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

move pbs-tools/src/percent_encoding.rs to pbs-api-types/src/percent_encoding.rs

Browse Source 
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer
2021-11-25 11:48:52 +01:00
parent f35e187f16
commit 577095e2f7
8 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pbs-api-types/Cargo.toml
View File

@ -12,6 +12,7 @@ lazy_static = "1.4"
libc = "0.2"
nix = "0.19.1"
openssl = "0.10"
percent-encoding = "2.1"
regex = "1.2"
serde = { version = "1.0", features = ["derive"] }

1
pbs-api-types/src/lib.rs
View File

@ -4,6 +4,7 @@ use serde::{Deserialize, Serialize};
use anyhow::bail;
pub mod common_regex;
pub mod percent_encoding;
use proxmox_schema::{
api, const_regex, ApiStringFormat, ApiType, ArraySchema, Schema, StringSchema, ReturnType,

22
pbs-api-types/src/percent_encoding.rs Normal file
View File

@ -0,0 +1,22 @@
use percent_encoding::{utf8_percent_encode, AsciiSet};
/// 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'}');
/// percent encode a url component
pub fn percent_encode_component(comp: &str) -> String {
utf8_percent_encode(comp, percent_encoding::NON_ALPHANUMERIC).to_string()
}