Fix LoginResource

Author: masseb974

knowage-core/src/main/java/it/eng/spagobi/commons/services/LoginConfigResource.java

@@ -42,8 +42,8 @@ public Response getLoginConfig(@Context HttpServletRequest req) {
 			item.put("defaultLanguage", config.getConfigValue("SPAGOBI.LANGUAGE_SUPPORTED.LANGUAGE.default"));
 			item.put("oauth2FlowType", oauth2FlowType);
 
-			item.put("JWT_LABEL", System.getProperty("JWT_LABEL", System.getenv("JWT_LABEL")));
-			item.put("JWT_SESSION_STORAGE", System.getProperty("JWT_SESSION_STORAGE", System.getenv("JWT_SESSION_STORAGE")));
+			item.put("jwtLabel", System.getProperty("JWT_LABEL", System.getenv("JWT_LABEL")));
+			item.put("jwtSessionStorage", System.getProperty("JWT_SESSION_STORAGE", System.getenv("JWT_SESSION_STORAGE")));
 
 			if (oauth2FlowType != null && !oauth2FlowType.equalsIgnoreCase("NONE")) {
 				OAuth2Config oauth2Config = OAuth2Config.getInstance();

knowage-core/src/main/java/it/eng/spagobi/commons/services/LoginResource.java

@@ -63,6 +63,7 @@
 import it.eng.spagobi.commons.utilities.TOTPService;
 import it.eng.spagobi.commons.utilities.UserUtilities;
 import it.eng.spagobi.commons.utilities.messages.MessageBuilder;
+import it.eng.spagobi.utilities.rest.RestUtilities;
 import it.eng.spagobi.profiling.bean.SbiUser;
 import it.eng.spagobi.profiling.dao.ISbiUserDAO;
 import it.eng.spagobi.security.InternalSecurityServiceSupplierImpl;
@@ -331,12 +332,23 @@ public Response verifyMfaCode(@Context HttpServletRequest req, Map<String, Strin
 	@POST
 	@Path("/oauth2")
 	@PublicService
-	public Response loginOAuth2(@Context HttpServletRequest req) throws Exception {
+	public Response loginOAuth2(@Context HttpServletRequest req, Map<String, String> payload) throws Exception {
 
 		IKnowageMonitor monitor = KnowageMonitorFactory.getInstance().start("knowage.login.oauth2.authentication");
 
 		try {
-			return performOAuth2Login(req, monitor, true);
+
+			// Store payload as request attribute if present
+			if (payload != null) {
+				String jwtLabel = System.getProperty("JWT_LABEL", System.getenv("JWT_LABEL"));
+				req.setAttribute(jwtLabel, payload.get(jwtLabel));
+			}
+
+			// Check JWT_SESSION_STORAGE variable
+			String jwtSessionStorage = System.getProperty("JWT_SESSION_STORAGE", System.getenv("JWT_SESSION_STORAGE"));
+			boolean requiresRedirect = StringUtils.isBlank(jwtSessionStorage);
+
+			return performOAuth2Login(req, monitor, requiresRedirect);
 		} catch (Exception e) {
 			logger.error("Unexpected error during OAuth2 login", e);
 			monitor.stop(e);
@@ -863,8 +875,8 @@ private Response completeLogin(HttpServletRequest req, IEngUserProfile profile,
 			}
 
 			if (requiresRedirect) {
-				URI redirectUri = URI
-						.create(System.getProperty("JWT_KNOWAGE_VUE", System.getenv("JWT_KNOWAGE_VUE")) + "login?authToken=" + profile.getUserUniqueIdentifier());
+				String origin = RestUtilities.getOrigin(req);
+				URI redirectUri = URI.create(origin + "/knowage-vue/login?authToken=" + profile.getUserUniqueIdentifier());
 				return Response.seeOther(redirectUri).build();
 			} else {
 				Object idToken = req.getAttribute(Oauth2SsoService.ID_TOKEN);

knowage/src/main/webapp/index.jsp

@@ -1,17 +1,17 @@
 <%--
 Knowage, Open Source Business Intelligence suite
 Copyright (C) 2016 Engineering Ingegneria Informatica S.p.A.
-  
+
 Knowage 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.
- 
+
 Knowage 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.  If not, see <http://www.gnu.org/licenses/>.
 --%>
@@ -20,13 +20,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
          extends="it.eng.spago.dispatching.httpchannel.AbstractHttpJspPage"
          contentType="text/html; charset=UTF-8"
          pageEncoding="UTF-8"
-         session="true" %>
-<%@page import="it.eng.spagobi.commons.utilities.ChannelUtilities"%>
-                
-<% 
-	//default url
-	String contextName = ChannelUtilities.getSpagoBIContextName(request);
-	String queryString = request.getQueryString(); // get query string with eventual parameters to propagate them
-	String redirectURL = contextName + "/servlet/AdapterHTTP?PAGE=LoginPage&NEW_SESSION=TRUE" + (queryString != null ? "&" + queryString : "");
+         session="true"
+         import="it.eng.spagobi.utilities.rest.RestUtilities" %>
+
+<%
+    String origin = RestUtilities.getOrigin(request);
+    String queryString = request.getQueryString();
+    String redirectURL = origin + "/knowage-vue/login" + (queryString != null ? "?" + queryString : "");
     response.sendRedirect(redirectURL);
 %>

knowageutils/src/main/java/it/eng/spagobi/services/common/GenericJWTSsoService.java

@@ -164,9 +164,24 @@ private String getJWT(HttpServletRequest request) throws Exception {
 	}
 
 	private String getJWTFromLabel(HttpServletRequest request, String jwtLabel) {
-		return request.getHeader(jwtLabel) == null ? request.getParameter(jwtLabel) : request.getHeader(jwtLabel);
+		// Check header first
+		String token = request.getHeader(jwtLabel);
+		if (token != null) {
+			return token;
+		}
+
+		// Check GET/POST form parameters
+		token = request.getParameter(jwtLabel);
+		if (token != null) {
+			return token;
+		}
+
+		// Check request attribute (set by loginOAuth2 for POST with payload)
+		token = (String) request.getAttribute(jwtLabel);
+		return token;
 	}
 
+
 	private String getJWTFromURL(HttpServletRequest request, String jwtURLMethod) {
 
 		try {

knowageutils/src/main/java/it/eng/spagobi/utilities/rest/RestUtilities.java

@@ -546,4 +546,25 @@ public static void checkIfAddressIsInWhitelist(String address) {
 		} catch (MalformedURLException e) {
 			throw new SpagoBIRuntimeException("Invalid URL format: " + address, e);
 		}
-	}}
+	}
+
+	/**
+	 * Calculates the origin (scheme + host + port) from the HttpServletRequest.
+	 * The port is included only if it's not the default port for the scheme (80 for HTTP, 443 for HTTPS).
+	 *
+	 * @param request the HttpServletRequest
+	 * @return the origin URL (e.g., http://localhost:8080 or https://example.com)
+	 */
+	public static String getOrigin(HttpServletRequest request) {
+		String scheme = request.getScheme();
+		String serverName = request.getServerName();
+		int serverPort = request.getServerPort();
+
+		String origin = scheme + "://" + serverName;
+		if ((scheme.equals("http") && serverPort != 80) || (scheme.equals("https") && serverPort != 443)) {
+			origin += ":" + serverPort;
+		}
+
+		return origin;
+	}
+}