Browse Source

Option to verify the tripwire code

Bob Mottram 7 years ago
parent
commit
d9adff3a9e
1 changed files with 52 additions and 39 deletions
  1. 52
    39
      src/freedombone-controlpanel

+ 52
- 39
src/freedombone-controlpanel View File

@@ -1268,6 +1268,18 @@ function security_settings {
1268 1268
     any_key
1269 1269
 }
1270 1270
 
1271
+function show_tripwire_verification_code {
1272
+    clear
1273
+    echo ''
1274
+    echo $'Tripwire Verification Code'
1275
+    echo ''
1276
+    DBHASH=$(sha512sum  /var/lib/tripwire/${HOSTNAME}.twd)
1277
+    echo "$DBHASH" | qrencode -t UTF8
1278
+    echo ''
1279
+    echo "$DBHASH"
1280
+    echo ''
1281
+}
1282
+
1271 1283
 function reset_tripwire {
1272 1284
     if [ ! -f /usr/bin/reset-tripwire ]; then
1273 1285
         echo $'Missing /usr/bin/reset-tripwire'
@@ -1299,12 +1311,10 @@ function reset_tripwire {
1299 1311
                 ' | reset-tripwire
1300 1312
     echo ''
1301 1313
     if [ -f /var/lib/tripwire/${HOSTNAME}.twd ]; then
1302
-        DBHASH=$(sha512sum  /var/lib/tripwire/${HOSTNAME}.twd)
1303
-        echo "$DBHASH" | qrencode -t UTF8
1304
-        echo ''
1305
-        echo "$DBHASH"
1306
-        echo ''
1307
-        echo $'Tripwire is now reset'
1314
+        show_tripwire_verification_code
1315
+        echo $'Tripwire is now reset. Take a note of the above hash, or record'
1316
+        echo $'the QR code using a mobile device. This will enable you to independently'
1317
+        echo $'verify the integrity of the tripwire.'
1308 1318
     else
1309 1319
         echo $'ERROR: tripwire database was not created'
1310 1320
     fi
@@ -2131,27 +2141,28 @@ function menu_top_level {
2131 2141
         trap "rm -f $data" 0 1 2 5 15
2132 2142
         dialog --backtitle $"Freedombone Control Panel" \
2133 2143
                --title $"Control Panel" \
2134
-               --radiolist $"Choose an operation:" 28 70 20 \
2144
+               --radiolist $"Choose an operation:" 29 70 21 \
2135 2145
                1 $"About this system" off \
2136 2146
                2 $"Passwords" off \
2137 2147
                3 $"Backup and Restore" off \
2138 2148
                4 $"Show Firewall" off \
2139
-               5 $"Reset Tripwire" off \
2140
-               6 $"App Settings" off \
2141
-               7 $"Add/Remove Apps" off \
2142
-               8 $"Logging on/off" off \
2143
-               9 $"Ping enable/disable" off \
2144
-               10 $"Manage Users" off \
2145
-               11 $"Email Menu" off \
2146
-               12 $"Domain or User Blocking" off \
2147
-               13 $"Security Settings" off \
2148
-               14 $"Change the name of this system" off \
2149
-               15 $"Set a static local IP address" off \
2150
-               16 $"Wifi menu" off \
2151
-               17 $"Check for updates" off \
2152
-               18 $"Power off the system" off \
2153
-               19 $"Restart the system" off \
2154
-               20 $"Exit" on 2> $data
2149
+               5 $"Verify Tripwire Code" off \
2150
+               6 $"Reset Tripwire" off \
2151
+               7 $"App Settings" off \
2152
+               8 $"Add/Remove Apps" off \
2153
+               9 $"Logging on/off" off \
2154
+               10 $"Ping enable/disable" off \
2155
+               11 $"Manage Users" off \
2156
+               12 $"Email Menu" off \
2157
+               13 $"Domain or User Blocking" off \
2158
+               14 $"Security Settings" off \
2159
+               15 $"Change the name of this system" off \
2160
+               16 $"Set a static local IP address" off \
2161
+               17 $"Wifi menu" off \
2162
+               18 $"Check for updates" off \
2163
+               19 $"Power off the system" off \
2164
+               20 $"Restart the system" off \
2165
+               21 $"Exit" on 2> $data
2155 2166
         sel=$?
2156 2167
         case $sel in
2157 2168
             1) exit 1;;
@@ -2163,26 +2174,28 @@ function menu_top_level {
2163 2174
             2) view_or_change_passwords;;
2164 2175
             3) menu_backup_restore;;
2165 2176
             4) show_firewall;;
2166
-            5) reset_tripwire;;
2167
-            6) menu_app_settings;;
2168
-            7) /usr/local/bin/addremove
2177
+            5) show_tripwire_verification_code
2178
+               any_key;;
2179
+            6) reset_tripwire;;
2180
+            7) menu_app_settings;;
2181
+            8) /usr/local/bin/addremove
2169 2182
                if [ ! "$?" = "0" ]; then
2170 2183
                    any_key
2171 2184
                fi
2172 2185
                ;;
2173
-            8) logging_on_off;;
2174
-            9) ping_enable_disable;;
2175
-            10) menu_users;;
2176
-            11) menu_email;;
2177
-            12) domain_blocking;;
2178
-            13) security_settings;;
2179
-            14) change_system_name;;
2180
-            15) set_static_IP;;
2181
-            16) menu_wifi;;
2182
-            17) check_for_updates;;
2183
-            18) shut_down_system;;
2184
-            19) restart_system;;
2185
-            20) break;;
2186
+            9) logging_on_off;;
2187
+            10) ping_enable_disable;;
2188
+            11) menu_users;;
2189
+            12) menu_email;;
2190
+            13) domain_blocking;;
2191
+            14) security_settings;;
2192
+            15) change_system_name;;
2193
+            16) set_static_IP;;
2194
+            17) menu_wifi;;
2195
+            18) check_for_updates;;
2196
+            19) shut_down_system;;
2197
+            20) restart_system;;
2198
+            21) break;;
2186 2199
         esac
2187 2200
     done
2188 2201
 }