change path validation for service installs when install location con…

…tains system32
i2p · Sep 13, 2022 · 0ce816a · 0ce816a
1 parent 2fd01c8
commit 0ce816a
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java
@@ -110,8 +110,19 @@ public static String getWorkingDir(Properties envProps, boolean migrateOldConfig
                     }
                 }
                 String programData = System.getenv("PROGRAMDATA");
-                if (home.toLowerCase().contains(programData.toLowerCase()) || home.toLowerCase().contains("system32".toLowerCase())) {
-                    home = programData;
+                String winDirSystem32 = System.getenv("WINDIR");
+                if (winDirSystem32 != null) {
+                    winDirSystem32 = new File(winDirSystem32, "system32").getAbsolutePath();
+                }
+                if (winDirSystem32 != null) {
+                    if (home.toLowerCase().startsWith(winDirSystem32.toLowerCase())) {
+                        home = programData;
+                    }
+                }
+                if (programData != null) {
+                    if (home.toLowerCase().startsWith(programData.toLowerCase())) {
+                        home = programData;
+                    }
                 }
                 dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_WINDOWS);
             } else if (SystemVersion.isMac()) {