From 5e9253e8f4a324909aa3b18a6d5e110ee83a278f Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Fri, 16 Feb 2018 19:29:08 +0100
Subject: Add host identifier options and use manual configured setting in
 function

---
 default.prf       |  6 ++++++
 include/functions | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/default.prf b/default.prf
index 7db2a16a..cbb4f76a 100644
--- a/default.prf
+++ b/default.prf
@@ -417,6 +417,12 @@ ssl-certificate-paths=/etc/apache2:/etc/dovecot:/etc/httpd:/etc/letsencrypt:/etc
 # This is useful for ephemeral systems which are short-lived.
 #allow-auto-purge=yes
 
+# Sometimes it might be useful to override the host identifiers.
+# Use only hexadecimal values (0-9, a-f), with 40 and 64 characters in length.
+#
+#hostid=40-char-hash
+#hostid2=64-char-hash
+
 # Proxy settings
 # Protocol (http, https, socks5)
 #proxy-protocol=https
diff --git a/include/functions b/include/functions
index 01e62e42..c266ca10 100644
--- a/include/functions
+++ b/include/functions
@@ -804,11 +804,17 @@
     # Name        : GetHostID()
     # Description : Create an unique id for the system
     #
-    # Returns     : Nothing
+    # Returns     : optional value
     # Usage       : GetHostID
     ################################################################################
 
     GetHostID() {
+
+        if [ ! -z "${HOSTID}" -a ! -z "${HOSTID2}" ]; then
+            Debug "Skipping creation of host identifiers, as they are already configured (via profile)"
+            return 1
+        fi
+
         FIND=""
         # Avoid some hashes (empty, only zeros)
         BLACKLISTED_HASHES="6ef1338f520d075957424741d7ed35ab5966ae97 adc83b19e793491b1c6ea0fd8b46cd9f32e592fc"
@@ -1104,6 +1110,8 @@
         # Show an exception if no HostID could be created, to ensure each system (and scan) has one
         if [ "${HOSTID}" = "" ]; then
             ReportException "GetHostID" "No unique host identifier could be created."
+        elif [ ! -z "${HOSTID2}" ]; then
+            return 0
         fi
     }
 
-- 
cgit v1.2.3