rubyfox-server 2.17.3.1 → 2.19.2.0

data/lib/rubyfox/server/data/www/ROOT/admin/modules/cluster-configurator.html

@@ -0,0 +1,32 @@
+<cluster-configurator-module class="module" id="cluster-configurator-module">
+	<style>
+		#clc-progressBar {
+			width: 100%;
+		}
+	</style>
+
+	<view-stack id="clc-viewstack" class="flex-grow-1">
+		<div id="clc-loading" class="position-relative">
+			<div class="float-centered-loading">
+				Requesting data...
+				<div id="clc-progressBar"></div>
+			</div>
+		</div>
+		<div id="clc-main" class="pt-3 px-3">
+			<div id="clc-tabNavigator">
+				<ul class="nav nav-tabs" id="tabs" role="tablist"></ul>
+				<div class="tab-content" id="tabPanels"></div>
+			</div>
+
+			<div id="clc-buttons" class="sticky-bottom-controls py-3 bg-color-default">
+				<button id="clc-reloadButton" type="button" class="k-button k-primary mr-1"><i class="fas fa-redo-alt mr-1"></i>Reload</button>
+				<button id="clc-submitButton" type="button" class="k-button k-primary mx-1"><i class="fas fa-check-circle mr-1"></i>Submit</button>
+				<div class="custom-control custom-checkbox d-inline ml-1">
+				  <input class="custom-control-input" type="checkbox" id="clc-backupCheck">
+				  <label class="custom-control-label" for="clc-backupCheck">Backup</label>
+				</div>
+			</div>
+		</div>
+	</view-stack>
+
+</cluster-configurator-module>

data/lib/rubyfox/server/data/www/ROOT/admin/modules/cluster-monitor.html

