fix: api log-follow, console password check

Author: simonwalz

system/cuos/api.sh

@@ -279,12 +279,12 @@ api_command_log_follow() {
   local input
   input="$(cat)"
   local since
-  since="$(echo "${input}" | jq -r '.message // ""')"
+  since="$(echo "${input}" | jq -r '.since // ""')"
   local journalctl_args=(-t cuos -n 100 -o json -f)
   if [ -n "$since" ]; then
-    since_args+=(--since "$since")
+    journalctl_args+=(--since "$since")
   fi
-  journalctl "${journalctl_args[@]}" | jq -c '{
+  journalctl "${journalctl_args[@]}" | jq --unbuffered -c '{
     date: (.["__REALTIME_TIMESTAMP"] | tonumber / 1000000 | strftime("%Y-%m-%dT%H:%M:%S")),
     level: ({"0":"EMERGENCY","1":"ALERT","2":"CRITICAL","3":"ERROR","4":"WARNING","5":"NOTICE","6":"INFO","7":"DEBUG"}[.PRIORITY] // "INFO"),
     message: .MESSAGE

system/cuos/dialog-maintenance.sh

@@ -373,10 +373,10 @@ check_password() {
 
   if [[ "${hash}" =~ ^\$[0-9a-z]+\$ ]] || [[ ${#hash} -gt 50 ]]; then
     local salt
-    salt="$(printf '%s' "$hash" | sed -E 's/^(\$6\$[^$]+\$).*$/\1/')"
+    salt="$(printf '%s' "$hash" | sed -E 's/^\$6\$([^$]+)\$.*$/\1/')"
 
     # Recreate and compare
-    test_hash="$(printf '%s' "$pass" | openssl passwd -6 -salt "${salt#\$6\$}" -stdin)"
+    test_hash="$(printf '%s' "$pass" | openssl passwd -6 -salt "${salt}" -stdin)"
 
     if [ "$test_hash" = "$hash" ]; then
       return 0