diff --git a/teamengine-core/src/main/java/com/occamlab/te/util/LogUtils.java b/teamengine-core/src/main/java/com/occamlab/te/util/LogUtils.java index 416bae47..b82ced16 100644 --- a/teamengine-core/src/main/java/com/occamlab/te/util/LogUtils.java +++ b/teamengine-core/src/main/java/com/occamlab/te/util/LogUtils.java @@ -34,6 +34,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; @@ -500,6 +501,15 @@ public static String generateSessionId(File logDir) { return session; } + /** + * Generates a session identifier for REST sessions. This will be a random UUID as + * String. + * @return a session id string + */ + public static String generateRestSessionId() { + return UUID.randomUUID().toString(); + } + /** * Generate a file in logDir refererring all logfiles. Create a file called * "report_logs.xml" in the log folder that includes all logs listed inside the diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java index 44dd4667..e730b186 100644 --- a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java +++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java @@ -356,13 +356,10 @@ private Source handleMultipartFormDataPost(String etsCode, String etsVersion, Fi private Source executeTestRun(String etsCode, Map> testRunArgs, String preferredMediaType) { List authCredentials = this.headers.getRequestHeader("Authorization"); - String logDir = System.getProperty("TE_BASE") + FileSystems.getDefault().getSeparator() + "users" - + FileSystems.getDefault().getSeparator() + TestRunUtils.getUserName(authCredentials) - + FileSystems.getDefault().getSeparator() + "rest"; + String logDir = System.getProperty("java.io.tmpdir"); if (null != logDir) { - String sessionId = LogUtils.generateSessionId(new File(logDir)); - + String sessionId = LogUtils.generateRestSessionId(); testRunArgs.put("logDir", List.of(logDir)); testRunArgs.put("sessionId", Collections.singletonList(sessionId)); } diff --git a/teamengine-web/src/main/webapp/createSession.jsp b/teamengine-web/src/main/webapp/createSession.jsp index 02070f93..6b6de110 100644 --- a/teamengine-web/src/main/webapp/createSession.jsp +++ b/teamengine-web/src/main/webapp/createSession.jsp @@ -1,5 +1,5 @@ <%@ page language="java" session="false" - import="java.util.*,com.occamlab.te.index.*,com.occamlab.te.config.*,com.occamlab.te.web.*"%><%! + import="java.util.*,java.io.*,com.occamlab.te.index.*,com.occamlab.te.config.*,com.occamlab.te.web.*,com.occamlab.te.util.*"%><%! Config Conf = null; List organizationList = null; Map> standardMap = null; @@ -196,7 +196,6 @@ } } - function removeAllOptions(selectbox) { var i; @@ -274,7 +273,13 @@ <%@ include file="header.jsp"%>
- +
<% String sessionId = LogUtils.generateSessionId(new File(Conf.getUsersDir(), request.getRemoteUser())); %> +Preparing session: <% out.println(sessionId); %>
+<% if(sessionId.equals("s0000")) { + out.println("Warning: You seem to have reached the maximum number of sessions. Starting the test might overwrite session s0000. Consider deleting sessions. View sessions"); +} +%> +

Select a test suite: