Fixed initial stream establishment response

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/branches@5831 b35dd754-fafc-0310-a699-88a17e54d16e

httpbind_branch/src/java/org/jivesoftware/wildfire/HttpServerManager.java

@@ -238,6 +238,7 @@ public class HttpServerManager {
             }
             httpBindServer = null;
         }
+        //noinspection ConstantConditions
         if(adminServer != null && adminServer != httpBindServer) {
             try {
                 adminServer.stop();

httpbind_branch/src/java/org/jivesoftware/wildfire/http/HttpBindServlet.java

@@ -147,7 +147,6 @@ public class HttpBindServlet extends HttpServlet {
             return;
         }
 
-
         try {
             HttpConnection connection = new HttpConnection(rid, request.isSecure());
             connection.setSession(sessionManager.createSession(rootNode, connection));
@@ -158,6 +157,9 @@ public class HttpBindServlet extends HttpServlet {
             response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
                     "Server Not initialized");
         }
+        catch (HttpBindException e) {
+            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        }
 
     }
 

httpbind_branch/src/java/org/jivesoftware/wildfire/http/HttpSession.java

@@ -18,6 +18,10 @@ import org.jivesoftware.wildfire.net.VirtualConnection;
 import org.jivesoftware.wildfire.auth.UnauthorizedException;
 import org.xmpp.packet.Packet;
 import org.xmpp.packet.Message;
+import org.dom4j.Element;
+import org.dom4j.DocumentHelper;
+import org.dom4j.QName;
+import org.dom4j.Namespace;
 
 import java.util.*;
 import java.net.InetAddress;
@@ -102,6 +106,46 @@ public class HttpSession extends ClientSession {
         lastPoll = time;
     }
 
+    public Collection<Element> getAvailableStreamFeaturesElements() {
+        List<Element> elements = new ArrayList<Element>();
+
+        // Include Stream Compression Mechanism
+        if (conn.getCompressionPolicy() != Connection.CompressionPolicy.disabled &&
+                !conn.isCompressed()) {
+            Element compression = DocumentHelper.createElement(new QName("compression",
+                    new Namespace("", "http://jabber.org/features/compress")));
+            Element method = compression.addElement("method");
+            method.setText("zlib");
+
+            elements.add(compression);
+        }
+
+        if (getAuthToken() == null) {
+            // Advertise that the server supports Non-SASL Authentication
+            Element auth = DocumentHelper.createElement(new QName("auth",
+                    new Namespace("", "http://jabber.org/features/iq-auth")));
+            elements.add(auth);
+            // Advertise that the server supports In-Band Registration
+            if (XMPPServer.getInstance().getIQRegisterHandler().isInbandRegEnabled()) {
+                Element register = DocumentHelper.createElement(new QName("register",
+                        new Namespace("", "http://jabber.org/features/iq-register")));
+                elements.add(register);
+            }
+        }
+        else {
+            // If the session has been authenticated then offer resource binding
+            // and session establishment
+            Element bind = DocumentHelper.createElement(new QName("bind",
+                    new Namespace("", "urn:ietf:params:xml:ns:xmpp-bind")));
+            elements.add(bind);
+
+            Element session = DocumentHelper.createElement(new QName("session",
+                    new Namespace("", "urn:ietf:params:xml:ns:xmpp-session")));
+            elements.add(session);
+        }
+        return elements;
+    }
+
     public String getAvailableStreamFeatures() {
         StringBuilder sb = new StringBuilder(200);
 

httpbind_branch/src/java/org/jivesoftware/wildfire/http/HttpSessionManager.java

@@ -11,12 +11,13 @@
 package org.jivesoftware.wildfire.http;
 
 import org.jivesoftware.util.JiveGlobals;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.wildfire.SessionManager;
 import org.jivesoftware.wildfire.StreamID;
 import org.jivesoftware.wildfire.multiplex.MultiplexerPacketRouter;
 import org.jivesoftware.wildfire.multiplex.UnknownStanzaException;
 import org.jivesoftware.wildfire.auth.UnauthorizedException;
-import org.dom4j.Element;
+import org.dom4j.*;
 
 import java.util.*;
 import java.io.UnsupportedEncodingException;
@@ -75,7 +76,7 @@ public class HttpSessionManager {
     }
 
     public HttpSession createSession(Element rootNode, HttpConnection connection)
-            throws UnauthorizedException
+            throws UnauthorizedException, HttpBindException
     {
         // TODO Check if IP address is allowed to connect to the server
 
@@ -102,6 +103,10 @@ public class HttpSessionManager {
         catch (HttpConnectionClosedException e) {
             /* This won't happen here. */
         }
+        catch (DocumentException e) {
+            Log.error("Error creating document", e);
+            throw new HttpBindException("Internal server error", true, 500);
+        }
 
         timer.reset(session);
         return session;
@@ -145,25 +150,24 @@ public class HttpSessionManager {
         }
     }
 
-    private String createSessionCreationResponse(HttpSession session) {
-        StringBuilder builder = new StringBuilder();
-        builder.append("<body")
-                .append(" xmlns='http://jabber.org/protocol/httpbind'").append(" authID='")
-                .append(session.getStreamID()).append("'")
-                .append(" sid='").append(session.getStreamID()).append("'")
-                .append(" secure='true" + "'").append(" requests='")
-                .append(String.valueOf(maxRequests)).append("'")
-                .append(" inactivity='").append(String.valueOf(session.getInactivityTimeout()))
-                .append("'")
-                .append(" polling='").append(String.valueOf(pollingInterval)).append("'")
-                .append(" wait='").append(String.valueOf(session.getWait())).append("'")
-                .append(">");
-        builder.append("<stream:features>");
-        builder.append(session.getAvailableStreamFeatures());
-        builder.append("</stream:features>");
-        builder.append("</body>");
-
-        return builder.toString();
+    private String createSessionCreationResponse(HttpSession session) throws DocumentException {
+        Element response = DocumentHelper.createElement("body");
+        response.addNamespace("", "http://jabber.org/protocol/httpbind");
+        response.addNamespace("stream", "http://etherx.jabber.org/streams");
+        response.addAttribute("authid", session.getStreamID().getID());
+        response.addAttribute("sid", session.getStreamID().getID());
+        response.addAttribute("secure", Boolean.TRUE.toString());
+        response.addAttribute("requests", String.valueOf(maxRequests));
+        response.addAttribute("inactivity", String.valueOf(session.getInactivityTimeout()));
+        response.addAttribute("polling", String.valueOf(pollingInterval));
+        response.addAttribute("wait", String.valueOf(session.getWait()));
+
+        Element features = response.addElement("stream:features");
+        for(Element feature : session.getAvailableStreamFeaturesElements()) {
+            features.add(feature);
+        }
+
+        return response.asXML();
     }
 
     public HttpConnection forwardRequest(long rid, HttpSession session, boolean isSecure,