Browse Source

Username validation function

Bob Mottram 8 years ago
parent
commit
55a446e0b3

+ 2
- 2
src/freedombone-app-blog View File

244
         fi
244
         fi
245
         for d in /home/*/ ; do
245
         for d in /home/*/ ; do
246
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
246
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
247
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
247
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
248
                 if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then
248
                 if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then
249
                     mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
249
                     mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
250
                 fi
250
                 fi
296
         fi
296
         fi
297
         for d in /home/*/ ; do
297
         for d in /home/*/ ; do
298
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
298
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
299
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
299
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
300
                 if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then
300
                 if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then
301
                     mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
301
                     mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
302
                 fi
302
                 fi

+ 2
- 2
src/freedombone-app-emacs View File

49
 function backup_local_emacs {
49
 function backup_local_emacs {
50
     for d in /home/*/ ; do
50
     for d in /home/*/ ; do
51
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
51
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
52
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
52
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
53
             if [ -d /home/$USERNAME/.emacs.d ]; then
53
             if [ -d /home/$USERNAME/.emacs.d ]; then
54
                 echo $"Backing up Emacs config for $USERNAME"
54
                 echo $"Backing up Emacs config for $USERNAME"
55
                 if [ -f /home/$USERNAME/.emacs ]; then
55
                 if [ -f /home/$USERNAME/.emacs ]; then
67
     if [ -d $USB_MOUNT/backup/emacs ]; then
67
     if [ -d $USB_MOUNT/backup/emacs ]; then
68
         for d in $USB_MOUNT/backup/emacs/*/ ; do
68
         for d in $USB_MOUNT/backup/emacs/*/ ; do
69
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
69
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
70
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
70
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
71
                 if [ ! -d /home/$USERNAME ]; then
71
                 if [ ! -d /home/$USERNAME ]; then
72
                     ${PROJECT_NAME}-adduser $USERNAME
72
                     ${PROJECT_NAME}-adduser $USERNAME
73
                 fi
73
                 fi

+ 1
- 1
src/freedombone-app-irc View File

61
             # replace the password for all users
61
             # replace the password for all users
62
             for d in /home/*/ ; do
62
             for d in /home/*/ ; do
63
                 IRC_USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
63
                 IRC_USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
64
-                if [[ $IRC_USERNAME != "git" && $IRC_USERNAME != "mirrors" && $IRC_USERNAME != "sync" && $IRC_USERNAME != "tahoelafs" ]]; then
64
+                if [[ $(is_valid_user $IRC_USERNAME) == "1" ]]; then
65
                     if [ -f /home/$IRC_USERNAME/.irssi/config ]; then
65
                     if [ -f /home/$IRC_USERNAME/.irssi/config ]; then
66
                         sed -i "s|$EXISTING_IRC_PASSWORD|$NEW_IRC_PASSWORD|g" /home/$IRC_USERNAME/.irssi/config
66
                         sed -i "s|$EXISTING_IRC_PASSWORD|$NEW_IRC_PASSWORD|g" /home/$IRC_USERNAME/.irssi/config
67
                         chown -R $IRC_USERNAME:$IRC_USERNAME /home/$IRC_USERNAME/.irssi
67
                         chown -R $IRC_USERNAME:$IRC_USERNAME /home/$IRC_USERNAME/.irssi

+ 2
- 2
src/freedombone-app-syncthing View File

278
     if [ -d $USB_MOUNT/backup/syncthing ]; then
278
     if [ -d $USB_MOUNT/backup/syncthing ]; then
279
         for d in $USB_MOUNT/backup/syncthing/*/ ; do
279
         for d in $USB_MOUNT/backup/syncthing/*/ ; do
280
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
280
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
281
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
281
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
282
                 if [ ! -d /home/$USERNAME ]; then
282
                 if [ ! -d /home/$USERNAME ]; then
283
                     ${PROJECT_NAME}-adduser $USERNAME
283
                     ${PROJECT_NAME}-adduser $USERNAME
284
                 fi
284
                 fi
366
     if [ -d $SERVER_DIRECTORY/backup/syncthing ]; then
366
     if [ -d $SERVER_DIRECTORY/backup/syncthing ]; then
367
         for d in $SERVER_DIRECTORY/backup/syncthing/*/ ; do
367
         for d in $SERVER_DIRECTORY/backup/syncthing/*/ ; do
368
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
368
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
369
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
369
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
370
                 if [ ! -d /home/$USERNAME ]; then
370
                 if [ ! -d /home/$USERNAME ]; then
371
                     ${PROJECT_NAME}-adduser $USERNAME
371
                     ${PROJECT_NAME}-adduser $USERNAME
372
                 fi
372
                 fi

+ 1
- 1
src/freedombone-app-tahoelafs View File

50
 function reconfigure_tahoelafs {
50
 function reconfigure_tahoelafs {
51
     for d in /home/*/ ; do
51
     for d in /home/*/ ; do
52
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
52
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
53
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
53
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
54
             if [ -d /home/$USERNAME/.tahoe ]; then
54
             if [ -d /home/$USERNAME/.tahoe ]; then
55
                 su -c "$TAHOE_COMMAND stop" - $USERNAME
55
                 su -c "$TAHOE_COMMAND stop" - $USERNAME
56
                 rm -rf /home/$USERNAME/.tahoe
56
                 rm -rf /home/$USERNAME/.tahoe

+ 1
- 1
src/freedombone-app-xmpp View File

246
 function xmpp_email_headers {
246
 function xmpp_email_headers {
247
     for d in /home/*/ ; do
247
     for d in /home/*/ ; do
248
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
248
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
249
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
249
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
250
             if [ -f /home/$USERNAME/.muttrc ]; then
250
             if [ -f /home/$USERNAME/.muttrc ]; then
251
                 if ! grep -q "Jabber-ID" /home/$USERNAME/.muttrc; then
251
                 if ! grep -q "Jabber-ID" /home/$USERNAME/.muttrc; then
252
                     echo "my_hdr Jabber-ID: ${USERNAME}@${HOSTNAME}" >> /home/$USERNAME/.muttrc
252
                     echo "my_hdr Jabber-ID: ${USERNAME}@${HOSTNAME}" >> /home/$USERNAME/.muttrc

+ 3
- 1
src/freedombone-archive-mail View File

33
 export TEXTDOMAIN=${PROJECT_NAME}-archive-mail
33
 export TEXTDOMAIN=${PROJECT_NAME}-archive-mail
34
 export TEXTDOMAINDIR="/usr/share/locale"
34
 export TEXTDOMAINDIR="/usr/share/locale"
35
 
35
 
36
+source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-validation
37
+
36
 for d in /home/*/ ; do
38
 for d in /home/*/ ; do
37
     USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
39
     USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
38
-    if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
40
+    if [[ $(is_valid_user $USERNAME) == "1" ]]; then
39
         # for every user who has a mail directory
41
         # for every user who has a mail directory
40
         if [ -d /home/$USERNAME/Maildir ]; then
42
         if [ -d /home/$USERNAME/Maildir ]; then
41
             MUTTRC=/home/$USERNAME/.muttrc
43
             MUTTRC=/home/$USERNAME/.muttrc

+ 1
- 1
src/freedombone-backup-local View File

98
     # Backup user files
98
     # Backup user files
99
     for d in /home/*/ ; do
99
     for d in /home/*/ ; do
100
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
100
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
101
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
101
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
102
 
102
 
103
             # Backup any gpg keys
103
             # Backup any gpg keys
104
             if [ -d /home/$USERNAME/.gnupg ]; then
104
             if [ -d /home/$USERNAME/.gnupg ]; then

+ 2
- 2
src/freedombone-backup-remote View File

122
 function backup_users {
122
 function backup_users {
123
     for d in /home/*/ ; do
123
     for d in /home/*/ ; do
124
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
124
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
125
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
125
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
126
 
126
 
127
             # personal settings
127
             # personal settings
128
             if [ -d /home/$USERNAME/personal ]; then
128
             if [ -d /home/$USERNAME/personal ]; then
451
         # Social key management
451
         # Social key management
452
         for d in /home/*/ ; do
452
         for d in /home/*/ ; do
453
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
453
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
454
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
454
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
455
                 disperse_key_shares $USERNAME $REMOTE_DOMAIN $REMOTE_SSH_PORT "$REMOTE_PASSWORD" $REMOTE_SERVER
455
                 disperse_key_shares $USERNAME $REMOTE_DOMAIN $REMOTE_SSH_PORT "$REMOTE_PASSWORD" $REMOTE_SERVER
456
             fi
456
             fi
457
         done
457
         done

+ 2
- 2
src/freedombone-base-email View File

1050
     echo '#!/bin/bash' > /usr/bin/filterspam
1050
     echo '#!/bin/bash' > /usr/bin/filterspam
1051
     echo 'for d in /home/*/ ; do' >> /usr/bin/filterspam
1051
     echo 'for d in /home/*/ ; do' >> /usr/bin/filterspam
1052
     echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/filterspam
1052
     echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/filterspam
1053
-    echo '    if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then' >> /usr/bin/filterspam
1053
+    echo '    if [[ $USERNAME != "git" && $USERNAME != "go" && $USERNAME != "gogs" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then' >> /usr/bin/filterspam
1054
     echo '        MAILDIR=/home/$USERNAME/Maildir/.learn-spam' >> /usr/bin/filterspam
1054
     echo '        MAILDIR=/home/$USERNAME/Maildir/.learn-spam' >> /usr/bin/filterspam
1055
     echo '        if [ ! -d "$MAILDIR" ]; then' >> /usr/bin/filterspam
1055
     echo '        if [ ! -d "$MAILDIR" ]; then' >> /usr/bin/filterspam
1056
     echo '           exit' >> /usr/bin/filterspam
1056
     echo '           exit' >> /usr/bin/filterspam
1072
     echo '#!/bin/bash' > /usr/bin/filterham
1072
     echo '#!/bin/bash' > /usr/bin/filterham
1073
     echo 'for d in /home/*/ ; do' >> /usr/bin/filterham
1073
     echo 'for d in /home/*/ ; do' >> /usr/bin/filterham
1074
     echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/filterham
1074
     echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/filterham
1075
-    echo '    if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then' >> /usr/bin/filterham
1075
+    echo '    if [[ $USERNAME != "git" && $USERNAME != "go" && $USERNAME != "gogs" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then' >> /usr/bin/filterham
1076
     echo '        MAILDIR=/home/$USERNAME/Maildir/.learn-ham' >> /usr/bin/filterham
1076
     echo '        MAILDIR=/home/$USERNAME/Maildir/.learn-ham' >> /usr/bin/filterham
1077
     echo '        if [ ! -d "$MAILDIR" ]; then' >> /usr/bin/filterham
1077
     echo '        if [ ! -d "$MAILDIR" ]; then' >> /usr/bin/filterham
1078
     echo '            exit' >> /usr/bin/filterham
1078
     echo '            exit' >> /usr/bin/filterham

+ 1
- 1
src/freedombone-controlpanel View File

459
     echo '--------------------------------------------------------------------------'
459
     echo '--------------------------------------------------------------------------'
460
     for d in /home/*/ ; do
460
     for d in /home/*/ ; do
461
         USRNAME=$(echo "$d" | awk -F '/' '{print $3}')
461
         USRNAME=$(echo "$d" | awk -F '/' '{print $3}')
462
-        if [[ $USRNAME != "git" && $USRNAME != "mirrors" && $USRNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
462
+        if [[ $(is_valid_user $USRNAME) == "1" ]]; then
463
             echo -n -e "$(pad_string ${USRNAME})"
463
             echo -n -e "$(pad_string ${USRNAME})"
464
             # get the SIP extension
464
             # get the SIP extension
465
             SIPEXT=
465
             SIPEXT=

+ 11
- 11
src/freedombone-restore-local View File

238
     if [ -d $USB_MOUNT/backup/mutt ]; then
238
     if [ -d $USB_MOUNT/backup/mutt ]; then
239
         for d in $USB_MOUNT/backup/mutt/*/ ; do
239
         for d in $USB_MOUNT/backup/mutt/*/ ; do
240
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
240
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
241
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
241
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
242
                 if [ ! -d /home/$USERNAME ]; then
242
                 if [ ! -d /home/$USERNAME ]; then
243
                     ${PROJECT_NAME}-adduser $USERNAME
243
                     ${PROJECT_NAME}-adduser $USERNAME
244
                 fi
244
                 fi
272
     if [ -d $USB_MOUNT/backup/gnupg ]; then
272
     if [ -d $USB_MOUNT/backup/gnupg ]; then
273
         for d in $USB_MOUNT/backup/gnupg/*/ ; do
273
         for d in $USB_MOUNT/backup/gnupg/*/ ; do
274
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
274
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
275
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
275
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
276
                 if [ ! -d /home/$USERNAME ]; then
276
                 if [ ! -d /home/$USERNAME ]; then
277
                     ${PROJECT_NAME}-adduser $USERNAME
277
                     ${PROJECT_NAME}-adduser $USERNAME
278
                 fi
278
                 fi
309
     if [ -d $USB_MOUNT/backup/procmail ]; then
309
     if [ -d $USB_MOUNT/backup/procmail ]; then
310
         for d in $USB_MOUNT/backup/procmail/*/ ; do
310
         for d in $USB_MOUNT/backup/procmail/*/ ; do
311
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
311
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
312
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
312
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
313
                 if [ ! -d /home/$USERNAME ]; then
313
                 if [ ! -d /home/$USERNAME ]; then
314
                     ${PROJECT_NAME}-adduser $USERNAME
314
                     ${PROJECT_NAME}-adduser $USERNAME
315
                 fi
315
                 fi
338
     if [ -d $USB_MOUNT/backup/spamassassin ]; then
338
     if [ -d $USB_MOUNT/backup/spamassassin ]; then
339
         for d in $USB_MOUNT/backup/spamassassin/*/ ; do
339
         for d in $USB_MOUNT/backup/spamassassin/*/ ; do
340
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
340
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
341
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
341
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
342
                 if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then
342
                 if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then
343
                     if [ ! -d /home/$USERNAME ]; then
343
                     if [ ! -d /home/$USERNAME ]; then
344
                         ${PROJECT_NAME}-adduser $USERNAME
344
                         ${PROJECT_NAME}-adduser $USERNAME
399
     if [ -d $USB_MOUNT/backup/ssh ]; then
399
     if [ -d $USB_MOUNT/backup/ssh ]; then
400
         for d in $USB_MOUNT/backup/ssh/*/ ; do
400
         for d in $USB_MOUNT/backup/ssh/*/ ; do
401
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
401
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
402
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
402
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
403
                 if [ ! -d /home/$USERNAME ]; then
403
                 if [ ! -d /home/$USERNAME ]; then
404
                     ${PROJECT_NAME}-adduser $USERNAME
404
                     ${PROJECT_NAME}-adduser $USERNAME
405
                 fi
405
                 fi
428
     if [ -d $USB_MOUNT/backup/config ]; then
428
     if [ -d $USB_MOUNT/backup/config ]; then
429
         for d in $USB_MOUNT/backup/config/*/ ; do
429
         for d in $USB_MOUNT/backup/config/*/ ; do
430
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
430
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
431
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
431
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
432
                 if [ ! -d /home/$USERNAME ]; then
432
                 if [ ! -d /home/$USERNAME ]; then
433
                     ${PROJECT_NAME}-adduser $USERNAME
433
                     ${PROJECT_NAME}-adduser $USERNAME
434
                 fi
434
                 fi
469
     if [ -d $USB_MOUNT/backup/monkeysphere ]; then
469
     if [ -d $USB_MOUNT/backup/monkeysphere ]; then
470
         for d in $USB_MOUNT/backup/monkeysphere/*/ ; do
470
         for d in $USB_MOUNT/backup/monkeysphere/*/ ; do
471
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
471
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
472
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
472
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
473
                 if [ ! -d /home/$USERNAME ]; then
473
                 if [ ! -d /home/$USERNAME ]; then
474
                     ${PROJECT_NAME}-adduser $USERNAME
474
                     ${PROJECT_NAME}-adduser $USERNAME
475
                 fi
475
                 fi
508
     if [ -d $USB_MOUNT/backup/fin ]; then
508
     if [ -d $USB_MOUNT/backup/fin ]; then
509
         for d in $USB_MOUNT/backup/fin/*/ ; do
509
         for d in $USB_MOUNT/backup/fin/*/ ; do
510
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
510
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
511
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
511
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
512
                 if [ ! -d /home/$USERNAME ]; then
512
                 if [ ! -d /home/$USERNAME ]; then
513
                     ${PROJECT_NAME}-adduser $USERNAME
513
                     ${PROJECT_NAME}-adduser $USERNAME
514
                 fi
514
                 fi
537
     if [ -d $USB_MOUNT/backup/local ]; then
537
     if [ -d $USB_MOUNT/backup/local ]; then
538
         for d in $USB_MOUNT/backup/local/*/ ; do
538
         for d in $USB_MOUNT/backup/local/*/ ; do
539
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
539
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
540
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
540
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
541
                 if [ ! -d /home/$USERNAME ]; then
541
                 if [ ! -d /home/$USERNAME ]; then
542
                     ${PROJECT_NAME}-adduser $USERNAME
542
                     ${PROJECT_NAME}-adduser $USERNAME
543
                 fi
543
                 fi
610
     if [ -d $USB_MOUNT/backup/personal ]; then
610
     if [ -d $USB_MOUNT/backup/personal ]; then
611
         for d in $USB_MOUNT/backup/personal/*/ ; do
611
         for d in $USB_MOUNT/backup/personal/*/ ; do
612
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
612
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
613
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
613
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
614
                 if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then
614
                 if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then
615
                     if [ ! -d /home/$USERNAME ]; then
615
                     if [ ! -d /home/$USERNAME ]; then
616
                         ${PROJECT_NAME}-adduser $USERNAME
616
                         ${PROJECT_NAME}-adduser $USERNAME
663
     if [ -d $USB_MOUNT/backup/mail ]; then
663
     if [ -d $USB_MOUNT/backup/mail ]; then
664
         for d in $USB_MOUNT/backup/mail/*/ ; do
664
         for d in $USB_MOUNT/backup/mail/*/ ; do
665
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
665
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
666
-            if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
666
+            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
667
                 if [ ! -d /home/$USERNAME ]; then
667
                 if [ ! -d /home/$USERNAME ]; then
668
                     ${PROJECT_NAME}-adduser $USERNAME
668
                     ${PROJECT_NAME}-adduser $USERNAME
669
                 fi
669
                 fi

+ 13
- 11
src/freedombone-restore-remote View File

36
 export TEXTDOMAIN=${PROJECT_NAME}-restore-remote
36
 export TEXTDOMAIN=${PROJECT_NAME}-restore-remote
37
 export TEXTDOMAINDIR="/usr/share/locale"
37
 export TEXTDOMAINDIR="/usr/share/locale"
38
 
38
 
39
+source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-validation
40
+
39
 SERVER_NAME=$1
41
 SERVER_NAME=$1
40
 
42
 
41
 # whether to restore everything or just a specific application
43
 # whether to restore everything or just a specific application
225
     fi
227
     fi
226
     for d in $SERVER_DIRECTORY/backup/mutt/*/ ; do
228
     for d in $SERVER_DIRECTORY/backup/mutt/*/ ; do
227
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
229
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
228
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
230
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
229
             if [ -d $SERVER_DIRECTORY/backup/mutt/$USERNAME ]; then
231
             if [ -d $SERVER_DIRECTORY/backup/mutt/$USERNAME ]; then
230
                 if [ ! -d /home/$USERNAME ]; then
232
                 if [ ! -d /home/$USERNAME ]; then
231
                     ${PROJECT_NAME}-adduser $USERNAME
233
                     ${PROJECT_NAME}-adduser $USERNAME
257
     fi
259
     fi
258
     for d in $SERVER_DIRECTORY/backup/gnupg/*/ ; do
260
     for d in $SERVER_DIRECTORY/backup/gnupg/*/ ; do
259
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
261
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
260
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
262
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
261
             if [ -d $SERVER_DIRECTORY/backup/gnupg/$USERNAME ]; then
263
             if [ -d $SERVER_DIRECTORY/backup/gnupg/$USERNAME ]; then
262
                 if [ ! -d /home/$USERNAME ]; then
264
                 if [ ! -d /home/$USERNAME ]; then
263
                     ${PROJECT_NAME}-adduser $USERNAME
265
                     ${PROJECT_NAME}-adduser $USERNAME
290
     fi
292
     fi
291
     for d in $SERVER_DIRECTORY/backup/procmail/*/ ; do
293
     for d in $SERVER_DIRECTORY/backup/procmail/*/ ; do
292
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
294
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
293
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
295
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
294
             if [ -d $SERVER_DIRECTORY/backup/procmail/$USERNAME ]; then
296
             if [ -d $SERVER_DIRECTORY/backup/procmail/$USERNAME ]; then
295
                 if [ ! -d /home/$USERNAME ]; then
297
                 if [ ! -d /home/$USERNAME ]; then
296
                     ${PROJECT_NAME}-adduser $USERNAME
298
                     ${PROJECT_NAME}-adduser $USERNAME
317
     fi
319
     fi
318
     for d in $SERVER_DIRECTORY/backup/spamassassin/*/ ; do
320
     for d in $SERVER_DIRECTORY/backup/spamassassin/*/ ; do
319
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
321
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
320
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
322
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
321
             if [ -d $SERVER_DIRECTORY/backup/spamassassin/$USERNAME ]; then
323
             if [ -d $SERVER_DIRECTORY/backup/spamassassin/$USERNAME ]; then
322
                 if [ ! -d /home/$USERNAME ]; then
324
                 if [ ! -d /home/$USERNAME ]; then
323
                     ${PROJECT_NAME}-adduser $USERNAME
325
                     ${PROJECT_NAME}-adduser $USERNAME
363
     fi
365
     fi
364
     for d in $SERVER_DIRECTORY/backup/ssh/*/ ; do
366
     for d in $SERVER_DIRECTORY/backup/ssh/*/ ; do
365
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
367
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
366
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
368
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
367
             if [ -d $SERVER_DIRECTORY/backup/ssh/$USERNAME ]; then
369
             if [ -d $SERVER_DIRECTORY/backup/ssh/$USERNAME ]; then
368
                 if [ ! -d /home/$USERNAME ]; then
370
                 if [ ! -d /home/$USERNAME ]; then
369
                     ${PROJECT_NAME}-adduser $USERNAME
371
                     ${PROJECT_NAME}-adduser $USERNAME
390
     fi
392
     fi
391
     for d in $SERVER_DIRECTORY/backup/config/*/ ; do
393
     for d in $SERVER_DIRECTORY/backup/config/*/ ; do
392
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
394
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
393
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
395
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
394
             if [ -d $SERVER_DIRECTORY/backup/config/$USERNAME ]; then
396
             if [ -d $SERVER_DIRECTORY/backup/config/$USERNAME ]; then
395
                 if [ ! -d /home/$USERNAME ]; then
397
                 if [ ! -d /home/$USERNAME ]; then
396
                     ${PROJECT_NAME}-adduser $USERNAME
398
                     ${PROJECT_NAME}-adduser $USERNAME
429
     fi
431
     fi
430
     for d in $SERVER_DIRECTORY/backup/monkeysphere/*/ ; do
432
     for d in $SERVER_DIRECTORY/backup/monkeysphere/*/ ; do
431
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
433
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
432
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
434
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
433
             if [ -d $SERVER_DIRECTORY/backup/monkeysphere/$USERNAME ]; then
435
             if [ -d $SERVER_DIRECTORY/backup/monkeysphere/$USERNAME ]; then
434
                 if [ ! -d /home/$USERNAME ]; then
436
                 if [ ! -d /home/$USERNAME ]; then
435
                     ${PROJECT_NAME}-adduser $USERNAME
437
                     ${PROJECT_NAME}-adduser $USERNAME
466
     fi
468
     fi
467
     for d in $SERVER_DIRECTORY/backup/fin/*/ ; do
469
     for d in $SERVER_DIRECTORY/backup/fin/*/ ; do
468
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
470
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
469
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
471
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
470
             if [ -d $SERVER_DIRECTORY/backup/fin/$USERNAME ]; then
472
             if [ -d $SERVER_DIRECTORY/backup/fin/$USERNAME ]; then
471
                 if [ ! -d /home/$USERNAME ]; then
473
                 if [ ! -d /home/$USERNAME ]; then
472
                     ${PROJECT_NAME}-adduser $USERNAME
474
                     ${PROJECT_NAME}-adduser $USERNAME
493
     fi
495
     fi
494
     for d in $SERVER_DIRECTORY/backup/local/*/ ; do
496
     for d in $SERVER_DIRECTORY/backup/local/*/ ; do
495
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
497
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
496
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
498
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
497
             if [ -d $SERVER_DIRECTORY/backup/local/$USERNAME ]; then
499
             if [ -d $SERVER_DIRECTORY/backup/local/$USERNAME ]; then
498
                 if [ ! -d /home/$USERNAME ]; then
500
                 if [ ! -d /home/$USERNAME ]; then
499
                     ${PROJECT_NAME}-adduser $USERNAME
501
                     ${PROJECT_NAME}-adduser $USERNAME
561
     fi
563
     fi
562
     for d in $SERVER_DIRECTORY/backup/personal/*/ ; do
564
     for d in $SERVER_DIRECTORY/backup/personal/*/ ; do
563
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
565
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
564
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
566
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
565
             if [ -d $SERVER_DIRECTORY/backup/personal/$USERNAME ]; then
567
             if [ -d $SERVER_DIRECTORY/backup/personal/$USERNAME ]; then
566
                 if [ ! -d /home/$USERNAME ]; then
568
                 if [ ! -d /home/$USERNAME ]; then
567
                     ${PROJECT_NAME}-adduser $USERNAME
569
                     ${PROJECT_NAME}-adduser $USERNAME
608
     fi
610
     fi
609
     for d in $SERVER_DIRECTORY/backup/mail/*/ ; do
611
     for d in $SERVER_DIRECTORY/backup/mail/*/ ; do
610
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
612
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
611
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
613
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
612
             if [ -d $SERVER_DIRECTORY/backup/mail/$USERNAME ]; then
614
             if [ -d $SERVER_DIRECTORY/backup/mail/$USERNAME ]; then
613
                 if [ ! -d /home/$USERNAME ]; then
615
                 if [ ! -d /home/$USERNAME ]; then
614
                     ${PROJECT_NAME}-adduser $USERNAME
616
                     ${PROJECT_NAME}-adduser $USERNAME

+ 4
- 2
src/freedombone-sec View File

36
 CONFIGURATION_FILE=/root/${PROJECT_NAME}.cfg
36
 CONFIGURATION_FILE=/root/${PROJECT_NAME}.cfg
37
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
37
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
38
 
38
 
39
+source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-validation
40
+
39
 SSL_PROTOCOLS=
41
 SSL_PROTOCOLS=
40
 SSL_CIPHERS=
42
 SSL_CIPHERS=
41
 SSH_CIPHERS=
43
 SSH_CIPHERS=
336
     monkeysphere_server_keys=$(monkeysphere-host show-key | grep $"OpenPGP fingerprint" | awk -F ' ' '{print $3}')
338
     monkeysphere_server_keys=$(monkeysphere-host show-key | grep $"OpenPGP fingerprint" | awk -F ' ' '{print $3}')
337
     for d in /home/*/ ; do
339
     for d in /home/*/ ; do
338
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
340
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
339
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
341
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
340
             if [ ! -d /home/$USERNAME/.monkeysphere ]; then
342
             if [ ! -d /home/$USERNAME/.monkeysphere ]; then
341
                 mkdir /home/$USERNAME/.monkeysphere
343
                 mkdir /home/$USERNAME/.monkeysphere
342
             fi
344
             fi
954
 function refresh_gpg_keys {
956
 function refresh_gpg_keys {
955
     for d in /home/*/ ; do
957
     for d in /home/*/ ; do
956
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
958
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
957
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
959
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
958
             su -c 'gpg --refresh-keys' - $USERNAME
960
             su -c 'gpg --refresh-keys' - $USERNAME
959
         fi
961
         fi
960
     done
962
     done

+ 7
- 5
src/freedombone-syncthing View File

36
 export TEXTDOMAIN=$PROJECT_NAME-syncthing
36
 export TEXTDOMAIN=$PROJECT_NAME-syncthing
37
 export TEXTDOMAINDIR="/usr/share/locale"
37
 export TEXTDOMAINDIR="/usr/share/locale"
38
 
38
 
39
+source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-validation
40
+
39
 # File which keeps track of what has already been installed
41
 # File which keeps track of what has already been installed
40
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
42
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
41
 
43
 
97
 
99
 
98
     for d in /home/*/ ; do
100
     for d in /home/*/ ; do
99
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
101
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
100
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
102
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
101
             echo "    <folder id=\"$USERNAME\" path=\"/home/$USERNAME/Sync/\" ro=\"false\" rescanIntervalS=\"60\" ignorePerms=\"false\" autoNormalize=\"true\">" >> $SYNCTHING_CONFIG_FILE
103
             echo "    <folder id=\"$USERNAME\" path=\"/home/$USERNAME/Sync/\" ro=\"false\" rescanIntervalS=\"60\" ignorePerms=\"false\" autoNormalize=\"true\">" >> $SYNCTHING_CONFIG_FILE
102
             # include any specified device IDs for this user
104
             # include any specified device IDs for this user
103
             if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
105
             if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
137
     echo "" > $TEMP_IDS_FILE
139
     echo "" > $TEMP_IDS_FILE
138
     for d in /home/*/ ; do
140
     for d in /home/*/ ; do
139
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
141
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
140
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
142
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
141
             if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
143
             if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
142
                 while read -r line || [[ -n "$line" ]]; do
144
                 while read -r line || [[ -n "$line" ]]; do
143
                     line2="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
145
                     line2="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
177
     echo "" > $TEMP_IDS_FILE
179
     echo "" > $TEMP_IDS_FILE
178
     for d in /home/*/ ; do
180
     for d in /home/*/ ; do
179
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
181
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
180
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
182
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
181
             if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
183
             if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
182
                 while read -r line || [[ -n "$line" ]]; do
184
                 while read -r line || [[ -n "$line" ]]; do
183
                     line2="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
185
                     line2="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
236
     # This allows it to appear within the user control panel
238
     # This allows it to appear within the user control panel
237
     for d in /home/*/ ; do
239
     for d in /home/*/ ; do
238
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
240
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
239
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
241
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
240
             echo "$SYNCTHING_ID" > /home/$USERNAME/.syncthing-server-id
242
             echo "$SYNCTHING_ID" > /home/$USERNAME/.syncthing-server-id
241
             chown $USERNAME:$USERNAME /home/$USERNAME/.syncthing-server-id
243
             chown $USERNAME:$USERNAME /home/$USERNAME/.syncthing-server-id
242
         fi
244
         fi
257
 
259
 
258
     for d in /home/*/ ; do
260
     for d in /home/*/ ; do
259
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
261
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
260
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
262
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
261
             if [ -f /home/$USERNAME/$SYNCTHING_UPDATE_FILE ]; then
263
             if [ -f /home/$USERNAME/$SYNCTHING_UPDATE_FILE ]; then
262
                 CHANGED=1
264
                 CHANGED=1
263
             fi
265
             fi

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

275
     echo $"Setting permissions"
275
     echo $"Setting permissions"
276
     for d in /home/*/ ; do
276
     for d in /home/*/ ; do
277
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
277
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
278
-        if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" && $USERNAME != "tahoelafs" ]]; then
278
+        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
279
             chown -R $USERNAME:$USERNAME /home/$USERNAME
279
             chown -R $USERNAME:$USERNAME /home/$USERNAME
280
         fi
280
         fi
281
     done
281
     done

+ 9
- 0
src/freedombone-utils-validation View File

60
     VALID_CODE='yes'
60
     VALID_CODE='yes'
61
 }
61
 }
62
 
62
 
63
+function is_valid_user {
64
+    USRNAME="$1"
65
+    if [[ "$USRNAME" != "go" && "$USRNAME" != "gogs" && "$USRNAME" != "git" && "$USRNAME" != "mirrors" && "$USRNAME" != "sync" && "$USERNAME" != "tahoelafs" ]]; then
66
+        echo "1"
67
+    else
68
+        echo "0"
69
+    fi
70
+}
71
+
63
 # NOTE: deliberately no exit 0
72
 # NOTE: deliberately no exit 0