Merge branch 'master' into hackday

Makefile

@@ -109,12 +109,15 @@ ifndef VIRTUAL_ENV
     $(error Please activate virtualenv first)
 endif
 	@echo "--> Updating Python requirements"
+	pip install --upgrade pip
 	pip install --upgrade pip-tools
 	pip-compile --output-file requirements-docs.txt requirements-docs.in -U --no-index
 	pip-compile --output-file requirements-dev.txt requirements-dev.in -U --no-index
 	pip-compile --output-file requirements-tests.txt requirements-tests.in -U --no-index
 	pip-compile --output-file requirements.txt requirements.in -U --no-index
 	@echo "--> Done updating Python requirements"
+	@echo "--> Removing python-ldap from requirements-docs.txt"
+	grep -v "python-ldap" requirements-docs.txt > tempreqs && mv tempreqs requirements-docs.txt
 	@echo "--> Installing new dependencies"
 	pip install -e .
 	@echo "--> Done installing new dependencies"

docs/administration.rst

@@ -1186,6 +1186,19 @@ Digicert
     https://github.com/opendns/lemur-digicert
 
 
+InfluxDB
+--------
+
+:Authors:
+    Titouan Christophe
+:Type:
+    Metric
+:Description:
+    Sends key metrics to InfluxDB
+:Links:
+    https://github.com/titouanc/lemur-influxdb
+
+
 Have an extension that should be listed here? Submit a `pull request <https://github.com/netflix/lemur>`_ and we'll
 get it added.
 

docs/requirements.txt

@@ -1,36 +0,0 @@
-CloudFlare==1.7.5
-Flask==0.12
-Flask-RESTful==0.3.6
-Flask-SQLAlchemy==2.1
-Flask-Script==2.0.5
-Flask-Migrate==2.1.1
-Flask-Bcrypt==0.7.1
-Flask-Principal==0.4.0
-Flask-Mail==0.9.1
-SQLAlchemy-Utils==0.32.14
-requests==2.11.1
-ndg-httpsclient==0.4.2
-psycopg2==2.7.3
-arrow==0.10.0
-six==1.10.0
-marshmallow-sqlalchemy==0.13.1
-gunicorn==19.7.1
-marshmallow==2.13.6
-cryptography==1.9
-xmltodict==0.11.0
-pyjwt==1.5.2
-lockfile==0.12.2
-inflection==0.3.1
-future==0.16.0
-boto3==1.4.6
-acme==0.18.1
-retrying==1.3.3
-tabulate==0.7.7
-pem==17.1.0
-raven[flask]==6.1.0
-jinja2==2.9.6
-# pyldap==2.4.37  # cannot be installed on rtd - required by ldap auth provider
-paramiko==2.4.1  # required for the SFTP destination plugin
-sphinx
-sphinxcontrib-httpdomain
-sphinx-rtd-theme

lemur/plugins/lemur_digicert/plugin.py

@@ -157,7 +157,7 @@ def map_cis_fields(options, csr):
         "csr": csr,
         "signature_hash": signature_hash(options.get('signing_algorithm')),
         "validity": {
-            "valid_to": options['validity_end'].format('YYYY-MM-DD')
+            "valid_to": options['validity_end'].format('YYYY-MM-DDTHH:MM') + 'Z'
         },
         "organization": {
             "name": options['organization'],

lemur/plugins/lemur_digicert/tests/test_digicert.py

@@ -103,7 +103,7 @@ def test_map_cis_fields(app):
         'signature_hash': 'sha256',
         'organization': {'name': 'Example, Inc.', 'units': ['Example Org']},
         'validity': {
-            'valid_to': arrow.get(2017, 5, 7).format('YYYY-MM-DDTHH:MM:SSZ')
+            'valid_to': arrow.get(2017, 5, 7).format('YYYY-MM-DDTHH:MM') + 'Z'
         },
         'profile_name': None
     }
@@ -132,7 +132,7 @@ def test_map_cis_fields(app):
             'signature_hash': 'sha256',
             'organization': {'name': 'Example, Inc.', 'units': ['Example Org']},
             'validity': {
-                'valid_to': arrow.get(2018, 11, 3).format('YYYY-MM-DDTHH:MM:SSZ')
+                'valid_to': arrow.get(2018, 11, 3).format('YYYY-MM-DDTHH:MM') + 'Z'
             },
             'profile_name': None
         }

