tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update to url/percent-encoding to 2.1

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-12-13 11:55:52 +01:00
parent db0cb9ce0b
commit 8a1028e0e7
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

@ -27,6 +27,7 @@ nix = "0.15"
openssl = "0.10" openssl = "0.10"
pam = "0.7" pam = "0.7"
pam-sys = "0.5" pam-sys = "0.5"
percent-encoding = "2.1"
pin-utils = "0.1.0-alpha" pin-utils = "0.1.0-alpha"
proxmox = { git = "ssh://gitolite3@proxdev.maurer-it.com/rust/proxmox", version = "0.1", features = [ "sortable-macro", "api-macro" ] } proxmox = { git = "ssh://gitolite3@proxdev.maurer-it.com/rust/proxmox", version = "0.1", features = [ "sortable-macro", "api-macro" ] }
regex = "1.0" regex = "1.0"
@ -36,10 +37,10 @@ serde_json = "1.0"
siphasher = "0.3" siphasher = "0.3"
syslog = "4.0" syslog = "4.0"
tokio = { version = "0.2.0", features = [ "blocking", "fs", "io-util", "macros", "rt-threaded", "signal", "stream", "tcp", "time", "uds" ] } tokio = { version = "0.2.0", features = [ "blocking", "fs", "io-util", "macros", "rt-threaded", "signal", "stream", "tcp", "time", "uds" ] }
tokio-util = { version = "0.2.0", features = [ "codec" ] }
tokio-openssl = "0.4.0" tokio-openssl = "0.4.0"
tokio-util = { version = "0.2.0", features = [ "codec" ] }
tower-service = "0.3.0" tower-service = "0.3.0"
url = "1.7" url = "2.1"
valgrind_request = { version = "1.1", optional = true } valgrind_request = { version = "1.1", optional = true }
walkdir = "2" walkdir = "2"
xdg = "2.2" xdg = "2.2"

4
src/client/http_client.rs
View File

@ -11,7 +11,7 @@ use hyper::Body;
use hyper::client::{Client, HttpConnector}; use hyper::client::{Client, HttpConnector};
use openssl::ssl::{SslConnector, SslMethod}; use openssl::ssl::{SslConnector, SslMethod};
use serde_json::{json, Value}; use serde_json::{json, Value};
use url::percent_encoding::{percent_encode, DEFAULT_ENCODE_SET}; use percent_encoding::percent_encode;
use xdg::BaseDirectories; use xdg::BaseDirectories;
use proxmox::tools::{ use proxmox::tools::{
@ -21,7 +21,7 @@ use proxmox::tools::{
use super::pipe_to_stream::PipeToSendStream; use super::pipe_to_stream::PipeToSendStream;
use crate::tools::async_io::EitherStream; use crate::tools::async_io::EitherStream;
use crate::tools::futures::{cancellable, Canceller}; use crate::tools::futures::{cancellable, Canceller};
use crate::tools::{self, tty, BroadcastFuture}; use crate::tools::{self, tty, BroadcastFuture, DEFAULT_ENCODE_SET};
#[derive(Clone)] #[derive(Clone)]
pub struct AuthInfo { pub struct AuthInfo {

19
src/tools.rs
View File

@ -14,6 +14,7 @@ use std::time::Duration;
use failure::*; use failure::*;
use serde_json::Value; use serde_json::Value;
use openssl::hash::{hash, DigestBytes, MessageDigest}; use openssl::hash::{hash, DigestBytes, MessageDigest};
use percent_encoding::AsciiSet;
use proxmox::tools::vec; use proxmox::tools::vec;
@ -416,7 +417,7 @@ pub fn extract_auth_cookie(cookie: &str, cookie_name: &str) -> Option<String> {
}; };
if name == cookie_name { if name == cookie_name {
use url::percent_encoding::percent_decode; use percent_encoding::percent_decode;
if let Ok(value) = percent_decode(value.as_bytes()).decode_utf8() { if let Ok(value) = percent_decode(value.as_bytes()).decode_utf8() {
return Some(value.into()); return Some(value.into());
} else { } else {
@ -549,3 +550,19 @@ impl<T: Any> AsAny for T {
self self
} }
} }
/// This used to be: `SIMPLE_ENCODE_SET` plus space, `"`, `#`, `<`, `>`, backtick, `?`, `{`, `}`
pub const DEFAULT_ENCODE_SET: &AsciiSet = &percent_encoding::CONTROLS // 0..1f and 7e
// The SIMPLE_ENCODE_SET adds space and anything >= 0x7e (7e itself is already included above)
.add(0x20)
.add(0x7f)
// the DEFAULT_ENCODE_SET added:
.add(b' ')
.add(b'"')
.add(b'#')
.add(b'<')
.add(b'>')
.add(b'`')
.add(b'?')
.add(b'{')
.add(b'}');