nick
/
Proxmox_Scripts
mirror of https://github.com/tteck/Proxmox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: nick:c152e24ef8d393efb788dff14ddc35ac50fc5b3d
Branches Tags
nick:main
nick:gh-pages
..
compare: nick:ab2cd43c159e79145b699e3c0bdda48c45ff776c
Branches Tags
nick:gh-pages
nick:main

3 Commits
c152e24ef8 ... ab2cd43c15

Author SHA1 Message Date
tteckster ab2cd43c15
Update vaultwarden.sh 
tweak
 2023-04-09 23:50:49 -04:00
tteckster c46675f250
Update vaultwarden-install.sh 
Add Argon2
 2023-04-09 23:47:27 -04:00
tteckster 1267ac0131
Update vaultwarden.sh 
Use Argon2 to securely hash passwords and protect them against various types of attacks.
 2023-04-09 23:45:57 -04:00
2 changed files with 10 additions and 8 deletions
Show Stats Expand all files Collapse all files

13
ct/vaultwarden.sh
View File

@ -65,7 +65,7 @@ function update_script() {
UPD=$(whiptail --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 3 \ UPD=$(whiptail --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 3 \
"1" "VaultWarden $VAULT" ON \ "1" "VaultWarden $VAULT" ON \
"2" "Web-Vault $WVRELEASE" OFF \ "2" "Web-Vault $WVRELEASE" OFF \
"3" "Show Admin Token" OFF \ "3" "Set Admin Token" OFF \
3>&1 1>&2 2>&3) 3>&1 1>&2 2>&3)
header_info header_info
@ -121,11 +121,12 @@ function update_script() {
exit exit
fi fi
if [ "$UPD" == "3" ]; then if [ "$UPD" == "3" ]; then
DIR=/usr/bin/vaultwarden if NEWTOKEN=$(whiptail --passwordbox "Set the ADMIN_TOKEN" 10 58 3>&1 1>&2 2>&3); then
if [ -d "$DIR" ]; then if [[ -z "$NEWTOKEN" ]]; then exit; fi
cat /etc/vaultwarden.env | grep "ADMIN_TOKEN" if ! command -v argon2 >/dev/null 2>&1; then apt-get install -y argon2 &>/dev/null; fi
else TOKEN=$(echo -n ${NEWTOKEN} | argon2 "$(openssl rand -base64 32)" -t 2 -m 16 -p 4 -l 64 -e)
cat /opt/vaultwarden/.env | grep "ADMIN_TOKEN" sed -i "s|ADMIN_TOKEN='.*'|ADMIN_TOKEN='${TOKEN}'|" /opt/vaultwarden/.env
systemctl restart vaultwarden
fi fi
exit exit
fi fi

5
install/vaultwarden-install.sh
View File

@ -5,7 +5,7 @@
# License: MIT # License: MIT
# https://github.com/tteck/Proxmox/raw/main/LICENSE # https://github.com/tteck/Proxmox/raw/main/LICENSE
source /dev/stdin <<< "$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
catch_errors catch_errors
@ -24,6 +24,7 @@ $STD apt-get -qqy install \
libpq-dev \ libpq-dev \
curl \ curl \
sudo \ sudo \
argon2 \
mc mc
msg_ok "Installed Dependencies" msg_ok "Installed Dependencies"
@ -61,7 +62,7 @@ $STD tar -xzf bw_web_$WEBVAULT.tar.gz -C /opt/vaultwarden/
msg_ok "Downloaded Web-Vault ${WEBVAULT}" msg_ok "Downloaded Web-Vault ${WEBVAULT}"
cat <<EOF >/opt/vaultwarden/.env cat <<EOF >/opt/vaultwarden/.env
ADMIN_TOKEN=$(openssl rand -base64 48) ADMIN_TOKEN=''
ROCKET_ADDRESS=0.0.0.0 ROCKET_ADDRESS=0.0.0.0
DATA_FOLDER=/opt/vaultwarden/data DATA_FOLDER=/opt/vaultwarden/data
DATABASE_MAX_CONNS=10 DATABASE_MAX_CONNS=10