V9.14.022.2026.06.10
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
@@ -13,6 +13,8 @@
|
||||
set -Ceuo pipefail
|
||||
umask 0077
|
||||
|
||||
declare -gx VAR_RDNS_DOMAIN="" # Forward-confirmed reverse DNS domain.
|
||||
declare -gx VAR_RDNS_IPV4="" # IPv4 address used for RDNS verification.
|
||||
declare -grx VAR_SEMAPHORE="/root/cdi.ciss" # Semaphore to appear.
|
||||
declare -girx VAR_TIMEOUT=3600 # Semaphore timer in seconds.
|
||||
|
||||
@@ -90,6 +92,238 @@ net_wait() {
|
||||
# shellcheck disable=SC2034
|
||||
readonly -f net_wait
|
||||
|
||||
#######################################
|
||||
# Validate an IPv4 address.
|
||||
# Globals:
|
||||
# None
|
||||
# Arguments:
|
||||
# $1: IPv4 address
|
||||
# Returns:
|
||||
# 0: valid IPv4 address
|
||||
# 1: invalid IPv4 address
|
||||
#######################################
|
||||
is_ipv4() {
|
||||
### Declare Arrays, HashMaps, and Variables.
|
||||
declare -r var_ip="${1:-}"
|
||||
declare -a ary_octets=()
|
||||
declare var_octet=""
|
||||
|
||||
[[ "${var_ip}" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]] || return 1
|
||||
|
||||
IFS='.' read -r -a ary_octets <<< "${var_ip}"
|
||||
|
||||
for var_octet in "${ary_octets[@]}"; do
|
||||
|
||||
if ! ((10#${var_octet} <= 255)); then
|
||||
|
||||
return 1
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
return 0
|
||||
}
|
||||
### Prevents accidental 'unset -f'.
|
||||
# shellcheck disable=SC2034
|
||||
readonly -f is_ipv4
|
||||
|
||||
#######################################
|
||||
# Validate a DNS domain name returned by RDNS.
|
||||
# Globals:
|
||||
# None
|
||||
# Arguments:
|
||||
# $1: domain name
|
||||
# Returns:
|
||||
# 0: valid domain name
|
||||
# 1: invalid domain name
|
||||
#######################################
|
||||
is_dns_name() {
|
||||
### Declare Arrays, HashMaps, and Variables.
|
||||
declare -r var_name="${1:-}"
|
||||
|
||||
[[ "${#var_name}" -le 253 ]] || return 1
|
||||
[[ "${var_name}" =~ ^[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)+$ ]] \
|
||||
|| return 1
|
||||
|
||||
return 0
|
||||
}
|
||||
### Prevents accidental 'unset -f'.
|
||||
# shellcheck disable=SC2034
|
||||
readonly -f is_dns_name
|
||||
|
||||
#######################################
|
||||
# Retrieve and forward-confirm reverse DNS for the active IPv4 route.
|
||||
# Globals:
|
||||
# VAR_RDNS_DOMAIN
|
||||
# VAR_RDNS_IPV4
|
||||
# Arguments:
|
||||
# $1: module log file
|
||||
# Returns:
|
||||
# 0: on confirmed RDNS
|
||||
# 1: on missing or unconfirmed RDNS
|
||||
#######################################
|
||||
# retrieve_rdns() intentionally probes optional resolver tools and validation helpers inside conditionals.
|
||||
# shellcheck disable=SC2310,SC2312
|
||||
retrieve_rdns() {
|
||||
### Declare Arrays, HashMaps, and Variables.
|
||||
declare -r var_log="${1:-}"
|
||||
declare -a ary_a=()
|
||||
declare -a ary_rdns=()
|
||||
declare -a ary_targets=()
|
||||
declare var_a="" var_ipv4="" var_rdns="" var_target=""
|
||||
|
||||
VAR_RDNS_DOMAIN=""
|
||||
VAR_RDNS_IPV4=""
|
||||
|
||||
mapfile -t ary_targets < <(
|
||||
getent ahostsv4 git.coresecret.dev 2>/dev/null \
|
||||
| awk '/^([0-9]{1,3}\.){3}[0-9]{1,3}[[:space:]]/ && !seen[$1]++ { print $1 }'
|
||||
)
|
||||
ary_targets+=( "1.1.1.1" "9.9.9.9" "8.8.8.8" )
|
||||
|
||||
if command -v ip >/dev/null 2>&1; then
|
||||
|
||||
for var_target in "${ary_targets[@]}"; do
|
||||
|
||||
if var_ipv4="$(
|
||||
ip -o -4 route get "${var_target}" 2>/dev/null \
|
||||
| awk '{ for (i = 1; i <= NF; i++) { if ($i == "src") { print $(i + 1); exit } } }'
|
||||
)" && is_ipv4 "${var_ipv4}"; then
|
||||
|
||||
break
|
||||
|
||||
fi
|
||||
|
||||
var_ipv4=""
|
||||
|
||||
done
|
||||
|
||||
if [[ -z "${var_ipv4}" ]]; then
|
||||
|
||||
mapfile -t ary_targets < <(
|
||||
ip -o -4 addr show scope global up 2>/dev/null \
|
||||
| awk '{ split($4, addr, "/"); if (!seen[addr[1]]++) { print addr[1] } }'
|
||||
)
|
||||
|
||||
for var_target in "${ary_targets[@]}"; do
|
||||
|
||||
if is_ipv4 "${var_target}"; then
|
||||
|
||||
var_ipv4="${var_target}"
|
||||
break
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
if [[ -z "${var_ipv4}" ]]; then
|
||||
|
||||
logger -t cdi-watcher "retrieve_rdns(): no active IPv4 address found; continuing without RDNS."
|
||||
printf "Command: [retrieve_rdns] no active IPv4 address found; continuing without RDNS.\n" >> "${var_log}"
|
||||
return 1
|
||||
|
||||
fi
|
||||
|
||||
if command -v dig >/dev/null 2>&1; then
|
||||
|
||||
mapfile -t ary_rdns < <(
|
||||
dig +time=3 +tries=1 +short -x "${var_ipv4}" 2>/dev/null \
|
||||
| sed 's/[.]$//' \
|
||||
| awk 'NF && !seen[$0]++ { print $0 }'
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
if ((${#ary_rdns[@]} == 0)) && command -v host >/dev/null 2>&1; then
|
||||
|
||||
mapfile -t ary_rdns < <(
|
||||
host "${var_ipv4}" 2>/dev/null \
|
||||
| awk '/domain name pointer/ { sub(/[.]$/, "", $NF); if (!seen[$NF]++) { print $NF } }'
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
if ((${#ary_rdns[@]} == 0)); then
|
||||
|
||||
mapfile -t ary_rdns < <(
|
||||
getent hosts "${var_ipv4}" 2>/dev/null \
|
||||
| awk '{ for (i = 2; i <= NF; i++) { sub(/[.]$/, "", $i); if (!seen[$i]++) { print $i } } }'
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
for var_rdns in "${ary_rdns[@]}"; do
|
||||
|
||||
var_rdns="${var_rdns%.}"
|
||||
var_rdns="${var_rdns,,}"
|
||||
|
||||
if ! is_dns_name "${var_rdns}"; then
|
||||
|
||||
continue
|
||||
|
||||
fi
|
||||
|
||||
ary_a=()
|
||||
|
||||
if command -v dig >/dev/null 2>&1; then
|
||||
|
||||
mapfile -t ary_a < <(
|
||||
dig +time=3 +tries=1 +short A "${var_rdns}" 2>/dev/null \
|
||||
| awk '/^([0-9]{1,3}\.){3}[0-9]{1,3}$/ && !seen[$0]++ { print $0 }'
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
if ((${#ary_a[@]} == 0)) && command -v host >/dev/null 2>&1; then
|
||||
|
||||
mapfile -t ary_a < <(
|
||||
host -t A "${var_rdns}" 2>/dev/null \
|
||||
| awk '/ has address / && !seen[$NF]++ { print $NF }'
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
if ((${#ary_a[@]} == 0)); then
|
||||
|
||||
mapfile -t ary_a < <(
|
||||
getent ahostsv4 "${var_rdns}" 2>/dev/null \
|
||||
| awk '!seen[$1]++ { print $1 }'
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
for var_a in "${ary_a[@]}"; do
|
||||
|
||||
if is_ipv4 "${var_a}" && [[ "${var_a}" == "${var_ipv4}" ]]; then
|
||||
|
||||
VAR_RDNS_IPV4="${var_ipv4}"
|
||||
VAR_RDNS_DOMAIN="${var_rdns}"
|
||||
logger -t cdi-watcher "retrieve_rdns(): confirmed IPv4 ${VAR_RDNS_IPV4} RDNS ${VAR_RDNS_DOMAIN}."
|
||||
printf "Command: [retrieve_rdns] confirmed IPv4 [%s] RDNS [%s].\n" \
|
||||
"${VAR_RDNS_IPV4}" "${VAR_RDNS_DOMAIN}" >> "${var_log}"
|
||||
return 0
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
done
|
||||
|
||||
logger -t cdi-watcher "retrieve_rdns(): no forward-confirmed RDNS for IPv4 ${var_ipv4}; continuing without RDNS."
|
||||
printf "Command: [retrieve_rdns] no forward-confirmed RDNS for IPv4 [%s]; continuing without RDNS.\n" \
|
||||
"${var_ipv4}" >> "${var_log}"
|
||||
|
||||
return 1
|
||||
}
|
||||
### Prevents accidental 'unset -f'.
|
||||
# shellcheck disable=SC2034
|
||||
readonly -f retrieve_rdns
|
||||
|
||||
#######################################
|
||||
# Wrapper for loading CISS hardened Kernel Parameters.
|
||||
# Globals:
|
||||
@@ -130,7 +364,7 @@ main() {
|
||||
touch "${var_log}"
|
||||
|
||||
|
||||
printf "CISS.debian.installer Master V9.14.020.2026.06.08 is up! \n" >> "${var_log}"
|
||||
printf "CISS.debian.live.builder V9.14.022.2026.06.10 calling CISS.debian.installer ... \n" >> "${var_log}"
|
||||
|
||||
### Sleep a moment to settle boot artifacts.
|
||||
sleep 8
|
||||
@@ -153,6 +387,12 @@ main() {
|
||||
fi
|
||||
printf "Command: [net_wait] executed.\n" >> "${var_log}"
|
||||
|
||||
### Retrieve forward-confirmed reverse DNS.
|
||||
printf "Command: [retrieve_rdns] to be executed ... \n" >> "${var_log}"
|
||||
# shellcheck disable=SC2310
|
||||
retrieve_rdns "${var_log}" || true
|
||||
printf "Command: [retrieve_rdns] executed.\n" >> "${var_log}"
|
||||
|
||||
### apt update.
|
||||
if ! apt-get update >> "${var_log}"; then
|
||||
|
||||
@@ -209,7 +449,7 @@ main() {
|
||||
|
||||
### Timeout reached without acceptable semaphore.
|
||||
logger -t cdi-watcher "No valid semaphore ${VAR_SEMAPHORE} (mode 0600) within ${VAR_TIMEOUT}s; exiting idle."
|
||||
printf "CISS.debian.installer Master V9.14.020.2026.06.08: No valid semaphore [%s] within [%s]s.\n" "${VAR_SEMAPHORE}" "${VAR_TIMEOUT}" >> "${var_log}"
|
||||
printf "CISS.debian.live.builder V9.14.022.2026.06.10: No valid semaphore [%s] within [%s]s.\n" "${VAR_SEMAPHORE}" "${VAR_TIMEOUT}" >> "${var_log}"
|
||||
|
||||
exit 0
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user