Browse Source

Set password when creating backup key

Bob Mottram 7 years ago
parent
commit
50d99f06eb
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      src/freedombone-utils-backup

+ 4
- 4
src/freedombone-utils-backup View File

78
         return
78
         return
79
     fi
79
     fi
80
 
80
 
81
-    backup_create_password
82
-
83
     # Generate a GPG key for backups
81
     # Generate a GPG key for backups
84
     BACKUP_KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_NAME (backup key)")
82
     BACKUP_KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_NAME (backup key)")
85
     if [[ $BACKUP_KEY_EXISTS == "no" ]]; then
83
     if [[ $BACKUP_KEY_EXISTS == "no" ]]; then
91
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
89
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
92
         echo "Name-Comment: backup key" >> /home/$MY_USERNAME/gpg-genkey.conf
90
         echo "Name-Comment: backup key" >> /home/$MY_USERNAME/gpg-genkey.conf
93
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
91
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
92
+        echo "Passphrase: $BACKUP_DUMMY_PASSWORD" >> /home/$MY_USERNAME/gpg-genkey.conf
94
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
93
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
95
         echo $'Backup key does not exist. Creating it.'
94
         echo $'Backup key does not exist. Creating it.'
96
-        su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase-fd $BACKUP_PASSWORD_FILE --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
95
+        su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
97
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
96
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
98
 
97
 
99
         shred -zu /home/$MY_USERNAME/gpg-genkey.conf
98
         shred -zu /home/$MY_USERNAME/gpg-genkey.conf
100
         echo $'Checking that the Backup key was created'
99
         echo $'Checking that the Backup key was created'
101
         BACKUP_KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_NAME (backup key)")
100
         BACKUP_KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_NAME (backup key)")
102
         if [[ $BACKUP_KEY_EXISTS == "no" ]]; then
101
         if [[ $BACKUP_KEY_EXISTS == "no" ]]; then
103
-            backup_remove_password
104
             echo $'Backup key could not be created'
102
             echo $'Backup key could not be created'
105
             exit 43382
103
             exit 43382
106
         fi
104
         fi
107
     fi
105
     fi
108
 
106
 
107
+    backup_create_password
108
+
109
     MY_BACKUP_KEY_ID=$(su -c "gpg --list-keys \"$MY_NAME (backup key)\"" - $MY_USERNAME | sed -n '2p' | sed 's/^[ \t]*//')
109
     MY_BACKUP_KEY_ID=$(su -c "gpg --list-keys \"$MY_NAME (backup key)\"" - $MY_USERNAME | sed -n '2p' | sed 's/^[ \t]*//')
110
     echo "Backup key: $MY_BACKUP_KEY_ID"
110
     echo "Backup key: $MY_BACKUP_KEY_ID"
111
     MY_BACKUP_KEY=/home/$MY_USERNAME/backup_key
111
     MY_BACKUP_KEY=/home/$MY_USERNAME/backup_key