CKAN 2.11 support#92
Open
markstuart wants to merge 3 commits into
Open
Conversation
- Remove dead CKANLoginThrottle and BeakerRedisAuth classes (repoze.who removed) - Fix SQLAlchemy table.exists() deprecation in model.py (use inspect) - Remove Beaker/repoze.who dependencies from requirements.txt - Loosen redis pin to >=4.1 for compatibility with CKAN core Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- Restore CKANLoginThrottle and BeakerRedisAuth classes (needed for CKAN < 2.11 repoze.who-based auth) - Restore Beaker/repoze.who/WebOb requirements (needed for CKAN < 2.11) - Keep SQLAlchemy inspect() fix for 2.11 compat (replaces deprecated table.exists()), using positional arg to create() instead of bind= keyword which was removed in SQLAlchemy 2.0 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…able Beaker session (CKAN < 2.11) has invalidate(); Flask-Session (CKAN 2.11+) uses clear(). Duck-type to support both. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
markstuart
commented
Feb 18, 2026
| if hasattr(session, 'invalidate'): | ||
| session.invalidate() | ||
| else: | ||
| session.clear() |
Contributor
Author
There was a problem hiding this comment.
This has been raised by other contributors as well, thanks for that team 👍
| <fieldset> | ||
| <legend>{{_('Two factor authentication')}}</legend> | ||
| {% link_for _('Manage two factor authentication'), controller='mfa_user', action='configure_mfa', id=data.id, class_='btn btn-default pull-left', icon='cog' %} | ||
| {% link_for _('Manage two factor authentication'), controller='mfa_user', action='configure_mfa', id=data.id, class_='btn btn-secondary float-start', icon='cog' %} |
Contributor
Author
There was a problem hiding this comment.
CKAN 2.10+ uses Bootstrap 5, and this makes it compatible with the BS5 styling.
| db_engine = model.meta.engine | ||
| inspector = inspect(db_engine) | ||
|
|
||
| if not inspector.has_table('package'): |
Contributor
Author
There was a problem hiding this comment.
Newer versions of SQLAlchemy have dropped the exists function, but all versions of SQLAlchemy that CKAN has used since 2.9+ have the has_table function available, so this will be backward compatible at least to there.
ThrawnCA
reviewed
Feb 18, 2026
| git+https://github.com/akissa/repoze.who-use_beaker@780379fd58b10264c0756feb6d3f232f797ba0cb#egg=repoze.who-use_beaker | ||
| six~=1.16.0 | ||
| WebOb~=1.8.7 | ||
| pyotp~=2.6.0 |
Contributor
There was a problem hiding this comment.
Why was this moved downward?
Contributor
Author
There was a problem hiding this comment.
the intent was that the 3 dependencies related to beaker and repoze are all essentially deprecated as per the comment, and grouped together for later removal.
maxwellyoung
added a commit
to maxwellyoung/ckanext-security
that referenced
this pull request
Feb 18, 2026
- Add compatibility table showing supported CKAN versions and corresponding ckanext-security versions - Clarify that who.ini changes are only needed for CKAN 2.9.x - Note that CKAN 2.10+ uses Flask-Login (no who.ini needed) - Note CKAN 2.11 Flask-Session compatibility via data-govt-nz#92 - Remove outdated Python 2 requirements reference Closes data-govt-nz#77
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Testing our site against CKAN 2.11.4 showed up a couple of issues that needed addressing.