浏览代码

No permissions on shadow most of the time

Bob Mottram 8 年前
父节点
当前提交
e1a352919f

+ 4
- 0
src/freedombone-addsipuser 查看文件

105
     echo $line >> $NEW_CONFIG_FILE
105
     echo $line >> $NEW_CONFIG_FILE
106
     done < $CONFIG_FILE
106
     done < $CONFIG_FILE
107
     mv $NEW_CONFIG_FILE $CONFIG_FILE
107
     mv $NEW_CONFIG_FILE $CONFIG_FILE
108
+    chmod 600 /etc/shadow
109
+    chmod 600 /etc/gshadow
108
     usermod -aG sipwitch $MY_USERNAME
110
     usermod -aG sipwitch $MY_USERNAME
111
+    chmod 0000 /etc/shadow
112
+    chmod 0000 /etc/gshadow
109
 }
113
 }
110
 
114
 
111
 while [[ $# > 1 ]]
115
 while [[ $# > 1 ]]

+ 2
- 2
src/freedombone-adduser 查看文件

75
 MINIMUM_PASSWORD_LENGTH=$(cat /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
75
 MINIMUM_PASSWORD_LENGTH=$(cat /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
76
 
76
 
77
 NEW_USER_PASSWORD="$(openssl rand -base64 30 | cut -c1-${MINIMUM_PASSWORD_LENGTH})"
77
 NEW_USER_PASSWORD="$(openssl rand -base64 30 | cut -c1-${MINIMUM_PASSWORD_LENGTH})"
78
-chmod 700 /etc/shadow
79
-chmod 700 /etc/gshadow
78
+chmod 600 /etc/shadow
79
+chmod 600 /etc/gshadow
80
 useradd -m -p "$NEW_USER_PASSWORD" -s /bin/bash $ADD_USERNAME
80
 useradd -m -p "$NEW_USER_PASSWORD" -s /bin/bash $ADD_USERNAME
81
 adduser $ADD_USERNAME sasl
81
 adduser $ADD_USERNAME sasl
82
 chmod 0000 /etc/shadow
82
 chmod 0000 /etc/shadow

+ 4
- 0
src/freedombone-app-pihole 查看文件

346
 function install_pihole {
346
 function install_pihole {
347
     apt-get -yq install dnsmasq curl
347
     apt-get -yq install dnsmasq curl
348
     adduser --disabled-login --gecos 'pi-hole' pihole
348
     adduser --disabled-login --gecos 'pi-hole' pihole
349
+    chmod 600 /etc/shadow
350
+    chmod 600 /etc/gshadow
349
     usermod -a -G www-data pihole
351
     usermod -a -G www-data pihole
352
+    chmod 0000 /etc/shadow
353
+    chmod 0000 /etc/gshadow
350
 
354
 
351
     systemctl enable dnsmasq
355
     systemctl enable dnsmasq
352
 
356
 

+ 8
- 0
src/freedombone-app-sip 查看文件

77
 
77
 
78
     # add user to the sipwitch group
78
     # add user to the sipwitch group
79
     if [ -f /etc/sipwitch.conf ]; then
79
     if [ -f /etc/sipwitch.conf ]; then
80
+        chmod 600 /etc/shadow
81
+        chmod 600 /etc/gshadow
80
         usermod -aG sipwitch $new_username
82
         usermod -aG sipwitch $new_username
83
+        chmod 0000 /etc/shadow
84
+        chmod 0000 /etc/gshadow
81
     fi
85
     fi
82
 
86
 
83
     # add user for SIP STUN/TURN
87
     # add user for SIP STUN/TURN
300
     sed -i 's|#PLUGINS=|PLUGINS=|g' /etc/default/sipwitch
304
     sed -i 's|#PLUGINS=|PLUGINS=|g' /etc/default/sipwitch
301
     sed -i 's|PLUGINS=.*|PLUGINS="zeroconf subscriber forward"|g' /etc/default/sipwitch
305
     sed -i 's|PLUGINS=.*|PLUGINS="zeroconf subscriber forward"|g' /etc/default/sipwitch
302
     groupadd sipwitch
306
     groupadd sipwitch
307
+    chmod 600 /etc/shadow
308
+    chmod 600 /etc/gshadow
303
     usermod -aG sipwitch $MY_USERNAME
309
     usermod -aG sipwitch $MY_USERNAME
310
+    chmod 0000 /etc/shadow
311
+    chmod 0000 /etc/gshadow
304
 
312
 
305
     SIP_ONION_HOSTNAME=$(add_onion_service sip ${SIP_PORT} ${SIP_PORT})
313
     SIP_ONION_HOSTNAME=$(add_onion_service sip ${SIP_PORT} ${SIP_PORT})
306
 
314
 

+ 4
- 0
src/freedombone-app-tox 查看文件

506
         chroot ${rootdir} /usr/sbin/useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment $"Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
506
         chroot ${rootdir} /usr/sbin/useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment $"Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
507
         chroot ${rootdir} /bin/chmod 700 /var/lib/tox-bootstrapd
507
         chroot ${rootdir} /bin/chmod 700 /var/lib/tox-bootstrapd
508
     else
508
     else
509
+        chmod 600 /etc/shadow
510
+        chmod 600 /etc/gshadow
509
         useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment $"Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
511
         useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment $"Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
512
+        chmod 0000 /etc/shadow
513
+        chmod 0000 /etc/gshadow
510
         chmod 700 /var/lib/tox-bootstrapd
514
         chmod 700 /var/lib/tox-bootstrapd
511
     fi
515
     fi
512
 
516
 

+ 4
- 0
src/freedombone-app-xmpp 查看文件

363
     fi
363
     fi
364
 
364
 
365
     groupadd default
365
     groupadd default
366
+    chmod 600 /etc/shadow
367
+    chmod 600 /etc/gshadow
366
     usermod -g default prosody
368
     usermod -g default prosody
369
+    chmod 0000 /etc/shadow
370
+    chmod 0000 /etc/gshadow
367
 
371
 
368
     chown root:default /etc/ssl/private/xmpp.*
372
     chown root:default /etc/ssl/private/xmpp.*
369
     chown root:default /etc/ssl/certs/xmpp.*
373
     chown root:default /etc/ssl/certs/xmpp.*

+ 8
- 0
src/freedombone-base-email 查看文件

594
     update-exim4.conf.template -r
594
     update-exim4.conf.template -r
595
     update-exim4.conf
595
     update-exim4.conf
596
     systemctl restart exim4
596
     systemctl restart exim4
597
+    chmod 600 /etc/shadow
598
+    chmod 600 /etc/gshadow
597
     useradd -d /var/schleuderlists -s /bin/false schleuder
599
     useradd -d /var/schleuderlists -s /bin/false schleuder
598
     adduser Debian-exim schleuder
600
     adduser Debian-exim schleuder
599
     usermod -a -G mail schleuder
601
     usermod -a -G mail schleuder
602
+    chmod 0000 /etc/shadow
603
+    chmod 0000 /etc/gshadow
600
     #exim -d -bt $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME
604
     #exim -d -bt $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME
601
     mark_completed $FUNCNAME
605
     mark_completed $FUNCNAME
602
 }
606
 }
1277
         fi
1281
         fi
1278
     fi
1282
     fi
1279
 
1283
 
1284
+    chmod 600 /etc/shadow
1285
+    chmod 600 /etc/gshadow
1280
     groupadd default
1286
     groupadd default
1281
     usermod -g default dovecot
1287
     usermod -g default dovecot
1288
+    chmod 0000 /etc/shadow
1289
+    chmod 0000 /etc/gshadow
1282
 
1290
 
1283
     chown root:default /etc/ssl/certs/dovecot.*
1291
     chown root:default /etc/ssl/certs/dovecot.*
1284
     chown root:default /etc/ssl/private/dovecot.*
1292
     chown root:default /etc/ssl/private/dovecot.*

+ 4
- 0
src/freedombone-config 查看文件

636
                            if [ ${#possible_username} -gt 1 ]; then
636
                            if [ ${#possible_username} -gt 1 ]; then
637
                                if [[ $possible_username != $GENERIC_IMAGE_USERNAME ]]; then
637
                                if [[ $possible_username != $GENERIC_IMAGE_USERNAME ]]; then
638
                                    MY_USERNAME=$(cat $data)
638
                                    MY_USERNAME=$(cat $data)
639
+                                   chmod 600 /etc/shadow
640
+                                   chmod 600 /etc/gshadow
639
                                    useradd -m -s /bin/bash $MY_USERNAME
641
                                    useradd -m -s /bin/bash $MY_USERNAME
642
+                                   chmod 0000 /etc/shadow
643
+                                   chmod 0000 /etc/gshadow
640
                                    if [ -d /home/$MY_USERNAME ]; then
644
                                    if [ -d /home/$MY_USERNAME ]; then
641
                                        echo "${MY_USERNAME}:$(printf `cat $IMAGE_PASSWORD_FILE`)" | chpasswd
645
                                        echo "${MY_USERNAME}:$(printf `cat $IMAGE_PASSWORD_FILE`)" | chpasswd
642
                                        # Add the user as a sudoer - they will be the new admin user
646
                                        # Add the user as a sudoer - they will be the new admin user

+ 4
- 0
src/freedombone-mirrors 查看文件

100
         MY_MIRRORS_PASSWORD="$(openssl rand -base64 20 | cut -c1-18)"
100
         MY_MIRRORS_PASSWORD="$(openssl rand -base64 20 | cut -c1-18)"
101
     fi
101
     fi
102
 
102
 
103
+    chmod 600 /etc/shadow
104
+    chmod 600 /etc/gshadow
103
     useradd -m -p "$MY_MIRRORS_PASSWORD" -s /bin/bash mirrors
105
     useradd -m -p "$MY_MIRRORS_PASSWORD" -s /bin/bash mirrors
106
+    chmod 0000 /etc/shadow
107
+    chmod 0000 /etc/gshadow
104
 
108
 
105
     # remove any existing user files
109
     # remove any existing user files
106
     rm -rf /home/mirrors/*
110
     rm -rf /home/mirrors/*

+ 2
- 2
src/freedombone-rmuser 查看文件

136
     fi
136
     fi
137
 done
137
 done
138
 
138
 
139
-chmod 700 /etc/shadow
140
-chmod 700 /etc/gshadow
139
+chmod 600 /etc/shadow
140
+chmod 600 /etc/gshadow
141
 userdel -r $REMOVE_USERNAME
141
 userdel -r $REMOVE_USERNAME
142
 chmod 0000 /etc/shadow
142
 chmod 0000 /etc/shadow
143
 chmod 0000 /etc/gshadow
143
 chmod 0000 /etc/gshadow

+ 4
- 0
src/freedombone-utils-web 查看文件

436
     fi
436
     fi
437
 
437
 
438
     # create an unprivileged user
438
     # create an unprivileged user
439
+    #chmod 600 /etc/shadow
440
+    #chmod 600 /etc/gshadow
439
     #useradd -r -s /bin/false debian-inadyn
441
     #useradd -r -s /bin/false debian-inadyn
442
+    #chmod 0000 /etc/shadow
443
+    #chmod 0000 /etc/gshadow
440
 
444
 
441
     # create a configuration file
445
     # create a configuration file
442
     echo 'background' > /etc/inadyn.conf
446
     echo 'background' > /etc/inadyn.conf