Skip to content

Commit

Permalink
Merge pull request #3249 from TIM-JYU/refactor-saml
Browse files Browse the repository at this point in the history
Refactor SAML to use PySAML2
  • Loading branch information
dezhidki authored Nov 9, 2022
2 parents e76e319 + 4c7906f commit 12f0d18
Show file tree
Hide file tree
Showing 21 changed files with 1,382 additions and 1,274 deletions.
1,065 changes: 575 additions & 490 deletions poetry.lock

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ PyLaTeX = "^1.4.1"
pypandoc = "^1.8.1"
python-dateutil = "^2.8.2"
python-magic = "^0.4.26"
python3-saml = "^1.14.0"
pytz = "^2022.1"
recommonmark = "^0.7.1"
responses = "^0.21.0"
Expand All @@ -71,6 +70,7 @@ Wand = "^0.6.7"
requests = "^2.27.1"
six = "^1.16.0"
python-gnupg = "^0.5.0"
pysaml2 = "^7.2.1"

[tool.poetry.group.dev.dependencies]
mypy = "^0.971"
Expand All @@ -89,6 +89,7 @@ Flask = "<2.2.0"
Authlib = "1.0.0rc1"
langcodes = "^3.3.0"
black = "^22.6.0"
types-pysaml2 = "^1.0.0"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down Expand Up @@ -163,6 +164,8 @@ module = [
"celery.schedules",
"lxml",
"lxml.*",
"saml2",
"saml2.*",
"sqlalchemy",
"sqlalchemy.dialects",
"sqlalchemy.exc",
Expand Down Expand Up @@ -191,7 +194,6 @@ module = [
"timApp.answer.routes",
"timApp.auth.accesshelper",
"timApp.auth.auth_models",
"timApp.auth.saml",
"timApp.auth.sessioninfo",
"timApp.defaultconfig",
"timApp.document.attributeparser",
Expand Down
3 changes: 3 additions & 0 deletions timApp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ RUN bash -c "${APT_INSTALL} \

RUN wget -q https://bootstrap.pypa.io/get-pip.py && python3.10 get-pip.py && rm get-pip.py

# Install xmlsec binary which is needed for PySAML2
RUN bash -c "${APT_INSTALL} xmlsec1 && ${APT_CLEANUP}"

ENV PIP_INSTALL="python3.10 -m pip install"
RUN bash -c "${PIP_INSTALL} --upgrade poetry==1.2.1 requests && ${APT_CLEANUP}"

Expand Down
Loading

0 comments on commit 12f0d18

Please sign in to comment.