From 544a02ca3ffd4a8147a8c77b482d19e51d70868a Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Tue, 29 May 2018 10:18:16 -0700 Subject: [PATCH] Addressing comments. Updating copyrights. Added function to determine authorative name server --- LICENSE | 2 +- docs/conf.py | 2 +- lemur/__about__.py | 2 +- lemur/__init__.py | 2 +- lemur/api_keys/cli.py | 2 +- lemur/api_keys/models.py | 2 +- lemur/api_keys/schemas.py | 2 +- lemur/api_keys/service.py | 2 +- lemur/api_keys/views.py | 2 +- lemur/auth/ldap.py | 2 +- lemur/auth/permissions.py | 2 +- lemur/auth/service.py | 2 +- lemur/auth/views.py | 2 +- lemur/authorities/models.py | 2 +- lemur/authorities/schemas.py | 2 +- lemur/authorities/service.py | 2 +- lemur/authorities/views.py | 2 +- lemur/authorizations/models.py | 6 +-- lemur/authorizations/service.py | 8 +-- lemur/certificates/cli.py | 2 +- lemur/certificates/hooks.py | 2 +- lemur/certificates/models.py | 2 +- lemur/certificates/schemas.py | 2 +- lemur/certificates/service.py | 2 +- lemur/certificates/verify.py | 2 +- lemur/certificates/views.py | 2 +- lemur/common/fields.py | 2 +- lemur/common/health.py | 2 +- lemur/common/managers.py | 2 +- lemur/common/schema.py | 2 +- lemur/common/utils.py | 2 +- lemur/constants.py | 2 +- lemur/database.py | 2 +- lemur/defaults/schemas.py | 2 +- lemur/defaults/views.py | 2 +- lemur/destinations/models.py | 2 +- lemur/destinations/schemas.py | 2 +- lemur/destinations/service.py | 2 +- lemur/destinations/views.py | 2 +- lemur/dns_providers/models.py | 4 +- lemur/dns_providers/service.py | 10 ++-- lemur/dns_providers/views.py | 4 +- lemur/domains/models.py | 2 +- lemur/domains/schemas.py | 2 +- lemur/domains/service.py | 2 +- lemur/domains/views.py | 2 +- lemur/endpoints/cli.py | 2 +- lemur/endpoints/models.py | 2 +- lemur/endpoints/schemas.py | 2 +- lemur/endpoints/service.py | 2 +- lemur/endpoints/views.py | 2 +- lemur/exceptions.py | 2 +- lemur/extensions.py | 2 +- lemur/factory.py | 2 +- lemur/logs/models.py | 2 +- lemur/logs/schemas.py | 2 +- lemur/logs/service.py | 2 +- lemur/logs/views.py | 2 +- lemur/metrics.py | 2 +- lemur/migrations/versions/29d8c8455c86_.py | 62 ++++++++++++++++++++++ lemur/models.py | 2 +- lemur/notifications/cli.py | 2 +- lemur/notifications/messaging.py | 2 +- lemur/notifications/models.py | 2 +- lemur/notifications/schemas.py | 2 +- lemur/notifications/service.py | 2 +- lemur/notifications/views.py | 2 +- lemur/pending_certificates/cli.py | 5 -- lemur/pending_certificates/models.py | 2 +- lemur/pending_certificates/service.py | 2 +- lemur/plugins/base/__init__.py | 2 +- lemur/plugins/base/manager.py | 2 +- lemur/plugins/base/v1.py | 2 +- lemur/plugins/bases/destination.py | 2 +- lemur/plugins/bases/export.py | 2 +- lemur/plugins/bases/issuer.py | 2 +- lemur/plugins/bases/metric.py | 2 +- lemur/plugins/bases/notification.py | 2 +- lemur/plugins/bases/source.py | 2 +- lemur/plugins/lemur_acme/dyn.py | 45 +++++++++++++++- lemur/plugins/lemur_acme/plugin.py | 2 +- lemur/plugins/lemur_atlas/plugin.py | 2 +- lemur/plugins/lemur_aws/iam.py | 2 +- lemur/plugins/lemur_aws/plugin.py | 2 +- lemur/plugins/lemur_aws/s3.py | 2 +- lemur/plugins/lemur_aws/sts.py | 2 +- lemur/plugins/lemur_cfssl/plugin.py | 2 +- lemur/plugins/lemur_cryptography/plugin.py | 2 +- lemur/plugins/lemur_email/plugin.py | 2 +- lemur/plugins/lemur_java/plugin.py | 2 +- lemur/plugins/lemur_kubernetes/plugin.py | 2 +- lemur/plugins/lemur_openssl/plugin.py | 2 +- lemur/plugins/lemur_sftp/plugin.py | 2 +- lemur/plugins/lemur_slack/plugin.py | 2 +- lemur/plugins/lemur_verisign/plugin.py | 2 +- lemur/plugins/service.py | 2 +- lemur/plugins/utils.py | 2 +- lemur/plugins/views.py | 2 +- lemur/policies/cli.py | 2 +- lemur/policies/models.py | 2 +- lemur/policies/schemas.py | 2 +- lemur/policies/service.py | 2 +- lemur/reporting/cli.py | 2 +- lemur/roles/models.py | 2 +- lemur/roles/schemas.py | 2 +- lemur/roles/service.py | 2 +- lemur/roles/views.py | 2 +- lemur/schemas.py | 6 +-- lemur/sources/cli.py | 2 +- lemur/sources/models.py | 2 +- lemur/sources/schemas.py | 2 +- lemur/sources/service.py | 2 +- lemur/sources/views.py | 2 +- lemur/users/models.py | 2 +- lemur/users/schemas.py | 2 +- lemur/users/service.py | 2 +- lemur/users/views.py | 2 +- lemur/utils.py | 2 +- requirements-dev.txt | 3 +- requirements-docs.txt | 14 ++--- requirements-tests.txt | 6 +-- requirements.txt | 8 +-- setup.py | 2 +- 123 files changed, 251 insertions(+), 150 deletions(-) create mode 100644 lemur/migrations/versions/29d8c8455c86_.py diff --git a/LICENSE b/LICENSE index ce743570..1df93f8e 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2014 Netflix, Inc. + Copyright 2018 Netflix, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/docs/conf.py b/docs/conf.py index 79630685..d5b1698c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,7 +59,7 @@ master_doc = 'index' # General information about the project. project = u'lemur' -copyright = u'2015, Netflix Inc.' +copyright = u'2018, Netflix Inc.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/lemur/__about__.py b/lemur/__about__.py index c40d4829..d15b7dea 100644 --- a/lemur/__about__.py +++ b/lemur/__about__.py @@ -15,4 +15,4 @@ __author__ = "The Lemur developers" __email__ = "security@netflix.com" __license__ = "Apache License, Version 2.0" -__copyright__ = "Copyright 2017 {0}".format(__author__) +__copyright__ = "Copyright 2018 {0}".format(__author__) diff --git a/lemur/__init__.py b/lemur/__init__.py index e3156845..1cdb3468 100644 --- a/lemur/__init__.py +++ b/lemur/__init__.py @@ -1,7 +1,7 @@ """ .. module: lemur :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/api_keys/cli.py b/lemur/api_keys/cli.py index ad7d7a15..2259d774 100644 --- a/lemur/api_keys/cli.py +++ b/lemur/api_keys/cli.py @@ -1,7 +1,7 @@ """ .. module: lemur.api_keys.cli :platform: Unix - :copyright: (c) 2017 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Eric Coan """ diff --git a/lemur/api_keys/models.py b/lemur/api_keys/models.py index c9e4b523..df77edb1 100644 --- a/lemur/api_keys/models.py +++ b/lemur/api_keys/models.py @@ -2,7 +2,7 @@ .. module: lemur.api_keys.models :platform: Unix :synopsis: This module contains all of the models need to create an api key within Lemur. - :copyright: (c) 2017 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Eric Coan """ diff --git a/lemur/api_keys/schemas.py b/lemur/api_keys/schemas.py index 30c41c58..a3c11417 100644 --- a/lemur/api_keys/schemas.py +++ b/lemur/api_keys/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.api_keys.schemas :platform: Unix - :copyright: (c) 2017 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Eric Coan """ diff --git a/lemur/api_keys/service.py b/lemur/api_keys/service.py index 9ebc685b..5ddb8a3a 100644 --- a/lemur/api_keys/service.py +++ b/lemur/api_keys/service.py @@ -1,7 +1,7 @@ """ .. module: lemur.api_keys.service :platform: Unix - :copyright: (c) 2017 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Eric Coan """ diff --git a/lemur/api_keys/views.py b/lemur/api_keys/views.py index 8986afdc..b7af2944 100644 --- a/lemur/api_keys/views.py +++ b/lemur/api_keys/views.py @@ -1,7 +1,7 @@ """ .. module: lemur.api_keys.views :platform: Unix - :copyright: (c) 2017 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Eric Coan diff --git a/lemur/auth/ldap.py b/lemur/auth/ldap.py index e72469a5..398a5830 100644 --- a/lemur/auth/ldap.py +++ b/lemur/auth/ldap.py @@ -1,7 +1,7 @@ """ .. module: lemur.auth.ldap :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Ian Stahnke """ diff --git a/lemur/auth/permissions.py b/lemur/auth/permissions.py index 4fa025f7..e6d14408 100644 --- a/lemur/auth/permissions.py +++ b/lemur/auth/permissions.py @@ -2,7 +2,7 @@ .. module: lemur.auth.permissions :platform: Unix :synopsis: This module defines all the permission used within Lemur - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/auth/service.py b/lemur/auth/service.py index 00419c9f..c862aa2e 100644 --- a/lemur/auth/service.py +++ b/lemur/auth/service.py @@ -3,7 +3,7 @@ :platform: Unix :synopsis: This module contains all of the authentication duties for lemur - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/auth/views.py b/lemur/auth/views.py index 5888de8f..347f0393 100644 --- a/lemur/auth/views.py +++ b/lemur/auth/views.py @@ -1,7 +1,7 @@ """ .. module: lemur.auth.views :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/authorities/models.py b/lemur/authorities/models.py index 9a7521a9..6c5f790b 100644 --- a/lemur/authorities/models.py +++ b/lemur/authorities/models.py @@ -2,7 +2,7 @@ .. module: lemur.authorities.models :platform: unix :synopsis: This module contains all of the models need to create an authority within Lemur. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/authorities/schemas.py b/lemur/authorities/schemas.py index 0815de73..d1f0adfc 100644 --- a/lemur/authorities/schemas.py +++ b/lemur/authorities/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.authorities.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/authorities/service.py b/lemur/authorities/service.py index fe90faea..1d35ad49 100644 --- a/lemur/authorities/service.py +++ b/lemur/authorities/service.py @@ -3,7 +3,7 @@ :platform: Unix :synopsis: This module contains all of the services level functions used to administer authorities in Lemur - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/authorities/views.py b/lemur/authorities/views.py index 06604c01..6bf7e2a8 100644 --- a/lemur/authorities/views.py +++ b/lemur/authorities/views.py @@ -1,7 +1,7 @@ """ .. module: lemur.authorities.views :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/authorizations/models.py b/lemur/authorizations/models.py index 1c9e587b..d30de7ed 100644 --- a/lemur/authorizations/models.py +++ b/lemur/authorizations/models.py @@ -1,7 +1,7 @@ """ .. module: lemur.authorizations.models :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Netflix Secops """ @@ -12,7 +12,7 @@ from lemur.database import db from lemur.plugins.base import plugins -class Authorizations(db.Model): +class Authorization(db.Model): __tablename__ = 'pending_dns_authorizations' id = Column(Integer, primary_key=True, autoincrement=True) account_number = Column(String(128)) @@ -25,7 +25,7 @@ class Authorizations(db.Model): return plugins.get(self.plugin_name) def __repr__(self): - return "Authorizations(id={id})".format(label=self.id) + return "Authorization(id={id})".format(label=self.id) def __init__(self, account_number, domains, dns_provider_type, options=None): self.account_number = account_number diff --git a/lemur/authorizations/service.py b/lemur/authorizations/service.py index d1a8b874..6e73c38c 100644 --- a/lemur/authorizations/service.py +++ b/lemur/authorizations/service.py @@ -1,18 +1,18 @@ """ .. module: lemur.pending_certificates.service - Copyright (c) 2017 and onwards Instart Logic, Inc. All rights reserved. + Copyright (c) 2018 and onwards Netflix, Inc. All rights reserved. .. moduleauthor:: Secops """ from lemur import database -from lemur.authorizations.models import Authorizations +from lemur.authorizations.models import Authorization def get(authorization_id): """ Retrieve dns authorization by ID """ - return database.get(Authorizations, authorization_id) + return database.get(Authorization, authorization_id) def create(account_number, domains, dns_provider_type, options=None): @@ -20,5 +20,5 @@ def create(account_number, domains, dns_provider_type, options=None): Creates a new dns authorization. """ - authorization = Authorizations(account_number, domains, dns_provider_type, options) + authorization = Authorization(account_number, domains, dns_provider_type, options) return database.create(authorization) diff --git a/lemur/certificates/cli.py b/lemur/certificates/cli.py index e3c5acbc..f5a84d18 100644 --- a/lemur/certificates/cli.py +++ b/lemur/certificates/cli.py @@ -1,7 +1,7 @@ """ .. module: lemur.certificate.cli :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/certificates/hooks.py b/lemur/certificates/hooks.py index e352a4d5..16f6c3b0 100644 --- a/lemur/certificates/hooks.py +++ b/lemur/certificates/hooks.py @@ -3,7 +3,7 @@ Debugging hooks for dumping imported or generated CSR and certificate details to .. module: lemur.certificates.hooks :platform: Unix - :copyright: (c) 2016-2017 by Marti Raudsepp, see AUTHORS for more + :copyright: (c) 2018 by Marti Raudsepp, see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Marti Raudsepp diff --git a/lemur/certificates/models.py b/lemur/certificates/models.py index 5edf7721..f88eda0a 100644 --- a/lemur/certificates/models.py +++ b/lemur/certificates/models.py @@ -1,7 +1,7 @@ """ .. module: lemur.certificates.models :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/certificates/schemas.py b/lemur/certificates/schemas.py index c50ddfcb..99e520c4 100644 --- a/lemur/certificates/schemas.py +++ b/lemur/certificates/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.certificates.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/certificates/service.py b/lemur/certificates/service.py index ce90b4f0..e7a5afd1 100644 --- a/lemur/certificates/service.py +++ b/lemur/certificates/service.py @@ -1,7 +1,7 @@ """ .. module: lemur.certificate.service :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/certificates/verify.py b/lemur/certificates/verify.py index c976fecc..3d847bdf 100644 --- a/lemur/certificates/verify.py +++ b/lemur/certificates/verify.py @@ -1,7 +1,7 @@ """ .. module: lemur.certificates.verify :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/certificates/views.py b/lemur/certificates/views.py index 59f96522..72cb3b5a 100644 --- a/lemur/certificates/views.py +++ b/lemur/certificates/views.py @@ -1,7 +1,7 @@ """ .. module: lemur.certificates.views :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/common/fields.py b/lemur/common/fields.py index c2b95635..9a0198e9 100644 --- a/lemur/common/fields.py +++ b/lemur/common/fields.py @@ -1,7 +1,7 @@ """ .. module: lemur.common.fields :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/common/health.py b/lemur/common/health.py index c48c1fae..69df3f0c 100644 --- a/lemur/common/health.py +++ b/lemur/common/health.py @@ -1,7 +1,7 @@ """ .. module: lemur.common.health :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/common/managers.py b/lemur/common/managers.py index 234432c0..9f30f216 100644 --- a/lemur/common/managers.py +++ b/lemur/common/managers.py @@ -1,7 +1,7 @@ """ .. module: lemur.common.managers :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/common/schema.py b/lemur/common/schema.py index 14086dc9..4e2c5306 100644 --- a/lemur/common/schema.py +++ b/lemur/common/schema.py @@ -1,7 +1,7 @@ """ .. module: lemur.common.schema :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/common/utils.py b/lemur/common/utils.py index fd621076..bcc8a21b 100644 --- a/lemur/common/utils.py +++ b/lemur/common/utils.py @@ -1,7 +1,7 @@ """ .. module: lemur.common.utils :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/constants.py b/lemur/constants.py index 0ee9bc40..060ecfed 100644 --- a/lemur/constants.py +++ b/lemur/constants.py @@ -1,6 +1,6 @@ """ .. module: lemur.constants - :copyright: (c) 2015 by Netflix Inc. + :copyright: (c) 2018 by Netflix Inc. :license: Apache, see LICENSE for more details. """ SAN_NAMING_TEMPLATE = "SAN-{subject}-{issuer}-{not_before}-{not_after}" diff --git a/lemur/database.py b/lemur/database.py index 8efd4b95..ad3899aa 100644 --- a/lemur/database.py +++ b/lemur/database.py @@ -4,7 +4,7 @@ :synopsis: This module contains all of the database related methods needed for lemur to interact with a datastore - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/defaults/schemas.py b/lemur/defaults/schemas.py index c03d6d85..4ff5da61 100644 --- a/lemur/defaults/schemas.py +++ b/lemur/defaults/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.defaults.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/defaults/views.py b/lemur/defaults/views.py index 5fe3cf41..5a573829 100644 --- a/lemur/defaults/views.py +++ b/lemur/defaults/views.py @@ -1,6 +1,6 @@ """ .. module: lemur.defaults.views - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. """ from flask import current_app, Blueprint diff --git a/lemur/destinations/models.py b/lemur/destinations/models.py index 3e04eae5..192a5f5d 100644 --- a/lemur/destinations/models.py +++ b/lemur/destinations/models.py @@ -1,7 +1,7 @@ """ .. module: lemur.destinations.models :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/destinations/schemas.py b/lemur/destinations/schemas.py index a7e47954..279889b4 100644 --- a/lemur/destinations/schemas.py +++ b/lemur/destinations/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.destinations.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/destinations/service.py b/lemur/destinations/service.py index 5cccb8a4..ed6fcb0f 100644 --- a/lemur/destinations/service.py +++ b/lemur/destinations/service.py @@ -1,7 +1,7 @@ """ .. module: lemur.destinations.service :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/destinations/views.py b/lemur/destinations/views.py index a0cb1a4e..7084e8e9 100644 --- a/lemur/destinations/views.py +++ b/lemur/destinations/views.py @@ -2,7 +2,7 @@ .. module: lemur.destinations.views :platform: Unix :synopsis: This module contains all of the accounts view code. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/dns_providers/models.py b/lemur/dns_providers/models.py index 751e1fbe..f0eb71a8 100644 --- a/lemur/dns_providers/models.py +++ b/lemur/dns_providers/models.py @@ -7,7 +7,7 @@ from lemur.plugins.base import plugins from lemur.utils import Vault -class DnsProviders(db.Model): +class DnsProvider(db.Model): __tablename__ = 'dns_providers' id = Column( Integer(), @@ -34,4 +34,4 @@ class DnsProviders(db.Model): return plugins.get(self.plugin_name) def __repr__(self): - return "DnsProviders(name={name})".format(name=self.name) + return "DnsProvider(name={name})".format(name=self.name) diff --git a/lemur/dns_providers/service.py b/lemur/dns_providers/service.py index da475e1e..ed6fbf2f 100644 --- a/lemur/dns_providers/service.py +++ b/lemur/dns_providers/service.py @@ -2,7 +2,7 @@ import json from flask import current_app from lemur import database -from lemur.dns_providers.models import DnsProviders +from lemur.dns_providers.models import DnsProvider def render(args): @@ -11,13 +11,13 @@ def render(args): :param args: :return: """ - query = database.session_query(DnsProviders) + query = database.session_query(DnsProvider) - return database.sort_and_page(query, DnsProviders, args) + return database.sort_and_page(query, DnsProvider, args) def get(dns_provider_id): - provider = database.get(DnsProviders, dns_provider_id) + provider = database.get(DnsProvider, dns_provider_id) return provider @@ -66,7 +66,7 @@ def create(data): credentials = {} for item in data.get("provider_type", {}).get("requirements", []): credentials[item["name"]] = item["value"] - dns_provider = DnsProviders( + dns_provider = DnsProvider( name=provider_name, description=data.get("description"), provider_type=data.get("provider_type").get("name"), diff --git a/lemur/dns_providers/views.py b/lemur/dns_providers/views.py index a2b956cd..b9543034 100644 --- a/lemur/dns_providers/views.py +++ b/lemur/dns_providers/views.py @@ -1,7 +1,7 @@ """ .. module: lemur.dns)providers.views :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Curtis Castrapel """ @@ -118,7 +118,7 @@ class DnsProvidersList(AuthenticatedResource): "type": "str", "required": true, "helpMessage": "Cloudflare Email", - "value": "test@netflix.com" + "value": "test@example.com" }, { "name": "key", diff --git a/lemur/domains/models.py b/lemur/domains/models.py index dae55bb7..afd348d6 100644 --- a/lemur/domains/models.py +++ b/lemur/domains/models.py @@ -1,7 +1,7 @@ """ .. module: lemur.domains.models :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/domains/schemas.py b/lemur/domains/schemas.py index 96e41967..6cf7fd31 100644 --- a/lemur/domains/schemas.py +++ b/lemur/domains/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.domains.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/domains/service.py b/lemur/domains/service.py index 60da1062..c9b8f759 100644 --- a/lemur/domains/service.py +++ b/lemur/domains/service.py @@ -1,7 +1,7 @@ """ .. module: lemur.domains.service :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/domains/views.py b/lemur/domains/views.py index dadb091d..db73f5cd 100644 --- a/lemur/domains/views.py +++ b/lemur/domains/views.py @@ -1,7 +1,7 @@ """ .. module: lemur.domains.views :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/endpoints/cli.py b/lemur/endpoints/cli.py index 0f576808..59496930 100644 --- a/lemur/endpoints/cli.py +++ b/lemur/endpoints/cli.py @@ -1,7 +1,7 @@ """ .. module: lemur.endpoints.cli :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/endpoints/models.py b/lemur/endpoints/models.py index 0df2bf31..b5823327 100644 --- a/lemur/endpoints/models.py +++ b/lemur/endpoints/models.py @@ -2,7 +2,7 @@ .. module: lemur.endpoints.models :platform: unix :synopsis: This module contains all of the models need to create an authority within Lemur. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/endpoints/schemas.py b/lemur/endpoints/schemas.py index 57f73642..ec2fd73e 100644 --- a/lemur/endpoints/schemas.py +++ b/lemur/endpoints/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.endpoints.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/endpoints/service.py b/lemur/endpoints/service.py index 55bacde2..d14174df 100644 --- a/lemur/endpoints/service.py +++ b/lemur/endpoints/service.py @@ -3,7 +3,7 @@ :platform: Unix :synopsis: This module contains all of the services level functions used to administer endpoints in Lemur - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/endpoints/views.py b/lemur/endpoints/views.py index 02542984..6509f056 100644 --- a/lemur/endpoints/views.py +++ b/lemur/endpoints/views.py @@ -1,7 +1,7 @@ """ .. module: lemur.endpoints.views :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/exceptions.py b/lemur/exceptions.py index 3bf90b77..d392fe5d 100644 --- a/lemur/exceptions.py +++ b/lemur/exceptions.py @@ -1,6 +1,6 @@ """ .. module: lemur.exceptions - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. """ from flask import current_app diff --git a/lemur/extensions.py b/lemur/extensions.py index 76abcab1..17a8e6e7 100644 --- a/lemur/extensions.py +++ b/lemur/extensions.py @@ -1,6 +1,6 @@ """ .. module: lemur.extensions - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. """ from flask_sqlalchemy import SQLAlchemy diff --git a/lemur/factory.py b/lemur/factory.py index 97f7f6ca..c2719e9b 100644 --- a/lemur/factory.py +++ b/lemur/factory.py @@ -4,7 +4,7 @@ :synopsis: This module contains all the needed functions to allow the factory app creation. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/logs/models.py b/lemur/logs/models.py index f634ba9b..d4239e59 100644 --- a/lemur/logs/models.py +++ b/lemur/logs/models.py @@ -2,7 +2,7 @@ .. module: lemur.logs.models :platform: unix :synopsis: This module contains all of the models related private key audit log. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/logs/schemas.py b/lemur/logs/schemas.py index db16755a..7d31cb39 100644 --- a/lemur/logs/schemas.py +++ b/lemur/logs/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.logs.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/logs/service.py b/lemur/logs/service.py index 59097cb0..04355938 100644 --- a/lemur/logs/service.py +++ b/lemur/logs/service.py @@ -3,7 +3,7 @@ :platform: Unix :synopsis: This module contains all of the services level functions used to administer logs in Lemur - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/logs/views.py b/lemur/logs/views.py index a19f7c4a..1e0bd184 100644 --- a/lemur/logs/views.py +++ b/lemur/logs/views.py @@ -1,7 +1,7 @@ """ .. module: lemur.logs.views :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/metrics.py b/lemur/metrics.py index 64ddeac3..381dc605 100644 --- a/lemur/metrics.py +++ b/lemur/metrics.py @@ -1,6 +1,6 @@ """ .. module: lemur.metrics - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. """ from flask import current_app diff --git a/lemur/migrations/versions/29d8c8455c86_.py b/lemur/migrations/versions/29d8c8455c86_.py new file mode 100644 index 00000000..f0b4749f --- /dev/null +++ b/lemur/migrations/versions/29d8c8455c86_.py @@ -0,0 +1,62 @@ +"""Adding endpoint tables + +Revision ID: 29d8c8455c86 +Revises: 3307381f3b88 +Create Date: 2016-06-28 16:05:25.720213 + +""" + +# revision identifiers, used by Alembic. +revision = '29d8c8455c86' +down_revision = '3307381f3b88' + +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.create_table('ciphers', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(length=128), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('policy', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(length=128), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('policies_ciphers', + sa.Column('cipher_id', sa.Integer(), nullable=True), + sa.Column('policy_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['cipher_id'], ['ciphers.id'], ), + sa.ForeignKeyConstraint(['policy_id'], ['policy.id'], ) + ) + op.create_index('policies_ciphers_ix', 'policies_ciphers', ['cipher_id', 'policy_id'], unique=False) + op.create_table('endpoints', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('owner', sa.String(length=128), nullable=True), + sa.Column('name', sa.String(length=128), nullable=True), + sa.Column('dnsname', sa.String(length=256), nullable=True), + sa.Column('type', sa.String(length=128), nullable=True), + sa.Column('active', sa.Boolean(), nullable=True), + sa.Column('port', sa.Integer(), nullable=True), + sa.Column('date_created', sa.DateTime(), server_default=sa.text(u'now()'), nullable=False), + sa.Column('policy_id', sa.Integer(), nullable=True), + sa.Column('certificate_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['certificate_id'], ['certificates.id'], ), + sa.ForeignKeyConstraint(['policy_id'], ['policy.id'], ), + sa.PrimaryKeyConstraint('id') + ) + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_table('endpoints') + op.drop_index('policies_ciphers_ix', table_name='policies_ciphers') + op.drop_table('policies_ciphers') + op.drop_table('policy') + op.drop_table('ciphers') + ### end Alembic commands ### diff --git a/lemur/models.py b/lemur/models.py index 900bbb0f..69f82360 100644 --- a/lemur/models.py +++ b/lemur/models.py @@ -4,7 +4,7 @@ :synopsis: This module contains all of the associative tables that help define the many to many relationships established in Lemur - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/notifications/cli.py b/lemur/notifications/cli.py index 58f7e86f..e3bf431e 100644 --- a/lemur/notifications/cli.py +++ b/lemur/notifications/cli.py @@ -1,7 +1,7 @@ """ .. module: lemur.notifications.cli :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/notifications/messaging.py b/lemur/notifications/messaging.py index 6096f9ef..5f33ba70 100644 --- a/lemur/notifications/messaging.py +++ b/lemur/notifications/messaging.py @@ -2,7 +2,7 @@ .. module: lemur.notifications.messaging :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/notifications/models.py b/lemur/notifications/models.py index 79a3df1c..87646b4c 100644 --- a/lemur/notifications/models.py +++ b/lemur/notifications/models.py @@ -1,7 +1,7 @@ """ .. module: lemur.notifications.models :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/notifications/schemas.py b/lemur/notifications/schemas.py index 3a772d78..b5d4e1e6 100644 --- a/lemur/notifications/schemas.py +++ b/lemur/notifications/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.notifications.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/notifications/service.py b/lemur/notifications/service.py index e26ff47f..466c680b 100644 --- a/lemur/notifications/service.py +++ b/lemur/notifications/service.py @@ -2,7 +2,7 @@ .. module: lemur.notifications.service :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/notifications/views.py b/lemur/notifications/views.py index 30b0f5f8..df75aaa9 100644 --- a/lemur/notifications/views.py +++ b/lemur/notifications/views.py @@ -2,7 +2,7 @@ .. module: lemur.notifications.views :platform: Unix :synopsis: This module contains all of the accounts view code. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/pending_certificates/cli.py b/lemur/pending_certificates/cli.py index a22859a8..6e12c53b 100644 --- a/lemur/pending_certificates/cli.py +++ b/lemur/pending_certificates/cli.py @@ -14,11 +14,6 @@ from lemur.users import service as user_service manager = Manager(usage="Handles pending certificate related tasks.") -# Need to call this multiple times and store status of the cert in DB. If it is being worked on by a worker, and which -# worker. -# Then open up an arbitrary number of copies of this? every minute?? -# Or instead how about you send in a list of all pending certificates, make all the dns changes at once, then loop -# through and wait for each one to complete? @manager.option('-i', dest='ids', action='append', help='IDs of pending certificates to fetch') def fetch(ids): """ diff --git a/lemur/pending_certificates/models.py b/lemur/pending_certificates/models.py index 4f02d84b..f8ebc7ab 100644 --- a/lemur/pending_certificates/models.py +++ b/lemur/pending_certificates/models.py @@ -1,6 +1,6 @@ """ .. module: lemur.pending_certificates.models - Copyright (c) 2017 and onwards Instart Logic, Inc. All rights reserved. + Copyright (c) 2018 and onwards Netflix, Inc. All rights reserved. .. moduleauthor:: James Chuong """ from datetime import datetime as dt diff --git a/lemur/pending_certificates/service.py b/lemur/pending_certificates/service.py index f58871b7..64c03c46 100644 --- a/lemur/pending_certificates/service.py +++ b/lemur/pending_certificates/service.py @@ -1,6 +1,6 @@ """ .. module: lemur.pending_certificates.service - Copyright (c) 2017 and onwards Instart Logic, Inc. All rights reserved. + Copyright (c) 2018 and onwards Netflix, Inc. All rights reserved. .. moduleauthor:: James Chuong """ import arrow diff --git a/lemur/plugins/base/__init__.py b/lemur/plugins/base/__init__.py index 107cbcf4..4e9f1e83 100644 --- a/lemur/plugins/base/__init__.py +++ b/lemur/plugins/base/__init__.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.base :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/base/manager.py b/lemur/plugins/base/manager.py index e6c29c4e..a2306445 100644 --- a/lemur/plugins/base/manager.py +++ b/lemur/plugins/base/manager.py @@ -1,6 +1,6 @@ """ .. module: lemur.plugins.base.manager - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson (kglisson@netflix.com) diff --git a/lemur/plugins/base/v1.py b/lemur/plugins/base/v1.py index 36dbaf6e..fb688c73 100644 --- a/lemur/plugins/base/v1.py +++ b/lemur/plugins/base/v1.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.base.v1 :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/bases/destination.py b/lemur/plugins/bases/destination.py index 53c63e86..1e7e4ed2 100644 --- a/lemur/plugins/bases/destination.py +++ b/lemur/plugins/bases/destination.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.bases.destination :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/bases/export.py b/lemur/plugins/bases/export.py index ab493869..1466c1ab 100644 --- a/lemur/plugins/bases/export.py +++ b/lemur/plugins/bases/export.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.bases.export :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/bases/issuer.py b/lemur/plugins/bases/issuer.py index dc9ca076..5eb0964c 100644 --- a/lemur/plugins/bases/issuer.py +++ b/lemur/plugins/bases/issuer.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.bases.issuer :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/bases/metric.py b/lemur/plugins/bases/metric.py index 586dab41..259af235 100644 --- a/lemur/plugins/bases/metric.py +++ b/lemur/plugins/bases/metric.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.bases.metric :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/bases/notification.py b/lemur/plugins/bases/notification.py index 054bdff5..a7ba4e0d 100644 --- a/lemur/plugins/bases/notification.py +++ b/lemur/plugins/bases/notification.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.bases.notification :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/bases/source.py b/lemur/plugins/bases/source.py index f7fe655b..ff3492fe 100644 --- a/lemur/plugins/bases/source.py +++ b/lemur/plugins/bases/source.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.bases.source :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/lemur_acme/dyn.py b/lemur/plugins/lemur_acme/dyn.py index 50d69c3c..67ce731f 100644 --- a/lemur/plugins/lemur_acme/dyn.py +++ b/lemur/plugins/lemur_acme/dyn.py @@ -1,6 +1,10 @@ import time +import dns import dns.exception +import dns.name +import dns.query +import dns.resolver import dns.resolver from dyn.tm.errors import DynectCreateError from dyn.tm.session import DynectSession @@ -22,7 +26,7 @@ def _has_dns_propagated(name, token): txt_records = [] try: dns_resolver = dns.resolver.Resolver() - dns_resolver.nameservers = ['8.8.8.8'] + dns_resolver.nameservers = [get_authoritative_nameserver(name)] dns_response = dns_resolver.query(name, 'TXT') for rdata in dns_response: for txt_record in rdata.strings: @@ -87,3 +91,42 @@ def delete_txt_record(change_id, account_number, domain, token): current_app.logger.debug("Deleting TXT record name: {0}".format(fqdn)) txt_record.delete() zone.publish() + + +def get_authoritative_nameserver(domain): + n = dns.name.from_text(domain) + + depth = 2 + default = dns.resolver.get_default_resolver() + nameserver = default.nameservers[0] + + last = False + while not last: + s = n.split(depth) + + last = s[0].to_unicode() == u'@' + sub = s[1] + + query = dns.message.make_query(sub, dns.rdatatype.NS) + response = dns.query.udp(query, nameserver) + + rcode = response.rcode() + if rcode != dns.rcode.NOERROR: + if rcode == dns.rcode.NXDOMAIN: + raise Exception('%s does not exist.' % sub) + else: + raise Exception('Error %s' % dns.rcode.to_text(rcode)) + + if len(response.authority) > 0: + rrset = response.authority[0] + else: + rrset = response.answer[0] + + rr = rrset[0] + if rr.rdtype != dns.rdatatype.SOA: + authority = rr.target + nameserver = default.query(authority).rrset[0].to_text() + + depth += 1 + + return nameserver diff --git a/lemur/plugins/lemur_acme/plugin.py b/lemur/plugins/lemur_acme/plugin.py index ff8f0406..a3f9af00 100644 --- a/lemur/plugins/lemur_acme/plugin.py +++ b/lemur/plugins/lemur_acme/plugin.py @@ -2,7 +2,7 @@ .. module: lemur.plugins.lemur_acme.plugin :platform: Unix :synopsis: This module is responsible for communicating with an ACME CA. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. Snippets from https://raw.githubusercontent.com/alex/letsencrypt-aws/master/letsencrypt-aws.py diff --git a/lemur/plugins/lemur_atlas/plugin.py b/lemur/plugins/lemur_atlas/plugin.py index 6b26740f..09d4c9f9 100644 --- a/lemur/plugins/lemur_atlas/plugin.py +++ b/lemur/plugins/lemur_atlas/plugin.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.lemur_atlas.plugin :platform: Unix - :copyright: (c) 2016 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/lemur_aws/iam.py b/lemur/plugins/lemur_aws/iam.py index ebe7fa80..53c3719d 100644 --- a/lemur/plugins/lemur_aws/iam.py +++ b/lemur/plugins/lemur_aws/iam.py @@ -2,7 +2,7 @@ .. module: lemur.plugins.lemur_aws.iam :platform: Unix :synopsis: Contains helper functions for interactive with AWS IAM Apis. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/plugins/lemur_aws/plugin.py b/lemur/plugins/lemur_aws/plugin.py index c15e30ca..d959cfdc 100644 --- a/lemur/plugins/lemur_aws/plugin.py +++ b/lemur/plugins/lemur_aws/plugin.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.lemur_aws.plugin :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. Terraform example to setup the destination bucket: diff --git a/lemur/plugins/lemur_aws/s3.py b/lemur/plugins/lemur_aws/s3.py index 9e98d3c5..2f8983e5 100644 --- a/lemur/plugins/lemur_aws/s3.py +++ b/lemur/plugins/lemur_aws/s3.py @@ -2,7 +2,7 @@ .. module: lemur.plugins.lemur_aws.s3 :platform: Unix :synopsis: Contains helper functions for interactive with AWS S3 Apis. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/plugins/lemur_aws/sts.py b/lemur/plugins/lemur_aws/sts.py index 0ef1c3f8..001ea2c8 100644 --- a/lemur/plugins/lemur_aws/sts.py +++ b/lemur/plugins/lemur_aws/sts.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.lemur_aws.sts :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/plugins/lemur_cfssl/plugin.py b/lemur/plugins/lemur_cfssl/plugin.py index 5f1caf37..530e196d 100644 --- a/lemur/plugins/lemur_cfssl/plugin.py +++ b/lemur/plugins/lemur_cfssl/plugin.py @@ -2,7 +2,7 @@ .. module: lemur.plugins.lemur_cfssl.plugin :platform: Unix :synopsis: This module is responsible for communicating with the CFSSL private CA. - :copyright: (c) 2016 by Thomson Reuters + :copyright: (c) 2018 by Thomson Reuters :license: Apache, see LICENSE for more details. .. moduleauthor:: Charles Hendrie diff --git a/lemur/plugins/lemur_cryptography/plugin.py b/lemur/plugins/lemur_cryptography/plugin.py index 23c691b2..fe9d7bb3 100644 --- a/lemur/plugins/lemur_cryptography/plugin.py +++ b/lemur/plugins/lemur_cryptography/plugin.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.lemur_cryptography.plugin :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/lemur_email/plugin.py b/lemur/plugins/lemur_email/plugin.py index 326fe9e5..18007b99 100644 --- a/lemur/plugins/lemur_email/plugin.py +++ b/lemur/plugins/lemur_email/plugin.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.lemur_email.plugin :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/lemur_java/plugin.py b/lemur/plugins/lemur_java/plugin.py index 53ee1618..151794da 100644 --- a/lemur/plugins/lemur_java/plugin.py +++ b/lemur/plugins/lemur_java/plugin.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.lemur_java.plugin :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/lemur_kubernetes/plugin.py b/lemur/plugins/lemur_kubernetes/plugin.py index d1d47051..ee466596 100644 --- a/lemur/plugins/lemur_kubernetes/plugin.py +++ b/lemur/plugins/lemur_kubernetes/plugin.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.lemur_kubernetes.plugin :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. diff --git a/lemur/plugins/lemur_openssl/plugin.py b/lemur/plugins/lemur_openssl/plugin.py index b013936d..d50b4e43 100644 --- a/lemur/plugins/lemur_openssl/plugin.py +++ b/lemur/plugins/lemur_openssl/plugin.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.lemur_openssl.plugin :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/lemur_sftp/plugin.py b/lemur/plugins/lemur_sftp/plugin.py index e782bcf7..d74effc5 100644 --- a/lemur/plugins/lemur_sftp/plugin.py +++ b/lemur/plugins/lemur_sftp/plugin.py @@ -2,7 +2,7 @@ .. module: lemur.plugins.lemur_sftp.plugin :platform: Unix :synopsis: Allow the uploading of certificates to SFTP. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. Allow the uploading of certificates to SFTP. diff --git a/lemur/plugins/lemur_slack/plugin.py b/lemur/plugins/lemur_slack/plugin.py index a8dc52b7..a986aa9a 100644 --- a/lemur/plugins/lemur_slack/plugin.py +++ b/lemur/plugins/lemur_slack/plugin.py @@ -1,7 +1,7 @@ """ .. module: lemur.plugins.lemur_slack.plugin :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Harm Weites diff --git a/lemur/plugins/lemur_verisign/plugin.py b/lemur/plugins/lemur_verisign/plugin.py index 44fa71df..19246eb1 100644 --- a/lemur/plugins/lemur_verisign/plugin.py +++ b/lemur/plugins/lemur_verisign/plugin.py @@ -2,7 +2,7 @@ .. module: lemur.plugins.lemur_verisign.plugin :platform: Unix :synopsis: This module is responsible for communicating with the VeriSign VICE 2.0 API. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/service.py b/lemur/plugins/service.py index 33965963..e91efc2e 100644 --- a/lemur/plugins/service.py +++ b/lemur/plugins/service.py @@ -1,7 +1,7 @@ """ .. module: service :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/plugins/utils.py b/lemur/plugins/utils.py index 2e727a00..a1914dd7 100644 --- a/lemur/plugins/utils.py +++ b/lemur/plugins/utils.py @@ -2,7 +2,7 @@ .. module: lemur.plugins.utils :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/plugins/views.py b/lemur/plugins/views.py index b54ad560..dbdfccab 100644 --- a/lemur/plugins/views.py +++ b/lemur/plugins/views.py @@ -2,7 +2,7 @@ .. module: lemur.plugins.views :platform: Unix :synopsis: This module contains all of the accounts view code. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/policies/cli.py b/lemur/policies/cli.py index 15accd98..725c1583 100644 --- a/lemur/policies/cli.py +++ b/lemur/policies/cli.py @@ -1,7 +1,7 @@ """ .. module: lemur.policies.cli :platform: Unix - :copyright: (c) 2017 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/policies/models.py b/lemur/policies/models.py index 99e33cc0..2329a347 100644 --- a/lemur/policies/models.py +++ b/lemur/policies/models.py @@ -2,7 +2,7 @@ .. module: lemur.policies.models :platform: unix :synopsis: This module contains all of the models need to create a certificate policy within Lemur. - :copyright: (c) 2017 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/policies/schemas.py b/lemur/policies/schemas.py index 190600fe..c20c6156 100644 --- a/lemur/policies/schemas.py +++ b/lemur/policies/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.policies.schemas :platform: unix - :copyright: (c) 2017 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/policies/service.py b/lemur/policies/service.py index c6719a03..10e9053b 100644 --- a/lemur/policies/service.py +++ b/lemur/policies/service.py @@ -1,7 +1,7 @@ """ .. module: lemur.policies.service :platform: Unix - :copyright: (c) 2017 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/reporting/cli.py b/lemur/reporting/cli.py index 8c2fe77a..8f797c33 100644 --- a/lemur/reporting/cli.py +++ b/lemur/reporting/cli.py @@ -1,7 +1,7 @@ """ .. module: lemur.reporting.cli :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/roles/models.py b/lemur/roles/models.py index 21a40be2..85bf1bf1 100644 --- a/lemur/roles/models.py +++ b/lemur/roles/models.py @@ -3,7 +3,7 @@ :platform: unix :synopsis: This module contains all of the models need to create a role within Lemur - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/roles/schemas.py b/lemur/roles/schemas.py index bbeb8ef7..319dec5d 100644 --- a/lemur/roles/schemas.py +++ b/lemur/roles/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.roles.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/roles/service.py b/lemur/roles/service.py index 352ebf1f..bbeef1ce 100644 --- a/lemur/roles/service.py +++ b/lemur/roles/service.py @@ -4,7 +4,7 @@ :synopsis: This module contains all of the services level functions used to administer roles in Lemur - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/roles/views.py b/lemur/roles/views.py index d8a328a8..a635fdba 100644 --- a/lemur/roles/views.py +++ b/lemur/roles/views.py @@ -1,7 +1,7 @@ """ .. module: lemur.roles.views :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/schemas.py b/lemur/schemas.py index 7f9e89cf..ffdfe66f 100644 --- a/lemur/schemas.py +++ b/lemur/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson @@ -21,7 +21,7 @@ from lemur.plugins.utils import get_plugin_option from lemur.roles.models import Role from lemur.users.models import User from lemur.authorities.models import Authority -from lemur.dns_providers.models import DnsProviders +from lemur.dns_providers.models import DnsProvider from lemur.policies.models import RotationPolicy from lemur.certificates.models import Certificate from lemur.destinations.models import Destination @@ -112,7 +112,7 @@ class AssociatedDnsProviderSchema(LemurInputSchema): @post_load def get_object(self, data, many=False): - return fetch_objects(DnsProviders, data, many=many) + return fetch_objects(DnsProvider, data, many=many) class AssociatedRoleSchema(LemurInputSchema): diff --git a/lemur/sources/cli.py b/lemur/sources/cli.py index 31bdd161..1f2fd9b0 100644 --- a/lemur/sources/cli.py +++ b/lemur/sources/cli.py @@ -1,7 +1,7 @@ """ .. module: lemur.sources.cli :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/sources/models.py b/lemur/sources/models.py index fcf91e48..8cb08eb4 100644 --- a/lemur/sources/models.py +++ b/lemur/sources/models.py @@ -1,7 +1,7 @@ """ .. module: lemur.sources.models :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/sources/schemas.py b/lemur/sources/schemas.py index f5bad719..028fdb32 100644 --- a/lemur/sources/schemas.py +++ b/lemur/sources/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.sources.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/sources/service.py b/lemur/sources/service.py index 9e6ce289..fbefbba1 100644 --- a/lemur/sources/service.py +++ b/lemur/sources/service.py @@ -1,7 +1,7 @@ """ .. module: lemur.sources.service :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/sources/views.py b/lemur/sources/views.py index 4ab9ae14..abf68109 100644 --- a/lemur/sources/views.py +++ b/lemur/sources/views.py @@ -2,7 +2,7 @@ .. module: lemur.sources.views :platform: Unix :synopsis: This module contains all of the accounts view code. - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/users/models.py b/lemur/users/models.py index 35197f9b..79125b9c 100644 --- a/lemur/users/models.py +++ b/lemur/users/models.py @@ -3,7 +3,7 @@ :platform: unix :synopsis: This module contains all of the models need to create a user within lemur - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson diff --git a/lemur/users/schemas.py b/lemur/users/schemas.py index 25a38fac..b5a21127 100644 --- a/lemur/users/schemas.py +++ b/lemur/users/schemas.py @@ -1,7 +1,7 @@ """ .. module: lemur.users.schemas :platform: unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/users/service.py b/lemur/users/service.py index 1b191d7e..c6557cb9 100644 --- a/lemur/users/service.py +++ b/lemur/users/service.py @@ -3,7 +3,7 @@ :platform: Unix :synopsis: This module contains all of the services level functions used to administer users in Lemur - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/users/views.py b/lemur/users/views.py index 05817c94..eb67f014 100644 --- a/lemur/users/views.py +++ b/lemur/users/views.py @@ -1,7 +1,7 @@ """ .. module: lemur.users.views :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/lemur/utils.py b/lemur/utils.py index 090ba992..6c82657c 100644 --- a/lemur/utils.py +++ b/lemur/utils.py @@ -1,7 +1,7 @@ """ .. module: lemur.utils :platform: Unix - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more :license: Apache, see LICENSE for more details. .. moduleauthor:: Kevin Glisson """ diff --git a/requirements-dev.txt b/requirements-dev.txt index 2d4c90a7..0097f932 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -16,13 +16,14 @@ invoke==1.0.0 mccabe==0.6.1 # via flake8 nodeenv==1.3.0 pkginfo==1.4.2 # via twine -pre-commit==1.9.0 +pre-commit==1.10.1 pycodestyle==2.3.1 # via flake8 pyflakes==1.6.0 # via flake8 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 +toml==0.9.4 # via pre-commit tqdm==4.23.4 # via twine twine==1.11.0 urllib3==1.22 # via requests diff --git a/requirements-docs.txt b/requirements-docs.txt index d760758b..3c2690f9 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -12,11 +12,11 @@ aniso8601==3.0.0 arrow==0.12.1 asn1crypto==0.24.0 asyncpool==1.0 -babel==2.5.3 # via sphinx +babel==2.6.0 # via sphinx bcrypt==3.1.4 blinker==1.4 -boto3==1.7.21 -botocore==1.10.21 +boto3==1.7.27 +botocore==1.10.27 certifi==2018.4.16 cffi==1.11.5 click==6.7 @@ -49,7 +49,7 @@ lockfile==0.12.2 mako==1.0.7 markupsafe==1.0 marshmallow-sqlalchemy==0.13.2 -marshmallow==2.15.2 +marshmallow==2.15.3 mock==2.0.0 ndg-httpsclient==0.5.0 packaging==17.1 # via sphinx @@ -58,10 +58,10 @@ pbr==4.0.3 pem==17.1.0 psycopg2==2.7.4 pyasn1-modules==0.2.1 -pyasn1==0.4.2 +pyasn1==0.4.3 pycparser==2.18 pygments==2.2.0 # via sphinx -pyjwt==1.6.1 +pyjwt==1.6.4 pynacl==1.2.1 pyopenssl==17.2.0 pyparsing==2.2.0 # via packaging @@ -77,7 +77,7 @@ s3transfer==0.1.13 six==1.11.0 snowballstemmer==1.2.1 # via sphinx sphinx-rtd-theme==0.3.1 -sphinx==1.7.4 +sphinx==1.7.5 sphinxcontrib-httpdomain==1.6.1 sphinxcontrib-websupport==1.0.1 # via sphinx sqlalchemy-utils==0.33.3 diff --git a/requirements-tests.txt b/requirements-tests.txt index 301eca5b..0600a04e 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -8,9 +8,9 @@ asn1crypto==0.24.0 # via cryptography atomicwrites==1.1.5 # via pytest attrs==18.1.0 # via pytest aws-xray-sdk==0.95 # via moto -boto3==1.7.27 # via moto +boto3==1.7.28 # via moto boto==2.48.0 # via moto -botocore==1.10.27 # via boto3, moto, s3transfer +botocore==1.10.28 # via boto3, moto, s3transfer certifi==2018.4.16 # via requests cffi==1.11.5 # via cryptography chardet==3.0.4 # via requests @@ -55,7 +55,7 @@ s3transfer==0.1.13 # via boto3 six==1.11.0 # via cryptography, docker, docker-pycreds, faker, freezegun, mock, more-itertools, moto, pytest, python-dateutil, requests-mock, responses, websocket-client text-unidecode==1.2 # via faker urllib3==1.22 # via requests -websocket-client==0.47.0 # via docker +websocket-client==0.48.0 # via docker werkzeug==0.14.1 # via flask, moto, pytest-flask wrapt==1.10.11 # via aws-xray-sdk xmltodict==0.11.0 # via moto diff --git a/requirements.txt b/requirements.txt index ef14a227..fed53454 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,8 +13,8 @@ asn1crypto==0.24.0 # via cryptography asyncpool==1.0 bcrypt==3.1.4 # via flask-bcrypt, paramiko blinker==1.4 # via flask-mail, flask-principal, raven -boto3==1.7.27 -botocore==1.10.27 # via boto3, s3transfer +boto3==1.7.28 +botocore==1.10.28 # via boto3, s3transfer certifi==2018.4.16 cffi==1.11.5 # via bcrypt, cryptography, pynacl click==6.7 # via flask @@ -45,7 +45,7 @@ jsonlines==1.2.0 # via cloudflare lockfile==0.12.2 mako==1.0.7 # via alembic markupsafe==1.0 # via jinja2, mako -marshmallow-sqlalchemy==0.13.2 +marshmallow-sqlalchemy==0.14.0 marshmallow==2.15.3 mock==2.0.0 # via acme ndg-httpsclient==0.5.0 @@ -71,7 +71,7 @@ retrying==1.3.3 s3transfer==0.1.13 # via boto3 six==1.11.0 sqlalchemy-utils==0.33.3 -sqlalchemy==1.2.7 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils +sqlalchemy==1.2.8 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils tabulate==0.8.2 tld==0.7.10 werkzeug==0.14.1 # via flask diff --git a/setup.py b/setup.py index 3cb731d2..1511b013 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ Lemur Is a TLS management and orchestration tool. -:copyright: (c) 2015 by Netflix, see AUTHORS for more +:copyright: (c) 2018 by Netflix, see AUTHORS for more :license: Apache, see LICENSE for more details. """ from __future__ import absolute_import