Skip to content

Commit 01e8206

Browse files
sfacklersfackler
authored
Merge pull request rust-postgres#340 from sfackler/deps
Upgrade dependencies
2 parents f76a292 + 8970fd9 commit 01e8206

6 files changed

Lines changed: 52 additions & 60 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,42 @@
11
restore_registry: &RESTORE_REGISTRY
22
restore_cache:
33
key: registry
4-
54
save_registry: &SAVE_REGISTRY
65
save_cache:
76
key: registry-{{ .BuildNum }}
87
paths:
9-
- /usr/local/cargo/registry/index
10-
8+
- /usr/local/cargo/registry/index
119
deps_key: &DEPS_KEY
12-
key: deps-1.19.0-{{ checksum "Cargo.lock" }}
13-
10+
key: deps-{{ checksum "~/rust-version" }}-{{ checksum "Cargo.lock" }}
1411
restore_deps: &RESTORE_DEPS
1512
restore_cache:
1613
<<: *DEPS_KEY
17-
1814
save_deps: &SAVE_DEPS
1915
save_cache:
2016
<<: *DEPS_KEY
2117
paths:
22-
- target
23-
- /usr/local/cargo/registry/cache
18+
- target
19+
- /usr/local/cargo/registry/cache
2420

2521
version: 2
2622
jobs:
2723
build:
2824
working_directory: ~/build
2925
docker:
30-
- image: rust:1.20.0
26+
- image: rust:1.21.0
3127
environment:
3228
RUSTFLAGS: -D warnings
3329
- image: sfackler/rust-postgres-test:3
3430
steps:
3531
- checkout
3632
- run: apt-get update
3733
- run: DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends jq
38-
- <<: *RESTORE_REGISTRY
34+
- *RESTORE_REGISTRY
3935
- run: cargo generate-lockfile
40-
- <<: *SAVE_REGISTRY
41-
- <<: *RESTORE_DEPS
36+
- *SAVE_REGISTRY
37+
- run: rustc --version > ~/rust-version
38+
- *RESTORE_DEPS
4239
- run: cargo test --all
4340
- run: cargo test --manifest-path=postgres/Cargo.toml --features "$(cargo read-manifest --manifest-path=postgres/Cargo.toml | jq -r '.features|keys|map(select(. != "with-security-framework" and . != "with-schannel"))|join(" ")')"
4441
- run: cargo test --manifest-path=tokio-postgres/Cargo.toml --all-features
45-
- <<: *SAVE_DEPS
42+
- *SAVE_DEPS

‎postgres-protocol/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ repository = "https://github.com/sfackler/rust-postgres-protocol"
88
readme = "../README.md"
99

1010
[dependencies]
11-
base64 = "0.6"
11+
base64 = "0.9"
1212
byteorder = "1.0"
1313
bytes = "0.4"
1414
fallible-iterator = "0.1"
15-
generic-array = "0.9"
16-
hmac = "0.5"
15+
generic-array = "0.11"
16+
hmac = "0.6"
1717
md5 = "0.3"
18-
memchr = "1.0"
19-
rand = "0.3"
18+
memchr = "2.0"
19+
rand = "0.4"
2020
sha2 = "0.7"
2121
stringprep = "0.1"

‎postgres-protocol/src/authentication/sasl.rs‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
//! SASL-based authentication support.
22
33
use base64;
4-
use generic_array::GenericArray;
54
use generic_array::typenum::U32;
5+
use generic_array::GenericArray;
66
use hmac::{Hmac, Mac};
7-
use sha2::{Sha256, Digest};
7+
use rand::{OsRng, Rng};
8+
use sha2::{Digest, Sha256};
89
use std::fmt::Write;
910
use std::io;
1011
use std::iter;
1112
use std::mem;
1213
use std::str;
13-
use rand::{OsRng, Rng};
1414
use stringprep;
1515

1616
const NONCE_LENGTH: usize = 24;
@@ -34,16 +34,15 @@ fn normalize(pass: &[u8]) -> Vec<u8> {
3434
}
3535

