Skip to content

Commit 1202577

Browse files
committed
Disable SAML2 auth and use default CKAN login system
- Pin numpy==1.24.4 and pandas==1.5.3 to fix version mismatch error - Remove saml2auth from plugins list in adx_config.ini - Comment out SAML2 configuration settings - Update ckanext-unaids to remove login_register_catch blueprint
1 parent 59a6804 commit 1202577

4 files changed

Lines changed: 76 additions & 139 deletions

File tree

Pipfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ pycparser = "==2.20"
7575
typing-extensions = "==4.12.2"
7676
ckantoolkit = ">=0.0.3"
7777
python-slugify = ">=5.0.0"
78-
numpy = ">=1.21.0"
79-
pandas = ">=1.4.2"
78+
numpy = "==1.24.4"
79+
pandas = "==1.5.3"
8080
pika = ">=1.1.0"
8181
pyopenssl = "~=18.0.0"
8282
pycountry = "==19.8.18"

Pipfile.lock

Lines changed: 63 additions & 126 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ckan/adx_config.ini

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ ckan.redis.url = redis://redis:6379/1
127127
# Add ``resource_proxy`` to enable resorce proxying and get around the
128128
# same origin policy
129129
# Note: Plugins to the left take precendence over plugins to the right!!! Opposite to what you might expect.
130-
ckan.plugins = activity unaids fork scheming_datasets blob_storage saml2auth emailasusername restricted authz_service stats
130+
ckan.plugins = activity unaids fork scheming_datasets blob_storage emailasusername restricted authz_service stats
131131
text_view image_view datatables_view unaids_recline_view
132132
resource_proxy datastore datapusher
133133
validation ytp_request pages dhis2harvester_plugin dhis2_pivot_tables_harvester harvest versions
@@ -298,15 +298,15 @@ ckan.hide_activity_from_users = %(ckan.site_id)s
298298
## Email settings
299299
email_to = support@fjelltopp.org
300300

301-
# SAML2.0
302-
ckanext.saml2auth.idp_metadata.location = remote
303-
ckanext.saml2auth.idp_metadata.remote_url = https://hivtools.eu.auth0.com/samlp/metadata/lMiD8vQo1OZUPJEzd5hPvcxgTMkyY7YS
304-
ckanext.saml2auth.idp_metadata.remote_cert = /etc/ckan/saml_idp.crt
305-
ckanext.saml2auth.user_fullname = http://schemas.xmlsoap.org/ws/2005/05/identity/claims/fullname
306-
ckanext.saml2auth.user_email = http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress
307-
ckanext.saml2auth.want_response_signed = False
308-
ckanext.saml2auth.want_assertions_signed = True
309-
ckanext.saml2auth.logout_requests_signed = False
301+
# SAML2.0 - DISABLED (using CKAN default authentication)
302+
# ckanext.saml2auth.idp_metadata.location = remote
303+
# ckanext.saml2auth.idp_metadata.remote_url = https://hivtools.eu.auth0.com/samlp/metadata/lMiD8vQo1OZUPJEzd5hPvcxgTMkyY7YS
304+
# ckanext.saml2auth.idp_metadata.remote_cert = /etc/ckan/saml_idp.crt
305+
# ckanext.saml2auth.user_fullname = http://schemas.xmlsoap.org/ws/2005/05/identity/claims/fullname
306+
# ckanext.saml2auth.user_email = http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress
307+
# ckanext.saml2auth.want_response_signed = False
308+
# ckanext.saml2auth.want_assertions_signed = True
309+
# ckanext.saml2auth.logout_requests_signed = False
310310
# ckanext.saml2auth.key_file_path = /etc/ckan/saml.key
311311
# ckanext.saml2auth.cert_file_path = /etc/ckan/saml.crt
312312
# Uncomment the internal login option to enable log in in offline mode

submodules/ckanext-unaids

Submodule ckanext-unaids updated from a17b7ef to 7fac569

0 commit comments

Comments
 (0)