@@ -0,0 +1,185 @@
+<cluster-monitor-module class="module" id="cluster-monitor-module">
+	<style>
+		.nodes-container {
+			max-height: 500px;
+			overflow-y: auto;
+		}
+
+		.name-cell {
+			line-height: 1em;
+    		padding: .5em 0;
+		}
+
+		.name-admin-link {
+			color: #fd7d24 !important;
+		}
+
+		.name-admin-link:hover {
+			color: #d35802 !important;
+		}
+
+		#clm-nodesList .k-grouping-row {
+			/* background-color: #F4F4F4; */
+		}
+
+		#clm-nodesList .k-grouping-row td {
+			border-top: 1px solid #DDDDE4;
+			font-style: italic;
+			color: #6c757d;
+		}
+	</style>
+
+	<div id="clm-tabNavigator" class="p-3 flex-grow-1">
+		<ul class="nav nav-tabs" id="tabs">
+			<li class="nav-item">
+				<a class="nav-link active" id="clm-clusterStatus-tab" data-toggle="tab" href="#clm-clusterStatus" role="tab" aria-controls="clm-clusterStatus" aria-selected="true">Cluster Status</a>
+			</li>
+			<li class="nav-item">
+				<a class="nav-link" id="clm-orchestrationLog-tab" data-toggle="tab" href="#clm-orchestrationLog" role="tab" aria-controls="clm-orchestrationLog" aria-selected="false">Orchestration Log</a>
+			</li>
+		</ul>
+		<div class="tab-content" id="tabPanels">
+			<div class="tab-pane show active" id="clm-clusterStatus" role="tabpanel" aria-labelledby="clm-clusterStatus-tab">
+				<div class="d-flex mb-2">
+					<small id="clm-lobbyState">
+						<span class="active"><i class="fas fa-circle text-success"></i> Lobby is active</span>
+						<span class="inactive"><i class="fas fa-circle text-secondary"></i> Lobby is inactive</span>
+						<i class="fas fa-question-circle text-muted help" title="An active lobby manages all game nodes in the cluster; an inactive one doesn't participate in the cluster"></i>
+					</small>
+				</div>
+				<div class="row">
+					<div class="col-sm-6 col-lg-3 mb-3">
+						<div class="special-box gray">
+							<span class="special-box-label my-1">Uptime</span>
+							<div class="d-flex justify-content-around font-weight-bold special-box-container">
+								<div><div id="clm-uptimeDays">---</div><div class="value-label">days</div></div>
+								<div>:<div class="value-label">&nbsp;</div></div>
+								<div><div id="clm-uptimeHours">--</div><div class="value-label">hours</div></div>
+								<div>:<div class="value-label">&nbsp;</div></div>
+								<div><div id="clm-uptimeMinutes">--</div><div class="value-label">minutes</div></div>
+							</div>
+						</div>
+					</div>
+					<div class="col-sm-6 col-lg-3 mb-3">
+						<div class="special-box gray">
+							<span class="special-box-label my-1">Total Nodes</span>
+							<div class="d-flex justify-content-around font-weight-bold special-box-container">
+								<div><div id="clm-totalActiveNodes">---</div><div class="value-label">active</div></div>
+								<div><div id="clm-totalInactiveNodes">--</div><div class="value-label">inactive</div></div>
+							</div>
+						</div>
+					</div>
+					<div class="col-sm-6 col-lg-3 mb-3">
+						<div class="special-box gray">
+							<span class="special-box-label my-1">Total CCU</span>
+							<div class="d-flex justify-content-around font-weight-bold special-box-container">
+								<div><div id="clm-totalCcuLobby">---</div><div class="value-label">lobby</div></div>
+								<div><div id="clm-totalCcuNodes">--</div><div class="value-label">nodes</div></div>
+							</div>
+						</div>
+					</div>
+					<div class="col-sm-6 col-lg-3 mb-3">
+						<div class="special-box gray">
+							<span class="special-box-label my-1">Total Rooms</span>
+							<div class="d-flex justify-content-around font-weight-bold special-box-container">
+								<div><div id="clm-totalRooms">---</div><div class="value-label">on nodes</div></div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="nodes-container">
+					<div id="clm-nodesList"></div>
+				</div>
+				<div class="row no-gutters">
+					<div class="col-md-7 text-md-right pt-3">
+						<button id="clm-deactivateBt" type="button" class="btn btn-secondary btn-sm mb-1" title="Deactivate nodes" disabled><i class="fas fa-trash"></i> Deactivate <span id="clm-deactivateNodesNum">nodes</span></button>
+						<button id="clm-scaleUpBt" type="button" class="btn btn-secondary btn-sm mb-1" title="Scale-up"><i class="fas fa-angle-double-up"></i> Scale-up</button>
+						<button id="clm-refreshBt" type="button" class="btn btn-secondary btn-sm mb-1" title="Refresh now"><i class="fas fa-sync-alt"></i></button>
+					</div>
+					<div class="col-md-5 order-md-first pt-3">
+						<div id="clm-mainRangeContainer">
+							<label class="text-muted pr-1">Range:</label>
+							<select id="clm-mainRangeDD" class="dropdown-sm dropdown-secondary"></select>
+						</div>
+					</div>
+				</div>
+				<div id="clm-nodeMiniChartsContainer"></div>
+			</div>
+
+			<div class="tab-pane" id="clm-orchestrationLog" role="tabpanel" aria-labelledby="clm-orchestrationLog-tab">
+				<p class="text-muted"><em>Log messages are not displayed in realtime, but with a fixed refresh rate of 3 seconds. The list contains a maximum of <span id="clm_maxLogMsgs">xxx</span> messages; older messages are discarded as new ones are added.</em></p>
+				<div id="clm-logGrid"></div>
+			</div>
+		</div>
+	</div>
+
+	<div class="modal" id="clm-chartModal" tabindex="-1" role="dialog" aria-labelledby="clm-chartModalTitle" aria-hidden="true">
+		<div class="modal-dialog modal-dialog-centered modal-xl" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<div>
+						<h5 class="modal-title text-primary" id="clm-chartModalTitle"></h5>
+						<div class="d-flex align-items-baseline">
+							<label class="text-muted pr-1">Node:</label>
+							<strong id="clm-chartNodeAlias" class="pr-1"></strong>
+							<small id="clm-chartNodeName" class="pr-1"></small>
+						</div>
+						<div>
+							<label class="text-muted pr-1">Range:</label>
+							<select id="clm-chartRangeDD" class="dropdown-sm dropdown-secondary"></select>
+						</div>
+					</div>
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+				</div>
+				<div class="modal-body">
+					<div id="clm-nodeDetailChartContainer"></div>
+				</div>
+				<!--
+				<div class="modal-footer">
+					<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+				</div>
+				-->
+			</div>
+		</div>
+	</div>
+
+	<div class="modal" id="clm-scaleUpModal" tabindex="-1" role="dialog" aria-labelledby="clm-scaleUpModalTitle" aria-hidden="true">
+		<div class="modal-dialog modal-dialog-centered" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title text-primary" id="clm-scaleUpModalTitle">Trigger Cluster Scale-up</h5>
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+				</div>
+				<div class="modal-body in-flow-invalid-msg">
+					<fieldset id="clm-scaleUpForm">
+						<div class="form-row">
+							<div class="form-group">
+								<div class="col-form-label form-label-container">
+									<label for="clm-numNodesNS" class="form-label">Number of nodes</label>
+								</div>
+								<div class="inner-widget">
+									<input id="clm-numNodesNS" class="form-control" name="numNodes" value="1" required data-required-msg="Required">
+									<span class="k-invalid-msg" data-for="numNodes"></span>
+								</div>
+							</div>
+						</div>
+					</fieldset>
+				</div>
+				<div class="modal-footer flex-column">
+					<div class="d-flex w-100">
+						<div class="flex-grow-1 text-left">
+							<button id="clm-scaleUpModalBt" type="button" class="k-button k-primary"><i class="fas fa-angle-double-up mr-1"></i>Scale-up</button>
+						</div>
+						<div class="flex-grow-1 text-right">
+							<button type="button" class="k-button k-secondary" data-dismiss="modal">Cancel</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</cluster-monitor-module>

