Skip to content

O
Openfire
Commit cbb5b82d authored by Guus der Kinderen's avatar Guus der Kinderen
Browse files
Options

Created replacement for Server Connection admin page

parent fa666d77
Hide whitespace changes
Inline Side-by-side
Showing with 541 additions and 2 deletions
src/web/connection-settings-socket-c2s.jsp
View file @ cbb5b82d
......@@ -147,7 +147,7 @@
</head>
<body>
<c:if test="${param.success}">
<c:if test="${param.success and empty errors}">
<admin:infoBox type="success"><fmt:message key="client.connections.settings.confirm.updated" /></admin:infoBox>
</c:if>
......@@ -257,7 +257,7 @@
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle">
<td><input type="checkbox" name="legacymode-enabled" id="legacymode-enabled" onclick="applyDisplayable('legacymode')" ${legacymodeConfiguration.enabled ? 'checked' : ''}/><label for="legacymode-enabled">Enabled</label></td>
<td><input type="checkbox" name="tlegacymode-enabled" id="legacymode-enabled" onclick="applyDisplayable('legacymode')" ${legacymodeConfiguration.enabled ? 'checked' : ''}/><label for="legacymode-enabled">Enabled</label></td>
</tr>
</table>
......
src/web/connection-settings-socket-s2s.jsp 0 → 100644
View file @ cbb5b82d
<%@ page import="org.jivesoftware.openfire.spi.ConnectionConfiguration" %>
<%@ page import="org.jivesoftware.openfire.spi.ConnectionManagerImpl" %>
<%@ page import="org.jivesoftware.openfire.XMPPServer" %>
<%@ page import="org.jivesoftware.openfire.spi.ConnectionType" %>
<%@ page import="org.jivesoftware.openfire.spi.ConnectionListener" %>
<%@ page import="org.jivesoftware.util.ParamUtils" %>
<%@ page import="org.jivesoftware.openfire.Connection" %>
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.Map" %>
<%@ page import="org.jivesoftware.openfire.server.RemoteServerManager" %>
<%@ page import="org.jivesoftware.openfire.server.RemoteServerConfiguration" %>
<%@ page import="org.jivesoftware.util.StringUtils" %>
<%@ page errorPage="error.jsp" %>
<%@ taglib uri="admin" prefix="admin" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %>
<%
final ConnectionType connectionType = ConnectionType.SOCKET_S2S;
final ConnectionManagerImpl manager = (ConnectionManagerImpl) XMPPServer.getInstance().getConnectionManager();
// final ConnectionConfiguration plaintextConfiguration = manager.getConfiguration( connectionType, false );
final ConnectionConfiguration legacymodeConfiguration = manager.getConfiguration( connectionType, true );
final boolean update = request.getParameter( "update" ) != null;
final boolean closeSettings = request.getParameter( "closeSettings" ) != null;
final boolean serverAllowed = request.getParameter( "serverAllowed" ) != null;
final boolean serverBlocked = request.getParameter( "serverBlocked" ) != null;
final String configToDelete = ParamUtils.getParameter( request, "deleteConf" );
final Map<String, String> errors = new HashMap<>();
if ( update && errors.isEmpty() )
{
// plaintext
// final boolean plaintextEnabled = ParamUtils.getBooleanParameter( request, "plaintext-enabled" );
// final int plaintextTcpPort = ParamUtils.getIntParameter( request, "plaintext-tcpPort", plaintextConfiguration.getPort() );
// final int plaintextReadBuffer = ParamUtils.getIntParameter( request, "plaintext-readBuffer", plaintextConfiguration.getMaxBufferSize() );
// final String plaintextTlsPolicyText = ParamUtils.getParameter( request, "plaintext-tlspolicy", true );
// final Connection.TLSPolicy plaintextTlsPolicy;
// if ( plaintextTlsPolicyText == null || plaintextTlsPolicyText.isEmpty() )
// {
// plaintextTlsPolicy = plaintextConfiguration.getTlsPolicy();
// }
// else
// {
// plaintextTlsPolicy = Connection.TLSPolicy.valueOf( plaintextTlsPolicyText );
// }
// final String plaintextMutualAuthenticationText = ParamUtils.getParameter( request, "plaintext-mutualauthentication", true );
// final Connection.ClientAuth plaintextMutualAuthentication;
// if ( plaintextMutualAuthenticationText == null || plaintextMutualAuthenticationText.isEmpty() )
// {
// plaintextMutualAuthentication = plaintextConfiguration.getClientAuth();
// }
// else
// {
// plaintextMutualAuthentication = Connection.ClientAuth.valueOf( plaintextMutualAuthenticationText );
// }
// final int plaintextListenerMaxThreads = ParamUtils.getIntParameter( request, "plaintext-maxThreads", plaintextConfiguration.getMaxThreadPoolSize() );
// legacymode
final boolean legacymodeEnabled = ParamUtils.getBooleanParameter( request, "legacymode-enabled" );
final int legacymodeTcpPort = ParamUtils.getIntParameter( request, "legacymode-tcpPort", legacymodeConfiguration.getPort() );
final int legacymodeReadBuffer = ParamUtils.getIntParameter( request, "legacymode-readBuffer", legacymodeConfiguration.getMaxBufferSize() );
final String legacymodeMutualAuthenticationText = ParamUtils.getParameter( request, "legacymode-mutualauthentication", true );
final Connection.ClientAuth legacymodeMutualAuthentication;
if ( legacymodeMutualAuthenticationText == null || legacymodeMutualAuthenticationText.isEmpty() )
{
legacymodeMutualAuthentication = legacymodeConfiguration.getClientAuth();
}
else
{
legacymodeMutualAuthentication = Connection.ClientAuth.valueOf( legacymodeMutualAuthenticationText );
}
final int legacymodeListenerMaxThreads = ParamUtils.getIntParameter( request, "legacymode-maxThreads", legacymodeConfiguration.getMaxThreadPoolSize() );
// Apply
// final ConnectionListener plaintextListener = manager.getListener( connectionType, false );
final ConnectionListener legacymodeListener = manager.getListener( connectionType, true );
// plaintextListener.enable( plaintextEnabled );
// plaintextListener.setPort( plaintextTcpPort );
// // TODO: plaintextListener.setMaxBufferSize( plaintextReadBuffer );
// plaintextListener.setTLSPolicy( plaintextTlsPolicy );
// plaintextListener.setClientAuth( plaintextMutualAuthentication );
// // TODO: plaintextListener.setMaxThreadPoolSize( plaintextListenerMaxThreads);
legacymodeListener.enable( legacymodeEnabled );
legacymodeListener.setPort( legacymodeTcpPort );
// TODO: legacymodeListener.setMaxBufferSize( legacymodeReadBuffer );
legacymodeListener.setClientAuth( legacymodeMutualAuthentication );
// TODO: legacymodeListener.setMaxThreadPoolSize( legacymodeListenerMaxThreads);
// Log the event
webManager.logEvent( "Updated connection settings for " + connectionType, "Applied configuration to legacy-mode connection listener." );
response.sendRedirect( "connection-settings-socket-s2s.jsp?success=update" );
}
else if ( closeSettings && errors.isEmpty() )
{
// TODO below is the 'idle connection' handing. This should go into the connection configuration, like all other configuration.
final boolean closeEnabled = ParamUtils.getBooleanParameter( request, "closeEnabled" );
// Handle an update of the kicking task settings
if (!closeEnabled) {
// Disable kicking users by setting a value of -1
webManager.getSessionManager().setServerSessionIdleTime( -1 );
// Log the event
webManager.logEvent( "disabled s2s idle kick", null );
response.sendRedirect( "connection-settings-socket-s2s.jsp?success=idle" );
return;
}
// do validation
final String idletime = ParamUtils.getParameter( request, "idletime" );
int idle = 0;
if ( idletime == null )
{
errors.put( "idletime", "idletime" );
}
else
{
// Try to obtain an int from the provided strings
if ( errors.size() == 0 )
{
try
{
idle = Integer.parseInt( idletime ) * 1000 * 60;
}
catch ( NumberFormatException e )
{
errors.put( "idletime", "idletime" );
}
if ( idle < 0 )
{
errors.put( "idletime", "idletime" );
}
}
}
if ( errors.isEmpty() )
{
webManager.getSessionManager().setServerSessionIdleTime( idle );
// Log the event
webManager.logEvent( "updated s2s idle kick", "timeout = " + idle );
response.sendRedirect( "connection-settings-socket-s2s.jsp?success=idle" );
return;
}
}
else if ( serverAllowed && errors.isEmpty() )
{
final String domain = ParamUtils.getParameter( request, "domain" );
final String remotePort = ParamUtils.getParameter( request, "remotePort" );
int intRemotePort = 0;
// Validate params
try
{
StringUtils.validateDomainName( domain );
}
catch ( IllegalArgumentException iae )
{
errors.put( "domain", "" );
}
if ( remotePort == null || remotePort.trim().length() == 0 || "0".equals( remotePort ) )
{
errors.put( "remotePort", "" );
}
else
{
try
{
intRemotePort = Integer.parseInt( remotePort );
}
catch ( NumberFormatException e )
{
errors.put( "remotePort", "" );
}
}
// If no errors, continue:
if ( errors.isEmpty() )
{
final RemoteServerConfiguration configuration = new RemoteServerConfiguration( domain );
configuration.setRemotePort( intRemotePort );
configuration.setPermission( RemoteServerConfiguration.Permission.allowed );
RemoteServerManager.allowAccess( configuration );
// Log the event
webManager.logEvent( "added s2s access for " + domain, "domain = " + domain + "\nport = " + intRemotePort );
response.sendRedirect( "connection-settings-socket-s2s.jsp?success=allow" );
}
}
else if ( serverBlocked && errors.isEmpty() )
{
final String domain = ParamUtils.getParameter( request, "domain" );
// Validate params
try
{
StringUtils.validateDomainName( domain );
}
catch ( IllegalArgumentException iae )
{
errors.put( "domain", "" );
}
// If no errors, continue:
if ( errors.isEmpty() )
{
RemoteServerManager.blockAccess( domain );
// Log the event
webManager.logEvent( "blocked s2s access for " + domain, "domain = " + domain );
response.sendRedirect( "connection-settings-socket-s2s.jsp?success=block" );
}
}
else if ( configToDelete != null && configToDelete.trim().length() != 0 && errors.isEmpty() )
{
RemoteServerManager.deleteConfiguration( configToDelete );
// Log the event
webManager.logEvent( "deleted s2s configuration", "config to delete = " + configToDelete );
response.sendRedirect( "connection-settings-socket-s2s.jsp?success=delete" );
}
pageContext.setAttribute( "errors", errors );
//pageContext.setAttribute( "plaintextConfiguration", plaintextConfiguration );
pageContext.setAttribute( "legacymodeConfiguration", legacymodeConfiguration );
// pageContext.setAttribute( "clientIdle", JiveGlobals.getIntProperty( ConnectionSettings.Client.IDLE_TIMEOUT, 6*60*1000 ) );
// pageContext.setAttribute( "pingIdleClients", JiveGlobals.getBooleanProperty( ConnectionSettings.Client.KEEP_ALIVE_PING, true) );
pageContext.setAttribute( "allowedServers", RemoteServerManager.getAllowedServers() );
pageContext.setAttribute( "blockedServers", RemoteServerManager.getBlockedServers() );
%>
<html>
<head>
<title><fmt:message key="server2server.settings.title"/></title>
<meta name="pageID" content="server2server-settings"/>
<script type="text/javascript">
// Displays or hides the configuration block for a particular connection type, based on the status of the
// 'enable' checkbox for that connection type.
function applyDisplayable( connectionType )
{
var configBlock, enabled;
// Select the right configuration block and enable or disable it as defined by the the corresponding checkbox.
configBlock = document.getElementById( connectionType + "-config" );
enabled = document.getElementById( connectionType + "-enabled" ).checked;
if ( ( configBlock != null ) && ( enabled != null ) )
{
if ( enabled )
{
configBlock.style.display = "block";
}
else
{
configBlock.style.display = "none";
}
}
}
// Ensure that the various elements are set properly when the page is loaded.
window.onload = function()
{
//applyDisplayable( "plaintext" );
applyDisplayable( "legacymode" );
};
</script>
</head>
<body>
<c:choose>
<c:when test="${not empty param.success and empty errors}">
<admin:infoBox type="success">
<c:choose>
<c:when test="${param.success eq 'idle'}"><fmt:message key="server2server.settings.update"/></c:when>
<c:when test="${param.success eq 'allow'}"><fmt:message key="server2server.settings.confirm.allowed"/></c:when>
<c:when test="${param.success eq 'block'}"><fmt:message key="server2server.settings.confirm.blocked"/></c:when>
<c:when test="${param.success eq 'delete'}"><fmt:message key="server2server.settings.confirm.deleted"/></c:when>
<c:otherwise><fmt:message key="server2server.settings.confirm.updated"/></c:otherwise>
</c:choose>
</admin:infoBox>
</c:when>
<c:otherwise>
<c:forEach var="err" items="${errors}">
<admin:infobox type="error">
<c:choose>
<c:when test="${err.key eq 'idletime'}"><fmt:message key="server2server.settings.valid.idle_minutes"/></c:when>
<c:when test="${err.key eq 'domain'}"><fmt:message key="server2server.settings.valid.domain"/></c:when>
<c:when test="${err.key eq 'remotePort'}"><fmt:message key="server2server.settings.valid.remotePort"/></c:when>
<c:otherwise>
<c:if test="${not empty err.value}">
<fmt:message key="admin.error"/>: <c:out value="${err.value}"/>
</c:if>
(<c:out value="${err.key}"/>)
</c:otherwise>
</c:choose>
</admin:infobox>
</c:forEach>
</c:otherwise>
</c:choose>
<p>
<fmt:message key="server2server.settings.info">
<fmt:param value="<a href='server-session-summary.jsp'>" />
<fmt:param value="</a>" />
</fmt:message>
</p>
<form action="connection-settings-socket-s2s.jsp" method="post">
<admin:contentBox title="Encrypted (legacy-mode) connections">
<p>Connections of this type are established using encryption immediately (as opposed to using STARTTLS). This type of connectivity is commonly referred to as the "legacy" method of establishing encrypted communications.</p>
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle">
<td><input type="checkbox" name="tlegacymode-enabled" id="legacymode-enabled" onclick="applyDisplayable('legacymode')" ${legacymodeConfiguration.enabled ? 'checked' : ''}/><label for="legacymode-enabled">Enabled</label></td>
</tr>
</table>
<div id="legacymode-config">
<br/>
<h4>TCP settings</h4>
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle">
<td width="1%" nowrap><label for="legacymode-tcpPort">Port number</label></td>
<td width="99%"><input type="text" name="legacymode-tcpPort" id="legacymode-tcpPort" value="${legacymodeConfiguration.port}"></td>
</tr>
<tr valign="middle">
<td width="1%" nowrap><label for="legacymode-readBuffer">Read buffer</label></td>
<td width="99%"><input type="text" name="legacymode-readBuffer" id="legacymode-readBuffer" value="${legacymodeConfiguration.maxBufferSize}" readonly/> (in bytes)</td>
</tr>
</table>
<br/>
<h4>Miscellaneous settings</h4>
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle">
<td width="1%" nowrap><label for="legacymode-maxThreads">Maximum worker threads</label></td>
<td width="99%"><input type="text" name="legacymode-maxThreads" id="legacymode-maxThreads" value="${legacymodeConfiguration.maxThreadPoolSize}" readonly/></td>
</tr>
</table>
</div>
</admin:contentBox>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form>
<br/>
<!-- BEGIN 'Idle Connection Settings' -->
<form action="connection-settings-socket-s2s.jsp?closeSettings" method="post">
<c:set var="idleTitle">
<fmt:message key="server2server.settings.close_settings" />
</c:set>
<admin:contentBox title="${idleTitle}">
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="closeEnabled" value="true" id="rb04" ${webManager.sessionManager.serverSessionIdleTime gt -1 ? 'checked' : ''}>
</td>
<td width="99%">
<c:if test="${webManager.sessionManager.serverSessionIdleTime gt -1}">
<c:set var="minutes">
<fmt:parseNumber integerOnly="true">${webManager.sessionManager.serverSessionIdleTime div 60000}</fmt:parseNumber>
</c:set>
</c:if>
<label for="rb04"><fmt:message key="server2server.settings.close_session" /></label>
<input type="text" name="idletime" id="idletime" size="5" maxlength="5" onclick="this.form.closeEnabled[0].checked=true;" value="${webManager.sessionManager.serverSessionIdleTime le -1 ? 30 : minutes}">
<label for="idletime"><fmt:message key="global.minutes" /></label>.
</td>
</tr>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="closeEnabled" value="false" id="rb03" ${webManager.sessionManager.serverSessionIdleTime gt -1 ? '' : 'checked'}>
</td>
<td width="99%">
<label for="rb03"><fmt:message key="server2server.settings.never_close" /></label>
</td>
</tr>
</table>
</admin:contentBox>
<input type="submit" value="<fmt:message key="global.save_settings" />">
</form>
<!-- END 'Idle Connection Settings' -->
<br/>
<!-- BEGIN 'Allowed to Connect' -->
<c:set var="allowedTitle">
<fmt:message key="server2server.settings.allowed" />
</c:set>
<admin:contentBox title="${allowedTitle}">
<form action="connection-settings-socket-s2s.jsp" method="post">
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="permissionFilter" value="blacklist" id="rb05" ${'blacklist' eq param.permissionFilter ? 'checked' : ''}>
</td>
<td width="99%">
<label for="rb05">
<b><fmt:message key="server2server.settings.anyone" /></b> - <fmt:message key="server2server.settings.anyone_info" />
</label>
</td>
</tr>
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="permissionFilter" value="whitelist" id="rb06" ${'whitelist' eq param.permissionFilter ? 'checked' : ''}>
</td>
<td width="99%">
<label for="rb06">
<b><fmt:message key="server2server.settings.whitelist" /></b> - <fmt:message key="server2server.settings.whitelist_info" />
</label>
</td>
</tr>
</table>
<br/>
<input type="submit" name="permissionUpdate" value="<fmt:message key="global.save_settings" />">
<br/><br/>
</form>
<form action="connection-settings-socket-s2s.jsp" method="post">
<table class="jive-table" cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<th width="1%">&nbsp;</th>
<th width="70%" nowrap><fmt:message key="server2server.settings.domain" /></th>
<th width="19%" nowrap><fmt:message key="server2server.settings.remotePort" /></th>
<th width="10%" style="text-align: center"><fmt:message key="global.delete" /></th>
</tr>
<c:choose>
<c:when test="${empty allowedServers}">
<tr>
<td align="center" colspan="7"><fmt:message key="server2server.settings.empty_list" /></td>
</tr>
</c:when>
<c:otherwise>
<c:forEach var="server" varStatus="status" items="${allowedServers}">
<tr class="${ ( (status.index + 1) % 2 ) eq 0 ? 'jive-even' : 'jive-odd'}">
<td>${ status.index + 1}</td>
<td><c:out value="${server.domain}"/></td>
<td><c:out value="${server.remotePort}"/></td>
<td align="center" style="border-right:1px #ccc solid;">
<a href="#" onclick="if (confirm('<fmt:message key="server2server.settings.confirm_delete" />')) { location.replace('connection-settings-socket-s2s.jsp?deleteConf=${server.domain}'); } "
title="<fmt:message key="global.click_delete" />"
><img src="images/delete-16x16.gif" width="16" height="16" border="0" alt=""></a>
</td>
</tr>
</c:forEach>
</c:otherwise>
</c:choose>
</table>
<br/>
<table cellpadding="3" cellspacing="1" border="0">
<tr>
<td nowrap>
<label for="domainAllowed"><fmt:message key="server2server.settings.domain" /></label>
<input type="text" size="40" name="domain" id="domainAllowed" value="${param.serverAllowed ? param.domain : ''}"/>
&nbsp;
<label for="remotePort"><fmt:message key="server2server.settings.remotePort" /></label>
<input type="text" size="5" name="remotePort" id="remotePort" value="${param.serverAllowed ? param.remotePort : '5269'}"/>
<input type="submit" name="serverAllowed" value="<fmt:message key="server2server.settings.allow" />">
</td>
</tr>
</table>
</form>
</admin:contentBox>
<!-- END 'Allowed to Connect' -->
<!-- BEGIN 'Not Allowed to Connect' -->
<c:set var="disallowedTitle">
<fmt:message key="server2server.settings.disallowed" />
</c:set>
<admin:contentBox title="${disallowedTitle}">
<table cellpadding="3" cellspacing="1" border="0" width="100%"><tr><td>
<fmt:message key="server2server.settings.disallowed.info" />
</td></tr></table>
<p>
<table class="jive-table" cellpadding="3" cellspacing="0" border="0" width="100%">
<tr>
<th width="1%">&nbsp;</th>
<th width="89%" nowrap><fmt:message key="server2server.settings.domain" /></th>
<th width="10%" style="text-align: center"><fmt:message key="global.delete" /></th>
</tr>
<c:choose>
<c:when test="${empty blockedServers}">
<tr>
<td align="center" colspan="7"><fmt:message key="server2server.settings.empty_list" /></td>
</tr>
</c:when>
<c:otherwise>
<c:forEach var="server" varStatus="status" items="${blockedServers}">
<tr class="${ ( (status.index + 1) % 2 ) eq 0 ? 'jive-even' : 'jive-odd'}">
<td>${ status.index + 1}</td>
<td><c:out value="${server.domain}"/></td>
<td align="center" style="border-right:1px #ccc solid;">
<a href="#" onclick="if (confirm('<fmt:message key="server2server.settings.confirm_delete" />')) { location.replace('connection-settings-socket-s2s.jsp?deleteConf=${server.domain}'); } "
title="<fmt:message key="global.click_delete" />"
><img src="images/delete-16x16.gif" width="16" height="16" border="0" alt=""></a>
</td>
</tr>
</c:forEach>
</c:otherwise>
</c:choose>
</table>
<br>
<form action="connection-settings-socket-s2s.jsp" method="post">
<table cellpadding="3" cellspacing="1" border="0" width="100%">
<tr>
<td nowrap width="1%">
<label for="domainBlocked"><fmt:message key="server2server.settings.domain" /></label>
</td>
<td>
<input type="text" size="40" name="domain" id="domainBlocked" value="${param.serverBlocked ? param.domain : ''}"/>&nbsp;
<input type="submit" name="serverBlocked" value="<fmt:message key="server2server.settings.block" />">
</td>
</tr>
</table>
</form>
</admin:contentBox>
<!-- END 'Not Allowed to Connect' -->
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023