mirror of
				https://github.com/dani-garcia/vaultwarden.git
				synced 2025-10-31 02:08:20 +02:00 
			
		
		
		
	Update Rust and crates (#4445)
- Updated Rust to v1.77.0 - Updated several crates The `reqwest` update included `trust-dns` > `hickory-dns` changes. Also, `reqwest` v0.12 is not working correctly for us, that is something to investigate. - Fixed a new clippy warning
This commit is contained in:
		
				
					committed by
					
						 GitHub
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							1e42755187
						
					
				
				
					commit
					93636eb3c3
				
			| @@ -54,7 +54,7 @@ static CLIENT: Lazy<Client> = Lazy::new(|| { | ||||
|         .timeout(icon_download_timeout) | ||||
|         .pool_max_idle_per_host(5) // Configure the Hyper Pool to only have max 5 idle connections | ||||
|         .pool_idle_timeout(pool_idle_timeout) // Configure the Hyper Pool to timeout after 10 seconds | ||||
|         .trust_dns(true) | ||||
|         .hickory_dns(true) | ||||
|         .default_headers(default_headers.clone()); | ||||
|  | ||||
|     match client.build() { | ||||
| @@ -66,7 +66,7 @@ static CLIENT: Lazy<Client> = Lazy::new(|| { | ||||
|                 .timeout(icon_download_timeout) | ||||
|                 .pool_max_idle_per_host(5) // Configure the Hyper Pool to only have max 5 idle connections | ||||
|                 .pool_idle_timeout(pool_idle_timeout) // Configure the Hyper Pool to timeout after 10 seconds | ||||
|                 .trust_dns(false) | ||||
|                 .hickory_dns(false) | ||||
|                 .default_headers(default_headers) | ||||
|                 .build() | ||||
|                 .expect("Failed to build client") | ||||
|   | ||||
| @@ -34,7 +34,8 @@ pub fn initialize_keys() -> Result<(), crate::error::Error> { | ||||
|     let mut priv_key_buffer = Vec::with_capacity(2048); | ||||
|  | ||||
|     let priv_key = { | ||||
|         let mut priv_key_file = File::options().create(true).read(true).write(true).open(CONFIG.private_rsa_key())?; | ||||
|         let mut priv_key_file = | ||||
|             File::options().create(true).truncate(false).read(true).write(true).open(CONFIG.private_rsa_key())?; | ||||
|  | ||||
|         #[allow(clippy::verbose_file_reads)] | ||||
|         let bytes_read = priv_key_file.read_to_end(&mut priv_key_buffer)?; | ||||
|   | ||||
| @@ -3,7 +3,7 @@ | ||||
| // The more key/value pairs there are the more recursion occurs. | ||||
| // We want to keep this as low as possible, but not higher then 128. | ||||
| // If you go above 128 it will cause rust-analyzer to fail, | ||||
| #![recursion_limit = "103"] | ||||
| #![recursion_limit = "87"] | ||||
|  | ||||
| // When enabled use MiMalloc as malloc instead of the default malloc | ||||
| #[cfg(feature = "enable_mimalloc")] | ||||
| @@ -213,7 +213,7 @@ fn launch_info() { | ||||
| fn init_logging(level: log::LevelFilter) -> Result<(), fern::InitError> { | ||||
|     // Depending on the main log level we either want to disable or enable logging for trust-dns. | ||||
|     // Else if there are timeouts it will clutter the logs since trust-dns uses warn for this. | ||||
|     let trust_dns_level = if level >= log::LevelFilter::Debug { | ||||
|     let hickory_level = if level >= log::LevelFilter::Debug { | ||||
|         level | ||||
|     } else { | ||||
|         log::LevelFilter::Off | ||||
| @@ -267,8 +267,8 @@ fn init_logging(level: log::LevelFilter) -> Result<(), fern::InitError> { | ||||
|         // Prevent cookie_store logs | ||||
|         .level_for("cookie_store", log::LevelFilter::Off) | ||||
|         // Variable level for trust-dns used by reqwest | ||||
|         .level_for("trust_dns_resolver::name_server::name_server", trust_dns_level) | ||||
|         .level_for("trust_dns_proto::xfer", trust_dns_level) | ||||
|         .level_for("hickory_resolver::name_server::name_server", hickory_level) | ||||
|         .level_for("hickory_proto::xfer", hickory_level) | ||||
|         .level_for("diesel_logger", diesel_logger_level) | ||||
|         .chain(std::io::stdout()); | ||||
|  | ||||
|   | ||||
| @@ -706,7 +706,7 @@ pub fn get_reqwest_client() -> Client { | ||||
|         Ok(client) => client, | ||||
|         Err(e) => { | ||||
|             error!("Possible trust-dns error, trying with trust-dns disabled: '{e}'"); | ||||
|             get_reqwest_client_builder().trust_dns(false).build().expect("Failed to build client") | ||||
|             get_reqwest_client_builder().hickory_dns(false).build().expect("Failed to build client") | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user