requirements-dev.in

@@ -1,3 +1,5 @@
+# Run `make up-reqs` to update pinned dependencies in requirement text files
+
 flake8>=3.2,<4.0
 pre-commit
 invoke

requirements-dev.txt

@@ -6,11 +6,11 @@
 #
 aspy.yaml==1.1.0          # via pre-commit
 cached-property==1.4.2    # via pre-commit
-certifi==2018.1.18        # via requests
+certifi==2018.4.16        # via requests
 cfgv==1.0.0               # via pre-commit
 chardet==3.0.4            # via requests
 flake8==3.5.0
-identify==1.0.11          # via pre-commit
+identify==1.0.13          # via pre-commit
 idna==2.6                 # via requests
 invoke==0.22.1
 mccabe==0.6.1             # via flake8
@@ -23,7 +23,7 @@ pyyaml==3.12              # via aspy.yaml, pre-commit
 requests-toolbelt==0.8.0  # via twine
 requests==2.18.4          # via requests-toolbelt, twine
 six==1.11.0               # via cfgv, pre-commit
-tqdm==4.22.0              # via twine
+tqdm==4.23.0              # via twine
 twine==1.11.0
 urllib3==1.22             # via requests
 virtualenv==15.2.0        # via pre-commit

requirements-docs.in

@@ -1,3 +1,7 @@
+# Note: python-ldap from requirements breaks due to readthedocs.io not having the correct header files
+# The `make up-reqs` will update all requirement text files, and forcibly remove python-ldap
+# from requirements-docs.txt
+-r requirements.txt
 sphinx
 sphinxcontrib-httpdomain
 sphinx-rtd-theme

requirements-docs.txt

@@ -4,24 +4,76 @@
 #
 #    pip-compile --no-index --output-file requirements-docs.txt requirements-docs.in
 #
+acme==0.23.0
 alabaster==0.7.10         # via sphinx
+alembic-autogenerate-enums==0.0.2
+alembic==0.9.9
+aniso8601==3.0.0
+arrow==0.12.1
+asn1crypto==0.24.0
 babel==2.5.3              # via sphinx
-certifi==2018.1.18        # via requests
+bcrypt==3.1.4
-chardet==3.0.4            # via requests
+blinker==1.4
-docutils==0.14            # via sphinx
+boto3==1.7.6
-idna==2.6                 # via requests
+botocore==1.10.6
+cffi==1.11.5
+click==6.7
+cryptography==2.2.2
+docutils==0.14
+flask-bcrypt==0.7.1
+flask-cors==3.0.3
+flask-mail==0.9.1
+flask-migrate==2.1.1
+flask-principal==0.4.0
+flask-restful==0.3.6
+flask-script==2.0.6
+flask-sqlalchemy==2.3.2
+flask==0.12
+future==0.16.0
+gunicorn==19.7.1
+idna==2.6
 imagesize==1.0.0          # via sphinx
-jinja2==2.10              # via sphinx
+inflection==0.3.1
-markupsafe==1.0           # via jinja2
+itsdangerous==0.24
+jinja2==2.10
+jmespath==0.9.3
+josepy==1.1.0
+lockfile==0.12.2
+mako==1.0.7
+markupsafe==1.0
+marshmallow-sqlalchemy==0.13.2
+marshmallow==2.15.0
+mock==2.0.0
+ndg-httpsclient==0.4.4
 packaging==17.1           # via sphinx
+paramiko==2.4.1
+pbr==4.0.2
+pem==17.1.0
+psycopg2==2.7.4
+pyasn1-modules==0.2.1
+pyasn1==0.4.2
+pycparser==2.18
 pygments==2.2.0           # via sphinx
+pyjwt==1.6.1
+pynacl==1.2.1
+pyopenssl==17.2.0
 pyparsing==2.2.0          # via packaging
-pytz==2018.4              # via babel
+pyrfc3339==1.0
-requests==2.18.4          # via sphinx
+python-dateutil==2.7.2
-six==1.11.0               # via packaging, sphinx, sphinxcontrib-httpdomain
+python-editor==1.0.3
+pytz==2018.4
+raven[flask]==6.7.0
+requests[security]==2.11.1
+retrying==1.3.3
+s3transfer==0.1.13
+six==1.11.0
 snowballstemmer==1.2.1    # via sphinx
 sphinx-rtd-theme==0.3.0
