Merge branch 'master' into hackday

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:SSZ')
         },
         "organization": {
             "name": options['organization'],
@@ -491,6 +491,11 @@ class DigiCertCISIssuerPlugin(IssuerPlugin):
 
         self.session.headers.pop('Accept')
         end_entity = pem.parse(certificate_pem)[0]
+
+        if 'ECC' in issuer_options['key_type']:
+            return "\n".join(str(end_entity).splitlines()), current_app.config.get('DIGICERT_ECC_CIS_INTERMEDIATE'), data['id']
+
+        # By default return RSA
         return "\n".join(str(end_entity).splitlines()), current_app.config.get('DIGICERT_CIS_INTERMEDIATE'), data['id']
 
     def revoke_certificate(self, certificate, comments):

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-DD')
+            'valid_to': arrow.get(2017, 5, 7).format('YYYY-MM-DDTHH:MM:SSZ')
         },
         '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-DD')
+                'valid_to': arrow.get(2018, 11, 3).format('YYYY-MM-DDTHH:MM:SSZ')
             },
             'profile_name': None
         }

lemur/plugins/lemur_statsd/docs/requirements.txt

@@ -0,0 +1 @@
+datadog==0.14.0

lemur/plugins/lemur_statsd/lemur_statsd/__init__.py

@@ -0,0 +1,4 @@
+try:
+    VERSION = __import__('pkg_resources').get_distribution(__name__).version
+except Exception as e:
+    VERSION = 'Unknown'

lemur/plugins/lemur_statsd/lemur_statsd/plugin.py

@@ -0,0 +1,45 @@
+import lemur_statsd as plug
+
+from flask import current_app
+from lemur.plugins.bases.metric import MetricPlugin
+from datadog import DogStatsd
+
+
+class StatsdMetricPlugin(MetricPlugin):
+    title = 'Statsd'
+    slug = 'statsd-metrics'
+    description = 'Adds support for sending metrics to Statsd'
+    version = plug.VERSION
+
+    def __init__(self):
+        host = current_app.config.get('STATSD_HOST')
+        port = current_app.config.get('STATSD_PORT')
+        prefix = current_app.config.get('STATSD_PREFIX')
+
+        self.statsd = DogStatsd(host=host, port=port, namespace=prefix)
+
+    def submit(self, metric_name, metric_type, metric_value, metric_tags=None, options=None):
+        valid_types = ['COUNTER', 'GAUGE', 'TIMER']
+        tags = []
+
+        if metric_type.upper() not in valid_types:
+            raise Exception(
+                "Invalid Metric Type for Statsd, '{metric}' choose from: {options}".format(
+                    metric=metric_type, options=','.join(valid_types)
+                )
+            )
+
+        if metric_tags:
+            if not isinstance(metric_tags, dict):
+                raise Exception("Invalid Metric Tags for Statsd: Tags must be in dict format")
+            else:
+                tags = map(lambda e: "{0}:{1}".format(*e), metric_tags.items())
+
+        if metric_type.upper() == 'COUNTER':
+            self.statsd.increment(metric_name, metric_value, tags)
+        elif metric_type.upper() == 'GAUGE':
+            self.statsd.gauge(metric_name, metric_value, tags)
+        elif metric_type.upper() == 'TIMER':
+            self.statsd.timing(metric_name, metric_value, tags)
+
+        return

lemur/plugins/lemur_statsd/setup.py

@@ -0,0 +1,24 @@
+"""Basic package information"""
+from __future__ import absolute_import
+from setuptools import setup, find_packages
+
+install_requires = [
+    'lemur',
+    'datadog'
+]
+
+setup(
+    name='lemur_statsd',
+    version='1.0.0',
+    author='Cloudflare Security Engineering',
+    author_email='',
+    include_package_data=True,
+    packages=find_packages(),
+    zip_safe=False,
+    install_requires=install_requires,
+    entry_points={
+        'lemur.plugins': [
+            'statsd = lemur_statsd.plugin:StatsdMetricPlugin',
+        ]
+    }
+)