From 03e2991ced00a3dfdf0d39f1b94f3abee7e7efef Mon Sep 17 00:00:00 2001 From: kevgliss Date: Sat, 29 Aug 2015 11:48:39 -0700 Subject: [PATCH 01/21] Closes #57 --- lemur/certificates/service.py | 4 ++++ lemur/certificates/views.py | 4 +++- .../app/angular/certificates/certificate/upload.tpl.html | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lemur/certificates/service.py b/lemur/certificates/service.py index 8a1e20fa..1eb82b7b 100644 --- a/lemur/certificates/service.py +++ b/lemur/certificates/service.py @@ -168,6 +168,10 @@ def upload(**kwargs): kwargs.get('intermediate_cert'), ) + # we override the generated name if one is provided + if kwargs.get('name'): + cert.name = kwargs['name'] + cert.description = kwargs.get('description') cert.owner = kwargs['owner'] diff --git a/lemur/certificates/views.py b/lemur/certificates/views.py index b6cb597d..4643dedc 100644 --- a/lemur/certificates/views.py +++ b/lemur/certificates/views.py @@ -332,7 +332,8 @@ class CertificatesUpload(AuthenticatedResource): "intermediateCert": "---Begin Public...", "privateKey": "---Begin Private..." "destinations": [], - "notifications": [] + "notifications": [], + "name": "cert1" } **Example response**: @@ -373,6 +374,7 @@ class CertificatesUpload(AuthenticatedResource): """ self.reqparse.add_argument('description', type=str, location='json') self.reqparse.add_argument('owner', type=str, required=True, location='json') + self.reqparse.add_argument('name', type=str, location='json') self.reqparse.add_argument('publicCert', type=pem_str, required=True, dest='public_cert', location='json') self.reqparse.add_argument('destinations', type=list, default=[], dest='destinations', location='json') self.reqparse.add_argument('notifications', type=list, default=[], dest='notifications', location='json') diff --git a/lemur/static/app/angular/certificates/certificate/upload.tpl.html b/lemur/static/app/angular/certificates/certificate/upload.tpl.html index 6ba63232..928e923e 100644 --- a/lemur/static/app/angular/certificates/certificate/upload.tpl.html +++ b/lemur/static/app/angular/certificates/certificate/upload.tpl.html @@ -18,6 +18,15 @@ email.

+
+ +
+ +
+
- -

You must give a short description about this authority will be used for, it should contain only alphanumeric characters

+ +

You must give a short description about this authority will be used for

- -

You must enter a common name

+ +

You must enter a common name and it must be less than 64 characters in length

- -

You must give a short description about this authority will be used for, this description should only include alphanumeric characters

+ +

You must give a short description about this authority will be used for.

- -

You must enter a common name

+ +

You must enter a common name and it must be less than 64 characters

diff --git a/lemur/static/app/angular/certificates/certificate/upload.tpl.html b/lemur/static/app/angular/certificates/certificate/upload.tpl.html index 928e923e..55dc850f 100644 --- a/lemur/static/app/angular/certificates/certificate/upload.tpl.html +++ b/lemur/static/app/angular/certificates/certificate/upload.tpl.html @@ -33,8 +33,8 @@ Description
- -

You must give a short description about this authority will be used for, this description should only include alphanumeric characters

+ +

You must give a short description about this authority will be used for.

