Skip to content

Commit 1fd3dd1

Browse files
author
Bennett Hardwick
committed
Update deps
1 parent cc4e796 commit 1fd3dd1

File tree

21 files changed

+380
-235
lines changed

21 files changed

+380
-235
lines changed

‎Cargo.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor-deps.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/usr/bin/env bash
22

3+
sed -i "/ssh:\/\/git@github.com\/cipherstash\/cipherstash-suite.git/s/^#//g" Cargo.toml
4+
sed -i "/vendor\/cipherstash-client/s/^/#/g" Cargo.toml
5+
36
cargo vendor
47

58
(
@@ -16,3 +19,8 @@ cargo vendor
1619
grep -xv "recipher" |\
1720
xargs rm -r
1821
)
22+
23+
sed -i "/ssh:\/\/git@github.com\/cipherstash\/cipherstash-suite.git/s/^/#/g" Cargo.toml
24+
sed -i "/vendor\/cipherstash-client/s/^#//g" Cargo.toml
25+
26+
sed -i "s/\.\.\/\.\.\/packages\/cipherstash-core/..\/cipherstash-core/g" ./vendor/cipherstash-client/Cargo.toml

‎vendor/cipherstash-client/.cargo-checksum.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"files":{"Cargo.toml":"717daf168bd6abb7bb1456fed41b8065b10f9c82b0f4cfda59834d4a9bd7e30b","LICENSE":"b1da10b43ce976d6fdb4b15c1ef4a19b7a9975ba48a431b27612087ace3129e9","README.md":"1ebb934850b992b8ace91258cc40f881cd676952a60d5036468254a4fcaf0740","examples/encrypt-data.rs":"ba3b4ff7081126c166398fa994a552967c20995f401b67da15c5271368366483","src/config/console_config.rs":"4ff650a56679f3b8973d54d0fbe75d73e3f962cd3ffbc9b526fb499825f64013","src/config/defaults.rs":"9829c97e2b2d41051f337bed0b52ea38a29f01ab2a7b882a67fb0c01bf481cea","src/config/errors.rs":"8f1dfb3dc969c3403f15347c5de9f4b22b6ee7191979104dd905824331df748a","src/config/idp_config.rs":"af55791a018eea96aefe665c04890e22b4df60a086cf2ec373b4b8121705155c","src/config/mod.rs":"c3cb5b9b82e1f43c3361dc82152aabd6877e07358cc3f9a12505159d8ee158a6","src/config/paths.rs":"b1b5782eb0e0a5b98c5e2e1d8e264cbdf10f303792551b04df9c873a0eb6ac3a","src/config/vars.rs":"4f09689b0e4b0490189f11c399ffbb55bb066a47dbbe838f99e44b3b7c8dcc74","src/config/vitur_config.rs":"7a09dc4a2c71e3a2083b0a69e53aeff0d7f2ec178ff98b47e002feef3a119f8a","src/config/workspace.rs":"2ef25fef911a562d384f4a80bcccbb21c39698432c178119eb1da2470321a9e4","src/console/mod.rs":"5cc6e50b3b8fd1f69dce6aa83bbe259fb70cec3f9ae7dabbc6d570d60ac415d8","src/credentials/auto_refresh.rs":"b10b2388dc0409d1c63a7c04be0032b3fb1280f80ae23b856ad6a64b0274efb1","src/credentials/console_credentials.rs":"00ffaad70ba324431dffb76e1af2f83cdb9a43a9ecb379c0d5a1ffc78587dbf2","src/credentials/mod.rs":"c2369f0140b5ce56b8112e41547b38969b72be7f4943e7e50a79054b38c6c9f8","src/credentials/token_store.rs":"7fb370367a2e76f3b8f841bfe8972ca24ff57a04acab936abc6815f7d541410a","src/credentials/vitur_credentials/mod.rs":"40569eb3963fad59da84ac759217af517bcbca26c2ed2008431fb448ca120d19","src/credentials/vitur_credentials/vitur_access_key_credentials.rs":"9e3de00f39afba34abc7a2a82a670abf41472d9b5d332b9b0d7704178e3d553a","src/credentials/vitur_credentials/vitur_console_auth_credentials.rs":"25e6e91d9de2aa10da8c82bac5378afac0b7e8258d7a8768f534809140ea7574","src/credentials/vitur_credentials/vitur_token.rs":"58f4d4d505ffd0806fa5b9fb1ad6b142e38cf9c80139fee66ef5d97a2a846d41","src/encryption/compound_indexer/accumulator.rs":"0ff1a8567f0718151feccd7650094fc061d73b54ccf8e81a031502905cbe71ce","src/encryption/compound_indexer/cons.rs":"7249b8e3d34cb50d2e6488959926dda8df5fc00fe25d7145f9ceb02712112b26","src/encryption/compound_indexer/mod.rs":"2e7680f09a0aa998b16d5d2fe0f3006b3c511a8e5dcd244264a272dd6be938c3","src/encryption/compound_indexer/prefix_indexer.rs":"9d59f5bd4b32109aae44dbf3d2a33f26d6c0a793a01873bffa9208c99c176604","src/encryption/dict_match_indexer/mod.rs":"4e9c644c12a104a9528c35f89c5eb14952cf10b67b8fe7836f846018377919aa","src/encryption/errors.rs":"07161a77493b76d4fa949674cffad820c3b4fe516936a7b44ab691473377996b","src/encryption/match_indexer/mod.rs":"6c5dcc0a96229e963fd5cbc261900506ea951fae33f630cc3e2841956df79bc3","src/encryption/mod.rs":"8abb7cdace4141263ec9da1e21444b447092a792feebf0598316eb18d12972f9","src/encryption/ore_indexer/conversion.rs":"d780d391b4aea0b61bb19094c26d0d72d6e0b322e83c2c77c99ad7285f308a62","src/encryption/ore_indexer/mod.rs":"30b262407aae0f1a95ee21d2dda9ac60cfd1e166eb2ad0128e28a51afc92e552","src/encryption/plaintext/from_conversion.rs":"6d611d2e59c0a3882a87afa8b3b26dc89abf543162666f2d8b5760e2b6104e5e","src/encryption/plaintext/mod.rs":"5ae988ca4a05ef85fb7dc4b8d667d03b568e1349ff2ce3d24cb546ca4df1ac55","src/encryption/plaintext/to_conversion.rs":"353095ac16c531fc3277b0c3f108cbc6e860e68278c3dae3ffd9df06a2afde19","src/encryption/text.rs":"2e3a6686c4d14603bb1fd3ab8b96122dcb9833625631a33719c3f6cd1c675765","src/encryption/unique_indexer/mod.rs":"743267b256b3fc210c6e33c7c061782373ce078f7a17984eed3c1cfc7995a00e","src/idp_client.rs":"8a3fa119569aaba659f14fb1c015f7daf79b66bca03b6c0ad4fbdaaf65394948","src/lib.rs":"84782398a6055cc20aea0716e29170ddfaca477986dfe71612a052459180576c","src/reqwest_client.rs":"cadce726f0eca20558b61680b4d4a35c4098bb024246810d609d1e94cbeca709","src/schema.rs":"e5651df4c1cff4a3dc2184c2997012be3793dcf84fff6db70adefb33b9c59239","src/vitur/errors.rs":"62c2ca3b60bdde35c1b194561ce712f81a249b42bd7996df372906a58a334a83","src/vitur/local_log.rs":"e9c151842d4f55bdfab95aa7b2574acdc2692272ce5e2d4ee972666b5c76a228","src/vitur/mod.rs":"f9633e141dcb696682972f8242706d73569b63ff01c23d67deafc702217b7e26","string_comparison_test_cases.json":"b1b2b84147092ab9a20b3f1c864d66cf505f6a7929d91f3c238add3c35302c7a"},"package":null}
1+
{"files":{"Cargo.toml":"e8c1ad7a9f8b5254630f6c8582d3babd60abef770134704f32d9da34b4658c09","LICENSE":"b1da10b43ce976d6fdb4b15c1ef4a19b7a9975ba48a431b27612087ace3129e9","README.md":"1ebb934850b992b8ace91258cc40f881cd676952a60d5036468254a4fcaf0740","examples/encrypt-data.rs":"ba3b4ff7081126c166398fa994a552967c20995f401b67da15c5271368366483","src/config/console_config.rs":"4ff650a56679f3b8973d54d0fbe75d73e3f962cd3ffbc9b526fb499825f64013","src/config/defaults.rs":"9829c97e2b2d41051f337bed0b52ea38a29f01ab2a7b882a67fb0c01bf481cea","src/config/errors.rs":"8f1dfb3dc969c3403f15347c5de9f4b22b6ee7191979104dd905824331df748a","src/config/idp_config.rs":"af55791a018eea96aefe665c04890e22b4df60a086cf2ec373b4b8121705155c","src/config/mod.rs":"c3cb5b9b82e1f43c3361dc82152aabd6877e07358cc3f9a12505159d8ee158a6","src/config/paths.rs":"b1b5782eb0e0a5b98c5e2e1d8e264cbdf10f303792551b04df9c873a0eb6ac3a","src/config/vars.rs":"4f09689b0e4b0490189f11c399ffbb55bb066a47dbbe838f99e44b3b7c8dcc74","src/config/vitur_config.rs":"8de6ac59a66147e59ca230a0a9278092d0c3f3f551fcb916325702af97f594d6","src/config/workspace.rs":"2ef25fef911a562d384f4a80bcccbb21c39698432c178119eb1da2470321a9e4","src/console/mod.rs":"5cc6e50b3b8fd1f69dce6aa83bbe259fb70cec3f9ae7dabbc6d570d60ac415d8","src/credentials/auto_refresh.rs":"b10b2388dc0409d1c63a7c04be0032b3fb1280f80ae23b856ad6a64b0274efb1","src/credentials/console_credentials.rs":"00ffaad70ba324431dffb76e1af2f83cdb9a43a9ecb379c0d5a1ffc78587dbf2","src/credentials/mod.rs":"c2369f0140b5ce56b8112e41547b38969b72be7f4943e7e50a79054b38c6c9f8","src/credentials/token_store.rs":"7fb370367a2e76f3b8f841bfe8972ca24ff57a04acab936abc6815f7d541410a","src/credentials/vitur_credentials/mod.rs":"40569eb3963fad59da84ac759217af517bcbca26c2ed2008431fb448ca120d19","src/credentials/vitur_credentials/vitur_access_key_credentials.rs":"9e3de00f39afba34abc7a2a82a670abf41472d9b5d332b9b0d7704178e3d553a","src/credentials/vitur_credentials/vitur_console_auth_credentials.rs":"25e6e91d9de2aa10da8c82bac5378afac0b7e8258d7a8768f534809140ea7574","src/credentials/vitur_credentials/vitur_token.rs":"58f4d4d505ffd0806fa5b9fb1ad6b142e38cf9c80139fee66ef5d97a2a846d41","src/encryption/compound_indexer/accumulator.rs":"ae8404a8fb7170641a924222c708bc87866c75da1ea2b1bb58dff6617677b571","src/encryption/compound_indexer/cons.rs":"7249b8e3d34cb50d2e6488959926dda8df5fc00fe25d7145f9ceb02712112b26","src/encryption/compound_indexer/mod.rs":"8cb5423af471db534aa2ed2d59bf8762b701f2e41c1d9e8a9558dffa36987d82","src/encryption/compound_indexer/prefix_indexer.rs":"c7901f13ecf79c996cac63ab6e8c67b33e6caa972f5c58bd98364bfad5076b93","src/encryption/errors.rs":"07161a77493b76d4fa949674cffad820c3b4fe516936a7b44ab691473377996b","src/encryption/match_indexer/mod.rs":"a39f5533457327e879a20888978caa7b11251d12814d655b5d3b5f3368169b73","src/encryption/mod.rs":"6c45e996fe067240f23307983aacf0626748d3fd4eff8e00c4c14f5d56de8420","src/encryption/ore_indexer/conversion.rs":"373049d811fbe025c66097a3646c468c31bf44940af045277cc3cc3701a76ac0","src/encryption/ore_indexer/mod.rs":"30b262407aae0f1a95ee21d2dda9ac60cfd1e166eb2ad0128e28a51afc92e552","src/encryption/plaintext/from_conversion.rs":"ed8072789b347afe4e52ef376cc2d27afc378673f7dbd0f3110bc1c73df01914","src/encryption/plaintext/mod.rs":"8c857ed07f894e104e62a410668f8c1b1c0460172d9fb31b19d111d0c516bc0a","src/encryption/plaintext/to_conversion.rs":"a920d53c720278e11a610994e20756cc41e632a916e40bc44dfb53c7f2df0ad1","src/encryption/text.rs":"17b720ae8afe87342cb6c0ef8e32d131ae419b88ccbaaeff8c6de125fe2278ec","src/encryption/unique_indexer/mod.rs":"0247abc0456e4e669ae4f0e49d65693e9f47295fec6dc0116897c8a936425e64","src/idp_client.rs":"8a3fa119569aaba659f14fb1c015f7daf79b66bca03b6c0ad4fbdaaf65394948","src/lib.rs":"84782398a6055cc20aea0716e29170ddfaca477986dfe71612a052459180576c","src/reqwest_client.rs":"cadce726f0eca20558b61680b4d4a35c4098bb024246810d609d1e94cbeca709","src/schema.rs":"e5651df4c1cff4a3dc2184c2997012be3793dcf84fff6db70adefb33b9c59239","src/vitur/errors.rs":"62c2ca3b60bdde35c1b194561ce712f81a249b42bd7996df372906a58a334a83","src/vitur/local_log.rs":"e9c151842d4f55bdfab95aa7b2574acdc2692272ce5e2d4ee972666b5c76a228","src/vitur/mod.rs":"f9633e141dcb696682972f8242706d73569b63ff01c23d67deafc702217b7e26","string_comparison_test_cases.json":"b1b2b84147092ab9a20b3f1c864d66cf505f6a7929d91f3c238add3c35302c7a"},"package":null}

