refact: dialogs

Author: simonwalz

system/cuos/api.sh

@@ -101,15 +101,15 @@ EOF
   "patch")
     report_info "cuos:patch" "Patching the system"
     CONFIG="$(echo "${INPUT}" | jq -c '.config // empty')"
-    if ! echo "${CONFIG}" | check_config; then
-      report_err "cuos:update:err_invalid_config" "Update: Invalid configuration provided."
-      echo "Invalid configuration provided."
-      exit 0
-    fi
-    # save current config for rollback:
-    cat "${CONFIG_PATH}" >"${NEXT_CONFIG_PATH}"
-
     if [[ -n "${CONFIG}" ]]; then
+      if ! echo "${CONFIG}" | check_config; then
+        report_err "cuos:update:err_invalid_config" "Update: Invalid configuration provided."
+        echo "Invalid configuration provided."
+        exit 0
+      fi
+      # save current config for rollback:
+      cat "${CONFIG_PATH}" >"${NEXT_CONFIG_PATH}"
+
       jq_replace \
         --argjson config "${CONFIG}" \
         '. * $config' \

system/cuos/dialog-edit-network.sh

@@ -41,6 +41,14 @@ is_valid_name_or_ip() {
     is_valid_hostname "$@" || is_valid_ip "$@"
 }
 
+is_valid_names_or_ips() {
+	[[ -z "$1" ]] && return 1
+	for ip in $1; do
+		is_valid_name_or_ip "${ip}" || return 1
+	done
+	return 0
+}
+
 edit() {
 	local field="$1"
 	local displayname="$2"
@@ -117,7 +125,7 @@ if mode_network; then
 			edit '.network['"$i"']["network-mask"]' "Network mask" is_valid_ip || exit 1
 			edit '.network['"$i"']["gateway"]' "Gateway" is_valid_ip || exit 1
 			edit '.network['"$i"']["dns-server"]' "DNS server(s)" is_valid_ips || exit 1
-			edit '.network['"$i"']["ntp"]' "NTP server(s)" is_valid_name_or_ip || exit 1
+			edit '.network['"$i"']["ntp"]' "NTP server(s)" is_valid_names_or_ips || exit 1
 		fi
 	done
 

system/cuos/dialog-maintenance.sh

@@ -38,6 +38,9 @@ maintenance_menu() {
   done
 }
 
+installation_precheck() {
+}
+
 install_menu() {
   local extra
   extra=()
@@ -76,6 +79,21 @@ install_menu() {
 }
 
 
+hash_admin_password() {
+  local password="$1"
+  local saltlen=8
+  local salt
+  salt="$(head -c "$saltlen" /dev/urandom)"
+
+  local pwhash
+  pwhash="$(printf "%s" "$password" | cat - <(printf "%s" "$salt") | openssl dgst -sha1 -binary)"
+
+  local ssha
+  ssha="$(printf "%s%s" "$pwhash" "$salt" | base64)"
+
+  echo "{SSHA}$ssha"
+}
+
 change_admin_password() {
   local p1 p2
   while true; do
@@ -92,8 +110,9 @@ change_admin_password() {
     (
       set +x
       jq_replace \
-        --arg password "$p1" \
-        '.system_admin_password = $password'
+        --arg password "$(hash_admin_password "$p1")" \
+        '.system_admin_password = $password' \
+        "${CONFIG_PATH}"
     )
     msg "Administrator password set." "Password"
     return 0
@@ -106,8 +125,9 @@ system_actions_menu() {
     choice="$(fmenu "System Actions" "Select an action:" 17 72 10 \
       "reboot" "Reboot System" \
       "shutdown" "Shutdown System" \
-      "update" "Apply System Update" \
-      "rollback" "Rollback Last Update" \
+      - " " \
+      "update" "Trigger System Update" \
+      "rollback" "Rollback Last Update (OS only)" \
       "expand" "Expand Filesystem" \
       "factory" "Factory Reset" \
       - " " \
@@ -129,7 +149,7 @@ system_actions_menu_installation() {
     local choice
     choice="$(fmenu "System Actions" "Select an action:" 17 72 10 \
       "shutdown" "Shutdown System" \
-      "update" "Apply System Update" \
+      "update" "Trigger System Update" \
       "expand" "Expand Filesystem" \
       - " " \
       "back" "\Z5Back\Z0")" || return 1
@@ -154,14 +174,14 @@ system_shutdown() {
 }
 
 system_update() {
-  if ! yesno "Apply the latest system update?\n\nThis may take several minutes and the system may reboot automatically." "System Update" 11 70; then
+  if ! yesno "Trigger system update?\n\nThis may take several minutes to complete and the system may reboot automatically." "System Update" 11 70; then
     return
   fi
   api_stream "Applying System Update" cuos trigger-update
 }
 
 system_rollback() {
-  if ! yesno "Rollback to the previous system version?\n\nThe system will boot into the previous partition." "Rollback" 11 72; then
+  if ! yesno "Rollback last update of the operating system?\n\nThe system will boot into the previous slot. User data will not be affected" "Rollback" 11 72; then
     return
   fi
   api_stream "Preparing Rollback" cuos rollback
@@ -282,6 +302,7 @@ change_vt
 
 if [[ "${1:-}" == "--install" ]]; then
   shift
+  installation_precheck
   install_menu "$@"
   sleep 1
 else