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

GT-2685 minor text revisions

Browse Source
This commit is contained in:
ghidra1
2019-05-31 17:51:11 -04:00
parent 17bb619048
commit 5c1127b085
7 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/GhidraServer.java
View File

@@ -69,7 +69,7 @@ public class GhidraServer extends UnicastRemoteObject implements GhidraServerHan
private static String HELP_FILE = "/ghidra/server/remote/ServerHelp.txt"; private static String HELP_FILE = "/ghidra/server/remote/ServerHelp.txt";
private static String USAGE_ARGS = private static String USAGE_ARGS =
" [-p<port>] [-a<authMode>] [-d<domain>] [-u] [-anonymous] [-ssh] [-ip<ipAddr>] [-i<ipAddr>] [-e<expireDays>] [-n] <serverPath>"; " [-p<port>] [-a<authMode>] [-d<domain>] [-u] [-anonymous] [-ssh] [-ip <hostname>] [-i <ipAddress>] [-e<expireDays>] [-n] <serverPath>";
private static final String RMI_SERVER_PROPERTY = "java.rmi.server.hostname"; private static final String RMI_SERVER_PROPERTY = "java.rmi.server.hostname";
@@ -421,7 +421,6 @@ public class GhidraServer extends UnicastRemoteObject implements GhidraServerHan
} }
private static String initRemoteAccessHostname() throws UnknownHostException { private static String initRemoteAccessHostname() throws UnknownHostException {
// System.setProperty("java.rmi.server.useLocalHostname", "false");
String hostname = System.getProperty(RMI_SERVER_PROPERTY); String hostname = System.getProperty(RMI_SERVER_PROPERTY);
if (hostname == null) { if (hostname == null) {
if (bindAddress != null) { if (bindAddress != null) {
@@ -433,7 +432,7 @@ public class GhidraServer extends UnicastRemoteObject implements GhidraServerHan
localhost = findHost(); localhost = findHost();
if (localhost == null) { if (localhost == null) {
log.fatal("Can't find host ip address!"); log.fatal("Can't find host ip address!");
System.exit(0); System.exit(-1);
} }
} }
hostname = localhost.getHostAddress(); hostname = localhost.getHostAddress();

4
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/remote/ServerHelp.txt
View File

@@ -1,8 +1,8 @@
Ghidra server startup parameters. Ghidra server startup parameters.
Command line parameters: [-ip <hostname>] [-i #.#.#.#] [-p#] [-a#] [-d<ntDomain>] [-e<days>] [-u] [-n] <repository_path> Command line parameters: [-ip <hostname>] [-i #.#.#.#] [-p#] [-a#] [-d<ntDomain>] [-e<days>] [-u] [-n] <repository_path>
-ip <hostname> : identifies the remote access IP address or hostname (FQDN) which should be -ip <hostname> : identifies the remote access IPv4 address or hostname (FQDN) which should be
used by remote clients to access the server. used by remote clients to access the server.
-i #.#.#.# : server interface IPv4 address to listen on (default will listen on all interfaces). -i #.#.#.# : server interface IPv4 address to listen on (default will listen on all interfaces).

13
Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ServerConnectTask.java
View File

@@ -123,17 +123,6 @@ class ServerConnectTask extends Task {
return name; return name;
} }
// private static void setOutgoingIpAddress(InetAddress destAddr, int serverPort)
// throws IOException {
// // TODO: this may not be needed since we do not create remote objects on the client
// InetSocketAddress sockAddr = new InetSocketAddress(destAddr, serverPort);
// Socket s = new Socket();
// s.connect(sockAddr, 5000);
// String ip = s.getLocalAddress().getHostAddress();
// System.setProperty("java.rmi.server.hostname", ip);
// s.close();
// }
private static boolean isSSLHandshakeCancelled(SSLHandshakeException e) throws IOException { private static boolean isSSLHandshakeCancelled(SSLHandshakeException e) throws IOException {
if (e.getMessage().indexOf("bad_certificate") > 0) { if (e.getMessage().indexOf("bad_certificate") > 0) {
if (ApplicationKeyManagerFactory.getPreferredKeyStore() == null) { if (ApplicationKeyManagerFactory.getPreferredKeyStore() == null) {
@@ -158,8 +147,6 @@ class ServerConnectTask extends Task {
*/ */
public static GhidraServerHandle getGhidraServerHandle(ServerInfo server) throws IOException { public static GhidraServerHandle getGhidraServerHandle(ServerInfo server) throws IOException {
// setOutgoingIpAddress(InetAddress.getByName(server.getServerName()), server.getPortNumber());
GhidraServerHandle gsh = null; GhidraServerHandle gsh = null;
try { try {
// Test SSL Handshake to ensure that user is able to decrypt keystore. // Test SSL Handshake to ensure that user is able to decrypt keystore.

3
Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/GhidraServerHandle.java
View File

@@ -47,6 +47,9 @@ public interface GhidraServerHandle extends Remote {
* 9: Added support for transient checkouts (7.2) * 9: Added support for transient checkouts (7.2)
* 10: Added BlockStreamServer (7.4) * 10: Added BlockStreamServer (7.4)
* 11: Revised password hash to SHA-256 (9.0) * 11: Revised password hash to SHA-256 (9.0)
* - version 9.1 switched to using SSL/TLS for RMI registry connection preventing
* older clients the ability to connect to the server. Remote interface remained
* unchanged allowing 9.1 clients to connect to 9.0 server.
*/ */
public static final int INTERFACE_VERSION = 11; public static final int INTERFACE_VERSION = 11;

2
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectInfoDialog.java
View File

@@ -557,7 +557,7 @@ public class ProjectInfoDialog extends DialogComponentProvider {
@Override @Override
public void run(TaskMonitor monitor) { public void run(TaskMonitor monitor) {
try { try {
// NOTE: conversion of non-shared project will loose version history // NOTE: conversion of non-shared project will lose version history
project.getProjectData().updateRepositoryInfo(taskRepository, monitor); project.getProjectData().updateRepositoryInfo(taskRepository, monitor);
status = true; status = true;
} }

2
Ghidra/RuntimeScripts/Common/server/server.conf
View File

@@ -108,7 +108,7 @@ ghidra.repositories.dir=./repositories
# Command line parameters: (Add command line parameters as needed and renumber each starting from .1) # Command line parameters: (Add command line parameters as needed and renumber each starting from .1)
# [-ip <hostname>] [-i ###.###.###.###] [-p#] [-a#] [-anonymous] [-ssh] [-d<ntDomain>] [-e<days>] [-u] [-n] <repositories_path> # [-ip <hostname>] [-i ###.###.###.###] [-p#] [-a#] [-anonymous] [-ssh] [-d<ntDomain>] [-e<days>] [-u] [-n] <repositories_path>
# #
# -ip <hostname> : remote access hostname or IP address to be used by clients # -ip <hostname> : remote access hostname or IPv4 address to be used by clients
# -i #.#.#.# : interface IPv4 address to accept connections on (default all interfaces) # -i #.#.#.# : interface IPv4 address to accept connections on (default all interfaces)
# -p# : base TCP port to be used (default: 13100) # -p# : base TCP port to be used (default: 13100)
# -a# : an optional authentication mode where # is a value 0 or 2 # -a# : an optional authentication mode where # is a value 0 or 2

22
Ghidra/RuntimeScripts/Common/server/svrREADME.html
View File

@@ -204,12 +204,12 @@ name/address queries.
</P> </P>
<P> <P>
By default the server will attempt to identify an appropriate remote access IP address which will By default the server will attempt to identify an appropriate remote access IPv4 address which will
be written to the log at startup. In addition, the server will only bind/listen to incoming be written to the log at startup. In addition, the server will listen for incoming
connections on this address by default. It is important to understand between the published address connections on all IPv4 interfaces by default. It is important to understand the difference between
and the listening address. See the <typewriter>-ip</typewriter> parameter and the published remote access address and the listening address (i.e. interface) which are both
<typewriter>-i</typewriter> options in the <a href="#serverOptions">Server configurable. See the <typewriter>-ip</typewriter> and <typewriter>-i</typewriter> options in
Options</a> section for more details. the <a href="#serverOptions">Server Options</a> section for more details.
</P> </P>
(<a href="#top">Back to Top</a>) (<a href="#top">Back to Top</a>)
@@ -291,9 +291,9 @@ public key files may be made without restarting the Ghidra Server.
login for <typewriter>-a0</typewriter> authentication mode. Without this option, the users login for <typewriter>-a0</typewriter> authentication mode. Without this option, the users
client-side login ID will be assumed.</LI> client-side login ID will be assumed.</LI>
<br> <br>
<LI><typewriter>-ip &lt;hostname&gt;</typewriter><br>Identifies the remote access IP address or <LI><typewriter>-ip &lt;hostname&gt;</typewriter><br>Identifies the remote access hostname (FQDN)
hostname (FQDN) which should be used by remote clients to access the server. By default the or IPv4 address which should be used by remote clients to access the server. By default the
host name reported by the operating system is resolved to an IP address, if this fails the host name reported by the operating system is resolved to an IPv4 address, if this fails the
local loopback address is used. The server log will indicate the remote access hostname local loopback address is used. The server log will indicate the remote access hostname
at startup. This option may be required when a server has multiple IP interfaces, relies on at startup. This option may be required when a server has multiple IP interfaces, relies on
a dynamic DNS or other network address translation for incoming connections. a dynamic DNS or other network address translation for incoming connections.
@@ -301,9 +301,9 @@ public key files may be made without restarting the Ghidra Server.
</LI> </LI>
<br> <br>
<LI><typewriter>-i &lt;#.#.#.#&gt;</typewriter><br>Forces the server to be bound to a specific <LI><typewriter>-i &lt;#.#.#.#&gt;</typewriter><br>Forces the server to be bound to a specific
IP interface on the server. If specified and the <typewriter>-ip</typewriter> option is not, IPv4 interface on the server. If specified and the <typewriter>-ip</typewriter> option is not,
the address specified by <typewriter>-i</typewriter> will establish the remote access IP the address specified by <typewriter>-i</typewriter> will establish the remote access IP
address as well as restricting the listing interface. If this option is not specified connections address as well as restrict the listening interface. If this option is not specified connections
will be accepted on any interface.</LI> will be accepted on any interface.</LI>
<br> <br>
<LI><typewriter>-p#</typewriter><br>Allows the base TCP port to be specified (default: 13100). The <LI><typewriter>-p#</typewriter><br>Allows the base TCP port to be specified (default: 13100). The