From 56e4747aff9ab47e99c78b5c548c73165564c5af Mon Sep 17 00:00:00 2001 From: Dave Cridland Date: Thu, 27 Aug 2026 09:22:52 -0400 Subject: [PATCH 1/2] OF-248: Add enabled controls for admin ports --- xmppserver/src/main/webapp/server-props.jsp | 42 ++++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/xmppserver/src/main/webapp/server-props.jsp b/xmppserver/src/main/webapp/server-props.jsp index c686bd7540..59ca101dac 100644 --- a/xmppserver/src/main/webapp/server-props.jsp +++ b/xmppserver/src/main/webapp/server-props.jsp @@ -47,6 +47,8 @@ int sslPort = ParamUtils.getIntParameter(request, "sslPort", -1); int embeddedPort = ParamUtils.getIntParameter(request, "embeddedPort", -1); int embeddedSecurePort = ParamUtils.getIntParameter(request, "embeddedSecurePort", -1); + boolean embeddedPortEnabled = ParamUtils.getBooleanParameter(request, "embeddedPortEnabled"); + boolean embeddedSecurePortEnabled = ParamUtils.getBooleanParameter(request, "embeddedSecurePortEnabled"); boolean sslEnabled = ParamUtils.getBooleanParameter(request, "sslEnabled"); int componentPort = ParamUtils.getIntParameter(request, "componentPort", -1); int serverPort = ParamUtils.getIntParameter(request, "serverPort", -1); @@ -72,6 +74,8 @@ serverSslPort = ConnectionManager.DEFAULT_SERVER_SSL_PORT; embeddedPort = 9090; embeddedSecurePort = 9091; + embeddedPortEnabled = true; + embeddedSecurePortEnabled = true; sslEnabled = true; jmxEnabled = false; jmxSecure = true; @@ -95,6 +99,12 @@ CookieUtils.setCookie(request, response, "csrf", csrfParam, -1); pageContext.setAttribute("csrf", csrfParam); if (save) { + if (!embeddedPortEnabled) { + embeddedPort = -1; + } + if (!embeddedSecurePortEnabled) { + embeddedSecurePort = -1; + } if (serverName == null) { errors.put("serverName", ""); } else { @@ -120,10 +130,10 @@ errors.put("serverSslPort", ""); } if (XMPPServer.getInstance().isStandAlone()) { - if (embeddedPort < 1) { + if (embeddedPortEnabled && embeddedPort < 1) { errors.put("embeddedPort", ""); } - if (embeddedSecurePort < 1) { + if (embeddedSecurePortEnabled && embeddedSecurePort < 1) { errors.put("embeddedSecurePort", ""); } if (embeddedPort > 0 && embeddedSecurePort > 0) { @@ -189,6 +199,8 @@ componentPort = connectionManager.getPort(ConnectionType.COMPONENT, false); serverPort = connectionManager.getPort(ConnectionType.SOCKET_S2S, false); serverSslPort = connectionManager.getPort(ConnectionType.SOCKET_S2S, true); + embeddedPort = 9090; + embeddedSecurePort = 9091; try { embeddedPort = Integer.parseInt(JiveGlobals.getXMLProperty("adminConsole.port")); } catch (Exception ignored) { @@ -197,6 +209,8 @@ embeddedSecurePort = Integer.parseInt(JiveGlobals.getXMLProperty("adminConsole.securePort")); } catch (Exception ignored) { } + embeddedPortEnabled = embeddedPort > 0; + embeddedSecurePortEnabled = embeddedSecurePort > 0; jmxEnabled = JMXManager.isEnabled(); jmxSecure = JMXManager.isSecure(); jmxPort = JMXManager.getPort(); @@ -207,6 +221,14 @@ <fmt:message key="server.props.title"/> +