Handle case where there are multiple services

Author: byronantak

webapp/src/main/java/com/box/l10n/mojito/security/ServiceIdentifierParser.java

@@ -13,6 +13,7 @@ String parseHeader(String header) throws ServiceNotIdentifiableException {
     if (serviceIdentifierParserConfig.isEnabled()) {
       return keyValueParser.parseHeader(
           header,
+          serviceIdentifierParserConfig.getServiceInstanceDelimiter(),
           serviceIdentifierParserConfig.getKeyValueDelimiter(),
           serviceIdentifierParserConfig.getValueDelimiter(),
           serviceIdentifierParserConfig.getIdentifierKey());

webapp/src/main/java/com/box/l10n/mojito/security/ServiceIdentifierParserConfig.java

@@ -5,6 +5,9 @@
 
 @Component
 public class ServiceIdentifierParserConfig {
+  @Value("${l10n.spring.security.header.parser.serviceInstanceDelimiter:,}")
+  protected String serviceInstanceDelimiter;
+
   @Value("${l10n.spring.security.header.parser.keyValueDelimiter:;}")
   protected String keyValueDelimiter;
 
@@ -48,4 +51,12 @@ public String getIdentifierKey() {
   public void setIdentifierKey(String identifierKey) {
     this.identifierKey = identifierKey;
   }
+
+  public String getServiceInstanceDelimiter() {
+    return serviceInstanceDelimiter;
+  }
+
+  public void setServiceInstanceDelimiter(String serviceInstanceDelimiter) {
+    this.serviceInstanceDelimiter = serviceInstanceDelimiter;
+  }
 }

webapp/src/main/java/com/box/l10n/mojito/security/ServiceKeyValueParser.java

@@ -14,15 +14,19 @@ public class ServiceKeyValueParser {
   Logger logger = LoggerFactory.getLogger(ServiceKeyValueParser.class);
 
   public String parseHeader(
-      String header, String keyValueDelimiter, String valueDelimiter, String identifierKey)
+      String header, String serviceInstanceDelimiter, String keyValueDelimiter, String valueDelimiter, String identifierKey)
       throws ServiceNotIdentifiableException {
     logger.debug("Parsing header: {}", header);
     if (header == null || header.isEmpty()) {
       throw new ServiceNotIdentifiableException("Service identifier not found");
     }
 
+    String[] serviceIdentifiers = header.split(serviceInstanceDelimiter);
+    // Similarly to pinboard. We assume that only the last service identifier is relevant
+    String relevantService = serviceIdentifiers[serviceIdentifiers.length - 1];
+
     Map<String, String> keyValueMap =
-        Stream.of(header.split(keyValueDelimiter))
+        Stream.of(relevantService.split(keyValueDelimiter))
             .map(kv -> kv.split(valueDelimiter))
             .filter(pair -> pair.length == 2)
             .collect(Collectors.toMap(parts -> parts[0], parts -> parts[1]));

webapp/src/test/java/com/box/l10n/mojito/security/ServiceKeyValueParserTest.java

@@ -17,30 +17,37 @@ public void setUp() {
 
   @Test
   public void testParseHeader_EmptyHeaderOrNull() {
-    Executable executable = () -> parser.parseHeader("", ",", "=", "id");
+    Executable executable = () -> parser.parseHeader("", "/", ",", "=", "id");
     assertThrows(ServiceNotIdentifiableException.class, executable);
-    executable = () -> parser.parseHeader(null, ",", "=", "id");
+    executable = () -> parser.parseHeader(null,"&", ",", "=", "id");
     assertThrows(ServiceNotIdentifiableException.class, executable);
   }
 
   @Test
   public void testParseHeader_ValidCsvInput() {
     String header = "key1=value1,key2=value2,id=someService";
-    String result = parser.parseHeader(header, ",", "=", "id");
+    String result = parser.parseHeader(header, "&", ",", "=", "id");
     assertEquals("someService", result);
   }
 
+  @Test
+  public void testParseHeader_ValidMultipleServiceInstanceInput() {
+    String header = "key1=value1,key2=value2,id=firstService&id=lastService";
+    String result = parser.parseHeader(header, "&", ",", "=", "id");
+    assertEquals("lastService", result);
+  }
+
   @Test
   public void testParseHeader_ValidSemicolonInput() {
     String header = "key1:=value1;key2:=value2;id:=someService";
-    String result = parser.parseHeader(header, ";", ":=", "id");
+    String result = parser.parseHeader(header, "&",";", ":=", "id");
     assertEquals("someService", result);
   }
 
   @Test
   public void testParseHeader_NoIdentifierKey() {
     String header = "key1=value1,key2=value2";
-    Executable executable = () -> parser.parseHeader(header, ",", "=", "id");
+    Executable executable = () -> parser.parseHeader(header, "&",",", "=", "id");
     ServiceNotIdentifiableException exception =
         assertThrows(ServiceNotIdentifiableException.class, executable);
     assertEquals("Service identifier not found", exception.getMessage());
@@ -49,14 +56,14 @@ public void testParseHeader_NoIdentifierKey() {
   @Test
   public void testParseHeader_InvalidFormat() {
     String header = "key1=value1&key2value2&id=someService";
-    Executable executable = () -> parser.parseHeader(header, ";", "=", "id");
+    Executable executable = () -> parser.parseHeader(header, "-",";", "=", "id");
     assertThrows(ServiceNotIdentifiableException.class, executable);
   }
 
   @Test
   public void testParseHeader_EmptyServiceIdentifier() {
     String header = "key1=value1,key2=value2,id=";
-    Executable executable = () -> parser.parseHeader(header, ",", "=", "id");
+    Executable executable = () -> parser.parseHeader(header, "&",",", "=", "id");
     ServiceNotIdentifiableException exception =
         assertThrows(ServiceNotIdentifiableException.class, executable);
     assertEquals("Service identifier not found", exception.getMessage());