Merge pull request #540 from htcondor/HTCONDOR-1071-rename-AuthToken-…

…attrs HTCONDOR-1017 Rename source job AuthToken* attributes in CE routed jobs
htcondor · May 31, 2022 · ec4c361 · ec4c361
2 parents 064677c + f7bc7fc
commit ec4c361
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/config/01-ce-router-defaults.conf b/config/01-ce-router-defaults.conf
@@ -137,6 +137,8 @@ JOB_ROUTER_TRANSFORM_Cleanup @=jrt
 
 
 JOB_ROUTER_TRANSFORM_OrigRequests @=jrt
+    # The AuthToken* attributes can't be sent on to the destination schedd, so we rename them here
+    RENAME /^AuthToken.*$/          orig_\0
     # Copy original, incoming job attributes for use in post transforms
     COPY /^OnExitHold.*$/          orig_\0
     COPY BatchRuntime              orig_BatchRuntime

diff --git a/src/condor_ce_router_defaults b/src/condor_ce_router_defaults
@@ -38,6 +38,13 @@ JOB_ROUTER_DEFAULTS_GENERATED @=jrd
     delete_TotalSubmitProcs = true;
     set_RoutedJob = true;
 
+    /* Copy AuthToken attributes if they exist - the routed job will have the original attributes deleted */
+    copy_AuthTokenSubject = "orig_AuthTokenSubject";
+    copy_AuthTokenIssuer = "orig_AuthTokenIssuer";
+    copy_AuthTokenGroups = "orig_AuthTokenGroups";
+    copy_AuthTokenScopes = "orig_AuthTokenScopes";
+    copy_AuthTokenId = "orig_AuthTokenId";
+
     /* Set the environment */
     copy_environment = "orig_environment";
     set_osg_environment = "{osg_environment}";