Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Include version 0.2.0 of the Synapse LDAP Auth Provider module in the Docker image. #12512

Merged
merged 2 commits into from
Apr 20, 2022

Conversation

reivilibre
Copy link
Contributor

@reivilibre reivilibre commented Apr 20, 2022

The v1.56.0 image included v0.2.0 whereas the v1.57.0 image included v0.1.5, which broke homeservers that are using it with the generic module API.

Issue likely introduced by https://github.com/matrix-org/synapse/pull/12385/files?

Fixes matrix-org/matrix-synapse-ldap3#162.

We'll want to release a patch release with this.

Signed-off-by: Olivier Wilkinson (reivilibre) <[email protected]>
@reivilibre reivilibre requested a review from a team as a code owner April 20, 2022 13:52
@reivilibre reivilibre changed the base branch from develop to release-v1.57 April 20, 2022 13:52
Copy link
Contributor

@DMRobertson DMRobertson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable to me.

It might be worth comparing all package versions in 1.56 against 1.57?

@DMRobertson
Copy link
Contributor

It might be worth comparing all package versions in 1.56 against 1.57?

docker run --entrypoint pip -it matrixdotorg/synapse:v1.56.0 list > 156
docker run --entrypoint pip -it matrixdotorg/synapse:v1.57.0 list > 157
diff -u 156 157

yields

--- 156	2022-04-20 14:57:51.816027277 +0100
+++ 157	2022-04-20 14:57:54.122032426 +0100
@@ -1,7 +1,7 @@
 Package              Version
 -------------------- ---------
 attrs                21.4.0
-Authlib              1.0.0
+Authlib              0.15.5
 Automat              20.2.0
 bcrypt               3.2.0
 bleach               4.1.0
@@ -10,31 +10,31 @@
 cffi                 1.15.0
 charset-normalizer   2.0.12
 constantly           15.1.0
-cryptography         36.0.2
+cryptography         36.0.1
 defusedxml           0.7.1
 elementpath          2.5.0
-frozendict           2.3.1
+frozendict           2.3.0
 hiredis              2.0.0
 hyperlink            21.0.0
 idna                 3.3
 ijson                3.1.4
-importlib-metadata   4.11.3
 incremental          21.3.0
 jaeger-client        4.8.0
-Jinja2               3.1.1
+Jinja2               3.0.3
 jsonschema           4.4.0
 ldap3                2.9.1
 lxml                 4.8.0
-MarkupSafe           2.1.1
+MarkupSafe           2.1.0
 matrix-common        1.1.0
-matrix-synapse       1.56.0
-matrix-synapse-ldap3 0.2.0
+matrix-synapse       1.57.0
+matrix-synapse-ldap3 0.1.5
 msgpack              1.0.3
 netaddr              0.8.0
 opentracing          2.4.0
 packaging            21.3
-phonenumbers         8.12.46
-Pillow               9.1.0
+parameterized        0.8.1
+phonenumbers         8.12.44
+Pillow               9.0.1
 pip                  22.0.4
 prometheus-client    0.13.1
 psycopg2             2.9.3
@@ -43,34 +43,32 @@
 pycparser            2.21
 PyJWT                2.3.0
 pymacaroons          0.13.0
-Pympler              1.0.1
 PyNaCl               1.5.0
 pyOpenSSL            22.0.0
 pyparsing            3.0.7
 pyrsistent           0.18.1
 pysaml2              7.1.2
 python-dateutil      2.8.2
-pytz                 2022.1
+pytz                 2021.3
 PyYAML               6.0
 requests             2.27.1
-sentry-sdk           1.5.8
+sentry-sdk           1.5.7
 service-identity     21.1.0
 setuptools           58.1.0
-signedjson           1.1.1
+signedjson           1.1.4
 simplejson           3.17.6
 six                  1.16.0
 sortedcontainers     2.4.0
 threadloop           1.0.2
-thrift               0.16.0
+thrift               0.15.0
 tornado              6.1
 treq                 22.2.0
 Twisted              22.2.0
 txredisapi           1.4.7
 typing_extensions    4.1.1
 unpaddedbase64       2.1.0
-urllib3              1.26.9
+urllib3              1.26.8
 webencodings         0.5.1
 wheel                0.37.1
 xmlschema            1.10.0
-zipp                 3.8.0
 zope.interface       5.4.0

@reivilibre
Copy link
Contributor Author

--- v1.56.0-deps.txt    2022-04-20 14:56:40.676609654 +0100
+++ v1.57.0-deps.txt    2022-04-20 14:56:35.244591950 +0100
@@ -1,71 +1,69 @@
 attrs==21.4.0
-Authlib==1.0.0
+Authlib==0.15.5
 Automat==20.2.0
 bcrypt==3.2.0
 bleach==4.1.0
 canonicaljson==1.6.0
 certifi==2021.10.8
 cffi==1.15.0
 charset-normalizer==2.0.12
 constantly==15.1.0
-cryptography==36.0.2
+cryptography==36.0.1
 defusedxml==0.7.1
 elementpath==2.5.0
