zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix(uriproxy): oops didnt strip base

Browse source
This commit is contained in:
əlemi 2024-05-20 06:42:22 +02:00
parent af3a3fbbb8
commit 96a0cf0df3
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
uriproxy/src/lib.rs
View file

@ -21,23 +21,28 @@ impl AsRef<str> for UriClass {
/// unpack uri in id if valid, otherwise compose full uri with "{base}/{entity}/{id}" /// unpack uri in id if valid, otherwise compose full uri with "{base}/{entity}/{id}"
pub fn uri(base: &str, entity: UriClass, id: &str) -> String { pub fn uri(base: &str, entity: UriClass, id: &str) -> String {
if id.starts_with('~') { // ready-to-use base64-encoded id if let Some(bare_id) = get_nth_uri_element(id) {
if let Ok(bytes) = base64::prelude::BASE64_STANDARD.decode(id) { if bare_id.starts_with('~') {
if let Ok(uri) = std::str::from_utf8(&bytes) { if let Ok(bytes) = base64::prelude::BASE64_STANDARD.decode(bare_id.replacen('~', "", 1)) {
return uri.to_string(); if let Ok(uri) = std::str::from_utf8(&bytes) {
return uri.to_string();
}
} }
} }
} }
format!("{}/{}/{}", base, entity.as_ref(), id) format!("{}/{}/{}", base, entity.as_ref(), id)
} }
fn get_nth_uri_element(uri: &str) -> Option<String> {
uri // https://example.org/users/test/followers/page?offset=42
.split('/') // ['https:', '', 'example.org', 'users', 'test', 'followers', 'page?offset=42' ]
.nth(4) // 'test'
.map(|x| x.to_string())
}
/// decompose local id constructed by uri() fn /// decompose local id constructed by uri() fn
pub fn decompose_id(full_id: &str) -> String { pub fn decompose_id(full_id: &str) -> String {
full_id // https://example.org/users/test/followers/page?offset=42 get_nth_uri_element(full_id).unwrap_or_default()
.split('/') // ['https:', '', 'example.org', 'users', 'test', 'followers', 'page?offset=42' ]
.nth(4) // 'test'
.unwrap_or("")
.to_string()
} }
/// encode with base64 remote url and prefix it with ~ /// encode with base64 remote url and prefix it with ~