Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Remove unused appsettings references and update tests
Leendert de Borstafc76fa843f7
diff --git a/apps/web/entrypoint.sh b/apps/web/entrypoint.shindex d5468822a..9615f265d 100755--- a/apps/web/entrypoint.sh+++ b/apps/web/entrypoint.sh@@ -1,13 +1,9 @@#!/bin/sh# Set the default values-DEFAULT_PRIVATE_EMAIL_DOMAINS=""-DEFAULT_HIDDEN_PRIVATE_EMAIL_DOMAINS=""DEFAULT_SUPPORT_EMAIL=""DEFAULT_PUBLIC_REGISTRATION_ENABLED="true"# Use the provided environment variables if they exist, otherwise use defaults-PRIVATE_EMAIL_DOMAINS=${PRIVATE_EMAIL_DOMAINS:-$DEFAULT_PRIVATE_EMAIL_DOMAINS}-HIDDEN_PRIVATE_EMAIL_DOMAINS=${HIDDEN_PRIVATE_EMAIL_DOMAINS:-$DEFAULT_HIDDEN_PRIVATE_EMAIL_DOMAINS}SUPPORT_EMAIL=${SUPPORT_EMAIL:-$DEFAULT_SUPPORT_EMAIL}PUBLIC_REGISTRATION_ENABLED=${PUBLIC_REGISTRATION_ENABLED:-$DEFAULT_PUBLIC_REGISTRATION_ENABLED}@@ -31,33 +27,6 @@ fi# The app will use a relative URL instead (base url + "/api/" which is the default for the Docker setup).sed -i "s|\"ApiUrl\": \"http://localhost:5100\",||g" /usr/share/nginx/html/appsettings.json-# Handle empty PRIVATE_EMAIL_DOMAINS by defaulting to empty array-if [ -z "$PRIVATE_EMAIL_DOMAINS" ]; then- json_array="[]"-else- # Convert comma-separated list to JSON array- json_array=$(echo $PRIVATE_EMAIL_DOMAINS | awk '{split($0,a,","); printf "["; for(i=1;i<=length(a);i++) {printf "\"%s\"", a[i]; if(i<length(a)) printf ","} printf "]"}')-fi--# Handle empty HIDDEN_PRIVATE_EMAIL_DOMAINS by defaulting to empty array-if [ -z "$HIDDEN_PRIVATE_EMAIL_DOMAINS" ]; then- hidden_json_array="[]"-else- # Convert comma-separated list to JSON array- hidden_json_array=$(echo $HIDDEN_PRIVATE_EMAIL_DOMAINS | awk '{split($0,a,","); printf "["; for(i=1;i<=length(a);i++) {printf "\"%s\"", a[i]; if(i<length(a)) printf ","} printf "]"}')-fi--# Use sed to update the PrivateEmailDomains field in appsettings.json-sed -i.bak "s|\"PrivateEmailDomains\": \[.*\]|\"PrivateEmailDomains\": $json_array|" /usr/share/nginx/html/appsettings.json--# Add HiddenPrivateEmailDomains field if it doesn't exist, or update it if it does-if grep -q "HiddenPrivateEmailDomains" /usr/share/nginx/html/appsettings.json; then- sed -i "s|\"HiddenPrivateEmailDomains\": \[.*\]|\"HiddenPrivateEmailDomains\": $hidden_json_array|" /usr/share/nginx/html/appsettings.json-else- # Insert HiddenPrivateEmailDomains after PrivateEmailDomains- sed -i "s|\"PrivateEmailDomains\": $json_array|\"PrivateEmailDomains\": $json_array,\n \"HiddenPrivateEmailDomains\": $hidden_json_array|" /usr/share/nginx/html/appsettings.json-fi-# Update support email in appsettings.jsonif [ ! -z "$SUPPORT_EMAIL" ]; thensed -i "s|\"SupportEmail\": \".*\"|\"SupportEmail\": \"$SUPPORT_EMAIL\"|g" /usr/share/nginx/html/appsettings.jsondiff --git a/apps/web/public/appsettings.json b/apps/web/public/appsettings.jsonindex eba6a82f9..75a804de7 100644--- a/apps/web/public/appsettings.json+++ b/apps/web/public/appsettings.json@@ -1,7 +1,5 @@{"ApiUrl": "http://localhost:5100",- "PrivateEmailDomains": ["example.tld", "example2.tld", "aliasvault.net", "disabled.tld"],- "HiddenPrivateEmailDomains": ["disabled.tld"],"PublicRegistrationEnabled": "true","DeploymentMode": "","SupportEmail": "[email protected]",diff --git a/core/rust/src/vault_sync/tests/fake_server.rs b/core/rust/src/vault_sync/tests/fake_server.rsindex 796c86677..9c6148ba3 100644--- a/core/rust/src/vault_sync/tests/fake_server.rs+++ b/core/rust/src/vault_sync/tests/fake_server.rs@@ -78,6 +78,7 @@ pub struct FakeServer {pub legacy: Option<LegacyVault>,pub pending_actions: Vec<Value>,pub capabilities: Value,+ pub email_domains: Value,pub faults: Faults,}@@ -94,6 +95,7 @@ impl FakeServer {legacy: None,pending_actions: Vec::new(),capabilities: json!({ "sharing": "on" }),+ email_domains: json!({ "privateEmailDomainList": ["private.io"], "hiddenPrivateEmailDomainList": [], "publicEmailDomainList": [] }),faults: Faults::default(),}))}@@ -258,14 +260,14 @@ impl FakeServer {"srpSalt": self.srp_salt,"capabilities": self.capabilities,"pendingActions": self.pending_actions,+ "emailDomains": self.email_domains,})}/// The `GET Vault` body.pub fn vault(&self) -> Value {- let email_routing = json!({ "privateEmailDomainList": ["private.io"], "publicEmailDomainList": [], "hiddenPrivateEmailDomainList": [], "emailAddressList": [] });if let Some(legacy) = &self.legacy {- return json!({ "storageFormat": "sqlite-blob", "legacyVaultBlob": legacy.blob, "legacyRevision": legacy.revision, "personalManifestId": self.personal_manifest_id, "emailRouting": email_routing });+ return json!({ "storageFormat": "sqlite-blob", "legacyVaultBlob": legacy.blob, "legacyRevision": legacy.revision, "personalManifestId": self.personal_manifest_id });}let manifests: Vec<Value> = self.manifests.iter().map(|(id, m)| {let mut dto = json!({ "manifestId": id, "blob": m.blob, "ciphertextHash": m.ciphertext_hash, "revision": m.revision, "blobReferences": m.blob_references });@@ -275,7 +277,7 @@ impl FakeServer {dto}).collect();let buckets: Vec<Value> = self.buckets.iter().map(|((manifest_id, category), b)| json!({ "manifestId": manifest_id, "category": category, "blob": b.blob, "ciphertextHash": b.ciphertext_hash, "revision": b.revision })).collect();- json!({ "storageFormat": "manifest", "personalManifestId": self.personal_manifest_id, "manifests": manifests, "buckets": buckets, "emailRouting": email_routing })+ json!({ "storageFormat": "manifest", "personalManifestId": self.personal_manifest_id, "manifests": manifests, "buckets": buckets })}/// The manifest and bucket revisions the server currently holds.diff --git a/core/rust/src/vault_sync/tests/sync.rs b/core/rust/src/vault_sync/tests/sync.rsindex 39f58e6bc..07a77e87e 100644--- a/core/rust/src/vault_sync/tests/sync.rs+++ b/core/rust/src/vault_sync/tests/sync.rs@@ -153,6 +153,40 @@ fn dirty_client_pushes_only_what_changed() {s.server.borrow().assert_converged(&s.host);}+/// Give an item a login email.+fn set_login_email(db: &rusqlite::Connection, item_id: &str, email: &str) {+ db.execute("INSERT INTO FieldValues (ManifestId, Id, ItemId, FieldKey, Value, Weight, ValueIndex, CreatedAt, UpdatedAt, IsDeleted) VALUES (?1, ?2, ?3, 'login.email', ?4, 0, 0, ?5, ?5, 0)", (PERSONAL_MANIFEST_ID, crate::vault_sync::db::new_id(), item_id, email, super::now())).unwrap();+}++#[test]+fn push_routes_with_the_domains_from_status() {+ let mut s = synced(|db| insert_item(db, ITEM_A, "Server item"));+ s.server.borrow_mut().email_domains = json!({ "privateEmailDomainList": ["private.io", "legacy.io"], "hiddenPrivateEmailDomainList": ["legacy.io"], "publicEmailDomainList": [] });++ // The request still carries the domains of the last pull, which lack legacy.io.+ s.host.edit(|db| {+ insert_item(db, ITEM_B, "Legacy alias");+ set_login_email(db, ITEM_B, "[email protected]");+ });+ let result = s.host.sync();++ assert_eq!(result["success"], true, "{}", result);+ let write = s.host.last_vault_write();+ assert_eq!(write["emailRouting"]["emailAddressList"][0]["address"], "[email protected]", "a hidden domain still routes");+ assert_eq!(result["emailDomains"]["hiddenPrivateEmailDomainList"], json!(["legacy.io"]), "the host is handed the current domains");+}++#[test]+fn status_check_reports_the_email_domains() {+ let mut s = synced(|db| insert_item(db, ITEM_A, "Server item"));+ s.server.borrow_mut().email_domains = json!({ "privateEmailDomainList": ["private.io"], "hiddenPrivateEmailDomainList": [], "publicEmailDomainList": ["spamok.com"] });++ let result = s.host.run("statusCheck");++ assert_eq!(result["success"], true, "{}", result);+ assert_eq!(result["emailDomains"]["publicEmailDomainList"], json!(["spamok.com"]));+}+#[test]fn no_op_mutation_clears_the_dirty_flag_without_a_write() {let mut s = synced(|db| insert_item(db, ITEM_A, "Server item"));diff --git a/dockerfiles/all-in-one/s6-scripts/client/run b/dockerfiles/all-in-one/s6-scripts/client/runindex 4367587fd..1d035e6ed 100644--- a/dockerfiles/all-in-one/s6-scripts/client/run+++ b/dockerfiles/all-in-one/s6-scripts/client/run@@ -26,11 +26,7 @@ for i in {1..30}; dodone# Client service entrypoint-DEFAULT_PRIVATE_EMAIL_DOMAINS=""-DEFAULT_HIDDEN_PRIVATE_EMAIL_DOMAINS=""DEFAULT_SUPPORT_EMAIL=""-PRIVATE_EMAIL_DOMAINS=${PRIVATE_EMAIL_DOMAINS:-$DEFAULT_PRIVATE_EMAIL_DOMAINS}-HIDDEN_PRIVATE_EMAIL_DOMAINS=${HIDDEN_PRIVATE_EMAIL_DOMAINS:-$DEFAULT_HIDDEN_PRIVATE_EMAIL_DOMAINS}SUPPORT_EMAIL=${SUPPORT_EMAIL:-$DEFAULT_SUPPORT_EMAIL}PUBLIC_REGISTRATION_ENABLED=${PUBLIC_REGISTRATION_ENABLED:-true}@@ -52,27 +48,9 @@ if [ ! -f /etc/nginx/ssl/nginx.crt ] || [ ! -f /etc/nginx/ssl/nginx.key ]; thenchmod 600 /etc/nginx/ssl/nginx.keyfi-# Convert comma-separated PRIVATE_EMAIL_DOMAINS to JSON array-if [ -z "$PRIVATE_EMAIL_DOMAINS" ]; then- json_array="[]"-else- # Convert comma-separated list to JSON array- json_array=$(echo "$PRIVATE_EMAIL_DOMAINS" | awk '{split($0,a,","); printf "["; for(i=1;i<=length(a);i++) {printf "\"%s\"", a[i]; if(i<length(a)) printf ","} printf "]"}')-fi--# Convert comma-separated HIDDEN_PRIVATE_EMAIL_DOMAINS to JSON array-if [ -z "$HIDDEN_PRIVATE_EMAIL_DOMAINS" ]; then- hidden_json_array="[]"-else- # Convert comma-separated list to JSON array- hidden_json_array=$(echo "$HIDDEN_PRIVATE_EMAIL_DOMAINS" | awk '{split($0,a,","); printf "["; for(i=1;i<=length(a);i++) {printf "\"%s\"", a[i]; if(i<length(a)) printf ","} printf "]"}')-fi-# Create JSON with environment variablescat > /app/client/wwwroot/appsettings.json << EOF{- "PrivateEmailDomains": $json_array,- "HiddenPrivateEmailDomains": $hidden_json_array,"SupportEmail": "$SUPPORT_EMAIL","PublicRegistrationEnabled": "$PUBLIC_REGISTRATION_ENABLED","DeploymentMode": "${DEPLOYMENT_MODE:-aio-build}",diff --git a/scripts/dev.sh b/scripts/dev.shindex 151491a15..38e558aa0 100755--- a/scripts/dev.sh+++ b/scripts/dev.sh@@ -144,8 +144,6 @@ write_web_dev_settings() {cat > "$target" <<JSON{"ApiUrl": "http://localhost:$API_HTTP",- "PrivateEmailDomains": ["example.tld", "example2.tld", "aliasvault.net", "disabled.tld"],- "HiddenPrivateEmailDomains": ["disabled.tld"],"SupportEmail": "[email protected]","PublicRegistrationEnabled": "$AV_PUBLIC_REGISTRATION_ENABLED","DeploymentMode": "dev"