Date: Tue, 1 Sep 2015 14:05:32 -0700 Subject: [PATCH 06/21] Allows authorities to have editable owners and descriptions --- lemur/authorities/service.py | 5 +++- lemur/authorities/views.py | 25 +++++++++++++------ .../{authorityEdit.tpl.html => edit.tpl.html} | 25 ++++++++++++++++++- .../app/angular/authorities/view/view.js | 21 +++++++++++++++- .../angular/authorities/view/view.tpl.html | 2 +- lemur/static/app/angular/roles/services.js | 2 -- 6 files changed, 67 insertions(+), 13 deletions(-) rename lemur/static/app/angular/authorities/authority/{authorityEdit.tpl.html => edit.tpl.html} (59%) diff --git a/lemur/authorities/service.py b/lemur/authorities/service.py index 23961ede..5a1f4341 100644 --- a/lemur/authorities/service.py +++ b/lemur/authorities/service.py @@ -22,7 +22,7 @@ from lemur.certificates.models import Certificate from lemur.plugins.base import plugins -def update(authority_id, active=None, roles=None): +def update(authority_id, description=None, owner=None, active=None, roles=None): """ Update a an authority with new values. @@ -37,6 +37,9 @@ def update(authority_id, active=None, roles=None): if active: authority.active = active + + authority.description = description + authority.owner = owner return database.update(authority) diff --git a/lemur/authorities/views.py b/lemur/authorities/views.py index f449a837..43a65fe5 100644 --- a/lemur/authorities/views.py +++ b/lemur/authorities/views.py @@ -20,6 +20,7 @@ from lemur.common.utils import paginated_parser, marshal_items FIELDS = { 'name': fields.String, + 'owner': fields.String, 'description': fields.String, 'options': fields.Raw, 'pluginName': fields.String, @@ -264,7 +265,9 @@ class Authorities(AuthenticatedResource): { "roles": [], - "active": false + "active": false, + "owner": "bob@example.com", + "description": "this is authority1" } **Example response**: @@ -279,12 +282,12 @@ class Authorities(AuthenticatedResource): "id": 1, "name": "authority1", "description": "this is authority1", - "pluginname": null, + "pluginName": null, "chain": "-----begin ...", "body": "-----begin ...", "active": false, - "notbefore": "2015-06-05t17:09:39", - "notafter": "2015-06-10t17:09:39" + "notBefore": "2015-06-05t17:09:39", + "notAfter": "2015-06-10t17:09:39" "options": null } @@ -292,8 +295,10 @@ class Authorities(AuthenticatedResource): :statuscode 200: no error :statuscode 403: unauthenticated """ - self.reqparse.add_argument('roles', type=list, location='json') - self.reqparse.add_argument('active', type=str, location='json') + self.reqparse.add_argument('roles', type=list, default=[], location='json') + self.reqparse.add_argument('active', type=str, location='json', required=True) + self.reqparse.add_argument('owner', type=str, location='json', required=True) + self.reqparse.add_argument('description', type=str, location='json', required=True) args = self.reqparse.parse_args() authority = service.get(authority_id) @@ -315,7 +320,13 @@ class Authorities(AuthenticatedResource): return dict(message="You are not allowed to associate a role which you are not a member of"), 400 if permission.can(): - return service.update(authority_id, active=args['active'], roles=args['roles']) + return service.update( + authority_id, + owner=args['owner'], + description=args['description'], + active=args['active'], + roles=args['roles'] + ) return dict(message="You are not authorized to update this authority"), 403 diff --git a/lemur/static/app/angular/authorities/authority/authorityEdit.tpl.html b/lemur/static/app/angular/authorities/authority/edit.tpl.html similarity index 59% rename from lemur/static/app/angular/authorities/authority/authorityEdit.tpl.html rename to lemur/static/app/angular/authorities/authority/edit.tpl.html index f100ba1b..fe3d3eac 100644 --- a/lemur/static/app/angular/authorities/authority/authorityEdit.tpl.html +++ b/lemur/static/app/angular/authorities/authority/edit.tpl.html @@ -1,9 +1,32 @@
-
Edit Authority chain of command!
+

Edit {{ authority.name }}

+
+ +
+ + +

Enter a valid + email.

+
+
+
+ +
+ +

You must give a short description about this authority will be used for, this description should only include alphanumeric characters

+
+

- Lemur, Netflix's SSL management portal has noticed that the following certificates are expiring soon, if you rely on these certificates + Lemur, has noticed that the following certificates are expiring soon, if you rely on these certificates you should create new certificates to replace the certificates that are expiring.

diff --git a/lemur/static/app/angular/authorities/authority/edit.tpl.html b/lemur/static/app/angular/authorities/authority/edit.tpl.html index fe3d3eac..a11e9177 100644 --- a/lemur/static/app/angular/authorities/authority/edit.tpl.html +++ b/lemur/static/app/angular/authorities/authority/edit.tpl.html @@ -10,7 +10,7 @@ Owner

-

Enter a valid diff --git a/lemur/static/app/angular/authorities/authority/tracking.tpl.html b/lemur/static/app/angular/authorities/authority/tracking.tpl.html index a2d0def6..b019bcf9 100644 --- a/lemur/static/app/angular/authorities/authority/tracking.tpl.html +++ b/lemur/static/app/angular/authorities/authority/tracking.tpl.html @@ -16,7 +16,7 @@ Owner

- +

You must enter an Certificate Authority owner

