String + int are preferable over InetSocketAddress for simplicity.

ikostov · May 31, 2015 · 59ce094 · 59ce094
1 parent 47dd689
commit 59ce094
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/org/littleshoot/proxy/MitmManager.java b/src/main/java/org/littleshoot/proxy/MitmManager.java
@@ -1,7 +1,5 @@
 package org.littleshoot.proxy;
 
-import java.net.InetSocketAddress;
-
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLSession;
 
@@ -13,14 +11,17 @@ public interface MitmManager {
     /**
      * Creates an {@link SSLEngine} for encrypting the server connection.
      * 
-     * @param remoteAddress
-     *            to start a client connection to the server. Peer information
-     *            is needed to send the server_name extension in handshake with
-     *            Server Name Indication (SNI).
+     * Note: Peer information is needed to send the server_name extension in
+     * handshake with Server Name Indication (SNI).
+     * 
+     * @param peerHost
+     *            to start a client connection to the server.
+     * @param peerPort
+     *            to start a client connection to the server. 
      * 
      * @return
      */
-    SSLEngine serverSslEngine(InetSocketAddress remoteAddress);
+    SSLEngine serverSslEngine(String peerHost, int peerPort);
 
     /**
      * <p>

diff --git a/src/main/java/org/littleshoot/proxy/extras/SelfSignedMitmManager.java b/src/main/java/org/littleshoot/proxy/extras/SelfSignedMitmManager.java
@@ -1,7 +1,5 @@
 package org.littleshoot.proxy.extras;
 
-import java.net.InetSocketAddress;
-
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLSession;
 
@@ -15,9 +13,8 @@ public class SelfSignedMitmManager implements MitmManager {
             new SelfSignedSslEngineSource(true);
 
     @Override
-    public SSLEngine serverSslEngine(InetSocketAddress remoteAddress) {
-        return selfSignedSslEngineSource.newSslEngine(
-                remoteAddress.getHostName(), remoteAddress.getPort());
+    public SSLEngine serverSslEngine(String peerHost, int peerPort) {
+        return selfSignedSslEngineSource.newSslEngine(peerHost, peerPort);
     }
 
     @Override

diff --git a/src/main/java/org/littleshoot/proxy/impl/ProxyToServerConnection.java b/src/main/java/org/littleshoot/proxy/impl/ProxyToServerConnection.java
@@ -543,8 +543,10 @@ private void initializeConnectionFlow() {
             boolean isMitmEnabled = mitmManager != null;
 
             if (isMitmEnabled) {
-                connectionFlow.then(serverConnection.EncryptChannel(
-                        mitmManager.serverSslEngine(remoteAddress)))
+                connectionFlow
+                        .then(serverConnection.EncryptChannel(mitmManager
+                                .serverSslEngine(remoteAddress.getHostName(),
+                                        remoteAddress.getPort())))
                         .then(clientConnection.RespondCONNECTSuccessful)
                         .then(serverConnection.MitmEncryptClientChannel);
             } else {