From f8636d1e2da7e5456895459a8d54db6390bc652b Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Mon, 21 Nov 2022 22:44:55 +0000 Subject: [PATCH] addon/proftpd: conver password generation to openssl Signed-off-by: Ian Leonard --- .../service/proftpd/source/bin/proftpd.start | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/addons/service/proftpd/source/bin/proftpd.start b/packages/addons/service/proftpd/source/bin/proftpd.start index d1dcc1907f..04603893cc 100755 --- a/packages/addons/service/proftpd/source/bin/proftpd.start +++ b/packages/addons/service/proftpd/source/bin/proftpd.start @@ -99,18 +99,18 @@ chmod 700 /var/config/proftpd.passwd for NUM in $(seq 1 100); do - case "$CryptoHash" in - "0") password_salt=$(python -c "import crypt; print(crypt.mksalt(crypt.METHOD_SHA512))");; - "1") password_salt=$(python -c "import crypt; print(crypt.mksalt(crypt.METHOD_SHA256))");; - "2") password_salt=$(python -c "import crypt; print(crypt.mksalt(crypt.METHOD_MD5))");; - esac - USERNAME=$(eval echo \$Username${NUM}) USERPASS=$(eval echo \$Userpass${NUM}) USERPATH=$(eval echo \$Userpath${NUM}) + case "$CryptoHash" in + "0") password_entry=$(openssl passwd -6 "${USERPASS}");; + "1") password_entry=$(openssl passwd -5 "${USERPASS}");; + "2") password_entry=$(openssl passwd -1 "${USERPASS}");; + esac + if [ -n "$USERNAME" ]; then - echo $USERNAME:$(python -c "import crypt; print(crypt.crypt('${USERPASS}', '${password_salt}'))"):10:10::$USERPATH:/bin/false >> /var/config/proftpd.passwd + echo $USERNAME:$password_entry:10:10::$USERPATH:/bin/false >> /var/config/proftpd.passwd # user writes with different user/group mkdir -p "$USERPATH" chmod 777 "$USERPATH"