From 959573b1f224fa2c676d4e4d8ba57911d2b2f6ac Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 12 Dec 2022 18:03:28 -0800 Subject: [PATCH 1/5] Update XrdSciTokensAccess.cc --- src/XrdSciTokens/XrdSciTokensAccess.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/XrdSciTokens/XrdSciTokensAccess.cc b/src/XrdSciTokens/XrdSciTokensAccess.cc index 93a72fe2460..0d3a7497de6 100644 --- a/src/XrdSciTokens/XrdSciTokensAccess.cc +++ b/src/XrdSciTokens/XrdSciTokensAccess.cc @@ -1083,6 +1083,16 @@ class XrdAccSciTokens : public XrdAccAuthorize, public XrdSciTokensHelper section.c_str()); continue; } + // prevent two + for (size_t i = 0; i < issuer.length(); i++) + { + if (issuer[i] == '\n') + { + issuer = issuer.substr(0,i); + break; + } + } + m_log.Log(LogMask::Debug, "Reconfig", "Configuring issuer", issuer.c_str()); std::vector rules; From a2ee18c1a630fca23e00771d65a7f57022bf7248 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 12 Dec 2022 18:04:59 -0800 Subject: [PATCH 2/5] Update XrdSciTokensAccess.cc --- src/XrdSciTokens/XrdSciTokensAccess.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/XrdSciTokens/XrdSciTokensAccess.cc b/src/XrdSciTokens/XrdSciTokensAccess.cc index 0d3a7497de6..917607b4f23 100644 --- a/src/XrdSciTokens/XrdSciTokensAccess.cc +++ b/src/XrdSciTokens/XrdSciTokensAccess.cc @@ -1083,7 +1083,7 @@ class XrdAccSciTokens : public XrdAccAuthorize, public XrdSciTokensHelper section.c_str()); continue; } - // prevent two + // prevent two identical issuer break the config for (size_t i = 0; i < issuer.length(); i++) { if (issuer[i] == '\n') From 4c5245b5b872e50d8b43e45b2c11cf9bd2c65120 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 12 Dec 2022 18:16:10 -0800 Subject: [PATCH 3/5] Update XrdSciTokensAccess.cc --- src/XrdSciTokens/XrdSciTokensAccess.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/XrdSciTokens/XrdSciTokensAccess.cc b/src/XrdSciTokens/XrdSciTokensAccess.cc index 917607b4f23..8aebe1d69d3 100644 --- a/src/XrdSciTokens/XrdSciTokensAccess.cc +++ b/src/XrdSciTokens/XrdSciTokensAccess.cc @@ -1083,7 +1083,7 @@ class XrdAccSciTokens : public XrdAccAuthorize, public XrdSciTokensHelper section.c_str()); continue; } - // prevent two identical issuer break the config + // prevent two identical issuers break the config for (size_t i = 0; i < issuer.length(); i++) { if (issuer[i] == '\n') From 280c9e75cf0f2165d950016b25300c617463fc98 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 12 Dec 2022 20:54:53 -0800 Subject: [PATCH 4/5] Update XrdSciTokensAccess.cc --- src/XrdSciTokens/XrdSciTokensAccess.cc | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/XrdSciTokens/XrdSciTokensAccess.cc b/src/XrdSciTokens/XrdSciTokensAccess.cc index 8aebe1d69d3..404e2fb307c 100644 --- a/src/XrdSciTokens/XrdSciTokensAccess.cc +++ b/src/XrdSciTokens/XrdSciTokensAccess.cc @@ -1083,18 +1083,18 @@ class XrdAccSciTokens : public XrdAccAuthorize, public XrdSciTokensHelper section.c_str()); continue; } + // prevent two identical issuers break the config - for (size_t i = 0; i < issuer.length(); i++) + char* issuer_c = const_cast(issuer.c_str()); + char* issuer_first = index(issuer_c,'\n'); + if (issuer_first) { - if (issuer[i] == '\n') - { - issuer = issuer.substr(0,i); - break; - } + issuer_first++; + issuer = issuer_first; } - m_log.Log(LogMask::Debug, "Reconfig", "Configuring issuer", issuer.c_str()); + std::vector rules; auto name_mapfile = reader.Get(section, "name_mapfile", ""); if (!name_mapfile.empty()) { @@ -1112,6 +1112,16 @@ class XrdAccSciTokens : public XrdAccAuthorize, public XrdSciTokensHelper section.c_str()); continue; } + + char* base_path_c = const_cast(base_path.c_str()); + char* base_path_first = index(base_path_c,'\n'); + if (base_path_first) + { + base_path_first++; + base_path = base_path_first; + } + m_log.Log(LogMask::Debug, "Reconfig", "Configuring issuer base_path", base_path.c_str()); + size_t pos = 7; while (section.size() > pos && std::isspace(section[pos])) {pos++;} From 5766bb680dfcc04c5740a46bce5a2da0aa40374b Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 12 Dec 2022 22:32:28 -0800 Subject: [PATCH 5/5] Update XrdSciTokensAccess.cc --- src/XrdSciTokens/XrdSciTokensAccess.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/XrdSciTokens/XrdSciTokensAccess.cc b/src/XrdSciTokens/XrdSciTokensAccess.cc index 404e2fb307c..a2e1aedf021 100644 --- a/src/XrdSciTokens/XrdSciTokensAccess.cc +++ b/src/XrdSciTokens/XrdSciTokensAccess.cc @@ -1086,7 +1086,7 @@ class XrdAccSciTokens : public XrdAccAuthorize, public XrdSciTokensHelper // prevent two identical issuers break the config char* issuer_c = const_cast(issuer.c_str()); - char* issuer_first = index(issuer_c,'\n'); + char* issuer_first = rindex(issuer_c,'\n'); if (issuer_first) { issuer_first++; @@ -1114,7 +1114,7 @@ class XrdAccSciTokens : public XrdAccAuthorize, public XrdSciTokensHelper } char* base_path_c = const_cast(base_path.c_str()); - char* base_path_first = index(base_path_c,'\n'); + char* base_path_first = rindex(base_path_c,'\n'); if (base_path_first) { base_path_first++;