Use and to connect two issuer names

joereuss12 · May 14, 2024 · ec4fd03 · ec4fd03
1 parent cb5f3c8
commit ec4fd03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/xrootd/authorization.go b/xrootd/authorization.go
@@ -561,7 +561,7 @@ func WriteOriginScitokensConfig(authedPaths []string) error {
 	if issuer, err := GenerateOriginIssuer(authedPaths); err == nil && len(issuer.Name) > 0 {
 		if val, ok := cfg.IssuerMap[issuer.Issuer]; ok {
 			val.BasePaths = append(val.BasePaths, issuer.BasePaths...)
-			val.Name += "; " + issuer.Name
+			val.Name += " and " + issuer.Name
 			cfg.IssuerMap[issuer.Issuer] = val
 		} else {
 			cfg.IssuerMap[issuer.Issuer] = issuer
@@ -574,7 +574,7 @@ func WriteOriginScitokensConfig(authedPaths []string) error {
 	if issuer, err := GenerateMonitoringIssuer(); err == nil && len(issuer.Name) > 0 {
 		if val, ok := cfg.IssuerMap[issuer.Issuer]; ok {
 			val.BasePaths = append(val.BasePaths, issuer.BasePaths...)
-			val.Name += "; " + issuer.Name
+			val.Name += " and " + issuer.Name
 			cfg.IssuerMap[issuer.Issuer] = val
 		} else {
 			cfg.IssuerMap[issuer.Issuer] = issuer
@@ -587,7 +587,7 @@ func WriteOriginScitokensConfig(authedPaths []string) error {
 	if issuer, err := GenerateDirectorMonitoringIssuer(); err == nil && len(issuer.Name) > 0 {
 		if val, ok := cfg.IssuerMap[issuer.Issuer]; ok {
 			val.BasePaths = append(val.BasePaths, issuer.BasePaths...)
-			val.Name += "; " + issuer.Name
+			val.Name += " and " + issuer.Name
 			cfg.IssuerMap[issuer.Issuer] = val
 		} else {
 			cfg.IssuerMap[issuer.Issuer] = issuer

diff --git a/xrootd/resources/test-scitokens-monitoring.cfg b/xrootd/resources/test-scitokens-monitoring.cfg
@@ -27,7 +27,7 @@ issuer = https://demo.scitokens.org
 base_path = /foo, /bar
 default_user = osg
 
-[Issuer Origin; Built-in Monitoring]
+[Issuer Origin and Built-in Monitoring]
 issuer = https://origin.example.com:8444
 base_path = /foo/bar, /pelican/monitoring