data/lib/rubyfox/server/data/www/ROOT/admin/modules/cluster-updater.html

@@ -0,0 +1,47 @@
+<cluster-updater-module class="module" id="cluster-updater-module">
+	<style>
+		#cup-progressBar {
+			width: 100%;
+		}
+	</style>
+
+	<view-stack id="cup-viewstack" class="flex-grow-1">
+		<div id="cup-loading" class="position-relative">
+			<div class="float-centered-loading">
+				Requesting data...
+				<div id="cup-progressBar"></div>
+			</div>
+		</div>
+		<div id="cup-error" class="position-relative">
+			<div class="float-centered-text w-50">
+				<div class="mb-3">The following error occurred while trying to connect to Overcast. Try again and, if the error persists, please report the issue to the SmartFoxServer team.</div>
+				<div class="mb-3"><strong id="cup-error1Msg"></strong></div>
+				<button id="cup-retryBt" type="button" class="k-button k-primary"><i class="fas fa-redo-alt mr-1"></i>Retry</button>
+			</div>
+		</div>
+		<div id="cup-none" class="position-relative">
+			<div class="float-centered-text w-50">This node is already running the latest SmartFoxServer version.</div>
+		</div>
+		<div id="cup-main" class="p-3">
+			<div class="row no-gutters">
+				<div class="col-md-6 light-box p-3">
+					<p class="h5">Installed server version: <strong id="cup-currentVer"></strong></p>
+					<p class="h5">Available server version: <strong id="cup-updateVer"></strong> <span id="cup-criticalUpd" class="badge badge-danger">CRITICAL</span></p>
+					<p class="h6" id="cup-includedVer"></p>
+					<hr>
+					<p class="text-muted"><strong>NOTE</strong>: the update will be installed immediately upon confirmation and a server restart will be triggered at then of the process, closing the current session as well.</p>
+					<hr>
+					<div class="my-3">
+						<button id="cup-updateBt" type="button" class="k-button k-primary mr-2"><i class="fas fa-download mr-1"></i>Update</button>
+						<button id="cup-refreshBt" type="button" class="k-button k-secondary">&nbsp;<i class="fas fa-redo-alt mr-1"></i>&nbsp;</button>
+					</div>
+					<p id="cup-error2Msg" class="text-danger"></p>
+				</div>
+				<div class="col-md-6 dark-box p-3">
+					<p class="h5">Release notes</p>
+					<div id="cup-releaseNotes"></div>
+				</div>
+			</div>
+		</div>
+	</view-stack>
+</cluster-updater-module>

