rubyfox-server 2.17.3.1 → 2.19.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86ec53be0167ed94d4bc59c7b02680b5d5c9102fd72be830dbb50aab38ed063c
-  data.tar.gz: de4b9dd88500ee64392f47d5fb3536a23f62ca7e4c6c897f1c60a5d2880ac415
+  metadata.gz: a6eff842d23b3ab45316fc18e3813e0ab636c387422db4d1f76c1ef817c127a1
+  data.tar.gz: 1961b36a94f48a73be3a498d09abcb1d82475acfbf4fa9e2390e2d8533eef215
 SHA512:
-  metadata.gz: '0291e04cfb0df61ea6c863675ca393dc4231f7519f8a1e058c6dd6e4c0c0215bd4b5de1617a1bdb157cc87a0bbb23adac5a4c727dad022f4b300b0927a021465'
-  data.tar.gz: c455152b9575cb76d07062d40ed4ee973277f187caf501a7e38b7140dd513395a4bc957eb466efd4e4fd7e46a3e1bc11e65cf9c864840d82b1ebbef09f03d32c
+  metadata.gz: e2b64d76547357c91395602ce423141dfc39091e9c40fb1f64cc81f90ee5caebd456fa7599b5c44968dea7239e749b643fde6dd0393afd77545b723148681f94
+  data.tar.gz: 904fd93bf30cc1cbd2db347cb2065ee79d078b8cb613d341413e875df25b443fe192ced5717617e8e1b137141da3790c55e9fe4e47d5025785bbcc1df43fc962

data/lib/rubyfox/server/data/config/admin/descriptors/config_room.txt

@@ -141,6 +141,15 @@
 	"value":{$BasicValue=roomSettings.allowOwnerInvitation}
 },
 
+// SUPPRESS USER LIST
+{
+	"name":"suppressUserList",
+	"label":"Suppress User List",
+	"tooltip":"If enabled the Room will neither send a list of Users when joining it, nor trigger update events when other Users enter or leave it",
+	"type":"CheckBox",
+	"value":{$BasicValue=roomSettings.suppressUserList}
+},
+
 //-------------------------------------------
 // PERMISSIONS AND EVENTS
 //-------------------------------------------
@@ -448,7 +457,7 @@
 {
 	"name":"mmoSettings.userMaxLimboSeconds",
 	"label":"User max limbo time",
-	"tooltip":"The maximum amount of seconds allowed between the MMORoom join and the first time the user position is set in the Room (known as 'limbo', because the user is inside the Room but he knows nothing about the other users in it, because the proximity system based on the AoI requires his position to be set at least one time); if this time is exeeded, the user is kicked from the Room automatically",
+	"tooltip":"The maximum amount of seconds allowed between the MMORoom join and the first time the user position is set in the Room (known as 'limbo', because the user is inside the Room but they know nothing about the other users in it, as the proximity system based on the AoI requires their position to be set at least one time); if this time is exeeded, the user is kicked from the Room automatically",
 	"category":"MMO Settings",
 	"type":"NumericStepper",
 	"value":{$BasicValue=mmoSettings.userMaxLimboSeconds},

data/lib/rubyfox/server/data/config/admin/descriptors/config_server.txt

@@ -67,7 +67,8 @@
 		}
 	],
 	"listValues":{$List=socketAddresses, instance=serverSettings, fields=address;port;type},
-	"clazz":"ServerSettings$SocketAddress"
+	"clazz":"ServerSettings$SocketAddress",
+	"denyEmpty":true
 },
 
 // SESSION MAX IDLE TIME
@@ -334,7 +335,7 @@
 {
 	"name":"webServer.enableHttp",
 	"label":"Enable HTTP",
-	"tooltip":"Enable/disable the HTTP module in the embedded web server",
+	"tooltip":"Enable/disable the HTTP connector in the embedded web server",
 	"category":"Web Server",
 	"type":"CheckBox",
 	"value":{$BasicValue=webServer.enableHttp}
@@ -344,7 +345,7 @@
 {
 	"name":"webServer.httpPort",
 	"label":"HTTP/WS port",
-	"tooltip":"TCP port used by the embedded web server for HTTP and WS communication\n\n<b>NOTE</b>\nThe entered value is ignored if HTTP module is disabled",
+	"tooltip":"TCP port used by the embedded web server for HTTP and WS communication\n\n<b>NOTE</b>\nThe entered value is ignored if HTTP connector is disabled",
 	"category":"Web Server",
 	"type":"NumericStepper",
 	"value":{$BasicValue=webServer.httpPort},
@@ -360,11 +361,41 @@
 	}
 },
 
