Przeglądaj źródła

Only copy the administrator user's keys to root

Bob Mottram 9 lat temu
rodzic
commit
2f5a873257
1 zmienionych plików z 12 dodań i 8 usunięć
  1. 12
    8
      src/freedombone

+ 12
- 8
src/freedombone Wyświetl plik

@@ -3226,11 +3226,13 @@ function create_restore_script {
3226 3226
   echo '        exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
3227 3227
   echo '      fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3228 3228
   echo '      rm -rf /root/tempgnupg' >> /usr/bin/$RESTORE_SCRIPT_NAME
3229
-  echo '      cp -r /home/$USERNAME/.gnupg /root' >> /usr/bin/$RESTORE_SCRIPT_NAME
3230
-  echo '      if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3231
-  echo '        umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3232
-  echo '        rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3233
-  echo '        exit 283' >> /usr/bin/$RESTORE_SCRIPT_NAME
3229
+  echo '      if [[ "$USERNAME" == "$MY_USERNAME" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3230
+  echo '        cp -r /home/$USERNAME/.gnupg /root' >> /usr/bin/$RESTORE_SCRIPT_NAME
3231
+  echo '        if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3232
+  echo '          umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3233
+  echo '          rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
3234
+  echo '          exit 283' >> /usr/bin/$RESTORE_SCRIPT_NAME
3235
+  echo '        fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3234 3236
   echo '      fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3235 3237
   echo '    fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3236 3238
   echo '  done' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -4732,9 +4734,11 @@ function restore_from_friend {
4732 4734
   echo '        exit 276' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4733 4735
   echo '      fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4734 4736
   echo '      rm -rf /root/tempgnupg' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4735
-  echo '      cp -r /home/$USERNAME/.gnupg /root' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4736
-  echo '      if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4737
-  echo '        exit 283' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4737
+  echo '      if [[ "$USERNAME" == "$MY_USERNAME" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4738
+  echo '        cp -r /home/$USERNAME/.gnupg /root' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4739
+  echo '        if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4740
+  echo '          exit 283' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4741
+  echo '        fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4738 4742
   echo '      fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4739 4743
   echo '    fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4740 4744
   echo '  fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME