xmpp:ConnectionOut -> StreamServerDialback

1 files changed, 16 insertions, 35 deletions

diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java b/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java
index 7d3767a2..6a796307 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java
@@ -24,15 +24,11 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
-import java.security.*;
-import java.security.cert.CertificateException;
 import java.time.Instant;
 import java.util.UUID;
 
@@ -50,7 +46,7 @@ public class Connection {
     public long bytesLocal = 0;
     public long packetsLocal = 0;
     XMPPServer xmpp;
-    Socket socket;
+    private Socket socket;
     public static final String NS_DB = "jabber:server:dialback";
     public static final String NS_TLS = "urn:ietf:params:xml:ns:xmpp-tls";
     public static final String NS_STREAM = "http://etherx.jabber.org/streams";
@@ -58,35 +54,12 @@ public class Connection {
     XmlPullParser parser = factory.newPullParser();
     OutputStreamWriter writer;
     private boolean secured = false;
-    SSLContext sc;
-    private TrustManager[] trustAllCerts = new TrustManager[]{
-            new X509TrustManager() {
-                public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) {
-                }
-
-                public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) {
-                }
-                public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-                    return null;
-                }
-            }
-    };
-
-
-    public Connection(XMPPServer xmpp) throws XmlPullParserException, KeyStoreException, CertificateException, NoSuchAlgorithmException, IOException, UnrecoverableKeyException, KeyManagementException {
+
+
+
+    public Connection(XMPPServer xmpp) throws XmlPullParserException {
         this.xmpp = xmpp;
         created = updated = Instant.now();
-        KeyStore ks = KeyStore.getInstance("JKS");
-        try (InputStream ksIs = new FileInputStream(xmpp.keystore)) {
-            ks.load(ksIs, xmpp.keystorePassword.toCharArray());
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory
-                    .getDefaultAlgorithm());
-            kmf.init(ks, xmpp.keystorePassword.toCharArray());
-            sc = SSLContext.getInstance("TLSv1.2");
-            sc.init(kmf.getKeyManagers(), trustAllCerts, new SecureRandom());
-        } catch (Exception e) {
-            logger.warn("tls unavailable");
-        }
     }
 
     public void logParser() {
@@ -153,4 +126,12 @@ public class Connection {
         parser.setInput(new InputStreamReader(socket.getInputStream()));
         writer = new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8);
     }
+
+    public Socket getSocket() {
+        return socket;
+    }
+
+    public void setSocket(Socket socket) {
+        this.socket = socket;
+    }
 }