Updated with Swordfish 4.29.0

rmraya · rmraya · commit 839911d46a91 · 2024-01-24T09:47:32.000-03:00
diff --git a/WebContent/WEB-INF/lib/openxliff.jar b/WebContent/WEB-INF/lib/openxliff.jar
diff --git a/WebContent/WEB-INF/lib/swordfish.jar b/WebContent/WEB-INF/lib/swordfish.jar
diff --git a/WebContent/WEB-INF/lib/xmljava.jar b/WebContent/WEB-INF/lib/xmljava.jar
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
         "build": "tsc"
     },
     "dependencies": {
-        "@types/node": "^18.16.3",
-        "esbuild": "^0.19.5"
+        "@types/node": "^20.11.5",
+        "esbuild": "^0.19.11"
     }
 }
diff --git a/src/com/maxprograms/remotetm/Constants.java b/src/com/maxprograms/remotetm/Constants.java
@@ -18,8 +18,8 @@ private Constants() {
         // private for security
     }
 
-    public static final String VERSION = "5.7.0";
-    public static final String BUILD = "20231115_1100";
+    public static final String VERSION = "5.8.0";
+    public static final String BUILD = "20240122_2130";
 
     public static final String STATUS = "status";
     public static final String OK = "OK";
diff --git a/src/com/maxprograms/remotetm/rest/AuthorizeServlet.java b/src/com/maxprograms/remotetm/rest/AuthorizeServlet.java
@@ -15,6 +15,7 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.net.URISyntaxException;
 import java.security.NoSuchAlgorithmException;
 import java.sql.SQLException;
 import java.util.Base64;
@@ -75,7 +76,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
                 }
             }
             Utils.denyAccess(response);
-        } catch (IOException | SQLException | NoSuchAlgorithmException e) {
+        } catch (IOException | SQLException | NoSuchAlgorithmException | URISyntaxException e) {
             logger.log(Level.ERROR, e);
         }
     }
diff --git a/src/com/maxprograms/remotetm/rest/DownloadServlet.java b/src/com/maxprograms/remotetm/rest/DownloadServlet.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.net.URISyntaxException;
 import java.nio.file.Files;
 
 import javax.servlet.ServletException;
@@ -68,7 +69,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
                 }
             }
             Utils.denyAccess(response);
-        } catch (IOException e) {
+        } catch (IOException | URISyntaxException e) {
             logger.log(Level.ERROR, e);
         }
     }
diff --git a/src/com/maxprograms/remotetm/rest/EmailServerServlet.java b/src/com/maxprograms/remotetm/rest/EmailServerServlet.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.security.NoSuchAlgorithmException;
 import java.sql.SQLException;
@@ -76,7 +77,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
                 }
             }
             Utils.denyAccess(response);
-        } catch (IOException | SQLException | NoSuchAlgorithmException e) {
+        } catch (IOException | SQLException | NoSuchAlgorithmException | URISyntaxException e) {
             logger.log(Level.ERROR, e);
         }
     }
@@ -104,7 +105,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                 }
             }
             Utils.denyAccess(response);
-        } catch (IOException | SQLException | NoSuchAlgorithmException e) {
+        } catch (IOException | SQLException | NoSuchAlgorithmException | URISyntaxException e) {
             logger.log(Level.ERROR, e);
         }
     }
diff --git a/src/com/maxprograms/remotetm/rest/LogoutServlet.java b/src/com/maxprograms/remotetm/rest/LogoutServlet.java
@@ -15,6 +15,7 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.net.URISyntaxException;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -44,7 +45,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
             }
             result.put(Constants.STATUS, Constants.ERROR);
             Utils.writeResponse(result, response, 500);
-        } catch (IOException e) {
+        } catch (IOException | URISyntaxException e) {
             Logger logger = System.getLogger(LogoutServlet.class.getName());
             logger.log(Level.ERROR, e);
         }
diff --git a/src/com/maxprograms/remotetm/rest/MemoriesServlet.java b/src/com/maxprograms/remotetm/rest/MemoriesServlet.java
@@ -16,6 +16,7 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.net.URISyntaxException;
 import java.security.NoSuchAlgorithmException;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -84,7 +85,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
                 return;
             }
             Utils.denyAccess(response);
-        } catch (IOException e) {
+        } catch (IOException | URISyntaxException e) {
             logger.log(Level.ERROR, e);
         }
     }
diff --git a/src/com/maxprograms/remotetm/rest/PasswordResetServlet.java b/src/com/maxprograms/remotetm/rest/PasswordResetServlet.java
@@ -15,6 +15,7 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.net.URISyntaxException;
 import java.security.NoSuchAlgorithmException;
 import java.sql.SQLException;
 import java.util.Iterator;
