b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #183167 from mweinelt/vaultwarden-1.25.2

Browse source
This commit is contained in:
ajs124 2022-07-28 02:50:50 +02:00 committed by GitHub
parent 4b9ec37bff bfb1246d29
commit 6372876b36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
nixos/tests/vaultwarden.nix
View file

@ -74,7 +74,10 @@ let
services.vaultwarden = {
enable = true;
dbBackend = backend;
config.rocketPort = 80;
config = {
rocketAddress = "0.0.0.0";
rocketPort = 80;
};
};
networking.firewall.allowedTCPPorts = [ 80 ];
@ -85,6 +88,8 @@ let
{
libraries = [ pkgs.python3Packages.selenium ];
} ''
from selenium.webdriver.common.by import By
from selenium.webdriver import Firefox
from selenium.webdriver.firefox.options import Options
from selenium.webdriver.support.ui import WebDriverWait
@ -101,40 +106,40 @@ let
wait.until(EC.title_contains("Create Account"))
driver.find_element_by_css_selector('input#email').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#email').send_keys(
'${userEmail}'
)
driver.find_element_by_css_selector('input#name').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys(
'A Cat'
)
driver.find_element_by_css_selector('input#masterPassword').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#masterPassword').send_keys(
'${userPassword}'
)
driver.find_element_by_css_selector('input#masterPasswordRetype').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#masterPasswordRetype').send_keys(
'${userPassword}'
)
driver.find_element_by_xpath("//button[contains(., 'Submit')]").click()
driver.find_element(By.XPATH, "//button[contains(., 'Submit')]").click()
wait.until_not(EC.title_contains("Create Account"))
driver.find_element_by_css_selector('input#masterPassword').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#masterPassword').send_keys(
'${userPassword}'
)
driver.find_element_by_xpath("//button[contains(., 'Log In')]").click()
driver.find_element(By.XPATH, "//button[contains(., 'Log In')]").click()
wait.until(EC.title_contains("My Vault"))
wait.until(EC.title_contains("Bitwarden Web Vault"))
driver.find_element_by_xpath("//button[contains(., 'Add Item')]").click()
driver.find_element(By.XPATH, "//button[contains(., 'Add Item')]").click()
driver.find_element_by_css_selector('input#name').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys(
'secrets'
)
driver.find_element_by_css_selector('input#loginPassword').send_keys(
driver.find_element(By.CSS_SELECTOR, 'input#loginPassword').send_keys(
'${storedPassword}'
)
driver.find_element_by_xpath("//button[contains(., 'Save')]").click()
driver.find_element(By.XPATH, "//button[contains(., 'Save')]").click()
'';
in
[ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ];

6
pkgs/tools/security/vaultwarden/default.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "vaultwarden";
version = "1.24.0";
version = "1.25.2";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = pname;
rev = version;
sha256 = "sha256-zeMVdsTSp1z8cwebU2N6w7436N8CcI7PzNedDOSvEx4=";
sha256 = "sha256-6CpdvLCw7SUmWm9NHAxFAo454Rrp1FloDp67YAr0pjQ=";
};
cargoSha256 = "sha256-Sn6DuzV2OfaywE0W2afRG0h8PfOprqMtZtYM/exGEww=";
cargoSha256 = "sha256-+rXQGZNUz6UDLFVNbyHF6dTe3nEm5/2ITmVI+MfY6nM=";
postPatch = ''
# Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working

4
pkgs/tools/security/vaultwarden/vault.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "vaultwarden-vault";
version = "2022.5.2";
version = "2022.6.2";
src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
sha256 = "sha256-clsiEC9nwfrGMIBwT95G3tR3KLxMvMM553s8it/3JtM=";
sha256 = "sha256-IG/eCBTUa7eKeaelqxCWO+rrXJUuBanhsYwklftxdOE=";
};
buildCommand = ''