Needed a change to one of the tests

Author: garethf

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/SubscriptionsGet.java

@@ -7,6 +7,7 @@
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.JabberPubsub;
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.PubSubElementProcessorAbstract;
 import org.buddycloud.channelserver.pubsub.model.NodeMembership;
+import org.buddycloud.channelserver.pubsub.subscription.Subscriptions;
 import org.buddycloud.channelserver.utils.XMLConstants;
 import org.buddycloud.channelserver.utils.node.item.payload.Buddycloud;
 import org.dom4j.Element;
@@ -67,6 +68,15 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm) throws Exc
         outQueue.put(result);
     }
 
+    /**
+     * Don't include any subscriptions other than Subscriptions.subscriptions, unless the user is
+     * one of owner, moderator or the user.
+     * 
+     * @param subscriptions
+     * @return
+     * @throws NodeStoreException
+     * @throws InterruptedException
+     */
     private boolean getNodeMemberships(Element subscriptions) throws NodeStoreException, InterruptedException {
 
         ResultSet<NodeMembership> cur = channelManager.getNodeMemberships(node);
@@ -76,19 +86,23 @@ private boolean getNodeMemberships(Element subscriptions) throws NodeStoreExcept
             subscriptions.addAttribute(XMLConstants.NODE_ATTR, node);
 
             for (NodeMembership ns : cur) {
-                if (actorJid.toBareJID().equals(ns.getUser().toBareJID())) {
-                    Element subscription = subscriptions.addElement(XMLConstants.SUBSCRIPTION_ELEM);
-                    subscription.addAttribute(XMLConstants.NODE_ATTR, ns.getNodeId())
-                            .addAttribute(XMLConstants.SUBSCRIPTION_ELEM, ns.getSubscription().toString())
-                            .addAttribute(XMLConstants.JID_ATTR, ns.getUser().toBareJID());
-                    if (null != ns.getInvitedBy() && isOwnerModerator()) {
-                        subscription.addAttribute(XMLConstants.INVITED_BY_ELEM, ns.getInvitedBy().toBareJID());
-                    }
+                if (!isUserPriviledged(ns.getUser()) && !ns.getSubscription().equals(Subscriptions.subscribed)) {
+                    continue;
+                }
+
+                Element subscription = subscriptions.addElement(XMLConstants.SUBSCRIPTION_ELEM);
+                subscription.addAttribute(XMLConstants.NODE_ATTR, ns.getNodeId())
+                        .addAttribute(XMLConstants.SUBSCRIPTION_ELEM, ns.getSubscription().toString())
+                        .addAttribute(XMLConstants.JID_ATTR, ns.getUser().toBareJID());
+
+                // Only add the invited by attribute if the user has the necessary priviledges
+                if (null != ns.getInvitedBy() && isUserPriviledged(ns.getUser())) {
+                    subscription.addAttribute(XMLConstants.INVITED_BY_ELEM, ns.getInvitedBy().toBareJID());
                 }
 
             }
         } else {
-
+            // TODO(garethf) this looks like makeRemoteRequest
             if (!channelManager.isCachedNode(node) || (null != requestIq.getElement().element(XMLConstants.PUBSUB_ELEM).element(XMLConstants.SET_ELEM))
                     && !cur.isEmpty()) {
                 makeRemoteRequest(new JID(node.split("/")[2]).getDomain());
@@ -99,6 +113,21 @@ private boolean getNodeMemberships(Element subscriptions) throws NodeStoreExcept
         return true;
     }
 
+    /**
+     * Don't include any subscriptions other than Subscriptions.subscriptions, unless the user is
+     * one of owner, moderator or the user.
+     * 
+     * @param ns
+     * 
+     * @return
+     * @throws NodeStoreException
+     */
+    private boolean isUserPriviledged(JID jid) throws NodeStoreException {
+        boolean isUser = actorJid.toBareJID().equals(jid.toBareJID());
+
+        return (isUser || isOwnerModerator()) ? true : false;
+    }
+
     private boolean getUserMemberships(Element subscriptions) throws NodeStoreException, InterruptedException {
         // let's get all subscriptions.
         ResultSet<NodeMembership> cur;

src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/SubscriptionsGetTest.java

@@ -71,7 +71,6 @@ public void testPassingNotSubscriptionsAsElementNameReturnsFalse() {
     @Test
     public void addsInvitedByToUserSubscriptionsList() throws Exception {
 
-
         ArrayList<NodeMembership> members = new ArrayList<NodeMembership>();
         members.add(new NodeMembershipImpl(node, jid, Subscriptions.invited, Affiliations.publisher, invitedBy));
 
@@ -112,11 +111,12 @@ public void remoteNodeForwardsStanza() throws Exception {
     public void doesntAddInvitedByToNodeSubscriptionsListIfNotUserOrOwnerOrModerator() throws Exception {
 
         List<NodeMembership> members = new ArrayList<NodeMembership>();
-        members.add(new NodeMembershipImpl(node, jid, Subscriptions.invited, Affiliations.publisher, invitedBy));
+        members.add(new NodeMembershipImpl(node, jid, Subscriptions.subscribed, Affiliations.publisher, invitedBy));
 
         Mockito.when(channelManager.getNodeMemberships(Mockito.anyString())).thenReturn(new ResultSetImpl<NodeMembership>(members));
 
-        subscriptionsGet.process(element, jid, nodeRequest, null);
+        // Run the processing as a JID other than the one used in the above 'add'
+        subscriptionsGet.process(element, new JID("shylock@shakespeare.lit"), nodeRequest, null);
 
         Assert.assertEquals(1, queue.size());
 
@@ -131,7 +131,7 @@ public void doesntAddInvitedByToNodeSubscriptionsListIfNotUserOrOwnerOrModerator
     }
 
     @Test
-    public void addsInvitedByToNodeSubscriptionsList() throws Exception {
+    public void addsInvitedByToNodeSubscriptionsListIfOwner() throws Exception {
 
         NodeMembership nodeMembership = new NodeMembershipImpl(node, jid, Subscriptions.subscribed, Affiliations.owner, null);
         Mockito.when(channelManager.getNodeMembership(Mockito.anyString(), Mockito.any(JID.class))).thenReturn(nodeMembership);