[GATE-68] Updated to deny registration additions for users not on the same server.

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

src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/BaseTransport.java

@@ -584,13 +584,6 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
 
                     try {
                         this.addNewRegistration(from, username, password, nickname);
-                    }
-                    catch (UserNotFoundException e) {
-                        Log.error("Someone attempted to register with the gateway who is not registered with the server: " + from);
-                        IQ eresult = IQ.createResultIQ(packet);
-                        eresult.setError(Condition.bad_request);
-                        reply.add(eresult);
-                    }
 
                         // Lets ask them what their presence is, maybe log
                         // them in immediately.
@@ -599,6 +592,19 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
                         p.setFrom(to);
                         reply.add(p);
                     }
+                    catch (UserNotFoundException e) {
+                        Log.error("Someone attempted to register with the gateway who is not registered with the server: " + from);
+                        IQ eresult = IQ.createResultIQ(packet);
+                        eresult.setError(Condition.bad_request);
+                        reply.add(eresult);
+                    }
+                    catch (IllegalAccessException e) {
+                        Log.error("Someone who is not a user of this server tried to register with the transport: "+from);
+                        IQ eresult = IQ.createResultIQ(packet);
+                        eresult.setError(Condition.not_allowed);
+                        reply.add(eresult);
+                    }
+                }
             }
             else if (packet.getType() == IQ.Type.get) {
                 Element response = DocumentHelper.createElement(QName.get("query", IQ_REGISTER));
@@ -1119,8 +1125,13 @@ public abstract class BaseTransport implements Component, RosterEventListener, P
      * @param password Legacy password of registration.
      * @param nickname Legacy nickname of registration.
      * @throws UserNotFoundException if registration or roster not found.
+     * @throws IllegalAccessException if jid is not from this server.
      */
-    public void addNewRegistration(JID jid, String username, String password, String nickname) throws UserNotFoundException {
+    public void addNewRegistration(JID jid, String username, String password, String nickname) throws UserNotFoundException, IllegalAccessException {
+        if (!XMPPServer.getInstance().getServerInfo().getName().equals(jid.getDomain())) {
+            throw new IllegalAccessException("Domain of jid registering does not match domain of server.");
+        }
+
         Collection<Registration> registrations = registrationManager.getRegistrations(jid, this.transportType);
         Boolean foundReg = false;
         for (Registration registration : registrations) {

src/plugins/gateway/src/web/gateway-registrations.jsp

@@ -101,6 +101,11 @@
                 response.sendRedirect("gateway-registrations.jsp?success=false");
                 return;
             }
+            catch (IllegalAccessException e) {
+                Log.error("Domain of JID specified for registration is not on this server: "+jid.toString());
+                response.sendRedirect("gateway-registrations.jsp?success=false");
+                return;
+            }
         }
     }