1 files changed, 23 insertions, 2 deletions
diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java
index e3bd53e9..0c991553 100644
--- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java
+++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/ConnectionOut.java
@@ -22,6 +22,8 @@ import com.juick.xmpp.Stream;
 import com.juick.xmpp.extensions.StreamError;
 import com.juick.xmpp.extensions.StreamFeatures;
 import com.juick.xmpp.utils.XmlUtils;
+import org.apache.commons.codec.Charsets;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.text.RandomStringGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +37,8 @@ import java.io.OutputStream;
 import java.net.SocketException;
 import java.util.UUID;
 
+import static com.juick.server.xmpp.s2s.Connection.NS_SASL;
+
 /**
  * @author ugnich
  */
@@ -43,7 +47,7 @@ public class ConnectionOut extends Stream {
     public static final String NS_TLS = "urn:ietf:params:xml:ns:xmpp-tls";
     public static final String NS_DB = "jabber:server:dialback";
     private boolean secured = false;
-
+    private boolean trusted = false;
     public boolean streamReady = false;
     String checkSID = null;
     String dbKey = null;
@@ -122,18 +126,27 @@ public class ConnectionOut extends Stream {
                             && listener.securing(this)) {
                         logger.debug("stream to {} {} securing", to.toEscapedString(), streamID);
                         send("<starttls xmlns=\"" + NS_TLS + "\" />");
+                    } else if (secured && features.EXTERNAL >=0) {
+                        String authid = Base64.encodeBase64String(from.toEscapedString().getBytes(Charsets.UTF_8));
+                        send(String.format("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='EXTERNAL'>%s</auth>", authid));
+                    } else if (secured && streamReady) {
+                        listener.ready(this);
                     } else {
                         processDialback();
                     }
                 } else if (tag.equals("proceed") && parser.getNamespace().equals(NS_TLS)) {
                     listener.proceed(this);
+                } else if (tag.equals("success") && parser.getNamespace().equals(NS_SASL)) {
+                    streamReady = true;
+                    restartStream();
+                    sendOpenStream();
                 } else if (secured && tag.equals("stream") && parser.getNamespace().equals(NS_STREAM)) {
                     streamID = parser.getAttributeValue(null, "id");
                 } else if (tag.equals("error")) {
                     StreamError streamError = StreamError.parse(parser);
                     listener.dialbackError(this, streamError);
                 } else {
-                    String unhandledStanza = XmlUtils.parseToString(parser, true);
+                    String unhandledStanza = XmlUtils.parseToString(parser, false);
                     logger.warn("Unhandled stanza from {} {} : {}", to, streamID, unhandledStanza);
                 }
             }
@@ -164,4 +177,12 @@ public class ConnectionOut extends Stream {
     public void setSecured(boolean secured) {
         this.secured = secured;
     }
+
+    public boolean isTrusted() {
+        return trusted;
+    }
+
+    public void setTrusted(boolean trusted) {
+        this.trusted = trusted;
+    }
 }