data/lib/rubyfox/server/data/www/ROOT/admin/modules/extension-deployer.html

@@ -0,0 +1,84 @@
+<extension-deployer-module class="module" id="extension-deployer-module">
+	<style>
+		.exd-progressBar {
+			width: 100%;
+		}
+
+		button.k-clear-selected, button.k-upload-selected {
+			display: none !important;
+		}
+	</style>
+
+	<view-stack id="exd-viewstack" class="flex-grow-1">
+		<div id="exd-init" class="position-relative">
+			<div class="float-centered-loading">
+				Initializing, please wait...
+				<div class="exd-progressBar"></div>
+			</div>
+		</div>
+		<div id="exd-locked" class="position-relative">
+			<div class="float-centered-text w-75">
+				<div class="my-3">This module is currently locked as an additional security measure.<br>Please access the server and delete the <strong>/config/UploadsLock.txt</strong> file before retrying.</div>
+				<button id="exd-retryBt" type="button" class="k-button k-primary" title="Retry"><i class="fas fa-sync-alt mr-1"></i>Retry</button>
+			</div>
+		</div>
+		<div id="exd-main" class="p-3">
+			<p>This module is in charge of distributing Extensions to game nodes in the cluster. If you need to deploy an Extension to the lobby node too, please go to the <strong>Extension Manager</strong> module.</p>
+			<p><strong>Important</strong>: before deploying an Extension to the running game nodes in the cluster (listed below), remember to update the game node snapshot in Overcast. This is important to avoid new nodes to be launched automatically by the scaling logic with an outdated version of the Extension.</p>
+			<div class="row">
+				<div class="col-md-7 col-lg-6 col-xl-8">
+					<div id="exd-nodesList"></div>
+					<div class="d-flex justify-content-between my-3">
+						<span>&nbsp;</span>
+						<button id="exd-refreshBt" type="button" class="btn btn-secondary btn-sm" title="Refresh now"><i class="fas fa-sync-alt"></i></button>
+					</div>
+				</div>
+				<div class="col-md-5 col-mlg-6 col-xl-4">
+					<fieldset id="exd-uploadFileForm" class="form-group dark-box p-3">
+						<h6 class="form-label">Deploy Extension to selected nodes</h6>
+						<hr>
+						<div class="inner-widget">
+							<input type="file" id="exd-uploader" name="uploader" accept=".zip" data-upload-msg="Select one or more files">
+							<span class="k-invalid-msg position-static" data-for="exd-uploader"></span>
+						</div>
+						<div class="inner-widget mt-3">
+							<input type="checkbox" id="exd-modeCb" data-role="switch" checked />
+							<label for="exd-modeCb">Non-destructive deployment <i class="fas fa-question-circle text-muted help" title="In destructive deployment, all folders under <strong>/extensions</strong> on the game node which are also found in the uploaded zip file are deleted before uncompressing the new version; in non-destructive deployment, files from the uploaded zip are simply added to the respective folders (overwriting existing files with the same name)"></i></label>
+						</div>
+						<button id="exd-deployBt" type="button" class="k-button k-primary mt-2"><i class="fas fa-file-upload mr-1"></i>Deploy</button>
+					</fieldset>
+				</div>
+			</div>
+		</div>
+	</view-stack>
+
+	<div class="modal" id="exd-deployStatusModal" tabindex="-1" role="dialog" aria-labelledby="exd-deployStatusModalTitle" aria-hidden="true">
+		<div class="modal-dialog modal-dialog-centered" role="document">
+			<div class="modal-content">
+				<div class="modal-body">
+					<view-stack id="exd-deployStatus">
+						<div id="exd-statusProgress">
+							<div class="exd-progressBar"></div>
+							<div class="mt-3">Deployment in progress, please wait...</div>
+						</div>
+						<div id="exd-statusError">
+							<h4 class="text-danger">Deployment error</h4>
+							<p id="exd-statusErrorText"></p>
+							<button type="button" class="k-button k-secondary exd-statusCloseBt">Close</button>
+						</div>
+						<div id="exd-statusWarning">
+							<h4 class="text-warning">Deployment warning</h4>
+							<p id="exd-statusWarningText"></p>
+							<button type="button" class="k-button k-secondary exd-statusCloseBt">Close</button>
+						</div>
+						<div id="exd-statusSuccess">
+							<h4 class="text-success">Deployment success</h4>
+							<p>The uploaded file was successfully transferred to all game nodes.</p>
+							<button type="button" class="k-button k-secondary exd-statusCloseBt">Close</button>
+						</div>
+					</view-stack>
+				</div>
+			</div>
+		</div>
+	</div>
+</extension-deployer-module>

data/lib/rubyfox/server/data/www/ROOT/admin/modules/zone-monitor.html

@@ -248,16 +248,18 @@
 								<hr/>
 								<div class="custom-tab-content">
 									<label class="config-form-separator-label mb-3 font-weight-bold">Kick User</label>
-									<div>Force user disconnection by kicking him/her; a message can be sent to the user to describe the reason of the action.</div>
+									<div>Force user disconnection by kicking them; a message can be sent to the user to describe the reason of the action.</div>
 									<div class="row no-gutters my-2">
 										<div class="col-lg pr-lg-2">
 											<input id="znm-kickMsgIn" class="k-textbox form-control w-100 my-1" placeholder="Message"/>
 										</div>
 										<div class="col-lg-auto col-xl-6">
-											<div class="d-inline-block" class="my-1">
+											<div class="d-inline-block my-1">
 												<input id="znm-kickDelayNS" class="form-control" style="max-width: 130px"/>
 											</div>
-											<button id="znm-kickBt" type="button" class="k-button k-primary my-1 ml-1"><i class="fas fa-bolt mr-1"></i>Kick</button>
+										</div>
+										<div class="col-12 my-1">
+											<button id="znm-kickBt" type="button" class="k-button k-primary"><i class="fas fa-bolt mr-1"></i>Kick</button>
 										</div>
 									</div>
 									<div class="text-muted">Kicked users can reconnect immediately.</div>
@@ -265,18 +267,21 @@
 								<hr/>
 								<div class="custom-tab-content">
 									<label class="config-form-separator-label mb-3 font-weight-bold">Ban User</label>
-									<div>Force user disconnection by banning his/her username (default) or IP address; a message can be sent to the user to describe the reason of the action.</div>
+									<div>Force user disconnection by banning their username (default) or IP address; a message can be sent to the user to explain the action taken and a reason can be saved for future reference (see Ban Manager module).</div>
 									<div class="row no-gutters my-2">
-										<div class="col-lg pr-lg-2">
+										<div class="col-lg-6 col-xl pr-lg-2">
 											<input id="znm-banMsgIn" class="k-textbox form-control w-100 my-1" placeholder="Message"/>
 										</div>
-										<div class="d-inline-flex col-lg-auto pr-xl-2">
+										<div class="col-lg-6 col-xl pr-xl-2">
+											<input id="znm-banRsnIn" class="k-textbox form-control w-100 my-1" placeholder="Reason"/>
+										</div>
+										<div class="d-inline-flex col-sm-auto pr-sm-2">
 											<input id="znm-banModeDD" class="form-control my-1" style="width: 90px"/>
 											<div class="d-inline-block my-1 ml-2">
 												<input id="znm-banDelayNS" class="form-control" style="max-width: 130px"/>
 											</div>
 										</div>
-										<div class="d-inline-flex col-xl-auto">
+										<div class="d-inline-flex col-sm-auto">
 											<div class="d-inline-block my-1">
 												<input id="znm-banDurationNS" class="form-control" style="max-width: 130px"/>
 											</div>
@@ -285,7 +290,9 @@
 										        <option value="hours">hours</option>
 										        <option value="days" selected>days</option>
 										    </select>
