From 4d9b066060bd78243616cb6f1fbdf0d06b09cbe7 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 5 Dec 2016 11:47:09 +0300
Subject: juick-xmpp: dialback refactoring

---
 juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionOut.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionOut.java')

diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionOut.java b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionOut.java
index 5b1da316..7a6ae122 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionOut.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionOut.java
@@ -1,8 +1,10 @@
 package com.juick.components.s2s;
 
 import com.juick.components.XMPPServer;
+import com.juick.components.s2s.util.DialbackUtils;
 import com.juick.xmpp.extensions.StreamFeatures;
 import com.juick.xmpp.utils.XmlUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -32,6 +34,7 @@ public class ConnectionOut extends Connection implements Runnable {
     public ConnectionOut(XMPPServer xmpp, String hostname) throws CertificateException, UnrecoverableKeyException, NoSuchAlgorithmException, XmlPullParserException, KeyManagementException, KeyStoreException, IOException {
         super(xmpp);
         to = hostname;
+        dbKey = DialbackUtils.generateDialbackKey(RandomStringUtils.randomAscii(15), to, xmpp.HOSTNAME, streamID);
     }
 
     public ConnectionOut(XMPPServer xmpp, String hostname, String checkSID, String dbKey) throws Exception {
@@ -53,7 +56,7 @@ public class ConnectionOut extends Connection implements Runnable {
             sendDialbackVerify(checkSID, dbKey);
         }
         sendStanza("<db:result from='" + xmpp.HOSTNAME + "' to='" + to + "'>" +
-                generateDialbackKey(to, xmpp.HOSTNAME, streamID) + "</db:result>");
+                 dbKey + "</db:result>");
     }
 
     @Override
-- 
cgit v1.2.3