瀏覽代碼

Menu option to fix stig test failures

Bob Mottram 7 年之前
父節點
當前提交
75d6de301b
共有 1 個文件被更改,包括 36 次插入28 次删除
  1. 36
    28
      src/freedombone-sec

+ 36
- 28
src/freedombone-sec 查看文件

@@ -969,22 +969,23 @@ function menu_security_settings {
969 969
     trap "rm -f $data" 0 1 2 5 15
970 970
     dialog --backtitle $"Freedombone Control Panel" \
971 971
            --title $"Security Settings" \
972
-           --radiolist $"Choose an operation:" 22 76 22 \
972
+           --radiolist $"Choose an operation:" 23 76 23 \
973 973
            1 $"Run STIG tests" off \
974
-           2 $"Show ssh host public key" off \
975
-           3 $"Tor bridges" off \
976
-           4 $"Password storage" off \
977
-           5 $"Export passwords" off \
978
-           6 $"Regenerate ssh host keys" off \
979
-           7 $"Regenerate Diffie-Hellman keys" off \
980
-           8 $"Update cipersuite" off \
981
-           9 $"Create a new Let's Encrypt certificate" off \
982
-           10 $"Renew Let's Encrypt certificate" off \
983
-           11 $"Delete a Let's Encrypt certificate" off \
984
-           12 $"Enable GPG based authentication (monkeysphere)" off \
985
-           13 $"Register a website with monkeysphere" off \
986
-           14 $"Allow ssh login with passwords" off \
987
-           15 $"Go Back/Exit" on 2> $data
974
+           2 $"Fix STIG test failures" off \
975
+           3 $"Show ssh host public key" off \
976
+           4 $"Tor bridges" off \
977
+           5 $"Password storage" off \
978
+           6 $"Export passwords" off \
979
+           7 $"Regenerate ssh host keys" off \
980
+           8 $"Regenerate Diffie-Hellman keys" off \
981
+           9 $"Update cipersuite" off \
982
+           10 $"Create a new Let's Encrypt certificate" off \
983
+           11 $"Renew Let's Encrypt certificate" off \
984
+           12 $"Delete a Let's Encrypt certificate" off \
985
+           13 $"Enable GPG based authentication (monkeysphere)" off \
986
+           14 $"Register a website with monkeysphere" off \
987
+           15 $"Allow ssh login with passwords" off \
988
+           16 $"Go Back/Exit" on 2> $data
988 989
     sel=$?
989 990
     case $sel in
990 991
         1) exit 1;;
@@ -1014,53 +1015,60 @@ function menu_security_settings {
1014 1015
             exit 0
1015 1016
             ;;
1016 1017
         2)
1018
+            clear
1019
+            echo $'Fixing any STIG failures...'
1020
+            echo ''
1021
+            ${PROJECT_NAME}-tests --stig fix
1022
+            exit 0
1023
+            ;;
1024
+        3)
1017 1025
             dialog --title $"SSH host public keys" \
1018 1026
                    --msgbox "\n$(get_ssh_server_key)" 12 60
1019 1027
             exit 0
1020 1028
             ;;
1021
-        3)
1029
+        4)
1022 1030
             menu_tor_bridges
1023 1031
             exit 0
1024 1032
             ;;
1025
-        4)
1033
+        5)
1026 1034
             store_passwords
1027 1035
             exit 0
1028 1036
             ;;
1029
-        5)
1037
+        6)
1030 1038
             export_passwords
1031 1039
             exit 0
1032 1040
             ;;
1033
-        6)
1041
+        7)
1034 1042
             regenerate_ssh_host_keys
1035 1043
             ;;
1036
-        7)
1044
+        8)
1037 1045
             regenerate_dh_keys
1038 1046
             ;;
1039
-        8)
1047
+        9)
1040 1048
             interactive_setup
1041 1049
             update_ciphersuite
1042 1050
             ;;
1043
-        9)
1051
+        10)
1044 1052
             create_letsencrypt
1045 1053
             ;;
1046
-        10)
1054
+        11)
1047 1055
             renew_letsencrypt
1048 1056
             ;;
1049
-        11)
1057
+        12)
1050 1058
             delete_letsencrypt
1051 1059
             ;;
1052
-        12)
1060
+        13)
1053 1061
             enable_monkeysphere
1054 1062
             ;;
1055
-        13)
1063
+        14)
1056 1064
             register_website
1057 1065
             ;;
1058
-        14)
1066
+        15)
1059 1067
             allow_ssh_passwords
1060 1068
             change_ssh_settings
1061 1069
             exit 0
1062 1070
             ;;
1063
-        15)
1071
+        16)
1064 1072
             exit 0
1065 1073
             ;;
1066 1074
     esac