Resolved merge conflicts

Author: TanyaEf

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

@@ -0,0 +1,56 @@
+package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.core;
+
+import com.jaspersoft.jasperserver.jaxrs.client.core.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.testng.AssertJUnit.assertNotNull;
+
+/**
+ * @author Tetiana Iefimenko
+ */
+public class JasperserverRestClientIT {
+
+
+    private RestClientConfiguration config;
+    private JasperserverRestClient client;
+    Session session;
+
+    @BeforeMethod
+    public void before() {
+        config = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
+        config.setAcceptMimeType(MimeType.JSON);
+        config.setContentMimeType(MimeType.JSON);
+        config.setJrsVersion(JRSVersion.v6_0_0);
+        client = new JasperserverRestClient(config);
+    }
+
+    @Test
+    public void should_return_session_via_j_sucurity_check() {
+        config.setAuthenticationType(AuthenticationType.SPRING);
+        session = client.authenticate("superuser", "superuser");
+        assertNotNull(session);
+        assertNotNull(session.getStorage().getSessionId());
+    }
+
+    @Test
+    public void should_return_session_via_rest_login() {
+        session = client.authenticate("superuser", "superuser");
+        assertNotNull(session);
+        assertNotNull(session.getStorage().getSessionId());
+    }
+
+    @Test
+    public void should_return_session_via_basic_login() {
+        config.setAuthenticationType(AuthenticationType.BASIC);
+        session = client.authenticate("jasperadmin", "jasperadmin");
+        assertNotNull(session);
+    }
+
+    @AfterMethod
+    public  void  after() {
+        session.logout();
+    }
+}
+

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2005 - 2014 Jaspersoft Corporation. All rights  reserved.
+ * http://www.jaspersoft.com.
+ *
+ * Unless you have purchased  a commercial license agreement from Jaspersoft,
+ * the following license terms  apply:
+ *
+ * This program is free software: you can redistribute it and/or  modify
+ * it under the terms of the GNU Affero General Public License  as
+ * published by the Free Software Foundation, either version 3 of  the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero  General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public  License
+ * along with this program.&nbsp; If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.jaspersoft.jasperserver.jaxrs.client.core;
+
+public enum AuthenticationType {
+    REST, SPRING, BASIC;
+}

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

@@ -21,7 +21,9 @@
 package com.jaspersoft.jasperserver.jaxrs.client.core;
 
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
+import com.jaspersoft.jasperserver.jaxrs.client.filters.BasicAuthenticationFilter;
 import com.jaspersoft.jasperserver.jaxrs.client.filters.SessionOutputFilter;
+import org.glassfish.jersey.client.ClientProperties;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
@@ -38,11 +40,16 @@ public JasperserverRestClient(RestClientConfiguration configuration) {
         }
         this.configuration = configuration;
     }
