Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CKAN security #40

Open
wants to merge 21 commits into
base: devel
Choose a base branch
from
Open

CKAN security #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6274890
Add ckanext-security
BWibo Aug 31, 2023
de397e8
enable security extension
BWibo Aug 31, 2023
1562be7
Apply ckanext-security patch
BWibo Sep 1, 2023
6b893aa
Add ckanext-security init script
BWibo Sep 3, 2023
6f5f932
remove handler paths
BWibo Sep 4, 2023
f58609a
Merge branch 'feature/ckanext-security' of github.com:tum-gis/ckan-do…
BWibo Sep 4, 2023
acb079d
Revert "remove handler paths"
BWibo Sep 4, 2023
92a1441
ignore testing folder
BWibo Sep 4, 2023
7c62e9f
minor change
BWibo Sep 4, 2023
33b316b
remove challengers
BWibo Sep 4, 2023
82ee19a
re-add challengers
BWibo Sep 4, 2023
de431a1
add auth_tkt
BWibo Sep 4, 2023
088e5f9
Add username pwd auth
BWibo Sep 4, 2023
152dbe5
fix flask middleware
BWibo Sep 4, 2023
ba6772f
drop pwd auth settings
BWibo Sep 4, 2023
2ef4c9c
no auth tkt
BWibo Sep 4, 2023
ea2dcf1
drop pw auth
BWibo Sep 4, 2023
c59a8d0
TEST: don't use 2FA
BWibo Sep 5, 2023
97ec186
all auth
BWibo Sep 5, 2023
5ab04ec
no pwd and tkt auth
BWibo Sep 5, 2023
a50ac01
testing new who settings
BWibo Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# VScode
.vscode/

# testing folder
/ignore
32 changes: 32 additions & 0 deletions sddi-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,19 @@ RUN set -ex && \
pip wheel --wheel-dir=/wheels \
git+${CKANEXT_REPEATING_GITHUB_URL}.git@${CKANEXT_REPEATING_VERSION}#egg=ckanext-repeating

# ckanext-security ############################################################
ARG CKANEXT_SECURITY_VERSION="v3.0.4"
ENV CKANEXT_SECURITY_VERSION=${CKANEXT_SECURITY_VERSION}
ENV CKANEXT_SECURITY_GITHUB_URL="https://github.com/data-govt-nz/ckanext-security"

RUN set -ex && \
pip wheel --wheel-dir=/wheels -r \
https://raw.githubusercontent.com/data-govt-nz/ckanext-security/${CKANEXT_SECURITY_VERSION}/requirements.txt && \
curl -o /wheels/ckanext-security.txt \
https://raw.githubusercontent.com/data-govt-nz/ckanext-security/${CKANEXT_SECURITY_VERSION}/requirements.txt && \
pip wheel --wheel-dir=/wheels \
git+${CKANEXT_SECURITY_GITHUB_URL}.git@${CKANEXT_SECURITY_VERSION}#egg=ckanext-security

# ckanext-spatial #############################################################
FROM ghcr.io/keitaroinc/ckan:${CKAN_VERSION_BUILD_SPATIAL} as extbuild-spatial

Expand Down Expand Up @@ -124,6 +137,7 @@ FROM ghcr.io/keitaroinc/ckan:${CKAN_VERSION_RUNTIME_STAGE} as runtime
ENV CKAN__PLUGINS "image_view text_view recline_view datastore datapusher \
hierarchy_display hierarchy_form display_group relation \
spatial_metadata spatial_query datesearch repeating composite scheming_datasets \
security \
envvars"

# Extra env for compatibility with ckan/base Docker images for downstream k8s
Expand Down Expand Up @@ -182,6 +196,11 @@ RUN set -ex && \
RUN set -ex && \
pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-repeating

# ckanext-security ############################################################
RUN set -ex && \
pip install -r ${APP_DIR}/ext_wheels/ckanext-security.txt && \
pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-security

# Copy init scripts and additional files
COPY --chown=ckan:ckan initScripts/ ${APP_DIR}/docker-afterinit.d

Expand All @@ -199,4 +218,17 @@ RUN set -ex && \
# Remove wheels
rm -rf ${APP_DIR}/ext_wheels

# Apply ckanext-security path #################################################
# WIP: For testing, we copy this to all possible locations. First location should be sufficient.
COPY --chown=ckan:ckan who.ini ${APP_DIR}/who.ini
COPY --chown=ckan:ckan who.ini ${CKAN_DIR}/who.ini
COPY --chown=ckan:ckan who.ini ${CKAN_DIR}/ckan/config/who.ini

# Download
# ADD https://raw.githubusercontent.com/data-govt-nz/ckanext-security/${CKANEXT_SECURITY_VERSION}/ckanext-security.patch \
# /tmp/sec.patch

COPY --chown=ckan:ckan flask_app.py ${CKAN_DIR}/ckan/config/middleware/flask_app.py
COPY --chown=ckan:ckan pylons_app.py ${CKAN_DIR}/ckan/config/middleware/pylons_app.py

USER ckan
Loading