3636
fn hi(str: &[u8], salt: &[u8], i: u32) -> GenericArray<u8, U32> {
37-
let mut hmac = Hmac::<Sha256>::new(str)
38-
.expect("HMAC is able to accept all key sizes");
37+
let mut hmac = Hmac::<Sha256>::new_varkey(str).expect("HMAC is able to accept all key sizes");
3938
hmac.input(salt);
4039
hmac.input(&[0, 0, 0, 1]);
4140
let mut prev = hmac.result().code();
4241

4342
let mut hi = GenericArray::<u8, U32>::clone_from_slice(&prev);
4443

4544
for _ in 1..i {
46-
let mut hmac = Hmac::<Sha256>::new(str).expect("already checked above");
45+
let mut hmac = Hmac::<Sha256>::new_varkey(str).expect("already checked above");
4746
hmac.input(prev.as_slice());
4847
prev = hmac.result().code();
4948

@@ -56,7 +55,10 @@ fn hi(str: &[u8], salt: &[u8], i: u32) -> GenericArray<u8, U32> {
5655
}
5756

5857
enum State {
59-
Update { nonce: String, password: Vec<u8> },
58+
Update {
59+
nonce: String,
60+
password: Vec<u8>,
61+
},
6062
Finish {
6163
salted_password: GenericArray<u8, U32>,
6264
auth_message: String,
@@ -134,9 +136,8 @@ impl ScramSha256 {
134136
_ => return Err(io::Error::new(io::ErrorKind::Other, "invalid SCRAM state")),
135137
};
136138

137-
let message = str::from_utf8(message).map_err(|e| {
138-
io::Error::new(io::ErrorKind::InvalidInput, e)
139-
})?;
139+
let message =
140+
str::from_utf8(message).map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
140141

141142
let parsed = Parser::new(message).server_first_message()?;
142143

@@ -151,7 +152,7 @@ impl ScramSha256 {
151152

152153
let salted_password = hi(&password, &salt, parsed.iteration_count);
153154

154-
let mut hmac = Hmac::<Sha256>::new(&salted_password)
155+
let mut hmac = Hmac::<Sha256>::new_varkey(&salted_password)
155156
.expect("HMAC is able to accept all key sizes");
156157
hmac.input(b"Client Key");
157158
let client_key = hmac.result().code();
@@ -165,8 +166,8 @@ impl ScramSha256 {
165166

166167
let auth_message = format!("n=,r={},{},{}", client_nonce, message, self.message);
167168

168-
let mut hmac = Hmac::<Sha256>::new(&stored_key)
169-
.expect("HMAC is able to accept all key sizes");
169+
let mut hmac =
170+
Hmac::<Sha256>::new_varkey(&stored_key).expect("HMAC is able to accept all key sizes");
170171
hmac.input(auth_message.as_bytes());
171172
let client_signature = hmac.result();
172173

@@ -197,9 +198,8 @@ impl ScramSha256 {
197198
_ => return Err(io::Error::new(io::ErrorKind::Other, "invalid SCRAM state")),
198199
};
199200

200-
let message = str::from_utf8(message).map_err(|e| {
201-
io::Error::new(io::ErrorKind::InvalidInput, e)
202-
})?;
201+
let message =
202+
str::from_utf8(message).map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
203203

204204
let parsed = Parser::new(message).server_final_message()?;
205205

@@ -218,18 +218,16 @@ impl ScramSha256 {
218218
Err(e) => return Err(io::Error::new(io::ErrorKind::InvalidInput, e)),
219219
};
220220

221-
let mut hmac = Hmac::<Sha256>::new(&salted_password)
221+
let mut hmac = Hmac::<Sha256>::new_varkey(&salted_password)
222222
.expect("HMAC is able to accept all key sizes");
223223
hmac.input(b"Server Key");
224224
let server_key = hmac.result();
225225

226-
let mut hmac = Hmac::<Sha256>::new(&server_key.code())
226+
let mut hmac = Hmac::<Sha256>::new_varkey(&server_key.code())
227227
.expect("HMAC is able to accept all key sizes");
228228
hmac.input(auth_message.as_bytes());
229-
hmac.verify(&verifier).map_err(|_| io::Error::new(
230-
io::ErrorKind::InvalidInput,
231-
"SCRAM verification error",
232-
))
229+
hmac.verify(&verifier)
230+
.map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "SCRAM verification error"))
233231
}
234232
}
235233

@@ -252,9 +250,7 @@ impl<'a> Parser<'a> {
252250
Some((i, c)) => {
253251
let m = format!(
254252
"unexpected character at byte {}: expected `{}` but got `{}",
255-
i,
256-
target,
257-
c
253+
i, target, c
258254
);
259255
Err(io::Error::new(io::ErrorKind::InvalidInput, m))
260256
}
@@ -316,9 +312,8 @@ impl<'a> Parser<'a> {
316312
'0'...'9' => true,
317313
_ => false,
318314
})?;
319-
n.parse().map_err(
320-
|e| io::Error::new(io::ErrorKind::InvalidInput, e),
321-
)
315+
n.parse()
316+
.map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))
322317
}
323318