@@ -82,7 +83,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                 return;
             }
             Utils.writeResponse(result, response, 200);
-        } catch (IOException e) {
+        } catch (IOException | URISyntaxException e) {
             Logger logger = System.getLogger(PasswordResetServlet.class.getName());
             logger.log(Level.ERROR, e);
         }
diff --git a/src/com/maxprograms/remotetm/rest/PermissionsServlet.java b/src/com/maxprograms/remotetm/rest/PermissionsServlet.java
@@ -15,6 +15,7 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.net.URISyntaxException;
 import java.security.NoSuchAlgorithmException;
 import java.sql.SQLException;
 import java.util.Iterator;
@@ -82,7 +83,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
                 return;
             }
             Utils.denyAccess(response);
-        } catch (IOException e) {
+        } catch (IOException | URISyntaxException e) {
             logger.log(Level.ERROR, e);
         }
     }
@@ -125,7 +126,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                 return;
             }
             Utils.denyAccess(response);
-        } catch (IOException e) {
+        } catch (IOException | URISyntaxException e) {
             logger.log(Level.ERROR, e);
         }
     }
diff --git a/src/com/maxprograms/remotetm/rest/UploadServlet.java b/src/com/maxprograms/remotetm/rest/UploadServlet.java
@@ -20,6 +20,7 @@
 import java.io.InputStreamReader;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.zip.ZipEntry;
@@ -134,7 +135,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                 return;
             }
             Utils.denyAccess(response);
-        } catch (IOException e) {
+        } catch (IOException | URISyntaxException e) {
             logger.log(Level.ERROR, e);
         }
     }
diff --git a/src/com/maxprograms/remotetm/rest/UsersServlet.java b/src/com/maxprograms/remotetm/rest/UsersServlet.java
@@ -15,6 +15,7 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.net.URISyntaxException;
 import java.security.NoSuchAlgorithmException;
 import java.sql.SQLException;
 import java.util.Iterator;
@@ -78,7 +79,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
                 return;
             }
             Utils.denyAccess(response);
-        } catch (IOException e) {
+        } catch (IOException | URISyntaxException e) {
             logger.log(Level.ERROR, e);
         }
     }
@@ -126,7 +127,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                 return;
             }
             Utils.denyAccess(response);
-        } catch (IOException e) {
+        } catch (IOException | URISyntaxException e) {
             logger.log(Level.ERROR, e);
         }
     }
diff --git a/src/com/maxprograms/remotetm/rest/VersionServlet.java b/src/com/maxprograms/remotetm/rest/VersionServlet.java
@@ -18,6 +18,8 @@
 import java.io.InputStreamReader;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 
 import javax.servlet.http.HttpServlet;
@@ -44,7 +46,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
             result.put(Constants.STATUS, Constants.OK);
             result.put("version", Constants.VERSION);
             result.put("build", Constants.BUILD);
-            URL home = new URL("https://maxprograms.com/remotetm.json");
+            URL home = new URI("https://maxprograms.com/remotetm.json").toURL();
             try (InputStream stream = home.openStream()) {
                 try (InputStreamReader reader = new InputStreamReader(stream)) {
                     StringBuilder builder = new StringBuilder();
@@ -58,7 +60,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
                 }
             }
             Utils.writeResponse(result, response, 200);
-        } catch (IOException e) {
+        } catch (IOException | URISyntaxException e) {
             Logger logger = System.getLogger(VersionServlet.class.getName());
             logger.log(Level.ERROR, e);
         }