-sphinx==1.7.2
+sphinx==1.7.3
 sphinxcontrib-httpdomain==1.6.1
 sphinxcontrib-websupport==1.0.1  # via sphinx
-urllib3==1.22             # via requests
+sqlalchemy-utils==0.33.2
+sqlalchemy==1.2.7
+tabulate==0.8.2
+werkzeug==0.14.1
+xmltodict==0.11.0

requirements-tests.in

@@ -1,3 +1,5 @@
+# Run `make up-reqs` to update pinned dependencies in requirement text files
+
 coverage
 factory-boy
 Faker

requirements-tests.txt

@@ -7,10 +7,10 @@
 asn1crypto==0.24.0        # via cryptography
 attrs==17.4.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-boto3==1.7.4              # via moto
+boto3==1.7.6              # via moto
 boto==2.48.0              # via moto
-botocore==1.10.4          # via boto3, moto, s3transfer
+botocore==1.10.6          # via boto3, moto, s3transfer
-certifi==2018.1.18        # via requests
+certifi==2018.4.16        # via requests
 cffi==1.11.5              # via cryptography
 chardet==3.0.4            # via requests
 click==6.7                # via flask
@@ -33,7 +33,7 @@ jsonpickle==0.9.6         # via aws-xray-sdk
 markupsafe==1.0           # via jinja2
 mock==2.0.0               # via moto
 more-itertools==4.1.0     # via pytest
-moto==1.3.2
+moto==1.3.3
 nose==1.3.7
 pbr==4.0.2                # via mock
 pluggy==0.6.0             # via pytest

requirements.in

@@ -1,3 +1,5 @@
+# Run `make up-reqs` to update pinned dependencies in requirement text files
+
 acme
 alembic-autogenerate-enums
 arrow

requirements.txt

@@ -12,8 +12,8 @@ arrow==0.12.1
 asn1crypto==0.24.0        # via cryptography
 bcrypt==3.1.4             # via flask-bcrypt, paramiko
 blinker==1.4              # via flask-mail, flask-principal, raven
-boto3==1.7.4
+boto3==1.7.6
-botocore==1.10.4          # via boto3, s3transfer
+botocore==1.10.6          # via boto3, s3transfer
 cffi==1.11.5              # via bcrypt, cryptography, pynacl
 click==6.7                # via flask
 cryptography==2.2.2
@@ -53,17 +53,17 @@ pyjwt==1.6.1
 pynacl==1.2.1             # via paramiko
 pyopenssl==17.2.0
 pyrfc3339==1.0            # via acme
-python-dateutil==2.6.1    # via alembic, arrow, botocore
+python-dateutil==2.7.2    # via alembic, arrow, botocore
 python-editor==1.0.3      # via alembic
 python-ldap==3.0.0
 pytz==2018.4              # via acme, flask-restful, pyrfc3339
-raven[flask]==6.6.0
+raven[flask]==6.7.0
 requests[security]==2.11.1
 retrying==1.3.3
 s3transfer==0.1.13        # via boto3
 six==1.11.0
 sqlalchemy-utils==0.33.2
-sqlalchemy==1.2.6         # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
+sqlalchemy==1.2.7         # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
 tabulate==0.8.2
 werkzeug==0.14.1          # via flask
 xmltodict==0.11.0

setup.py

@@ -16,14 +16,20 @@ import datetime
 
 from distutils import log
 from distutils.core import Command
-from pip.download import PipSession
-from pip.req import parse_requirements
 from setuptools.command.develop import develop
 from setuptools.command.install import install
 from setuptools.command.sdist import sdist
 from setuptools import setup, find_packages
 from subprocess import check_output
 
+import pip
+if tuple(map(int, pip.__version__.split('.'))) >= (10, 0, 0):
+    from pip._internal.download import PipSession
+    from pip._internal.req import parse_requirements
+else:
+    from pip.download import PipSession
+    from pip.req import parse_requirements
+
 ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__)))
 
 # When executing the setup.py, we need to be able to import ourselves, this