-											<button id="znm-banBt" type="button" class="k-button k-primary my-1"><i class="fas fa-ban mr-1"></i>Ban</button>
+										</div>
+										<div class="col-12 my-1">
+											<button id="znm-banBt" type="button" class="k-button k-primary"><i class="fas fa-ban mr-1"></i>Ban</button>
 										</div>
 									</div>
 									<div class="text-muted">Banned users can't reconnect until the ban duration time has passed (default: 1 day).</div>

data/lib/rubyfox/server/data/www/ROOT/index.html

@@ -7,12 +7,6 @@
 <meta http-equiv="description" content="Basic examples for SmartFoxServer, a massive multiplayer platform for building games, MMO communities, virtual worlds, realtime multiplayer games and a lot more..." />
 <meta name="copyright" content="gotoAndPlay()" />
 <meta name="language" content="English" />
-<meta name="author" content="
-	GotoAndPlay S.N.C.
-	Via IV Novembre, 8
-	12045 Fossano (CN)
-	Italy
-	Copyright (C) gotoAndPlay()" />
 
 <link rel="icon" href="../_images_/favicon.png" />
 
@@ -32,31 +26,27 @@
             <div id="text">
             	<p><strong>SmartFoxServer 2X</strong> was installed successfully and is now up and running!</p>
             	<p>Before proceeding, please make sure you are using the <strong>latest version</strong> by visiting the <a href="http://www.smartfoxserver.com/download/sfs2x#p=updates" target="_blank">updates section</a> of the SmartFoxServer website.</p>
-            	<h2>Administration</h2>
+            	<h2>&raquo; Administration</h2>
             	<p>Launch the <a href="admin/">Administration Tool 2X</a> (default username &amp; password: <em>sfsadmin</em>).</p>
-				<h2>Documentation</h2>
+				<div class="note">
+					<strong>PLEASE NOTE: </strong> if you are installing SFS2X on a public server, make sure to immediately change the default Admin credentials using a secure password. To do so, login in the AdminTool, select Server Settings > Remote Admin > and apply the changes. Then restart SmartFoxServer.
+				</div>
+				<h2>&raquo; Documentation</h2>
             	<p>Visit the <a href="http://www.smartfoxserver.com/support/sfs2x" target="_blank">SmartFoxServer 2X online documentation</a>.</p>
-            	<h2>Examples</h2>
-            	<h3>Basic package</h3>
-            	<p>The basic examples package allows you to rapidly put SmartFoxServer 2X in action.<br />
-           	    In order to install the examples follow these steps:</p>
-            	<ol>
-            	  <li>download the <a href="http://www.smartfoxserver.com/download/get/120">Basic examples package</a></li>
-            	  <li>unzip the content in the <em>[SFS2X_install_folder]SFS2X/www/root/examples</em> folder, overwriting the existing file</li>
-           	  </ol>
-            	<p>After completing the installation, visit the <a href="examples/">examples main page</a>.</p>
-<p class="note"><strong>IMPORTANT</strong>: SmartFoxServer 2X is by default distributed with a predefined Zone used by the basic examples, and a server-side extension used by the Tris game. If you want to keep your installation clean (usually for production environments) you should delete the content of the 
-   	      <strong>[SFS2X_install_folder]SFS2X/extensions</strong> and <strong>zones</strong> folders before installing your own Zone/s and Extension/s.           	  </p>
-<h3>Full packages</h3>
-            	<p>The full examples packages for all supported platforms can be downloaded from the SmartFoxServer website's <a href="http://www.smartfoxserver.com/download/sfs2x#p=examples" target="_blank">download page</a>. A complete set of tutorials with detailed deployment instructions for each example is also available in the dedicated sections of the <a href="http://www.smartfoxserver.com/support/sfs2x">online documentation</a>.</p>
-<p>&nbsp;</p>
+            	
+				<h2>&raquo; Examples</h2>
+            	<p>We provide <strong>examples packages</strong> for all supported platforms that can be downloaded from our website's <a href="http://www.smartfoxserver.com/download/sfs2x#p=examples" target="_blank">download section</a>. A complete set of tutorials with detailed deployment instructions for each example is also available in the dedicated sections of the <a href="http://www.smartfoxserver.com/support/sfs2x" target="_blank">online documentation</a>.</p>
+
+				<h2>&raquo; Support</h2>
+				Join our <a href="https://www.smartfoxserver.com/forums/index.php" target="_blank">support forum</a> where you can post your requests, submit bug reports and search a vast archive with tens of thousands of topics.
             	<p>&nbsp;</p>
