Merge branch 'develop'

Author: TanyaEf

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/core/TMP.java

@@ -0,0 +1,30 @@
+package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.core;
+
+/**
+ * @author Tetiana Iefimenko
+ */
+public class TMP {
+    public static void main(String[] args) {
+
+        String s = "[^?]+\\?([^&]*&)*error=1(&[^&]*)*$";
+        System.out.println("http://localhost:8080/jasperserver-pro/login.html?error=1".matches(s));
+        System.out.println("http://localhost:8080/jasperserver-pro/login.html?error=2&error=1".matches(s));
+        System.out.println("http://localhost:8080/jasperserver-pro/login.html?error=1&error=2".matches(s));
+        System.out.println("http://jasperserver.com/jasperserver-pro/login.html?error=1&error=2".matches(s));
+        System.out.println("http://jasperserver.com/jasperserver-pro/login.html?error=1&".matches(s));
+        System.out.println("http://jasperserver.com/jasperserver-p&ro/login.html?error=1&".matches(s));
+        System.out.println("http://jasperserver.com/jasperserver-p&ro/login.html?error=1&&".matches(s));
+        System.out.println("http://jasperserver.com/jasperserver-p&ro/login.html?error=1&dfdf?&".matches(s));
+        System.out.println("http://localhost:8080/jasperserver-pro/login.html??&error=1".matches(s));
+        System.out.println("http://localhost:8080/jasperserver-pro/login.html?&error=1".matches(s));
+        System.out.println("http://localhost:8080/jasperserver-pr&o/login.html?&error=1".matches(s));
+        System.out.println("http://localhost:8080/jasperserver-pro/login.html?&error=1".matches(s));
+        System.out.println("http://jasperserver.com/jasperserver-p&ro/login.html??&error=1&dfdf?&".matches(s));
+        System.out.println();
+        System.out.println("http://jasperserver.com/jasperserver-p&ro/login.html??error=1&dfdf?&".matches(s));
+        System.out.println("http://localhost:8080/jasperserver-pro/login.html?error=11".matches(s));
+        System.out.println("http://localhost:8080/jasperserver-pro/login.html?rtr&gfgfderror=1".matches(s));
+        System.out.println("http://localhost:8080/jasperserver-pro/login.html?fdhdfh=fbfhb?error=1".matches(s));
+        System.out.println("http://localhost:8080/jasperserver-pro/login.html&error=1".matches(s));
+    }
+}

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/JasperserverRestClient.java

@@ -73,7 +73,7 @@ protected void login(SessionStorage storage) {
         String sessionId = null;
         String location = response.getLocation().toString();
 
-        if (response.getStatus() == ResponseStatus.FOUND && !location.matches("^(https?)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*?error=1$")) {
+        if (response.getStatus() == ResponseStatus.FOUND && !location.matches("[^?]+\\?([^&]*&)*error=1(&[^&]*)*$")) {
             sessionId = response.getCookies().get("JSESSIONID").getValue();
             storage.setSessionId(sessionId);
         } else {