Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-1 Revised server command processing to address testing issue

ghidra108a1765da861
diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/CommandProcessor.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/CommandProcessor.java
index 93c9f41428..edff61a2f8 100644
--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/CommandProcessor.java
+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/CommandProcessor.java
@@ -224,12 +224,12 @@ public class CommandProcessor {
return -1;
}
- static File getCommandDir(File serverRootDir) {
- return new File(serverRootDir, ADMIN_CMD_DIR);
- }
-
- static File getOrCreateCommandDir(RepositoryManager repositoryMgr) {
- File cmdDir = getCommandDir(repositoryMgr.getRootDir());
+ static File getOrCreateCommandDir(File serverRootDir) {
+ if (!serverRootDir.isDirectory() || !serverRootDir.canWrite()) {
+ System.err.println("Insufficient privilege or server not started!");
+ System.exit(-1);
+ }
+ File cmdDir = new File(serverRootDir, ADMIN_CMD_DIR);
if (!cmdDir.exists()) {
// ensure process owner creates queued command directory
cmdDir.mkdir();
@@ -243,7 +243,7 @@ public class CommandProcessor {
* @throws IOException
*/
static void processCommands(RepositoryManager repositoryMgr) throws IOException {
- File cmdDir = getOrCreateCommandDir(repositoryMgr);
+ File cmdDir = getOrCreateCommandDir(repositoryMgr.getRootDir());
File[] files = cmdDir.listFiles(CMD_FILE_FILTER);
if (files == null) {
log.error("Failed to access command queue " + cmdDir.getAbsolutePath() +
diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/CommandWatcher.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/CommandWatcher.java
index e3b4ffbe1c..fd235b23ba 100644
--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/CommandWatcher.java
+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/CommandWatcher.java
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@ public class CommandWatcher implements Runnable {
this.repositoryMgr = repositoryMgr;
watcher = FileSystems.getDefault().newWatchService();
- cmdDirPath = CommandProcessor.getOrCreateCommandDir(repositoryMgr).toPath();
+ cmdDirPath = CommandProcessor.getOrCreateCommandDir(repositoryMgr.getRootDir()).toPath();
cmdDirPath.register(watcher, StandardWatchEventKinds.ENTRY_CREATE);
}
diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
index 2edbc46cf0..fe0a217f84 100644
--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
@@ -111,11 +111,7 @@ public class ServerAdmin implements GhidraLaunchable {
System.exit(-1);
}
- File cmdDir = CommandProcessor.getCommandDir(serverRootDir);
- if (!cmdDir.isDirectory() || !cmdDir.canWrite()) {
- System.err.println("Insufficient privilege or server not started!");
- System.exit(-1);
- }
+ File cmdDir = CommandProcessor.getOrCreateCommandDir(serverRootDir);
// Process command line
boolean listRepositories = false;