diff --git a/lemur/authorities/schemas.py b/lemur/authorities/schemas.py
index f931b185..ef6263a8 100644
--- a/lemur/authorities/schemas.py
+++ b/lemur/authorities/schemas.py
@@ -23,6 +23,7 @@ from lemur.common.schema import LemurInputSchema, LemurOutputSchema
from lemur.common import validators, missing
from lemur.common.fields import ArrowDateTime
+from lemur.constants import CERTIFICATE_KEY_TYPES
class AuthorityInputSchema(LemurInputSchema):
@@ -56,11 +57,12 @@ class AuthorityInputSchema(LemurInputSchema):
type = fields.String(validate=validate.OneOf(["root", "subca"]), missing="root")
parent = fields.Nested(AssociatedAuthoritySchema)
signing_algorithm = fields.String(
- validate=validate.OneOf(["sha256WithRSA", "sha1WithRSA"]),
+ validate=validate.OneOf(["sha256WithRSA", "sha1WithRSA",
+ "sha256WithECDSA", "SHA384withECDSA", "SHA512withECDSA"]),
missing="sha256WithRSA",
)
key_type = fields.String(
- validate=validate.OneOf(["RSA2048", "RSA4096"]), missing="RSA2048"
+ validate=validate.OneOf(CERTIFICATE_KEY_TYPES), missing="RSA2048"
)
key_name = fields.String()
sensitivity = fields.String(
diff --git a/lemur/static/app/angular/authorities/authority/options.tpl.html b/lemur/static/app/angular/authorities/authority/options.tpl.html
index dbc4f40a..bf1ad70c 100644
--- a/lemur/static/app/angular/authorities/authority/options.tpl.html
+++ b/lemur/static/app/angular/authorities/authority/options.tpl.html
@@ -4,7 +4,7 @@
Signing Algorithm
-
+
diff --git a/lemur/tests/test_authorities.py b/lemur/tests/test_authorities.py
index 9649e949..fade39e8 100644
--- a/lemur/tests/test_authorities.py
+++ b/lemur/tests/test_authorities.py
@@ -34,6 +34,29 @@ def test_authority_input_schema(client, role, issuer_plugin, logged_in_user):
assert not errors
+def test_authority_input_schema_ecc(client, role, issuer_plugin, logged_in_user):
+ from lemur.authorities.schemas import AuthorityInputSchema
+
+ input_data = {
+ "name": "Example Authority",
+ "owner": "jim@example.com",
+ "description": "An example authority.",
+ "commonName": "An Example Authority",
+ "plugin": {
+ "slug": "test-issuer",
+ "plugin_options": [{"name": "test", "value": "blah"}],
+ },
+ "type": "root",
+ "signingAlgorithm": "sha256WithECDSA",
+ "keyType": "ECCPRIME256V1",
+ "sensitivity": "medium",
+ }
+
+ data, errors = AuthorityInputSchema().load(input_data)
+
+ assert not errors
+
+
def test_user_authority(session, client, authority, role, user, issuer_plugin):
u = user["user"]
u.roles.append(role)
diff --git a/requirements-dev.txt b/requirements-dev.txt
index a029d4ae..166722e8 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -11,7 +11,7 @@ cffi==1.14.0 # via cryptography
cfgv==3.1.0 # via pre-commit
chardet==3.0.4 # via requests
colorama==0.4.3 # via twine
-cryptography==3.0 # via secretstorage
+cryptography==3.1 # via secretstorage
distlib==0.3.0 # via virtualenv
docutils==0.16 # via readme-renderer
filelock==3.0.12 # via virtualenv
diff --git a/requirements-docs.txt b/requirements-docs.txt
index 0ee5d42e..37d50804 100644
--- a/requirements-docs.txt
+++ b/requirements-docs.txt
@@ -17,8 +17,8 @@ bcrypt==3.1.7 # via -r requirements.txt, flask-bcrypt, paramiko
beautifulsoup4==4.9.1 # via -r requirements.txt, cloudflare
billiard==3.6.3.0 # via -r requirements.txt, celery
blinker==1.4 # via -r requirements.txt, flask-mail, flask-principal, raven
-boto3==1.14.48 # via -r requirements.txt
-botocore==1.17.48 # via -r requirements.txt, boto3, s3transfer
+boto3==1.14.56 # via -r requirements.txt
+botocore==1.17.56 # via -r requirements.txt, boto3, s3transfer
celery[redis]==4.4.2 # via -r requirements.txt
certifi==2020.6.20 # via -r requirements.txt, requests
certsrv==2.1.1 # via -r requirements.txt
@@ -26,13 +26,13 @@ cffi==1.14.0 # via -r requirements.txt, bcrypt, cryptography, pynac
chardet==3.0.4 # via -r requirements.txt, requests
click==7.1.1 # via -r requirements.txt, flask
cloudflare==2.8.13 # via -r requirements.txt
-cryptography==3.0 # via -r requirements.txt, acme, josepy, paramiko, pyopenssl, requests
+cryptography==3.1 # via -r requirements.txt, acme, josepy, paramiko, pyopenssl, requests
dnspython3==1.15.0 # via -r requirements.txt
dnspython==1.15.0 # via -r requirements.txt, dnspython3
docutils==0.15.2 # via -r requirements.txt, botocore, sphinx
dyn==1.8.1 # via -r requirements.txt
flask-bcrypt==0.7.1 # via -r requirements.txt
-flask-cors==3.0.8 # via -r requirements.txt
+flask-cors==3.0.9 # via -r requirements.txt
flask-mail==0.9.1 # via -r requirements.txt
flask-migrate==2.5.3 # via -r requirements.txt
flask-principal==0.4.0 # via -r requirements.txt
@@ -62,9 +62,9 @@ marshmallow-sqlalchemy==0.23.1 # via -r requirements.txt
marshmallow==2.20.4 # via -r requirements.txt, marshmallow-sqlalchemy
ndg-httpsclient==0.5.1 # via -r requirements.txt
packaging==20.3 # via sphinx
-paramiko==2.7.1 # via -r requirements.txt
+paramiko==2.7.2 # via -r requirements.txt
pem==20.1.0 # via -r requirements.txt
-psycopg2==2.8.5 # via -r requirements.txt
+psycopg2==2.8.6 # via -r requirements.txt
pyasn1-modules==0.2.8 # via -r requirements.txt, pyjks, python-ldap
pyasn1==0.4.8 # via -r requirements.txt, ndg-httpsclient, pyasn1-modules, pyjks, python-ldap
pycparser==2.20 # via -r requirements.txt, cffi
diff --git a/requirements-tests.txt b/requirements-tests.txt
index 303338c1..e9106767 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -5,21 +5,21 @@
# pip-compile --no-index --output-file=requirements-tests.txt requirements-tests.in
#
appdirs==1.4.3 # via black
-attrs==19.3.0 # via black, jsonschema, pytest
+attrs==19.3.0 # via jsonschema, pytest
aws-sam-translator==1.22.0 # via cfn-lint
aws-xray-sdk==2.5.0 # via moto
bandit==1.6.2 # via -r requirements-tests.in
-black==19.10b0 # via -r requirements-tests.in
-boto3==1.14.48 # via aws-sam-translator, moto
+black==20.8b1 # via -r requirements-tests.in
+boto3==1.14.56 # via aws-sam-translator, moto
boto==2.49.0 # via moto
-botocore==1.17.48 # via aws-xray-sdk, boto3, moto, s3transfer
+botocore==1.17.56 # via aws-xray-sdk, boto3, moto, s3transfer
certifi==2020.6.20 # via requests
cffi==1.14.0 # via cryptography
cfn-lint==0.29.5 # via moto
chardet==3.0.4 # via requests
-click==7.1.1 # via black, flask
+click==7.1.2 # via black, flask
coverage==5.2.1 # via -r requirements-tests.in
-cryptography==3.0 # via moto, sshpubkeys
+cryptography==3.1 # via moto, sshpubkeys
decorator==4.4.2 # via networkx
docker==4.2.0 # via moto
docutils==0.15.2 # via botocore
@@ -28,7 +28,7 @@ factory-boy==3.0.1 # via -r requirements-tests.in
faker==4.1.2 # via -r requirements-tests.in, factory-boy
fakeredis==1.4.3 # via -r requirements-tests.in
flask==1.1.2 # via pytest-flask
-freezegun==0.3.15 # via -r requirements-tests.in
+freezegun==1.0.0 # via -r requirements-tests.in
future==0.18.2 # via aws-xray-sdk
gitdb==4.0.4 # via gitpython
gitpython==3.1.1 # via bandit
@@ -47,6 +47,7 @@ markupsafe==1.1.1 # via jinja2
mock==4.0.2 # via moto
more-itertools==8.2.0 # via pytest
moto==1.3.14 # via -r requirements-tests.in
+mypy-extensions==0.4.3 # via black
networkx==2.4 # via cfn-lint
nose==1.3.7 # via -r requirements-tests.in
packaging==20.3 # via pytest
@@ -60,7 +61,7 @@ pyflakes==2.2.0 # via -r requirements-tests.in
pyparsing==2.4.7 # via packaging
pyrsistent==0.16.0 # via jsonschema
pytest-flask==1.0.0 # via -r requirements-tests.in
-pytest-mock==3.3.0 # via -r requirements-tests.in
+pytest-mock==3.3.1 # via -r requirements-tests.in
pytest==6.0.1 # via -r requirements-tests.in, pytest-flask, pytest-mock
python-dateutil==2.8.1 # via botocore, faker, freezegun, moto
python-jose==3.1.0 # via moto
@@ -73,14 +74,15 @@ requests==2.24.0 # via docker, moto, requests-mock, responses
responses==0.10.12 # via moto
rsa==4.0 # via python-jose
s3transfer==0.3.3 # via boto3
-six==1.15.0 # via aws-sam-translator, bandit, cfn-lint, cryptography, docker, ecdsa, fakeredis, freezegun, jsonschema, moto, packaging, pyrsistent, python-dateutil, python-jose, requests-mock, responses, stevedore, websocket-client
+six==1.15.0 # via aws-sam-translator, bandit, cfn-lint, cryptography, docker, ecdsa, fakeredis, jsonschema, moto, packaging, pyrsistent, python-dateutil, python-jose, requests-mock, responses, stevedore, websocket-client
smmap==3.0.2 # via gitdb
sortedcontainers==2.1.0 # via fakeredis
sshpubkeys==3.1.0 # via moto
stevedore==1.32.0 # via bandit
text-unidecode==1.3 # via faker
-toml==0.10.0 # via black, pytest
+toml==0.10.1 # via black, pytest
typed-ast==1.4.1 # via black
+typing-extensions==3.7.4.3 # via black
urllib3==1.25.8 # via botocore, requests
websocket-client==0.57.0 # via docker
werkzeug==1.0.1 # via flask, moto, pytest-flask
diff --git a/requirements.txt b/requirements.txt
index c79ec23d..64e41b3c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,8 +15,8 @@ bcrypt==3.1.7 # via flask-bcrypt, paramiko
beautifulsoup4==4.9.1 # via cloudflare
billiard==3.6.3.0 # via celery
blinker==1.4 # via flask-mail, flask-principal, raven
-boto3==1.14.48 # via -r requirements.in
-botocore==1.17.48 # via -r requirements.in, boto3, s3transfer
+boto3==1.14.56 # via -r requirements.in
+botocore==1.17.56 # via -r requirements.in, boto3, s3transfer
celery[redis]==4.4.2 # via -r requirements.in
certifi==2020.6.20 # via -r requirements.in, requests
certsrv==2.1.1 # via -r requirements.in
@@ -24,13 +24,13 @@ cffi==1.14.0 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests
click==7.1.1 # via flask
cloudflare==2.8.13 # via -r requirements.in
-cryptography==3.0 # via -r requirements.in, acme, josepy, paramiko, pyopenssl, requests
+cryptography==3.1 # via -r requirements.in, acme, josepy, paramiko, pyopenssl, requests
dnspython3==1.15.0 # via -r requirements.in
dnspython==1.15.0 # via dnspython3
docutils==0.15.2 # via botocore
dyn==1.8.1 # via -r requirements.in
flask-bcrypt==0.7.1 # via -r requirements.in
-flask-cors==3.0.8 # via -r requirements.in
+flask-cors==3.0.9 # via -r requirements.in
flask-mail==0.9.1 # via -r requirements.in
flask-migrate==2.5.3 # via -r requirements.in
flask-principal==0.4.0 # via -r requirements.in
@@ -58,9 +58,9 @@ markupsafe==1.1.1 # via jinja2, mako
marshmallow-sqlalchemy==0.23.1 # via -r requirements.in
marshmallow==2.20.4 # via -r requirements.in, marshmallow-sqlalchemy
ndg-httpsclient==0.5.1 # via -r requirements.in
-paramiko==2.7.1 # via -r requirements.in
+paramiko==2.7.2 # via -r requirements.in
pem==20.1.0 # via -r requirements.in
-psycopg2==2.8.5 # via -r requirements.in
+psycopg2==2.8.6 # via -r requirements.in
pyasn1-modules==0.2.8 # via pyjks, python-ldap
pyasn1==0.4.8 # via ndg-httpsclient, pyasn1-modules, pyjks, python-ldap
pycparser==2.20 # via cffi