OF-500

Implemented ability to restrict access to external gateways

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

src/plugins/remoteRoster/changelog.html

@@ -44,7 +44,7 @@
 Remote Roster Plugin Changelog
 </h1>
 
-<p><b>1.0</b> -- Oct 16, 2011</p>
+<p><b>1.0 Alpha</b> -- Dec 12, 2011</p>
 
 <ul>
      <li>Initial release. </li>

src/plugins/remoteRoster/plugin.xml

@@ -6,9 +6,9 @@
 
     <name>Remote Roster</name>
     <description>ProtoXEP-xxxx: Remote Roster Management support</description>
-    <author>Holger Bergunde & Daniel Henninger</author>
+    <author>Holger Bergunde and Daniel Henninger</author>
     <version>1.0.0 Alpha</version>
-    <date>12/01/2011</date>
+    <date>12/06/2011</date>
     <minServerVersion>3.7.0</minServerVersion>
 
     <!-- Admin console entries -->

src/plugins/remoteRoster/src/java/org/jivesoftware/openfire/plugin/PermissionManager.java

+package org.jivesoftware.openfire.plugin;
+
+import java.util.Collection;
+
+import org.jivesoftware.openfire.group.Group;
+import org.jivesoftware.openfire.group.GroupManager;
+import org.jivesoftware.util.JiveGlobals;
+import org.xmpp.packet.JID;
+
+public class PermissionManager {
+
+	GroupManager _groupManager = GroupManager.getInstance();
+
+	public boolean isGatewayLimited(String subdomain)
+	{
+		return getGroupForGateway(subdomain).length() > 0; 
+	}
+
+	public boolean allowedForUser(String gateway, JID jid)
+	{
+		String groupAllowedFor = getGroupForGateway(gateway);
+		if (groupAllowedFor != null) {
+			Collection<Group> groups = _groupManager.getGroups(jid);
+			for (Group gr : groups) {
+				if (gr.getName().equals(groupAllowedFor))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public String getGroupForGateway(String gateway)
+	{
+		return JiveGlobals.getProperty("plugin.remoteroster.permissiongroup."+gateway, "");
+	}
+
+	public void setGroupForGateway(String gateway, String group)
+	{
+		JiveGlobals.setProperty("plugin.remoteroster.permissiongroup."+gateway, group);
+	}
+	
+	public void removeGatewayLimitation(String gateway)
+	{
+		setGroupForGateway(gateway, "");
+	}
+	
+}

src/plugins/remoteRoster/src/java/org/jivesoftware/openfire/plugin/RemoteRosterPlugin.java

@@ -15,7 +15,8 @@ import org.jivesoftware.openfire.component.ComponentEventListener;
 import org.jivesoftware.openfire.component.InternalComponentManager;
 import org.jivesoftware.openfire.container.Plugin;
 import org.jivesoftware.openfire.container.PluginManager;
-import org.jivesoftware.openfire.interceptor.InterceptorManager;
+import org.jivesoftware.openfire.plugin.interceptor.AbstractInterceptorHandler;
+import org.jivesoftware.openfire.plugin.interceptor.GatewayInterceptorHandler;
 import org.jivesoftware.openfire.session.ComponentSession;
 import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.PropertyEventDispatcher;
@@ -29,11 +30,10 @@ public class RemoteRosterPlugin implements Plugin {
 
 	private static final Logger Log = LoggerFactory.getLogger(RemoteRosterPlugin.class);
 	final SessionManager _sessionManager = SessionManager.getInstance();
-	private Map<String, RemotePackageInterceptor> _interceptors = new HashMap<String, RemotePackageInterceptor>();
+	private Map<String, AbstractInterceptorHandler> _interceptors = new HashMap<String, AbstractInterceptorHandler>();
 	private static PluginManager pluginManager;
 	private Set<String> _waitingForIQResponse = new HashSet<String>();
 
-	private InterceptorManager _interceptorManager;
 	private PropertyEventListener _settingsObserver;
 
 	public RemoteRosterPlugin() {
@@ -42,11 +42,10 @@ public class RemoteRosterPlugin implements Plugin {
 
 	public void initializePlugin(PluginManager manager, File pluginDirectory)
 	{
-		Log.debug("Starting RemoteRoster Plguin");
+		Log.debug("Starting RemoteRoster Plugin");
 		pluginManager = manager;
 		manageExternalComponents();
 		listenToSettings();
-		_interceptorManager = InterceptorManager.getInstance();
 	}
 
 	private void manageExternalComponents()
@@ -83,17 +82,18 @@ public class RemoteRosterPlugin implements Plugin {
 			public void componentInfoReceived(IQ iq)
 			{
 				String from = iq.getFrom().getDomain();
-				//Waiting for this external component sending an IQ response to us?
+				// Waiting for this external component sending an IQ response to
+				// us?
 				if (_waitingForIQResponse.contains(from)) {
 					Element packet = iq.getChildElement();
 					Document doc = packet.getDocument();
 					List<Node> nodes = Utils.findNodesInDocument(doc, "//disco:identity[@category='gateway']");
-					//Is this external component a gateway and there is no package interceptor for it?
-					if (nodes.size() > 0 && !_interceptors.containsKey(from))
-					{
+					// Is this external component a gateway and there is no
+					// package interceptor for it?
+					if (nodes.size() > 0 && !_interceptors.containsKey(from)) {
 						updateInterceptors(from);
 					}
-					
+
 					// We got the IQ, we can now remove it from the set, because
 					// we are not waiting any more
 					_waitingForIQResponse.remove(from);
@@ -102,8 +102,6 @@ public class RemoteRosterPlugin implements Plugin {
 		});
 	}
 
-	
-	
 	private void listenToSettings()
 	{
 		_settingsObserver = new RemoteRosterPropertyListener() {
@@ -115,38 +113,30 @@ public class RemoteRosterPlugin implements Plugin {
 		};
 		PropertyEventDispatcher.addListener(_settingsObserver);
 	}
-	
+
 	public void destroyPlugin()
 	{
-		for (String interceptor : _interceptors.keySet())
-		{
-			removeInterceptor(interceptor);
+		for (String key : _interceptors.keySet()) {
+			_interceptors.get(key).stop();
 		}
 		PropertyEventDispatcher.removeListener(_settingsObserver);
 		pluginManager = null;
-		_interceptorManager = null;
 	}
 
-	
 	private void updateInterceptors(String componentJID)
 	{
-		Log.debug("Updating my package interceptors for component "+componentJID);
-		boolean allowed = JiveGlobals.getBooleanProperty("plugin.remoteroster.jids."+componentJID, false);
-		if (allowed)
-		{
-			if(!_interceptors.containsKey(componentJID))
-			{
+		boolean allowed = JiveGlobals.getBooleanProperty("plugin.remoteroster.jids." + componentJID, false);
+		if (allowed) {
+			if (!_interceptors.containsKey(componentJID)) {
 				createNewPackageIntercetor(componentJID);
 			}
-		} else
-		{
-			if(_interceptors.containsKey(componentJID))
-			{
+		} else {
+			if (_interceptors.containsKey(componentJID)) {
 				removeInterceptor(componentJID);
 			}
 		}
 	}
-	
+
 	public String getName()
 	{
 		return "remoteRoster";
@@ -160,20 +150,17 @@ public class RemoteRosterPlugin implements Plugin {
 
 	private void removeInterceptor(String initialSubdomain)
 	{
-		RemotePackageInterceptor interceptor = _interceptors.get(initialSubdomain);
+		AbstractInterceptorHandler interceptor = _interceptors.get(initialSubdomain);
 		if (interceptor != null) {
-			Log.debug("Removing package interceptor for "+initialSubdomain);
-			_interceptorManager.removeInterceptor(interceptor);
-			_interceptors.remove(initialSubdomain);
+			interceptor.stop();
 		}
 	}
 
 	private void createNewPackageIntercetor(String initialSubdomain)
 	{
-		Log.debug("Creating package interceptor.");
-		RemotePackageInterceptor interceptor = new RemotePackageInterceptor(initialSubdomain);
+		AbstractInterceptorHandler interceptor = new GatewayInterceptorHandler(initialSubdomain);
 		_interceptors.put(initialSubdomain, interceptor);
-		_interceptorManager.addInterceptor(interceptor);
+		interceptor.start();
 	}
 
 }

src/plugins/remoteRoster/src/java/org/jivesoftware/openfire/plugin/RemoteRosterPropertyListener.java

@@ -2,6 +2,7 @@ package org.jivesoftware.openfire.plugin;
 
 import java.util.Map;
 
+import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.util.PropertyEventListener;
 
 public abstract class RemoteRosterPropertyListener implements PropertyEventListener {
@@ -10,17 +11,16 @@ public abstract class RemoteRosterPropertyListener implements PropertyEventListe
 	public void xmlPropertySet(String property, Map<String, Object> params)
 	{
 	}
-	
+
 	@Override
 	public void xmlPropertyDeleted(String property, Map<String, Object> params)
 	{
 	}
-	
+
 	@Override
 	public void propertySet(String property, Map<String, Object> params)
 	{
-		if (property.contains("plugin.remoteroster.jids."))
-		{
+		if (property.contains("plugin.remoteroster.jids.")) {
 			changedProperty(property.replace("plugin.remoteroster.jids.", ""));
 		}
 	}
@@ -28,9 +28,11 @@ public abstract class RemoteRosterPropertyListener implements PropertyEventListe
 	@Override
 	public void propertyDeleted(String property, Map<String, Object> params)
 	{
-		changedProperty(property);
+		String hostname = XMPPServer.getInstance().getServerInfo().getXMPPDomain();
+		property += "." + hostname;
+		changedProperty(property.replace("plugin.remoteroster.jids.", ""));
 	}
-	
+
 	protected abstract void changedProperty(String prop);
 
 }

src/plugins/remoteRoster/src/java/org/jivesoftware/openfire/plugin/Utils.java

@@ -32,6 +32,7 @@ public class Utils {
 	{
 		Map<String, String> namespaceUris = new HashMap<String, String>();
 		namespaceUris.put("roster", "jabber:iq:roster");
+		namespaceUris.put("discoitems", "http://jabber.org/protocol/disco#items");
 		namespaceUris.put("register", "jabber:iq:register");
 		namespaceUris.put("disco", "http://jabber.org/protocol/disco#info");
 		XPath xPath = DocumentHelper.createXPath(xpath);

src/plugins/remoteRoster/src/java/org/jivesoftware/openfire/plugin/interceptor/AbstractInterceptorHandler.java

+package org.jivesoftware.openfire.plugin.interceptor;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jivesoftware.openfire.interceptor.InterceptorManager;
+import org.jivesoftware.openfire.interceptor.PacketInterceptor;
+
+public abstract class AbstractInterceptorHandler {
+
+	private String _subdomain;
+	private boolean _isRunning = false;
+	private Set<PacketInterceptor> _interceptors = new HashSet<PacketInterceptor>();
+	private InterceptorManager _iManager;
+
+	public AbstractInterceptorHandler(String subdomain) {
+		_subdomain = subdomain;
+		_iManager = InterceptorManager.getInstance();
+	}
+
+	protected boolean addInterceptor(PacketInterceptor interceptor)
+	{
+		if (_isRunning) {
+			return false;
+		}
+		return _interceptors.add(interceptor);
+	}
+
+	protected boolean removeInterceptor(PacketInterceptor interceptor)
+	{
+		if (_isRunning) {
+			return false;
+		}
+		return _interceptors.remove(interceptor);
+	}
+
+	public void start()
+	{
+		System.out.println("Start handling message interceptors for gateway " + _subdomain);
+		_isRunning = true;
+		for (PacketInterceptor interceptor : _interceptors) {
+			_iManager.addInterceptor(interceptor);
+		}
+	}
+
+	public void stop()
+	{
+		System.out.println("Stop handling message interceptors for gateway " + _subdomain);
+		if (!_isRunning)
+			return;
+		_isRunning = false;
+		for (PacketInterceptor interceptor : _interceptors) {
+			_iManager.removeInterceptor(interceptor);
+		}
+
+	}
+
+}

src/plugins/remoteRoster/src/java/org/jivesoftware/openfire/plugin/interceptor/DiscoPackageInterceptor.java

+package org.jivesoftware.openfire.plugin.interceptor;
+
+import java.util.List;
+
+import org.dom4j.Element;
+import org.dom4j.Node;
+import org.jivesoftware.openfire.XMPPServer;
+import org.jivesoftware.openfire.interceptor.PacketInterceptor;
+import org.jivesoftware.openfire.interceptor.PacketRejectedException;
+import org.jivesoftware.openfire.plugin.PermissionManager;
+import org.jivesoftware.openfire.plugin.Utils;
+import org.jivesoftware.openfire.session.Session;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.Packet;
+
+public class DiscoPackageInterceptor implements PacketInterceptor {
+
+	private PermissionManager _permissions;
+	private String _subDomain;
+	private String _host;
+
+	public DiscoPackageInterceptor(String subdomain) {
+		_permissions = new PermissionManager();
+		_subDomain = subdomain;
+		XMPPServer server = XMPPServer.getInstance();
+		_host = server.getServerInfo().getHostname();
+	}
+
+	@Override
+	public void interceptPacket(Packet packet, Session session, boolean incoming, boolean processed)
+			throws PacketRejectedException
+	{
+		if (_permissions.isGatewayLimited(_subDomain)) {
+			if (packet instanceof IQ) {
+				IQ iqpacket = (IQ) packet;
+				Element root = iqpacket.getChildElement();
+				String ns = root.getNamespaceURI();
+				if (ns.equals("http://jabber.org/protocol/disco#items") && iqpacket.getType().equals(IQ.Type.result)) {
+					if (!_permissions.allowedForUser(_subDomain, iqpacket.getTo())) {
+						if (iqpacket.getFrom().toString().equals(_host)) {
+							List<Node> nodes = Utils.findNodesInDocument(root.getDocument(), "//discoitems:item");
+							for (Node node : nodes) {
+								if (node.valueOf("@jid").equals(_subDomain)) {
+									root.remove(node);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+}

src/plugins/remoteRoster/src/java/org/jivesoftware/openfire/plugin/interceptor/GatewayInterceptorHandler.java

+package org.jivesoftware.openfire.plugin.interceptor;
+
+public class GatewayInterceptorHandler extends AbstractInterceptorHandler {
+	public GatewayInterceptorHandler(String subdomain) {
+		super(subdomain);
+		DiscoPackageInterceptor discoInterceptor = new DiscoPackageInterceptor(subdomain);
+		RemotePackageInterceptor remoteRosterInterceptor = new RemotePackageInterceptor(subdomain); 
+		addInterceptor(remoteRosterInterceptor);
+		addInterceptor(discoInterceptor);
+	}
+}

src/plugins/remoteRoster/src/java/org/jivesoftware/openfire/plugin/RemotePackageInterceptor.java → src/plugins/remoteRoster/src/java/org/jivesoftware/openfire/plugin/interceptor/RemotePackageInterceptor.java

-package org.jivesoftware.openfire.plugin;
+package org.jivesoftware.openfire.plugin.interceptor;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,6 +6,7 @@ import java.util.Map;
 import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.interceptor.PacketInterceptor;
 import org.jivesoftware.openfire.interceptor.PacketRejectedException;
+import org.jivesoftware.openfire.plugin.Utils;
 import org.jivesoftware.openfire.plugin.packageProcessor.AbstractRemoteRosterProcessor;
 import org.jivesoftware.openfire.plugin.packageProcessor.CleanUpRosterProcessor;
 import org.jivesoftware.openfire.plugin.packageProcessor.ClientToComponentUpdateProcessor;

src/plugins/remoteRoster/src/web/http.js

+var http = function() {
+	this.callback = function(a) {};
+
+	this.obj = window.XMLHttpRequest ? new XMLHttpRequest()
+			: new ActiveXObject("Microsoft.XMLHTTP");
+
+	this.load = function(url) {
+		this.obj.open('get', url);
+		this.obj.callback = this.callback;
+		this.obj.onreadystatechange = this.handle;
+		this.obj.send(null);
+	};
+
+	this.handle = function() {
+		if (this.readyState == 4)
+			this.callback(this);
+	};
+};

src/plugins/remoteRoster/src/web/rr-main.jsp

-<%@ page import="org.jivesoftware.openfire.session.ComponentSession" %>
-<%@ page import="java.util.Collection" %>
-<%@ page import="org.jivesoftware.openfire.SessionManager" %>
-<%@ page import="org.jivesoftware.util.JiveGlobals" %>
-<%@ page import="java.util.HashMap" %>
-<%@ page import="java.util.Map" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.jivesoftware.util.ParamUtils" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
-
-<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
+<%@page import="org.jivesoftware.openfire.plugin.PermissionManager"%>
+<%@ page import="org.dom4j.tree.DefaultElement"%>
+<%@ page import="org.jivesoftware.openfire.group.GroupManager"%>
+<%@ page import="org.jivesoftware.openfire.group.Group"%>
+<%@ page import="org.jivesoftware.openfire.session.ComponentSession"%>
+<%@ page import="java.util.Collection"%>
+<%@ page import="org.jivesoftware.openfire.SessionManager"%>
+<%@ page import="org.jivesoftware.util.JiveGlobals"%>
+<%@ page import="java.util.HashMap"%>
+<%@ page import="java.util.Map"%>
+<%@ page import="java.util.List"%>
+<%@ page import="org.jivesoftware.util.ParamUtils"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
+
+<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <%
-    webManager.init(request, response, session, application, out);
-    boolean save = request.getParameter("save") != null;
-    boolean success = request.getParameter("success") != null;
-    //boolean persistentRoster = ParamUtils.getBooleanAttribute(request, "persistentEnabled");
-    boolean persistentRoster = true;
-    String sparkdiscoParam = request.getParameter("sparkDiscoInfo");
-    boolean sparkDiscoInfo = sparkdiscoParam == null? false: sparkdiscoParam.equals("true");
-    String[] componentsEnabled = request.getParameterValues("enabledComponents[]");
-	
-    
-    
-    Map<String,String> errors = new HashMap<String,String>();
-    if (save) {
-        for (String property : JiveGlobals.getPropertyNames("plugin.remoteroster.jids")) {
-            JiveGlobals.deleteProperty(property);
-        }
-        if (componentsEnabled != null) {
-            for (int i = 0; i < componentsEnabled.length; i++) {
-                JiveGlobals.setProperty("plugin.remoteroster.jids."+componentsEnabled[i], "true");
-            }
-        }
-        JiveGlobals.setProperty("plugin.remoteroster.persistent", (persistentRoster ? "true" : "false"));
-        JiveGlobals.setProperty("plugin.remoteroster.sparkDiscoInfo", (sparkDiscoInfo ? "true" : "false"));
-        response.sendRedirect("rr-main.jsp?success=true");
-        return;
-    }
-
-    // Get the session manager
-    SessionManager sessionManager = webManager.getSessionManager();
-
-    Collection<ComponentSession> sessions = sessionManager.getComponentSessions();
+	webManager.init(request, response, session, application, out);
+	boolean save = request.getParameter("save") != null;
+	boolean success = request.getParameter("success") != null;
+	//boolean persistentRoster = ParamUtils.getBooleanAttribute(request, "persistentEnabled");
+	boolean persistentRoster = true;
+	String sparkdiscoParam = request.getParameter("sparkDiscoInfo");
+	boolean sparkDiscoInfo = sparkdiscoParam == null ? false : sparkdiscoParam.equals("true");
+	String[] componentsEnabled = request.getParameterValues("enabledComponents[]");
+	PermissionManager _pmanager = new PermissionManager();
+
+	Map<String, String> errors = new HashMap<String, String>();
+	if (save) {
+		for (String property : JiveGlobals.getPropertyNames("plugin.remoteroster.jids")) {
+			JiveGlobals.deleteProperty(property);
+		}
+		if (componentsEnabled != null) {
+			for (int i = 0; i < componentsEnabled.length; i++) {
+				JiveGlobals.setProperty("plugin.remoteroster.jids." + componentsEnabled[i], "true");
+				String group = request.getParameter("input_group." + componentsEnabled[i]);
+				if (group != null) {
+					_pmanager.setGroupForGateway(componentsEnabled[i], group);
+				}
+			}
+		}
+		JiveGlobals.setProperty("plugin.remoteroster.persistent", (persistentRoster ? "true" : "false"));
+		JiveGlobals.setProperty("plugin.remoteroster.sparkDiscoInfo", (sparkDiscoInfo ? "true" : "false"));
+		response.sendRedirect("rr-main.jsp?success=true");
+		return;
+	}
 
+	// Get the session manager
+	SessionManager sessionManager = webManager.getSessionManager();
+
+	Collection<ComponentSession> sessions = sessionManager.getComponentSessions();
 %>
 
 <html>
 <head>
-    <title>
-        <fmt:message key="rr.summary.title"/>
-    </title>
-    <meta name="pageID" content="remoteRoster"/>
-    <meta name="helpPage" content=""/>
+<title><fmt:message key="rr.summary.title" /></title>
+<link href="rr.css" rel="stylesheet" type="text/css">
+<script src="http.js" type="text/javascript"></script>
+<script src="jquery.js" type="text/javascript"></script>
+<script src="rr.js" type="text/javascript"></script>
+<script src="jquery.sparkline.js" type="text/javascript"></script>
+
 
+<meta name="pageID" content="remoteRoster" />
+<meta name="helpPage" content="" />
 
 </head>
 <body>
 
-<p>
-    Any components configured here will allow the external component associated with them full control over
-    their domain within any user's roster.  Before enabling Remote Roster Management support for an external
-    component, first connect it like you would any external component.  Once it has connected and registered
-    with Openfire, it's JID should show up below and you can enable Remote Roster support.
-</p>
-
-<%  if (success) { %>
-
-    <div class="jive-success">
-    <table cellpadding="0" cellspacing="0" border="0">
-    <tbody>
-        <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
-        <td class="jive-icon-label">
-            Settings saved!
-        </td></tr>
-    </tbody>
-    </table>
-    </div><br>
-
-<%  } else if (errors.size() > 0) { %>
-
-    <div class="jive-error">
-    <table cellpadding="0" cellspacing="0" border="0">
-    <tbody>
-        <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
-        <td class="jive-icon-label">
-            Error saving settings!
-        </td></tr>
-    </tbody>
-    </table>
-    </div><br>
-
-<%  } %>
-
-<form action="rr-main.jsp?save" method="post">
-
-<div class="jive-contentBoxHeader">Connected Gateway Components</div>
-<div class="jive-contentBox">
+	<p>Any components configured here will allow the external component associated with them full control over their
+		domain within any user's roster. Before enabling Remote Roster Management support for an external component, first
+		connect it like you would any external component. Once it has connected and registered with Openfire, it's JID should
+		show up below and you can enable Remote Roster support.</p>
 
-<p>Select which components you want to enable remote roster on:</p>
-<table>
-<%
-    boolean gatewayFound = false;
-    for (ComponentSession componentSession : sessions) {
-        if (!componentSession.getExternalComponent().getCategory().equals("gateway")) { continue; }
-        gatewayFound = true;
-%>
-<tr>
-    <td align="center"><input type="checkbox" name="enabledComponents[]" value="<%= componentSession.getExternalComponent().getInitialSubdomain() %>" <%= JiveGlobals.getBooleanProperty("plugin.remoteroster.jids."+componentSession.getExternalComponent().getInitialSubdomain(), false) ? "checked=\"checked\"" : "" %> /></td>
-    <td align="left"><%= componentSession.getExternalComponent().getName() %></td>
-    <td align="left"><%= componentSession.getExternalComponent().getInitialSubdomain() %></td>
-</tr>
-<%
-    }
-%>
-</table>
-<%
-        if (!gatewayFound) {
-%>
-<span style="font-weight: bold">No connected external gateway components found.</span>
-<%
-    }
-%>
-</div>
-<!--  DISABLED PERSISTENT ROSTER UNTIL SPECTRUM SUPPORTS IT
+	<%
+		if (success) {
+	%>
+
+	<div class="jive-success">
+		<table cellpadding="0" cellspacing="0" border="0">
+			<tbody>
+				<tr>
+					<td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0" alt=""></td>
+					<td class="jive-icon-label">Settings saved!</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+	<br>
+
+	<%
+		} else if (errors.size() > 0) {
+	%>
+
+	<div class="jive-error">
+		<table cellpadding="0" cellspacing="0" border="0">
+			<tbody>
+				<tr>
+					<td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0" alt=""></td>
+					<td class="jive-icon-label">Error saving settings!</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+	<br>
+
+	<%
+		}
+	%>
+
+	<form action="rr-main.jsp?save" method="post">
+
+		<div class="jive-contentBoxHeader">Connected Gateway Components</div>
+		<div class="jive-contentBox">
+
+			<p>Select which components you want to enable remote roster on:</p>
+			<%
+				boolean gatewayFound = false;
+				int i = 0;
+				for (ComponentSession componentSession : sessions) {
+					if (!componentSession.getExternalComponent().getCategory().equals("gateway")) {
+						continue;
+					}
+					gatewayFound = true;
+			%>
+			<table class="gatewayHeader">
+				<tbody>
+					<tr>
+						<td class="gatewayCheckbox"><input type="checkbox" name="enabledComponents[]"
+							value="<%=componentSession.getExternalComponent().getInitialSubdomain()%>"
+							<%=JiveGlobals.getBooleanProperty("plugin.remoteroster.jids."
+						+ componentSession.getExternalComponent().getInitialSubdomain(), false) ? "checked=\"checked\""
+						: ""%> />
+						</td>
+						<td class="gatewayName"><%=componentSession.getExternalComponent().getName()%></td>
+						<td class="gatewayIcons"><img src="images/info-16x16.png" id="showConfig"
+							onclick="slideToggle('#config<%=i%>')"> <img src="images/permissions-16x16.png" id="showPermissions"
+							onclick="slideToggle('#permission<%=i%>')"> <img src="images/log-16x16.png"></td>
+					</tr>
+				</tbody>
+			</table>
+			<div id="config<%=i%>" class="slider">
+				<table class="configTable">
+					<tbody>
+						<tr>
+							<td class="configTable1Column">Domain:</td>
+							<td><%=componentSession.getExternalComponent().getInitialSubdomain()%></td>
+						</tr>
+						<tr>
+							<td class="configTable1Column">Status:</td>
+							<td>Online</td>
+						</tr>
+						<tr>
+							<td class="configTable1Column">Packages Send/Received:</td>
+							<td><%=componentSession.getNumServerPackets()%> / <%=componentSession.getNumClientPackets()%><div id="inlinesparkline<%=i%>">1,4,4,7,5,9,10</div></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			<div id="permission<%=i%>" class="slider">
+				> <span class="permissionTitle">You can limit the access to the external component to an existing group</span>)
+				<table class="groupTable">
+					<tbody>
+						<tr>
+							<td class="permissionTableColumn">Groupname:</td>
+							<td><input type="text" id="groupSearch<%=i%>"
+								name="input_group.<%=componentSession.getExternalComponent().getInitialSubdomain()%>" alt="Find Groups"
+								onkeyup="searchSuggest('<%=i%>');" autocomplete="off"
+								value="<%=_pmanager.getGroupForGateway(componentSession.getExternalComponent().getInitialSubdomain())%>">
+								<div id="search_suggest<%=i%>"></div></td>
+							<td style="vertical-align: top;">
+								<div class="ajaxloading" id="ajaxloading<%=i%>"></div>
+							</td>
+
+						</tr>
+					</tbody>
+				</table>
+			</div>
+
+
+
+
+			<%
+				++i;
+				}
+			%>
+			<%
+				if (!gatewayFound) {
+			%>
+			<span style="font-weight: bold">No connected external gateway components found.</span>
+			<%
+				}
+			%>
+		</div>
+		<!--  DISABLED PERSISTENT ROSTER UNTIL SPECTRUM SUPPORTS IT
 		
 <div class="jive-contentBoxHeader">Options</div>
 <div class="jive-contentBox">
@@ -157,40 +227,44 @@
 
  -->
 
-<div class="jive-contentBoxHeader">Client specific options</div>
-<div class="jive-contentBox">
-   <table cellpadding="3" cellspacing="0" border="0" width="100%">
-   <tbody>
-   <tr valign="top">
-       <td width="1%" nowrap class="c1">
-           Spark:
-       </td>
-       <td width="99%">
-           <table cellpadding="0" cellspacing="0" border="0">
-           <tbody>
-               <tr>
-                   <td>
-                       <input type="checkbox" name="sparkDiscoInfo" id="SDI" value="true" <%= JiveGlobals.getBooleanProperty("plugin.remoteroster.sparkDiscoInfo", false) ? "checked=\"checked\"" : "" %> />
-                      
-                   </td>
-                   <td><label for="SDI"> Support jabber:iq:registered feature*</label></td>
-               </tr>
-               <tr>
-                   <td />
-                   <td align="left" style="font-size:-3;color:grey">*If you use Spark clients within your network, it might be necessary to modify the service discovery packets between Spark and the external component. If you check this RemoteRoster will add the feature "jabber:iq:registered" to the disco#info to indicate that the Client is registered with the external component.</td>
-               </tr>
-           </tbody>
-           </table>
-       </td>
-   </tr>
-   </tbody>
-   </table>
-</div>
 
 
-<input type="submit" name="save" value="Save Settings" />
+		<br /> <br />
+		<div class="jive-contentBoxHeader">Client specific options</div>
+		<div class="jive-contentBox">
+			<table cellpadding="3" cellspacing="0" border="0" width="100%">
+				<tbody>
+					<tr valign="top">
+						<td width="1%" nowrap class="c1">Spark:</td>
+						<td width="99%">
+							<table cellpadding="0" cellspacing="0" border="0">
+								<tbody>
+									<tr>
+										<td><input type="checkbox" name="sparkDiscoInfo" id="SDI" value="true"
+											<%=JiveGlobals.getBooleanProperty("plugin.remoteroster.sparkDiscoInfo", false) ? "checked=\"checked\""
+					: ""%> />
+
+										</td>
+										<td><label for="SDI"> Support jabber:iq:registered feature*</label></td>
+									</tr>
+									<tr>
+										<td />
+										<td align="left" style="font-size: -3; color: grey">*If you use Spark clients within your network, it
+											might be necessary to modify the service discovery packets between Spark and the external component. If you
+											check this RemoteRoster will add the feature "jabber:iq:registered" to the disco#info to indicate that the
+											Client is registered with the external component.</td>
+									</tr>
+								</tbody>
+							</table>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+
 
-</form>
+		<input type="submit" name="save" value="Save Settings" />
+	</form>
 
 </body>
 </html>

src/plugins/remoteRoster/src/web/rr.css

+@CHARSET "ISO-8859-1";
+
+
+.suggest_link {
+	background-color: #FFFFFF;
+	padding: 2px 6px 2px 6px;
+}
+
+.suggest_link_over {
+	background-color: #3366CC;
+	padding: 2px 6px 2px 6px;
+}
+
+#search_suggest {
+	position: absolute;
+	background-color: #FFFFFF;
+	text-align: left;
+	border: 1px solid #000000;
+	display:none;
+}
+
+.slider {
+	margin-left:1%;
+	padding-top:0px;
+	background-color:rgb(230,230,230);
+	border-color:#CCCCCC rgb(204, 204, 204);
+	color:white;
+	width:58%;
+	border-style: solid;
+	border-width: 1px;
+	border-top:none;
+	display: none;
+	}
+	
+.gatewayHeader {
+	width:60%;
+	background-color:#EEEEEE;
+    border-color:#CCCCCC rgb(204, 204, 204);
+    border-style:solid solid solid;
+    border-width:1px 1px 1px;
+}
+
+.gatewayName {
+	padding-left: 10px;
+}
+
+.gatewayIcon  {
+	border-left: 1px;
+	}
+
+.gatewayCheckbox {
+	width: 20px;
+}
+
+.configTable {
+	width: 80%;
+
+	}
+
+
+.configTable1Column {
+	width: 50%;
+}
+
+.gatewayIcons img {
+	float: right;
+	padding: 4px;
+}
+
+#permissions {
+	margin-left:1%;
+	padding-top:0px;
+	background-color:rgb(230,230,230);
+	border-color:#CCCCCC rgb(204, 204, 204);
+	color:white;
+	width:58%;
+	border-style: solid;
+	border-width: 1px;
+	border-top:none;
+	display: none;
+}
+
+.permissionTableColumn
+{
+	width: 50%;
+}
+
+.ajaxloading {
+	padding-left: 4px;
+	padding-top: 3px;
+	}
+
+.permissionTitle {
+	color:black;
+	size:+2;
+}
+
+
+

src/plugins/remoteRoster/src/web/rr.js

+function searchSuggest(object) {
+	document.getElementById('search_suggest'+object).innerHTML = '';
+	var str = escape(document.getElementById('groupSearch'+object).value);
+		$("#ajaxloading"+object).html("<img src=\"images/ajax-loader.gif\">");
+		var request = new http();
+		var f = function(obj) {
+			console.log(obj);
+			var ss = document.getElementById('search_suggest'+object);
+			var resp = obj.responseXML.documentElement
+					.getElementsByTagName('item');
+			if (resp.length > 0) {
+				for ( var i = 0; i < resp.length; i++) {
+					console.log(resp[i].textContent);
+					var suggest = '<div onmouseover="javascript:suggestOver(this);" ';
+					suggest += 'onmouseout="javascript:suggestOut(this);" ';
+					suggest += 'onclick="javascript:setSearch(this.innerHTML,'+object+');" ';
+					suggest += 'class="suggest_link">' + resp[i].textContent
+							+ '</div>';
+					ss.innerHTML += suggest;
+				}
+				$("#search_suggest"+object).show("slow");
+			} else {
+				$("#search_suggest"+object).hide("slow");
+			}	
+		};
+		request.callback = f;
+		request.load('searchGroup.jsp?search=' + str);
+}
+
+// Mouse over function
+function suggestOver(div_value) {
+	div_value.className = 'suggest_link_over';
+}
+// Mouse out function
+function suggestOut(div_value) {
+	div_value.className = 'suggest_link';
+}
+// Click function
+function setSearch(value, object) {
+	document.getElementById("groupSearch"+object).value = value;
+	// document.getElementById('search_suggest').innerHTML = '';
+	$("#search_suggest"+object).hide("slow");
+	checkIfExists(value,object);
+}
+
+function checkIfExists(value, object) {
+	var str = value;
+	var request = new http();
+	var f = function(obj) {
+		console.log(obj);
+		var ss = document.getElementById('search_suggest'+object);
+		var resp = obj.responseXML.documentElement.getElementsByTagName('item');
+		for ( var i = 0; i < resp.length; i++) {
+			var stri = String(str);
+			var respStr = String(resp[i].textContent);
+			if (stri == respStr) {
+				$("#ajaxloading"+object)
+						.html("<img src=\"images/correct-16x16.png\">");
+				break;
+			}
+		}
+	};
+	request.callback = f;
+	request.load('searchGroup.jsp?search=' + str);
+}
+
+$(document).ready(function () {
+	console.log("bind da");
+	var myvalues = [10,8,5,7,4,4,1];
+    $('#inlinesparkline0').sparkline(); 
+   
+    
+})
+
+function slideToggle(value)
+{
+	$(value).slideToggle();
+}

src/plugins/remoteRoster/src/web/searchGroup.jsp

+<?xml version="1.0" encoding="UTF-8" ?>
+<%@page import="org.dom4j.tree.DefaultElement"%>
+<%@page import="org.dom4j.*"%>
+<%@ page language="java" contentType="text/xml" pageEncoding="ISO-8859-1"%>
+<%@ page import="org.jivesoftware.openfire.group.GroupManager"%>
+<%@ page import="org.jivesoftware.openfire.group.Group"%>
+<%@ page import="java.util.Collection"%>
+<%
+String param = request.getParameter("search");
+Element root = new DefaultElement("result");
+if (param != null && param.length() > 0)
+{
+	GroupManager manager = GroupManager.getInstance();
+	Collection<Group> groups = manager.getGroups();
+	for (Group gr : groups)
+	{
+		if (gr.getName().startsWith(param))
+		{
+			root.addElement("item").addText(gr.getName());
+		}
+	}
+	
+}
+	out.write(root.asXML());
+%>