yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Corrected Find Checkouts help and incorrect regex in UserManager

Browse source
This commit is contained in:
ghidra1 2019-12-05 10:56:49 -05:00
parent ea4407f0e8
commit 88a19c81d4
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ghidra/Features/Base/certification.manifest
View file

@ -843,7 +843,6 @@ src/main/java/ghidra/app/util/bin/format/package.html||GHIDRA||||END|
src/main/java/ghidra/app/util/bin/format/pe/package.html||GHIDRA||||END|
src/main/java/ghidra/app/util/bin/format/pe/resource/package.html||GHIDRA||||END|
src/main/java/ghidra/app/util/bin/package.html||GHIDRA||||END|
src/main/java/ghidra/app/util/cparser/build.xml||GHIDRA||||END|
src/main/java/ghidra/app/util/exporter/package.html||GHIDRA||||END|
src/main/java/ghidra/app/util/importer/package.html||GHIDRA||||END|
src/main/java/ghidra/app/util/opinion/package.html||GHIDRA||||END|

BIN
Ghidra/Features/Base/src/main/help/help/topics/VersionControl/images/CheckedOut.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Before After
Before After

BIN
Ghidra/Features/Base/src/main/help/help/topics/VersionControl/images/FindMyCheckouts.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

3
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/UserManager.java
View file

@ -735,13 +735,14 @@ public class UserManager {
getDNLog().println(username + "; " + principal);
}
catch (IOException e) {
// ignore
}
}
/*
* Regex: matches if the entire string is alpha, digit, ".", "-", "_", fwd or back slash.
*/
private static final Pattern VALID_USERNAME_REGEX = Pattern.compile("[a-zA-Z0-9.-_/\\\\]+");
private static final Pattern VALID_USERNAME_REGEX = Pattern.compile("[a-zA-Z0-9.\\-_/\\\\]+");
/**
* Ensures a name only contains valid characters and meets length limitations.

8
Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/VersionControlSlowScreenShots.java
View file

@ -15,7 +15,7 @@
*/
package help.screenshot;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.*;
import java.io.IOException;
@ -58,9 +58,9 @@ public class VersionControlSlowScreenShots extends GhidraScreenShotGenerator {
public void tearDown() throws Exception {
// super.tearDown(); don't do this; use our tool instead
frontEnd.dispose();
if (frontEnd != null) {
frontEnd.dispose();
}
showResults();
}

2
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/server/remote/ServerTestUtil.java
View file

@ -117,7 +117,7 @@ public class ServerTestUtil {
private static class ShutdownHook extends Thread {
@Override
public void run() {
Msg.debug(ServerTestUtil.class, "\n\n\n\n\tSHUTDONW HOOK RUNNING");
Msg.debug(ServerTestUtil.class, "\n\n\n\n\tSHUTDOWN HOOK RUNNING");
disposeServer();
}
}