Merge pull request #169 from sco0ter/of874

OF-874 disco#items request SHOULD return connected or available resources

src/java/org/jivesoftware/openfire/SessionManager.java

@@ -22,6 +22,7 @@ package org.jivesoftware.openfire;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -32,6 +33,7 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Lock;
 
+import org.dom4j.Element;
 import org.jivesoftware.openfire.audit.AuditStreamIDFactory;
 import org.jivesoftware.openfire.auth.AuthToken;
 import org.jivesoftware.openfire.auth.UnauthorizedException;
@@ -39,6 +41,11 @@ import org.jivesoftware.openfire.cluster.ClusterEventListener;
 import org.jivesoftware.openfire.cluster.ClusterManager;
 import org.jivesoftware.openfire.component.InternalComponentManager;
 import org.jivesoftware.openfire.container.BasicModule;
+import org.jivesoftware.openfire.disco.DiscoInfoProvider;
+import org.jivesoftware.openfire.disco.DiscoItem;
+import org.jivesoftware.openfire.disco.DiscoItemsProvider;
+import org.jivesoftware.openfire.disco.DiscoServerItem;
+import org.jivesoftware.openfire.disco.ServerItemsProvider;
 import org.jivesoftware.openfire.event.SessionEventDispatcher;
 import org.jivesoftware.openfire.http.HttpConnection;
 import org.jivesoftware.openfire.http.HttpSession;
@@ -60,12 +67,15 @@ import org.jivesoftware.openfire.session.RemoteSessionLocator;
 import org.jivesoftware.openfire.session.Session;
 import org.jivesoftware.openfire.spi.BasicStreamIDFactory;
 import org.jivesoftware.openfire.user.UserManager;
+import org.jivesoftware.openfire.user.UserNotFoundException;
 import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.LocaleUtils;
+import org.jivesoftware.util.Log;
 import org.jivesoftware.util.cache.Cache;
 import org.jivesoftware.util.cache.CacheFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.xmpp.forms.DataForm;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.Message;
 import org.xmpp.packet.Packet;
@@ -78,7 +88,7 @@ import org.xmpp.packet.Presence;
  *
  * @author Derek DeMoro
  */
-public class SessionManager extends BasicModule implements ClusterEventListener {
+public class SessionManager extends BasicModule implements ClusterEventListener, ServerItemsProvider, DiscoInfoProvider, DiscoItemsProvider {
 
 	private static final Logger Log = LoggerFactory.getLogger(SessionManager.class);
 
@@ -1162,6 +1172,48 @@ public class SessionManager extends BasicModule implements ClusterEventListener
         JiveGlobals.setProperty("xmpp.session.conflict-limit", Integer.toString(conflictLimit));
     }
 
+    @Override
+    public Iterator<DiscoServerItem> getItems() {
+        return Arrays.asList(new DiscoServerItem(serverAddress, null, null, null, this, this)).iterator();
+    }
+
+    @Override
+    public Iterator<Element> getIdentities(String name, String node, JID senderJID) {
+        return Collections.emptyIterator();
+    }
+
+    @Override
+    public Iterator<String> getFeatures(String name, String node, JID senderJID) {
+        return Collections.emptyIterator();
+    }
+
+    @Override
+    public DataForm getExtendedInfo(String name, String node, JID senderJID) {
+        return null;
+    }
+
+    @Override
+    public boolean hasInfo(String name, String node, JID senderJID) {
+        return false;
+    }
+
+    @Override
+    public Iterator<DiscoItem> getItems(String name, String node, JID senderJID) {
+        try {
+            // If the requesting entity is the user itself or the sender or the requesting entity can probe the presence of the user.
+            if (server.getUserManager().isRegisteredUser(senderJID) && name.equals(senderJID.getNode()) || server.getPresenceManager().canProbePresence(senderJID, name)) {
+                Collection<DiscoItem> discoItems = new ArrayList<DiscoItem>();
+                for (ClientSession clientSession : getSessions(name)) {
+                    discoItems.add(new DiscoItem(clientSession.getAddress(), null, null, null));
+                }
+                return discoItems.iterator();
+            }
+            return Collections.emptyIterator();
+        } catch (UserNotFoundException e) {
+            return Collections.emptyIterator();
+        }
+    }
+
     private class ClientSessionListener implements ConnectionCloseListener {
         /**
          * Handle a session that just closed.
@@ -1320,6 +1372,7 @@ public class SessionManager extends BasicModule implements ClusterEventListener
         sessionInfoCache = CacheFactory.createCache(C2S_INFO_CACHE_NAME);
         // Listen to cluster events
         ClusterManager.addListener(this);
+        server.getIQDiscoItemsHandler().addServerItemsProvider(this);
     }
 
 

src/java/org/jivesoftware/openfire/XMPPServer.java

@@ -540,7 +540,6 @@ public class XMPPServer {
         loadModule(PrivateStorage.class.getName());
         // Load core modules
         loadModule(PresenceManagerImpl.class.getName());
-        loadModule(SessionManager.class.getName());
         loadModule(PacketRouterImpl.class.getName());
         loadModule(IQRouter.class.getName());
         loadModule(MessageRouter.class.getName());
@@ -580,6 +579,8 @@ public class XMPPServer {
         loadModule(PubSubModule.class.getName());
         loadModule(IQDiscoInfoHandler.class.getName());
         loadModule(IQDiscoItemsHandler.class.getName());
+        // SessionManager registers to IQDiscoItemsHandler, therefore load it after it.
+        loadModule(SessionManager.class.getName());
         loadModule(UpdateManager.class.getName());
         loadModule(FlashCrossDomainHandler.class.getName());
         loadModule(InternalComponentManager.class.getName());