Skip to content

O
Openfire
Commit 3836c3c0 authored by wroot's avatar wroot
Browse files
Options

Merge remote-tracking branch 'igniterealtime/master'

parents 2d5c65c3 e3373fc5
Hide whitespace changes
Inline Side-by-side
Showing with 279 additions and 51 deletions
LICENSE.txt 0 → 100644
View file @ 3836c3c0
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright {yyyy} {name of copyright owner}
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
src/java/org/jivesoftware/database/DefaultConnectionProvider.java
View file @ 3836c3c0
......@@ -20,11 +20,6 @@
package org.jivesoftware.database;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Properties;
import org.jivesoftware.util.JiveGlobals;
import org.logicalcobwebs.proxool.ConnectionPoolDefinitionIF;
import org.logicalcobwebs.proxool.ProxoolException;
......@@ -33,6 +28,11 @@ import org.logicalcobwebs.proxool.admin.SnapshotIF;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Properties;
/**
* Default Jive connection provider, which uses an internal connection pool.<p>
*
......@@ -94,7 +94,7 @@ public class DefaultConnectionProvider implements ConnectionProvider {
public void start() {
proxoolURL = "proxool.openfire:"+getDriver()+":"+getServerURL();
settings = new Properties();
settings.setProperty("proxool.maximum-activetime", Integer.toString(activeTimeout));
settings.setProperty("proxool.maximum-active-time", Integer.toString(activeTimeout));
settings.setProperty("proxool.maximum-connection-count", Integer.toString(getMaxConnections()));
settings.setProperty("proxool.minimum-connection-count", Integer.toString(getMinConnections()));
settings.setProperty("proxool.maximum-connection-lifetime", Integer.toString((int)(86400000 * getConnectionTimeout())));
......
src/java/org/jivesoftware/openfire/XMPPServer.java
View file @ 3836c3c0
......@@ -560,19 +560,15 @@ public class XMPPServer {
private void initModules() {
for (Module module : modules.values()) {
boolean isInitialized = false;
try {
module.initialize(this);
isInitialized = true;
}
catch (Exception e) {
e.printStackTrace();
// Remove the failed initialized module
this.modules.remove(module.getClass());
if (isInitialized) {
module.stop();
module.destroy();
}
module.stop();
module.destroy();
logger.error(LocaleUtils.getLocalizedString("admin.error"), e);
}
}
......@@ -585,16 +581,12 @@ public class XMPPServer {
*/
private void startModules() {
for (Module module : modules.values()) {
boolean started = false;
try {
logger.debug( "Starting module: " + module.getName() );
module.start();
}
catch (Exception e) {
if (started && module != null) {
module.stop();
module.destroy();
}
logger.error(LocaleUtils.getLocalizedString("admin.error"), e);
logger.error( "An exception occurred while starting module '{}'.", module.getName(), e );
}
}
}
......
src/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java
View file @ 3836c3c0
......@@ -1072,11 +1072,11 @@ public class LocalMUCRoom implements MUCRoom, GroupEventListener {
throw new ForbiddenException();
default:
case visitor:
if (canSendPrivateMessage.equals( "participants" )) throw new ForbiddenException();
if (canSendPrivateMessage().equals( "participants" )) throw new ForbiddenException();
case participant:
if (canSendPrivateMessage.equals( "moderators" )) throw new ForbiddenException();
if (canSendPrivateMessage().equals( "moderators" )) throw new ForbiddenException();
case moderator:
if (canSendPrivateMessage.equals( "none" )) throw new ForbiddenException();
if (canSendPrivateMessage().equals( "none" )) throw new ForbiddenException();
}
String resource = packet.getTo().getResource();
List<MUCRole> occupants = occupantsByNickname.get(resource.toLowerCase());
......
src/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java
View file @ 3836c3c0
......@@ -20,24 +20,19 @@
package org.jivesoftware.openfire.spi;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.*;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.buffer.SimpleBufferAllocator;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.jivesoftware.openfire.*;
import org.jivesoftware.openfire.Connection;
import org.jivesoftware.openfire.ConnectionManager;
import org.jivesoftware.openfire.ServerPort;
import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.openfire.container.BasicModule;
import org.jivesoftware.openfire.container.PluginManager;
import org.jivesoftware.openfire.container.PluginManagerListener;
import org.jivesoftware.openfire.http.HttpBindManager;
import org.jivesoftware.openfire.keystore.CertificateStoreManager;
import org.jivesoftware.openfire.net.*;
import org.jivesoftware.openfire.net.SocketSendingTracker;
import org.jivesoftware.openfire.session.ConnectionSettings;
import org.jivesoftware.util.CertificateEventListener;
import org.jivesoftware.util.CertificateManager;
......@@ -46,6 +41,13 @@ import org.jivesoftware.util.PropertyEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.*;
public class ConnectionManagerImpl extends BasicModule implements ConnectionManager, CertificateEventListener, PropertyEventListener
{
public static final String EXECUTOR_FILTER_NAME = "threadModel";
......@@ -274,24 +276,32 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
private synchronized void startListeners()
{
// Check if plugins have been loaded
Log.debug( "Received a request to start listeners. Have plugins been loaded?" );
PluginManager pluginManager = XMPPServer.getInstance().getPluginManager();
if (!pluginManager.isExecuted()) {
pluginManager.addPluginManagerListener(new PluginManagerListener() {
public void pluginsMonitored() {
if ( !pluginManager.isExecuted() )
{
Log.debug( "Plugins not yet loaded. Waiting for plugins to be loaded..." );
pluginManager.addPluginManagerListener( new PluginManagerListener()
{
public void pluginsMonitored()
{
Log.debug( "Received plugin monitor event! Plugins should now be loaded." );
// Stop listening for plugin events
XMPPServer.getInstance().getPluginManager().removePluginManagerListener(this);
XMPPServer.getInstance().getPluginManager().removePluginManagerListener( this );
// Start listeners
startListeners();
}
});
} );
return;
}
Log.debug( "Starting listeners..." );
for ( final ConnectionListener listener : getListeners() )
{
try
{
listener.start();
Log.debug( "Started '{}' (port {}) listener.", listener.getType(), listener.getPort() );
}
catch ( RuntimeException ex )
{
......@@ -303,6 +313,7 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
try
{
HttpBindManager.getInstance().start();
Log.debug( "Started HTTP client listener." );
}
catch ( RuntimeException ex )
{
......
src/plugins/clientControl/changelog.html
View file @ 3836c3c0
......@@ -43,6 +43,11 @@
<h1>
Client Control Plugin Changelog
</h1>
<p><b>2.0.1</b> -- November 4, 2016</p>
<ul>
<li>[<a href='http://www.igniterealtime.org/issues/browse/OF-1211'>OF-1211</a>] - Updated description for 'Broadcasting' option to correspond with issue resolved in ticket SPARK-1827. Locale files updated are EN, CZ, ES, FR, PT_BR.</li>
</ul>
<p><b>2.0.0</b> -- January 11, 2016</p>
<ul>
<li>No longer supports Bookmarks functionality (this functionality has been moved to the new Bookmarks Plugin).</li>
......
src/plugins/clientControl/plugin.xml
View file @ 3836c3c0
......@@ -8,8 +8,8 @@
<name>Client Control</name>
<description>Controls clients allowed to connect and available features</description>
<author>Jive Software</author>
<version>2.0.0</version>
<date>1/11/2015</date>
<version>2.0.1</version>
<date>11/04/2016</date>
<minServerVersion>4.0.0</minServerVersion>
<!-- UI extension -->
......
src/plugins/clientControl/src/i18n/clientcontrol_i18n.properties
View file @ 3836c3c0
......@@ -60,7 +60,7 @@ client.features.update.features = Client feature permissions have been updated.
client.features.info = Use the form below to enable or disable client features. \
Note: Some of the client restrictions only apply to the Spark client.
client.features.broadcasting = Broadcasting
client.features.broadcasting.description = Allow for broadcasting of messages to specified groups or entire roster.
client.features.broadcasting.description = Allow for broadcasting of messages.
client.features.enabled = Enabled
client.features.disabled = Disabled
client.features.filetransfer = File Transfer
......
src/plugins/clientControl/src/i18n/clientcontrol_i18n_cs_CZ.properties
View file @ 3836c3c0
......@@ -42,7 +42,7 @@ client.features.update.features = Povolen\u00ed mo\u017enost\u00ed klient\u016f
client.features.info = Pou\u017eijte spodn\u00ed formul\u00e1\u0159 pro povolen\u00ed \u010di zak\u00e1z\u00e1n\u00ed mo\u017enost\u00ed klient\u016f. \
Pozn\u00e1mka: N\u011bkter\u00e1 omezen\u00ed klient\u016f se t\u00fdkaj\u00ed jen Spark klienta.
client.features.broadcasting = Vys\u00edl\u00e1n\u00ed
client.features.broadcasting.description = Povoluje vys\u00edl\u00e1n\u00ed zpr\u00e1v specifick\u00fdm skupin\u00e1m nebo cel\u00e9mu seznamu.
client.features.broadcasting.description = Povoluje vys\u00edl\u00e1n\u00ed zpr\u00e1v.
client.features.enabled = Povoleno
client.features.disabled = Zak\u00e1z\u00e1no
client.features.filetransfer = P\u0159enos soubor\u016f
......
src/plugins/clientControl/src/i18n/clientcontrol_i18n_es.properties
View file @ 3836c3c0
......@@ -57,7 +57,7 @@ client.features.update.features = Permisos de prestaciones de clientes han sido
client.features.info = Utilice el siguiente formulario para habilitar o deshabilitar prestaciones de clientes. \
Nota: Algunas de las restricciones de clientes s\u00f3lo aplican al cliente Spark.
client.features.broadcasting = Difusi\u00f3n
client.features.broadcasting.description = Permitir difundir mensajes a grupos espec\u00edficos o lista de contactos.
client.features.broadcasting.description = Permitir difundir mensajes.
client.features.enabled = Habilitado
client.features.disabled = Deshabilitado
client.features.filetransfer = Transferencia de Archivos
......
src/plugins/clientControl/src/i18n/clientcontrol_i18n_fr.properties
View file @ 3836c3c0
......@@ -116,7 +116,7 @@ archive.settings.title=Param\u00e8tres d'Archivage
archive.settings.update.settings=Param\u00e8tres de Mise \u00e0 jour
client.feature=Module
client.features.broadcasting=Diffusion
client.features.broadcasting.description=Permet d'envoyer un message a certains groupes ou tout un roster.
client.features.broadcasting.description=Permet d'envoyer un message.
client.features.disabled=D\u00e9sactiv\u00e9
client.features.enabled=Activ\u00e9
client.features.filetransfer=Transfert de Fichiers
......
src/plugins/clientControl/src/i18n/clientcontrol_i18n_pt_BR.properties
View file @ 3836c3c0
......@@ -79,7 +79,7 @@ client.features.update.features = Permiss\u00f5es de funcionalidades do cliente
client.features.info = Utilize o formul\u00e1rio abaixo para habilitar ou desabilitar funcionalidades de cliente \
Notex: Algumas das restri\u00e7\u00f5es de cliente aplicam-se somente ao cliente Spark.
client.features.broadcasting = Transmitindo
client.features.broadcasting.description = Permitir transmiss\u00e3o de mensagens para um grupo espec\u00edfico ou lista completa.
client.features.broadcasting.description = Permitir transmiss\u00e3o de mensagens.
client.features.enabled = Habilitado
client.features.disabled = Desabilitado
client.features.filetransfer = Transfer\u00eancia de Arquivo
......
src/plugins/hazelcast/changelog.html
View file @ 3836c3c0
......@@ -44,10 +44,15 @@
Hazelcast Clustering Plugin Changelog
</h1>
<p><b>2.2.1</b> -- November 4, 2016</p>
<ul>
<li>[<a href='http://www.igniterealtime.org/issues/browse/OF-1210'>OF-1210</a>] - correct time-to-live-seconds and MaxLifetime settings for hazelcast</li>
</ul>
<p><b>2.2.0</b> -- October 12, 2015</p>
<ul>
<li>[<a href='http://www.igniterealtime.org/issues/browse/OF-953'>OF-953</a>] - Updated JSP libraries.</li>
<li>Requires Openfire 3.11.0.</li>
<li>Requires Openfire 4.0.0</li>
</ul>
<p><b>2.1.2</b> -- September 16, 2015</p>
......
src/plugins/hazelcast/classes/hazelcast-cache-config.xml
View file @ 3836c3c0
......@@ -420,6 +420,7 @@
<read-backup-data>true</read-backup-data>
<max-size policy="PER_NODE">100000</max-size>
<max-idle-seconds>3600</max-idle-seconds>
<time-to-live-seconds>900</time-to-live-seconds>
<eviction-policy>LRU</eviction-policy>
</map>
<map name="Group">
......@@ -427,6 +428,7 @@
<read-backup-data>true</read-backup-data>
<max-size policy="PER_NODE">100000</max-size>
<max-idle-seconds>3600</max-idle-seconds>
<time-to-live-seconds>900</time-to-live-seconds>
<eviction-policy>LRU</eviction-policy>
</map>
<map name="Roster">
......@@ -434,6 +436,7 @@
<read-backup-data>true</read-backup-data>
<max-size policy="PER_NODE">100000</max-size>
<max-idle-seconds>3600</max-idle-seconds>
<time-to-live-seconds>21600</time-to-live-seconds>
<eviction-policy>LRU</eviction-policy>
</map>
<map name="User">
......@@ -441,6 +444,7 @@
<read-backup-data>true</read-backup-data>
<max-size policy="PER_NODE">100000</max-size>
<max-idle-seconds>3600</max-idle-seconds>
<time-to-live-seconds>1800</time-to-live-seconds>
<eviction-policy>LRU</eviction-policy>
</map>
......
src/plugins/hazelcast/plugin.xml
View file @ 3836c3c0
......@@ -5,7 +5,7 @@
<name>${plugin.name}</name>
<description>${plugin.description}</description>
<author>Tom Evans</author>
<version>2.2.0</version>
<date>10/12/2015</date>
<version>2.2.1</version>
<date>11/04/2016</date>
<minServerVersion>4.0.0</minServerVersion>
</plugin>
src/plugins/hazelcast/src/java/org/jivesoftware/openfire/plugin/util/cache/ClusteredCache.java
View file @ 3836c3c0
......@@ -160,7 +160,7 @@ public class ClusteredCache implements Cache {
}
public void setMaxLifetime(long maxLifetime) {
CacheFactory.setMaxSizeProperty(getName(), maxLifetime);
CacheFactory.setMaxLifetimeProperty(getName(), maxLifetime);
}
public void destroy() {
......
src/web/connection-settings-socket-s2s.jsp
View file @ 3836c3c0
......@@ -21,19 +21,22 @@
final ConnectionType connectionType = ConnectionType.SOCKET_S2S;
final ConnectionManagerImpl manager = (ConnectionManagerImpl) XMPPServer.getInstance().getConnectionManager();
pageContext.setAttribute("permissionPolicy", RemoteServerManager.getPermissionPolicy().toString());
final ConnectionConfiguration plaintextConfiguration = manager.getListener( connectionType, false ).generateConnectionConfiguration();
boolean update = request.getParameter( "update" ) != null;
boolean closeSettings = request.getParameter( "closeSettings" ) != null;
boolean serverAllowed = request.getParameter( "serverAllowed" ) != null;
boolean serverBlocked = request.getParameter( "serverBlocked" ) != null;
boolean permissionUpdate = request.getParameter( "permissionUpdate" ) != null;
String configToDelete = ParamUtils.getParameter( request, "deleteConf" );
final Map<String, String> errors = new HashMap<>();
Cookie csrfCookie = CookieUtils.getCookie(request, "csrf");
String csrfParam = ParamUtils.getParameter(request, "csrf");
if (update || closeSettings || serverAllowed || serverBlocked || configToDelete != null) {
if (update || closeSettings || serverAllowed || serverBlocked || permissionUpdate || configToDelete != null) {
if (csrfCookie == null || csrfParam == null || !csrfCookie.getValue().equals(csrfParam)) {
update = false;
closeSettings = false;
......@@ -63,6 +66,13 @@
webManager.logEvent( "Updated connection settings for " + connectionType, "plain: enabled=" + plaintextEnabled + ", port=" + plaintextTcpPort);
response.sendRedirect( "connection-settings-socket-s2s.jsp?success=update" );
}
else if ( permissionUpdate && errors.isEmpty() )
{
final String permissionFilter = ParamUtils.getParameter( request, "permissionFilter" );
RemoteServerManager.setPermissionPolicy(permissionFilter);
webManager.logEvent( "Updated s2s permission policy to: " + permissionFilter, null);
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.
......@@ -352,7 +362,7 @@
<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' : ''}>
<input type="radio" name="permissionFilter" value="blacklist" id="rb05" ${permissionPolicy eq 'blacklist'? 'checked' : '' }>
</td>
<td width="99%">
<label for="rb05">
......@@ -362,7 +372,7 @@
</tr>
<tr valign="top">
<td width="1%" nowrap>
<input type="radio" name="permissionFilter" value="whitelist" id="rb06" ${'whitelist' eq param.permissionFilter ? 'checked' : ''}>
<input type="radio" name="permissionFilter" value="whitelist" id="rb06" ${permissionPolicy eq 'whitelist'? 'checked' : ''}>
</td>
<td width="99%">
<label for="rb06">
......@@ -486,4 +496,4 @@
<!-- END 'Not Allowed to Connect' -->
</body>
</html>
\ No newline at end of file
</html>
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