From c4d77b873c4deb15a968ac17998a024bd0c618d4 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 10 May 2016 23:38:41 +0300
Subject: ssl blacklist

---
 src/main/java/com/juick/xmpp/s2s/ConnectionIn.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/juick/xmpp/s2s/ConnectionIn.java')

diff --git a/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java b/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java
index a7d687d2..554d3b05 100644
--- a/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java
+++ b/src/main/java/com/juick/xmpp/s2s/ConnectionIn.java
@@ -53,7 +53,7 @@ public class ConnectionIn extends Connection implements Runnable {
             }
             boolean xmppversionnew = parser.getAttributeValue(null, "version") != null;
 
-            sendOpenStream(xmppversionnew);
+            sendOpenStream(parser.getAttributeValue(null, "from"), xmppversionnew);
 
             while (parser.next() != XmlPullParser.END_DOCUMENT) {
                 updateTsRemoteData();
@@ -144,7 +144,7 @@ public class ConnectionIn extends Connection implements Runnable {
                         closeConnection();
                     }
                 } else if (isSecured() && tag.equals("stream") && parser.getNamespace().equals(NS_STREAM)) {
-                    sendOpenStream(true);
+                    sendOpenStream(null, true);
                 } else {
                     LOGGER.info("STREAM " + streamID + ": " + XmlUtils.parseToString(parser, true));
                 }
@@ -169,13 +169,13 @@ public class ConnectionIn extends Connection implements Runnable {
         tsRemoteData = System.currentTimeMillis();
     }
 
-    void sendOpenStream(boolean xmppversionnew) throws IOException {
+    void sendOpenStream(String from, boolean xmppversionnew) throws IOException {
         String openStream = "<?xml version='1.0'?><stream:stream xmlns='jabber:server' " +
                 "xmlns:stream='http://etherx.jabber.org/streams' xmlns:db='jabber:server:dialback' from='" +
                 XMPPComponent.HOSTNAME + "' id='" + streamID + "' version='1.0'>";
         if (xmppversionnew) {
             openStream += "<stream:features>";
-            if (!isSecured()) {
+            if (!isSecured() && !XMPPComponent.brokenSSLhosts.contains(from)) {
                 openStream += "<starttls xmlns=\"" + NS_TLS + "\"><optional/></starttls>";
             }
             openStream += "</stream:features>";
-- 
cgit v1.2.3