+				<p>&nbsp;</p>
             </div>
         </div> <!-- /main -->
     </div> <!-- /wrapper1 -->
 </div> <!-- /wrapper2 -->
 <div id="footer">
-  <p id="copyright">Copyright &copy; gotoAndPlay() 2004-2016. All rights reserved<br />
+  <p id="copyright">Copyright &copy; gotoAndPlay(). All rights reserved<br />
     <a href="http://www.smartfoxserver.com/" target="_blank">www.smartfoxserver.com</a></p>
 </div> <!-- /footer -->
 </body>

data/lib/rubyfox/server/data/www/host-manager/META-INF/context.xml

@@ -16,9 +16,9 @@
   limitations under the License.
 -->
 <Context antiResourceLocking="false" privileged="true" >
-  <!--
+  <CookieProcessor className="org.apache.tomcat.util.http.Rfc6265CookieProcessor"
+                   sameSiteCookies="strict" />
   <Valve className="org.apache.catalina.valves.RemoteAddrValve"
          allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1" />
-  -->
   <Manager sessionAttributeValueClassNameFilter="java\.lang\.(?:Boolean|Integer|Long|Number|String)|org\.apache\.catalina\.filters\.CsrfPreventionFilter\$LruCache(?:\$1)?|java\.util\.(?:Linked)?HashMap"/>
 </Context>

data/lib/rubyfox/server/data/www/host-manager/WEB-INF/jsp/404.jsp

@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@ page import="org.apache.catalina.util.RequestUtil" session="false"
+<%@ page import="org.apache.tomcat.util.security.Escape" session="false"
          trimDirectiveWhitespaces="true" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
@@ -33,7 +33,7 @@
    <h1>404 Not found</h1>
    <p>
     The page you tried to access
-    (<%=RequestUtil.filter((String) request.getAttribute(
+    (<%=Escape.htmlElementContent((String) request.getAttribute(
             "javax.servlet.error.request_uri"))%>)
     does not exist.
    </p>

data/lib/rubyfox/server/data/www/host-manager/{manager.xml → WEB-INF/manager.xml}

@@ -22,5 +22,9 @@
 -->
 <Context docBase="${catalina.home}/webapps/manager"
          privileged="true" antiResourceLocking="false" >
-
+  <CookieProcessor className="org.apache.tomcat.util.http.Rfc6265CookieProcessor"
+                   sameSiteCookies="strict" />
+  <Valve className="org.apache.catalina.valves.RemoteAddrValve"
+         allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1" />
+  <Manager sessionAttributeValueClassNameFilter="java\.lang\.(?:Boolean|Integer|Long|Number|String)|org\.apache\.catalina\.filters\.CsrfPreventionFilter\$LruCache(?:\$1)?|java\.util\.(?:Linked)?HashMap"/>
 </Context>

data/lib/rubyfox/server/data/www/host-manager/WEB-INF/web.xml

@@ -56,11 +56,28 @@
     </init-param>
   </filter>
 
+  <!-- Configured to set X-FRAME-OPTIONS. Disable HSTS in case it interferes -->
+  <!-- with an existing setting. Keep X-Content-Type-Options and             -->
+  <!-- X-XSS-Protection as they are page specific.                           -->
+  <filter>
+    <filter-name>HTTP header security filter</filter-name>
+    <filter-class>org.apache.catalina.filters.HttpHeaderSecurityFilter</filter-class>
+    <init-param>
+      <param-name>hstsEnabled</param-name>
+      <param-value>false</param-value>
+    </init-param>
+  </filter>
+
   <filter-mapping>
     <filter-name>CSRF</filter-name>
     <servlet-name>HTMLHostManager</servlet-name>
   </filter-mapping>
 
+  <filter-mapping>
+    <filter-name>HTTP header security filter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
   <!-- Define the Manager Servlet Mapping -->
   <servlet-mapping>
     <servlet-name>HostManager</servlet-name>