From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 7 Dec 2019 08:32:01 +0000 (+0100)
Subject: baculum: Tweak fix allowed password length in API install wizard and Web config wizard
X-Git-Tag: Release-9.6.0~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41486f229bac14ecc6f5806c0532e9915afc767f;p=thirdparty%2Fbacula.git

baculum: Tweak fix allowed password length in API install wizard and Web config wizard
---

diff --git a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page
index 20b0aca8a..5c5474528 100644
--- a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page
+++ b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page
@@ -736,7 +736,7 @@
 								ID="APIPassword"
 								CssClass="textbox"
 								TextMode="Password"
-								MaxLength="30"
+								MaxLength="60"
 								PersistPassword="true"
 							/>
 							<com:TRequiredFieldValidator
@@ -752,7 +752,7 @@
 								Display="Dynamic"
 								ControlCssClass="invalidate"
 								ControlToValidate="APIPassword"
-								RegularExpression="[\S\s]{5,30}"
+								RegularExpression="[\S\s]{5,60}"
 								ValidationGroup="Basic"
 								Text="<%[ Password must be longer than 4 chars. ]%>"
 							/>
@@ -765,7 +765,7 @@
 								ID="RetypeAPIPassword"
 								CssClass="textbox"
 								TextMode="Password"
-								MaxLength="30"
+								MaxLength="60"
 								PersistPassword="true"
 							/>
 							<com:TRequiredFieldValidator
@@ -783,7 +783,7 @@
 								Display="Dynamic"
 								ControlCssClass="invalidate"
 								ControlToValidate="RetypeAPIPassword"
-								RegularExpression="[\S\s]{5,30}"
+								RegularExpression="[\S\s]{5,60}"
 								ValidationGroup="Basic"
 								Text="<%[ Password must be longer than 4 chars. ]%>"
 							/>
diff --git a/gui/baculum/protected/Web/Pages/WebConfigWizard.page b/gui/baculum/protected/Web/Pages/WebConfigWizard.page
index 60e4f19fb..71b3cdb49 100644
--- a/gui/baculum/protected/Web/Pages/WebConfigWizard.page
+++ b/gui/baculum/protected/Web/Pages/WebConfigWizard.page
@@ -152,17 +152,17 @@
 			<div class="w3-container w3-margin-bottom">
 				<div class="w3-third"><com:TLabel ForControl="WebPassword" Text="<%[ Administration password: ]%>" /></div>
 				<div class="w3-third">
-					<com:TTextBox ID="WebPassword" CssClass="w3-input w3-border" TextMode="Password" MaxLength="30" PersistPassword="true" />
+					<com:TTextBox ID="WebPassword" CssClass="w3-input w3-border" TextMode="Password" MaxLength="60" PersistPassword="true" />
 					<com:TRequiredFieldValidator CssClass="validator-block" Display="Dynamic" ControlCssClass="invalidate" ControlToValidate="WebPassword" Text="<%[ Please enter password. ]%>"/>
-					<com:TRegularExpressionValidator CssClass="validator-block" Display="Dynamic" ControlCssClass="invalidate" ControlToValidate="WebPassword" RegularExpression="[\S\s]{5,30}" Text="<%[ Password must be longer than 4 chars. ]%>" />
+					<com:TRegularExpressionValidator CssClass="validator-block" Display="Dynamic" ControlCssClass="invalidate" ControlToValidate="WebPassword" RegularExpression="[\S\s]{5,60}" Text="<%[ Password must be longer than 4 chars. ]%>" />
 				</div>
 			</div>
 			<div class="w3-container w3-margin-bottom">
 				<div class="w3-third"><com:TLabel ForControl="RetypeWebPassword" Text="<%[ Retype administration password: ]%>" /></div>
 				<div class="w3-third">
-					<com:TTextBox ID="RetypeWebPassword" CssClass="w3-input w3-border" TextMode="Password" MaxLength="30" PersistPassword="true" />
+					<com:TTextBox ID="RetypeWebPassword" CssClass="w3-input w3-border" TextMode="Password" MaxLength="60" PersistPassword="true" />
 					<com:TRequiredFieldValidator ID="RetypeWebPasswordRequireValidator" CssClass="validator-block" Display="Dynamic" ControlCssClass="invalidate" ControlToValidate="RetypeWebPassword" Text="<%[ Please enter retype password. ]%>"/>
-					<com:TRegularExpressionValidator ID="RetypeWebPasswordRegexpValidator" CssClass="validator-block" Display="Dynamic" ControlCssClass="invalidate" ControlToValidate="RetypeWebPassword" RegularExpression="[\S\s]{5,30}" Text="<%[ Password must be longer than 4 chars. ]%>" />
+					<com:TRegularExpressionValidator ID="RetypeWebPasswordRegexpValidator" CssClass="validator-block" Display="Dynamic" ControlCssClass="invalidate" ControlToValidate="RetypeWebPassword" RegularExpression="[\S\s]{5,60}" Text="<%[ Password must be longer than 4 chars. ]%>" />
 					<com:TCustomValidator ID="RetypeWebPasswordCustomValidator" CssClass="validator-block" Display="Dynamic" ControlCssClass="invalidate" ControlToValidate="RetypeWebPassword" OnServerValidate="validateAdministratorPassword" Text="<%[ Passwords must be the same. ]%>" />
 				</div>
 			</div>