mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-07-30 07:18:37 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-07-10 11:25:51 -04:00
parent 5aa3853207 08a1765da8
commit 75492ac3e9
4 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/CommandProcessor.java
View File

@@ -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() +

6
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/CommandWatcher.java
View File

@@ -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);
}

6
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/ServerAdmin.java
View File

@@ -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;

84
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/server/remote/ServerTestUtil.java
View File

@@ -823,13 +823,45 @@ public class ServerTestUtil {
}
/**
* Create and populate server test repositories "Test" and "Test1" with the specified
* users added. The ADMIN_USER "test" is added by default.
* @param dirPath server root
* @param users optional inclusion of USER_A and/or USER_B to be added with no authentication required
* Add a new user to an existing local Ghidra Test Server using the ServerAdmin class.
* @param serverRoot server's repositories root directory
* @param name user name
* @param dn DN or null (applies to PKI authentication only)
* @throws Exception
*/
public static void createPopulatedTestServer(String dirPath, String... users) throws Exception {
public static void addUser(File serverRoot, String name, String dn) throws Exception {
ServerAdmin serverAdmin = new ServerAdmin();
if (dn != null) {
serverAdmin.execute(new String[] { serverRoot.getAbsolutePath(), "-dn", name, dn });
}
else {
serverAdmin.execute(new String[] { serverRoot.getAbsolutePath(), "-add", name });
}
}
/**
* Grant an existing user access to a repository for an existing local Ghidra Test Server
* using the ServerAdmin class.
* @param serverRoot server's repositories root directory
* @param name user name
* @param repoName existing repository name
* @param access an access string: "+r", "+w", "+a"
* @throws Exception
*/
public static void setUserAccess(File serverRoot, String name, String repoName, String access)
throws Exception {
ServerAdmin serverAdmin = new ServerAdmin();
serverAdmin.execute(
new String[] { serverRoot.getAbsolutePath(), "-grant", name, access, repoName });
}
/**
* Create and populate server test repositories "Test" and "Test1". The ADMIN_USER "test"
* is added by default to both repositories.
* @param dirPath server root
* @throws Exception
*/
public static void createPopulatedTestServer(String dirPath) throws Exception {
Msg.info(ServerTestUtil.class, "Constructing Ghidra Server for testing: " + dirPath);
@@ -837,16 +869,12 @@ public class ServerTestUtil {
FileUtilities.deleteDir(rootDir);
FileUtilities.mkdirs(rootDir);
String[] userArray = new String[users.length + 1];
userArray[0] = ADMIN_USER;
System.arraycopy(users, 0, userArray, 1, users.length);
createUsers(dirPath, userArray);
createUsers(dirPath, new String[] { ADMIN_USER });
String keys[] = SSHKeyUtil.generateSSHRSAKeys();
addSSHKeys(dirPath, keys[0], "test.key", keys[1], "test.pub");
LocalFileSystem repoFilesystem = createRepository(dirPath, "Test", ADMIN_USER + "=ADMIN",
USER_A + "=READ_ONLY", USER_B + "=WRITE");
LocalFileSystem repoFilesystem = createRepository(dirPath, "Test", ADMIN_USER + "=ADMIN");
try {
createRepositoryItem(repoFilesystem, "foo", "/", 0);
createRepositoryItem(repoFilesystem, "notepad", "/", 0);
@@ -857,7 +885,7 @@ public class ServerTestUtil {
}
repoFilesystem = createRepository(dirPath, "Test1", "=ANONYMOUS_ALLOWED",
ADMIN_USER + "=ADMIN", USER_A + "=WRITE");
ADMIN_USER + "=ADMIN");
try {
createRepositoryItem(repoFilesystem, "foo1", "/", 0);
createRepositoryItem(repoFilesystem, "notepad1", "/", 0);
@@ -870,17 +898,16 @@ public class ServerTestUtil {
}
/**
* Create and populate server test repositories "Test" and "Test1" with the specified
* users added. The ADMIN_USER "test" is added by default.
* Create and populate server test repositories "Test" and "Test1". The ADMIN_USER "test"
* is added by default to both repositories.
* @param dirPath server root
* @param repoName repository name
* @param contentProvider repository content provider callback
* (use {@link #createRepositoryItem(LocalFileSystem, String, String, Program)} to add content.
* @param users optional inclusion of USER_A and/or USER_B to be added with no authentication required
* @throws Exception
*/
public static void createPopulatedTestServer(String dirPath, String repoName,
Consumer<LocalFileSystem> contentProvider, String... users) throws Exception {
Consumer<LocalFileSystem> contentProvider) throws Exception {
Msg.info(ServerTestUtil.class, "Constructing Ghidra Server for testing: " + dirPath);
@@ -888,16 +915,12 @@ public class ServerTestUtil {
FileUtilities.deleteDir(rootDir);
FileUtilities.mkdirs(rootDir);
String[] userArray = new String[users.length + 1];
userArray[0] = ADMIN_USER;
System.arraycopy(users, 0, userArray, 1, users.length);
createUsers(dirPath, userArray);
createUsers(dirPath, new String[] { ADMIN_USER });
String keys[] = SSHKeyUtil.generateSSHRSAKeys();
addSSHKeys(dirPath, keys[0], "test.key", keys[1], "test.pub");
LocalFileSystem repoFilesystem = createRepository(dirPath, repoName, ADMIN_USER + "=ADMIN",
USER_A + "=READ_ONLY", USER_B + "=WRITE");
LocalFileSystem repoFilesystem = createRepository(dirPath, repoName, ADMIN_USER + "=ADMIN");
try {
contentProvider.accept(repoFilesystem);
}
@@ -987,21 +1010,4 @@ public class ServerTestUtil {
return altNames;
}
/**
* Add PKI user to server
* @param serverRoot
* @param userName
* @param dn
* @throws Exception
*/
public static void addPKIUser(File serverRoot, String userName, String dn) throws Exception {
ServerAdmin serverAdmin = new ServerAdmin();
if (dn != null) {
serverAdmin.execute(new String[] { serverRoot.getAbsolutePath(), "-dn", userName, dn });
}
else {
serverAdmin.execute(new String[] { serverRoot.getAbsolutePath(), "-add", userName });
}
}
}