Skip to content

[OpenWrt] Fix hostname detection #1602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
macie wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[OpenWrt] Fix hostname detection #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f907c32
refactor: Specify linux HOSTNAME detection
macie Feb 8, 2025
b8f5b41
fix: Detect HOSTNAME on OpenWrt
macie Feb 8, 2025
6106147
fix: False positive NETW-2400 on OpenWrt
macie Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/tests_networking
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
LogText "Result: hostnamed is defined and not longer than 63 characters"
fi
# Test valid characters (normally a dot should not be in the name, but we can't be 100% sure we have short name)
FIND=$(echo "${HOSTNAME}" | ${TRBINARY} -d '[:alnum:]\.\-')
# (we are NOT using [:alnum:] to support BusyBox's tr on devices with limited resources)
FIND=$(echo "${HOSTNAME}" | ${TRBINARY} -d '[a-zA-Z0-9]\.\-')
if [ -z "${FIND}" ]; then
LogText "Result: good, no unexpected characters discovered in hostname"
if IsVerbose; then Display --indent 2 --text "- Hostname (allowed characters)" --result "${STATUS_OK}" --color GREEN; fi
Expand Down
30 changes: 20 additions & 10 deletions lynis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,22 +514,32 @@ ${NORMAL}
. ${INCLUDEDIR}/osdetection
Display --indent 2 --text "- Detecting OS... " --result "${STATUS_DONE}" --color GREEN

# Check hostname and get timestamp
# Detect hostname and domain
FQDN=$(hostname 2> /dev/null)
case ${OS} in
HP-UX)
HOSTNAME=$(hostname) ;;
HOSTNAME=$(hostname) ;;
Linux)
if [ "${LINUX_VERSION}" = "OpenWrt" ]; then
HOSTNAME=$(uname -n)
FQDN="${HOSTNAME:+$HOSTNAME.}$(uci -q get dhcp.@dnsmasq[0].domain)"
else
HOSTNAME=$(hostname -s 2> /dev/null)
if [ -z "${HOSTNAME}" ]; then
HOSTNAME="${FQDN:-no-hostname}"
fi
if [ "${HOSTNAME}" = "${FQDN}" ]; then
FQDN=$(hostname -f 2> /dev/null)
fi
fi
;;
Solaris)
HOSTNAME=$(uname -n) ;;
HOSTNAME=$(uname -n) ;;
*)
HOSTNAME=$(hostname -s 2> /dev/null) ;;
HOSTNAME=$(hostname -s 2> /dev/null) ;;
esac
if [ -z "${HOSTNAME}" ]; then
HOSTNAME=$(hostname 2> /dev/null)
if [ -z "${HOSTNAME}" ]; then HOSTNAME="no-hostname"; fi
fi
FQDN=$(hostname 2> /dev/null)
if [ "${OS}" = "Linux" -a "${HOSTNAME}" = "${FQDN}" ]; then
FQDN=$(hostname -f 2> /dev/null)
HOSTNAME="${FQDN:-no-hostname}"
fi
#
#################################################################################
Expand Down