Browse Source

Fix some gpg permissions which otherwise prevent searching for keys

Bob Mottram 7 years ago
parent
commit
6d541dc780
4 changed files with 30 additions and 0 deletions
  1. 6
    0
      src/freedombone-adduser
  2. 12
    0
      src/freedombone-base-email
  3. 8
    0
      src/freedombone-utils-gpg
  4. 4
    0
      src/freedombone-utils-keys

+ 6
- 0
src/freedombone-adduser View File

239
     echo 'controluser' >> /home/$ADD_USERNAME/.bashrc
239
     echo 'controluser' >> /home/$ADD_USERNAME/.bashrc
240
 fi
240
 fi
241
 
241
 
242
+# fix some gpg strangeness when searching for keys
243
+printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > /home/$ADD_USERNAME/.gnupg/S.dirmngr
244
+if [ -d /home/$ADD_USERNAME/.gnupg/crls.d ]; then
245
+    chmod +x /home/$ADD_USERNAME/.gnupg/crls.d
246
+fi
247
+
242
 ${PROJECT_NAME}-pass -u $ADD_USERNAME -a login -p "$NEW_USER_PASSWORD"
248
 ${PROJECT_NAME}-pass -u $ADD_USERNAME -a login -p "$NEW_USER_PASSWORD"
243
 clear
249
 clear
244
 echo $"New user $ADD_USERNAME was created"
250
 echo $"New user $ADD_USERNAME was created"

+ 12
- 0
src/freedombone-base-email View File

1391
                 chown -R $MY_USERNAME:$MY_USERNAME $gpg_dir
1391
                 chown -R $MY_USERNAME:$MY_USERNAME $gpg_dir
1392
                 chmod 700 $gpg_dir
1392
                 chmod 700 $gpg_dir
1393
                 chmod 600 $gpg_dir/*
1393
                 chmod 600 $gpg_dir/*
1394
+                printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > /home/$MY_USERNAME/.gnupg/S.dirmngr
1395
+                if [ -d /home/$MY_USERNAME/.gnupg/crls.d ]; then
1396
+                    chmod +x /home/$MY_USERNAME/.gnupg/crls.d
1397
+                fi
1394
                 mark_completed $FUNCNAME
1398
                 mark_completed $FUNCNAME
1395
                 return
1399
                 return
1396
             fi
1400
             fi
1419
     chown -R $MY_USERNAME:$MY_USERNAME $gpg_dir
1423
     chown -R $MY_USERNAME:$MY_USERNAME $gpg_dir
1420
     chmod 700 $gpg_dir
1424
     chmod 700 $gpg_dir
1421
     chmod 600 $gpg_dir/*
1425
     chmod 600 $gpg_dir/*
1426
+    printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > /home/$MY_USERNAME/.gnupg/S.dirmngr
1427
+    if [ -d /home/$MY_USERNAME/.gnupg/crls.d ]; then
1428
+        chmod +x /home/$MY_USERNAME/.gnupg/crls.d
1429
+    fi
1422
 
1430
 
1423
     if [[ $MY_GPG_PUBLIC_KEY && $MY_GPG_PRIVATE_KEY ]]; then
1431
     if [[ $MY_GPG_PUBLIC_KEY && $MY_GPG_PRIVATE_KEY ]]; then
1424
         echo $'Importing GPG keys from file'
1432
         echo $'Importing GPG keys from file'
1467
         cp -r /home/$MY_USERNAME/.gnupg /root/
1475
         cp -r /home/$MY_USERNAME/.gnupg /root/
1468
         chmod 700 /root/.gnupg
1476
         chmod 700 /root/.gnupg
1469
         chmod 600 /root/.gnupg/*
1477
         chmod 600 /root/.gnupg/*
1478
+        printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > /home/$MY_USERNAME/.gnupg/S.dirmngr
1479
+        if [ -d /home/$MY_USERNAME/.gnupg/crls.d ]; then
1480
+            chmod +x /home/$MY_USERNAME/.gnupg/crls.d
1481
+        fi
1470
     fi
1482
     fi
1471
 
1483
 
1472
     mark_completed $FUNCNAME
1484
     mark_completed $FUNCNAME

+ 8
- 0
src/freedombone-utils-gpg View File

144
     if [[ "$key_username" != 'root' ]]; then
144
     if [[ "$key_username" != 'root' ]]; then
145
         chmod 700 /home/$key_username/.gnupg
145
         chmod 700 /home/$key_username/.gnupg
146
         chmod -R 600 /home/$key_username/.gnupg/*
146
         chmod -R 600 /home/$key_username/.gnupg/*
147
+        printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > /home/$key_username/.gnupg/S.dirmngr
148
+        if [ -d /home/$key_username/.gnupg/crls.d ]; then
149
+            chmod +x /home/$key_username/.gnupg/crls.d
150
+        fi
147
         chown -R $key_username:$key_username /home/$key_username/.gnupg
151
         chown -R $key_username:$key_username /home/$key_username/.gnupg
148
     else
152
     else
149
         chmod 700 /root/.gnupg
153
         chmod 700 /root/.gnupg
150
         chmod -R 600 /root/.gnupg/*
154
         chmod -R 600 /root/.gnupg/*
155
+        printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > /root/.gnupg/S.dirmngr
156
+        if [ -d /root/.gnupg/crls.d ]; then
157
+            chmod +x /root/.gnupg/crls.d
158
+        fi
151
         chown -R $key_username:$key_username /root/.gnupg
159
         chown -R $key_username:$key_username /root/.gnupg
152
     fi
160
     fi
153
 }
161
 }

+ 4
- 0
src/freedombone-utils-keys View File

264
         cp -rf /home/$MY_USERNAME/.gnupg /root
264
         cp -rf /home/$MY_USERNAME/.gnupg /root
265
         chmod 700 /root/.gnupg
265
         chmod 700 /root/.gnupg
266
         chmod 600 /root/.gnupg/*
266
         chmod 600 /root/.gnupg/*
267
+        printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > /root/.gnupg/S.dirmngr
268
+        if [ -d /root/.gnupg/crls.d ]; then
269
+            chmod +x /root/.gnupg/crls.d
270
+        fi
267
     fi
271
     fi
268
 }
272
 }
269
 
273