v2.15.26

skavanagh · skavanagh · commit d0b1d902f348 · 2014-08-27T20:18:40.000-04:00
Fixed websocket path to support different contexts
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.keybox</groupId>
     <artifactId>keybox</artifactId>
-    <version>2.15.25</version>
+    <version>2.15.26</version>
     <packaging>war</packaging>
     <name>KeyBox</name>
     <properties>
diff --git a/src/main/java/com/keybox/manage/socket/SecureShellWS.java b/src/main/java/com/keybox/manage/socket/SecureShellWS.java
@@ -36,7 +36,7 @@
 /**
  * class to run commands and start thread to send web socket terminal output
  */
-@ServerEndpoint(value = "/terms.ws", configurator = GetHttpSessionConfigurator.class)
+@ServerEndpoint(value = "/admin/terms.ws", configurator = GetHttpSessionConfigurator.class)
 @SuppressWarnings("unchecked")
 public class SecureShellWS {
     private HttpSession httpSession;
diff --git a/src/main/webapp/admin/secure_shell.jsp b/src/main/webapp/admin/secure_shell.jsp
@@ -287,7 +287,7 @@ $(document).ready(function () {
     } else {
         ws_uri = "ws:";
     }
-    ws_uri += "//" + loc.host + '/terms.ws?t=' + new Date().getTime();
+    ws_uri += "//" + loc.host + loc.pathname + '/../terms.ws?t=' + new Date().getTime();
 
     var connection = new WebSocket(ws_uri);
 

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ $(document).ready(function () {`
`287`	`287`	`} else {`
`288`	`288`	`ws_uri = "ws:";`
`289`	`289`	`}`
`290`		`- ws_uri += "//" + loc.host + '/terms.ws?t=' + new Date().getTime();`
	`290`	`+ ws_uri += "//" + loc.host + loc.pathname + '/../terms.ws?t=' + new Date().getTime();`
`291`	`291`
`292`	`292`	`var connection = new WebSocket(ws_uri);`
`293`	`293`