Merge ~leftyfb/plainbox-provider-certification-server:1661099-check-section-headers into plainbox-provider-certification-server:master

[Mike Rushton]

Added XDG config check and cleaned up some code

[Jeff Lane  (bladernr)]

glad you got the push to finally work :D

review: Approve

diff --git a/tools/canonical-certification-precheck b/tools/canonical-certification-precheck
index a20f873..80e7a97 100755
--- a/tools/canonical-certification-precheck
+++ b/tools/canonical-certification-precheck
@@ -21,8 +21,7 @@ info(){
 
 
 
-steps="Ubuntu_Version Arch EFI_Mode CCS_Version SID_Check Installed_Ram Virtualization_Support NICs_enabled IPERF Network_Subnets Hard_Disks USB_Disks KVM_Image_Check" 
-yes=1
+steps="Ubuntu_Version Arch EFI_Mode CCS_Version SID_Check Installed_Ram Virtualization_Support NICs_enabled IPERF Network_Subnets Hard_Disks USB_Disks KVM_Image_Check XDG_Check" 
 
 while getopts "i" opt; do
   case $opt in
@@ -34,6 +33,7 @@ echoname(){
     echo -e "\n\e[1;33m============\e[m \e[1;34m$name\e[m \e[1;33m============\e[m"
 }
 
+# Check architecture
 Arch(){
  name="Check architecture"
  echoname
@@ -46,6 +46,48 @@ Arch(){
  fi
 }
 
+# Check for valid section headers in xdg config file
+XDG_Check(){
+ name="XDG Config file Check"
+ echoname
+ failstatus=0
+ prevstatus=0
+ for section in common transport:c3 environment
+     do grep ^'\['$section'\]' /etc/xdg/canonical-certification.conf >/dev/null 2>&1
+      exitstatus=$?
+      printf "%15s" " [$section] "
+      printf "%0.1s" " "{1..5}
+      if [ $exitstatus = "0" ] ; then
+        printf "\e[1;32m  OK\e[m\n"
+        failstatus=1
+      else
+        printf "\e[1;31m  Not found\e[m\n"
+        if [ $section = "common" ] ; then
+            failstatus=3
+        else
+                failstatus=2
+                if [ $prevstatus = $failstatus ] ; then
+                    output="[$section],[$prevsection]"
+                else
+                    output=[$section]
+                fi
+                eval info${i}=\"\$output\ missing\"
+                prevsection=$section
+        fi
+      fi
+     if [ $prevstatus -gt $failstatus ] ; then
+        failstatus=$prevstatus
+     fi
+     prevstatus=$failstatus
+ done
+ if [ $failstatus = 3 ] ; then
+    fail
+ elif [ $failstatus = 2 ] ; then
+    warn
+ else
+    pass
+ fi
+}
 
 # Display version of canonical-certification-server package installed
 CCS_Version(){
@@ -84,11 +126,10 @@ configure_SID(){
     fi
 }
 
-
+# Check for Secure ID config
 SID_Check(){
 name="Secure ID Check"
 echoname
-#if [ -n $secureid ];then
 if grep "^secure_id =" /etc/xdg/canonical-certification.conf >/dev/null ; then
 	secureid=$(grep "^secure_id =" /etc/xdg/canonical-certification.conf|awk '{print $3}')
     echo " Secure ID is configured as '$secureid'."
@@ -130,6 +171,7 @@ if [ -d "/sys/bus/usb/devices" ]; then
 fi
 }
 
+# Check for valid filesystem
 Hard_Disks(){
 name="Hard Disk Filesystem Check"
 echoname
@@ -185,6 +227,7 @@ else
 fi
 }
 
+# Check for USB storage devices
 USB_Disks(){
 name="USB Disks Check"
 echoname
@@ -327,7 +370,7 @@ if curl --output /dev/null --silent --head -fail "$kvmurl"; then
 	fi
 }
 
-#Correct Ubuntu version installed (could be tricky to determine, so maybe too much effort -- or maybe just display the Ubuntu version and, if the script is interactive, ask the user to verify that it’s what was intended)
+# Correct Ubuntu version installed (could be tricky to determine, so maybe too much effort -- or maybe just display the Ubuntu version and, if the script is interactive, ask the user to verify that it’s what was intended)
 Ubuntu_Version(){
  name="Ubuntu Version"
  echoname
@@ -451,7 +494,7 @@ case "$worst_status" in
 esac
 }
 
-#### Installed RAM (STG says 4GiB minimum) ###
+# Installed RAM (STG says 4GiB minimum)
 Installed_Ram(){
 name="Check Installed Ram"
 echoname
@@ -466,7 +509,7 @@ else
 fi
 }
 
-#CPU virtualization support (VMX/SVM)
+# CPU virtualization support (VMX/SVM)
 Virtualization_Support(){
 name="Virtualization Support"
 echoname
@@ -480,7 +523,7 @@ else
 fi
 }
 
-#EFI-mode installation (redundant with Checkbox test for same, but maybe good to warn about this issue before running Checkbox)
+# EFI-mode installation (redundant with Checkbox test for same, but maybe good to warn about this issue before running Checkbox)
 EFI_Mode(){
 name="EFI-mode installation"
 echoname
@@ -502,11 +545,7 @@ runchoices() {
  for i in $steps
   do
    eval "status=\$check${i}"
-   if [[ $status == "y" ]] || [[ "$yes" == "1" ]]; then
     "$i"
-   else
-    echo -e "\e[1;31mskipping\e[m \e[1;34m$i\e[m"
-   fi
  done
 }