From dbc082dc75ce718f87c17d98a1cc21c45b6be158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
<dani-garcia@users.noreply.github.com>
Date: Thu, 10 Sep 2020 23:15:29 +0200
Subject: [PATCH] Update web vault to 2.16.0 and dependencies
---
Cargo.lock | 82 +++++++++++++++++++---------------
Cargo.toml | 2 +-
docker/Dockerfile.j2 | 8 ++--
docker/amd64/Dockerfile | 2 +-
docker/amd64/Dockerfile.alpine | 2 +-
docker/arm32v6/Dockerfile | 2 +-
docker/arm32v7/Dockerfile | 2 +-
docker/arm64v8/Dockerfile | 2 +-
8 files changed, 56 insertions(+), 46 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index b8128e33..b6a3d67e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -167,7 +167,7 @@ dependencies = [
"soup",
"structopt",
"syslog",
- "time 0.2.18",
+ "time 0.2.20",
"u2f",
"uuid",
"ws",
@@ -247,9 +247,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
[[package]]
name = "cc"
-version = "1.0.59"
+version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
+checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"
[[package]]
name = "cfg-if"
@@ -340,7 +340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c60ef6d0bbf56ad2674249b6bb74f2c6aeb98b98dd57b5d3e37cace33011d69"
dependencies = [
"percent-encoding 2.1.0",
- "time 0.2.18",
+ "time 0.2.20",
]
[[package]]
@@ -419,7 +419,7 @@ dependencies = [
"bitflags",
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -447,7 +447,7 @@ checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -681,7 +681,7 @@ dependencies = [
"proc-macro-hack",
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -892,6 +892,12 @@ version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+[[package]]
+name = "httpdate"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
+
[[package]]
name = "hyper"
version = "0.10.16"
@@ -913,9 +919,9 @@ dependencies = [
[[package]]
name = "hyper"
-version = "0.13.7"
+version = "0.13.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e68a8dd9716185d9e64ea473ea6ef63529252e3e27623295a0378a19665d5eb"
+checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835"
dependencies = [
"bytes 0.5.6",
"futures-channel",
@@ -925,10 +931,10 @@ dependencies = [
"http",
"http-body",
"httparse",
+ "httpdate",
"itoa",
"pin-project",
"socket2",
- "time 0.1.44",
"tokio",
"tower-service",
"tracing",
@@ -954,7 +960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"
dependencies = [
"bytes 0.5.6",
- "hyper 0.13.7",
+ "hyper 0.13.8",
"native-tls",
"tokio",
"tokio-tls",
@@ -1032,9 +1038,12 @@ dependencies = [
[[package]]
name = "instant"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485"
+checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
+dependencies = [
+ "cfg-if",
+]
[[package]]
name = "iovec"
@@ -1256,7 +1265,7 @@ dependencies = [
"migrations_internals",
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -1286,11 +1295,12 @@ dependencies = [
[[package]]
name = "miniz_oxide"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722"
+checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9"
dependencies = [
"adler",
+ "autocfg 1.0.1",
]
[[package]]
@@ -1459,7 +1469,7 @@ checksum = "6f09b9841adb6b5e1f89ef7087ea636e0fd94b2851f887c1e3eb5d5f8228fab3"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -1623,9 +1633,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ddc8e145de01d9180ac7b78b9676f95a9c2447f6a88b2c2a04702211bc5d71"
+checksum = "0520af26d4cf99643dbbe093a61507922b57232d9978d8491fdc8f7b44573c8c"
[[package]]
name = "pear"
@@ -1701,7 +1711,7 @@ dependencies = [
"pest_meta",
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -1770,7 +1780,7 @@ checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -1821,7 +1831,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
"version_check 0.9.2",
]
@@ -2128,7 +2138,7 @@ dependencies = [
"futures-util",
"http",
"http-body",
- "hyper 0.13.7",
+ "hyper 0.13.8",
"hyper-tls",
"ipnet",
"js-sys",
@@ -2200,7 +2210,7 @@ dependencies = [
"rocket_codegen",
"rocket_http",
"state",
- "time 0.2.18",
+ "time 0.2.20",
"toml",
"version_check 0.9.2",
"yansi",
@@ -2246,7 +2256,7 @@ dependencies = [
"rustls",
"smallvec 1.4.2",
"state",
- "time 0.2.18",
+ "time 0.2.20",
"unicode-xid 0.2.1",
]
@@ -2395,7 +2405,7 @@ checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -2582,7 +2592,7 @@ dependencies = [
"quote 1.0.7",
"serde",
"serde_derive",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -2598,7 +2608,7 @@ dependencies = [
"serde_derive",
"serde_json",
"sha1",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -2668,7 +2678,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -2696,9 +2706,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.40"
+version = "1.0.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
+checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
@@ -2782,9 +2792,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.2.18"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12785163ae8a1cbb52a5db39af4a5baabd3fe49f07f76f952f89d7e89e5ce531"
+checksum = "0d4953c513c9bf1b97e9cdd83f11d60c4b0a83462880a360d80d96953a953fee"
dependencies = [
"const_fn",
"libc",
@@ -2815,7 +2825,7 @@ dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
"standback",
- "syn 1.0.40",
+ "syn 1.0.41",
]
[[package]]
@@ -3140,7 +3150,7 @@ dependencies = [
"log 0.4.11",
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
"wasm-bindgen-shared",
]
@@ -3174,7 +3184,7 @@ checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
- "syn 1.0.40",
+ "syn 1.0.41",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
diff --git a/Cargo.toml b/Cargo.toml
index 781e515b..383d6314 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -124,7 +124,7 @@ structopt = "0.3.17"
backtrace = "0.3.50"
# Macro ident concatenation
-paste = "1.0"
+paste = "1.0.0"
[patch.crates-io]
# Use newest ring
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
index ef12bfa8..af222ad5 100644
--- a/docker/Dockerfile.j2
+++ b/docker/Dockerfile.j2
@@ -27,17 +27,17 @@
# https://docs.docker.com/develop/develop-images/multistage-build/
# https://whitfin.io/speeding-up-rust-docker-builds/
####################### VAULT BUILD IMAGE #######################
-{% set vault_image_hash = "sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c" %}
+{% set vault_image_hash = "sha256:a6705a4d7776500a6544afd141de1786e6b87c386b068be996294960779cb5bf" %}
{% raw %}
# This hash is extracted from the docker web-vault builds and it's prefered over a simple tag because it's immutable.
# It can be viewed in multiple ways:
# - From the https://hub.docker.com/repository/docker/bitwardenrs/web-vault/tags page, click the tag name and the digest should be there.
# - From the console, with the following commands:
-# docker pull bitwardenrs/web-vault:v2.15.1
-# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.15.1
+# docker pull bitwardenrs/web-vault:v2.16.0b
+# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.0b
#
# - To do the opposite, and get the tag from the hash, you can do:
-# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c
+# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:a6705a4d7776500a6544afd141de1786e6b87c386b068be996294960779cb5bf
{% endraw %}
FROM bitwardenrs/web-vault@{{ vault_image_hash }} as vault
diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile
index b8a7bf9e..fff45d66 100644
--- a/docker/amd64/Dockerfile
+++ b/docker/amd64/Dockerfile
@@ -15,7 +15,7 @@
#
# - To do the opposite, and get the tag from the hash, you can do:
# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c
-FROM bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c as vault
+FROM bitwardenrs/web-vault@sha256:3581afd49201ea11edc5372ee3ffd8945f005602d9adc0300dcc7ef6860f232c as vault
########################## BUILD IMAGE ##########################
FROM rust:1.45 as build
diff --git a/docker/amd64/Dockerfile.alpine b/docker/amd64/Dockerfile.alpine
index fd3ca479..736374f0 100644
--- a/docker/amd64/Dockerfile.alpine
+++ b/docker/amd64/Dockerfile.alpine
@@ -15,7 +15,7 @@
#
# - To do the opposite, and get the tag from the hash, you can do:
# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c
-FROM bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c as vault
+FROM bitwardenrs/web-vault@sha256:3581afd49201ea11edc5372ee3ffd8945f005602d9adc0300dcc7ef6860f232c as vault
########################## BUILD IMAGE ##########################
FROM clux/muslrust:nightly-2020-07-09 as build
diff --git a/docker/arm32v6/Dockerfile b/docker/arm32v6/Dockerfile
index b1165d3a..13449db4 100644
--- a/docker/arm32v6/Dockerfile
+++ b/docker/arm32v6/Dockerfile
@@ -15,7 +15,7 @@
#
# - To do the opposite, and get the tag from the hash, you can do:
# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c
-FROM bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c as vault
+FROM bitwardenrs/web-vault@sha256:3581afd49201ea11edc5372ee3ffd8945f005602d9adc0300dcc7ef6860f232c as vault
########################## BUILD IMAGE ##########################
FROM rust:1.45 as build
diff --git a/docker/arm32v7/Dockerfile b/docker/arm32v7/Dockerfile
index 57e96489..ee1654e7 100644
--- a/docker/arm32v7/Dockerfile
+++ b/docker/arm32v7/Dockerfile
@@ -15,7 +15,7 @@
#
# - To do the opposite, and get the tag from the hash, you can do:
# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c
-FROM bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c as vault
+FROM bitwardenrs/web-vault@sha256:3581afd49201ea11edc5372ee3ffd8945f005602d9adc0300dcc7ef6860f232c as vault
########################## BUILD IMAGE ##########################
FROM rust:1.45 as build
diff --git a/docker/arm64v8/Dockerfile b/docker/arm64v8/Dockerfile
index 984ef99c..a53233d5 100644
--- a/docker/arm64v8/Dockerfile
+++ b/docker/arm64v8/Dockerfile
@@ -15,7 +15,7 @@
#
# - To do the opposite, and get the tag from the hash, you can do:
# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c
-FROM bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c as vault
+FROM bitwardenrs/web-vault@sha256:3581afd49201ea11edc5372ee3ffd8945f005602d9adc0300dcc7ef6860f232c as vault
########################## BUILD IMAGE ##########################
FROM rust:1.45 as build
--
GitLab