Stuff

2 files changed, 16 insertions, 1 deletions

diff --git a/src/main/java/org/openslx/satserver/util/Exec.java b/src/main/java/org/openslx/satserver/util/Exec.java
index 1f810eb..db59b0d 100644
--- a/src/main/java/org/openslx/satserver/util/Exec.java
+++ b/src/main/java/org/openslx/satserver/util/Exec.java
@@ -14,8 +14,13 @@ public class Exec
 	 */
 	public static int sync( String... command )
 	{
+		return syncAt( "/", command );
+	}
+
+	public static int syncAt( String cwd, String... command )
+	{
 		ProcessBuilder pb = new ProcessBuilder( command );
-		pb.directory( new File( "/" ) );
+		pb.directory( new File( cwd ) );
 		Process p;
 		try {
 			p = pb.start();
diff --git a/src/main/java/org/openslx/satserver/util/Util.java b/src/main/java/org/openslx/satserver/util/Util.java
index 2df4c73..fcf10ed 100644
--- a/src/main/java/org/openslx/satserver/util/Util.java
+++ b/src/main/java/org/openslx/satserver/util/Util.java
@@ -22,6 +22,8 @@ public class Util
 	 */
 	public static boolean startsWith( String stringToCheck, String... compareTo )
 	{
+		if ( stringToCheck == null )
+			return false;
 		for ( String check : compareTo ) {
 			if ( stringToCheck.startsWith( check ) )
 				return true;
@@ -77,4 +79,12 @@ public class Util
 		FileUtils.writeStringToFile( file, string, StandardCharsets.UTF_8 );
 	}
 
+	private static final String[] DEFAULT_ALLOWED_DIRS =
+	{ "/tmp/", "/opt/openslx/configs/" };
+
+	public static boolean isAllowedDir( String dir )
+	{
+		return startsWith( dir, DEFAULT_ALLOWED_DIRS );
+	}
+
 }