Update susSettings.php

Force trailing slash in SUS URL validation
jamf · Jul 31, 2019 · 0b5da63 · 0b5da63
1 parent 35bf7c0
commit 0b5da63
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/webadmin/var/www/webadmin/susSettings.php b/webadmin/var/www/webadmin/susSettings.php
@@ -154,15 +154,15 @@ function hideSuccess(element) {
 
 				function validBaseUrl(element, labelId = false) {
 					hideSuccess(element);
-					if (/^http(s)?:\/\/(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[0-9][\/]|[1-9][0-9]|[1-9][0-9][\/]|1[0-9]{2}|1[0-9]{2}[\/]|2[0-4][0-9]|2[0-4][0-9][\/]|25[0-5]|25[0-5][\/])$|^http(s)?:\/\/(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][\/]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9][\/])$/.test(element.value)) {
+					if (/^http(s)?:\/\/(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[0-9]|[1-9][0-9]|[1-9][0-9]|1[0-9]{2}|1[0-9]{2}|2[0-4][0-9]|2[0-4][0-9]|25[0-5]|25[0-5])\/$|^http(s)?:\/\/(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])\/$/.test(element.value)) {
 						hideError(element, labelId);
 					} else {
 						showError(element, labelId);
 					}
 				}
 
 				function updateBaseUrl(element, offset = false) {
-					if (/^http(s)?:\/\/(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[0-9][\/]|[1-9][0-9]|[1-9][0-9][\/]|1[0-9]{2}|1[0-9]{2}[\/]|2[0-4][0-9]|2[0-4][0-9][\/]|25[0-5]|25[0-5][\/])$|^http(s)?:\/\/(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][\/]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9][\/])$/.test(element.value)) {
+					if (/^http(s)?:\/\/(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[0-9]|[1-9][0-9]|[1-9][0-9]|1[0-9]{2}|1[0-9]{2}|2[0-4][0-9]|2[0-4][0-9]|25[0-5]|25[0-5])\/$|^http(s)?:\/\/(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])\/$/.test(element.value)) {
 						ajaxPost('susCtl.php', 'baseurl='+element.value);
 						showSuccess(element);
 					}
@@ -281,7 +281,7 @@ function toggleDashboard() {
 			<hr>
 
 			<div style="padding: 9px 20px 1px;">
-				<h5 id="baseurl_label"><strong>Base URL</strong> <small>Base URL for the software update server (e.g. "http://sus.mycompany.corp").</small></h5>
+				<h5 id="baseurl_label"><strong>Base URL</strong> <small>Base URL for the software update server (e.g. "http://sus.mycompany.corp/").</small></h5>
 				<div class="form-group has-feedback">
 					<input type="text" name="baseurl" id="baseurl" class="form-control input-sm long-text-input" placeholder="[Required]" value="<?php echo $susbaseurl; ?>" onFocus="validBaseUrl(this, 'baseurl_label');" onKeyUp="validBaseUrl(this, 'baseurl_label');" onChange="updateBaseUrl(this);"/>
 				</div>