Merge branch 'master' of https://github.com/KnowageLabs/Knowage-Server

Author: masseb974

knowage-api/src/main/java/it/eng/knowage/logmanager/resource/LogsResource.java

@@ -30,7 +30,7 @@
 import java.util.List;
 
 @Path("/2.0/resources/logs")
-@Component
+@Component("logsResourceLogManager")
 @Validated
 
 /*

knowage-api/src/main/java/it/eng/knowage/logmanager/service/impl/LogManagerAPIImpl.java

@@ -1,7 +1,6 @@
 package it.eng.knowage.logmanager.service.impl;
 
 import it.eng.knowage.boot.error.KnowageRuntimeException;
-import it.eng.knowage.boot.utils.ContextPropertiesConfig;
 import it.eng.knowage.boot.utils.HMACUtilities;
 import it.eng.knowage.knowageapi.error.*;
 import it.eng.knowage.logmanager.resource.dto.LogFileDTO;
@@ -75,12 +74,13 @@ public LogFolderDTO getFolders(SpagoBIUserProfile profile) throws ImpossibleToRe
     * - Creates directories when missing.
     */
     public Path getWorkDirectory(SpagoBIUserProfile profile) throws IOException {
-        String logPathBase = ContextPropertiesConfig.getLogPath();
+        String catalinaBase = System.getProperty("catalina.base");
+        String logPathBase = catalinaBase + File.separator + "logs";
         Path totalPath = Paths.get(logPathBase);
-        if (!Files.isDirectory(totalPath)) {
-            LOGGER.info("The log folder is missing at [" + totalPath + "]. It will be created now.");
+        if (!Files.exists(totalPath)) {
             Files.createDirectories(totalPath);
         }
+
         return totalPath;
     }
 
@@ -151,7 +151,9 @@ private boolean canSee(Path path, SpagoBIUserProfile profile) throws IOException
 
         if (hasAdminFunctionality(profile)){
             String tenant = resolveTenant(profile);
-            Path baseLogPath = Paths.get(ContextPropertiesConfig.getLogPath()).normalize();
+            Path workDir = getWorkDirectory(profile).normalize();
+            //now that I have the work dir I can build the base log path
+            Path baseLogPath = workDir.normalize();
             Path logsRoot = baseLogPath.resolve("logs").normalize();
             Path target = path.normalize();
 

knowage-api/src/main/resources/application.properties

@@ -4,7 +4,6 @@ application.environment=${application.environment}
 
 jndi.lookup.hmackey=java:comp/env/hmacKey
 jndi.lookup.resourcepath=java:comp/env/resource_path
-jndi.lookup.logpath=java:comp/env/logs_path
 
 logging.level.org.springframework.web=ERROR
 logging.level.org.hibernate=ERROR

knowage-spring-boot-api-common/src/main/java/it/eng/knowage/boot/utils/ContextPropertiesConfig.java

@@ -47,11 +47,10 @@ public class ContextPropertiesConfig {
     private static String logPathKey;
 
 	@Autowired
-	public ContextPropertiesConfig(@Value("${jndi.lookup.hmackey}") String hmacKey, @Value("${jndi.lookup.resourcepath}") String resourcePathKey, @Value("${jndi.lookup.logpath}") String logPathKey) {
+	public ContextPropertiesConfig(@Value("${jndi.lookup.hmackey}") String hmacKey, @Value("${jndi.lookup.resourcepath}") String resourcePathKey) {
 		// TODO : values for static attributes shouldn't not be injected in a non-static way
 		this.hmacKey = hmacKey;
 		this.resourcePathKey = resourcePathKey;
-        this.logPathKey = logPathKey;
 	}
 
 	public static String jwtToken2userId(String jwtToken) throws JWTVerificationException {
@@ -83,18 +82,4 @@ public static String getResourcePath() {
 		}
 		return resourcePath;
 	}
-
-    public static String getLogPath() {
-        String logPath = null;
-        Context ctx;
-        try {
-            ctx = new InitialContext();
-            logPath = (String) ctx.lookup(logPathKey);
-
-        } catch (Exception e) {
-            throw new KnowageRuntimeException(e.getMessage(), e);
-        }
-        return logPath;
-    }
-
 }

knowage/src/main/webapp/themes/sbi_default/jsp/login.jsp

@@ -263,7 +263,7 @@
 	            	</form>
 	            	<% if (activeSignup){ %>
 		               	<button class="btn btn-lg btn-primary btn-block btn-signup" id="signupBtn" ><%=msgBuilder.getMessage("signup")%></button>
-		               	<a href="<%=urlBuilder.getResourceLink(request, "restful-services/signup/forgotPassword")%>"><%=msgBuilder.getMessage("signup.forgotPassword")%></a>
+		               	<a style="width: 100%;display: block;text-align: center;font-size: .8rem;margin-top: 8px;" href="<%=urlBuilder.getResourceLink(request, "restful-services/signup/forgotPassword")%>"><%=msgBuilder.getMessage("signup.forgotPassword")%></a>
 					<%} %> 
             	</div>
             	<!-- img class="col-xs-8 offset-sm-4 col-sm-4" src='<%=urlBuilder.getResourceLink(request, "themes/commons/img/defaultTheme/poweredBy.svg")%>' / -->