324319
fn iteration_count(&mut self) -> io::Result<u32> {
@@ -329,12 +324,10 @@ impl<'a> Parser<'a> {
329324

330325
fn eof(&mut self) -> io::Result<()> {
331326
match self.it.peek() {
332-
Some(&(i, _)) => {
333-
Err(io::Error::new(
334-
io::ErrorKind::InvalidInput,
335-
format!("unexpected trailing data at byte {}", i),
336-
))
337-
}
327+
Some(&(i, _)) => Err(io::Error::new(
328+
io::ErrorKind::InvalidInput,
329+
format!("unexpected trailing data at byte {}", i),
330+
)),
338331
None => Ok(()),
339332
}
340333
}
@@ -419,10 +412,12 @@ mod test {
419412
let nonce = "9IZ2O01zb9IgiIZ1WJ/zgpJB";
420413

421414
let client_first = "n,,n=,r=9IZ2O01zb9IgiIZ1WJ/zgpJB";
422-
let server_first = "r=9IZ2O01zb9IgiIZ1WJ/zgpJBjx/oIRLs02gGSHcw1KEty3eY,s=fs3IXBy7U7+IvVjZ,i\
423-
=4096";
424-
let client_final = "c=biws,r=9IZ2O01zb9IgiIZ1WJ/zgpJBjx/oIRLs02gGSHcw1KEty3eY,p=AmNKosjJzS3\
425-
1NTlQYNs5BTeQjdHdk7lOflDo5re2an8=";
415+
let server_first =
416+
"r=9IZ2O01zb9IgiIZ1WJ/zgpJBjx/oIRLs02gGSHcw1KEty3eY,s=fs3IXBy7U7+IvVjZ,i\
417+
=4096";
418+
let client_final =
419+
"c=biws,r=9IZ2O01zb9IgiIZ1WJ/zgpJBjx/oIRLs02gGSHcw1KEty3eY,p=AmNKosjJzS3\
420+
1NTlQYNs5BTeQjdHdk7lOflDo5re2an8=";
426421
let server_final = "v=U+ppxD5XUKtradnv8e2MkeupiA8FU87Sg8CXzXHDAzw=";
427422

428423
let mut scram = ScramSha256::new_inner(password.as_bytes(), nonce.to_string()).unwrap();

‎postgres-shared/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ with-time = ["time"]
1717
with-uuid = ["uuid"]
1818

1919
[dependencies]
20-
hex = "0.2"
20+
hex = "0.3"
2121
fallible-iterator = "0.1.3"
2222
phf = "=0.7.21"
2323
postgres-protocol = { version = "0.3", path = "../postgres-protocol" }

‎postgres-shared/src/types/serde_json.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use self::serde_json::Value;
44
use std::error::Error;
55
use std::io::{Read, Write};
66

7-
use types::{FromSql, ToSql, IsNull, Type, JSON, JSONB};
7+
use types::{FromSql, IsNull, ToSql, Type, JSON, JSONB};
88

99
impl FromSql for Value {
1010
fn from_sql(ty: &Type, mut raw: &[u8]) -> Result<Value, Box<Error + Sync + Send>> {
@@ -23,7 +23,7 @@ impl FromSql for Value {
2323
}
2424

2525
impl ToSql for Value {
26-
fn to_sql(&self, ty: &Type, mut out: &mut Vec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {
26+
fn to_sql(&self, ty: &Type, out: &mut Vec<u8>) -> Result<IsNull, Box<Error + Sync + Send>> {
2727
if *ty == JSONB {
2828
out.push(1);
2929
}

‎postgres/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ postgres-protocol = { version = "0.3.0", path = "../postgres-protocol" }
7070
postgres-shared = { version = "0.4.1", path = "../postgres-shared" }
7171

7272
[dev-dependencies]
73-
hex = "0.2"
73+
hex = "0.3"
7474
url = "1.0"
7575

7676
bit-vec = "0.4"

0 commit comments

Comments
 (0)