mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-7043 Allow local project path, project name and project content

Browse Source 
file/folder pathnames to contain '+' char
This commit is contained in:
ghidra1
2026-09-18 09:26:18 -04:00
parent ad0f0231d6
commit b9e86d3c62
3 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Framework/FileSystem/src/main/java/ghidra/util/NamingUtilities.java
View File

@@ -37,7 +37,7 @@ public final class NamingUtilities {
public final static Set<Character> VALID_NAME_CHARSET = public final static Set<Character> VALID_NAME_CHARSET =
Collections.unmodifiableSet( Collections.unmodifiableSet(
Set.of('.', '-', '=', '@', ' ', '_', '(', ')', '[', ']', '~')); Set.of('.', '-', '=', '@', ' ', '_', '(', ')', '[', ']', '~', '+'));
private NamingUtilities() { private NamingUtilities() {
} }

45
Ghidra/Framework/Project/src/test/java/ghidra/framework/model/ProjectLocatorTest.java
View File

@@ -28,6 +28,7 @@ import ghidra.framework.Application;
import ghidra.framework.OperatingSystem; import ghidra.framework.OperatingSystem;
import ghidra.framework.protocol.ghidra.GhidraURL; import ghidra.framework.protocol.ghidra.GhidraURL;
import ghidra.framework.protocol.ghidra.Handler; import ghidra.framework.protocol.ghidra.Handler;
import ghidra.util.NamingUtilities;
public class ProjectLocatorTest extends AbstractGenericTest { public class ProjectLocatorTest extends AbstractGenericTest {
@@ -41,7 +42,7 @@ public class ProjectLocatorTest extends AbstractGenericTest {
// //
private URL toGhidraLocalURL(String path) throws MalformedURLException, URISyntaxException { private URL toGhidraLocalURL(String path) throws MalformedURLException, URISyntaxException {
return new URI(GhidraURL.PROTOCOL, path, null).toURL(); return new URI(GhidraURL.PROTOCOL, null, path, null).toURL();
} }
@Test @Test
@@ -158,6 +159,48 @@ public class ProjectLocatorTest extends AbstractGenericTest {
} }
} }
@Test
public void testSpecialCharsInPath() throws Exception {
StringBuilder specialChars = new StringBuilder();
for (Character c : NamingUtilities.VALID_NAME_CHARSET) {
specialChars.append(c);
}
String dirName = "bill" + specialChars;
String projName = "bob" + specialChars;
ProjectLocator pl = new ProjectLocator("c:\\" + dirName, projName);
assertEquals(toGhidraLocalURL("/c:/" + dirName + "/" + projName), pl.getURL());
assertEquals("/c:/" + dirName + "/", pl.getLocation());
assertEquals(new File("/c:/" + dirName + "/" + projName + ".rep"), pl.getProjectDir());
assertEquals(new File("/c:/" + dirName + "/" + projName + ".gpr"), pl.getMarkerFile());
assertEquals(projName, pl.getName());
assertTrue(pl.isWindowsOnlyLocation());
if (OperatingSystem.CURRENT_OPERATING_SYSTEM == OperatingSystem.WINDOWS) {
assertEquals("c:\\" + dirName + "\\" + projName + ".rep",
pl.getProjectDir().getAbsolutePath());
assertEquals("c:\\" + dirName + "\\" + projName + ".gpr",
pl.getMarkerFile().getAbsolutePath());
}
pl = new ProjectLocator("/c:/" + dirName, projName);
assertEquals(toGhidraLocalURL("/c:/" + dirName + "/" + projName), pl.getURL());
assertEquals("/c:/" + dirName + "/", pl.getLocation());
assertEquals(new File("/c:/" + dirName + "/" + projName + ".rep"), pl.getProjectDir());
assertEquals(new File("/c:/" + dirName + "/" + projName + ".gpr"), pl.getMarkerFile());
assertEquals(projName, pl.getName());
assertTrue(pl.isWindowsOnlyLocation());
if (OperatingSystem.CURRENT_OPERATING_SYSTEM == OperatingSystem.WINDOWS) {
assertEquals("c:\\" + dirName + "\\" + projName + ".rep",
pl.getProjectDir().getAbsolutePath());
assertEquals("c:\\" + dirName + "\\" + projName + ".gpr",
pl.getMarkerFile().getAbsolutePath());
}
}
@Test @Test
public void testTempPath() throws Exception { public void testTempPath() throws Exception {

14
Ghidra/Framework/Project/src/test/java/ghidra/framework/protocol/ghidra/GhidraURLTest.java
View File

@@ -27,6 +27,7 @@ import generic.test.AbstractGenericTest;
import ghidra.framework.client.*; import ghidra.framework.client.*;
import ghidra.framework.model.ProjectLocator; import ghidra.framework.model.ProjectLocator;
import ghidra.framework.protocol.ghidra.GhidraURLConnection.StatusCode; import ghidra.framework.protocol.ghidra.GhidraURLConnection.StatusCode;
import ghidra.util.NamingUtilities;
public class GhidraURLTest extends AbstractGenericTest { public class GhidraURLTest extends AbstractGenericTest {
@@ -110,6 +111,19 @@ public class GhidraURLTest extends AbstractGenericTest {
assertEquals(url, ghidraUrl); assertEquals(url, ghidraUrl);
assertEquals(loc, GhidraURL.getProjectStorageLocator(ghidraUrl)); assertEquals(loc, GhidraURL.getProjectStorageLocator(ghidraUrl));
StringBuilder specialChars = new StringBuilder();
for (Character c : NamingUtilities.VALID_NAME_CHARSET) {
specialChars.append(c);
}
loc = new ProjectLocator("/a/b" + specialChars, "Test" + specialChars);
assertEquals("/a/b" + specialChars + "/", loc.getLocation());
assertFalse(loc.isWindowsOnlyLocation());
ghidraUrl = GhidraURL.makeURL(loc);
url = toGhidraLocalURL("/a/b" + specialChars + "/Test" + specialChars, null);
assertEquals(url, ghidraUrl);
assertEquals(loc, GhidraURL.getProjectStorageLocator(ghidraUrl));
try { try {
new ProjectLocator("a/b", "Test"); new ProjectLocator("a/b", "Test");
fail("relative path should not be permitted"); fail("relative path should not be permitted");