‎vendor/cipherstash-client/Cargo.toml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ features = [
5050
default_features = false
5151

5252
[dependencies.cipherstash-core]
53-
path = "../cipherstash-core/"
53+
path = "../cipherstash-core"
5454

5555
[dependencies.open]
5656
version = "3.0.3"
5757

5858
[dependencies.ore-rs]
59-
path = "../ore-rs/"
59+
git = "https://github.com/cipherstash/ore.rs"
6060

6161
[dependencies.reqwest]
6262
version = "0.11.12"
@@ -68,7 +68,7 @@ features = [
6868
default-features = false
6969

7070
[dependencies.schema]
71-
path = "../vitur-config/"
71+
path = "../vitur-config"
7272
package = "vitur-config"
7373

7474
[dependencies.serde]
@@ -81,10 +81,14 @@ features = ["full"]
8181
optional = true
8282

8383
[dependencies.vitur-client]
84-
path = "../vitur-client/"
84+
path = "../vitur-client"
8585

8686
[dependencies.vitur-protocol]
87-
path = "../vitur-protocol/"
87+
path = "../vitur-protocol"
88+
89+
[dependencies.zeroize]
90+
version = "1.6.0"
91+
features = ["derive"]
8892

8993
[dev-dependencies]
9094
anyhow = "1.0.71"
@@ -94,7 +98,7 @@ sealed_test = "1.0.0"
9498
serde_json = "1.0"
9599

96100
[dev-dependencies.clap]
97-
version = "4.3.0"
101+
version = "4.4.6"
98102
features = ["derive"]
99103

100104
[dev-dependencies.tokio]

‎vendor/cipherstash-client/src/config/vitur_config.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,21 @@ impl ViturConfigBuilder {
208208

209209
self
210210
}
211+
212+
pub fn with_config(
213+
mut self,
214+
client_id: &str,
215+
client_secret: &str,
216+
workspace_id: &str,
217+
client_access_key: &str,
218+
) -> Self {
219+
self.client_id = Some(client_id.to_owned());
220+
self.client_key = Some(client_secret.to_owned());
221+
self.workspace_id = Some(workspace_id.to_owned());
222+
self.access_key = Some(client_access_key.to_owned());
223+
224+
self
225+
}
211226
}
212227

213228
#[derive(Clone)]

‎vendor/cipherstash-client/src/encryption/compound_indexer/accumulator.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@ pub enum Accumulator {
2020
pub struct ExactlyOneAccumulator(Accumulator);
2121

2222
impl ExactlyOneAccumulator {
23-
pub fn term(self) -> Vec<u8> {
23+
pub fn term(self) -> Result<Vec<u8>, AccumulatorError> {
2424
match self.0 {
25-
Accumulator::Term(term) => term,
25+
Accumulator::Term(term) => Ok(term),
2626
Accumulator::Terms(terms) => {
27-
unreachable!("Expected exactly one term, found {:?}", terms)
27+
if terms.is_empty() {
28+
Err(AccumulatorError::EmptyAccumulator)
29+
} else {
30+
Err(AccumulatorError::MultipleTermsFound)
31+
}
2832
}
2933
}
3034
}
@@ -101,8 +105,10 @@ impl From<Accumulator> for IndexTerm {
101105
}
102106
}
103107

104-
impl From<ExactlyOneAccumulator> for IndexTerm {
105-
fn from(acc: ExactlyOneAccumulator) -> Self {
106-
IndexTerm::Binary(acc.term())
108+
impl TryFrom<ExactlyOneAccumulator> for IndexTerm {
109+
type Error = AccumulatorError;
110+
111+
fn try_from(acc: ExactlyOneAccumulator) -> Result<Self, Self::Error> {
112+
Ok(IndexTerm::Binary(acc.term()?))
107113
}
108114
}

‎vendor/cipherstash-client/src/encryption/compound_indexer/mod.rs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,20 @@ pub enum SupportedOperators {
116116
}
117117

118118
impl SupportedOperators {
119-
fn to_vec(self) -> Vec<(String, Vec<Operator>)> {
119+
fn into_vec(self) -> Vec<(String, Vec<Operator>)> {
120120
match self {
121121
Self::Simple(field, operators) => vec![(field, operators)],
122122
Self::Compound(fields) => fields,
123123
}
124124
}
125125

126126
fn add(self, other: Self) -> Self {
127-
Self::Compound(self.to_vec().into_iter().chain(other.to_vec()).collect())
127+
Self::Compound(
128+
self.into_vec()
129+
.into_iter()
130+
.chain(other.into_vec())
131+
.collect(),
132+
)
128133
}
129134
}
130135

@@ -273,14 +278,10 @@ impl ComposableIndex for PrefixIndex {
273278
Accumulator::Terms(terms) => {
274279
terms
275280
.into_iter()
276-
.fold(Ok(Accumulator::empty()), |acc, term| {
277-
if let Ok(acc) = acc {
278-
indexer
279-
.index_with_salt(&plaintext, term)
280-
.map(|out| acc.add(out))
281-
} else {
282-
acc
283-
}
281+
.try_fold(Accumulator::empty(), |acc, term| {
282+
indexer
283+
.index_with_salt(&plaintext, term)
284+
.map(|out| acc.add(out))
284285
})
285286
}
286287
}

‎vendor/cipherstash-client/src/encryption/compound_indexer/prefix_indexer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ mod tests {
163163
let result =
164164
indexer.query_with_salt(&Plaintext::Utf8Str(Some("Hello".to_string())), &[])?;
165165

166-
assert_eq!(result.exactly_one()?.term().len(), 32);
166+
assert_eq!(result.exactly_one()?.term()?.len(), 32);
167167

168168
Ok(())
169169
}

‎vendor/cipherstash-client/src/encryption/dict_match_indexer/mod.rs

Lines changed: 0 additions & 126 deletions
This file was deleted.

‎vendor/cipherstash-client/src/encryption/match_indexer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ mod tests {
119119
let index_key = [0u8; 32];
120120
let indexer =
121121
MatchIndexer::new(index_key, tokenizer.clone(), token_filters.to_vec(), *k, *m);
122-
let term = indexer.encrypt(&Plaintext::Utf8Str(Some("Dan Draper".to_string())))?;
122+
let term = indexer.encrypt(&"Dan Draper".into())?;
123123
assert!(matches!(term, IndexTerm::BitMap(_)));
124124
} else {
125125
panic!()

0 commit comments

Comments
 (0)