Small fix when multiple cookies sent.

opencadc · Jan 11, 2024 · 8a9a7f1 · 8a9a7f1
1 parent 1fa5979
commit 8a9a7f1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -5,6 +5,6 @@
 # tags with and without build number so operators use the versioned
 # tag but we always keep a timestamped tag in case a semantic tag gets
 # replaced accidentally
-VER=0.2.0
+VER=0.2.1
 TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
 unset VER
diff --git a/build.gradle b/build.gradle
@@ -21,8 +21,8 @@ repositories {
 
 dependencies {
     implementation 'com.opencsv:opencsv:[5.1,6.0)'
-    implementation 'commons-net:commons-net:3.6'
-    implementation 'org.apache.commons:commons-configuration2:2.3'
+    implementation 'commons-net:commons-net:3.9.0'
+    implementation 'org.apache.commons:commons-configuration2:2.7'
     implementation 'org.opencadc:cadc-access-control-identity:[1.1.0,)'
     implementation 'org.opencadc:cadc-gms:[1.0.12,2.0)'
     implementation 'org.opencadc:cadc-log:[1.1.5,)'

diff --git a/src/main/java/org/opencadc/scienceportal/SciencePortalAuthAction.java b/src/main/java/org/opencadc/scienceportal/SciencePortalAuthAction.java
@@ -106,6 +106,7 @@ protected Subject getCurrentSubject() throws Exception {
         if (StringUtil.hasText(rawCookieHeader)) {
             final String[] firstPartyCookies =
                     Arrays.stream(rawCookieHeader.split(";"))
+                          .map(String::trim)
                           .filter(cookieString -> cookieString.startsWith(
                                   ApplicationConfiguration.FIRST_PARTY_COOKIE_NAME))
                           .toArray(String[]::new);