Compare commits
	
		
			1 Commits
		
	
	
		
			master
			...
			0488ef274d
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 0488ef274d | 
							
								
								
									
										41
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										41
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							| @@ -722,9 +722,9 @@ checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" | ||||
|  | ||||
| [[package]] | ||||
| name = "log" | ||||
| version = "0.4.28" | ||||
| version = "0.4.27" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" | ||||
| checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" | ||||
|  | ||||
| [[package]] | ||||
| name = "memchr" | ||||
| @@ -905,9 +905,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "rand" | ||||
| version = "0.9.2" | ||||
| version = "0.9.1" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" | ||||
| checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" | ||||
| dependencies = [ | ||||
|  "rand_chacha", | ||||
|  "rand_core 0.9.3", | ||||
| @@ -943,9 +943,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "reqwest" | ||||
| version = "0.12.24" | ||||
| version = "0.12.19" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" | ||||
| checksum = "a2f8e5513d63f2e5b386eb5106dc67eaf3f84e95258e210489136b8b92ad6119" | ||||
| dependencies = [ | ||||
|  "base64", | ||||
|  "bytes", | ||||
| @@ -959,10 +959,12 @@ dependencies = [ | ||||
|  "hyper-rustls", | ||||
|  "hyper-tls", | ||||
|  "hyper-util", | ||||
|  "ipnet", | ||||
|  "js-sys", | ||||
|  "log", | ||||
|  "mime", | ||||
|  "native-tls", | ||||
|  "once_cell", | ||||
|  "percent-encoding", | ||||
|  "pin-project-lite", | ||||
|  "rustls-pki-types", | ||||
| @@ -1090,28 +1092,18 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "serde" | ||||
| version = "1.0.228" | ||||
| version = "1.0.219" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" | ||||
| dependencies = [ | ||||
|  "serde_core", | ||||
|  "serde_derive", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "serde_core" | ||||
| version = "1.0.228" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" | ||||
| checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" | ||||
| dependencies = [ | ||||
|  "serde_derive", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| name = "serde_derive" | ||||
| version = "1.0.228" | ||||
| version = "1.0.219" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" | ||||
| checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" | ||||
| dependencies = [ | ||||
|  "proc-macro2", | ||||
|  "quote", | ||||
| @@ -1120,15 +1112,14 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "serde_json" | ||||
| version = "1.0.145" | ||||
| version = "1.0.140" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" | ||||
| checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" | ||||
| dependencies = [ | ||||
|  "itoa", | ||||
|  "memchr", | ||||
|  "ryu", | ||||
|  "serde", | ||||
|  "serde_core", | ||||
| ] | ||||
|  | ||||
| [[package]] | ||||
| @@ -1327,9 +1318,9 @@ dependencies = [ | ||||
|  | ||||
| [[package]] | ||||
| name = "tower-http" | ||||
| version = "0.6.6" | ||||
| version = "0.6.5" | ||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||||
| checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" | ||||
| checksum = "5cc2d9e086a412a451384326f521c8123a99a466b329941a9403696bff9b0da2" | ||||
| dependencies = [ | ||||
|  "bitflags", | ||||
|  "bytes", | ||||
|   | ||||
| @@ -39,7 +39,7 @@ impl Error for StateError {} | ||||
|  | ||||
| impl fmt::Display for StateError { | ||||
|     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { | ||||
|         write!(f, "StateManager error {self:?}") | ||||
|         write!(f, "StateManager error {:?}", self) | ||||
|     } | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -38,7 +38,7 @@ impl OpenIDConfig { | ||||
|         code: &str, | ||||
|         redirect_uri: &str, | ||||
|     ) -> Result<(OpenIDTokenResponse, String), Box<dyn Error>> { | ||||
|         let authorization = BASE64_STANDARD.encode(format!("{client_id}:{client_secret}")); | ||||
|         let authorization = BASE64_STANDARD.encode(format!("{}:{}", client_id, client_secret)); | ||||
|  | ||||
|         let mut params = HashMap::new(); | ||||
|         params.insert("grant_type", "authorization_code"); | ||||
|   | ||||
| @@ -1,10 +1,12 @@ | ||||
| use std::error::Error; | ||||
| use std::io::ErrorKind; | ||||
|  | ||||
| use aes_gcm::aead::{Aead, OsRng}; | ||||
| use aes_gcm::{Aes256Gcm, Key, KeyInit, Nonce}; | ||||
| use base64::engine::general_purpose::STANDARD as BASE64_STANDARD; | ||||
| use base64::Engine as _; | ||||
| use bincode::{Decode, Encode}; | ||||
| use rand::Rng; | ||||
| use std::error::Error; | ||||
|  | ||||
| /// The lenght of the nonce used to initialize encryption | ||||
| const NONCE_LEN: usize = 12; | ||||
| @@ -43,7 +45,8 @@ impl CryptoWrapper { | ||||
|         let bytes = BASE64_STANDARD.decode(input)?; | ||||
|  | ||||
|         if bytes.len() < NONCE_LEN { | ||||
|             return Err(Box::new(std::io::Error::other( | ||||
|             return Err(Box::new(std::io::Error::new( | ||||
|                 ErrorKind::Other, | ||||
|                 "Input string is smaller than nonce!", | ||||
|             ))); | ||||
|         } | ||||
| @@ -56,8 +59,9 @@ impl CryptoWrapper { | ||||
|         let dec = match aes_key.decrypt(Nonce::from_slice(nonce), enc) { | ||||
|             Ok(d) => d, | ||||
|             Err(e) => { | ||||
|                 log::error!("Failed to decrypt wrapped data! {e:#?}"); | ||||
|                 return Err(Box::new(std::io::Error::other( | ||||
|                 log::error!("Failed to decrypt wrapped data! {:#?}", e); | ||||
|                 return Err(Box::new(std::io::Error::new( | ||||
|                     ErrorKind::Other, | ||||
|                     "Failed to decrypt wrapped data!", | ||||
|                 ))); | ||||
|             } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user