From 291a10fefe4224c1c1307ab39e4f8d91eb5cff3d Mon Sep 17 00:00:00 2001 From: Aleksey Karpov <86011874+alekseyolg@users.noreply.github.com> Date: Fri, 23 Jun 2023 19:15:57 +0300 Subject: [PATCH] feat(docker): Add support LDAP/AD authorization (#24277) --- .github/workflows/bashlib.sh | 3 ++- Dockerfile | 1 + requirements/development.in | 1 + requirements/development.txt | 12 +++++++++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bashlib.sh b/.github/workflows/bashlib.sh index 95b218aab..d6000bb82 100644 --- a/.github/workflows/bashlib.sh +++ b/.github/workflows/bashlib.sh @@ -40,7 +40,8 @@ default-setup-command() { apt-get-install() { say "::group::apt-get install dependencies" sudo apt-get update && sudo apt-get install --yes \ - libsasl2-dev + libsasl2-dev \ + libldap2-dev say "::endgroup::" } diff --git a/Dockerfile b/Dockerfile index 0745294b4..ee4287728 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,6 +68,7 @@ RUN mkdir -p ${PYTHONPATH} \ libsasl2-modules-gssapi-mit \ libpq-dev \ libecpg-dev \ + libldap2-dev \ && rm -rf /var/lib/apt/lists/* WORKDIR /app diff --git a/requirements/development.in b/requirements/development.in index efe5bb574..78a84536e 100644 --- a/requirements/development.in +++ b/requirements/development.in @@ -22,5 +22,6 @@ ipython progress>=1.5,<2 pyinstrument>=4.0.2,<5 pylint==2.9.6 +python-ldap>=3.4.3 setuptools>=65.5.1 sqloxide diff --git a/requirements/development.txt b/requirements/development.txt index e398368e7..c49cda433 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -1,4 +1,4 @@ -# SHA1:6d10e2cb134133e823edef48aa3e33b2b1b85681 +# SHA1:4c0ce3a84b01a5a3fe6c72cbf2fc96e5eada2dbe # # This file is autogenerated by pip-compile-multi # To update, run: @@ -10,8 +10,6 @@ # via # -r requirements/base.in # -r requirements/development.in -appnope==0.1.3 - # via ipython astroid==2.6.6 # via pylint asttokens==2.2.1 @@ -86,6 +84,12 @@ pure-eval==0.2.2 # via stack-data pure-sasl==0.6.2 # via thrift-sasl +pyasn1==0.5.0 + # via + # pyasn1-modules + # python-ldap +pyasn1-modules==0.3.0 + # via python-ldap pydruid==0.6.5 # via apache-superset pyhive[hive]==0.6.5 @@ -94,6 +98,8 @@ pyinstrument==4.4.0 # via -r requirements/development.in pylint==2.9.6 # via -r requirements/development.in +python-ldap==3.4.3 + # via -r requirements/development.in requests==2.30.0 # via # pydruid