Commit Graph

1925 Commits

Author SHA1 Message Date
Hossein Shafagh 45da5847f7 Merge branch 'master' of github.com:Netflix/lemur into update-travis-sudo
# Conflicts:
#	.travis.yml
2019-04-24 17:51:07 -07:00
Hossein Shafagh 55f35b0f35 removing sudo, since deprecated in Travis
https://github.com/Netflix/lemur/issues/2758
2019-04-24 17:48:18 -07:00
Curtis e313b74813
Merge pull request #2763 from castrapel/metrics_errors_acme
Better exception handling, logging, and metrics for ACME flow
2019-04-24 15:33:11 -07:00
Curtis Castrapel 272285f64a Better exception handling, logging, and metrics for ACME flow 2019-04-24 15:26:23 -07:00
Curtis ccd0bde0bc
Merge pull request #2757 from jplana/add-pending-certificate-upload
Allow uploading a signed cert for a pending certificate.
2019-04-24 09:53:50 -07:00
Curtis 0f9b0f39f7
Merge branch 'master' into add-pending-certificate-upload 2019-04-24 09:34:35 -07:00
Hossein Shafagh 21d619e24a
Merge pull request #2759 from alwaysjolley/lemur_vault_plugin
Adding SAN filter to Vault Destination Plugin
2019-04-24 09:30:35 -07:00
Hossein Shafagh 6804bfb233
Merge branch 'master' into lemur_vault_plugin 2019-04-24 08:53:10 -07:00
Hossein Shafagh 4338b4346e
Merge branch 'master' into add-pending-certificate-upload 2019-04-24 08:52:58 -07:00
Curtis 07e8e6a628
Merge pull request #2762 from castrapel/pyjks
Use official pyjks version
2019-04-23 08:06:33 -07:00
Curtis Castrapel b6e09621f8 Use official pyjks version 2019-04-23 08:05:32 -07:00
alwaysjolley a801112cf6
Merge branch 'master' into lemur_vault_plugin 2019-04-23 07:07:39 -04:00
alwaysjolley 85efb6a99e cleanup tmp files 2019-04-23 07:06:52 -04:00
Curtis ec7da60d04
Merge pull request #2761 from castrapel/pyjks_pycryptodomex
Pinning pyjks to specific commit with pycryptodomex
2019-04-22 22:00:22 -07:00
Curtis Castrapel 83784d7cb8 Pinning pyjks to specific commit with pycryptodomex instead of pycryptodome 2019-04-22 21:50:48 -07:00
Hossein Shafagh 9b38761153
Merge branch 'master' into add-pending-certificate-upload 2019-04-22 11:47:02 -07:00
Hossein Shafagh f1a3fdf7b9
Merge pull request #2751 from intgr/rewrite-java-keystore-use-pyjks
Rewrite Java Keystore/Truststore support based on pyjks library
2019-04-22 11:46:26 -07:00
Hossein Shafagh 94f3265104
Merge branch 'master' into rewrite-java-keystore-use-pyjks 2019-04-22 09:55:58 -07:00
Hossein Shafagh 0bd2c76ed3
Merge pull request #2760 from hosseinsh/re-update-190422
updating requirements, addressing the urllib3 high severity warning
2019-04-22 09:55:47 -07:00
Hossein Shafagh d1e5a40d20 updating requirements, addressing the urllib3 high severity warning 2019-04-22 09:49:03 -07:00
alwaysjolley f9dadb2670 fixing validation 2019-04-22 09:38:44 -04:00
alwaysjolley 8dccaaf544 simpler validation 2019-04-22 07:58:01 -04:00
alwaysjolley 1667c05742 removed unused functions 2019-04-18 13:57:10 -04:00
alwaysjolley b39e2e3f66 Merge branch 'master' into lemur_vault_plugin 2019-04-18 13:55:45 -04:00
alwaysjolley fb3b0e8cd7 adding regex filtering 2019-04-18 13:52:40 -04:00
Jose Plana 7dd9268ca7 Allow uploading a signed cert for a pending certificate. 2019-04-18 00:46:39 +02:00
Curtis 8177e12f3f
Merge branch 'master' into rewrite-java-keystore-use-pyjks 2019-04-17 10:43:44 -07:00
Curtis 4c7bf917f2
Merge pull request #2747 from jramosf/master
Parse SubjectAlternativeNames from CSR into Lemur Certificate
2019-04-17 10:43:21 -07:00
Hossein Shafagh 52f939658f
Merge branch 'master' into rewrite-java-keystore-use-pyjks 2019-04-17 10:31:58 -07:00
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