+// MAX HTTP THREADS
+{
+	"name":"webServer.maxHttpThreads",
+	"label":"Maximum HTTP threads",
+	"tooltip":"The maximum number of request processing threads to be created by the web server HTTP connector, which therefore determines the maximum number of simultaneous requests that can be handled",
+	"category":"Web Server",
+	"type":"NumericStepper",
+	"value":{$BasicValue=webServer.maxHttpThreads},
+	"attributes":
+	{
+		"min":1,
+		"max":2147483648
+	}
+},
+
+// MAX HTTP CONNECTIONS
+{
+	"name":"webServer.maxHttpConnections",
+	"label":"Maximum HTTP connections",
+	"tooltip":"The maximum number of HTTP connections that the web server will accept and process at any given time",
+	"category":"Web Server",
+	"type":"NumericStepper",
+	"value":{$BasicValue=webServer.maxHttpConnections},
+	"attributes":
+	{
+		"min":1,
+		"max":2147483648
+	}
+},
+
 // ENABLE HTTPS MODULE
 {
 	"name":"webServer.enableHttps",
 	"label":"Enable HTTPS",
-	"tooltip":"Enable/disable the HTTPS module in the embedded web server",
+	"tooltip":"Enable/disable the HTTPS connector in the embedded web server",
 	"category":"Web Server",
 	"type":"CheckBox",
 	"value":{$BasicValue=webServer.enableHttps}
@@ -374,7 +405,7 @@
 {
 	"name":"webServer.httpsPort",
 	"label":"HTTPS/WSS port",
-	"tooltip":"TCP port used by the embedded web server for HTTPS and WSS communication\n\n<b>NOTE</b>\nThe entered value is ignored if HTTPS module is disabled",
+	"tooltip":"TCP port used by the embedded web server for HTTPS and WSS communication\n\n<b>NOTE</b>\nThe entered value is ignored if HTTPS connector is disabled",
 	"category":"Web Server",
 	"type":"NumericStepper",
 	"value":{$BasicValue=webServer.httpsPort},
@@ -390,11 +421,41 @@
 	}
 },
 
+// MAX HTTPS THREADS
+{
+	"name":"webServer.maxHttpsThreads",
+	"label":"Maximum HTTPS threads",
+	"tooltip":"The maximum number of request processing threads to be created by the web server HTTPS connector, which therefore determines the maximum number of simultaneous requests that can be handled",
+	"category":"Web Server",
+	"type":"NumericStepper",
+	"value":{$BasicValue=webServer.maxHttpsThreads},
+	"attributes":
+	{
+		"min":1,
+		"max":2147483648
+	}
+},
+
+// MAX HTTPS CONNECTIONS
+{
+	"name":"webServer.maxHttpsConnections",
+	"label":"Maximum HTTPS connections",
+	"tooltip":"The maximum number of HTTPS connections that the web server will accept and process at any given time",
+	"category":"Web Server",
+	"type":"NumericStepper",
+	"value":{$BasicValue=webServer.maxHttpsConnections},
+	"attributes":
+	{
+		"min":1,
+		"max":2147483648
+	}
+},
+
 // ENABLE WS/WSS COMMUNICATION
 {
 	"name":"webServer.isWSActive",
 	"label":"Enable WS/WSS",
-	"tooltip":"Enable/disable the WebSocket communication (both WS and WSS) through the HTTP/S modules; requires one of the two modules (or both) to be active",
+	"tooltip":"Enable/disable the WebSocket communication (both WS and WSS) through the HTTP/S modules; requires one of the two connectors (or both) to be active",
 	"category":"Web Server",
 	"type":"CheckBox",
 	"value":{$BasicValue=webServer.isWSActive}
@@ -473,7 +534,7 @@
 {
 	"name":"webServer.blueBoxPollingTimeout",
 	"label":"BlueBox polling timeout",
-	"tooltip":"The amount of seconds after which a client connected through the BlueBox is considered disconnected if he doesn't send a polling request",
+	"tooltip":"The amount of seconds after which a client connected through the BlueBox is considered disconnected if it doesn't send a polling request",
 	"category":"Web Server",
 	"type":"NumericStepper",
 	"value":{$BasicValue=webServer.blueBoxPollingTimeout},
@@ -490,7 +551,7 @@
 	"separator":
 	{
 		"pos":"before",
-		"text":"\n<b>BlueBox Settings</b>"
+		"text":"<hr><b>BlueBox Settings</b>"
 	}
 },
 
@@ -612,6 +673,16 @@
 	}
 },
 
