mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-07-29 21:55:05 +03:00
Update API response, crates and GHA (#7470)
- Updated API response to more closely match v2026.6.0+ server versions. - Updated all the crates - Updated Rust to v1.97.1 - Updated the web-vault to v2026.6.4 - Updated GitHub Actions Signed-off-by: BlackDex <black.dex@gmail.com>
This commit is contained in:
@@ -1330,6 +1330,13 @@ pub async fn prelogin(data: Json<PreloginData>, conn: DbConn) -> Json<Value> {
|
||||
"kdfIterations": kdf_iter,
|
||||
"kdfMemory": kdf_mem,
|
||||
"kdfParallelism": kdf_para,
|
||||
"kdfSettings": {
|
||||
"iterations": kdf_iter,
|
||||
"kdfType": kdf_type,
|
||||
"memory": kdf_mem,
|
||||
"parallelism": kdf_para
|
||||
},
|
||||
"salt": null,
|
||||
}))
|
||||
}
|
||||
|
||||
|
||||
+9
-2
@@ -228,14 +228,17 @@ fn config() -> Json<Value> {
|
||||
// Version history:
|
||||
// - Individual cipher key encryption: 2024.2.0
|
||||
// - Mobile app support for MasterPasswordUnlockData: 2025.8.0
|
||||
"version": "2025.12.0",
|
||||
"version": "2026.6.0",
|
||||
"gitHash": option_env!("GIT_REV"),
|
||||
"server": {
|
||||
"name": "Vaultwarden",
|
||||
"url": "https://github.com/dani-garcia/vaultwarden"
|
||||
},
|
||||
"settings": {
|
||||
"disableUserRegistration": CONFIG.is_signup_disabled()
|
||||
"disableUserRegistration": CONFIG.is_signup_disabled(),
|
||||
// When enabled, this setting signals to clients that onboarding interstitials
|
||||
// (post-login welcome dialogs, extension install prompts, setup extension redirects, and premium upsell modals) should be suppressed
|
||||
"suppressOnboardingInterstitials": false
|
||||
},
|
||||
"environment": {
|
||||
"vault": domain,
|
||||
@@ -251,6 +254,10 @@ fn config() -> Json<Value> {
|
||||
"vapidPublicKey": null
|
||||
},
|
||||
"featureStates": feature_states,
|
||||
// Not supported right now
|
||||
// Used for by clients to learn if the server requires extra work to establish a connection.
|
||||
// See: https://github.com/bitwarden/server/pull/6892 | https://github.com/bitwarden/server/commit/52955d1860b4dfb905f67bbe39d9b10bbd61ded0
|
||||
"communication": null,
|
||||
"object": "config",
|
||||
}))
|
||||
}
|
||||
|
||||
+15
-7
@@ -42,13 +42,15 @@ pub struct Cipher {
|
||||
|
||||
pub key: Option<String>,
|
||||
|
||||
/*
|
||||
Login = 1,
|
||||
SecureNote = 2,
|
||||
Card = 3,
|
||||
Identity = 4,
|
||||
SshKey = 5
|
||||
*/
|
||||
// See (v2026.7.0): https://github.com/bitwarden/server/blob/5d4461aa42cadbacfef8fe2166c5453a5c52773a/src/Core/Vault/Enums/CipherType.cs
|
||||
// Login = 1,
|
||||
// SecureNote = 2,
|
||||
// Card = 3,
|
||||
// Identity = 4,
|
||||
// SSHKey = 5
|
||||
// BankAccount = 6,
|
||||
// DriversLicense = 7,
|
||||
// Passport = 8,
|
||||
pub atype: i32,
|
||||
pub name: String,
|
||||
pub notes: Option<String>,
|
||||
@@ -353,6 +355,9 @@ impl Cipher {
|
||||
"card": null,
|
||||
"identity": null,
|
||||
"sshKey": null,
|
||||
"bankAccount": null,
|
||||
"driversLicense": null,
|
||||
"passport": null,
|
||||
});
|
||||
|
||||
// These values are only needed for user/default syncs
|
||||
@@ -392,6 +397,9 @@ impl Cipher {
|
||||
3 => "card",
|
||||
4 => "identity",
|
||||
5 => "sshKey",
|
||||
6 => "bankAccount",
|
||||
7 => "driversLicense",
|
||||
8 => "passport",
|
||||
_ => err!(format!("Cipher {} has an invalid type {}", self.uuid, self.atype)),
|
||||
};
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@ use super::{
|
||||
User, UserId,
|
||||
};
|
||||
|
||||
// See (v2026.7.0): https://github.com/bitwarden/server/blob/5d4461aa42cadbacfef8fe2166c5453a5c52773a/src/Core/AdminConsole/Entities/Collection.cs
|
||||
#[derive(Identifiable, Queryable, Insertable, AsChangeset)]
|
||||
#[diesel(table_name = collections)]
|
||||
#[diesel(treat_none_as_null = true)]
|
||||
@@ -71,6 +72,11 @@ impl Collection {
|
||||
"id": self.uuid,
|
||||
"organizationId": self.org_uuid,
|
||||
"name": self.name,
|
||||
// Collection types are either 0: SharedCollection or 1: DefaultUserCollection, of which we do not yet support DefaultUserCollection.
|
||||
// See (v2026.7.0): https://github.com/bitwarden/server/blob/5d4461aa42cadbacfef8fe2166c5453a5c52773a/src/Core/AdminConsole/Enums/CollectionType.cs
|
||||
"type": 0,
|
||||
// This is only used together with MyItems/DefaultUserCollection, which we do not yet support.
|
||||
"defaultUserCollectionEmail": null,
|
||||
"object": "collection",
|
||||
})
|
||||
}
|
||||
|
||||
@@ -217,11 +217,18 @@ impl Organization {
|
||||
"useSecretsManager": false, // Not supported (Not AGPLv3 Licensed)
|
||||
"selfHost": true,
|
||||
"useApi": true,
|
||||
"useDisableSMAdsForUsers": true, // Hide Secrets Manager ads
|
||||
"useInviteLinks": false, // Not (yet) supported
|
||||
"useMyItems": false, // Not (yet) supported
|
||||
"useOrganizationDomains": false, // Not supported (Linked to SSO)
|
||||
"usePam": false, // Not supported
|
||||
"usePhishingBlocker": false,
|
||||
"hasPublicAndPrivateKeys": self.private_key.is_some() && self.public_key.is_some(),
|
||||
"useResetPassword": CONFIG.mail_enabled(),
|
||||
"allowAdminAccessToAllCollectionItems": true,
|
||||
"limitCollectionCreation": true,
|
||||
"limitCollectionDeletion": true,
|
||||
"limitItemDeletion": false,
|
||||
|
||||
"businessName": self.name,
|
||||
"businessAddress1": null,
|
||||
@@ -495,6 +502,12 @@ impl Membership {
|
||||
"useActivateAutofillPolicy": false,
|
||||
"useAdminSponsoredFamilies": false,
|
||||
"useRiskInsights": false, // Not supported (Not AGPLv3 Licensed)
|
||||
"useDisableSMAdsForUsers": true, // Hide Secrets Manager ads
|
||||
"useInviteLinks": false, // Not (yet) supported
|
||||
"useMyItems": false, // Not (yet) supported
|
||||
"useOrganizationDomains": false, // Not supported (Linked to SSO)
|
||||
"usePam": false, // Not supported
|
||||
"usePhishingBlocker": false,
|
||||
|
||||
"organizationUserId": self.uuid,
|
||||
"providerId": null,
|
||||
|
||||
@@ -268,8 +268,25 @@ impl User {
|
||||
UserStatus::Enabled
|
||||
};
|
||||
|
||||
let account_keys = if self.private_key.is_some() {
|
||||
json!({
|
||||
"publicKeyEncryptionKeyPair": {
|
||||
"wrappedPrivateKey": self.private_key,
|
||||
"publicKey": self.public_key,
|
||||
"signedPublicKey": null,
|
||||
"object": "publicKeyEncryptionKeyPair",
|
||||
},
|
||||
"securityState": null,
|
||||
"signatureKeyPair": null,
|
||||
"object": "privateKeys"
|
||||
})
|
||||
} else {
|
||||
Value::Null
|
||||
};
|
||||
|
||||
json!({
|
||||
"_status": status as i32,
|
||||
"accountKeys": account_keys,
|
||||
"id": self.uuid,
|
||||
"name": self.name,
|
||||
"email": self.email,
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
// The recursion_limit is mainly triggered by the json!() macro.
|
||||
// The more key/value pairs there are the more recursion occurs.
|
||||
// We want to keep this as low as possible!
|
||||
#![recursion_limit = "165"]
|
||||
#![recursion_limit = "192"]
|
||||
|
||||
// When enabled use MiMalloc as malloc instead of the default malloc
|
||||
#[cfg(feature = "enable_mimalloc")]
|
||||
|
||||
Reference in New Issue
Block a user