Skip to content

O
Openfire
Commit 8652d843 authored by Sven Bunge's avatar Sven Bunge
Browse files
Options

Extract more properties related to connections

parent 706eebc7
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 39 deletions
src/java/org/jivesoftware/openfire/nio/ClientConnectionHandler.java
View file @ 8652d843
......@@ -21,6 +21,7 @@ package org.jivesoftware.openfire.nio;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoSession;
import org.jivesoftware.openfire.session.ConnectionSettings;
import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.openfire.Connection;
import org.jivesoftware.openfire.XMPPServer;
......@@ -59,7 +60,7 @@ public class ClientConnectionHandler extends ConnectionHandler {
@Override
int getMaxIdleTime() {
return JiveGlobals.getIntProperty("xmpp.client.idle", 6 * 60 * 1000) / 1000;
return JiveGlobals.getIntProperty(ConnectionSettings.Client.IDLE_TIMEOUT, 6 * 60 * 1000) / 1000;
}
/**
......@@ -86,7 +87,7 @@ public class ClientConnectionHandler extends ConnectionHandler {
public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
super.sessionIdle(session, status);
final boolean doPing = JiveGlobals.getBooleanProperty("xmpp.client.idle.ping", true);
final boolean doPing = JiveGlobals.getBooleanProperty(ConnectionSettings.Client.KEEP_ALIVE_PING, true);
if (doPing && session.getIdleCount(status) == 1) {
final ClientStanzaHandler handler = (ClientStanzaHandler) session.getAttribute(HANDLER);
final JID entity = handler.getAddress();
......
src/java/org/jivesoftware/openfire/server/RemoteServerManager.java
View file @ 8652d843
......@@ -299,13 +299,13 @@ public class RemoteServerManager {
* @return the remote port to connect for the specified remote server.
*/
public static int getPortForServer(String domain) {
int port = JiveGlobals.getIntProperty(ConnectionSettings.Server.PORT, ConnectionManager.DEFAULT_SERVER_PORT);
int port = JiveGlobals.getIntProperty(ConnectionSettings.Server.REMOTE_SERVER_PORT, ConnectionManager.DEFAULT_SERVER_PORT);
RemoteServerConfiguration config = getConfiguration(domain);
if (config != null) {
port = config.getRemotePort();
if (port == 0) {
port = JiveGlobals
.getIntProperty(ConnectionSettings.Server.PORT, ConnectionManager.DEFAULT_SERVER_PORT);
.getIntProperty(ConnectionSettings.Server.REMOTE_SERVER_PORT, ConnectionManager.DEFAULT_SERVER_PORT);
}
}
return port;
......
src/java/org/jivesoftware/openfire/session/ConnectionSettings.java
View file @ 8652d843
......@@ -7,7 +7,15 @@ public final class ConnectionSettings {
public static final class Client {
public static final String SOCKET_ACTIVE = "xmpp.socket.plain.active";
public static final String PORT = "xmpp.socket.plain.port";
public static final String IDLE_TIMEOUT = "xmpp.client.idle";
public static final String KEEP_ALIVE_PING = "xmpp.client.idle.ping";
public static final String TLS_POLICY = "xmpp.client.tls.policy";
public static final String OLD_SSLPORT = "xmpp.socket.ssl.port";
public static final String ENABLE_OLD_SSLPORT = "xmpp.socket.ssl.active";
public static final String AUTH_PER_CLIENTCERT_POLICY = "xmpp.client.cert.policy";
public static final String COMPRESSION_SETTINGS = "xmpp.client.compression.policy";
public static final String LOGIN_ALLOWED = "xmpp.client.login.allowed";
......@@ -20,7 +28,8 @@ public final class ConnectionSettings {
public static final class Server {
public static final String SOCKET_ACTIVE = "xmpp.server.socket.active";
public static final String PORT = "xmpp.server.socket.remotePort";
public static final String PORT = "xmpp.server.socket.port";
public static final String REMOTE_SERVER_PORT = "xmpp.server.socket.remotePort";
public static final String SOCKET_READ_TIMEOUT = "xmpp.server.read.timeout";
public static final String QUEUE_MAX_THREADS = "xmpp.server.outgoing.max.threads";
......@@ -43,10 +52,19 @@ public final class ConnectionSettings {
}
public static final class Multiplex {
public static final String SOCKET_ACTIVE = "xmpp.multiplex.socket.active";
public static final String PORT = "xmpp.multiplex.socket.port";
public static final String TLS_POLICY = "xmpp.multiplex.tls.policy";
public static final String COMPRESSION_SETTINGS = "xmpp.multiplex.compression.policy";
private Multiplex() {
}
}
public static final class Component {
public static final String SOCKET_ACTIVE = "xmpp.component.socket.active";
public static final String PORT = "xmpp.component.socket.port";
}
}
src/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java
View file @ 8652d843
......@@ -87,6 +87,7 @@ import org.jivesoftware.openfire.nio.ClientConnectionHandler;
import org.jivesoftware.openfire.nio.ComponentConnectionHandler;
import org.jivesoftware.openfire.nio.MultiplexerConnectionHandler;
import org.jivesoftware.openfire.nio.XMPPCodecFactory;
import org.jivesoftware.openfire.session.ConnectionSettings;
import org.jivesoftware.util.CertificateEventListener;
import org.jivesoftware.util.CertificateManager;
import org.jivesoftware.util.JiveGlobals;
......@@ -467,10 +468,10 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
new java.security.SecureRandom());
SSLFilter sslFilter = new SSLFilter(sslContext);
if (JiveGlobals.getProperty("xmpp.client.cert.policy","disabled").equals("needed")) {
if (JiveGlobals.getProperty(ConnectionSettings.Client.AUTH_PER_CLIENTCERT_POLICY,"disabled").equals("needed")) {
sslFilter.setNeedClientAuth(true);
}
else if(JiveGlobals.getProperty("xmpp.client.cert.policy","disabled").equals("wanted")) {
else if(JiveGlobals.getProperty(ConnectionSettings.Client.AUTH_PER_CLIENTCERT_POLICY,"disabled").equals("wanted")) {
sslFilter.setWantClientAuth(true);
}
sslSocketAcceptor.getFilterChain().addFirst("tls", sslFilter);
......@@ -586,20 +587,20 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
return;
}
if (enabled) {
JiveGlobals.setProperty("xmpp.socket.plain.active", "true");
JiveGlobals.setProperty(ConnectionSettings.Client.SOCKET_ACTIVE, "true");
// Start the port listener for clients
createClientListeners();
startClientListeners(localIPAddress);
}
else {
JiveGlobals.setProperty("xmpp.socket.plain.active", "false");
JiveGlobals.setProperty(ConnectionSettings.Client.SOCKET_ACTIVE, "false");
// Stop the port listener for clients
stopClientListeners();
}
}
public boolean isClientListenerEnabled() {
return JiveGlobals.getBooleanProperty("xmpp.socket.plain.active", true);
return JiveGlobals.getBooleanProperty(ConnectionSettings.Client.SOCKET_ACTIVE, true);
}
public void enableClientSSLListener(boolean enabled) {
......@@ -608,13 +609,13 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
return;
}
if (enabled) {
JiveGlobals.setProperty("xmpp.socket.ssl.active", "true");
JiveGlobals.setProperty(ConnectionSettings.Client.ENABLE_OLD_SSLPORT, "true");
// Start the port listener for secured clients
createClientSSLListeners();
startClientSSLListeners(localIPAddress);
}
else {
JiveGlobals.setProperty("xmpp.socket.ssl.active", "false");
JiveGlobals.setProperty(ConnectionSettings.Client.ENABLE_OLD_SSLPORT, "false");
// Stop the port listener for secured clients
stopClientSSLListeners();
}
......@@ -622,7 +623,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
public boolean isClientSSLListenerEnabled() {
try {
return JiveGlobals.getBooleanProperty("xmpp.socket.ssl.active", true) && SSLConfig.getKeyStore().size() > 0;
return JiveGlobals.getBooleanProperty(ConnectionSettings.Client.ENABLE_OLD_SSLPORT, false) && SSLConfig.getKeyStore().size() > 0;
} catch (KeyStoreException e) {
return false;
} catch (IOException e) {
......@@ -636,20 +637,20 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
return;
}
if (enabled) {
JiveGlobals.setProperty("xmpp.component.socket.active", "true");
JiveGlobals.setProperty(ConnectionSettings.Component.SOCKET_ACTIVE, "true");
// Start the port listener for external components
createComponentListener();
startComponentListener();
}
else {
JiveGlobals.setProperty("xmpp.component.socket.active", "false");
JiveGlobals.setProperty(ConnectionSettings.Component.SOCKET_ACTIVE, "false");
// Stop the port listener for external components
stopComponentListener();
}
}
public boolean isComponentListenerEnabled() {
return JiveGlobals.getBooleanProperty("xmpp.component.socket.active", false);
return JiveGlobals.getBooleanProperty(ConnectionSettings.Component.SOCKET_ACTIVE, false);
}
public void enableServerListener(boolean enabled) {
......@@ -658,20 +659,20 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
return;
}
if (enabled) {
JiveGlobals.setProperty("xmpp.server.socket.active", "true");
JiveGlobals.setProperty(ConnectionSettings.Server.SOCKET_ACTIVE, "true");
// Start the port listener for s2s communication
createServerListener(localIPAddress);
startServerListener();
}
else {
JiveGlobals.setProperty("xmpp.server.socket.active", "false");
JiveGlobals.setProperty(ConnectionSettings.Server.SOCKET_ACTIVE, "false");
// Stop the port listener for s2s communication
stopServerListener();
}
}
public boolean isServerListenerEnabled() {
return JiveGlobals.getBooleanProperty("xmpp.server.socket.active", true);
return JiveGlobals.getBooleanProperty(ConnectionSettings.Server.SOCKET_ACTIVE, true);
}
public void enableConnectionManagerListener(boolean enabled) {
......@@ -680,20 +681,20 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
return;
}
if (enabled) {
JiveGlobals.setProperty("xmpp.multiplex.socket.active", "true");
JiveGlobals.setProperty(ConnectionSettings.Multiplex.SOCKET_ACTIVE, "true");
// Start the port listener for s2s communication
createConnectionManagerListener();
startConnectionManagerListener(localIPAddress);
}
else {
JiveGlobals.setProperty("xmpp.multiplex.socket.active", "false");
JiveGlobals.setProperty(ConnectionSettings.Multiplex.SOCKET_ACTIVE, "false");
// Stop the port listener for s2s communication
stopConnectionManagerListener();
}
}
public boolean isConnectionManagerListenerEnabled() {
return JiveGlobals.getBooleanProperty("xmpp.multiplex.socket.active", false);
return JiveGlobals.getBooleanProperty(ConnectionSettings.Multiplex.SOCKET_ACTIVE, false);
}
public void setClientListenerPort(int port) {
......@@ -701,7 +702,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
// Ignore new setting
return;
}
JiveGlobals.setProperty("xmpp.socket.plain.port", String.valueOf(port));
JiveGlobals.setProperty(ConnectionSettings.Client.PORT, String.valueOf(port));
// Stop the port listener for clients
stopClientListeners();
if (isClientListenerEnabled()) {
......@@ -716,7 +717,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
}
public int getClientListenerPort() {
return JiveGlobals.getIntProperty("xmpp.socket.plain.port", DEFAULT_PORT);
return JiveGlobals.getIntProperty(ConnectionSettings.Client.PORT, DEFAULT_PORT);
}
public SocketAcceptor getSSLSocketAcceptor() {
......@@ -728,7 +729,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
// Ignore new setting
return;
}
JiveGlobals.setProperty("xmpp.socket.ssl.port", String.valueOf(port));
JiveGlobals.setProperty(ConnectionSettings.Client.OLD_SSLPORT, String.valueOf(port));
// Stop the port listener for secured clients
stopClientSSLListeners();
if (isClientSSLListenerEnabled()) {
......@@ -739,7 +740,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
}
public int getClientSSLListenerPort() {
return JiveGlobals.getIntProperty("xmpp.socket.ssl.port", DEFAULT_SSL_PORT);
return JiveGlobals.getIntProperty(ConnectionSettings.Client.OLD_SSLPORT, DEFAULT_SSL_PORT);
}
public void setComponentListenerPort(int port) {
......@@ -747,7 +748,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
// Ignore new setting
return;
}
JiveGlobals.setProperty("xmpp.component.socket.port", String.valueOf(port));
JiveGlobals.setProperty(ConnectionSettings.Component.PORT, String.valueOf(port));
// Stop the port listener for external components
stopComponentListener();
if (isComponentListenerEnabled()) {
......@@ -762,7 +763,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
}
public int getComponentListenerPort() {
return JiveGlobals.getIntProperty("xmpp.component.socket.port", DEFAULT_COMPONENT_PORT);
return JiveGlobals.getIntProperty(ConnectionSettings.Component.PORT, DEFAULT_COMPONENT_PORT);
}
public void setServerListenerPort(int port) {
......@@ -770,7 +771,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
// Ignore new setting
return;
}
JiveGlobals.setProperty("xmpp.server.socket.port", String.valueOf(port));
JiveGlobals.setProperty(ConnectionSettings.Server.PORT, String.valueOf(port));
// Stop the port listener for s2s communication
stopServerListener();
if (isServerListenerEnabled()) {
......@@ -781,7 +782,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
}
public int getServerListenerPort() {
return JiveGlobals.getIntProperty("xmpp.server.socket.port", DEFAULT_SERVER_PORT);
return JiveGlobals.getIntProperty(ConnectionSettings.Server.PORT, DEFAULT_SERVER_PORT);
}
public SocketAcceptor getMultiplexerSocketAcceptor() {
......@@ -793,7 +794,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
// Ignore new setting
return;
}
JiveGlobals.setProperty("xmpp.multiplex.socket.port", String.valueOf(port));
JiveGlobals.setProperty(ConnectionSettings.Multiplex.PORT, String.valueOf(port));
// Stop the port listener for connection managers
stopConnectionManagerListener();
if (isConnectionManagerListenerEnabled()) {
......@@ -804,7 +805,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
}
public int getConnectionManagerListenerPort() {
return JiveGlobals.getIntProperty("xmpp.multiplex.socket.port", DEFAULT_MULTIPLEX_PORT);
return JiveGlobals.getIntProperty(ConnectionSettings.Multiplex.PORT, DEFAULT_MULTIPLEX_PORT);
}
// #####################################################################
......
src/web/client-connections-settings.jsp
View file @ 8652d843
......@@ -31,6 +31,7 @@
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.Map" %>
<%@ page import="org.jivesoftware.openfire.session.ConnectionSettings" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %>
......@@ -88,14 +89,16 @@
response.sendRedirect("client-connections-settings.jsp?success=true");
if (!idleDisco) {
JiveGlobals.setProperty("xmpp.client.idle", "-1");
JiveGlobals.setProperty(ConnectionSettings.Client.IDLE_TIMEOUT, "-1");
} else {
JiveGlobals.setProperty("xmpp.client.idle", String.valueOf(clientIdle));
JiveGlobals.setProperty(ConnectionSettings.Client.IDLE_TIMEOUT, String.valueOf(clientIdle));
}
JiveGlobals.setProperty("xmpp.client.idle.ping", String.valueOf(pingIdleClients));
JiveGlobals.setProperty(ConnectionSettings.Client.KEEP_ALIVE_PING, String.valueOf(pingIdleClients));
// Log the events
webManager.logEvent("set server property xmpp.client.idle", "xmpp.client.idle = "+clientIdle);
webManager.logEvent("set server property xmpp.client.idle.ping", "xmpp.client.idle.ping = "+pingIdleClients);
webManager.logEvent("set server property " + ConnectionSettings.Client.IDLE_TIMEOUT,
ConnectionSettings.Client.IDLE_TIMEOUT + " = " + clientIdle);
webManager.logEvent("set server property " + ConnectionSettings.Client.KEEP_ALIVE_PING
, ConnectionSettings.Client.KEEP_ALIVE_PING + " = " + pingIdleClients);
return;
}
......@@ -103,8 +106,8 @@
sslEnabled = connectionManager.isClientSSLListenerEnabled();
port = connectionManager.getClientListenerPort();
sslPort = connectionManager.getClientSSLListenerPort();
clientIdle = JiveGlobals.getIntProperty("xmpp.client.idle", 6*60*1000);
pingIdleClients = JiveGlobals.getBooleanProperty("xmpp.client.idle.ping", true);
clientIdle = JiveGlobals.getIntProperty(ConnectionSettings.Client.IDLE_TIMEOUT, 6*60*1000);
pingIdleClients = JiveGlobals.getBooleanProperty(ConnectionSettings.Client.KEEP_ALIVE_PING, true);
}
%>
......
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