+// USE SSL
+{
+	"name":"mailer.useSSL",
+	"label":"Use SSL",
+	"tooltip":"Enable/disable SSL. We recommend keeping it turned on!",
+	"category":"Mailer",
+	"type":"CheckBox",
+	"value":{$BasicValue=mailer.useSSL}
+},
+
 //-------------------------------------------
 // REMOTE ADMIN
 //-------------------------------------------
@@ -620,8 +691,9 @@
 {
 	"name":"remoteAdmin.administrators",
 	"label":"Administrators",
-	"tooltip":"The access credentials and permissions of SmartFoxServer administrators; removing all the administrators will prevent the AdminTool to reconnect to the server instance after a disconnection",
+	"tooltip":"The access credentials and permissions of SmartFoxServer administrators; removing all the administrators is not permitted as this would prevent further interacting with the server after the configuration submission",
 	"category":"Remote Admin",
+	"immediate":true,
 	"type":"DataGrid",
 	"defaultListItem":
 	[
@@ -671,29 +743,26 @@
 	],
 	"listValues":{$List=administrators, instance=remoteAdmin, fields=login;password;allowHalt;disabledModulesString},
 	"clazz":"AdminUser",
-	"separator":
-	{
-		"pos":"before",
-		"text":"<b>IMPORTANT</b>: all settings below, except 'Use encryption', are <b>applied immediately</b> on submission, without a server restart being required"
-	}
+	"denyEmpty":true
 },
 
 // ALLOWED REMOTE ADDRESSES
 {
 	"name":"remoteAdmin.allowedRemoteAddresses",
 	"label":"Allowed client IP addresses",
-	"tooltip":"List of client IP address which are allowed to access the SmartFoxServer's administration; leave the list empty to skip this check on administrator login",
+	"tooltip":"List of client IP addresses or IP ranges which are allowed to access the SmartFoxServer's administration; leave the list empty to skip this check on administrator login",
 	"category":"Remote Admin",
+	"immediate":true,
 	"type":"DataGrid",
 	"defaultListItem":
 	[
 		{
 			"name":"ipAddress",
-			"label":"IP address",
-			"tooltip":"Client IP address",
+			"label":"IP address or range",
+			"tooltip":"Client IP address or range",
 			"type":"TextInput",
 			"value":"",
-			"validator":"ip",
+			"validator":"ipRange",
 			"componentParams": // DEPRECATED (implicit in validator)
 			{
 				"restrict":"0-9."
@@ -706,9 +775,10 @@
 // ADMIN TCP PORT
 {
 	"name":"remoteAdmin.adminTcpPort",
-	"label":"Administration TCP port",
-	"tooltip":"TCP port number used for administration; set it to -1 to skip this check on administrator login",
+	"label":"Administration port",
+	"tooltip":"Port number used for administration; set it to -1 to skip this check on administrator login",
 	"category":"Remote Admin",
+	"immediate":true,
 	"type":"NumericStepper",
 	"value":{$BasicValue=remoteAdmin.adminTcpPort},
 	"componentParams": // DEPRECATED

data/lib/rubyfox/server/data/config/admin/descriptors/config_zone.txt

@@ -53,6 +53,15 @@
 	"value":{$BasicValue=zoneSettings.geoLocationEnabled}
 },
 
+// TOGGLE KEEPALIVE
+{
+	"name":"lagMonitorKeepAlive",
+	"label":"Enable Keepalive",
+	"tooltip":"Allows client side LagMonitor requests to act as keepalive pings, resetting the idle timer. When active the client will essentially not be disconnected for being idle",
+	"type":"CheckBox",
+	"value":{$BasicValue=zoneSettings.lagMonitorKeepAlive}
+},
+
 // MAX FAILED LOGIN ATTEMPTS
 {
 	"name":"maxFailedLogins",

data/lib/rubyfox/server/data/config/admin/descriptors/runtime_room.txt

@@ -249,6 +249,17 @@
 	"edit":true
 },
 
+// SUPPRESS USER LIST
+{
+	"name":"suppressUserList",
+	"label":"Suppress User List",
+	"tooltip":"If enabled the Room will neither send a list of Users when joining it, nor trigger update events when other Users enter or leave it",
+	"category":"Runtime Room Settings",
+	"type":"CheckBox",
+	"value":{$BasicValue=room.suppressUserList},
+	"edit":false
+},
+
 //-------------------------------------------
 // PERMISSIONS AND EVENTS
 //-------------------------------------------

data/lib/rubyfox/server/data/config/admin/descriptors/runtime_user.txt

@@ -496,7 +496,7 @@
 {
 	"name":"buddyOnline",
 	"label":"User is online as buddy",
-	"tooltip":"The user can decide to go online or offline in the buddy system at any time during his session",
+	"tooltip":"The user can decide to go online or offline in the buddy system at any time during their session",
 	"category":"Buddy Properties",
 	"type":"CheckBox",
 	"value":{$BasicValue=buddyProps.online},
@@ -591,14 +591,14 @@
 		{
 			"name":"blocked",
 			"label":"Blocked",
-			"tooltip":"If the buddy is blocked the user won't receive any messages from him/her",
+			"tooltip":"If the buddy is blocked the user won't receive any messages from them",
 			"type":"CheckBox",
 			"value":false
 		},
 		{
 			"name":"temp",
 			"label":"Temp",
-			"tooltip":"A temporary buddy will be lost as soon as the user disconnects, unless he decides to add such user to his Buddy List. Check the docs for more details on this",
+			"tooltip":"A temporary buddy will be lost as soon as the user disconnects, unless they decide to add such user to their Buddy List. Check the docs for more details on this",
 			"type":"CheckBox",
 			"value":false
 		}

data/lib/rubyfox/server/data/config/core.xml

@@ -1,8 +1,8 @@
 <!--
-	SmartFoxServer 2X v 2.14.x
+	SmartFoxServer 2X v 2.19.x
 	<<< Core Configuration >>>
 	
-	(c) gotoAndPlay  2009-2019
+	(c) gotoAndPlay  2009-2023
 	- www.smartfoxserver.com -
 -->
 
@@ -34,8 +34,8 @@
 	<socketReaderThreadPoolSize>1</socketReaderThreadPoolSize>
 	<socketWriterThreadPoolSize>3</socketWriterThreadPoolSize>	
 	
-	<!-- Enable disable Nagle algorithm on sockets, true == disable -->
-	<tcpNoDelay>true</tcpNoDelay>
+	<!-- Enable or disable Nagle algorithm on sockets, true == disable -->
+	<tcpNoDelay>false</tcpNoDelay>
 
 	<!-- BlueBox Settings -->
 	<bbMaxLogFiles>10</bbMaxLogFiles>

data/lib/rubyfox/server/data/config/default.words.txt

@@ -0,0 +1,11 @@
+(?i:asshole)
+(?i:shit)
+(?i:son of a bitch)
+(?i:sonofabitch)
+(?i:shitlover)
+(?i:motherfucker)
+(?i:fucker)
+(?i:assfucker)
+(?i:asslicker)
+(?i:bastard)
+([f|F][\W]*[u|U][\W]*[c|C][\W]*[k|K][\W]*)

data/lib/rubyfox/server/data/config/log4j.properties

@@ -55,7 +55,7 @@ log4j.appender.fileAppender.DatePattern='.'yyyy-MM-dd
 log4j.appender.bootFileAppender=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.bootFileAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.bootFileAppender.File=logs/boot/boot.log
-log4j.appender.bootConsoleAppender.threshold=DEBUG
+log4j.appender.bootFileAppender.threshold=DEBUG
 log4j.appender.bootFileAppender.layout.ConversionPattern=%d{dd MMM yyyy | HH:mm:ss,SSS} | %-5p | %t | %c{3} | %3x | %m%n
 log4j.appender.bootFileAppender.Encoding=UTF-8
 
@@ -69,7 +69,6 @@ log4j.appender.bootConsoleAppender.threshold=WARN
 log4j.category.com.smartfoxserver=INFO,consoleAppender,fileAppender
 log4j.category.org.apache=INFO,consoleAppender,fileAppender
 log4j.category.org.apache.http=INFO,consoleAppender,fileAppender
-log4j.category.org.eclipse.jetty=WARN,consoleAppender,fileAppender
 log4j.category.bootLogger=DEBUG,bootFileAppender,bootConsoleAppender
 log4j.category.sfs2x=INFO,consoleAppender,fileAppender
 log4j.category.Extensions=INFO,consoleAppender,fileAppender

data/lib/rubyfox/server/data/config/server.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><serverSettings>
   <socketAddresses>
     <socket address="0.0.0.0" port="9933" type="TCP"/>
-    <socket address="127.0.0.1" port="9933" type="UDP"/>
+    <socket address="0.0.0.0" port="9933" type="UDP"/>
   </socketAddresses>
   <ipFilter>
     <addressBlackList>

data/lib/rubyfox/server/data/lib/apache-tomcat/bin/catalina-tasks.xml

@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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.
--->
-<!--
-  XML file for importing Catalina ant tasks.
-  <import file="${catalina.home}/bin/catalina-tasks.xml"/>
--->
-
-<project name="catalina-tasks">
-  <description>Catalina Ant Manager, JMX and JSPC Tasks</description>
-  <!-- set catalina.home if it's not already set -->
-  <dirname property="catalina.home.bin.dir" file="${ant.file.catalina-tasks}"/>
-  <property name="catalina.home" value="${catalina.home.bin.dir}/.."/>
-  <typedef resource="org/apache/catalina/ant/catalina.tasks">
-    <classpath>
-      <fileset file="${catalina.home}/bin/tomcat-juli.jar"/>
-      <fileset dir="${catalina.home}/lib" includes="*.jar"/>
-    </classpath>
-  </typedef>
-  <typedef resource="org/apache/catalina/ant/jmx/jmxaccessor.tasks">
-    <classpath>
-      <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
-    </classpath>
-  </typedef>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!--
+  XML file for importing Catalina ant tasks.
+  <import file="${catalina.home}/bin/catalina-tasks.xml"/>
+-->
+
+<project name="catalina-tasks">
+  <description>Catalina Ant Manager, JMX and JSPC Tasks</description>
+  <!-- set catalina.home if it's not already set -->
+  <dirname property="catalina.home.bin.dir" file="${ant.file.catalina-tasks}"/>
+  <property name="catalina.home" value="${catalina.home.bin.dir}/.."/>
+  <typedef resource="org/apache/catalina/ant/catalina.tasks">
+    <classpath>
+      <fileset file="${catalina.home}/bin/tomcat-juli.jar"/>
+      <fileset dir="${catalina.home}/lib" includes="*.jar"/>
+    </classpath>
+  </typedef>
+  <typedef resource="org/apache/catalina/ant/jmx/jmxaccessor.tasks">
+    <classpath>
+      <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
+    </classpath>
+  </typedef>
+</project>

data/lib/rubyfox/server/data/lib/apache-tomcat/conf/Catalina/localhost/rewrite.config

@@ -1 +1 @@
-RewriteRule /websocket /BlueBox/websocket
+RewriteRule /websocket /BlueBox/websocket