diff --git a/docker/DockerSettings.yaml b/docker/DockerSettings.yaml index 908f9721..587a4d61 100644 --- a/docker/DockerSettings.yaml +++ b/docker/DockerSettings.yaml @@ -1,6 +1,6 @@ --- -vault_version: "v2023.9.1" -vault_image_digest: "sha256:ccf76db7406378b36cb937c1a3ca884448e32e7f82effd4d97b335cd725c75fd" +vault_version: "v2023.10.0" +vault_image_digest: "sha256:419e4976921f98f1124f296ed02e68bf7f8ff29b3f1fba59e7e715228a065935" # Cross Compile Docker Helper Scripts v1.3.0 # We use the linux/amd64 platform shell scripts since there is no difference between the different platform scripts xx_image_digest: "sha256:c9609ace652bbe51dd4ce90e0af9d48a4590f1214246da5bc70e46f6dd586edc" diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 8a8332f0..64373440 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -18,15 +18,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull docker.io/vaultwarden/web-vault:v2023.9.1 -# $ docker image inspect --format "{{.RepoDigests}}" docker.io/vaultwarden/web-vault:v2023.9.1 -# [docker.io/vaultwarden/web-vault@sha256:ccf76db7406378b36cb937c1a3ca884448e32e7f82effd4d97b335cd725c75fd] +# $ docker pull docker.io/vaultwarden/web-vault:v2023.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" docker.io/vaultwarden/web-vault:v2023.10.0 +# [docker.io/vaultwarden/web-vault@sha256:419e4976921f98f1124f296ed02e68bf7f8ff29b3f1fba59e7e715228a065935] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" docker.io/vaultwarden/web-vault@sha256:ccf76db7406378b36cb937c1a3ca884448e32e7f82effd4d97b335cd725c75fd -# [docker.io/vaultwarden/web-vault:v2023.9.1] +# $ docker image inspect --format "{{.RepoTags}}" docker.io/vaultwarden/web-vault@sha256:419e4976921f98f1124f296ed02e68bf7f8ff29b3f1fba59e7e715228a065935 +# [docker.io/vaultwarden/web-vault:v2023.10.0] # -FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:ccf76db7406378b36cb937c1a3ca884448e32e7f82effd4d97b335cd725c75fd as vault +FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:419e4976921f98f1124f296ed02e68bf7f8ff29b3f1fba59e7e715228a065935 as vault ########################## ALPINE BUILD IMAGES ########################## ## NOTE: The Alpine Base Images do not support other platforms then linux/amd64 diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 6d4522a7..26a53b0a 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -18,15 +18,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull docker.io/vaultwarden/web-vault:v2023.9.1 -# $ docker image inspect --format "{{.RepoDigests}}" docker.io/vaultwarden/web-vault:v2023.9.1 -# [docker.io/vaultwarden/web-vault@sha256:ccf76db7406378b36cb937c1a3ca884448e32e7f82effd4d97b335cd725c75fd] +# $ docker pull docker.io/vaultwarden/web-vault:v2023.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" docker.io/vaultwarden/web-vault:v2023.10.0 +# [docker.io/vaultwarden/web-vault@sha256:419e4976921f98f1124f296ed02e68bf7f8ff29b3f1fba59e7e715228a065935] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" docker.io/vaultwarden/web-vault@sha256:ccf76db7406378b36cb937c1a3ca884448e32e7f82effd4d97b335cd725c75fd -# [docker.io/vaultwarden/web-vault:v2023.9.1] +# $ docker image inspect --format "{{.RepoTags}}" docker.io/vaultwarden/web-vault@sha256:419e4976921f98f1124f296ed02e68bf7f8ff29b3f1fba59e7e715228a065935 +# [docker.io/vaultwarden/web-vault:v2023.10.0] # -FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:ccf76db7406378b36cb937c1a3ca884448e32e7f82effd4d97b335cd725c75fd as vault +FROM --platform=linux/amd64 docker.io/vaultwarden/web-vault@sha256:419e4976921f98f1124f296ed02e68bf7f8ff29b3f1fba59e7e715228a065935 as vault ########################## Cross Compile Docker Helper Scripts ########################## ## We use the linux/amd64 no matter which Build Platform, since these are all bash scripts diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs index b9f3ef63..733ae7b9 100644 --- a/src/api/core/ciphers.rs +++ b/src/api/core/ciphers.rs @@ -212,8 +212,7 @@ pub struct CipherData { Login = 1, SecureNote = 2, Card = 3, - Identity = 4, - Fido2Key = 5 + Identity = 4 */ pub Type: i32, pub Name: String, @@ -225,7 +224,6 @@ pub struct CipherData { SecureNote: Option, Card: Option, Identity: Option, - Fido2Key: Option, Favorite: Option, Reprompt: Option, @@ -468,7 +466,6 @@ pub async fn update_cipher_from_data( 2 => data.SecureNote, 3 => data.Card, 4 => data.Identity, - 5 => data.Fido2Key, _ => err!("Invalid type"), }; diff --git a/src/api/core/mod.rs b/src/api/core/mod.rs index 62a60197..7df0171b 100644 --- a/src/api/core/mod.rs +++ b/src/api/core/mod.rs @@ -216,7 +216,8 @@ fn config() -> Json { // Any feature flags that we want the clients to use // Can check the enabled ones at: // https://vault.bitwarden.com/api/config - "autofill-v2": true + "autofill-v2": true, + "fido2-vault-credentials": true }, "object": "config", })) diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs index 6bc98b90..bd3531a0 100644 --- a/src/db/models/cipher.rs +++ b/src/db/models/cipher.rs @@ -29,8 +29,7 @@ db_object! { Login = 1, SecureNote = 2, Card = 3, - Identity = 4, - Fido2key = 5 + Identity = 4 */ pub atype: i32, pub name: String, @@ -229,7 +228,6 @@ impl Cipher { "SecureNote": null, "Card": null, "Identity": null, - "Fido2Key": null, }); // These values are only needed for user/default syncs @@ -258,7 +256,6 @@ impl Cipher { 2 => "SecureNote", 3 => "Card", 4 => "Identity", - 5 => "Fido2Key", _ => panic!("Wrong type"), };