You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by hs...@apache.org on 2023/06/08 06:53:05 UTC
[incubator-teaclave] branch master updated (bfa88e43 -> 388f8ffb)
This is an automated email from the ASF dual-hosted git repository.
hsun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
from bfa88e43 Bump h2 from 0.3.16 to 0.3.19
new 6fda4c43 [sdk] Update the cbindgen command
new 3b6dcdbf [storage] Add a unit test
new 39419202 [management] Add an auditor to collect logs
new 388f8ffb [frontend] Send audit information to the management service
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cmake/tomls/Cargo.sgx_trusted_lib.lock | 925 +++++++++++++++++----
cmake/tomls/Cargo.sgx_trusted_lib.toml | 2 +
cmake/tomls/Cargo.sgx_untrusted_app.lock | 768 ++++++++++-------
cmake/tomls/Cargo.unix_app.lock | 872 ++++++++++---------
examples/rust/builtin_echo/Cargo.lock | 2 +
.../rust/builtin_ordered_set_intersect/Cargo.lock | 2 +
.../rust/builtin_ordered_set_intersect/src/main.rs | 17 +
sdk/c/Makefile | 4 +-
sdk/c/cbindgen.toml | 2 +-
sdk/c/teaclave_client_sdk.h | 52 +-
sdk/python/teaclave.py | 20 +
sdk/rust/Cargo.lock | 2 +
sdk/rust/src/bindings.rs | 102 ++-
sdk/rust/src/lib.rs | 30 +-
services/frontend/enclave/src/audit.rs | 61 ++
services/frontend/enclave/src/lib.rs | 43 +-
services/frontend/enclave/src/service.rs | 121 ++-
services/management/enclave/Cargo.toml | 22 +-
services/management/enclave/Enclave.config.xml | 2 +-
services/management/enclave/src/audit/auditor.rs | 195 +++++
.../management/enclave/src/audit/db_directory.rs | 215 +++++
.../management/enclave/src/audit/mod.rs | 8 +-
.../management/enclave/src/audit/tests.rs | 31 +-
services/management/enclave/src/error.rs | 3 +
services/management/enclave/src/lib.rs | 6 +-
services/management/enclave/src/service.rs | 82 +-
services/proto/Cargo.toml | 23 +-
services/proto/src/proto/teaclave_common.proto | 8 +
.../src/proto/teaclave_frontend_service.proto | 10 +
.../src/proto/teaclave_management_service.proto | 7 +
services/proto/src/teaclave_common.rs | 47 +-
services/proto/src/teaclave_frontend_service.rs | 22 +-
services/proto/src/teaclave_management_service.rs | 15 +
services/storage/enclave/src/lib.rs | 1 +
services/storage/enclave/src/service.rs | 9 +
tests/functional/enclave/src/frontend_service.rs | 60 ++
types/Cargo.toml | 11 +-
types/src/audit.rs | 138 +++
types/src/lib.rs | 2 +
types/src/user.rs | 6 +
40 files changed, 3025 insertions(+), 923 deletions(-)
create mode 100644 services/frontend/enclave/src/audit.rs
create mode 100644 services/management/enclave/src/audit/auditor.rs
create mode 100644 services/management/enclave/src/audit/db_directory.rs
copy executor/context/src/lib.rs => services/management/enclave/src/audit/mod.rs (87%)
copy runtime/src/lib.rs => services/management/enclave/src/audit/tests.rs (57%)
create mode 100644 types/src/audit.rs
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org
[incubator-teaclave] 02/04: [storage] Add a unit test
Posted by hs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hsun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit 3b6dcdbf8d98f5bd07843309e1d562ac920e27a2
Author: sunhe05 <su...@baidu.com>
AuthorDate: Mon Jun 5 03:08:31 2023 +0000
[storage] Add a unit test
---
services/storage/enclave/src/lib.rs | 1 +
services/storage/enclave/src/service.rs | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/services/storage/enclave/src/lib.rs b/services/storage/enclave/src/lib.rs
index 021f7052..8d443f85 100644
--- a/services/storage/enclave/src/lib.rs
+++ b/services/storage/enclave/src/lib.rs
@@ -175,6 +175,7 @@ pub mod tests {
service::tests::test_get_key,
service::tests::test_put_key,
service::tests::test_delete_key,
+ service::tests::test_empty_value,
service::tests::test_enqueue,
service::tests::test_dequeue,
service::tests::test_get_keys_by_prefix,
diff --git a/services/storage/enclave/src/service.rs b/services/storage/enclave/src/service.rs
index 7326f01f..af3feb10 100644
--- a/services/storage/enclave/src/service.rs
+++ b/services/storage/enclave/src/service.rs
@@ -322,6 +322,15 @@ pub mod tests {
assert!(service.get(request).is_err());
}
+ pub fn test_empty_value() {
+ let service = get_mock_service();
+ let request = PutRequest::new("test_empty_value", "");
+ assert!(service.put(request).is_ok());
+ let request = GetRequest::new("test_empty_value");
+ let response = service.get(request).unwrap();
+ assert_eq!(response.value, Vec::<u8>::new());
+ }
+
pub fn test_enqueue() {
let service = get_mock_service();
let request = EnqueueRequest::new("test_enqueue_key", "1");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org
[incubator-teaclave] 03/04: [management] Add an auditor to collect logs
Posted by hs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hsun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit 394192020623a9d1e107f38e52df4456dd8dd2c4
Author: sunhe05 <su...@baidu.com>
AuthorDate: Mon Jun 5 07:41:40 2023 +0000
[management] Add an auditor to collect logs
---
cmake/tomls/Cargo.sgx_trusted_lib.lock | 926 +++++++++++++++++----
cmake/tomls/Cargo.sgx_trusted_lib.toml | 2 +
cmake/tomls/Cargo.sgx_untrusted_app.lock | 768 ++++++++++-------
cmake/tomls/Cargo.unix_app.lock | 872 ++++++++++---------
services/management/enclave/Cargo.toml | 22 +-
services/management/enclave/Enclave.config.xml | 2 +-
services/management/enclave/src/audit/auditor.rs | 193 +++++
.../management/enclave/src/audit/db_directory.rs | 222 +++++
.../management/enclave/src/audit/mod.rs | 44 +-
.../management/enclave/src/audit/tests.rs | 55 +-
services/management/enclave/src/error.rs | 2 +
services/management/enclave/src/lib.rs | 2 +
services/management/enclave/src/service.rs | 36 +-
services/proto/Cargo.toml | 23 +-
services/proto/src/proto/teaclave_common.proto | 8 +
.../src/proto/teaclave_management_service.proto | 6 +
services/proto/src/teaclave_common.rs | 47 +-
services/proto/src/teaclave_management_service.rs | 1 +
types/Cargo.toml | 11 +-
types/src/audit.rs | 138 +++
types/src/lib.rs | 2 +
21 files changed, 2460 insertions(+), 922 deletions(-)
diff --git a/cmake/tomls/Cargo.sgx_trusted_lib.lock b/cmake/tomls/Cargo.sgx_trusted_lib.lock
index e26aec56..5ad9c349 100644
--- a/cmake/tomls/Cargo.sgx_trusted_lib.lock
+++ b/cmake/tomls/Cargo.sgx_trusted_lib.lock
@@ -8,21 +8,53 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+[[package]]
+name = "ahash"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
+
[[package]]
name = "aho-corasick"
-version = "1.0.1"
+version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [
"memchr",
]
+[[package]]
+name = "aho-corasick"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
[[package]]
name = "anyhow"
version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+[[package]]
+name = "arc-swap"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+
[[package]]
name = "async-stream"
version = "0.3.5"
@@ -40,9 +72,9 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
@@ -51,9 +83,9 @@ version = "0.1.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
@@ -76,9 +108,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
-version = "0.21.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "bit-vec"
@@ -92,11 +124,20 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+[[package]]
+name = "bitpacking"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7"
+dependencies = [
+ "crunchy",
+]
+
[[package]]
name = "bumpalo"
-version = "3.12.2"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytemuck"
@@ -122,6 +163,12 @@ version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+[[package]]
+name = "census"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fafee10a5dd1cffcb5cc560e0d0df8803d7355a2b12272e3557dee57314cb6e"
+
[[package]]
name = "cfg-if"
version = "0.1.10"
@@ -136,11 +183,11 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.24"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [
- "num-integer",
+ "android-tzdata",
"num-traits",
]
@@ -150,6 +197,15 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+[[package]]
+name = "combine"
+version = "4.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "core-foundation"
version = "0.9.3"
@@ -180,16 +236,71 @@ dependencies = [
"cfg-if 1.0.0",
]
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
+dependencies = [
+ "autocfg",
+ "cfg-if 1.0.0",
+ "crossbeam-utils",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
[[package]]
name = "ctor"
version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
dependencies = [
- "quote 1.0.27",
+ "quote 1.0.28",
"syn 1.0.109",
]
+[[package]]
+name = "downcast-rs"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+
[[package]]
name = "either"
version = "1.8.1"
@@ -214,6 +325,15 @@ dependencies = [
"log",
]
+[[package]]
+name = "erased-serde"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "errno"
version = "0.3.1"
@@ -235,6 +355,36 @@ dependencies = [
"libc",
]
+[[package]]
+name = "fail"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe5e43d0f78a42ad591453aedb1d7ae631ce7ee445c7643691055a9ed8d3b01c"
+dependencies = [
+ "log",
+ "once_cell",
+ "rand",
+]
+
+[[package]]
+name = "fastdivide"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25c7df09945d65ea8d70b3321547ed414bbc540aad5bac6883d021b970f35b04"
+
+[[package]]
+name = "fastfield_codecs"
+version = "0.3.1"
+source = "git+https://github.com/mesatee/tantivy.git?branch=0.19.2#433372df6a1787f726caefafccc3352b12449ff0"
+dependencies = [
+ "fastdivide",
+ "itertools 0.10.5",
+ "log",
+ "ownedbytes",
+ "tantivy-bitpacker",
+ "tantivy-common",
+]
+
[[package]]
name = "fastrand"
version = "1.9.0"
@@ -344,9 +494,9 @@ version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
@@ -392,6 +542,19 @@ dependencies = [
"serde_json",
]
+[[package]]
+name = "generator"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a"
+dependencies = [
+ "cc",
+ "libc",
+ "log",
+ "rustversion",
+ "windows",
+]
+
[[package]]
name = "getrandom"
version = "0.2.6"
@@ -409,16 +572,16 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
name = "h2"
-version = "0.3.18"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21"
+checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
dependencies = [
"bytes",
"fnv",
@@ -438,6 +601,9 @@ name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash",
+]
[[package]]
name = "hashbrown_tstd"
@@ -473,6 +639,12 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+[[package]]
+name = "htmlescape"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
+
[[package]]
name = "http"
version = "0.2.9"
@@ -597,6 +769,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
dependencies = [
"cfg-if 1.0.0",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
]
[[package]]
@@ -622,16 +797,16 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e41b53715c6f0c4be49510bb82dee2c1e51c8586d885abe65396e82ed518548"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
"syn 1.0.109",
]
[[package]]
name = "io-lifetimes"
-version = "1.0.10"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
"hermit-abi 0.3.1",
"libc",
@@ -676,9 +851,9 @@ checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
[[package]]
name = "js-sys"
-version = "0.3.62"
+version = "0.3.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5"
+checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
dependencies = [
"wasm-bindgen",
]
@@ -703,34 +878,71 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+[[package]]
+name = "levenshtein_automata"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25"
+
[[package]]
name = "libc"
-version = "0.2.144"
+version = "0.2.145"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81"
[[package]]
name = "libm"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
[[package]]
name = "linux-raw-sys"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "log"
-version = "0.4.17"
+version = "0.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
dependencies = [
- "cfg-if 1.0.0",
"value-bag",
]
+[[package]]
+name = "loom"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
+dependencies = [
+ "cfg-if 1.0.0",
+ "generator",
+ "pin-utils",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "lru"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
+dependencies = [
+ "hashbrown",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata",
+]
+
[[package]]
name = "matrixmultiply"
version = "0.1.15"
@@ -740,12 +952,31 @@ dependencies = [
"rawpointer",
]
+[[package]]
+name = "measure_time"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56220900f1a0923789ecd6bf25fbae8af3b2f1ff3e9e297fc9b6b8674dd4d852"
+dependencies = [
+ "instant",
+ "log",
+]
+
[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+[[package]]
+name = "memoffset"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
+dependencies = [
+ "autocfg",
+]
+
[[package]]
name = "mime"
version = "0.3.17"
@@ -778,6 +1009,15 @@ version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+[[package]]
+name = "murmurhash32"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d736ff882f0e85fe9689fb23db229616c4c00aee2b3ac282f666d8f20eb25d4a"
+dependencies = [
+ "byteorder",
+]
+
[[package]]
name = "native-tls"
version = "0.2.11"
@@ -796,6 +1036,16 @@ dependencies = [
"tempfile",
]
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
[[package]]
name = "num"
version = "0.1.42"
@@ -906,15 +1156,24 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.17.1"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "oneshot"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc22d22931513428ea6cc089e942d38600e3d00976eef8c86de6b8a3aadec6eb"
+dependencies = [
+ "loom",
+]
[[package]]
name = "openssl"
-version = "0.10.52"
+version = "0.10.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56"
+checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
@@ -931,9 +1190,9 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
@@ -944,9 +1203,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.87"
+version = "0.9.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e"
+checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617"
dependencies = [
"cc",
"libc",
@@ -954,6 +1213,20 @@ dependencies = [
"vcpkg",
]
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "ownedbytes"
+version = "0.4.0"
+source = "git+https://github.com/mesatee/tantivy.git?branch=0.19.2#433372df6a1787f726caefafccc3352b12449ff0"
+dependencies = [
+ "stable_deref_trait",
+]
+
[[package]]
name = "pem"
version = "0.8.3"
@@ -983,22 +1256,22 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.0.12"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
- "syn 1.0.109",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
@@ -1036,9 +1309,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
dependencies = [
"unicode-ident",
]
@@ -1081,8 +1354,8 @@ checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
dependencies = [
"anyhow",
"itertools 0.10.5",
- "proc-macro2 1.0.56",
- "quote 1.0.27",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
"syn 1.0.109",
]
@@ -1107,11 +1380,11 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.27"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [
- "proc-macro2 1.0.56",
+ "proc-macro2 1.0.59",
]
[[package]]
@@ -1166,6 +1439,26 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebac11a9d2e11f2af219b8b8d833b76b1ea0e054aa0e8d8e9e4cbde353bdf019"
+[[package]]
+name = "rayon"
+version = "1.7.0"
+source = "git+https://github.com/mesatee/rayon.git?branch=teaclave#a07ce2e8cbbe76a3cb5abd5e17890ba88afebb60"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.11.0"
+source = "git+https://github.com/mesatee/rayon.git?branch=teaclave#a07ce2e8cbbe76a3cb5abd5e17890ba88afebb60"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "num_cpus",
+]
+
[[package]]
name = "rdrand"
version = "0.8.2"
@@ -1186,28 +1479,43 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.8.1"
+version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
dependencies = [
- "aho-corasick",
+ "aho-corasick 1.0.2",
"memchr",
- "regex-syntax",
+ "regex-syntax 0.7.2",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
]
[[package]]
name = "regex-syntax"
-version = "0.7.1"
+version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "reqwest"
-version = "0.11.17"
+version = "0.11.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
"bytes",
"encoding_rs",
"futures-core",
@@ -1263,6 +1571,22 @@ dependencies = [
"num 0.1.42",
]
+[[package]]
+name = "rust-stemmers"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54"
+dependencies = [
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
[[package]]
name = "rustface"
version = "0.1.7"
@@ -1301,6 +1625,12 @@ dependencies = [
"webpki",
]
+[[package]]
+name = "rustversion"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+
[[package]]
name = "rusty-leveldb"
version = "1.0.4"
@@ -1342,6 +1672,18 @@ dependencies = [
"windows-sys 0.42.0",
]
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
[[package]]
name = "sct"
version = "0.6.1"
@@ -1354,9 +1696,9 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.8.2"
+version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
+checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
dependencies = [
"bitflags",
"core-foundation",
@@ -1367,9 +1709,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.8.0"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
+checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
dependencies = [
"core-foundation-sys",
"libc",
@@ -1377,22 +1719,31 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.162"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.162"
+version = "1.0.163"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+dependencies = [
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "serde_fmt"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6"
+checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
- "syn 2.0.15",
+ "serde",
]
[[package]]
@@ -1484,8 +1835,8 @@ dependencies = [
name = "sgx_macros"
version = "2.0.0"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
"syn 1.0.109",
]
@@ -1625,6 +1976,15 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+[[package]]
+name = "sharded-slab"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+dependencies = [
+ "lazy_static",
+]
+
[[package]]
name = "simple_asn1"
version = "0.4.1"
@@ -1644,6 +2004,12 @@ dependencies = [
"autocfg",
]
+[[package]]
+name = "smallvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+
[[package]]
name = "snap"
version = "0.2.5"
@@ -1670,11 +2036,79 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
[[package]]
name = "sval"
-version = "1.0.0-alpha.5"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08"
+checksum = "0e6aa16ce8d9e472e21a528a52c875a76a49190f3968f2ec7e9b550ccc28b410"
+
+[[package]]
+name = "sval_buffer"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "905c4373621186ee9637464b0aaa026389ea9e7f841f2225f160a32ba5d5bac4"
+dependencies = [
+ "sval",
+ "sval_ref",
+]
+
+[[package]]
+name = "sval_dynamic"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad6b4988322c5f22859a6a7649fa1249aa3dd01514caf8ed57d83735f997bb8b"
+dependencies = [
+ "sval",
+]
+
+[[package]]
+name = "sval_fmt"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d3ccd10346f925c2fbd97b75e8573b38e34431bfba04cc531cd23aad0fbabb8"
+dependencies = [
+ "itoa",
+ "ryu",
+ "sval",
+]
+
+[[package]]
+name = "sval_json"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a12e1488defd6344e23243c17ea4a1b185c547968749e8a281373fde0bde2d5"
+dependencies = [
+ "itoa",
+ "ryu",
+ "sval",
+]
+
+[[package]]
+name = "sval_ref"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b797fc4b284dd0e45f7ec424479e604ea5be9bb191a1ef4e96c20c7685649938"
+dependencies = [
+ "sval",
+]
+
+[[package]]
+name = "sval_serde"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "810fa9a837e67a23e0efa7536250fc4d24043306cc1efd076f1943ba2fc2e62d"
+dependencies = [
+ "serde",
+ "sval",
+ "sval_buffer",
+ "sval_fmt",
+]
[[package]]
name = "syn"
@@ -1693,22 +2127,104 @@ version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
"unicode-ident",
]
[[package]]
name = "syn"
-version = "2.0.15"
+version = "2.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
"unicode-ident",
]
+[[package]]
+name = "tantivy"
+version = "0.19.2"
+source = "git+https://github.com/mesatee/tantivy.git?branch=0.19.2#433372df6a1787f726caefafccc3352b12449ff0"
+dependencies = [
+ "aho-corasick 0.7.20",
+ "arc-swap",
+ "async-trait",
+ "base64 0.13.1",
+ "bitpacking",
+ "byteorder",
+ "census",
+ "crc32fast",
+ "crossbeam-channel",
+ "downcast-rs",
+ "fail",
+ "fastdivide",
+ "fastfield_codecs",
+ "htmlescape",
+ "itertools 0.10.5",
+ "levenshtein_automata",
+ "log",
+ "lru",
+ "measure_time",
+ "murmurhash32",
+ "num_cpus",
+ "once_cell",
+ "oneshot",
+ "ownedbytes",
+ "rayon",
+ "regex",
+ "rust-stemmers",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "smallvec",
+ "stable_deref_trait",
+ "tantivy-bitpacker",
+ "tantivy-common",
+ "tantivy-fst",
+ "tantivy-query-grammar",
+ "thiserror",
+ "time",
+ "uuid 1.3.3",
+ "winapi",
+]
+
+[[package]]
+name = "tantivy-bitpacker"
+version = "0.3.0"
+source = "git+https://github.com/mesatee/tantivy.git?branch=0.19.2#433372df6a1787f726caefafccc3352b12449ff0"
+
+[[package]]
+name = "tantivy-common"
+version = "0.4.0"
+source = "git+https://github.com/mesatee/tantivy.git?branch=0.19.2#433372df6a1787f726caefafccc3352b12449ff0"
+dependencies = [
+ "byteorder",
+ "ownedbytes",
+]
+
+[[package]]
+name = "tantivy-fst"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc3c506b1a8443a3a65352df6382a1fb6a7afe1a02e871cee0d25e2c3d5f3944"
+dependencies = [
+ "byteorder",
+ "regex-syntax 0.6.29",
+ "utf8-ranges",
+]
+
+[[package]]
+name = "tantivy-query-grammar"
+version = "0.19.0"
+source = "git+https://github.com/mesatee/tantivy.git?branch=0.19.2#433372df6a1787f726caefafccc3352b12449ff0"
+dependencies = [
+ "combine",
+ "once_cell",
+ "regex",
+]
+
[[package]]
name = "teaclave_access_control_service_enclave"
version = "0.5.1"
@@ -1760,7 +2276,7 @@ dependencies = [
"teaclave_types",
"thiserror",
"url",
- "uuid",
+ "uuid 0.8.2",
"webpki",
"webpki-roots",
"yasna",
@@ -1790,7 +2306,7 @@ dependencies = [
"teaclave_types",
"thiserror",
"tokio",
- "uuid",
+ "uuid 0.8.2",
]
[[package]]
@@ -1869,7 +2385,7 @@ dependencies = [
"thiserror",
"tokio",
"url",
- "uuid",
+ "uuid 0.8.2",
]
[[package]]
@@ -2010,7 +2526,7 @@ dependencies = [
"thiserror",
"tokio",
"url",
- "uuid",
+ "uuid 0.8.2",
]
[[package]]
@@ -2049,12 +2565,15 @@ version = "0.5.1"
dependencies = [
"anyhow",
"cfg-if 0.1.10",
+ "chrono",
"log",
+ "once_cell",
"rand",
"ring",
"serde",
"serde_json",
"sgx_types",
+ "tantivy",
"teaclave_attestation",
"teaclave_binder",
"teaclave_config",
@@ -2066,7 +2585,7 @@ dependencies = [
"thiserror",
"tokio",
"url",
- "uuid",
+ "uuid 0.8.2",
]
[[package]]
@@ -2074,6 +2593,7 @@ name = "teaclave_proto"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"prost",
"serde",
"serde_json",
@@ -2084,7 +2604,7 @@ dependencies = [
"tonic",
"tonic-build",
"url",
- "uuid",
+ "uuid 0.8.2",
]
[[package]]
@@ -2133,7 +2653,7 @@ dependencies = [
"teaclave_types",
"thiserror",
"tokio",
- "uuid",
+ "uuid 0.8.2",
]
[[package]]
@@ -2207,8 +2727,8 @@ dependencies = [
name = "teaclave_test_utils_proc_macro"
version = "0.0.1"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
"syn 1.0.109",
]
@@ -2217,6 +2737,7 @@ name = "teaclave_types"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"hex",
"log",
"rand",
@@ -2231,7 +2752,7 @@ dependencies = [
"toml",
"tonic",
"url",
- "uuid",
+ "uuid 0.8.2",
]
[[package]]
@@ -2311,9 +2832,46 @@ version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if 1.0.0",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
+dependencies = [
+ "itoa",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
+[[package]]
+name = "time-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+dependencies = [
+ "time-core",
]
[[package]]
@@ -2363,8 +2921,8 @@ name = "tokio-macros"
version = "1.8.2"
source = "git+https://github.com/tokio-rs/tokio.git?tag=tokio-1.24.0#dfe252d1fa82bdfefd7cba20f9a88cdd27e310cc"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
"syn 1.0.109",
]
@@ -2476,9 +3034,9 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757"
dependencies = [
- "proc-macro2 1.0.56",
+ "proc-macro2 1.0.59",
"prost-build",
- "quote 1.0.27",
+ "quote 1.0.28",
"syn 1.0.109",
]
@@ -2533,18 +3091,19 @@ version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
+ "valuable",
]
[[package]]
@@ -2557,6 +3116,35 @@ dependencies = [
"tracing",
]
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
[[package]]
name = "try-lock"
version = "0.2.4"
@@ -2571,9 +3159,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
[[package]]
name = "unicode-normalization"
@@ -2614,6 +3202,12 @@ dependencies = [
"serde",
]
+[[package]]
+name = "utf8-ranges"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
+
[[package]]
name = "uuid"
version = "0.8.2"
@@ -2625,15 +3219,56 @@ dependencies = [
"sha1",
]
+[[package]]
+name = "uuid"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
+dependencies = [
+ "getrandom",
+ "serde",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
[[package]]
name = "value-bag"
-version = "1.0.0-alpha.9"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
+checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e"
+dependencies = [
+ "value-bag-serde1",
+ "value-bag-sval2",
+]
+
+[[package]]
+name = "value-bag-serde1"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4735c95b4cca1447b448e2e2e87e98d7e7498f4da27e355cf7af02204521001d"
+dependencies = [
+ "erased-serde",
+ "serde",
+ "serde_fmt",
+]
+
+[[package]]
+name = "value-bag-sval2"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "859cb4f0ce7da6a118b559ba74b0e63bf569bea867c20ba457a6b1c886a04e97"
dependencies = [
- "ctor",
"sval",
- "version_check",
+ "sval_buffer",
+ "sval_dynamic",
+ "sval_fmt",
+ "sval_json",
+ "sval_ref",
+ "sval_serde",
]
[[package]]
@@ -2672,9 +3307,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.85"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4"
+checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
dependencies = [
"cfg-if 1.0.0",
"wasm-bindgen-macro",
@@ -2682,24 +3317,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.85"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822"
+checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
dependencies = [
"bumpalo",
"log",
"once_cell",
- "proc-macro2 1.0.56",
- "quote 1.0.27",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.35"
+version = "0.4.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163"
+checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@@ -2709,32 +3344,32 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.85"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434"
+checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
dependencies = [
- "quote 1.0.27",
+ "quote 1.0.28",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.85"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869"
+checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.27",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.85"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb"
+checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
[[package]]
name = "wasm-streams"
@@ -2751,9 +3386,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.62"
+version = "0.3.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721"
+checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2811,6 +3446,15 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
[[package]]
name = "windows-sys"
version = "0.42.0"
diff --git a/cmake/tomls/Cargo.sgx_trusted_lib.toml b/cmake/tomls/Cargo.sgx_trusted_lib.toml
index 4bacf775..76ad2bd5 100644
--- a/cmake/tomls/Cargo.sgx_trusted_lib.toml
+++ b/cmake/tomls/Cargo.sgx_trusted_lib.toml
@@ -61,9 +61,11 @@ image = { git = "https://github.com/apache/incubator-teaclave-crates
mio = { git = "https://github.com/apache/incubator-teaclave-crates" }
num_cpus = { git = "https://github.com/apache/incubator-teaclave-crates" }
rand = { git = "https://github.com/apache/incubator-teaclave-crates" }
+rayon = { git = "https://github.com/mesatee/rayon.git", branch = "teaclave" }
ring = { git = "https://github.com/apache/incubator-teaclave-crates" }
rustface = { git = "https://github.com/apache/incubator-teaclave-crates" }
rustls = { git = "https://github.com/apache/incubator-teaclave-crates" }
rusty-machine = { git = "https://github.com/apache/incubator-teaclave-crates" }
+tantivy = { git = "https://github.com/mesatee/tantivy.git", branch = "0.19.2" }
tokio = { git = "https://github.com/tokio-rs/tokio.git", tag = "tokio-1.24.0"}
yasna = { git = "https://github.com/sccommunity/yasna.rs", branch = "teaclave-sgx" }
diff --git a/cmake/tomls/Cargo.sgx_untrusted_app.lock b/cmake/tomls/Cargo.sgx_untrusted_app.lock
index 16b0b014..aa6d860f 100644
--- a/cmake/tomls/Cargo.sgx_untrusted_app.lock
+++ b/cmake/tomls/Cargo.sgx_untrusted_app.lock
@@ -10,13 +10,19 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aho-corasick"
-version = "0.7.20"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
dependencies = [
"memchr",
]
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
[[package]]
name = "ansi_term"
version = "0.12.1"
@@ -28,9 +34,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.68"
+version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
[[package]]
name = "async-stream"
@@ -49,9 +55,9 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
@@ -60,9 +66,9 @@ version = "0.1.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
@@ -99,9 +105,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
-version = "0.21.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "bit-vec"
@@ -117,9 +123,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bumpalo"
-version = "3.11.1"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytemuck"
@@ -135,15 +141,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
[[package]]
name = "cc"
-version = "1.0.78"
+version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
[[package]]
name = "cfg-if"
@@ -159,11 +165,11 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.23"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [
- "num-integer",
+ "android-tzdata",
"num-traits",
]
@@ -209,9 +215,9 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "crc32fast"
@@ -228,31 +234,31 @@ version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
dependencies = [
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.28",
+ "syn 1.0.109",
]
[[package]]
name = "ctrlc"
-version = "3.2.4"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1631ca6e3c59112501a9d87fd86f21591ff77acd31331e8a73f8d80a65bbdd71"
+checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e"
dependencies = [
"nix",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "either"
-version = "1.8.0"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
dependencies = [
"cfg-if 1.0.0",
]
@@ -279,11 +285,41 @@ dependencies = [
"log",
]
+[[package]]
+name = "erased-serde"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
[[package]]
name = "fastrand"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
dependencies = [
"instant",
]
@@ -342,9 +378,9 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]]
name = "futures"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
@@ -357,9 +393,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -367,15 +403,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -384,38 +420,38 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-macro"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
name = "futures-sink"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
@@ -445,9 +481,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -456,20 +492,20 @@ dependencies = [
[[package]]
name = "ghost"
-version = "0.1.7"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3"
+checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
name = "h2"
-version = "0.3.16"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
+checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
dependencies = [
"bytes",
"fnv",
@@ -480,7 +516,7 @@ dependencies = [
"indexmap",
"slab",
"tokio",
- "tokio-util 0.7.7",
+ "tokio-util 0.7.8",
"tracing",
]
@@ -521,6 +557,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
[[package]]
name = "hex"
version = "0.4.3"
@@ -529,9 +571,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "http"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
dependencies = [
"bytes",
"fnv",
@@ -572,9 +614,9 @@ dependencies = [
[[package]]
name = "hyper"
-version = "0.14.25"
+version = "0.14.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
+checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
dependencies = [
"bytes",
"futures-channel",
@@ -646,9 +688,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.9.2"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg 1.1.0",
"hashbrown",
@@ -680,16 +722,27 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e41b53715c6f0c4be49510bb82dee2c1e51c8586d885abe65396e82ed518548"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.1",
+ "libc",
+ "windows-sys 0.48.0",
]
[[package]]
name = "ipnet"
-version = "2.7.0"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
+checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
[[package]]
name = "itertools"
@@ -711,9 +764,9 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "jpeg-decoder"
@@ -723,9 +776,9 @@ checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
[[package]]
name = "js-sys"
-version = "0.3.60"
+version = "0.3.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
dependencies = [
"wasm-bindgen",
]
@@ -738,23 +791,28 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.139"
+version = "0.2.145"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81"
[[package]]
name = "libm"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "log"
-version = "0.4.17"
+version = "0.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
dependencies = [
- "cfg-if 1.0.0",
"value-bag",
]
@@ -775,9 +833,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "mime"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "miniz_oxide"
@@ -790,14 +848,13 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.6"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
- "log",
"wasi",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -826,9 +883,9 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.26.1"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
+checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
@@ -947,15 +1004,15 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.16.0"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "openssl"
-version = "0.10.45"
+version = "0.10.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
+checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
@@ -968,13 +1025,13 @@ dependencies = [
[[package]]
name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
@@ -985,11 +1042,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.80"
+version = "0.9.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
+checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617"
dependencies = [
- "autocfg 1.1.0",
"cc",
"libc",
"pkg-config",
@@ -1014,22 +1070,22 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.0.12"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
@@ -1046,9 +1102,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "ppv-lite86"
@@ -1063,9 +1119,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 1.0.109",
"version_check",
]
@@ -1075,8 +1131,8 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
"version_check",
]
@@ -1091,9 +1147,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
dependencies = [
"unicode-ident",
]
@@ -1136,9 +1192,9 @@ checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
dependencies = [
"anyhow",
"itertools 0.10.5",
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 1.0.109",
]
[[package]]
@@ -1168,11 +1224,11 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.26"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [
- "proc-macro2 1.0.56",
+ "proc-macro2 1.0.59",
]
[[package]]
@@ -1356,18 +1412,18 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.2.16"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
dependencies = [
"bitflags",
]
[[package]]
name = "regex"
-version = "1.7.0"
+version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
dependencies = [
"aho-corasick",
"memchr",
@@ -1376,26 +1432,17 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "reqwest"
-version = "0.11.16"
+version = "0.11.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
"bytes",
"encoding_rs",
"futures-core",
@@ -1418,7 +1465,7 @@ dependencies = [
"serde_urlencoded",
"tokio",
"tokio-native-tls",
- "tokio-util 0.7.7",
+ "tokio-util 0.7.8",
"tower-service",
"url",
"wasm-bindgen",
@@ -1464,6 +1511,20 @@ dependencies = [
"serde_json",
]
+[[package]]
+name = "rustix"
+version = "0.37.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "rustls"
version = "0.19.1"
@@ -1492,18 +1553,17 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
[[package]]
name = "schannel"
-version = "0.1.20"
+version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
dependencies = [
- "lazy_static",
- "windows-sys 0.36.1",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -1518,9 +1578,9 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.7.0"
+version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
+checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
dependencies = [
"bitflags",
"core-foundation",
@@ -1531,9 +1591,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.6.1"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
dependencies = [
"core-foundation-sys",
"libc",
@@ -1541,29 +1601,38 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.151"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.151"
+version = "1.0.163"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+dependencies = [
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "serde_fmt"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
+checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "serde",
]
[[package]]
name = "serde_json"
-version = "1.0.91"
+version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
dependencies = [
"itoa",
"ryu",
@@ -1636,9 +1705,9 @@ dependencies = [
name = "sgx_macros"
version = "2.0.0"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 1.0.109",
]
[[package]]
@@ -1789,18 +1858,18 @@ dependencies = [
[[package]]
name = "signal-hook-registry"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
dependencies = [
"libc",
]
[[package]]
name = "slab"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
dependencies = [
"autocfg 1.1.0",
]
@@ -1852,16 +1921,78 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
dependencies = [
"heck",
"proc-macro-error",
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 1.0.109",
]
[[package]]
name = "sval"
-version = "1.0.0-alpha.5"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e6aa16ce8d9e472e21a528a52c875a76a49190f3968f2ec7e9b550ccc28b410"
+
+[[package]]
+name = "sval_buffer"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "905c4373621186ee9637464b0aaa026389ea9e7f841f2225f160a32ba5d5bac4"
+dependencies = [
+ "sval",
+ "sval_ref",
+]
+
+[[package]]
+name = "sval_dynamic"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08"
+checksum = "ad6b4988322c5f22859a6a7649fa1249aa3dd01514caf8ed57d83735f997bb8b"
+dependencies = [
+ "sval",
+]
+
+[[package]]
+name = "sval_fmt"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d3ccd10346f925c2fbd97b75e8573b38e34431bfba04cc531cd23aad0fbabb8"
+dependencies = [
+ "itoa",
+ "ryu",
+ "sval",
+]
+
+[[package]]
+name = "sval_json"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a12e1488defd6344e23243c17ea4a1b185c547968749e8a281373fde0bde2d5"
+dependencies = [
+ "itoa",
+ "ryu",
+ "sval",
+]
+
+[[package]]
+name = "sval_ref"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b797fc4b284dd0e45f7ec424479e604ea5be9bb191a1ef4e96c20c7685649938"
+dependencies = [
+ "sval",
+]
+
+[[package]]
+name = "sval_serde"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "810fa9a837e67a23e0efa7536250fc4d24043306cc1efd076f1943ba2fc2e62d"
+dependencies = [
+ "serde",
+ "sval",
+ "sval_buffer",
+ "sval_fmt",
+]
[[package]]
name = "syn"
@@ -1876,23 +2007,23 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.107"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
"unicode-ident",
]
[[package]]
name = "syn"
-version = "2.0.15"
+version = "2.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
"unicode-ident",
]
@@ -2107,7 +2238,7 @@ dependencies = [
"teaclave_types",
"thiserror",
"tokio",
- "tokio-util 0.7.7",
+ "tokio-util 0.7.8",
"url",
]
@@ -2202,6 +2333,7 @@ name = "teaclave_proto"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"prost",
"serde",
"serde_json",
@@ -2325,9 +2457,9 @@ dependencies = [
name = "teaclave_test_utils_proc_macro"
version = "0.0.1"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 1.0.109",
]
[[package]]
@@ -2335,6 +2467,7 @@ name = "teaclave_types"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"hex",
"log",
"rand 0.8.5",
@@ -2384,23 +2517,22 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.3.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
dependencies = [
"cfg-if 1.0.0",
"fastrand",
- "libc",
"redox_syscall",
- "remove_dir_all",
- "winapi",
+ "rustix",
+ "windows-sys 0.45.0",
]
[[package]]
name = "termcolor"
-version = "1.1.3"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
dependencies = [
"winapi-util",
]
@@ -2416,22 +2548,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
@@ -2445,15 +2577,15 @@ dependencies = [
[[package]]
name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.27.0"
+version = "1.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [
"autocfg 1.1.0",
"bytes",
@@ -2463,7 +2595,7 @@ dependencies = [
"pin-project-lite",
"socket2",
"tokio-macros",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -2478,13 +2610,13 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
@@ -2535,9 +2667,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.7"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
dependencies = [
"bytes",
"futures-core",
@@ -2549,9 +2681,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.5.10"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
dependencies = [
"serde",
]
@@ -2595,10 +2727,10 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757"
dependencies = [
- "proc-macro2 1.0.56",
+ "proc-macro2 1.0.59",
"prost-build",
- "quote 1.0.26",
- "syn 1.0.107",
+ "quote 1.0.28",
+ "syn 1.0.109",
]
[[package]]
@@ -2615,7 +2747,7 @@ dependencies = [
"rand 0.8.5",
"slab",
"tokio",
- "tokio-util 0.7.7",
+ "tokio-util 0.7.8",
"tower-layer",
"tower-service",
"tracing",
@@ -2652,16 +2784,16 @@ version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 2.0.15",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
]
[[package]]
name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
]
@@ -2678,21 +2810,21 @@ dependencies = [
[[package]]
name = "try-lock"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
[[package]]
name = "unicode-normalization"
@@ -2705,9 +2837,9 @@ dependencies = [
[[package]]
name = "unicode-segmentation"
-version = "1.10.0"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
[[package]]
name = "unicode-width"
@@ -2752,13 +2884,38 @@ dependencies = [
[[package]]
name = "value-bag"
-version = "1.0.0-alpha.9"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
+checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e"
+dependencies = [
+ "value-bag-serde1",
+ "value-bag-sval2",
+]
+
+[[package]]
+name = "value-bag-serde1"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4735c95b4cca1447b448e2e2e87e98d7e7498f4da27e355cf7af02204521001d"
+dependencies = [
+ "erased-serde",
+ "serde",
+ "serde_fmt",
+]
+
+[[package]]
+name = "value-bag-sval2"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "859cb4f0ce7da6a118b559ba74b0e63bf569bea867c20ba457a6b1c886a04e97"
dependencies = [
- "ctor",
"sval",
- "version_check",
+ "sval_buffer",
+ "sval_dynamic",
+ "sval_fmt",
+ "sval_json",
+ "sval_ref",
+ "sval_serde",
]
[[package]]
@@ -2797,9 +2954,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.83"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
dependencies = [
"cfg-if 1.0.0",
"wasm-bindgen-macro",
@@ -2807,24 +2964,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.83"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
dependencies = [
"bumpalo",
"log",
"once_cell",
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.33"
+version = "0.4.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
+checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@@ -2834,32 +2991,32 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.83"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
dependencies = [
- "quote 1.0.26",
+ "quote 1.0.28",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 1.0.107",
+ "proc-macro2 1.0.59",
+ "quote 1.0.28",
+ "syn 2.0.18",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
[[package]]
name = "wasm-streams"
@@ -2876,9 +3033,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.60"
+version = "0.3.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
+checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2945,31 +3102,18 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
[[package]]
name = "windows-sys"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
- "windows_aarch64_gnullvm",
+ "windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm",
+ "windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]
@@ -2979,7 +3123,16 @@ version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
- "windows-targets",
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
]
[[package]]
@@ -2988,15 +3141,30 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
- "windows_aarch64_gnullvm",
+ "windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm",
+ "windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
+]
+
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.2"
@@ -3004,10 +3172,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
@@ -3016,10 +3184,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
+name = "windows_aarch64_msvc"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
@@ -3028,10 +3196,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
+name = "windows_i686_gnu"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
@@ -3040,10 +3208,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
+name = "windows_i686_msvc"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
@@ -3051,6 +3219,12 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
@@ -3058,10 +3232,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
@@ -3069,6 +3243,12 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
[[package]]
name = "winreg"
version = "0.10.1"
diff --git a/cmake/tomls/Cargo.unix_app.lock b/cmake/tomls/Cargo.unix_app.lock
index f7050aaa..9bc3b4dc 100644
--- a/cmake/tomls/Cargo.unix_app.lock
+++ b/cmake/tomls/Cargo.unix_app.lock
@@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aead"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
dependencies = [
"crypto-common",
"generic-array",
@@ -31,9 +31,9 @@ dependencies = [
[[package]]
name = "aes-gcm"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c"
+checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237"
dependencies = [
"aead",
"aes",
@@ -45,13 +45,19 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "0.7.20"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
dependencies = [
"memchr",
]
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
[[package]]
name = "android_system_properties"
version = "0.1.5"
@@ -72,50 +78,48 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.68"
+version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
[[package]]
name = "async-stream"
-version = "0.3.3"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
dependencies = [
"async-stream-impl",
"futures-core",
+ "pin-project-lite",
]
[[package]]
name = "async-stream-impl"
-version = "0.3.3"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
]
[[package]]
name = "async-trait"
-version = "0.1.60"
+version = "0.1.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3"
+checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
]
[[package]]
name = "atomic"
-version = "0.5.1"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c"
-dependencies = [
- "autocfg",
-]
+checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
[[package]]
name = "atty"
@@ -152,6 +156,12 @@ version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
+[[package]]
+name = "base64"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+
[[package]]
name = "binascii"
version = "0.1.4"
@@ -172,30 +182,30 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
dependencies = [
"generic-array",
]
[[package]]
name = "bumpalo"
-version = "3.11.1"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytes"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
[[package]]
name = "cc"
-version = "1.0.78"
+version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
[[package]]
name = "cfg-if"
@@ -211,13 +221,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.23"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [
+ "android-tzdata",
"iana-time-zone",
"js-sys",
- "num-integer",
"num-traits",
"time 0.1.45",
"wasm-bindgen",
@@ -226,9 +236,9 @@ dependencies = [
[[package]]
name = "cipher"
-version = "0.4.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
dependencies = [
"crypto-common",
"inout",
@@ -249,16 +259,6 @@ dependencies = [
"vec_map",
]
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
[[package]]
name = "cookie"
version = "0.16.2"
@@ -273,21 +273,21 @@ dependencies = [
"rand",
"sha2",
"subtle",
- "time 0.3.17",
+ "time 0.3.21",
"version_check",
]
[[package]]
name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "cpufeatures"
-version = "0.2.5"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58"
dependencies = [
"libc",
]
@@ -319,7 +319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
dependencies = [
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -331,50 +331,6 @@ dependencies = [
"cipher",
]
-[[package]]
-name = "cxx"
-version = "1.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "devise"
version = "0.3.1"
@@ -403,16 +359,16 @@ checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0"
dependencies = [
"bitflags",
"proc-macro2",
- "proc-macro2-diagnostics",
+ "proc-macro2-diagnostics 0.9.1",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "digest"
-version = "0.10.6"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer",
"crypto-common",
@@ -421,15 +377,15 @@ dependencies = [
[[package]]
name = "either"
-version = "1.8.0"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
dependencies = [
"cfg-if 1.0.0",
]
@@ -447,25 +403,46 @@ dependencies = [
"termcolor",
]
+[[package]]
+name = "errno"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
[[package]]
name = "fastrand"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
dependencies = [
"instant",
]
[[package]]
name = "figment"
-version = "0.10.8"
+version = "0.10.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e56602b469b2201400dec66a66aec5a9b8761ee97cd1b8c96ab2483fcc16cc9"
+checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5"
dependencies = [
"atomic",
"pear",
"serde",
- "toml",
+ "toml 0.7.4",
"uncased",
"version_check",
]
@@ -503,9 +480,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
@@ -518,9 +495,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -528,15 +505,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -545,38 +522,38 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-macro"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
]
[[package]]
name = "futures-sink"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
@@ -592,9 +569,9 @@ dependencies = [
[[package]]
name = "generator"
-version = "0.7.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e"
+checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a"
dependencies = [
"cc",
"libc",
@@ -605,9 +582,9 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
@@ -615,9 +592,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -636,26 +613,26 @@ dependencies = [
[[package]]
name = "ghost"
-version = "0.1.7"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3"
+checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
]
[[package]]
name = "glob"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "h2"
-version = "0.3.15"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
+checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
dependencies = [
"bytes",
"fnv",
@@ -666,7 +643,7 @@ dependencies = [
"indexmap",
"slab",
"tokio",
- "tokio-util 0.7.4",
+ "tokio-util 0.7.8",
"tracing",
]
@@ -707,6 +684,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
[[package]]
name = "hex"
version = "0.4.3"
@@ -733,9 +716,9 @@ dependencies = [
[[package]]
name = "http"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
dependencies = [
"bytes",
"fnv",
@@ -776,9 +759,9 @@ dependencies = [
[[package]]
name = "hyper"
-version = "0.14.23"
+version = "0.14.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
+checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
dependencies = [
"bytes",
"futures-channel",
@@ -812,26 +795,25 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "winapi",
+ "windows",
]
[[package]]
name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
]
[[package]]
@@ -846,9 +828,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.9.2"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown",
@@ -898,7 +880,18 @@ checksum = "7e41b53715c6f0c4be49510bb82dee2c1e51c8586d885abe65396e82ed518548"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.1",
+ "libc",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -912,15 +905,15 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "js-sys"
-version = "0.3.60"
+version = "0.3.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
dependencies = [
"wasm-bindgen",
]
@@ -933,18 +926,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.139"
+version = "0.2.145"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81"
[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
+name = "linux-raw-sys"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "lock_api"
@@ -958,12 +948,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.17"
+version = "0.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if 1.0.0",
-]
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
[[package]]
name = "loom"
@@ -997,9 +984,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "mime"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "miniz_oxide"
@@ -1012,21 +999,20 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.5"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
- "log",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
name = "multer"
-version = "2.0.4"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22"
+checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2"
dependencies = [
"bytes",
"encoding_rs",
@@ -1036,9 +1022,9 @@ dependencies = [
"log",
"memchr",
"mime",
- "spin 0.9.4",
+ "spin 0.9.8",
"tokio",
- "tokio-util 0.7.4",
+ "tokio-util 0.7.8",
"version_check",
]
@@ -1100,9 +1086,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.16.0"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "opaque-debug"
@@ -1128,22 +1114,22 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.5"
+version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
+checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"smallvec",
- "windows-sys",
+ "windows-sys 0.45.0",
]
[[package]]
name = "pear"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702"
+checksum = "0ec95680a7087503575284e5063e14b694b7a9c0b065e5dceec661e0497127e8"
dependencies = [
"inlinable_string",
"pear_codegen",
@@ -1152,14 +1138,14 @@ dependencies = [
[[package]]
name = "pear_codegen"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0"
+checksum = "9661a3a53f93f09f2ea882018e4d7c88f6ff2956d809a276060476fd8c879d3c"
dependencies = [
"proc-macro2",
- "proc-macro2-diagnostics",
+ "proc-macro2-diagnostics 0.10.0",
"quote",
- "syn",
+ "syn 2.0.18",
]
[[package]]
@@ -1191,22 +1177,22 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.0.12"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
]
[[package]]
@@ -1248,7 +1234,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -1265,9 +1251,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.49"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
dependencies = [
"unicode-ident",
]
@@ -1280,7 +1266,20 @@ checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
+ "version_check",
+ "yansi",
+]
+
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
"version_check",
"yansi",
]
@@ -1325,7 +1324,7 @@ dependencies = [
"itertools",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1346,9 +1345,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quote"
-version = "1.0.23"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [
"proc-macro2",
]
@@ -1401,35 +1400,44 @@ dependencies = [
"bitflags",
]
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags",
+]
+
[[package]]
name = "ref-cast"
-version = "1.0.14"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed"
+checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
-version = "1.0.14"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f"
+checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
]
[[package]]
name = "regex"
-version = "1.7.0"
+version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax",
+ "regex-syntax 0.7.2",
]
[[package]]
@@ -1438,23 +1446,20 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
dependencies = [
- "regex-syntax",
+ "regex-syntax 0.6.29",
]
[[package]]
name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
+name = "regex-syntax"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "ring"
@@ -1499,10 +1504,10 @@ dependencies = [
"serde",
"state",
"tempfile",
- "time 0.3.17",
+ "time 0.3.21",
"tokio",
"tokio-stream",
- "tokio-util 0.7.4",
+ "tokio-util 0.7.8",
"ubyte",
"version_check",
"yansi",
@@ -1519,7 +1524,7 @@ dependencies = [
"proc-macro2",
"quote",
"rocket_http",
- "syn",
+ "syn 1.0.109",
"unicode-xid",
]
@@ -1540,18 +1545,32 @@ dependencies = [
"percent-encoding",
"pin-project-lite",
"ref-cast",
- "rustls 0.20.7",
+ "rustls 0.20.8",
"rustls-pemfile",
"serde",
"smallvec",
"stable-pattern",
"state",
- "time 0.3.17",
+ "time 0.3.21",
"tokio",
"tokio-rustls 0.23.4",
"uncased",
]
+[[package]]
+name = "rustix"
+version = "0.37.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "rustls"
version = "0.19.1"
@@ -1567,9 +1586,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.20.7"
+version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
dependencies = [
"log",
"ring",
@@ -1579,24 +1598,24 @@ dependencies = [
[[package]]
name = "rustls-pemfile"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
+checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
dependencies = [
- "base64 0.13.1",
+ "base64 0.21.2",
]
[[package]]
name = "rustversion"
-version = "1.0.11"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
[[package]]
name = "ryu"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
[[package]]
name = "scoped-tls"
@@ -1610,12 +1629,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-[[package]]
-name = "scratch"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
-
[[package]]
name = "sct"
version = "0.6.1"
@@ -1638,35 +1651,44 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.151"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.151"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
]
[[package]]
name = "serde_json"
-version = "1.0.91"
+version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
dependencies = [
"itoa",
"ryu",
"serde",
]
+[[package]]
+name = "serde_spanned"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "sgx_alloc"
version = "2.0.0"
@@ -1866,18 +1888,18 @@ dependencies = [
[[package]]
name = "signal-hook-registry"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
dependencies = [
"libc",
]
[[package]]
name = "slab"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
dependencies = [
"autocfg",
]
@@ -1890,9 +1912,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "socket2"
-version = "0.4.7"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
dependencies = [
"libc",
"winapi",
@@ -1906,9 +1928,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "spin"
-version = "0.9.4"
+version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
[[package]]
name = "stable-pattern"
@@ -1955,20 +1977,31 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "subtle"
-version = "2.4.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
[[package]]
name = "syn"
-version = "1.0.107"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
dependencies = [
"proc-macro2",
"quote",
@@ -2050,7 +2083,7 @@ dependencies = [
"anyhow",
"log",
"serde",
- "toml",
+ "toml 0.5.11",
"url",
]
@@ -2095,6 +2128,7 @@ name = "teaclave_proto"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"prost",
"serde",
"serde_json",
@@ -2137,7 +2171,7 @@ version = "0.0.1"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2145,6 +2179,7 @@ name = "teaclave_types"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"hex",
"log",
"rand",
@@ -2156,7 +2191,7 @@ dependencies = [
"teaclave_crypto",
"teaclave_test_utils",
"thiserror",
- "toml",
+ "toml 0.5.11",
"tonic",
"url",
"uuid",
@@ -2164,23 +2199,22 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.3.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
dependencies = [
"cfg-if 1.0.0",
"fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
+ "redox_syscall 0.3.5",
+ "rustix",
+ "windows-sys 0.45.0",
]
[[package]]
name = "termcolor"
-version = "1.1.3"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
dependencies = [
"winapi-util",
]
@@ -2196,30 +2230,31 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
]
[[package]]
name = "thread_local"
-version = "1.1.4"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
dependencies = [
+ "cfg-if 1.0.0",
"once_cell",
]
@@ -2236,9 +2271,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.17"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
+checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
dependencies = [
"itoa",
"serde",
@@ -2248,15 +2283,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
-version = "0.2.6"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
+checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
dependencies = [
"time-core",
]
@@ -2272,27 +2307,26 @@ dependencies = [
[[package]]
name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.23.0"
+version = "1.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [
"autocfg",
"bytes",
"libc",
- "memchr",
"mio",
"num_cpus",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"tokio-macros",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -2307,13 +2341,13 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "1.8.2"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
]
[[package]]
@@ -2333,16 +2367,16 @@ version = "0.23.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
dependencies = [
- "rustls 0.20.7",
+ "rustls 0.20.8",
"tokio",
"webpki 0.22.0",
]
[[package]]
name = "tokio-stream"
-version = "0.1.11"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
dependencies = [
"futures-core",
"pin-project-lite",
@@ -2365,9 +2399,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.4"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
dependencies = [
"bytes",
"futures-core",
@@ -2379,11 +2413,45 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.5.10"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
dependencies = [
+ "indexmap",
"serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
]
[[package]]
@@ -2428,7 +2496,7 @@ dependencies = [
"proc-macro2",
"prost-build",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2445,7 +2513,7 @@ dependencies = [
"rand",
"slab",
"tokio",
- "tokio-util 0.7.4",
+ "tokio-util 0.7.8",
"tower-layer",
"tower-service",
"tracing",
@@ -2478,20 +2546,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
]
[[package]]
name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
"valuable",
@@ -2520,9 +2588,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
dependencies = [
"matchers",
"nu-ansi-term",
@@ -2538,9 +2606,9 @@ dependencies = [
[[package]]
name = "try-lock"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "typenum"
@@ -2559,9 +2627,9 @@ dependencies = [
[[package]]
name = "uncased"
-version = "0.9.7"
+version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622"
+checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68"
dependencies = [
"serde",
"version_check",
@@ -2569,15 +2637,15 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
[[package]]
name = "unicode-normalization"
@@ -2590,9 +2658,9 @@ dependencies = [
[[package]]
name = "unicode-segmentation"
-version = "1.10.0"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
[[package]]
name = "unicode-width"
@@ -2608,9 +2676,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "universal-hash"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
dependencies = [
"crypto-common",
"subtle",
@@ -2687,9 +2755,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.83"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
dependencies = [
"cfg-if 1.0.0",
"wasm-bindgen-macro",
@@ -2697,24 +2765,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.83"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.83"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2722,28 +2790,28 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.18",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
[[package]]
name = "web-sys"
-version = "0.3.60"
+version = "0.3.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
+checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2822,103 +2890,153 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
-version = "0.39.0"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
- "windows_aarch64_msvc 0.39.0",
- "windows_i686_gnu 0.39.0",
- "windows_i686_msvc 0.39.0",
- "windows_x86_64_gnu 0.39.0",
- "windows_x86_64_msvc 0.39.0",
+ "windows-targets 0.42.2",
]
[[package]]
name = "windows-sys"
-version = "0.42.0"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
]
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.39.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
-version = "0.39.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
-version = "0.39.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.39.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.39.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
+dependencies = [
+ "memchr",
+]
[[package]]
name = "yansi"
diff --git a/services/management/enclave/Cargo.toml b/services/management/enclave/Cargo.toml
index dbdd7445..fae94c96 100644
--- a/services/management/enclave/Cargo.toml
+++ b/services/management/enclave/Cargo.toml
@@ -43,17 +43,19 @@ cov = ["teaclave_service_enclave_utils/cov"]
enclave_unit_test = ["teaclave_binder/enclave_unit_test", "teaclave_test_utils/mesalock_sgx"]
[dependencies]
-anyhow = { version = "1.0.26" }
-cfg-if = { version = "0.1.9" }
-log = { version = "0.4.17", features = ["release_max_level_info"] }
-serde = { version = "1.0.92" }
+anyhow = { version = "1.0.26" }
+cfg-if = { version = "0.1.9" }
+chrono = { version = "0.4.6", default-features = false }
+log = { version = "0.4.17", features = ["release_max_level_info"] }
+serde = { version = "1.0.92" }
serde_json = { version = "1.0.39" }
-thiserror = { version = "1.0.9" }
-tokio = { version = "1.0", features = ["rt-multi-thread", "time", "macros"] }
-ring = { version = "0.16.5" }
-rand = { version = "0.8.5" }
-uuid = { version = "0.8.1", features = ["v4"] }
-url = { version = "2.1.1", features = ["serde"]}
+thiserror = { version = "1.0.9" }
+tokio = { version = "1.0", features = ["rt-multi-thread", "time", "macros"] }
+ring = { version = "0.16.5" }
+rand = { version = "0.8.5" }
+tantivy = { version = "0.19.2", default-features = false }
+uuid = { version = "0.8.1", features = ["v4"] }
+url = { version = "2.1.1", features = ["serde"]}
teaclave_attestation = { path = "../../../attestation" }
teaclave_config = { path = "../../../config" }
diff --git a/services/management/enclave/Enclave.config.xml b/services/management/enclave/Enclave.config.xml
index b09351d5..6b47474e 100644
--- a/services/management/enclave/Enclave.config.xml
+++ b/services/management/enclave/Enclave.config.xml
@@ -23,7 +23,7 @@
<ISVSVN>0</ISVSVN>
<StackMaxSize>0x200000</StackMaxSize> <!-- 2M -->
<HeapMaxSize>0x30000000</HeapMaxSize> <!-- 768M -->
- <TCSNum>22</TCSNum>
+ <TCSNum>64</TCSNum>
<TCSPolicy>0</TCSPolicy>
<DisableDebug>0</DisableDebug>
<MiscSelect>0</MiscSelect>
diff --git a/services/management/enclave/src/audit/auditor.rs b/services/management/enclave/src/audit/auditor.rs
new file mode 100644
index 00000000..f8ac6790
--- /dev/null
+++ b/services/management/enclave/src/audit/auditor.rs
@@ -0,0 +1,193 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use super::*;
+
+use teaclave_proto::teaclave_storage_service::TeaclaveStorageClient;
+use teaclave_rpc::transport::Channel;
+use teaclave_types::{Entry, EntryBuilder};
+
+use std::sync::Arc;
+use tokio::sync::Mutex;
+
+use anyhow::{anyhow, Result};
+use tantivy::{
+ collector::TopDocs, query::QueryParser, schema::*, DateTime, Index, IndexReader, IndexSettings,
+ IndexSortByField, IndexWriter, Order, ReloadPolicy,
+};
+
+#[derive(Clone)]
+pub struct Auditor {
+ index: Arc<Mutex<Index>>,
+ reader: Arc<Mutex<IndexReader>>,
+ writer: Arc<Mutex<IndexWriter>>,
+}
+
+impl Auditor {
+ pub fn try_new(storage: Arc<Mutex<TeaclaveStorageClient<Channel>>>) -> Result<Self> {
+ let directory = db_directory::DbDirectory::new(storage);
+
+ let schema = Self::log_schema();
+
+ let settings = IndexSettings {
+ sort_by_field: Some(IndexSortByField {
+ field: "date".to_string(),
+ order: Order::Desc,
+ }),
+ ..Default::default()
+ };
+
+ let index = Index::builder()
+ .schema(schema)
+ .settings(settings)
+ .open_or_create(directory)?;
+ let reader = index
+ .reader_builder()
+ .reload_policy(ReloadPolicy::OnCommit)
+ .try_into()?;
+
+ // 8 is the max thread number of tantivy writer
+ let writer = index.writer(8 * 3_000_000)?;
+
+ let index = Arc::new(Mutex::new(index));
+ let reader = Arc::new(Mutex::new(reader));
+ let writer = Arc::new(Mutex::new(writer));
+
+ Ok(Self {
+ index,
+ reader,
+ writer,
+ })
+ }
+
+ pub async fn add_logs(&self, logs: Vec<Entry>) -> Result<()> {
+ let mut writer = self.writer.lock().await;
+
+ for log in logs {
+ let document = Self::convert_to_doc(log);
+ writer.add_document(document)?;
+ }
+
+ writer.commit()?;
+
+ Ok(())
+ }
+
+ /// query: the query for tantivy
+ /// limit: maximum number of the returned logs
+ pub async fn query_logs(&self, query: &str, limit: usize) -> Result<Vec<Entry>> {
+ let index = self.index.lock().await;
+ let schema = Self::log_schema();
+
+ let reader = self.reader.lock().await;
+ let searcher = reader.searcher();
+
+ let message = schema.get_field("message").unwrap();
+ let date = schema.get_field("date").unwrap();
+
+ let query_parser = QueryParser::for_index(&index, vec![message]);
+ let query = query_parser.parse_query(query)?;
+
+ let top_docs = searcher.search(
+ &query,
+ &TopDocs::with_limit(limit).order_by_fast_field::<DateTime>(date),
+ )?;
+
+ let mut entries = Vec::new();
+
+ for (_, doc_address) in top_docs {
+ let retrieved_doc = searcher.doc(doc_address)?;
+ let entry = Self::try_convert_to_entry(retrieved_doc)?;
+ entries.push(entry);
+ }
+
+ Ok(entries)
+ }
+
+ pub(crate) fn try_convert_to_entry(doc: Document) -> Result<Entry> {
+ let schema = Self::log_schema();
+ let date = schema.get_field("date").unwrap();
+ let ip = schema.get_field("ip").unwrap();
+ let user = schema.get_field("user").unwrap();
+ let message = schema.get_field("message").unwrap();
+ let result = schema.get_field("result").unwrap();
+
+ let date = doc
+ .get_first(date)
+ .and_then(|d| d.as_date())
+ .ok_or_else(|| anyhow!("failed to get date"))?;
+ let ip = doc
+ .get_first(ip)
+ .and_then(|i| i.as_ip_addr())
+ .ok_or_else(|| anyhow!("failed to get ip"))?;
+ let user = doc
+ .get_first(user)
+ .and_then(|u| u.as_text())
+ .ok_or_else(|| anyhow!("failed to get user"))?;
+ let message = doc
+ .get_first(message)
+ .and_then(|m| m.as_text())
+ .ok_or_else(|| anyhow!("failed to get message"))?;
+ let result = doc
+ .get_first(result)
+ .and_then(|r| r.as_bool())
+ .ok_or_else(|| anyhow!("failed to get result"))?;
+
+ let microsecond = date.into_timestamp_micros();
+
+ let entry = EntryBuilder::new()
+ .microsecond(microsecond)
+ .ip(ip.to_ipv4().unwrap())
+ .user(user.to_owned())
+ .message(message.to_owned())
+ .result(result)
+ .build();
+
+ Ok(entry)
+ }
+
+ pub(crate) fn convert_to_doc(entry: Entry) -> Document {
+ let schema = Self::log_schema();
+ let date = schema.get_field("date").unwrap();
+ let ip = schema.get_field("ip").unwrap();
+ let user = schema.get_field("user").unwrap();
+ let message = schema.get_field("message").unwrap();
+ let result = schema.get_field("result").unwrap();
+
+ let date_v = DateTime::from_timestamp_micros(entry.datetime().timestamp_micros());
+
+ let mut doc = Document::default();
+ doc.add_date(date, date_v);
+ doc.add_ip_addr(ip, entry.ip().to_ipv6_compatible());
+ doc.add_text(user, &entry.user());
+ doc.add_text(message, &entry.message());
+ doc.add_bool(result, entry.result());
+
+ doc
+ }
+
+ pub(crate) fn log_schema() -> Schema {
+ let mut builder = Schema::builder();
+ builder.add_date_field("date", INDEXED | FAST | STORED);
+ builder.add_ip_addr_field("ip", INDEXED | STORED);
+ builder.add_text_field("user", TEXT | STORED);
+ builder.add_text_field("message", TEXT | STORED);
+ builder.add_bool_field("result", INDEXED | STORED);
+
+ builder.build()
+ }
+}
diff --git a/services/management/enclave/src/audit/db_directory.rs b/services/management/enclave/src/audit/db_directory.rs
new file mode 100644
index 00000000..0562608d
--- /dev/null
+++ b/services/management/enclave/src/audit/db_directory.rs
@@ -0,0 +1,222 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+// This file references
+// https://github.com/quickwit-oss/tantivy/blob/main/src/directory/ram_directory.rs
+
+use teaclave_proto::teaclave_storage_service::{
+ DeleteRequest, GetRequest, PutRequest, TeaclaveStorageClient,
+};
+use teaclave_rpc::transport::Channel;
+
+use std::io::{self, BufWriter, Cursor, Seek, SeekFrom, Write};
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, LazyLock};
+use std::{fmt, result};
+
+use tantivy::directory::error::{DeleteError, OpenReadError, OpenWriteError};
+use tantivy::directory::{
+ AntiCallToken, Directory, FileHandle, FileSlice, TerminatingWrite, WatchCallback,
+ WatchCallbackList, WatchHandle, WritePtr,
+};
+use tokio::runtime::{Builder, Runtime};
+use tokio::sync::Mutex;
+
+pub static META_FILEPATH: LazyLock<&'static Path> = LazyLock::new(|| Path::new("meta.json"));
+pub static DB_PREFIX: LazyLock<String> = LazyLock::new(|| String::from("tantivy/"));
+static INDEX_WRITER_LOCK: LazyLock<&'static Path> =
+ LazyLock::new(|| Path::new(".tantivy-writer.lock"));
+
+struct Cache {
+ path: PathBuf,
+ shared_directory: DbDirectory,
+ data: Cursor<Vec<u8>>,
+ is_flushed: bool,
+ rt: Runtime,
+}
+
+impl Cache {
+ fn new(path_buf: PathBuf, shared_directory: DbDirectory) -> Self {
+ let rt = Builder::new_current_thread().enable_all().build().unwrap();
+
+ Cache {
+ path: path_buf,
+ data: Cursor::new(Vec::new()),
+ shared_directory,
+ is_flushed: true,
+ rt,
+ }
+ }
+}
+
+impl Drop for Cache {
+ fn drop(&mut self) {
+ if !self.is_flushed {
+ let _ = self.flush();
+ }
+ }
+}
+
+impl Seek for Cache {
+ fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
+ self.data.seek(pos)
+ }
+}
+
+impl Write for Cache {
+ fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+ self.is_flushed = false;
+ self.data.write_all(buf)?;
+ Ok(buf.len())
+ }
+
+ fn flush(&mut self) -> io::Result<()> {
+ self.is_flushed = true;
+ let key = DB_PREFIX.clone() + &self.path.to_string_lossy();
+ let request = PutRequest::new(key.as_bytes(), self.data.get_ref().clone());
+
+ self.rt
+ .block_on(self.shared_directory.db.blocking_lock().put(request))
+ .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
+ Ok(())
+ }
+}
+
+impl TerminatingWrite for Cache {
+ fn terminate_ref(&mut self, _: AntiCallToken) -> io::Result<()> {
+ self.flush()
+ }
+}
+
+/// A Directory storing everything in the storage service.
+#[derive(Clone)]
+pub struct DbDirectory {
+ db: Arc<Mutex<TeaclaveStorageClient<Channel>>>,
+ watch_router: Arc<WatchCallbackList>,
+ rt: Arc<Runtime>,
+}
+
+impl fmt::Debug for DbDirectory {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ write!(f, "DbDirectory")
+ }
+}
+
+impl DbDirectory {
+ pub fn new(db: Arc<Mutex<TeaclaveStorageClient<Channel>>>) -> Self {
+ let rt = Arc::new(Builder::new_current_thread().enable_all().build().unwrap());
+ let dir = Self {
+ db,
+ watch_router: Arc::default(),
+ rt,
+ };
+
+ // remove the lockfile if it exists
+ let _ = dir.delete(&INDEX_WRITER_LOCK);
+
+ dir
+ }
+
+ fn write(&self, path: &Path, data: &[u8]) -> io::Result<()> {
+ let key = DB_PREFIX.clone() + &path.to_string_lossy();
+ let request = PutRequest::new(key.as_bytes(), data);
+
+ self.rt
+ .block_on(self.db.blocking_lock().put(request))
+ .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
+ Ok(())
+ }
+}
+
+impl Directory for DbDirectory {
+ fn get_file_handle(&self, path: &Path) -> Result<Arc<dyn FileHandle>, OpenReadError> {
+ let file_slice = self.open_read(path)?;
+ Ok(Arc::new(file_slice))
+ }
+
+ fn open_read(&self, path: &Path) -> result::Result<FileSlice, OpenReadError> {
+ let key = DB_PREFIX.clone() + &path.to_string_lossy();
+ let request = GetRequest::new(key.as_bytes());
+
+ self.rt
+ .block_on(self.db.blocking_lock().get(request))
+ .map_err(|_| OpenReadError::FileDoesNotExist(PathBuf::from(path)))
+ .map(|r| FileSlice::from(r.into_inner().value))
+ }
+
+ fn delete(&self, path: &Path) -> result::Result<(), DeleteError> {
+ let key = DB_PREFIX.clone() + &path.to_string_lossy();
+ let request = DeleteRequest::new(key.as_bytes());
+
+ self.rt
+ .block_on(self.db.blocking_lock().delete(request))
+ .map_err(|_| DeleteError::FileDoesNotExist(PathBuf::from(path)))?;
+ Ok(())
+ }
+
+ fn exists(&self, path: &Path) -> Result<bool, OpenReadError> {
+ let key = DB_PREFIX.clone() + &path.to_string_lossy();
+ let request = GetRequest::new(key.as_bytes());
+
+ let get = self.rt.block_on(self.db.blocking_lock().get(request));
+ Ok(get.is_ok())
+ }
+
+ fn open_write(&self, path: &Path) -> Result<WritePtr, OpenWriteError> {
+ let cache = Cache::new(path.to_owned(), self.clone());
+ let exists = self.exists(path).unwrap();
+ // force the creation of the file to mimic the MMap directory.
+ if exists {
+ self.write(path, &[])
+ .map_err(|io_error| OpenWriteError::IoError {
+ io_error: Arc::new(io_error),
+ filepath: PathBuf::from(path),
+ })?;
+
+ Err(OpenWriteError::FileAlreadyExists(PathBuf::from(path)))
+ } else {
+ Ok(BufWriter::new(Box::new(cache)))
+ }
+ }
+
+ fn atomic_read(&self, path: &Path) -> Result<Vec<u8>, OpenReadError> {
+ let bytes =
+ self.open_read(path)?
+ .read_bytes()
+ .map_err(|io_error| OpenReadError::IoError {
+ io_error: Arc::new(io_error),
+ filepath: PathBuf::from(path),
+ })?;
+ Ok(bytes.as_slice().to_owned())
+ }
+
+ fn atomic_write(&self, path: &Path, data: &[u8]) -> io::Result<()> {
+ self.write(path, data)?;
+ if path == *META_FILEPATH {
+ drop(self.watch_router.broadcast());
+ }
+ Ok(())
+ }
+
+ fn watch(&self, watch_callback: WatchCallback) -> tantivy::Result<WatchHandle> {
+ Ok(self.watch_router.subscribe(watch_callback))
+ }
+
+ fn sync_directory(&self) -> io::Result<()> {
+ Ok(())
+ }
+}
diff --git a/types/src/lib.rs b/services/management/enclave/src/audit/mod.rs
similarity index 56%
copy from types/src/lib.rs
copy to services/management/enclave/src/audit/mod.rs
index f48eeb45..c65824af 100644
--- a/types/src/lib.rs
+++ b/services/management/enclave/src/audit/mod.rs
@@ -15,45 +15,9 @@
// specific language governing permissions and limitations
// under the License.
-extern crate sgx_types;
-
-mod attestation;
-mod crypto;
-mod error;
-mod file;
-mod file_agent;
-mod function;
-mod macros;
-mod staged_file;
-mod staged_function;
-mod staged_task;
-mod storage;
-mod task;
-mod task_state;
-mod user;
-mod worker;
-
-pub use attestation::*;
-pub use crypto::*;
-pub use error::*;
-pub use file::*;
-pub use file_agent::*;
-pub use function::*;
-pub use macros::*;
-pub use staged_file::*;
-pub use staged_function::*;
-pub use staged_task::*;
-pub use storage::*;
-pub use task::*;
-pub use task_state::*;
-pub use user::*;
-pub use worker::*;
-
+mod auditor;
+mod db_directory;
#[cfg(feature = "enclave_unit_test")]
-pub mod tests {
- use super::*;
+pub mod tests;
- pub fn run_tests() -> bool {
- worker::tests::run_tests()
- }
-}
+pub use auditor::Auditor;
diff --git a/types/src/lib.rs b/services/management/enclave/src/audit/tests.rs
similarity index 53%
copy from types/src/lib.rs
copy to services/management/enclave/src/audit/tests.rs
index f48eeb45..b9637d63 100644
--- a/types/src/lib.rs
+++ b/services/management/enclave/src/audit/tests.rs
@@ -15,45 +15,26 @@
// specific language governing permissions and limitations
// under the License.
-extern crate sgx_types;
+use super::*;
-mod attestation;
-mod crypto;
-mod error;
-mod file;
-mod file_agent;
-mod function;
-mod macros;
-mod staged_file;
-mod staged_function;
-mod staged_task;
-mod storage;
-mod task;
-mod task_state;
-mod user;
-mod worker;
+use teaclave_types::EntryBuilder;
-pub use attestation::*;
-pub use crypto::*;
-pub use error::*;
-pub use file::*;
-pub use file_agent::*;
-pub use function::*;
-pub use macros::*;
-pub use staged_file::*;
-pub use staged_function::*;
-pub use staged_task::*;
-pub use storage::*;
-pub use task::*;
-pub use task_state::*;
-pub use user::*;
-pub use worker::*;
+pub fn test_entry_doc_conversion() {
+ let schema = Auditor::log_schema();
+ let entry = EntryBuilder::new().microsecond(0).build();
-#[cfg(feature = "enclave_unit_test")]
-pub mod tests {
- use super::*;
+ let doc = schema
+ .parse_document(
+ r#"{
+ "date": "1970-01-01T00:00:00.00Z",
+ "ip": "0000:0000:0000:0000:0000:0000:0000:0000",
+ "user": "",
+ "message": "",
+ "result": false
+ }"#,
+ )
+ .unwrap();
- pub fn run_tests() -> bool {
- worker::tests::run_tests()
- }
+ assert_eq!(entry, Auditor::try_convert_to_entry(doc.clone()).unwrap());
+ assert_eq!(Auditor::convert_to_doc(entry), doc);
}
diff --git a/services/management/enclave/src/error.rs b/services/management/enclave/src/error.rs
index 33515efe..a8d7f88a 100644
--- a/services/management/enclave/src/error.rs
+++ b/services/management/enclave/src/error.rs
@@ -47,6 +47,8 @@ pub(crate) enum ManagementServiceError {
TaskCancelError(String),
#[error("function quota has been used up")]
FunctionQuotaError,
+ #[error("audit log error, reason: {0}")]
+ AuditError(String),
}
impl From<ManagementServiceError> for Status {
diff --git a/services/management/enclave/src/lib.rs b/services/management/enclave/src/lib.rs
index 6faf32ff..5d6f5bd6 100644
--- a/services/management/enclave/src/lib.rs
+++ b/services/management/enclave/src/lib.rs
@@ -32,6 +32,7 @@ use teaclave_proto::teaclave_management_service::TeaclaveManagementServer;
use teaclave_service_enclave_utils::{create_trusted_storage_endpoint, ServiceEnclave};
use teaclave_types::{EnclaveInfo, TeeServiceError, TeeServiceResult};
+mod audit;
mod error;
mod service;
@@ -145,6 +146,7 @@ pub mod tests {
service::tests::check_function_quota,
service::tests::handle_task,
service::tests::handle_staged_task,
+ audit::tests::test_entry_doc_conversion,
)
}
}
diff --git a/services/management/enclave/src/service.rs b/services/management/enclave/src/service.rs
index 5f666d67..0c2649a5 100644
--- a/services/management/enclave/src/service.rs
+++ b/services/management/enclave/src/service.rs
@@ -15,7 +15,11 @@
// specific language governing permissions and limitations
// under the License.
-use crate::error::ManagementServiceError;
+use super::*;
+
+use audit::Auditor;
+use error::ManagementServiceError;
+
use anyhow::anyhow;
use std::convert::TryInto;
use std::sync::Arc;
@@ -36,7 +40,7 @@ use teaclave_proto::teaclave_frontend_service::{
UpdateFunctionResponse, UpdateInputFileRequest, UpdateInputFileResponse,
UpdateOutputFileRequest, UpdateOutputFileResponse,
};
-use teaclave_proto::teaclave_management_service::TeaclaveManagement;
+use teaclave_proto::teaclave_management_service::{SaveLogsRequest, TeaclaveManagement};
use teaclave_proto::teaclave_storage_service::{
DeleteRequest, EnqueueRequest, GetKeysByPrefixRequest, GetRequest, PutRequest,
TeaclaveStorageClient,
@@ -52,6 +56,7 @@ use uuid::Uuid;
#[derive(Clone)]
pub(crate) struct TeaclaveManagementService {
storage_client: Arc<Mutex<TeaclaveStorageClient<Channel>>>,
+ auditor: audit::Auditor,
}
#[teaclave_rpc::async_trait]
@@ -914,6 +919,27 @@ impl TeaclaveManagement for TeaclaveManagementService {
Ok(Response::new(()))
}
+
+ // access_control: none
+ async fn save_logs(
+ &self,
+ request: Request<SaveLogsRequest>,
+ ) -> TeaclaveServiceResponseResult<()> {
+ let request = request.into_inner();
+
+ let entries: Result<Vec<Entry>> = request.logs.into_iter().map(Entry::try_from).collect();
+ let logs = entries.map_err(|e| {
+ let err_msg = format!("failed to transform entries {:?}", e);
+ ManagementServiceError::AuditError(err_msg)
+ })?;
+
+ self.auditor.add_logs(logs).await.map_err(|e| {
+ let err_msg = format!("failed to save logs {:?}", e);
+ ManagementServiceError::AuditError(err_msg)
+ })?;
+
+ Ok(Response::new(()))
+ }
}
impl TeaclaveManagementService {
@@ -923,7 +949,11 @@ impl TeaclaveManagementService {
.await
.map_err(|e| anyhow!("Failed to connect to storage service, {:?}", e))?;
let storage_client = Arc::new(Mutex::new(TeaclaveStorageClient::new(channel)));
- let service = Self { storage_client };
+ let auditor = Auditor::try_new(storage_client.clone())?;
+ let service = Self {
+ storage_client,
+ auditor,
+ };
#[cfg(test_mode)]
service.add_mock_data().await?;
diff --git a/services/proto/Cargo.toml b/services/proto/Cargo.toml
index 43693f77..a4dd1c92 100644
--- a/services/proto/Cargo.toml
+++ b/services/proto/Cargo.toml
@@ -36,20 +36,21 @@ mesalock_sgx = [
cov = ["sgx_cov"]
[dependencies]
-anyhow = { version = "1.0.26" }
-prost = { version = "0.9" }
-serde = { version = "1.0.39", features = ["derive"] }
-serde_json = { version = "1.0.39" }
-tonic = { version = "0.6.1", features = ["tls", "compression"]}
-url = { version = "2.1.1" }
-uuid = { version = "0.8.1", features = ["v4"] }
-teaclave_types = { path = "../../types" }
+anyhow = { version = "1.0.26" }
+chrono = { version = "0.4", default-features = false }
+prost = { version = "0.9" }
+serde = { version = "1.0.39", features = ["derive"] }
+serde_json = { version = "1.0.39" }
+tonic = { version = "0.6.1", features = ["tls", "compression"]}
+url = { version = "2.1.1" }
+uuid = { version = "0.8.1", features = ["v4"] }
+teaclave_types = { path = "../../types" }
teaclave_crypto = { path = "../../crypto" }
-sgx_cov = { version = "2.0.0", optional = true }
+sgx_cov = { version = "2.0.0", optional = true }
[target.'cfg(not(target_vendor = "teaclave"))'.dependencies]
-sgx_types = { version = "2.0.0" }
+sgx_types = { version = "2.0.0" }
[build-dependencies]
-tonic-build = { version = "0.6.0", features = ["prost","compression"] }
\ No newline at end of file
+tonic-build = { version = "0.6.0", features = ["prost","compression"] }
diff --git a/services/proto/src/proto/teaclave_common.proto b/services/proto/src/proto/teaclave_common.proto
index 405d029f..3a6d43b5 100644
--- a/services/proto/src/proto/teaclave_common.proto
+++ b/services/proto/src/proto/teaclave_common.proto
@@ -70,3 +70,11 @@ message TaskResult {
teaclave_common_proto.TaskFailure Err = 2;
}
}
+
+message Entry {
+ int64 microsecond = 1;
+ bytes ip = 2;
+ string user = 3;
+ string message = 4;
+ bool result = 5;
+}
diff --git a/services/proto/src/proto/teaclave_management_service.proto b/services/proto/src/proto/teaclave_management_service.proto
index 21285c53..25158d50 100644
--- a/services/proto/src/proto/teaclave_management_service.proto
+++ b/services/proto/src/proto/teaclave_management_service.proto
@@ -22,9 +22,14 @@ syntax = "proto3";
package teaclave_management_service_proto;
+import "teaclave_common.proto";
import "teaclave_frontend_service.proto";
import "google/protobuf/empty.proto";
+message SaveLogsRequest {
+ repeated teaclave_common_proto.Entry logs = 1;
+}
+
service TeaclaveManagement {
rpc RegisterInputFile (teaclave_frontend_service_proto.RegisterInputFileRequest) returns (teaclave_frontend_service_proto.RegisterInputFileResponse);
rpc RegisterOutputFile (teaclave_frontend_service_proto.RegisterOutputFileRequest) returns (teaclave_frontend_service_proto.RegisterOutputFileResponse);
@@ -47,4 +52,5 @@ service TeaclaveManagement {
rpc ApproveTask (teaclave_frontend_service_proto.ApproveTaskRequest) returns (google.protobuf.Empty);
rpc InvokeTask (teaclave_frontend_service_proto.InvokeTaskRequest) returns (google.protobuf.Empty);
rpc CancelTask (teaclave_frontend_service_proto.CancelTaskRequest) returns (google.protobuf.Empty);
+ rpc SaveLogs (SaveLogsRequest) returns (google.protobuf.Empty);
}
diff --git a/services/proto/src/teaclave_common.rs b/services/proto/src/teaclave_common.rs
index a5ba4942..762e34cc 100644
--- a/services/proto/src/teaclave_common.rs
+++ b/services/proto/src/teaclave_common.rs
@@ -16,11 +16,17 @@
// under the License.
use crate::teaclave_common_proto as proto;
-use anyhow::{bail, Error, Result};
pub use proto::*;
-use std::convert::TryInto;
+
use teaclave_crypto::TeaclaveFile128Key;
-use teaclave_types::{FileCrypto, TaskFailure, TaskOutputs, TaskResult, TaskStatus};
+use teaclave_types::{
+ Entry, EntryBuilder, FileCrypto, TaskFailure, TaskOutputs, TaskResult, TaskStatus,
+};
+
+use std::convert::TryInto;
+use std::net::Ipv4Addr;
+
+use anyhow::{bail, ensure, Error, Result};
impl UserCredential {
pub fn new(id: impl Into<String>, token: impl Into<String>) -> Self {
@@ -271,3 +277,38 @@ impl std::convert::From<ExecutorCommand> for i32 {
}
}
}
+
+impl std::convert::TryFrom<proto::Entry> for Entry {
+ type Error = Error;
+
+ fn try_from(proto: crate::teaclave_common_proto::Entry) -> Result<Self> {
+ const IPV4_LENTGH: usize = 4;
+
+ let len = proto.ip.len();
+ ensure!(len == IPV4_LENTGH, "invalid ip length: {}", len);
+ let ip = Ipv4Addr::from(<Vec<u8> as TryInto<[u8; 4]>>::try_into(proto.ip).unwrap());
+
+ let builder = EntryBuilder::new();
+ let entry = builder
+ .microsecond(proto.microsecond)
+ .ip(ip)
+ .user(proto.user)
+ .message(proto.message.clone())
+ .result(proto.result)
+ .build();
+
+ Ok(entry)
+ }
+}
+
+impl From<Entry> for proto::Entry {
+ fn from(entry: Entry) -> Self {
+ Self {
+ microsecond: entry.datetime().timestamp_micros(),
+ ip: entry.ip().octets().to_vec(),
+ user: entry.user(),
+ message: entry.message(),
+ result: entry.result(),
+ }
+ }
+}
diff --git a/services/proto/src/teaclave_management_service.rs b/services/proto/src/teaclave_management_service.rs
index 4d178dcd..46412438 100644
--- a/services/proto/src/teaclave_management_service.rs
+++ b/services/proto/src/teaclave_management_service.rs
@@ -16,6 +16,7 @@
// under the License.
use crate::teaclave_management_service_proto as proto;
+pub use proto::*;
pub use proto::teaclave_management_client::TeaclaveManagementClient;
pub use proto::teaclave_management_server::TeaclaveManagement;
diff --git a/types/Cargo.toml b/types/Cargo.toml
index aadc0d4f..50e75e23 100644
--- a/types/Cargo.toml
+++ b/types/Cargo.toml
@@ -36,16 +36,17 @@ mesalock_sgx = [
enclave_unit_test = ["teaclave_test_utils/mesalock_sgx"]
[dependencies]
-log = { version = "0.4.17", features = ["release_max_level_info"] }
anyhow = { version = "1.0.26" }
-rand = { version = "0.8.5" }
+chrono = { version = "0.4", default-features = false }
hex = { version = "0.4.0" }
+log = { version = "0.4.17", features = ["release_max_level_info"] }
+rand = { version = "0.8.5" }
+ring = { version = "0.16.5" }
serde = { version = "1.0.92", features = ["derive"] }
serde_json = { version = "1.0.39" }
-toml = { version = "0.5.3" }
-ring = { version = "0.16.5" }
thiserror = { version = "1.0.9" }
-tonic = { version = "0.6.1", features = ["tls", "compression"] }
+toml = { version = "0.5.3" }
+tonic = { version = "0.6.1", features = ["tls", "compression"] }
url = { version = "2.1.1", features = ["serde"]}
uuid = { version = "0.8.1", features = ["v4", "v5", "serde"] }
diff --git a/types/src/audit.rs b/types/src/audit.rs
new file mode 100644
index 00000000..49d07ebe
--- /dev/null
+++ b/types/src/audit.rs
@@ -0,0 +1,138 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use std::net::Ipv4Addr;
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use chrono::NaiveDateTime;
+
+/// The entry for one line audit log
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct Entry {
+ /// Timestamp
+ datetime: NaiveDateTime,
+ /// Where the request is from.
+ ip: Ipv4Addr,
+ /// Who conducst the request.
+ user: String,
+ /// What the user wants.
+ message: String,
+ /// The result for the message.
+ /// true for success and false for failure
+ result: bool,
+}
+
+impl Default for Entry {
+ fn default() -> Self {
+ let datetime = NaiveDateTime::from_timestamp_micros(0).unwrap();
+ let ip = Ipv4Addr::UNSPECIFIED;
+ let user = String::new();
+ let message = String::new();
+ let result = false;
+
+ Self {
+ datetime,
+ ip,
+ user,
+ message,
+ result,
+ }
+ }
+}
+
+impl Entry {
+ pub fn datetime(&self) -> NaiveDateTime {
+ self.datetime
+ }
+
+ pub fn ip(&self) -> Ipv4Addr {
+ self.ip
+ }
+
+ pub fn user(&self) -> String {
+ self.user.clone()
+ }
+
+ pub fn message(&self) -> String {
+ self.message.clone()
+ }
+
+ pub fn result(&self) -> bool {
+ self.result
+ }
+}
+
+#[derive(Default, Clone)]
+pub struct EntryBuilder {
+ /// The microsecond since the UNIX epoch
+ microsecond: Option<i64>,
+ ip: Option<Ipv4Addr>,
+ user: Option<String>,
+ message: Option<String>,
+ result: Option<bool>,
+}
+
+impl EntryBuilder {
+ pub fn new() -> Self {
+ Default::default()
+ }
+
+ pub fn microsecond(mut self, microsecond: i64) -> Self {
+ self.microsecond = Some(microsecond);
+ self
+ }
+
+ pub fn ip(mut self, ip: Ipv4Addr) -> Self {
+ self.ip = Some(ip);
+ self
+ }
+
+ pub fn user(mut self, user: String) -> Self {
+ self.user = Some(user);
+ self
+ }
+
+ pub fn message(mut self, message: String) -> Self {
+ self.message = Some(message);
+ self
+ }
+
+ pub fn result(mut self, result: bool) -> Self {
+ self.result = Some(result);
+ self
+ }
+
+ pub fn build(self) -> Entry {
+ let datetime = self
+ .microsecond
+ .and_then(NaiveDateTime::from_timestamp_micros)
+ .unwrap_or_else(|| {
+ // The time when the build happens
+ let now = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
+ let microsecond = now.as_micros() as i64;
+ NaiveDateTime::from_timestamp_micros(microsecond).unwrap()
+ });
+
+ Entry {
+ datetime,
+ ip: self.ip.unwrap_or(Ipv4Addr::UNSPECIFIED),
+ user: self.user.unwrap_or_default(),
+ message: self.message.unwrap_or_default(),
+ result: self.result.unwrap_or(false),
+ }
+ }
+}
diff --git a/types/src/lib.rs b/types/src/lib.rs
index f48eeb45..e03dabf6 100644
--- a/types/src/lib.rs
+++ b/types/src/lib.rs
@@ -18,6 +18,7 @@
extern crate sgx_types;
mod attestation;
+mod audit;
mod crypto;
mod error;
mod file;
@@ -34,6 +35,7 @@ mod user;
mod worker;
pub use attestation::*;
+pub use audit::*;
pub use crypto::*;
pub use error::*;
pub use file::*;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org
[incubator-teaclave] 01/04: [sdk] Update the cbindgen command
Posted by hs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hsun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit 6fda4c43ad74de38071eea4b3c57cf345ebba29f
Author: sunhe05 <su...@baidu.com>
AuthorDate: Mon Jun 5 02:56:17 2023 +0000
[sdk] Update the cbindgen command
---
sdk/c/Makefile | 4 +++-
sdk/c/cbindgen.toml | 2 +-
sdk/c/teaclave_client_sdk.h | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sdk/c/Makefile b/sdk/c/Makefile
index 533ddb71..23589f24 100644
--- a/sdk/c/Makefile
+++ b/sdk/c/Makefile
@@ -16,7 +16,9 @@
# under the License.
+# It is very slow to use cbindgen crate in sdk/rust/build.rs,
+# so we put the generation separately here.
RUST_CLIENT_SDK_SOURCE:=$(wildcard ../rust/src/*.rs)
all: $(RUST_CLIENT_SDK_SOURCE)
- rustup run nightly cbindgen ../rust -c cbindgen.toml -o teaclave_client_sdk.h
+ cbindgen ../rust -c cbindgen.toml -o teaclave_client_sdk.h
diff --git a/sdk/c/cbindgen.toml b/sdk/c/cbindgen.toml
index fc17d275..a1d64639 100644
--- a/sdk/c/cbindgen.toml
+++ b/sdk/c/cbindgen.toml
@@ -24,7 +24,7 @@ header = """
autogen_warning = """/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen.
* To generate this file:
* 1. Get the latest cbindgen using `cargo install --force cbindgen`
- * 2. Run `rustup run nightly cbindgen ../rust -c cbindgen.toml -o
+ * 2. Run `cbindgen ../rust -c cbindgen.toml -o
teaclave_client_sdk.h` or `make`.
*/"""
diff --git a/sdk/c/teaclave_client_sdk.h b/sdk/c/teaclave_client_sdk.h
index 95519a4a..cc54549d 100644
--- a/sdk/c/teaclave_client_sdk.h
+++ b/sdk/c/teaclave_client_sdk.h
@@ -21,7 +21,7 @@
/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen.
* To generate this file:
* 1. Get the latest cbindgen using `cargo install --force cbindgen`
- * 2. Run `rustup run nightly cbindgen ../rust -c cbindgen.toml -o
+ * 2. Run `cbindgen ../rust -c cbindgen.toml -o
teaclave_client_sdk.h` or `make`.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org
[incubator-teaclave] 04/04: [frontend] Send audit information to the management service
Posted by hs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hsun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit 388f8ffbe00e68c12c47f81e79b4bb91cc7551ab
Author: sunhe05 <su...@baidu.com>
AuthorDate: Mon Jun 5 12:14:18 2023 +0000
[frontend] Send audit information to the management service
---
cmake/tomls/Cargo.sgx_trusted_lib.lock | 1 -
examples/rust/builtin_echo/Cargo.lock | 2 +
.../rust/builtin_ordered_set_intersect/Cargo.lock | 2 +
.../rust/builtin_ordered_set_intersect/src/main.rs | 17 +++
sdk/c/teaclave_client_sdk.h | 50 +++++++++
sdk/python/teaclave.py | 20 ++++
sdk/rust/Cargo.lock | 2 +
sdk/rust/src/bindings.rs | 102 +++++++++++++++--
sdk/rust/src/lib.rs | 30 ++++-
services/frontend/enclave/src/audit.rs | 61 +++++++++++
services/frontend/enclave/src/lib.rs | 43 ++++++--
services/frontend/enclave/src/service.rs | 121 +++++++++++++++------
services/management/enclave/src/audit/auditor.rs | 26 +++--
.../management/enclave/src/audit/db_directory.rs | 11 +-
services/management/enclave/src/error.rs | 1 +
services/management/enclave/src/lib.rs | 4 +-
services/management/enclave/src/service.rs | 54 +++++++--
.../src/proto/teaclave_frontend_service.proto | 10 ++
.../src/proto/teaclave_management_service.proto | 1 +
services/proto/src/teaclave_common.rs | 8 +-
services/proto/src/teaclave_frontend_service.rs | 22 +++-
services/proto/src/teaclave_management_service.rs | 14 +++
tests/functional/enclave/src/frontend_service.rs | 60 ++++++++++
types/src/audit.rs | 16 +--
types/src/user.rs | 6 +
25 files changed, 586 insertions(+), 98 deletions(-)
diff --git a/cmake/tomls/Cargo.sgx_trusted_lib.lock b/cmake/tomls/Cargo.sgx_trusted_lib.lock
index 5ad9c349..485ce7aa 100644
--- a/cmake/tomls/Cargo.sgx_trusted_lib.lock
+++ b/cmake/tomls/Cargo.sgx_trusted_lib.lock
@@ -2567,7 +2567,6 @@ dependencies = [
"cfg-if 0.1.10",
"chrono",
"log",
- "once_cell",
"rand",
"ring",
"serde",
diff --git a/examples/rust/builtin_echo/Cargo.lock b/examples/rust/builtin_echo/Cargo.lock
index 38b4db0a..8c3230f7 100644
--- a/examples/rust/builtin_echo/Cargo.lock
+++ b/examples/rust/builtin_echo/Cargo.lock
@@ -1042,6 +1042,7 @@ name = "teaclave_proto"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"prost",
"serde",
"serde_json",
@@ -1072,6 +1073,7 @@ name = "teaclave_types"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"hex",
"log",
"rand",
diff --git a/examples/rust/builtin_ordered_set_intersect/Cargo.lock b/examples/rust/builtin_ordered_set_intersect/Cargo.lock
index 14447ddd..8ee7759f 100644
--- a/examples/rust/builtin_ordered_set_intersect/Cargo.lock
+++ b/examples/rust/builtin_ordered_set_intersect/Cargo.lock
@@ -1042,6 +1042,7 @@ name = "teaclave_proto"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"prost",
"serde",
"serde_json",
@@ -1072,6 +1073,7 @@ name = "teaclave_types"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"hex",
"log",
"rand",
diff --git a/examples/rust/builtin_ordered_set_intersect/src/main.rs b/examples/rust/builtin_ordered_set_intersect/src/main.rs
index 55d0e024..b09d0563 100644
--- a/examples/rust/builtin_ordered_set_intersect/src/main.rs
+++ b/examples/rust/builtin_ordered_set_intersect/src/main.rs
@@ -202,6 +202,14 @@ impl Client {
let response = self.client.get_task_result(&task_id)?;
Ok(response)
}
+
+ fn query_audit_logs(
+ &mut self,
+ message: &str,
+ limit: usize,
+ ) -> Result<Vec<teaclave_client_sdk::Entry>> {
+ self.client.query_audit_logs(message.to_owned(), limit)
+ }
}
fn main() -> Result<()> {
@@ -278,6 +286,15 @@ fn main() -> Result<()> {
result_user1.1
);
+ // Wait for the logs to be sent to the auditor
+ std::thread::sleep(std::time::Duration::from_secs(35));
+
+ println!("[+] getting audit logs");
+ let logs = user1.query_audit_logs("*", 1000)?;
+ for log in logs {
+ println!("{:?}", log);
+ }
+
println!("[+] done");
Ok(())
}
diff --git a/sdk/c/teaclave_client_sdk.h b/sdk/c/teaclave_client_sdk.h
index cc54549d..4720193a 100644
--- a/sdk/c/teaclave_client_sdk.h
+++ b/sdk/c/teaclave_client_sdk.h
@@ -34,6 +34,14 @@ typedef struct AuthenticationClient AuthenticationClient;
typedef struct FrontendClient FrontendClient;
+typedef struct c_entry {
+ int64_t microsecond;
+ uint8_t ip[16];
+ void *user;
+ void *message;
+ bool result;
+} c_entry;
+
/**
* Connect to Teaclave Authentication Service.
*
@@ -203,6 +211,22 @@ int teaclave_get_task_result(struct FrontendClient *client,
char *task_result,
size_t *task_result_len);
+/**
+ * Query audit logs according to `query`. `query` is the query statement for tantivy. The result
+ * will be saved in the `log_buffer` buffer with the corresponding `log_len` argument set.
+ * Remember to free the user and message inside c_entry to avoid memory leak.
+ *
+ * The function returns 0 for success. On error, the function returns 1.
+ *
+ * # Safety
+ *
+ * Inconsistent length of allocated buffer may caused overflow.
+ */
+int teaclave_query_audit_logs(struct FrontendClient *client,
+ const char *query,
+ struct c_entry *log_buffer,
+ size_t *log_len);
+
/**
* Send JSON serialized request to the service with the `client` and
* get the serialized response.
@@ -540,3 +564,29 @@ int teaclave_get_task_serialized(struct FrontendClient *client,
const char *serialized_request,
char *serialized_response,
size_t *serialized_response_len);
+
+/**
+ * Send JSON serialized request to the service with the `client` and
+ * get the serialized response.
+ *
+ * # Arguments
+ *
+ * * `client`: service client.
+ * * `serialized_request`; JSON serialized request
+ * * `serialized_response`: buffer to store the JSON serialized response.
+ * * `serialized_response_len`: length of the allocated
+ * `serialized_response`, will be set as the length of
+ * `serialized_response` when return successfully.
+ *
+ * # Return
+ *
+ * The function returns 0 for success. On error, the function returns 1.
+ *
+ * # Safety
+ *
+ * Inconsistent length of allocated buffer may caused overflow.
+ */
+int teaclave_query_audit_logs_serialized(struct FrontendClient *client,
+ const char *serialized_request,
+ char *serialized_response,
+ size_t *serialized_response_len);
diff --git a/sdk/python/teaclave.py b/sdk/python/teaclave.py
index 43032641..d1ca3841 100644
--- a/sdk/python/teaclave.py
+++ b/sdk/python/teaclave.py
@@ -769,6 +769,13 @@ class GetTaskRequest(Request):
self.message = fe.GetTaskRequest(task_id=task_id)
+class QueryAuditLogsRequest(Request):
+
+ def __init__(self, metadata: Metadata, message: str, limit: int):
+ super().__init__("QueryAuditLogs", fe.QueryAuditLogsResponse, metadata)
+ self.message = fe.QueryAuditLogsReqeust(message=message, limit=limit)
+
+
class FrontendService(TeaclaveService):
"""Establish trusted channel with the frontend service and provide
clients to send request through RPC.
@@ -1044,3 +1051,16 @@ class FrontendService(TeaclaveService):
preserving_proto_field_name=True,
use_integers_for_enums=True)
return base64.b64decode(response["result"]["Ok"]["tags_map"][tag])
+
+ def query_audit_logs(self, message: str, limit: int):
+ self.check_metadata()
+ self.check_channel()
+ request = QueryAuditLogsRequest(self.metadata, message, limit)
+ try:
+ response = self.call_method(request)
+ return MessageToDict(response,
+ preserving_proto_field_name=True,
+ use_integers_for_enums=True)
+ except Exception as e:
+ reason = str(e)
+ raise TeaclaveException(f"Failed to get audit logs ({reason})")
diff --git a/sdk/rust/Cargo.lock b/sdk/rust/Cargo.lock
index be4d6899..56491508 100644
--- a/sdk/rust/Cargo.lock
+++ b/sdk/rust/Cargo.lock
@@ -1033,6 +1033,7 @@ name = "teaclave_proto"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"prost",
"serde",
"serde_json",
@@ -1063,6 +1064,7 @@ name = "teaclave_types"
version = "0.5.1"
dependencies = [
"anyhow",
+ "chrono",
"hex",
"log",
"rand",
diff --git a/sdk/rust/src/bindings.rs b/sdk/rust/src/bindings.rs
index f48b8c71..1e3664c8 100644
--- a/sdk/rust/src/bindings.rs
+++ b/sdk/rust/src/bindings.rs
@@ -15,16 +15,14 @@
// specific language governing permissions and limitations
// under the License.
-use libc::size_t;
-use std::ffi::CStr;
-use std::ffi::CString;
-use std::fs;
-use std::os::raw::c_char;
-use std::os::raw::c_int;
-use std::ptr;
+use libc::{c_char, c_int, c_void, malloc, size_t};
+
+use std::ffi::{CStr, CString};
+use std::{fs, ptr};
use crate::{
- AuthenticationClient, AuthenticationService, EnclaveInfo, FrontendClient, FrontendService,
+ AuthenticationClient, AuthenticationService, EnclaveInfo, Entry, FrontendClient,
+ FrontendService,
};
macro_rules! unwrap_or_return_null {
@@ -384,6 +382,89 @@ pub unsafe extern "C" fn teaclave_get_task_result(
}
}
+/// Query audit logs according to `query`. `query` is the query statement for tantivy. The result
+/// will be saved in the `log_buffer` buffer with the corresponding `log_len` argument set.
+/// Remember to free the user and message inside c_entry to avoid memory leak.
+///
+/// The function returns 0 for success. On error, the function returns 1.
+///
+/// # Safety
+///
+/// Inconsistent length of allocated buffer may caused overflow.
+#[no_mangle]
+pub unsafe extern "C" fn teaclave_query_audit_logs(
+ client: &mut FrontendClient,
+ query: *const c_char,
+ log_buffer: *mut c_entry,
+ log_len: *mut size_t,
+) -> c_int {
+ if (client as *mut FrontendClient).is_null()
+ || query.is_null()
+ || log_buffer.is_null()
+ || log_len.is_null()
+ || *log_len == 0
+ {
+ return 1;
+ }
+
+ let query = CStr::from_ptr(query).to_string_lossy().into_owned();
+ match client.query_audit_logs(query, *log_len) {
+ Ok(audit_logs) => {
+ let c_logs: Vec<_> = audit_logs.into_iter().map(c_entry::from).collect();
+ let src_logs = c_logs.as_ptr();
+ let len = c_logs.len();
+ if len > *log_len {
+ return 1;
+ }
+
+ unsafe {
+ ptr::copy_nonoverlapping(src_logs, log_buffer, len);
+ }
+
+ *log_len = len;
+ 0
+ }
+ Err(_) => 1,
+ }
+}
+
+#[repr(C)]
+pub struct c_entry {
+ microsecond: i64,
+ ip: [u8; 16],
+ user: *mut c_void,
+ message: *mut c_void,
+ result: bool,
+}
+
+impl From<Entry> for c_entry {
+ fn from(entry: Entry) -> Self {
+ let user_bytes = CString::new(entry.user()).unwrap().into_bytes_with_nul();
+ let len = user_bytes.len();
+ let user = unsafe {
+ let user = malloc(len);
+ ptr::copy_nonoverlapping(user_bytes.as_ptr(), user as *mut u8, len);
+ user
+ };
+
+ let message_bytes = CString::new(entry.message()).unwrap().into_bytes_with_nul();
+ let len = message_bytes.len();
+ let message = unsafe {
+ let message = malloc(len);
+ ptr::copy_nonoverlapping(message_bytes.as_ptr(), message as *mut u8, len);
+ message
+ };
+
+ Self {
+ microsecond: entry.datetime().timestamp_micros(),
+ ip: entry.ip().octets(),
+ user,
+ message,
+ result: entry.result(),
+ }
+ }
+}
+
macro_rules! generate_function_serialized {
( $client_type:ident, $c_function_name:ident, $rust_function_name:ident) => {
/// Send JSON serialized request to the service with the `client` and
@@ -505,3 +586,8 @@ generate_function_serialized!(
teaclave_get_task_serialized,
get_task_serialized
);
+generate_function_serialized!(
+ FrontendClient,
+ teaclave_query_audit_logs_serialized,
+ query_audit_logs_serialized
+);
diff --git a/sdk/rust/src/lib.rs b/sdk/rust/src/lib.rs
index d38ec933..0eb466cd 100644
--- a/sdk/rust/src/lib.rs
+++ b/sdk/rust/src/lib.rs
@@ -35,12 +35,12 @@ pub use teaclave_proto::teaclave_frontend_service::{
ApproveTaskRequest, AssignDataRequest, CancelTaskRequest, CreateTaskRequest,
CreateTaskResponse, GetFunctionRequest, GetFunctionResponse, GetFunctionUsageStatsRequest,
GetFunctionUsageStatsResponse, GetTaskRequest, GetTaskResponse, InvokeTaskRequest,
- RegisterFunctionRequest, RegisterFunctionRequestBuilder, RegisterFunctionResponse,
- RegisterInputFileRequest, RegisterInputFileResponse, RegisterOutputFileRequest,
- RegisterOutputFileResponse,
+ QueryAuditLogsRequest, QueryAuditLogsResponse, RegisterFunctionRequest,
+ RegisterFunctionRequestBuilder, RegisterFunctionResponse, RegisterInputFileRequest,
+ RegisterInputFileResponse, RegisterOutputFileRequest, RegisterOutputFileResponse,
};
pub use teaclave_types::{
- EnclaveInfo, Executor, FileCrypto, FunctionArgument, FunctionInput, FunctionOutput,
+ EnclaveInfo, Entry, Executor, FileCrypto, FunctionArgument, FunctionInput, FunctionOutput,
FunctionUsage, TaskResult,
};
@@ -550,6 +550,28 @@ impl FrontendClient {
let request = CancelTaskRequest::new(task_id.try_into()?);
self.cancel_task_with_request(request)
}
+
+ pub fn query_audit_logs(&mut self, query: String, limit: usize) -> Result<Vec<Entry>> {
+ let request = QueryAuditLogsRequest::new(query, limit);
+ let response = self.query_audit_logs_with_request(request)?;
+
+ response.logs.into_iter().map(Entry::try_from).collect()
+ }
+
+ pub fn query_audit_logs_serialized(&mut self, serialized_request: &str) -> Result<String> {
+ let request = serde_json::from_str(serialized_request)?;
+ let response = self.query_audit_logs_with_request(request)?;
+ let serialized_response = serde_json::to_string(&response)?;
+
+ Ok(serialized_response)
+ }
+
+ pub fn query_audit_logs_with_request(
+ &mut self,
+ request: QueryAuditLogsRequest,
+ ) -> Result<QueryAuditLogsResponse> {
+ do_request_with_credential!(self, query_audit_logs, request)
+ }
}
#[cfg(test)]
diff --git a/services/frontend/enclave/src/audit.rs b/services/frontend/enclave/src/audit.rs
new file mode 100644
index 00000000..28e52d8a
--- /dev/null
+++ b/services/frontend/enclave/src/audit.rs
@@ -0,0 +1,61 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use tokio::sync::Mutex;
+use tokio::time::{sleep, Duration};
+
+use std::sync::Arc;
+
+use teaclave_proto::teaclave_management_service::{SaveLogsRequest, TeaclaveManagementClient};
+use teaclave_rpc::transport::Channel;
+use teaclave_types::Entry;
+
+/// Agent to send audit information to the auditor in the management service.
+/// To reduce the network activity, buffer and then send the information every 30 seconds.
+pub struct AuditAgent {
+ management_client: Arc<Mutex<TeaclaveManagementClient<Channel>>>,
+ buffer: Arc<Mutex<Vec<Entry>>>,
+}
+
+impl AuditAgent {
+ pub fn new(
+ management_client: Arc<Mutex<TeaclaveManagementClient<Channel>>>,
+ buffer: Arc<Mutex<Vec<Entry>>>,
+ ) -> Self {
+ Self {
+ management_client,
+ buffer,
+ }
+ }
+
+ pub async fn run(&self) {
+ loop {
+ let mut mutex = self.buffer.lock().await;
+ let logs: Vec<Entry> = mutex.drain(..).collect();
+ drop(mutex);
+
+ if !logs.is_empty() {
+ let request = SaveLogsRequest::new(logs);
+
+ let mut client = self.management_client.lock().await;
+ let _ = client.save_logs(request).await;
+ }
+
+ sleep(Duration::from_secs(30)).await;
+ }
+ }
+}
diff --git a/services/frontend/enclave/src/lib.rs b/services/frontend/enclave/src/lib.rs
index 67f66806..78a63b7f 100644
--- a/services/frontend/enclave/src/lib.rs
+++ b/services/frontend/enclave/src/lib.rs
@@ -19,6 +19,9 @@
extern crate log;
extern crate sgx_types;
use anyhow::{anyhow, Result};
+use tokio::sync::Mutex;
+
+use std::sync::Arc;
use teaclave_attestation::verifier;
use teaclave_attestation::{AttestationConfig, RemoteAttestation};
@@ -29,13 +32,16 @@ use teaclave_binder::proto::{
use teaclave_binder::{handle_ecall, register_ecall_handler};
use teaclave_config::build::AS_ROOT_CA_CERT;
use teaclave_config::RuntimeConfig;
+use teaclave_proto::teaclave_authentication_service::TeaclaveAuthenticationInternalClient;
use teaclave_proto::teaclave_frontend_service::TeaclaveFrontendServer;
+use teaclave_proto::teaclave_management_service::TeaclaveManagementClient;
use teaclave_rpc::{config::SgxTrustedTlsServerConfig, transport::Server};
use teaclave_service_enclave_utils::{
create_trusted_authentication_endpoint, create_trusted_management_endpoint, ServiceEnclave,
};
use teaclave_types::{TeeServiceError, TeeServiceResult};
+mod audit;
mod error;
mod service;
@@ -67,7 +73,15 @@ async fn start_service(config: &RuntimeConfig) -> Result<()> {
attested_tls_config.clone(),
)?;
- info!(" Starting FrontEnd: setup authentication endpoint finished ...");
+ let authentication_channel = authentication_service_endpoint
+ .connect()
+ .await
+ .map_err(|e| anyhow!("Failed to connect to authentication service, retry {:?}", e))?;
+ let authentication_client = Arc::new(Mutex::new(TeaclaveAuthenticationInternalClient::new(
+ authentication_channel,
+ )));
+
+ info!(" Starting FrontEnd: setup authentication client finished ...");
let management_service_endpoint = create_trusted_management_endpoint(
&config.internal_endpoints.management.advertised_address,
@@ -77,13 +91,25 @@ async fn start_service(config: &RuntimeConfig) -> Result<()> {
attested_tls_config,
)?;
- info!(" Starting FrontEnd: setup management endpoint finished ...");
+ let management_channel = management_service_endpoint
+ .connect()
+ .await
+ .map_err(|e| anyhow!("Failed to connect to management service, {:?}", e))?;
+ let management_client = Arc::new(Mutex::new(TeaclaveManagementClient::new(
+ management_channel,
+ )));
+
+ info!(" Starting FrontEnd: setup management client finished ...");
- let service = service::TeaclaveFrontendService::new(
- authentication_service_endpoint,
- management_service_endpoint,
- )
- .await?;
+ let log_buffer = Arc::new(Mutex::new(Vec::new()));
+ let audit_agent = audit::AuditAgent::new(management_client.clone(), log_buffer.clone());
+ let agent_handle = tokio::spawn(async move {
+ audit_agent.run().await;
+ });
+
+ let service =
+ service::TeaclaveFrontendService::new(authentication_client, management_client, log_buffer)
+ .await?;
info!(" Starting FrontEnd: start listening ...");
Server::builder()
@@ -92,6 +118,9 @@ async fn start_service(config: &RuntimeConfig) -> Result<()> {
.add_service(TeaclaveFrontendServer::new(service))
.serve(listen_address)
.await?;
+
+ agent_handle.await?;
+
Ok(())
}
diff --git a/services/frontend/enclave/src/service.rs b/services/frontend/enclave/src/service.rs
index 31a2d317..288c3982 100644
--- a/services/frontend/enclave/src/service.rs
+++ b/services/frontend/enclave/src/service.rs
@@ -18,7 +18,8 @@
use crate::error::AuthenticationError;
use crate::error::FrontendServiceError;
-use anyhow::{anyhow, Result};
+use anyhow::Result;
+use std::net::{IpAddr, Ipv6Addr};
use std::sync::Arc;
use teaclave_proto::teaclave_authentication_service::{
TeaclaveAuthenticationInternalClient, UserAuthenticateRequest,
@@ -30,28 +31,34 @@ use teaclave_proto::teaclave_frontend_service::{
GetFunctionResponse, GetFunctionUsageStatsRequest, GetFunctionUsageStatsResponse,
GetInputFileRequest, GetInputFileResponse, GetOutputFileRequest, GetOutputFileResponse,
GetTaskRequest, GetTaskResponse, InvokeTaskRequest, ListFunctionsRequest,
- ListFunctionsResponse, RegisterFunctionRequest, RegisterFunctionResponse,
- RegisterFusionOutputRequest, RegisterFusionOutputResponse, RegisterInputFileRequest,
- RegisterInputFileResponse, RegisterInputFromOutputRequest, RegisterInputFromOutputResponse,
- RegisterOutputFileRequest, RegisterOutputFileResponse, TeaclaveFrontend, UpdateFunctionRequest,
- UpdateFunctionResponse, UpdateInputFileRequest, UpdateInputFileResponse,
- UpdateOutputFileRequest, UpdateOutputFileResponse,
+ ListFunctionsResponse, QueryAuditLogsRequest, QueryAuditLogsResponse, RegisterFunctionRequest,
+ RegisterFunctionResponse, RegisterFusionOutputRequest, RegisterFusionOutputResponse,
+ RegisterInputFileRequest, RegisterInputFileResponse, RegisterInputFromOutputRequest,
+ RegisterInputFromOutputResponse, RegisterOutputFileRequest, RegisterOutputFileResponse,
+ TeaclaveFrontend, UpdateFunctionRequest, UpdateFunctionResponse, UpdateInputFileRequest,
+ UpdateInputFileResponse, UpdateOutputFileRequest, UpdateOutputFileResponse,
};
use teaclave_proto::teaclave_management_service::TeaclaveManagementClient;
-use teaclave_rpc::transport::{channel::Endpoint, Channel};
+use teaclave_rpc::transport::Channel;
use teaclave_rpc::Request;
use teaclave_service_enclave_utils::bail;
-use teaclave_types::{TeaclaveServiceResponseResult, UserAuthClaims, UserRole};
+use teaclave_types::{
+ Entry, EntryBuilder, TeaclaveServiceResponseResult, UserAuthClaims, UserRole,
+};
use tokio::sync::Mutex;
-#[derive(Clone)]
-pub(crate) struct TeaclaveFrontendService {
- authentication_client: Arc<Mutex<TeaclaveAuthenticationInternalClient<Channel>>>,
- management_client: Arc<Mutex<TeaclaveManagementClient<Channel>>>,
-}
-
macro_rules! authentication_and_forward_to_management {
($service: ident, $request: ident, $func: ident, $endpoint: expr) => {{
+ let function_name = stringify!($func).to_owned();
+ let ip_option = $request.remote_addr().map(|s| s.ip());
+ let ip = match ip_option {
+ Some(IpAddr::V4(ip_v4)) => ip_v4.to_ipv6_compatible(),
+ Some(IpAddr::V6(ip_v6)) => ip_v6,
+ None => Ipv6Addr::UNSPECIFIED,
+ };
+
+ let builder = EntryBuilder::new().ip(ip);
+
let claims = match $service.authenticate(&$request).await {
Ok(claims) => {
if authorize(&claims, $endpoint) {
@@ -62,6 +69,13 @@ macro_rules! authentication_and_forward_to_management {
stringify!($endpoint),
stringify!($func)
);
+
+ let entry = builder
+ .message(String::from("authenticate to ") + &function_name)
+ .result(false)
+ .build();
+ $service.push_log(entry).await;
+
bail!(FrontendServiceError::PermissionDenied);
}
}
@@ -71,10 +85,22 @@ macro_rules! authentication_and_forward_to_management {
stringify!($endpoint),
stringify!($func)
);
+
+ let entry = builder
+ .message(
+ String::from("authenticate to ") + &function_name + ": " + &e.to_string(),
+ )
+ .result(false)
+ .build();
+ $service.push_log(entry).await;
+
bail!(e);
}
};
+ let user = claims.to_string();
+ let builder = builder.user(user);
+
let client = $service.management_client.clone();
let mut client = client.lock().await;
let meta = $request.metadata().clone();
@@ -85,11 +111,26 @@ macro_rules! authentication_and_forward_to_management {
*metadata = meta;
metadata.insert("role", claims.role.parse().unwrap());
- let response = client.$func(request).await?;
+ let response = match client.$func(request).await {
+ Err(e) => {
+ let entry = builder
+ .clone()
+ .message(function_name.clone() + ":" + &e.to_string())
+ .result(false)
+ .build();
+ $service.push_log(entry).await;
+ return Err(e);
+ }
+ Ok(r) => r,
+ };
+
+ let entry = builder.message(function_name).result(true).build();
+ $service.push_log(entry).await;
Ok(response)
}};
}
+// TODO: remove this structure as it is the same with RPC interface
enum Endpoints {
RegisterInputFile,
RegisterOutputFile,
@@ -112,6 +153,7 @@ enum Endpoints {
ApproveTask,
InvokeTask,
CancelTask,
+ QueryAuditLogs,
}
fn authorize(claims: &UserAuthClaims, request: Endpoints) -> bool {
@@ -146,35 +188,34 @@ fn authorize(claims: &UserAuthClaims, request: Endpoints) -> bool {
Endpoints::GetFunction | Endpoints::ListFunctions | Endpoints::GetFunctionUsageStats => {
role.is_function_owner() || role.is_data_owner()
}
+ Endpoints::QueryAuditLogs => false,
}
}
+#[derive(Clone)]
+pub(crate) struct TeaclaveFrontendService {
+ authentication_client: Arc<Mutex<TeaclaveAuthenticationInternalClient<Channel>>>,
+ management_client: Arc<Mutex<TeaclaveManagementClient<Channel>>>,
+ audit_log_buffer: Arc<Mutex<Vec<Entry>>>,
+}
+
impl TeaclaveFrontendService {
pub(crate) async fn new(
- authentication_service_endpoint: Endpoint,
- management_service_endpoint: Endpoint,
+ authentication_client: Arc<Mutex<TeaclaveAuthenticationInternalClient<Channel>>>,
+ management_client: Arc<Mutex<TeaclaveManagementClient<Channel>>>,
+ audit_log_buffer: Arc<Mutex<Vec<Entry>>>,
) -> Result<Self> {
- let authentication_channel = authentication_service_endpoint
- .connect()
- .await
- .map_err(|e| anyhow!("Failed to connect to authentication service, retry {:?}", e))?;
- let authentication_client = Arc::new(Mutex::new(
- TeaclaveAuthenticationInternalClient::new(authentication_channel),
- ));
-
- let management_channel = management_service_endpoint
- .connect()
- .await
- .map_err(|e| anyhow!("Failed to connect to management service, {:?}", e))?;
- let management_client = Arc::new(Mutex::new(TeaclaveManagementClient::new(
- management_channel,
- )));
-
Ok(Self {
authentication_client,
management_client,
+ audit_log_buffer,
})
}
+
+ pub async fn push_log(&self, entry: Entry) {
+ let mut buffer_lock = self.audit_log_buffer.lock().await;
+ buffer_lock.push(entry);
+ }
}
#[teaclave_rpc::async_trait]
@@ -405,6 +446,18 @@ impl TeaclaveFrontend for TeaclaveFrontendService {
) -> TeaclaveServiceResponseResult<()> {
authentication_and_forward_to_management!(self, request, cancel_task, Endpoints::CancelTask)
}
+
+ async fn query_audit_logs(
+ &self,
+ request: Request<QueryAuditLogsRequest>,
+ ) -> TeaclaveServiceResponseResult<QueryAuditLogsResponse> {
+ authentication_and_forward_to_management!(
+ self,
+ request,
+ query_audit_logs,
+ Endpoints::QueryAuditLogs
+ )
+ }
}
impl TeaclaveFrontendService {
diff --git a/services/management/enclave/src/audit/auditor.rs b/services/management/enclave/src/audit/auditor.rs
index f8ac6790..46cfab35 100644
--- a/services/management/enclave/src/audit/auditor.rs
+++ b/services/management/enclave/src/audit/auditor.rs
@@ -21,8 +21,7 @@ use teaclave_proto::teaclave_storage_service::TeaclaveStorageClient;
use teaclave_rpc::transport::Channel;
use teaclave_types::{Entry, EntryBuilder};
-use std::sync::Arc;
-use tokio::sync::Mutex;
+use std::sync::{Arc, Mutex};
use anyhow::{anyhow, Result};
use tantivy::{
@@ -38,7 +37,9 @@ pub struct Auditor {
}
impl Auditor {
- pub fn try_new(storage: Arc<Mutex<TeaclaveStorageClient<Channel>>>) -> Result<Self> {
+ pub fn try_new(
+ storage: Arc<tokio::sync::Mutex<TeaclaveStorageClient<Channel>>>,
+ ) -> Result<Self> {
let directory = db_directory::DbDirectory::new(storage);
let schema = Self::log_schema();
@@ -74,8 +75,8 @@ impl Auditor {
})
}
- pub async fn add_logs(&self, logs: Vec<Entry>) -> Result<()> {
- let mut writer = self.writer.lock().await;
+ pub fn add_logs(&self, logs: Vec<Entry>) -> Result<()> {
+ let mut writer = self.writer.lock().unwrap();
for log in logs {
let document = Self::convert_to_doc(log);
@@ -89,12 +90,13 @@ impl Auditor {
/// query: the query for tantivy
/// limit: maximum number of the returned logs
- pub async fn query_logs(&self, query: &str, limit: usize) -> Result<Vec<Entry>> {
- let index = self.index.lock().await;
- let schema = Self::log_schema();
-
- let reader = self.reader.lock().await;
+ pub fn query_logs(&self, query: &str, limit: usize) -> Result<Vec<Entry>> {
+ let reader = self.reader.lock().unwrap();
let searcher = reader.searcher();
+ drop(reader);
+
+ let index = self.index.lock().unwrap();
+ let schema = Self::log_schema();
let message = schema.get_field("message").unwrap();
let date = schema.get_field("date").unwrap();
@@ -151,7 +153,7 @@ impl Auditor {
let entry = EntryBuilder::new()
.microsecond(microsecond)
- .ip(ip.to_ipv4().unwrap())
+ .ip(ip)
.user(user.to_owned())
.message(message.to_owned())
.result(result)
@@ -172,7 +174,7 @@ impl Auditor {
let mut doc = Document::default();
doc.add_date(date, date_v);
- doc.add_ip_addr(ip, entry.ip().to_ipv6_compatible());
+ doc.add_ip_addr(ip, entry.ip());
doc.add_text(user, &entry.user());
doc.add_text(message, &entry.message());
doc.add_bool(result, entry.result());
diff --git a/services/management/enclave/src/audit/db_directory.rs b/services/management/enclave/src/audit/db_directory.rs
index 0562608d..6e0f3c2c 100644
--- a/services/management/enclave/src/audit/db_directory.rs
+++ b/services/management/enclave/src/audit/db_directory.rs
@@ -46,19 +46,15 @@ struct Cache {
shared_directory: DbDirectory,
data: Cursor<Vec<u8>>,
is_flushed: bool,
- rt: Runtime,
}
impl Cache {
fn new(path_buf: PathBuf, shared_directory: DbDirectory) -> Self {
- let rt = Builder::new_current_thread().enable_all().build().unwrap();
-
Cache {
path: path_buf,
data: Cursor::new(Vec::new()),
shared_directory,
is_flushed: true,
- rt,
}
}
}
@@ -85,13 +81,10 @@ impl Write for Cache {
}
fn flush(&mut self) -> io::Result<()> {
+ self.shared_directory
+ .write(&self.path, self.data.get_ref())?;
self.is_flushed = true;
- let key = DB_PREFIX.clone() + &self.path.to_string_lossy();
- let request = PutRequest::new(key.as_bytes(), self.data.get_ref().clone());
- self.rt
- .block_on(self.shared_directory.db.blocking_lock().put(request))
- .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
Ok(())
}
}
diff --git a/services/management/enclave/src/error.rs b/services/management/enclave/src/error.rs
index a8d7f88a..9ae56c08 100644
--- a/services/management/enclave/src/error.rs
+++ b/services/management/enclave/src/error.rs
@@ -17,6 +17,7 @@
use teaclave_rpc::{Code, Status};
use thiserror::Error;
+
#[derive(Error, Debug)]
pub(crate) enum ManagementServiceError {
#[error("service internal error")]
diff --git a/services/management/enclave/src/lib.rs b/services/management/enclave/src/lib.rs
index 5d6f5bd6..4f5e75ad 100644
--- a/services/management/enclave/src/lib.rs
+++ b/services/management/enclave/src/lib.rs
@@ -15,6 +15,8 @@
// specific language governing permissions and limitations
// under the License.
+#![feature(result_flattening)]
+
#[macro_use]
extern crate log;
extern crate sgx_types;
@@ -37,7 +39,7 @@ mod error;
mod service;
// Sets the number of worker threads the Runtime will use.
-const N_WORKERS: usize = 8;
+const N_WORKERS: usize = 16;
async fn start_service(config: &RuntimeConfig) -> Result<()> {
info!("Starting Management...");
diff --git a/services/management/enclave/src/service.rs b/services/management/enclave/src/service.rs
index 0c2649a5..7d182a32 100644
--- a/services/management/enclave/src/service.rs
+++ b/services/management/enclave/src/service.rs
@@ -33,11 +33,11 @@ use teaclave_proto::teaclave_frontend_service::{
GetFunctionResponse, GetFunctionUsageStatsRequest, GetFunctionUsageStatsResponse,
GetInputFileRequest, GetInputFileResponse, GetOutputFileRequest, GetOutputFileResponse,
GetTaskRequest, GetTaskResponse, InvokeTaskRequest, ListFunctionsRequest,
- ListFunctionsResponse, RegisterFunctionRequest, RegisterFunctionResponse,
- RegisterFusionOutputRequest, RegisterFusionOutputResponse, RegisterInputFileRequest,
- RegisterInputFileResponse, RegisterInputFromOutputRequest, RegisterInputFromOutputResponse,
- RegisterOutputFileRequest, RegisterOutputFileResponse, UpdateFunctionRequest,
- UpdateFunctionResponse, UpdateInputFileRequest, UpdateInputFileResponse,
+ ListFunctionsResponse, QueryAuditLogsRequest, QueryAuditLogsResponse, RegisterFunctionRequest,
+ RegisterFunctionResponse, RegisterFusionOutputRequest, RegisterFusionOutputResponse,
+ RegisterInputFileRequest, RegisterInputFileResponse, RegisterInputFromOutputRequest,
+ RegisterInputFromOutputResponse, RegisterOutputFileRequest, RegisterOutputFileResponse,
+ UpdateFunctionRequest, UpdateFunctionResponse, UpdateInputFileRequest, UpdateInputFileResponse,
UpdateOutputFileRequest, UpdateOutputFileResponse,
};
use teaclave_proto::teaclave_management_service::{SaveLogsRequest, TeaclaveManagement};
@@ -50,6 +50,7 @@ use teaclave_rpc::{Request, Response};
use teaclave_service_enclave_utils::ensure;
use teaclave_types::*;
use tokio::sync::Mutex;
+use tokio::task;
use url::Url;
use uuid::Uuid;
@@ -933,12 +934,46 @@ impl TeaclaveManagement for TeaclaveManagementService {
ManagementServiceError::AuditError(err_msg)
})?;
- self.auditor.add_logs(logs).await.map_err(|e| {
- let err_msg = format!("failed to save logs {:?}", e);
+ let auditor = self.auditor.clone();
+ task::spawn_blocking(move || auditor.add_logs(logs))
+ .await
+ .map_err(|e| anyhow!("{}", e.to_string()))
+ .flatten()
+ .map_err(|e| {
+ let err_msg = format!("failed to save logs {:?}", e);
+ ManagementServiceError::AuditError(err_msg)
+ })?;
+
+ Ok(Response::new(()))
+ }
+
+ // access_control: only
+ // user_role == admin
+ async fn query_audit_logs(
+ &self,
+ request: Request<QueryAuditLogsRequest>,
+ ) -> TeaclaveServiceResponseResult<QueryAuditLogsResponse> {
+ let role = get_request_role(&request)?;
+ ensure!(
+ role == UserRole::PlatformAdmin,
+ ManagementServiceError::PermissionDenied
+ );
+
+ let request = request.into_inner();
+ let auditor = self.auditor.clone();
+ let logs = task::spawn_blocking(move || {
+ auditor.query_logs(&request.query, request.limit as usize)
+ })
+ .await
+ .map_err(|e| anyhow!("{}", e.to_string()))
+ .flatten()
+ .map_err(|e| {
+ let err_msg = format!("failed to query logs {:?}", e);
ManagementServiceError::AuditError(err_msg)
})?;
- Ok(Response::new(()))
+ let response = QueryAuditLogsResponse::new(logs);
+ Ok(Response::new(response))
}
}
@@ -949,7 +984,8 @@ impl TeaclaveManagementService {
.await
.map_err(|e| anyhow!("Failed to connect to storage service, {:?}", e))?;
let storage_client = Arc::new(Mutex::new(TeaclaveStorageClient::new(channel)));
- let auditor = Auditor::try_new(storage_client.clone())?;
+ let client_clone = storage_client.clone();
+ let auditor = task::spawn_blocking(move || Auditor::try_new(client_clone)).await??;
let service = Self {
storage_client,
auditor,
diff --git a/services/proto/src/proto/teaclave_frontend_service.proto b/services/proto/src/proto/teaclave_frontend_service.proto
index 2a94a3a0..db89d706 100644
--- a/services/proto/src/proto/teaclave_frontend_service.proto
+++ b/services/proto/src/proto/teaclave_frontend_service.proto
@@ -252,6 +252,15 @@ message CancelTaskRequest {
string task_id = 1;
}
+message QueryAuditLogsRequest {
+ string query = 1;
+ uint64 limit = 2;
+}
+
+message QueryAuditLogsResponse {
+ repeated teaclave_common_proto.Entry logs = 1;
+}
+
service TeaclaveFrontend {
rpc RegisterInputFile (RegisterInputFileRequest) returns (RegisterInputFileResponse);
rpc RegisterOutputFile (RegisterOutputFileRequest) returns (RegisterOutputFileResponse);
@@ -274,4 +283,5 @@ service TeaclaveFrontend {
rpc ApproveTask (ApproveTaskRequest) returns (google.protobuf.Empty);
rpc InvokeTask (InvokeTaskRequest) returns (google.protobuf.Empty);
rpc CancelTask (CancelTaskRequest) returns (google.protobuf.Empty);
+ rpc QueryAuditLogs (QueryAuditLogsRequest) returns (QueryAuditLogsResponse);
}
diff --git a/services/proto/src/proto/teaclave_management_service.proto b/services/proto/src/proto/teaclave_management_service.proto
index 25158d50..d528326c 100644
--- a/services/proto/src/proto/teaclave_management_service.proto
+++ b/services/proto/src/proto/teaclave_management_service.proto
@@ -53,4 +53,5 @@ service TeaclaveManagement {
rpc InvokeTask (teaclave_frontend_service_proto.InvokeTaskRequest) returns (google.protobuf.Empty);
rpc CancelTask (teaclave_frontend_service_proto.CancelTaskRequest) returns (google.protobuf.Empty);
rpc SaveLogs (SaveLogsRequest) returns (google.protobuf.Empty);
+ rpc QueryAuditLogs (teaclave_frontend_service_proto.QueryAuditLogsRequest) returns (teaclave_frontend_service_proto.QueryAuditLogsResponse);
}
diff --git a/services/proto/src/teaclave_common.rs b/services/proto/src/teaclave_common.rs
index 762e34cc..a3c5b92c 100644
--- a/services/proto/src/teaclave_common.rs
+++ b/services/proto/src/teaclave_common.rs
@@ -24,7 +24,7 @@ use teaclave_types::{
};
use std::convert::TryInto;
-use std::net::Ipv4Addr;
+use std::net::Ipv6Addr;
use anyhow::{bail, ensure, Error, Result};
@@ -282,11 +282,11 @@ impl std::convert::TryFrom<proto::Entry> for Entry {
type Error = Error;
fn try_from(proto: crate::teaclave_common_proto::Entry) -> Result<Self> {
- const IPV4_LENTGH: usize = 4;
+ const IPV6_LENTGH: usize = 16;
let len = proto.ip.len();
- ensure!(len == IPV4_LENTGH, "invalid ip length: {}", len);
- let ip = Ipv4Addr::from(<Vec<u8> as TryInto<[u8; 4]>>::try_into(proto.ip).unwrap());
+ ensure!(len == IPV6_LENTGH, "invalid ip length: {}", len);
+ let ip = Ipv6Addr::from(<Vec<u8> as TryInto<[u8; 16]>>::try_into(proto.ip).unwrap());
let builder = EntryBuilder::new();
let entry = builder
diff --git a/services/proto/src/teaclave_frontend_service.rs b/services/proto/src/teaclave_frontend_service.rs
index 8f502195..6e45e9cb 100644
--- a/services/proto/src/teaclave_frontend_service.rs
+++ b/services/proto/src/teaclave_frontend_service.rs
@@ -20,7 +20,7 @@ use anyhow::{Error, Result};
use core::convert::TryInto;
use std::collections::HashMap;
use teaclave_types::{
- Executor, ExecutorType, ExternalID, FileAuthTag, FileCrypto, FunctionArgument,
+ Entry, Executor, ExecutorType, ExternalID, FileAuthTag, FileCrypto, FunctionArgument,
FunctionArguments, FunctionBuilder, FunctionInput, FunctionOutput, OwnerList, TaskFileOwners,
};
use url::Url;
@@ -652,3 +652,23 @@ pub fn from_proto_file_ids(vector: Vec<proto::DataMap>) -> Result<HashMap<String
})
.collect()
}
+
+impl QueryAuditLogsRequest {
+ pub fn new(query: String, limit: usize) -> Self {
+ Self {
+ query,
+ limit: limit as u64,
+ }
+ }
+}
+
+impl QueryAuditLogsResponse {
+ pub fn new(entries: Vec<Entry>) -> Self {
+ let logs: Vec<crate::teaclave_common_proto::Entry> = entries
+ .into_iter()
+ .map(crate::teaclave_common_proto::Entry::from)
+ .collect();
+
+ Self { logs }
+ }
+}
diff --git a/services/proto/src/teaclave_management_service.rs b/services/proto/src/teaclave_management_service.rs
index 46412438..0d29fdb5 100644
--- a/services/proto/src/teaclave_management_service.rs
+++ b/services/proto/src/teaclave_management_service.rs
@@ -22,6 +22,8 @@ pub use proto::teaclave_management_client::TeaclaveManagementClient;
pub use proto::teaclave_management_server::TeaclaveManagement;
pub use proto::teaclave_management_server::TeaclaveManagementServer;
+use teaclave_types::Entry;
+
pub type RegisterInputFileRequest = crate::teaclave_frontend_service::RegisterInputFileRequest;
pub type UpdateInputFileRequest = crate::teaclave_frontend_service::UpdateInputFileRequest;
pub type RegisterInputFileResponse = crate::teaclave_frontend_service::RegisterInputFileResponse;
@@ -68,3 +70,15 @@ pub type AssignDataRequest = crate::teaclave_frontend_service::AssignDataRequest
pub type ApproveTaskRequest = crate::teaclave_frontend_service::ApproveTaskRequest;
pub type InvokeTaskRequest = crate::teaclave_frontend_service::InvokeTaskRequest;
pub type CancelTaskRequest = crate::teaclave_frontend_service::CancelTaskRequest;
+pub type QueryAuditLogsRequest = crate::teaclave_frontend_service::QueryAuditLogsRequest;
+pub type QueryAuditLogsResponse = crate::teaclave_frontend_service::QueryAuditLogsResponse;
+
+impl SaveLogsRequest {
+ pub fn new(entries: Vec<Entry>) -> Self {
+ let logs: Vec<crate::teaclave_common_proto::Entry> = entries
+ .into_iter()
+ .map(crate::teaclave_common_proto::Entry::from)
+ .collect();
+ Self { logs }
+ }
+}
diff --git a/tests/functional/enclave/src/frontend_service.rs b/tests/functional/enclave/src/frontend_service.rs
index e495d9d9..ddfa95ae 100644
--- a/tests/functional/enclave/src/frontend_service.rs
+++ b/tests/functional/enclave/src/frontend_service.rs
@@ -209,6 +209,66 @@ async fn test_register_function() {
let mut client = unauthorized_client().await;
let response = client.register_function(request).await;
assert!(response.is_err());
+
+ // Wait for the logs to be sent to the auditor
+ std::thread::sleep(std::time::Duration::from_secs(35));
+
+ let function_name = "register_function";
+
+ // query by user name
+ let request = QueryAuditLogsRequest::new("user:".to_string() + USERNAME, 100);
+ let response = authorized_client()
+ .await
+ .query_audit_logs(request)
+ .await
+ .unwrap();
+
+ let logs: Vec<_> = response
+ .into_inner()
+ .logs
+ .into_iter()
+ .map(|e| Entry::try_from(e).unwrap())
+ .filter(|e| e.message() == function_name)
+ .collect();
+ assert_eq!(logs.len(), 1);
+ assert!(logs[0].result());
+
+ // query by function name stored in the message
+ let request = QueryAuditLogsRequest::new("message:".to_string() + function_name, 100);
+ let response = authorized_client()
+ .await
+ .query_audit_logs(request)
+ .await
+ .unwrap();
+ let logs: Vec<_> = response
+ .into_inner()
+ .logs
+ .into_iter()
+ .map(|e| Entry::try_from(e).unwrap())
+ .collect();
+ assert_eq!(logs.len(), 2);
+ assert!(logs[0].user().contains(USERNAME));
+ assert!(logs[0].result());
+
+ assert!(!logs[1].result());
+
+ let request = QueryAuditLogsRequest::new("message:".to_string() + "authenticate", 100);
+ let response = authorized_client()
+ .await
+ .query_audit_logs(request)
+ .await
+ .unwrap();
+ let logs: Vec<_> = response
+ .into_inner()
+ .logs
+ .into_iter()
+ .map(|e| Entry::try_from(e).unwrap())
+ .collect();
+ // "authenticate" message will only show in the entry with false result and empty user
+ for log in logs {
+ assert_eq!(log.user(), "");
+ assert!(!log.result());
+ }
}
#[async_test_case]
diff --git a/types/src/audit.rs b/types/src/audit.rs
index 49d07ebe..437a7949 100644
--- a/types/src/audit.rs
+++ b/types/src/audit.rs
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-use std::net::Ipv4Addr;
+use std::net::Ipv6Addr;
use std::time::{SystemTime, UNIX_EPOCH};
use chrono::NaiveDateTime;
@@ -26,8 +26,8 @@ pub struct Entry {
/// Timestamp
datetime: NaiveDateTime,
/// Where the request is from.
- ip: Ipv4Addr,
- /// Who conducst the request.
+ ip: Ipv6Addr,
+ /// Who conducts the request.
user: String,
/// What the user wants.
message: String,
@@ -39,7 +39,7 @@ pub struct Entry {
impl Default for Entry {
fn default() -> Self {
let datetime = NaiveDateTime::from_timestamp_micros(0).unwrap();
- let ip = Ipv4Addr::UNSPECIFIED;
+ let ip = Ipv6Addr::UNSPECIFIED;
let user = String::new();
let message = String::new();
let result = false;
@@ -59,7 +59,7 @@ impl Entry {
self.datetime
}
- pub fn ip(&self) -> Ipv4Addr {
+ pub fn ip(&self) -> Ipv6Addr {
self.ip
}
@@ -80,7 +80,7 @@ impl Entry {
pub struct EntryBuilder {
/// The microsecond since the UNIX epoch
microsecond: Option<i64>,
- ip: Option<Ipv4Addr>,
+ ip: Option<Ipv6Addr>,
user: Option<String>,
message: Option<String>,
result: Option<bool>,
@@ -96,7 +96,7 @@ impl EntryBuilder {
self
}
- pub fn ip(mut self, ip: Ipv4Addr) -> Self {
+ pub fn ip(mut self, ip: Ipv6Addr) -> Self {
self.ip = Some(ip);
self
}
@@ -129,7 +129,7 @@ impl EntryBuilder {
Entry {
datetime,
- ip: self.ip.unwrap_or(Ipv4Addr::UNSPECIFIED),
+ ip: self.ip.unwrap_or(Ipv6Addr::UNSPECIFIED),
user: self.user.unwrap_or_default(),
message: self.message.unwrap_or_default(),
result: self.result.unwrap_or(false),
diff --git a/types/src/user.rs b/types/src/user.rs
index 950abd1b..8ffe0064 100644
--- a/types/src/user.rs
+++ b/types/src/user.rs
@@ -103,3 +103,9 @@ impl UserAuthClaims {
UserRole::from_str(&self.role)
}
}
+
+impl std::fmt::Display for UserAuthClaims {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ write!(f, "{{ user: {}, role: {:?} }}", self.sub, self.get_role())
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org