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

vo-frontend: Patch for GWMS 3.10.7, cleanups #192

Merged
merged 2 commits into from
Jun 25, 2024
Merged

vo-frontend: Patch for GWMS 3.10.7, cleanups #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ed5d77
vo-frontend: Patch for GWMS 3.10.7, cleanups
rynge Jun 25, 2024
f33cdbd
Removed GSI auth
rynge Jun 25, 2024
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
5 changes: 2 additions & 3 deletions opensciencegrid/vo-frontend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ARG BASE_YUM_REPO=release
ARG BASE_OSG_SERIES=3.6
ARG BASE_OSG_SERIES=23
ARG BASE_OS=el9

FROM opensciencegrid/software-base:$BASE_OSG_SERIES-$BASE_OS-$BASE_YUM_REPO

LABEL maintainer OSG Software <help@opensciencegrid.org>
LABEL maintainer OSG Software <support@osg-htc.org>

# Create the frontend user with a fixed GID/UID
# This is important so that we can use the same IDs in the persistent volume used for
Expand All @@ -29,7 +29,6 @@ RUN rm -rf /var/log/gwms-frontend/*

# patch gwms (but only for certain versions)
ADD patches /opt/gwms-patches
#RUN if rpm -qa | grep glideinwms-libs-3.9.4; then /tmp/patch_gwms.sh; fi
RUN VERSION=$(rpm -qa | grep glideinwms-libs | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') && \
if [ -e /opt/gwms-patches/$VERSION.sh ]; then \
/opt/gwms-patches/$VERSION.sh; \
Expand Down
35 changes: 35 additions & 0 deletions opensciencegrid/vo-frontend/patches/3.10.7.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#!/bin/bash
set -e
# Use git diff in the glideinwms checkout to generate the patch
SITE_PACKAGES=$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')
pushd $SITE_PACKAGES/glideinwms
patch -p1 <<'__END_PATCH__'
diff --git a/creation/lib/cvWCreate.py b/creation/lib/cvWCreate.py
index f88353830..80e0c943a 100644
--- a/creation/lib/cvWCreate.py
+++ b/creation/lib/cvWCreate.py
@@ -210,7 +210,7 @@ def create_client_condor_config(config_fname, mapfile_fname, collector_nodes, cl
fd.write("############################\n")

fd.write("\n# Force GSI authentication\n")
- fd.write("SEC_DEFAULT_AUTHENTICATION_METHODS = IDTOKENS, GSI\n")
+ fd.write("SEC_DEFAULT_AUTHENTICATION_METHODS = IDTOKENS, SSL\n")
fd.write("SEC_DEFAULT_AUTHENTICATION = REQUIRED\n")

fd.write("\n#################################\n")
@@ -224,7 +224,12 @@ def create_client_condor_config(config_fname, mapfile_fname, collector_nodes, cl
fd.write("# I.e. we only talk to servers that have \n")
fd.write("# a DN mapped in our mapfile\n")
for context in condorSecurity.CONDOR_CONTEXT_LIST:
- fd.write("DENY_%s = anonymous@*\n" % context)
+ if context == "CLIENT":
+ # as we map SSL to anonymous, but want to allow
+ # anonymous clients, just put a placeholder for CLIENT
+ fd.write("DENY_%s = no-deny\n" % context)
+ else:
+ fd.write("DENY_%s = anonymous@*\n" % context)
fd.write("\n")
for context in condorSecurity.CONDOR_CONTEXT_LIST:
fd.write("ALLOW_%s = *@*\n" % context)
__END_PATCH__
popd
Loading