From e9f7860816040f4c7b121e0ca4ba5d9c0d437a31 Mon Sep 17 00:00:00 2001 From: sirferl Date: Wed, 25 Nov 2020 14:06:26 +0100 Subject: [PATCH 1/5] Fixed AD-LDAP decode problem --- lemur/auth/ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemur/auth/ldap.py b/lemur/auth/ldap.py index 030c7c78..48604785 100644 --- a/lemur/auth/ldap.py +++ b/lemur/auth/ldap.py @@ -211,7 +211,7 @@ class LdapPrincipal: for group in lgroups: (dn, values) = group if type(values) == dict: - self.ldap_groups.append(values["cn"][0].decode("ascii")) + self.ldap_groups.append(values["cn"][0].decode("utf-8")) else: lgroups = self.ldap_client.search_s( self.ldap_base_dn, ldap.SCOPE_SUBTREE, ldap_filter, self.ldap_attrs From 8ad82bee532f8f90bb4e0cb3ff2ba2c145b356f6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 13:29:01 +0000 Subject: [PATCH 2/5] Bump pre-commit from 2.9.0 to 2.9.2 Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.9.0 to 2.9.2. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v2.9.0...v2.9.2) Signed-off-by: dependabot-preview[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index adc8304b..5ffcb1e4 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -24,7 +24,7 @@ keyring==21.2.0 # via twine mccabe==0.6.1 # via flake8 nodeenv==1.5.0 # via -r requirements-dev.in, pre-commit pkginfo==1.5.0.1 # via twine -pre-commit==2.9.0 # via -r requirements-dev.in +pre-commit==2.9.2 # via -r requirements-dev.in pycodestyle==2.6.0 # via flake8 pycparser==2.20 # via cffi pyflakes==2.2.0 # via flake8 From b00d97b6de140c273179cef4434d13572730fa84 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 16:50:51 +0000 Subject: [PATCH 3/5] Bump fakeredis from 1.4.4 to 1.4.5 Bumps [fakeredis](https://github.com/jamesls/fakeredis) from 1.4.4 to 1.4.5. - [Release notes](https://github.com/jamesls/fakeredis/releases) - [Commits](https://github.com/jamesls/fakeredis/compare/1.4.4...1.4.5) Signed-off-by: dependabot-preview[bot] --- requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-tests.txt b/requirements-tests.txt index 4fd96f95..0fc940d8 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -25,7 +25,7 @@ docker==4.2.0 # via moto ecdsa==0.14.1 # via moto, python-jose, sshpubkeys factory-boy==3.1.0 # via -r requirements-tests.in faker==4.17.1 # via -r requirements-tests.in, factory-boy -fakeredis==1.4.4 # via -r requirements-tests.in +fakeredis==1.4.5 # via -r requirements-tests.in flask==1.1.2 # via pytest-flask freezegun==1.0.0 # via -r requirements-tests.in future==0.18.2 # via aws-xray-sdk From 1eb0024b1ffb51ec7a490de0ee6eb3d2a4380719 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 17:00:28 +0000 Subject: [PATCH 4/5] Bump boto3 from 1.16.24 to 1.16.25 Bumps [boto3](https://github.com/boto/boto3) from 1.16.24 to 1.16.25. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.16.24...1.16.25) Signed-off-by: dependabot-preview[bot] --- requirements-docs.txt | 4 ++-- requirements-tests.txt | 4 ++-- requirements.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index 0642dce7..cae4accd 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.16.24 # via -r requirements.txt -botocore==1.19.24 # via -r requirements.txt, boto3, s3transfer +boto3==1.16.25 # via -r requirements.txt +botocore==1.19.25 # via -r requirements.txt, boto3, s3transfer celery[redis]==4.4.2 # via -r requirements.txt certifi==2020.11.8 # via -r requirements.txt, requests certsrv==2.1.1 # via -r requirements.txt diff --git a/requirements-tests.txt b/requirements-tests.txt index 0fc940d8..90bb7b5e 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -10,9 +10,9 @@ 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==20.8b1 # via -r requirements-tests.in -boto3==1.16.24 # via aws-sam-translator, moto +boto3==1.16.25 # via aws-sam-translator, moto boto==2.49.0 # via moto -botocore==1.19.24 # via aws-xray-sdk, boto3, moto, s3transfer +botocore==1.19.25 # via aws-xray-sdk, boto3, moto, s3transfer certifi==2020.11.8 # via requests cffi==1.14.0 # via cryptography cfn-lint==0.29.5 # via moto diff --git a/requirements.txt b/requirements.txt index e029b61c..68d5fdb6 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.16.24 # via -r requirements.in -botocore==1.19.24 # via -r requirements.in, boto3, s3transfer +boto3==1.16.25 # via -r requirements.in +botocore==1.19.25 # via -r requirements.in, boto3, s3transfer celery[redis]==4.4.2 # via -r requirements.in certifi==2020.11.8 # via -r requirements.in, requests certsrv==2.1.1 # via -r requirements.in From fa082145fefc431d167a201a172ccf88a044bea7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 17:09:42 +0000 Subject: [PATCH 5/5] Bump pyopenssl from 19.1.0 to 20.0.0 Bumps [pyopenssl](https://github.com/pyca/pyopenssl) from 19.1.0 to 20.0.0. - [Release notes](https://github.com/pyca/pyopenssl/releases) - [Changelog](https://github.com/pyca/pyopenssl/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pyca/pyopenssl/compare/19.1.0...20.0.0) Signed-off-by: dependabot-preview[bot] --- requirements-docs.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index cae4accd..c612db5c 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -73,7 +73,7 @@ pygments==2.6.1 # via sphinx pyjks==20.0.0 # via -r requirements.txt pyjwt==1.7.1 # via -r requirements.txt pynacl==1.3.0 # via -r requirements.txt, paramiko -pyopenssl==19.1.0 # via -r requirements.txt, acme, josepy, ndg-httpsclient, requests +pyopenssl==20.0.0 # via -r requirements.txt, acme, josepy, ndg-httpsclient, requests pyparsing==2.4.7 # via packaging pyrfc3339==1.1 # via -r requirements.txt, acme python-dateutil==2.8.1 # via -r requirements.txt, alembic, arrow, botocore diff --git a/requirements.txt b/requirements.txt index 68d5fdb6..20698495 100644 --- a/requirements.txt +++ b/requirements.txt @@ -67,7 +67,7 @@ pycryptodomex==3.9.7 # via pyjks pyjks==20.0.0 # via -r requirements.in pyjwt==1.7.1 # via -r requirements.in pynacl==1.3.0 # via paramiko -pyopenssl==19.1.0 # via -r requirements.in, acme, josepy, ndg-httpsclient, requests +pyopenssl==20.0.0 # via -r requirements.in, acme, josepy, ndg-httpsclient, requests pyrfc3339==1.1 # via acme python-dateutil==2.8.1 # via alembic, arrow, botocore python-editor==1.0.4 # via alembic