docker/pgcat
1
0
Fork 0
mirror of https://github.com/postgresml/pgcat.git synced 2026-03-23 01:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deprecation warnings (#319)

Browse Source 
warning: use of deprecated function `base64::decode`: Use Engine::decode
This commit is contained in:
Mostafa Abdelraouf
2023-02-14 16:20:11 -06:00
committed by GitHub
parent 9830c18315
commit 97f5a0564d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/scram.rs
View File

@@ -2,6 +2,7 @@
// https://github.com/sfackler/rust-postgres/ // https://github.com/sfackler/rust-postgres/
// SASL implementation. // SASL implementation.
use base64::{engine::general_purpose, Engine as _};
use bytes::BytesMut; use bytes::BytesMut;
use hmac::{Hmac, Mac}; use hmac::{Hmac, Mac};
use rand::{self, Rng}; use rand::{self, Rng};
@@ -81,7 +82,7 @@ impl ScramSha256 {
return Err(Error::ProtocolSyncError(format!("SCRAM"))); return Err(Error::ProtocolSyncError(format!("SCRAM")));
} }
let salt = match base64::decode(&server_message.salt) { let salt = match general_purpose::STANDARD.decode(&server_message.salt) {
Ok(salt) => salt, Ok(salt) => salt,
Err(_) => return Err(Error::ProtocolSyncError(format!("SCRAM"))), Err(_) => return Err(Error::ProtocolSyncError(format!("SCRAM"))),
}; };
@@ -111,7 +112,7 @@ impl ScramSha256 {
let mut cbind_input = vec![]; let mut cbind_input = vec![];
cbind_input.extend("n,,".as_bytes()); cbind_input.extend("n,,".as_bytes());
let cbind_input = base64::encode(&cbind_input); let cbind_input = general_purpose::STANDARD.encode(&cbind_input);
self.message.clear(); self.message.clear();
@@ -149,7 +150,11 @@ impl ScramSha256 {
*proof ^= signature; *proof ^= signature;
} }
match write!(&mut self.message, ",p={}", base64::encode(&*client_proof)) { match write!(
&mut self.message,
",p={}",
general_purpose::STANDARD.encode(&*client_proof)
) {
Ok(_) => (), Ok(_) => (),
Err(_) => return Err(Error::ServerError), Err(_) => return Err(Error::ServerError),
}; };
@@ -161,7 +166,7 @@ impl ScramSha256 {
pub fn finish(&mut self, message: &BytesMut) -> Result<(), Error> { pub fn finish(&mut self, message: &BytesMut) -> Result<(), Error> {
let final_message = FinalMessage::parse(message)?; let final_message = FinalMessage::parse(message)?;
let verifier = match base64::decode(&final_message.value) { let verifier = match general_purpose::STANDARD.decode(&final_message.value) {
Ok(verifier) => verifier, Ok(verifier) => verifier,
Err(_) => return Err(Error::ProtocolSyncError(format!("SCRAM"))), Err(_) => return Err(Error::ProtocolSyncError(format!("SCRAM"))),
}; };