Merge pull request #1118 from steph78630/master

Add translated status

db/languages/en

@@ -72,10 +72,14 @@ STATUS_DISABLED="DISABLED"
 STATUS_DONE="DONE"
 STATUS_ENABLED="ENABLED"
 STATUS_ERROR="ERROR"
+STATUS_EXPOSED="EXPOSED"
 STATUS_FAILED="FAILED"
 STATUS_FILES_FOUND="FILES FOUND"
 STATUS_FOUND="FOUND"
+STATUS_HARDENED="HARDENED"
 STATUS_INSTALLED="INSTALLED"
+STATUS_LOCAL_ONLY="LOCAL ONLY"
+STATUS_MEDIUM="MEDIUM"
 STATUS_NO="NO"
 STATUS_NO_UPDATE="NO UPDATE"
 STATUS_NON_DEFAULT="NON DEFAULT"
@@ -88,11 +92,13 @@ STATUS_NOT_RUNNING="NOT RUNNING"
 STATUS_OFF="OFF"
 STATUS_OK="OK"
 STATUS_ON="ON"
+STATUS_PARTIALLY_HARDENED="PARTIALLY HARDENED"
 STATUS_PROTECTED="PROTECTED"
 STATUS_RUNNING="RUNNING"
 STATUS_SKIPPED="SKIPPED"
 STATUS_SUGGESTION="SUGGESTION"
 STATUS_UNKNOWN="UNKNOWN"
+STATUS_UNSAFE="UNSAFE"
 STATUS_UPDATE_AVAILABLE="UPDATE AVAILABLE"
 STATUS_WARNING="WARNING"
 STATUS_WEAK="WEAK"

db/languages/fr

@@ -72,10 +72,14 @@ STATUS_DISABLED="DÉSACTIVÉ"
 STATUS_DONE="FAIT"
 STATUS_ENABLED="ACTIVÉ"
 STATUS_ERROR="ERREUR"
+STATUS_EXPOSED="EXPOSÉ"
 STATUS_FAILED="ÉCHOUÉ"
 STATUS_FILES_FOUND="FICHIERS TROUVÉS"
 STATUS_FOUND="TROUVÉ"
+STATUS_HARDENED="RENFORCÉ"
 STATUS_INSTALLED="INSTALLÉ"
+STATUS_LOCAL_ONLY="LOCAL SEULEMENT"
+STATUS_MEDIUM="MOYEN"
 STATUS_NO="NON"
 STATUS_NO_UPDATE="PAS DE MISE A JOUR"
 STATUS_NON_DEFAULT="PAS PAR DÉFAUT"
@@ -88,11 +92,13 @@ STATUS_NOT_RUNNING="NON LANCÉ"
 STATUS_OFF="OFF"
 STATUS_OK="OK"
 STATUS_ON="ON"
+STATUS_PARTIALLY_HARDENED="PARTIELLEMENT RENFORCÉ"
 STATUS_PROTECTED="PROTÉGÉ"
 STATUS_RUNNING="EN COURS"
 STATUS_SKIPPED="IGNORÉ"
 STATUS_SUGGESTION="SUGGESTION"
 STATUS_UNKNOWN="INCONNU"
+STATUS_UNSAFE="RISQUÉ"
 STATUS_UPDATE_AVAILABLE="MISE A JOUR DISPONIBLE"
 STATUS_WARNING="AVERTISSEMENT"
 STATUS_WEAK="FAIBLE"

include/tests_boot_services

@@ -1068,23 +1068,28 @@
             if [ "${UNIT}" = "UNIT" ]; then
                 continue
             fi
+            STATUS="UNKNOWN"
             COLOR="BLACK"
             case ${PREDICATE} in
                 PERFECT | SAFE | OK)
+                    STATUS="${STATUS_PROTECTED}"
                     COLOR=GREEN
                 ;;
                 MEDIUM)
+                    STATUS="${STATUS_MEDIUM}"
                     COLOR=WHITE
                 ;;
                 EXPOSED)
+                    STATUS="${STATUS_EXPOSED}"
                     COLOR=YELLOW
                 ;;
                 UNSAFE | DANGEROUS)
+                    STATUS="${STATUS_UNSAFE}"
                     COLOR=RED
                 ;;
             esac
-            Display --indent 8 --text "- ${UNIT}:" --result "${PREDICATE}" --color "${COLOR}"
+            Display --indent 8 --text "- ${UNIT}:" --result "${STATUS}" --color "${COLOR}"
-            LogText "Result: ${UNIT}: ${EXPOSURE} ${PREDICATE}"
+            LogText "Result: ${UNIT}: ${EXPOSURE} ${STATUS}"
         done
         ReportSuggestion "${TEST_NO}" "Consider hardening system services" "Run '${SYSTEMDANALYZEBINARY} security SERVICE' for each service"
     fi

include/tests_filesystems

@@ -606,11 +606,11 @@
                     done
                     if [ ${FULLY_HARDENED} -eq 1 ]; then
                         LogText "Result: marked ${FILESYSTEM} as fully hardened"
-                        Display --indent 2 --text "- Mount options of ${FILESYSTEM}" --result HARDENED --color GREEN
+                        Display --indent 2 --text "- Mount options of ${FILESYSTEM}" --result "${STATUS_HARDENED}" --color GREEN
                         AddHP 5 5
                     elif [ ${PARTIALLY_HARDENED} -eq 1 ]; then
                         LogText "Result: marked ${FILESYSTEM} as partially hardened"
-                        Display --indent 2 --text "- Mount options of ${FILESYSTEM}" --result "PARTIALLY HARDENED" --color YELLOW
+                        Display --indent 2 --text "- Mount options of ${FILESYSTEM}" --result "${STATUS_PARTIALLY_HARDENED}" --color YELLOW
                         AddHP 4 5
                     else
                         # if