Merge pull request htcondor#548 from timtheisen/V5-HTCONDOR-1313-pcre2-regex

matyasselmeci · web-flow · commit 0220409b7cd7 · 2022-09-14T12:45:23.000-05:00
HTCONDOR-1313: Make mapfile regular expressions PCRE2 compliant
diff --git a/config/mapfiles.d/50-central-collector.conf b/config/mapfiles.d/50-central-collector.conf
@@ -8,4 +8,4 @@
 #
 ###############################################################################
 
-GSI /[-.A-Za-z0-9\/= ]*\/CN=([-.A-Za-z0-9\/= ]+)/ \1@unmapped.htcondor.org
+GSI /[.A-Za-z0-9\/=[:space:]-]*\/CN=([.A-Za-z0-9\/=[:space:]-]+)/ \1@unmapped.htcondor.org
diff --git a/config/mapfiles.d/50-common-default.conf b/config/mapfiles.d/50-common-default.conf
@@ -8,7 +8,7 @@
 #
 ###############################################################################
 
-SSL /\/CN=([-.A-Za-z0-9\/= ]+)/ \1@unmapped.htcondor.org
+SSL /\/CN=([.A-Za-z0-9\/=[:space:]-]+)/ \1@unmapped.htcondor.org
 CLAIMTOBE /.*/ anonymous@claimtobe
 FS /^(root|condor)$/ \1@daemon.htcondor.org
 FS /(.*)/ \1

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@`
`8`	`8`	`#`
`9`	`9`	`###############################################################################`
`10`	`10`
`11`		`-GSI /[-.A-Za-z0-9\/= ]*\/CN=([-.A-Za-z0-9\/= ]+)/ \[email protected]`
	`11`	`+GSI /[.A-Za-z0-9\/=[:space:]-]*\/CN=([.A-Za-z0-9\/=[:space:]-]+)/ \[email protected]`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`###############################################################################`
`10`	`10`
`11`		`-SSL /\/CN=([-.A-Za-z0-9\/= ]+)/ \[email protected]`
	`11`	`+SSL /\/CN=([.A-Za-z0-9\/=[:space:]-]+)/ \[email protected]`
`12`	`12`	`CLAIMTOBE /.*/ anonymous@claimtobe`
`13`	`13`	`FS /^(root\|condor)$/ \[email protected]`
`14`	`14`	`FS /(.*)/ \1`