Commit Graph

2196 Commits

Author SHA1 Message Date
Curtis f6afcc6d21
Merge branch 'master' into master 2019-04-17 10:28:46 -07:00
Curtis 2f7342951d
Merge pull request #2534 from jplana/upload_certificates_with_csr
Allow uploading csr along with certificates
2019-04-17 10:28:31 -07:00
Curtis f76e913689
Merge branch 'master' into upload_certificates_with_csr 2019-04-17 10:20:05 -07:00
Curtis 135d86c583
Merge branch 'master' into master 2019-04-17 10:19:56 -07:00
Curtis c45c2344bc
Merge pull request #2756 from castrapel/makefile-checkout-pr
Make command to checkout PR from upstream
2019-04-17 10:19:24 -07:00
Curtis Castrapel eb16afb6e6 Make command to checkout PR from upstream 2019-04-17 10:18:49 -07:00
Javier Ramos 58dd424de8
Prevent potential NoneType not subscriptable
Fix when data['extensions']['subAltNames']['names'] is none
2019-04-17 18:33:52 +02:00
Curtis 900ae10764
Merge branch 'master' into master 2019-04-17 09:06:24 -07:00
Hossein Shafagh 57874971aa
Merge branch 'master' into upload_certificates_with_csr 2019-04-16 15:05:11 -07:00
Curtis e45d005b74
Merge branch 'master' into rewrite-java-keystore-use-pyjks 2019-04-16 14:57:16 -07:00
Hossein Shafagh 0c078fea57
Merge pull request #2755 from hosseinsh/re-update-190416
updating requirements
2019-04-16 14:55:09 -07:00
Hossein Shafagh 8e1f00f17c
Merge branch 'master' into master 2019-04-16 08:56:31 -07:00
Hossein Shafagh e24026f3db
Merge branch 'master' into rewrite-java-keystore-use-pyjks 2019-04-16 08:51:32 -07:00
Hossein Shafagh 5dd2e05972 updating requirements 2019-04-16 08:50:46 -07:00
Jose Plana 771f2ebc47 Use SAN_CERT_CSR 2019-04-13 11:01:36 +02:00
Jose Plana 770729a72e Allow csr to be empty during upload 2019-04-13 01:17:12 +02:00
Hossein Shafagh 2ff811ae71 updating cryptography API call, to create right signing algorithm object. 2019-04-13 00:57:48 +02:00
Hossein Shafagh 09796cf7c9 the check_cert_signature() method was attempting to compare RSA and ECC signatures.
If a ec public-key certificate is signed with an RSA key, then it can't be a self-signed certificate, in which case we just raise InvalidSignature.
2019-04-13 00:57:48 +02:00
Jose Plana 406753fcde Fix PEP8 2019-04-13 00:49:35 +02:00
Jose Plana a5570d07bc Added some documentation for API users. 2019-04-13 00:48:19 +02:00
Jose Plana c1b02cc8a5 Allow uploading csr along with certificates 2019-04-13 00:48:19 +02:00
Hossein Shafagh cf5b0145bd
Merge pull request #2754 from hosseinsh/re-update-190412
Updating requirements
2019-04-12 15:09:44 -07:00
Hossein Shafagh 9bdf48c1b9 updating requirements 2019-04-12 14:29:08 -07:00
Hossein Shafagh ad244fc83d Merge branch 'master' of github.com:Netflix/lemur into re-update-190412 2019-04-12 14:26:35 -07:00
Hossein Shafagh da51e7f31d removing the announcement 2019-04-12 14:24:29 -07:00
Hossein Shafagh f8a9ec6e3e simple hardcoded announcement 2019-04-12 14:24:29 -07:00
Hossein Shafagh df8d4e0892
Merge branch 'master' into rewrite-java-keystore-use-pyjks 2019-04-12 09:38:50 -07:00
Hossein Shafagh ceb335f3ab
Merge branch 'master' into master 2019-04-12 09:38:41 -07:00
Hossein Shafagh 26e3982cb4
Merge pull request #2469 from hosseinsh/hshafagh-src-dst-register
Source and Destination registration
2019-04-12 09:25:25 -07:00
alwaysjolley 9ecc19c481 adding san filter 2019-04-12 09:53:06 -04:00
Hossein Shafagh 6d67ec7e34 removing unused import 2019-04-11 17:34:02 -07:00
Hossein Shafagh 512e1a0bdd fixing typos 2019-04-11 17:17:28 -07:00
Hossein Shafagh 6ec84a398c checking for None 2019-04-11 17:13:47 -07:00
Hossein Shafagh 69c00c4db5 upon creating a new destination, we also add it as source, if the plugin defines this as an option 2019-04-11 17:13:47 -07:00
Hossein Shafagh d7abf2ec18 adding a new util method for setting options 2019-04-11 17:13:47 -07:00
Hossein Shafagh 557fac39b5 refactoring the sync job into a service method that we can also call when adding a new destination 2019-04-11 17:13:47 -07:00
Hossein Shafagh d1ead4b79c removing the announcement 2019-04-11 17:13:47 -07:00
Hossein Shafagh 5900828051 simple hardcoded announcement 2019-04-11 17:13:47 -07:00
Hossein Shafagh 818da6653d removing the announcement 2019-04-11 17:13:47 -07:00
Hossein Shafagh e1a67e9b4e simple hardcoded announcement 2019-04-11 17:13:47 -07:00
Hossein Shafagh 84dfdd0600 removing the announcement 2019-04-11 17:13:47 -07:00
Hossein Shafagh ba691a26d4 simple hardcoded announcement 2019-04-11 17:13:47 -07:00
Hossein Shafagh b66fac0494 removing the announcement 2019-04-11 17:13:47 -07:00
Hossein Shafagh 1bda246df2 simple hardcoded announcement 2019-04-11 17:13:47 -07:00
Hossein Shafagh 9a210c055a
Merge branch 'master' into hshafagh-src-dst-register 2019-04-11 15:36:48 -07:00
Hossein Shafagh 81e2ff99ff
Merge pull request #2468 from hosseinsh/hosseinsh-celeryjob-sync-src-dst
Celery job for synching destinations and sources
2019-04-11 15:17:16 -07:00
Hossein Shafagh 2459234147 removing lines 2019-04-11 14:34:26 -07:00
Hossein Shafagh 60edab9f6d cleaning up 2019-04-11 14:12:31 -07:00
Hossein Shafagh ec3d2d7316 fixing typo 2019-04-11 13:51:43 -07:00
Hossein Shafagh 83d408b238
Merge branch 'master' into hosseinsh-celeryjob-sync-src-dst 2019-04-11 13:30:12 -07:00