From a85902c7368a00e2010dd8540f9e65d96dab67e5 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Mon, 27 Apr 2015 10:53:47 -0700 Subject: [PATCH] Add detection of chef-client and chef-server as an automation tool --- include/binaries | 2 ++ include/consts | 3 ++- include/tests_tooling | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/include/binaries b/include/binaries index 844027d3..2f217e5e 100644 --- a/include/binaries +++ b/include/binaries @@ -94,6 +94,7 @@ chkconfig) CHKCONFIGFOUND=1; CHKCONFIGBINARY=${BINARY}; logtext " Found known binary: chkconfig (administration tool) - ${BINARY}" ;; clamscan) CLAMSCANFOUND=1; CLAMSCANBINARY=${BINARY}; logtext " Found known binary: clamscan (AV scanner) - ${BINARY}" ;; cfagent) CFAGENTFOUND=1; CFAGENTBINARY="${BINARY}"; FILE_INT_TOOL_FOUND=1; logtext " Found known binary: cfengine agent (configuration tool) - ${BINARY}" ;; + chef-client) CHEFCLIENTFOUND=1; CHEFCLIENTBINARY="${BINARY}" logtext " Found known binary: chef-client (chef client daemon) - ${BINARY}" ;; chkrootkit) CHKROOTKITFOUND=1; CHKROOTKITBINARY="${BINARY}"; MALWARE_SCANNER_INSTALLED=1; logtext " Found known binary: chkrootkit (malware scanner) - ${BINARY}" ;; comm) COMMBINARY="${BINARY}"; logtext " Found known binary: comm (file compare) - ${BINARY}" ;; csum) CSUMFOUND=1; CSUMBINARY="${BINARY}"; logtext " Found known binary: csum (hashing tool on AIX) - ${BINARY}" ;; @@ -103,6 +104,7 @@ domainname) DOMAINNAMEFOUND=1; DOMAINNAMEBINARY="${BINARY}"; logtext " Found known binary: domainname (NIS domain) - ${BINARY}" ;; dpkg) DPKGBINARY="${BINARY}"; logtext " Found known binary: dpkg (package management) - ${BINARY}" ;; egrep) EGREPFOUND=1; EGREPBINARY=${BINARY}; logtext " Found known binary: egrep (text search) - ${BINARY}" ;; + erchef) CHEFSERVERFOUND=1; CHEFSERVERBINARY="${BINARY}" logtext " Found known binary: erchef (chef server daemon) - ${BINARY}" ;; exim) EXIMFOUND=1; EXIMBINARY="${BINARY}"; EXIMVERSION=`${BINARY} -bV | grep 'Exim version' | awk '{ print $3 }' | xargs`; logtext "Found ${BINARY} (version ${EXIMVERSION})" ;; find) FINDFOUND=1; FINDBINARY="${BINARY}"; logtext " Found known binary: find (search tool) - ${BINARY}" ;; g++) GPLUSPLUSFOUND=1; GPLUSPLUSBINARY="${BINARY}"; COMPILER_INSTALLED=1; logtext " Found known binary: g++ (compiler) - ${BINARY}" ;; diff --git a/include/consts b/include/consts index 077628f9..c44cdc95 100644 --- a/include/consts +++ b/include/consts @@ -26,7 +26,8 @@ BINPATHS="/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin \ /usr/local/libexec /usr/libexec /usr/sfw/bin /usr/sfw/sbin \ /usr/sfw/libexec /opt/sfw/bin /opt/sfw/sbin /opt/sfw/libexec \ /usr/xpg4/bin /usr/css/bin /usr/ucb /usr/X11R6/bin /usr/X11R7/bin \ - /usr/pkg/bin /usr/pkg/sbin" + /usr/pkg/bin /usr/pkg/sbin /opt/chef/bin /opt/chef-server/sv \ + /opt/chefdk/bin" # Do not use specific language, fall back to default unset LANG diff --git a/include/tests_tooling b/include/tests_tooling index 6f8e6150..bbd31a52 100644 --- a/include/tests_tooling +++ b/include/tests_tooling @@ -45,6 +45,20 @@ Display --indent 4 --text "Found: Cfengine (cfagent)" --result FOUND --color GREEN fi + # Chef-Client + if [ ! "${CHEFCLIENTBINARY}" = "" ]; then + logtext "Result: Chef client (chef-client) is installed (${CHEFCLIENTBINARY})" + AUTOMATION_TOOL_FOUND=1 + Display --indent 4 --text "Found: Chef client (chef-client)" --result FOUND --color GREEN + fi + + # Chef-Server + if [ ! "${CHEFSERVERBINARY}" = "" ]; then + logtext "Result: Chef Server (erchef) is installed (${CHEFSERVERBINARY})" + AUTOMATION_TOOL_FOUND=1 + Display --indent 4 --text "Found: Chef Server (erchef)" --result FOUND --color GREEN + fi + # Puppet if [ ! "${PUPPETBINARY}" = "" ]; then logtext "Result: Puppet is installed (${PUPPETBINARY})"