浏览代码

Fix other passwords

Bob Mottram 8 年前
父节点
当前提交
27907b5d45
共有 5 个文件被更改,包括 8 次插入6 次删除
  1. 1
    1
      src/freedombone-image
  2. 2
    2
      src/freedombone-image-customise
  3. 2
    1
      src/freedombone-image-mesh
  4. 1
    1
      src/freedombone-mirrors
  5. 2
    1
      src/freedombone-pass

+ 1
- 1
src/freedombone-image 查看文件

465
 
465
 
466
 if [ ! $PASSWORD ]; then
466
 if [ ! $PASSWORD ]; then
467
     # generate a random password
467
     # generate a random password
468
-    PASSWORD="$(openssl rand -base64 30 | cut -c1-${MINIMUM_PASSWORD_LENGTH})"
468
+    PASSWORD=$(openssl rand -base64 32 | tr -dc A-Za-z0-9 | head -c ${MINIMUM_PASSWORD_LENGTH})
469
 fi
469
 fi
470
 
470
 
471
 # Move any existing images into a build subdirectory
471
 # Move any existing images into a build subdirectory

+ 2
- 2
src/freedombone-image-customise 查看文件

358
     echo "            dialog --backtitle \"${ENTROPY_MESSAGE1}\" --title \"${ENTROPY_MESSAGE2}\" --msgbox \"${ENTROPY_MESSAGE3}\" 8 50" >> $rootdir/root/.bashrc
358
     echo "            dialog --backtitle \"${ENTROPY_MESSAGE1}\" --title \"${ENTROPY_MESSAGE2}\" --msgbox \"${ENTROPY_MESSAGE3}\" 8 50" >> $rootdir/root/.bashrc
359
     echo '            exit' >> $rootdir/root/.bashrc
359
     echo '            exit' >> $rootdir/root/.bashrc
360
     echo '        fi' >> $rootdir/root/.bashrc
360
     echo '        fi' >> $rootdir/root/.bashrc
361
-    echo -n '        NEW_USER_PASSWORD="$(openssl rand -base64 30 | cut -c1-' >> $rootdir/root/.bashrc
362
-    echo "${DEFAULT_PASSWORD_LENGTH})\"" >> $rootdir/root/.bashrc
361
+    echo -n '        NEW_USER_PASSWORD=$(openssl rand -base64 32 | tr -dc A-Za-z0-9 | head -c ' >> $rootdir/root/.bashrc
362
+    echo "${DEFAULT_PASSWORD_LENGTH})" >> $rootdir/root/.bashrc
363
     echo '    fi' >> $rootdir/root/.bashrc
363
     echo '    fi' >> $rootdir/root/.bashrc
364
     echo '    echo "${NEW_USER_PASSWORD}" > ~/login.txt' >> $rootdir/root/.bashrc
364
     echo '    echo "${NEW_USER_PASSWORD}" > ~/login.txt' >> $rootdir/root/.bashrc
365
 
365
 

+ 2
- 1
src/freedombone-image-mesh 查看文件

356
         echo "WARNING: ${tomb_name} tomb did not install properly" >> /var/log/${PROJECT_NAME}.log
356
         echo "WARNING: ${tomb_name} tomb did not install properly" >> /var/log/${PROJECT_NAME}.log
357
         tomb >> /var/log/${PROJECT_NAME}.log
357
         tomb >> /var/log/${PROJECT_NAME}.log
358
     fi
358
     fi
359
-    TOMB_TEMP_PASSWORD="$(openssl rand -base64 32 | cut -c1-30)"
359
+    TOMB_TEMP_PASSWORD=$(openssl rand -base64 64 | tr -dc A-Za-z0-9 | head -c 30)
360
+
360
     tomb forge /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
361
     tomb forge /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
361
     tomb lock /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
362
     tomb lock /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
362
     tomb open /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
363
     tomb open /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe

+ 1
- 1
src/freedombone-mirrors 查看文件

97
     fi
97
     fi
98
 
98
 
99
     if [ $create_password ]; then
99
     if [ $create_password ]; then
100
-        MY_MIRRORS_PASSWORD="$(openssl rand -base64 20 | cut -c1-18)"
100
+        MY_MIRRORS_PASSWORD=$(openssl rand -base64 64 | tr -dc A-Za-z0-9 | head -c 18)
101
     fi
101
     fi
102
 
102
 
103
     chmod 600 /etc/shadow
103
     chmod 600 /etc/shadow

+ 2
- 1
src/freedombone-pass 查看文件

255
         mkdir -p /root/.passwords/root
255
         mkdir -p /root/.passwords/root
256
     fi
256
     fi
257
     if [ ! -f /root/.passwords/root/master ]; then
257
     if [ ! -f /root/.passwords/root/master ]; then
258
-        echo "$(openssl rand -base64 32 | cut -c1-30)" > /root/.passwords/root/master
258
+        newpass=$(openssl rand -base64 64 | tr -dc A-Za-z0-9 | head -c 30)
259
+        echo "$newpass" > /root/.passwords/root/master
259
         chmod 700 /root/.passwords/root/master
260
         chmod 700 /root/.passwords/root/master
260
     fi
261
     fi
261
     MASTER_PASSWORD=$(cat /root/.passwords/root/master)
262
     MASTER_PASSWORD=$(cat /root/.passwords/root/master)