Merge branch '1.1.x'

Author: priitr

pom.xml

@@ -6,7 +6,7 @@
     <groupId>ee.ria.tara</groupId>
     <artifactId>tara-server</artifactId>
     <packaging>war</packaging>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
 
     <properties>
         <cas.version>5.1.9</cas.version>

src/main/java/ee/ria/sso/service/AbstractService.java

@@ -5,6 +5,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apereo.cas.authentication.principal.WebApplicationService;
+import org.apereo.cas.util.EncodingUtils;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 import org.springframework.webflow.core.collection.SharedAttributeMap;
@@ -54,11 +55,13 @@ private String getServiceUrlFromFlowContext(RequestContext context) {
     private String getClientIdParameterValue(String serviceParameter) {
         try {
             UriComponents serviceUri = UriComponentsBuilder.fromUriString(serviceParameter).build();
-            return serviceUri.getQueryParams().get("client_id").get(0);
+            String clientId = serviceUri.getQueryParams().getFirst("client_id");
+            if (clientId == null)
+                throw new IllegalStateException("No client_id found among query parameters!");
+            return clientId;
         } catch (Exception e) {
-            log.error("Failed to get client_id from service parameter!", e);
-
-            return null;
+            log.warn("Failed to get client_id from service parameter: " + e.getMessage());
+            return EncodingUtils.urlEncode(serviceParameter);
         }
     }
 

src/test/java/ee/ria/sso/service/AbstractServiceTest.java

@@ -12,6 +12,8 @@
 import org.springframework.webflow.test.MockParameterMap;
 import org.springframework.webflow.test.MockRequestContext;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -28,12 +30,22 @@ public void setUp() {
     }
 
     @Test
-    public void getServiceClientIdShouldReturnNullWhenMalformedServiceUrl() {
+    public void getServiceClientIdShouldReturnServiceUrlWhenMalformedServiceUrl() {
         RequestContext requestContext = getMockRequestContext(new HashMap<>());
         ((MockHttpServletRequest) requestContext.getExternalContext().getNativeRequest()).addParameter("service", "invalidUrl");
 
         String clientId = abstractService.getServiceClientId(requestContext);
-        Assert.assertEquals(null, clientId);
+        Assert.assertEquals("invalidUrl", clientId);
+    }
+
+    @Test
+    public void getServiceClientIdShouldReturnServiceUrlWhenMalformedServiceUrl2() throws UnsupportedEncodingException {
+        String serviceParameter = createStringFromRangeOfValues('\0', '\u007F');
+        RequestContext requestContext = getMockRequestContext(new HashMap<>());
+        ((MockHttpServletRequest) requestContext.getExternalContext().getNativeRequest()).addParameter("service", serviceParameter);
+
+        String clientId = abstractService.getServiceClientId(requestContext);
+        Assert.assertEquals(URLEncoder.encode(serviceParameter, "UTF-8"), clientId);
     }
 
     @Test
@@ -77,4 +89,15 @@ private RequestContext getMockRequestContext(Map<String, String> parameters) {
         return context;
     }
 
+    private String createStringFromRangeOfValues(char min, char max) {
+        final int length = (max - min) + 1;
+        char[] values = new char[length];
+
+        for (int i = 0; i < length; ++i) {
+            values[i] = (char) (min + i);
+        }
+
+        return new String(values);
+    }
+
 }