From bc88d3514cc7de4dfbb0371059e4282d06935c87 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Wed, 22 Aug 2018 13:17:33 -0700 Subject: [PATCH 1/2] Revert "Merge pull request #1589 from castrapel/issue_1570_ignorecasev2" This reverts commit a21b71a0e209fd32cf07c3e2f5ffb9ecd5250de0, reversing changes made to 075b18e5dbf11ed16d69a7cd620c577942d85010. --- lemur/auth/permissions.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/lemur/auth/permissions.py b/lemur/auth/permissions.py index 68c48773..e6d14408 100644 --- a/lemur/auth/permissions.py +++ b/lemur/auth/permissions.py @@ -29,9 +29,6 @@ class CertificatePermission(Permission): needs = [RoleNeed('admin'), RoleNeed(owner), RoleNeed('creator')] for r in roles: needs.append(CertificateOwnerNeed(str(r))) - # Backwards compatibility with mixed-case role names - if str(r) != str(r).lower(): - needs.append(CertificateOwnerNeed(str(r).lower())) super(CertificatePermission, self).__init__(*needs) From b8b0f77ff880ef8d857394f68ed6143715939604 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Mon, 27 Aug 2018 09:00:04 -0700 Subject: [PATCH 2/2] Update requirements --- lemur/auth/permissions.py | 3 +++ requirements-dev.txt | 4 ++-- requirements-docs.txt | 8 ++++---- requirements-tests.txt | 14 +++++++------- requirements.in | 4 ++-- requirements.txt | 6 +++--- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/lemur/auth/permissions.py b/lemur/auth/permissions.py index e6d14408..68c48773 100644 --- a/lemur/auth/permissions.py +++ b/lemur/auth/permissions.py @@ -29,6 +29,9 @@ class CertificatePermission(Permission): needs = [RoleNeed('admin'), RoleNeed(owner), RoleNeed('creator')] for r in roles: needs.append(CertificateOwnerNeed(str(r))) + # Backwards compatibility with mixed-case role names + if str(r) != str(r).lower(): + needs.append(CertificateOwnerNeed(str(r).lower())) super(CertificatePermission, self).__init__(*needs) diff --git a/requirements-dev.txt b/requirements-dev.txt index cb9be135..9b8728ae 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,7 @@ # aspy.yaml==1.1.1 # via pre-commit cached-property==1.4.3 # via pre-commit -certifi==2018.8.13 # via requests +certifi==2018.8.24 # via requests cfgv==1.1.0 # via pre-commit chardet==3.0.4 # via requests flake8==3.5.0 @@ -24,7 +24,7 @@ requests-toolbelt==0.8.0 # via twine requests==2.19.1 # via requests-toolbelt, twine six==1.11.0 # via cfgv, pre-commit toml==0.9.4 # via pre-commit -tqdm==4.24.0 # via twine +tqdm==4.25.0 # via twine twine==1.11.0 urllib3==1.23 # via requests virtualenv==16.0.0 # via pre-commit diff --git a/requirements-docs.txt b/requirements-docs.txt index 22621681..f3278b66 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -15,9 +15,9 @@ asyncpool==1.0 babel==2.6.0 # via sphinx bcrypt==3.1.4 blinker==1.4 -boto3==1.7.79 -botocore==1.10.79 -certifi==2018.8.13 +boto3==1.8.1 +botocore==1.11.1 +certifi==2018.8.24 cffi==1.11.5 chardet==3.0.4 click==6.7 @@ -79,7 +79,7 @@ s3transfer==0.1.13 six==1.11.0 snowballstemmer==1.2.1 # via sphinx sphinx-rtd-theme==0.4.1 -sphinx==1.7.6 +sphinx==1.7.7 sphinxcontrib-httpdomain==1.7.0 sphinxcontrib-websupport==1.1.0 # via sphinx sqlalchemy-utils==0.33.3 diff --git a/requirements-tests.txt b/requirements-tests.txt index 2575b631..a34bf1fd 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -5,13 +5,13 @@ # pip-compile --no-index --output-file requirements-tests.txt requirements-tests.in # asn1crypto==0.24.0 # via cryptography -atomicwrites==1.1.5 # via pytest +atomicwrites==1.2.0 # via pytest attrs==18.1.0 # via pytest aws-xray-sdk==0.95 # via moto -boto3==1.7.79 # via moto +boto3==1.8.1 # via moto boto==2.49.0 # via moto -botocore==1.10.79 # via boto3, moto, s3transfer -certifi==2018.8.13 # via requests +botocore==1.11.1 # via boto3, moto, s3transfer +certifi==2018.8.24 # via requests cffi==1.11.5 # via cryptography chardet==3.0.4 # via requests click==6.7 # via flask @@ -47,7 +47,7 @@ pycryptodome==3.6.6 # via python-jose pyflakes==2.0.0 pytest-flask==0.10.0 pytest-mock==1.10.0 -pytest==3.7.1 +pytest==3.7.3 python-dateutil==2.7.3 # via botocore, faker, freezegun, moto python-jose==2.0.2 # via moto pytz==2018.5 # via moto @@ -58,8 +58,8 @@ responses==0.9.0 # via moto s3transfer==0.1.13 # via boto3 six==1.11.0 # via cryptography, docker, docker-pycreds, faker, freezegun, mock, more-itertools, moto, pytest, python-dateutil, python-jose, requests-mock, responses, websocket-client text-unidecode==1.2 # via faker -urllib3==1.23 # via requests -websocket-client==0.49.0 # via docker +urllib3==1.23 # via botocore, requests +websocket-client==0.51.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.in b/requirements.in index 0e028261..9d77bee2 100644 --- a/requirements.in +++ b/requirements.in @@ -4,7 +4,7 @@ acme alembic-autogenerate-enums arrow asyncpool -boto3 +boto3==1.7.79 certifi CloudFlare cryptography @@ -39,4 +39,4 @@ retrying six SQLAlchemy-Utils tabulate -xmltodict +xmltodict \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5503758b..6da0f82b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,8 +14,8 @@ asyncpool==1.0 bcrypt==3.1.4 # via flask-bcrypt, paramiko blinker==1.4 # via flask-mail, flask-principal, raven boto3==1.7.79 -botocore==1.10.79 # via boto3, s3transfer -certifi==2018.8.13 +botocore==1.10.84 # via boto3, s3transfer +certifi==2018.8.24 cffi==1.11.5 # via bcrypt, cryptography, pynacl chardet==3.0.4 # via requests click==6.7 # via flask @@ -73,7 +73,7 @@ retrying==1.3.3 s3transfer==0.1.13 # via boto3 six==1.11.0 sqlalchemy-utils==0.33.3 -sqlalchemy==1.2.10 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils +sqlalchemy==1.2.11 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils tabulate==0.8.2 urllib3==1.23 # via requests werkzeug==0.14.1 # via flask