diff --git a/src/com/maxprograms/remotetm/utils/SecurityFilter.java b/src/com/maxprograms/remotetm/utils/SecurityFilter.java
@@ -23,6 +23,7 @@
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.maxprograms.remotetm.Constants;
@@ -32,17 +33,24 @@ public class SecurityFilter implements Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
 			throws IOException, ServletException {
+		HttpServletRequest req = (HttpServletRequest) request;
 		HttpServletResponse res = (HttpServletResponse) response;
 
+		res.addHeader("X-Frame-Options", "SAMEORIGIN");
+		res.addHeader("X-XSS-Protection", "1; mode=block");
 		res.addHeader("X-Content-Type-Options", "nosniff");
 		res.addHeader("Cache-Control", "no-cache");
+		res.addHeader("Pragma", "no-cache");
+		res.addHeader("Expires", "0");
 		res.addHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains");
 		res.addHeader("X-Permitted-Cross-Domain-Policies", "master-only");
 		res.addHeader("Content-Security-Policy", "report-uri https://dev.maxprograms.com");
 		res.addHeader("Referrer-Policy", "no-referrer-when-downgrade");
-		res.addHeader("X-Frame-Options", "SAMEORIGIN");
-		res.addHeader("X-XSS-Protection", "1; mode=block");
-		res.addHeader("Permissions-Policy", "geolocation=(), camera=(), microphone=()");
+		res.addHeader("Permissions-Policy", "microphone=(), camera=()");
+		if ("/RemoteTM/".equals(req.getRequestURI())) {
+			res.setContentType("text/html");
+			res.addHeader("Content-type", "text/html");
+		}
 		res.setCharacterEncoding(StandardCharsets.UTF_8.name());
 		try {
 			chain.doFilter(request, response);
diff --git a/src/com/maxprograms/remotetm/utils/Utils.java b/src/com/maxprograms/remotetm/utils/Utils.java
@@ -19,6 +19,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -85,8 +87,8 @@ public static String generatePassword() throws NoSuchAlgorithmException {
         return sb.toString();
     }
 
-    public static boolean isSafe(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        URL url = new URL(request.getRequestURL().toString());
+    public static boolean isSafe(HttpServletRequest request, HttpServletResponse response) throws IOException, URISyntaxException {
+        URL url = new URI(request.getRequestURL().toString()).toURL();
         if (!Constants.HTTPS.equals(url.getProtocol())) {
             denyAccess(response);
             return false;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"build": "tsc"`
`18`	`18`	`},`
`19`	`19`	`"dependencies": {`
`20`		`- "@types/node": "^18.16.3",`
`21`		`- "esbuild": "^0.19.5"`
	`20`	`+ "@types/node": "^20.11.5",`
	`21`	`+ "esbuild": "^0.19.11"`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ private Constants() {`
`18`	`18`	`// private for security`
`19`	`19`	`}`
`20`	`20`
`21`		`- public static final String VERSION = "5.7.0";`
`22`		`- public static final String BUILD = "20231115_1100";`
	`21`	`+ public static final String VERSION = "5.8.0";`
	`22`	`+ public static final String BUILD = "20240122_2130";`
`23`	`23`
`24`	`24`	`public static final String STATUS = "status";`
`25`	`25`	`public static final String OK = "OK";`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`import java.io.IOException;`
`16`	`16`	`import java.lang.System.Logger;`
`17`	`17`	`import java.lang.System.Logger.Level;`
	`18`	`+import java.net.URISyntaxException;`
`18`	`19`	`import java.security.NoSuchAlgorithmException;`
`19`	`20`	`import java.sql.SQLException;`
`20`	`21`	`import java.util.Base64;`
`@@ -75,7 +76,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`	`Utils.denyAccess(response);`
`78`		`- } catch (IOException \| SQLException \| NoSuchAlgorithmException e) {`
	`79`	`+ } catch (IOException \| SQLException \| NoSuchAlgorithmException \| URISyntaxException e) {`
`79`	`80`	`logger.log(Level.ERROR, e);`
`80`	`81`	`}`
`81`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`import java.io.IOException;`
`19`	`19`	`import java.lang.System.Logger;`
`20`	`20`	`import java.lang.System.Logger.Level;`
	`21`	`+import java.net.URISyntaxException;`
`21`	`22`	`import java.nio.file.Files;`
`22`	`23`
`23`	`24`	`import javax.servlet.ServletException;`
`@@ -68,7 +69,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)`
`68`	`69`	`}`
`69`	`70`	`}`
`70`	`71`	`Utils.denyAccess(response);`
`71`		`- } catch (IOException e) {`
	`72`	`+ } catch (IOException \| URISyntaxException e) {`
`72`	`73`	`logger.log(Level.ERROR, e);`
`73`	`74`	`}`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`import java.io.IOException;`
`17`	`17`	`import java.lang.System.Logger;`
`18`	`18`	`import java.lang.System.Logger.Level;`
	`19`	`+import java.net.URISyntaxException;`
`19`	`20`	`import java.security.NoSuchAlgorithmException;`
`20`	`21`	`import java.sql.DriverManager;`
`21`	`22`	`import java.sql.SQLException;`
`@@ -84,7 +85,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {`
`84`	`85`	`return;`
`85`	`86`	`}`
`86`	`87`	`Utils.denyAccess(response);`
`87`		`- } catch (IOException e) {`
	`88`	`+ } catch (IOException \| URISyntaxException e) {`
`88`	`89`	`logger.log(Level.ERROR, e);`
`89`	`90`	`}`
`90`	`91`	`}`