feat: Validate legacy settings before use (#1894)

This commit is contained in:
Kroese
2026-07-19 03:26:31 +02:00
committed by GitHub
parent bd147e236b
commit ee94f2c0ae
+3 -3
View File
@@ -1727,8 +1727,7 @@ prepareInstall() {
local username="${USERNAME:-Docker}" local username="${USERNAME:-Docker}"
local password="${PASSWORD:-admin}" local password="${PASSWORD:-admin}"
local organization="$APP for $ENGINE" local sifUsername sifPassword sifOrganization
local sifUsername sifPassword
local regUsername regPassword local regUsername regPassword
validateLegacyUsername "$username" "$desc" || return 1 validateLegacyUsername "$username" "$desc" || return 1
@@ -1736,6 +1735,7 @@ prepareInstall() {
sifUsername=$(escapeSIFValue "$username") || return 1 sifUsername=$(escapeSIFValue "$username") || return 1
sifPassword=$(escapeSIFValue "$password") || return 1 sifPassword=$(escapeSIFValue "$password") || return 1
sifOrganization=$(escapeSIFValue "$APP for $ENGINE") || return 1
regUsername=$(escapeRegistryValue "$username") || return 1 regUsername=$(escapeRegistryValue "$username") || return 1
regPassword=$(escapeRegistryValue "$password") || return 1 regPassword=$(escapeRegistryValue "$password") || return 1
@@ -1775,7 +1775,7 @@ prepareInstall() {
echo "[UserData]" echo "[UserData]"
echo " FullName=\"$sifUsername\"" echo " FullName=\"$sifUsername\""
echo " ComputerName=\"*\"" echo " ComputerName=\"*\""
echo " OrgName=\"$organization\"" echo " OrgName=\"$sifOrganization\""
echo " $product" echo " $product"
echo "" echo ""
echo "[Identification]" echo "[Identification]"