MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-12-03 14:31:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

upgrade Rust deps including Retina

Browse Source
This commit is contained in:
Scott Lamb
2023-12-29 15:17:10 -08:00
parent e9a25322b5
commit 7d12e8033d
7 changed files with 135 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/db/Cargo.toml
View File

@@ -16,14 +16,14 @@ path = "lib.rs"
[dependencies]
base = { package = "moonfire-base", path = "../base" }
base64 = "0.13.0"
base64 = { workspace = true }
blake3 = "1.0.0"
byteorder = "1.0"
cstr = "0.2.5"
diff = "0.1.12"
fnv = "1.0"
futures = "0.3"
h264-reader = "0.6.0"
h264-reader = { workspace = true }
hashlink = "0.8.1"
itertools = "0.10.0"
libc = "0.2"
@@ -33,7 +33,7 @@ odds = { version = "0.4.0", features = ["std-vec"] }
pretty-hex = "0.3.0"
protobuf = "3.0"
ring = "0.16.2"
rusqlite = "0.28.0"
rusqlite = { workspace = true }
scrypt = "0.10.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

11
server/db/auth.rs
View File

@@ -7,6 +7,7 @@
use crate::json::UserConfig;
use crate::schema::Permissions;
use base::{bail, err, strutil, Error, ErrorKind, ResultExt as _};
use base64::{engine::general_purpose::STANDARD_NO_PAD, Engine as _};
use fnv::FnvHashMap;
use protobuf::Message;
use ring::rand::{SecureRandom, SystemRandom};
@@ -282,7 +283,8 @@ pub struct RawSessionId([u8; 48]);
impl RawSessionId {
pub fn decode_base64(input: &[u8]) -> Result<Self, Error> {
let mut s = RawSessionId([0u8; 48]);
let l = ::base64::decode_config_slice(input, ::base64::STANDARD_NO_PAD, &mut s.0[..])
let l = STANDARD_NO_PAD
.decode_slice(input, &mut s.0[..])
.map_err(|e| err!(InvalidArgument, msg("bad session id"), source(e)))?;
if l != 48 {
bail!(InvalidArgument, msg("session id must be 48 bytes"));
@@ -326,12 +328,15 @@ pub struct SessionHash(pub [u8; 24]);
impl SessionHash {
pub fn encode_base64(&self, output: &mut [u8; 32]) {
::base64::encode_config_slice(self.0, ::base64::STANDARD_NO_PAD, output);
STANDARD_NO_PAD
.encode_slice(self.0, output)
.expect("base64 encode should succeed");
}
pub fn decode_base64(input: &[u8]) -> Result<Self, Error> {
let mut h = SessionHash([0u8; 24]);
let l = ::base64::decode_config_slice(input, ::base64::STANDARD_NO_PAD, &mut h.0[..])
let l = STANDARD_NO_PAD
.decode_slice(input, &mut h.0[..])
.map_err(|e| err!(InvalidArgument, msg("invalid session hash"), source(e)))?;
if l != 24 {
bail!(InvalidArgument, msg("session hash must be 24 bytes"));