+
     public Session authenticate(String username, String password) {
-        AuthenticationCredentials credentials = new AuthenticationCredentials(username, password);
-        SessionStorage sessionStorage = new SessionStorage(configuration, credentials);
-        login(sessionStorage);
-        return new Session(sessionStorage);
+
+        if (username != null && username.length() > 0 && password != null && password.length() > 0) {
+            AuthenticationCredentials credentials = new AuthenticationCredentials(username, password);
+            SessionStorage sessionStorage = new SessionStorage(configuration, credentials);
+            login(sessionStorage);
+            return new Session(sessionStorage);
+        }
+        return null;
     }
 
     public AnonymousSession getAnonymousSession() {
@@ -53,13 +60,22 @@ protected void login(SessionStorage storage) {
 
         AuthenticationCredentials credentials = storage.getCredentials();
         WebTarget rootTarget = storage.getRootTarget();
+        if (configuration.getAuthenticationType() == AuthenticationType.BASIC) {
+            rootTarget.register(new BasicAuthenticationFilter(credentials));
+            return;
+        }
         Form form = new Form();
         form.param("j_username", credentials.getUsername()).param("j_password", credentials.getPassword());
-
-        WebTarget target = rootTarget.path("/rest/login");
+        WebTarget target;
+        if (configuration.getAuthenticationType() == AuthenticationType.SPRING) {
+            target = rootTarget.path("/j_spring_security_check")
+                    .property(ClientProperties.FOLLOW_REDIRECTS, Boolean.FALSE);
+        } else {
+            target = rootTarget.path("/rest/login");
+        }
         Response response = target.request().post(Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
         String sessionId = null;
-        if (response.getStatus() == ResponseStatus.OK) {
+        if (isResponseSuccessful(response)) {
             sessionId = response.getCookies().get("JSESSIONID").getValue();
             storage.setSessionId(sessionId);
         } else {
@@ -68,4 +84,14 @@ protected void login(SessionStorage storage) {
         rootTarget.register(new SessionOutputFilter(sessionId));
     }
 
+    private boolean isResponseSuccessful(Response response) {
+        if ((configuration.getAuthenticationType() == AuthenticationType.SPRING
+                || configuration.getAuthenticationType() == AuthenticationType.REST)
+                && (response.getStatus() == ResponseStatus.FOUND
+                || response.getStatus() == ResponseStatus.OK)) {
+            return true;
+        }
+        return false;
+    }
+
 }

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

@@ -21,16 +21,19 @@
 
 package com.jaspersoft.jasperserver.jaxrs.client.core;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
 import java.io.InputStream;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
 
 public class RestClientConfiguration {
 
@@ -41,10 +44,12 @@ public class RestClientConfiguration {
     private MimeType contentMimeType = MimeType.JSON;
     private MimeType acceptMimeType = MimeType.JSON;
     private JRSVersion jrsVersion = JRSVersion.v5_5_0;
+    private AuthenticationType authenticationType = AuthenticationType.REST;
+    private Boolean restrictedHttpMethods = false;
     private TrustManager[] trustManagers;
     private Integer connectionTimeout;
+
     private Integer readTimeout;
-    private Boolean restrictedHttpMethods = false;
 
     public RestClientConfiguration(String jasperReportsServerUrl) {
         this();
@@ -79,6 +84,13 @@ public void setJasperReportsServerUrl(String jasperReportsServerUrl) {
             throw new IllegalArgumentException("Given parameter is not a URL");
         this.jasperReportsServerUrl = jasperReportsServerUrl;
     }
+    public AuthenticationType getAuthenticationType() {
+        return authenticationType;
+    }
+
+    public void setAuthenticationType(AuthenticationType authenticationType) {
+        this.authenticationType = authenticationType;
+    }
 
     public MimeType getContentMimeType() {
         return contentMimeType;
@@ -104,7 +116,7 @@ public void setJrsVersion(JRSVersion jrsVersion) {
         this.jrsVersion = jrsVersion;
     }
 
-    public TrustManager[] getTrustManagers() {
+     public TrustManager[] getTrustManagers() {
         return trustManagers;
     }
 

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

@@ -38,17 +38,24 @@
 import javax.ws.rs.core.Response;
 
 
+
 public class Session extends AnonymousSession{
 
+
     public Session(SessionStorage sessionStorage) {
         super(sessionStorage);
     }
 
     public void logout() {
-        WebTarget target = storage.getRootTarget().path("/exituser.html");
-        Response response = target.request().get();
-        if (response.getStatus() >= 400) {
-            new DefaultErrorHandler().handleError(response);
+        if (storage.getConfiguration().getAuthenticationType() == AuthenticationType.BASIC) {
+            storage.getCredentials().setUsername(null);
+            storage.getCredentials().setPassword(null);
+        } else {
+            WebTarget target = storage.getRootTarget().path("/exituser.html");
+            Response response = target.request().get();
+            if (response.getStatus() >= 400) {
+                new DefaultErrorHandler().handleError(response);
+            }
         }
     }
 

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

@@ -24,15 +24,20 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-import java.security.SecureRandom;
+
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.jackson.JacksonFeature;
+
+
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.jackson.JacksonFeature;
+
+import java.security.SecureRandom;
+
 
 public class SessionStorage {
 

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/filters/BasicAuthenticationFilter.java

@@ -0,0 +1,43 @@
+package com.jaspersoft.jasperserver.jaxrs.client.filters;
+
+import com.jaspersoft.jasperserver.jaxrs.client.core.AuthenticationCredentials;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.xml.bind.DatatypeConverter;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @author Tetiana Iefimenko
+ */
+public class BasicAuthenticationFilter implements ClientRequestFilter {
+    private final AuthenticationCredentials credentials;
+
+    public BasicAuthenticationFilter(AuthenticationCredentials credentials) {
+        this.credentials = credentials;
+
+    }
+
+    @Override
+    public void filter(ClientRequestContext clientRequestContext) throws IOException {
+        MultivaluedMap<String, Object> headers = clientRequestContext.getHeaders();
+        if (credentials.getUsername() == null && credentials.getPassword() == null) {
+            return;
+        }
+        final String basicAuthentication = getBasicAuthentication();
+        headers.add("Authorization", basicAuthentication);
+
+    }
+
+    private String getBasicAuthentication() {
+        String token = this.credentials.getUsername() + ":" + this.credentials.getPassword();
+        try {
+            return "Basic " + DatatypeConverter.printBase64Binary(token.getBytes("UTF-8"));
+        } catch (UnsupportedEncodingException ex) {
+            throw new IllegalStateException("Cannot encode with UTF-8", ex);
+        }
+    }
+}
+

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/serverInfo/ServerInfoServiceTest.java

@@ -151,7 +151,6 @@ public void should_return_proper_server_version() throws Exception {
         PowerMockito.verifyPrivate(service, times(1)).invoke("buildServerInfoRequest", "/since");
         assertSame(retrieved, operationResultMock);
     }
-
     @Test
     public void should_return_proper_server_details() {