OF-725 OF should return error if a message stanza is blocked

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13989 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/openfire/IQRouter.java

@@ -35,6 +35,7 @@ import org.jivesoftware.openfire.interceptor.PacketRejectedException;
 import org.jivesoftware.openfire.privacy.PrivacyList;
 import org.jivesoftware.openfire.privacy.PrivacyListManager;
 import org.jivesoftware.openfire.session.ClientSession;
+import org.jivesoftware.openfire.session.LocalClientSession;
 import org.jivesoftware.openfire.session.Session;
 import org.jivesoftware.openfire.user.UserManager;
 import org.jivesoftware.util.LocaleUtils;
@@ -376,9 +377,29 @@ public class IQRouter extends BasicModule {
                 }
             }
             else {
-                // JID is of the form <node@domain/resource> or belongs to a remote server
-                // or to an uninstalled component
-                routingTable.routePacket(recipientJID, packet, false);
+                ClientSession session = sessionManager.getSession(packet.getFrom());
+                boolean isAcceptable = true;
+                if (session instanceof LocalClientSession) {
+                    // Check if we could process IQ stanzas from the recipient.
+                    // If not, return a not-acceptable error as per XEP-0016:
+                    // If the user attempts to send an outbound stanza to a contact and that stanza type is blocked, the user's server MUST NOT route the stanza to the contact but instead MUST return a <not-acceptable/> error
+                    IQ dummyIQ = packet.createCopy();
+                    dummyIQ.setFrom(packet.getTo());
+                    dummyIQ.setTo(packet.getFrom());
+                    if (!((LocalClientSession) session).canProcess(dummyIQ)) {
+                        packet.setTo(session.getAddress());
+                        packet.setFrom((JID) null);
+                        packet.setError(PacketError.Condition.not_acceptable);
+                        session.process(packet);
+                        isAcceptable = false;
+                    }
+                }
+
+                if (isAcceptable) {
+                    // JID is of the form <node@domain/resource> or belongs to a remote server
+                    // or to an uninstalled component
+                    routingTable.routePacket(recipientJID, packet, false);
+                }
             }
         }
         catch (Exception e) {

src/java/org/jivesoftware/openfire/MessageRouter.java

@@ -25,8 +25,11 @@ package org.jivesoftware.openfire;
 import org.jivesoftware.openfire.container.BasicModule;
 import org.jivesoftware.openfire.interceptor.InterceptorManager;
 import org.jivesoftware.openfire.interceptor.PacketRejectedException;
-import org.jivesoftware.openfire.session.ClientSession;
-import org.jivesoftware.openfire.session.Session;
+   import org.jivesoftware.openfire.privacy.PrivacyList;
+   import org.jivesoftware.openfire.privacy.PrivacyListManager;
+   import org.jivesoftware.openfire.session.ClientSession;
+   import org.jivesoftware.openfire.session.LocalClientSession;
+   import org.jivesoftware.openfire.session.Session;
 import org.jivesoftware.openfire.user.UserManager;
 import org.jivesoftware.util.JiveGlobals;
 import org.slf4j.Logger;
@@ -109,13 +112,30 @@ public class MessageRouter extends BasicModule {
                     return;
                 }
 
-                try {
-                    // Deliver stanza to requested route
-                    routingTable.routePacket(recipientJID, packet, false);
+                boolean isAcceptable = true;
+                if (session instanceof LocalClientSession) {
+                    // Check if we could process messages from the recipient.
+                    // If not, return a not-acceptable error as per XEP-0016:
+                    // If the user attempts to send an outbound stanza to a contact and that stanza type is blocked, the user's server MUST NOT route the stanza to the contact but instead MUST return a <not-acceptable/> error
+                    Message dummyMessage = packet.createCopy();
+                    dummyMessage.setFrom(packet.getTo());
+                    dummyMessage.setTo(packet.getFrom());
+                    if (!((LocalClientSession) session).canProcess(dummyMessage)) {
+                        packet.setTo(session.getAddress());
+                        packet.setFrom((JID)null);
+                        packet.setError(PacketError.Condition.not_acceptable);
+                        session.process(packet);
+                        isAcceptable = false;
+                    }
                 }
-                catch (Exception e) {
-                	log.error("Failed to route packet: " + packet.toXML(), e);
-                    routingFailed(recipientJID, packet);
+                if (isAcceptable) {
+                    try {
+                        // Deliver stanza to requested route
+                        routingTable.routePacket(recipientJID, packet, false);
+                    } catch (Exception e) {
+                        log.error("Failed to route packet: " + packet.toXML(), e);
+                        routingFailed(recipientJID, packet);
+                    }
                 }
             }
             else {