Merge branch 'main' of https://github.com/mmguero-dev/Malcolm into v26.08.0_merge_cisagov

Author: mmguero

hedgehog-raspi/sensor_install.sh

@@ -34,7 +34,7 @@ MALCOLM_SRC='/opt/Malcolm'
 WORK_DIR="$(mktemp -d -p "$HOME" -t hedgehog-XXXXXX)"
 
 # Build time dependencies for htpdate
-BUILD_DEPS='build-essential libssl-dev checkinstall'
+BUILD_DEPS='build-essential libssl-dev checkinstall bsdextrautils'
 
 ################################
 ######### Functions ############
@@ -58,15 +58,25 @@ build_htpdate() {
 
     make https
 
-    checkinstall -y -D --nodoc --strip=yes --stripso=yes --install=no --fstrans=no \
-    --pkgname=htpdate --pkgversion=$htpdate_vers --pkgarch="$ARCH" --pkgsource="$htpdate_url" \
-    --pkgrelease="$htpdate_release" --pakdir "$DEBS_DIR"
-
-    # htpdate is installed outside of dpkg with checkinstall
-    make uninstall
+    checkinstall \
+      -y -D \
+      --nodoc \
+      --strip=yes \
+      --stripso=yes \
+      --install=no \
+      --fstrans=yes \
+      --exclude=/usr/bin/install,/bin/install \
+      --pkgname=htpdate \
+      --pkgversion=$htpdate_vers \
+      --pkgarch="$ARCH" \
+      --pkgsource="$htpdate_url" \
+      --pkgrelease="$htpdate_release" \
+      --pakdir "$DEBS_DIR"
 
     cd "${WORK_DIR}"
 
+    dpkg-deb -c "${DEBS_DIR}/htpdate_${htpdate_vers}-${htpdate_release}_${ARCH}.deb"
+
     dpkg -i "${DEBS_DIR}/htpdate_${htpdate_vers}-${htpdate_release}_${ARCH}.deb"
 }
 

scripts/control.py

@@ -2987,7 +2987,7 @@ def authSetup():
                                 labels=['Malcolm Server IP', 'Single-use Code Phrase'],
                                 defaultBehavior=defaultBehavior,
                             )
-                            if (len(values) == 2) and (len(values[0]) >= 3) and (len(values[1]) >= 16):
+                            if (len(values) == 2) and (len(values[0]) >= 3) and (len(values[1]) >= 11):
                                 tx_ip = values[0]
                                 rx_token = values[1]
                                 break

scripts/tx-rx-secure.sh

@@ -246,6 +246,17 @@ function _cleanup {
     fi
 }
 
+###############################################################################
+# normalize croc's terminal output and suppress update notices
+function _filter_croc_output {
+    LC_ALL=C sed -u -E \
+        -e $'s/.*\r//' \
+        -e '/^A newer croc version is available:/d' \
+        -e '\|^Run: curl https://getcroc\.com \| bash$|d' \
+        -e '/^Or open:$/d' \
+        -e '\|^[[:space:]]*https://getcroc\.com/\?code=|d'
+}
+
 ###############################################################################
 
 trap "_cleanup" EXIT
@@ -284,7 +295,9 @@ if [[ -n "${PORTS}" ]] && [[ "${MODE}" == "tx" ]] && (( $# > 0 )); then
     [[ -n "${SEND_RELAY_IP}" ]] && RELAY_ARGS=(--relay "${SEND_RELAY_IP}:${FIRST_PORT}")
 
     # run croc
-    "${CROC_BIN}" --yes --ignore-stdin --overwrite ${DEBUG_FLAG} "${CURVE_ARGS[@]}" "${RELAY_ARGS[@]}" send "${HASH_ARGS[@]}" "$@"
+    "${CROC_BIN}" --yes --ignore-stdin --overwrite --disable-clipboard ${DEBUG_FLAG} \
+        "${CURVE_ARGS[@]}" "${RELAY_ARGS[@]}" send \
+        "${HASH_ARGS[@]}" "$@" 2>&1 | _filter_croc_output
 
 elif [[ -n "${PORTS}" ]] && ( [[ "${MODE}" == "rx" ]] && [[ -n "${TOKEN}" ]] && ( [[ -z "${LOCAL_RELAY}" ]] || [[ -n "${SERVER}" ]] ) ); then
     # we have ports defined, have requested receive mode, have been given a token, and either have a relay IP or are not using a local relay
@@ -293,7 +306,9 @@ elif [[ -n "${PORTS}" ]] && ( [[ "${MODE}" == "rx" ]] && [[ -n "${TOKEN}" ]] &&
 
     # run croc
     export CROC_SECRET="${TOKEN}"
-    "${CROC_BIN}" --yes --ignore-stdin --overwrite ${DEBUG_FLAG} "${CURVE_ARGS[@]}" "${RELAY_ARGS[@]}" "${OUTPUT_ARGS[@]}"
+    "${CROC_BIN}" --yes --ignore-stdin --overwrite --disable-clipboard ${DEBUG_FLAG} \
+        "${CURVE_ARGS[@]}" "${RELAY_ARGS[@]}" \
+        "${OUTPUT_ARGS[@]}" 2>&1 | _filter_croc_output
 
 else
     _help >&2