-frozendict==2.3.1
+frozendict==2.3.0
 hiredis==2.0.0
 hyperlink==21.0.0
 idna==3.3
 ijson==3.1.4
-importlib-metadata==4.11.3
 incremental==21.3.0
 jaeger-client==4.8.0
-Jinja2==3.1.1
+Jinja2==3.0.3
 jsonschema==4.4.0
 ldap3==2.9.1
 lxml==4.8.0
-MarkupSafe==2.1.1
+MarkupSafe==2.1.0
 matrix-common==1.1.0
 matrix-synapse @ file:///synapse
-matrix-synapse-ldap3==0.2.0
+matrix-synapse-ldap3==0.1.5
 msgpack==1.0.3
 netaddr==0.8.0
 opentracing==2.4.0
 packaging==21.3
-phonenumbers==8.12.46
-Pillow==9.1.0
+parameterized==0.8.1
+phonenumbers==8.12.44
+Pillow==9.0.1
 prometheus-client==0.13.1
 psycopg2==2.9.3
 pyasn1==0.4.8
 pyasn1-modules==0.2.8
 pycparser==2.21
 PyJWT==2.3.0
 pymacaroons==0.13.0
-Pympler==1.0.1
 PyNaCl==1.5.0
 pyOpenSSL==22.0.0
 pyparsing==3.0.7
 pyrsistent==0.18.1
 pysaml2==7.1.2
 python-dateutil==2.8.2
-pytz==2022.1
+pytz==2021.3
 PyYAML==6.0
 requests==2.27.1
-sentry-sdk==1.5.8
+sentry-sdk==1.5.7
 service-identity==21.1.0
-signedjson==1.1.1
+signedjson==1.1.4
 simplejson==3.17.6
 six==1.16.0
 sortedcontainers==2.4.0
 threadloop==1.0.2
-thrift==0.16.0
+thrift==0.15.0
 tornado==6.1
 treq==22.2.0
 Twisted==22.2.0
 txredisapi==1.4.7
 typing_extensions==4.1.1
 unpaddedbase64==2.1.0
-urllib3==1.26.9
+urllib3==1.26.8
 webencodings==0.5.1
 xmlschema==1.10.0
-zipp==3.8.0
 zope.interface==5.4.0

@reivilibre
Copy link
Contributor Author

Most of those don't seem important, but a few of those make me wonder...

-Authlib==1.0.0
+Authlib==0.15.5

1.0.0 sounds like a nicer version than 0.15.5 when you have the choice, but that may just be superstitious :D.

-Pympler==1.0.1

According to what we were talking about this morning, Pympler might be useful for diagnosing memory problems. Having it in the docker image might help us?

This might be better off pushed back to 1.58.0 though, I don't think you'd call it a a regression (yet).

@reivilibre reivilibre enabled auto-merge (squash) April 20, 2022 14:03
@DMRobertson
Copy link
Contributor

DMRobertson commented Apr 20, 2022

Authlib 1.0.0 was released about a month ago, so I'm not worried about using 0.155. If anything I'm worried about the major semver jump.

Pympler was formerly included in the all extra but now it seems not to be; it's only in the cache_memory extra. Will need to be taken care of alongside #12478.

@DMRobertson
Copy link
Contributor

Pympler was formerly included in the all extra but now it seems not to be; it's only in the cache_memory extra.

# - cache_memory: this is an experimental option
is the smoking gun.

@reivilibre reivilibre merged commit 3e2e76c into release-v1.57 Apr 20, 2022
@reivilibre reivilibre deleted the rei/1.57.0-regression-ldap3 branch April 20, 2022 14:22
babolivier added a commit to matrix-org/synapse-dinsic that referenced this pull request Apr 28, 2022
Synapse 1.57.1 (2022-04-20)
===========================

This is a patch release that only affects the Docker image. It is only of interest to administrators using [the LDAP module][LDAPModule] to authenticate their users.
If you have already upgraded to Synapse 1.57.0 without problem, then you have no need to upgrade to this patch release.

[LDAPModule]: https://github.com/matrix-org/matrix-synapse-ldap3

Updates to the Docker image
---------------------------

- Include version 0.2.0 of the Synapse LDAP Auth Provider module in the Docker image. This matches the version that was present in the Docker image for Synapse v1.56.0. ([\#12512](matrix-org/synapse#12512))
SpiritCroc pushed a commit to SpiritCroc/synapse-old that referenced this pull request May 12, 2022
Synapse 1.57.1 (2022-04-20)
===========================

This is a patch release that only affects the Docker image. It is only of interest to administrators using [the LDAP module][LDAPModule] to authenticate their users.
If you have already upgraded to Synapse 1.57.0 without problem, then you have no need to upgrade to this patch release.

[LDAPModule]: https://github.com/matrix-org/matrix-synapse-ldap3

Updates to the Docker image
---------------------------

- Include version 0.2.0 of the Synapse LDAP Auth Provider module in the Docker image. This matches the version that was present in the Docker image for Synapse v1.56.0. ([\matrix-org#12512](matrix-org#12512))
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

In Synapse 1.57.0 Docker image: module 'ldap_auth_provider' has no attribute 'LdapAuthProviderModule'
2 participants