diff --git a/lemur/static/app/angular/certificates/certificate/upload.tpl.html b/lemur/static/app/angular/certificates/certificate/upload.tpl.html index 55dc850f..f97d8d67 100644 --- a/lemur/static/app/angular/certificates/certificate/upload.tpl.html +++ b/lemur/static/app/angular/certificates/certificate/upload.tpl.html @@ -11,7 +11,7 @@
-

Enter a valid @@ -24,7 +24,7 @@ Custom Name

- +

SSL In The Cloud Encrypt it all

- -

The Security Operations team manages all of the SSL certificate generation at Netflix. This - portal was created to serve as both a self service application so that application owners can provision - their own certificates and to help enforce some key naming and security conventions, in order provide - Netflix with scalable and manageable SSL security.

- -

See go/ssl for more info.

diff --git a/lemur/status/views.py b/lemur/status/views.py index 65d3af7a..fddfdb69 100644 --- a/lemur/status/views.py +++ b/lemur/status/views.py @@ -5,7 +5,7 @@ """ import os -from flask import app, Blueprint, jsonify +from flask import app, current_app, Blueprint, jsonify from flask.ext.restful import Api from lemur.auth.service import AuthenticatedResource @@ -25,7 +25,9 @@ class Status(AuthenticatedResource): return jsonify({ 'environment': app.config.get('ENVIRONMENT'), 'status': 'degraded', - 'message': "This Lemur instance is in a degraded state and is unable to issue certificates, please alert secops@netflix.com"}) + 'message': "This Lemur instance is in a degraded state and is unable to issue certificates, please alert {0}".format( + current_app.config.get('LEMUR_SECURITY_TEAM_EMAIL') + )}) else: return jsonify({ 'environment': app.config.get('ENVIRONMENT'), From aaae4d5a1f8c4591ff74b11e0f93faed34376696 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Fri, 4 Sep 2015 15:52:56 -0700 Subject: [PATCH 15/21] unifying lemur defaults --- lemur/__init__.py | 4 +- lemur/certificates/views.py | 51 +-------------- lemur/{status => defaults}/__init__.py | 0 lemur/defaults/views.py | 63 +++++++++++++++++++ lemur/static/app/angular/app.js | 9 +++ .../authorities/authority/authority.js | 3 + .../app/angular/authorities/services.js | 12 +++- .../app/angular/certificates/services.js | 4 +- lemur/status/views.py | 35 ----------- 9 files changed, 91 insertions(+), 90 deletions(-) rename lemur/{status => defaults}/__init__.py (100%) create mode 100644 lemur/defaults/views.py delete mode 100644 lemur/status/views.py diff --git a/lemur/__init__.py b/lemur/__init__.py index 24cb6ef1..79b45241 100644 --- a/lemur/__init__.py +++ b/lemur/__init__.py @@ -17,7 +17,7 @@ from lemur.domains.views import mod as domains_bp from lemur.destinations.views import mod as destinations_bp from lemur.authorities.views import mod as authorities_bp from lemur.certificates.views import mod as certificates_bp -from lemur.status.views import mod as status_bp +from lemur.defaults.views import mod as defaults_bp from lemur.plugins.views import mod as plugins_bp from lemur.notifications.views import mod as notifications_bp from lemur.sources.views import mod as sources_bp @@ -31,7 +31,7 @@ LEMUR_BLUEPRINTS = ( destinations_bp, authorities_bp, certificates_bp, - status_bp, + defaults_bp, plugins_bp, notifications_bp, sources_bp diff --git a/lemur/certificates/views.py b/lemur/certificates/views.py index 834fdff7..112c86ad 100644 --- a/lemur/certificates/views.py +++ b/lemur/certificates/views.py @@ -7,7 +7,7 @@ """ from builtins import str -from flask import Blueprint, current_app, make_response, jsonify +from flask import Blueprint, make_response, jsonify from flask.ext.restful import reqparse, Api, fields from cryptography import x509 @@ -668,58 +668,9 @@ class NotificationCertificatesList(AuthenticatedResource): return service.render(args) -class CertificatesDefaults(AuthenticatedResource): - """ Defineds the 'certificates' defaults endpoint """ - def __init__(self): - super(CertificatesDefaults) - - def get(self): - """ - .. http:get:: /certificates/defaults - - Returns defaults needed to generate CSRs - - **Example request**: - - .. sourcecode:: http - - GET /certificates/defaults HTTP/1.1 - Host: example.com - Accept: application/json, text/javascript - - **Example response**: - - .. sourcecode:: http - - HTTP/1.1 200 OK - Vary: Accept - Content-Type: text/javascript - - { - "country": "US", - "state": "CA", - "location": "Los Gatos", - "organization": "Netflix", - "organizationalUnit": "Operations" - } - - :reqheader Authorization: OAuth token to authenticate - :statuscode 200: no error - :statuscode 403: unauthenticated - """ - return dict( - country=current_app.config.get('LEMUR_DEFAULT_COUNTRY'), - state=current_app.config.get('LEMUR_DEFAULT_STATE'), - location=current_app.config.get('LEMUR_DEFAULT_LOCATION'), - organization=current_app.config.get('LEMUR_DEFAULT_ORGANIZATION'), - organizationalUnit=current_app.config.get('LEMUR_DEFAULT_ORGANIZATIONAL_UNIT') - ) - - api.add_resource(CertificatesList, '/certificates', endpoint='certificates') api.add_resource(Certificates, '/certificates/', endpoint='certificate') api.add_resource(CertificatesStats, '/certificates/stats', endpoint='certificateStats') api.add_resource(CertificatesUpload, '/certificates/upload', endpoint='certificateUpload') api.add_resource(CertificatePrivateKey, '/certificates//key', endpoint='privateKeyCertificates') api.add_resource(NotificationCertificatesList, '/notifications//certificates', endpoint='notificationCertificates') -api.add_resource(CertificatesDefaults, '/certificates/defaults', endpoint='certificatesDefault') diff --git a/lemur/status/__init__.py b/lemur/defaults/__init__.py similarity index 100% rename from lemur/status/__init__.py rename to lemur/defaults/__init__.py diff --git a/lemur/defaults/views.py b/lemur/defaults/views.py new file mode 100644 index 00000000..d053aef7 --- /dev/null +++ b/lemur/defaults/views.py @@ -0,0 +1,63 @@ +""" +.. module: lemur.status.views + :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more + :license: Apache, see LICENSE for more details. +""" +from flask import current_app, Blueprint +from flask.ext.restful import Api + +from lemur.auth.service import AuthenticatedResource + + +mod = Blueprint('default', __name__) +api = Api(mod) + + +class LemurDefaults(AuthenticatedResource): + """ Defines the 'defaults' endpoint """ + def __init__(self): + super(LemurDefaults) + + def get(self): + """ + .. http:get:: /defaults + + Returns defaults needed to generate CSRs + + **Example request**: + + .. sourcecode:: http + + GET /defaults HTTP/1.1 + Host: example.com + Accept: application/json, text/javascript + + **Example response**: + + .. sourcecode:: http + + HTTP/1.1 200 OK + Vary: Accept + Content-Type: text/javascript + + { + "country": "US", + "state": "CA", + "location": "Los Gatos", + "organization": "Netflix", + "organizationalUnit": "Operations" + } + + :reqheader Authorization: OAuth token to authenticate + :statuscode 200: no error + :statuscode 403: unauthenticated + """ + return dict( + country=current_app.config.get('LEMUR_DEFAULT_COUNTRY'), + state=current_app.config.get('LEMUR_DEFAULT_STATE'), + location=current_app.config.get('LEMUR_DEFAULT_LOCATION'), + organization=current_app.config.get('LEMUR_DEFAULT_ORGANIZATION'), + organizationalUnit=current_app.config.get('LEMUR_DEFAULT_ORGANIZATIONAL_UNIT') + ) + +api.add_resource(LemurDefaults, '/defaults', endpoint='default') diff --git a/lemur/static/app/angular/app.js b/lemur/static/app/angular/app.js index fd620ffe..da9ce330 100644 --- a/lemur/static/app/angular/app.js +++ b/lemur/static/app/angular/app.js @@ -60,6 +60,15 @@ lemur.controller('datePickerController', function ($scope, $timeout){ }; }); +lemur.service('DefaultService', function (LemurRestangular) { + var DefaultService = this; + DefaultService.get = function () { + return LemurRestangular.all('defaults').customGET().then(function (defaults) { + return defaults; + }); + }; +}); + lemur.factory('LemurRestangular', function (Restangular, $location, $auth) { return Restangular.withConfig(function (RestangularConfigurer) { RestangularConfigurer.setBaseUrl('http://localhost:5000/api/1'); diff --git a/lemur/static/app/angular/authorities/authority/authority.js b/lemur/static/app/angular/authorities/authority/authority.js index 0fcd54b3..be8c4066 100644 --- a/lemur/static/app/angular/authorities/authority/authority.js +++ b/lemur/static/app/angular/authorities/authority/authority.js @@ -30,6 +30,9 @@ angular.module('lemur') .controller('AuthorityCreateController', function ($scope, $modalInstance, AuthorityService, LemurRestangular, RoleService, PluginService, WizardHandler) { $scope.authority = LemurRestangular.restangularizeElement(null, {}, 'authorities'); + // set the defaults + AuthorityService.getDefaults($scope.authority); + $scope.loading = false; $scope.create = function (authority) { WizardHandler.wizard().context.loading = true; diff --git a/lemur/static/app/angular/authorities/services.js b/lemur/static/app/angular/authorities/services.js index eefdbc8c..235b7ee7 100644 --- a/lemur/static/app/angular/authorities/services.js +++ b/lemur/static/app/angular/authorities/services.js @@ -56,7 +56,7 @@ angular.module('lemur') }); return LemurRestangular.all('authorities'); }) - .service('AuthorityService', function ($location, AuthorityApi, toaster) { + .service('AuthorityService', function ($location, AuthorityApi, DefaultService, toaster) { var AuthorityService = this; AuthorityService.findAuthorityByName = function (filterValue) { return AuthorityApi.getList({'filter[name]': filterValue}) @@ -117,6 +117,16 @@ angular.module('lemur') }); }; + AuthorityService.getDefaults = function (authority) { + return DefaultService.get().then(function (defaults) { + authority.caDN.country = defaults.country; + authority.caDN.state = defaults.state; + authority.caDN.location = defaults.location; + authority.caDN.organization = defaults.organization; + authority.caDN.organizationalUnit = defaults.organizationalUnit; + }); + }; + AuthorityService.getRoles = function (authority) { return authority.getList('roles').then(function (roles) { authority.roles = roles; diff --git a/lemur/static/app/angular/certificates/services.js b/lemur/static/app/angular/certificates/services.js index b421537c..fff61221 100644 --- a/lemur/static/app/angular/certificates/services.js +++ b/lemur/static/app/angular/certificates/services.js @@ -89,7 +89,7 @@ angular.module('lemur') }); return LemurRestangular.all('certificates'); }) - .service('CertificateService', function ($location, CertificateApi, LemurRestangular, toaster) { + .service('CertificateService', function ($location, CertificateApi, LemurRestangular, DefaultService, toaster) { var CertificateService = this; CertificateService.findCertificatesByName = function (filterValue) { return CertificateApi.getList({'filter[name]': filterValue}) @@ -207,7 +207,7 @@ angular.module('lemur') }; CertificateService.getDefaults = function (certificate) { - return certificate.customGET('defaults').then(function (defaults) { + return DefaultService.get().then(function (defaults) { certificate.country = defaults.country; certificate.state = defaults.state; certificate.location = defaults.location; diff --git a/lemur/status/views.py b/lemur/status/views.py deleted file mode 100644 index fddfdb69..00000000 --- a/lemur/status/views.py +++ /dev/null @@ -1,35 +0,0 @@ -""" -.. module: lemur.status.views - :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more - :license: Apache, see LICENSE for more details. -""" -import os - -from flask import app, current_app, Blueprint, jsonify -from flask.ext.restful import Api - -from lemur.auth.service import AuthenticatedResource - - -mod = Blueprint('status', __name__) -api = Api(mod) - - -class Status(AuthenticatedResource): - """ Defines the 'accounts' endpoint """ - def __init__(self): - super(Status, self).__init__() - - def get(self): - if not os.path.isdir(os.path.join(app.config.get("KEY_PATH"), "decrypted")): - return jsonify({ - 'environment': app.config.get('ENVIRONMENT'), - 'status': 'degraded', - 'message': "This Lemur instance is in a degraded state and is unable to issue certificates, please alert {0}".format( - current_app.config.get('LEMUR_SECURITY_TEAM_EMAIL') - )}) - else: - return jsonify({ - 'environment': app.config.get('ENVIRONMENT'), - 'status': 'healthy', - 'message': "This Lemur instance is healthy"}) From 0afd4c94b45942ecbd92d5a2992ad45b459075aa Mon Sep 17 00:00:00 2001 From: kevgliss Date: Fri, 4 Sep 2015 15:54:02 -0700 Subject: [PATCH 16/21] removing more netflix --- .../app/angular/certificates/certificate/tracking.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemur/static/app/angular/certificates/certificate/tracking.tpl.html b/lemur/static/app/angular/certificates/certificate/tracking.tpl.html index 94fe81d9..11553ffe 100644 --- a/lemur/static/app/angular/certificates/certificate/tracking.tpl.html +++ b/lemur/static/app/angular/certificates/certificate/tracking.tpl.html @@ -6,7 +6,7 @@ Owner
- +

You must enter an Certificate owner

From 8ab9c06778408bf569a0e743bae8200893e695d2 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Fri, 4 Sep 2015 15:54:52 -0700 Subject: [PATCH 17/21] removing more netflix --- .../app/angular/certificates/certificate/destinations.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemur/static/app/angular/certificates/certificate/destinations.tpl.html b/lemur/static/app/angular/certificates/certificate/destinations.tpl.html index 9961a6f2..59cbe0b1 100644 --- a/lemur/static/app/angular/certificates/certificate/destinations.tpl.html +++ b/lemur/static/app/angular/certificates/certificate/destinations.tpl.html @@ -4,7 +4,7 @@
- Date: Mon, 7 Sep 2015 21:54:23 -0700 Subject: [PATCH 18/21] fixing setup.py --- setup.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 0e15ea76..fa1a844a 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ from distutils.core import Command from setuptools.command.develop import develop from setuptools.command.install import install from setuptools.command.sdist import sdist -from setuptools import setup +from setuptools import setup, find_packages from subprocess import check_output ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__))) @@ -110,11 +110,11 @@ class BuildStatic(Command): setup( name='lemur', - version='0.1', + version='0.1.3', author='Kevin Glisson', author_email='kglisson@netflix.com', long_description=open(os.path.join(ROOT, 'README.rst')).read(), - packages=['lemur'], + packages=find_packages(), include_package_data=True, zip_safe=False, install_requires=install_requires, @@ -127,7 +127,6 @@ setup( 'build_static': BuildStatic, 'sdist': SdistWithBuildStatic, 'install': SmartInstall - }, entry_points={ 'console_scripts': [ From 0383e2a1e104e8b7d6a8b2c803aab327fd45813f Mon Sep 17 00:00:00 2001 From: kevgliss Date: Mon, 7 Sep 2015 22:14:18 -0700 Subject: [PATCH 19/21] adding manifest --- MANIFEST.in | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..ec344cc4 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,4 @@ +include setup.py package.json bower.json gulpfile.js README.rst MANIFEST.in LICENSE AUTHORS +recursive-include lemur/plugins/lemur_email/templates * +recursive-include lemur/static * +global-exclude *~ From bf957d2509137011275cd5179787d68745b0d692 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Fri, 11 Sep 2015 08:19:35 -0700 Subject: [PATCH 20/21] moving to hotfix version of cryptography --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fa1a844a..a72ba7da 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ install_requires = [ 'six==1.9.0', 'gunicorn==19.3.0', 'pycrypto==2.6.1', - 'cryptography==1.0', + 'cryptography==1.0.1', 'pyopenssl==0.15.1', 'pyjwt==1.0.1', 'xmltodict==0.9.2', From 7f119e95e1998080dd97e42f46b36553bc41adf7 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Fri, 11 Sep 2015 08:27:34 -0700 Subject: [PATCH 21/21] making the verisign urls more generic --- lemur/plugins/lemur_verisign/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lemur/plugins/lemur_verisign/plugin.py b/lemur/plugins/lemur_verisign/plugin.py index 930b2574..6f4cd8b4 100644 --- a/lemur/plugins/lemur_verisign/plugin.py +++ b/lemur/plugins/lemur_verisign/plugin.py @@ -147,7 +147,7 @@ class VerisignIssuerPlugin(IssuerPlugin): :param issuer_options: :return: :raise Exception: """ - url = current_app.config.get("VERISIGN_URL") + '/enroll' + url = current_app.config.get("VERISIGN_URL") + '/rest/services/enroll' data = process_options(issuer_options) data['csr'] = csr @@ -177,6 +177,6 @@ class VerisignIssuerPlugin(IssuerPlugin): :return: """ - url = current_app.config.get("VERISIGN_URL") + '/getTokens' + url = current_app.config.get("VERISIGN_URL") + '/rest/services/getTokens' response = self.session.post(url, headers={'content-type': 'application/x-www-form-urlencoded'}) return handle_response(response.content)['Response']['Order']