Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 66 additions & 2 deletions src/azure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,18 @@ fn sanitize_tag_component(input: &str) -> String {
.collect()
}

fn normalize_sas_token(input: &str) -> String {
let trimmed = input.trim();
if trimmed.is_empty() {
return String::new();
}
if trimmed.starts_with('?') {
trimmed.to_string()
} else {
format!("?{}", trimmed)
}
}

/// Get Azure credentials from config.toml
fn get_azure_credentials(name: &str) -> AzureConfig {
let cfg_content = get_config_content();
Expand All @@ -67,7 +79,30 @@ fn get_azure_credentials(name: &str) -> AzureConfig {
account: account.to_string(),
key: key.to_string(),
container: container.to_string(),
sastoken: sastoken.to_string(),
sastoken: normalize_sas_token(sastoken),
}
}

#[cfg(test)]
mod tests {
use super::normalize_sas_token;

#[test]
fn sas_token_is_left_empty() {
assert_eq!(normalize_sas_token(""), "");
assert_eq!(normalize_sas_token(" "), "");
}

#[test]
fn sas_token_is_left_intact_when_prefixed() {
assert_eq!(normalize_sas_token("?sv=1"), "?sv=1");
assert_eq!(normalize_sas_token(" ?sv=1 "), "?sv=1");
}

#[test]
fn sas_token_is_prefixed_when_missing_question_mark() {
assert_eq!(normalize_sas_token("sv=1"), "?sv=1");
assert_eq!(normalize_sas_token(" sv=1 "), "?sv=1");
}
}

Expand Down Expand Up @@ -440,7 +475,36 @@ async fn get_file_from_blob(filename: String) -> ReceivedFile {
// is status anything else than 200?
// TODO: Do we need to return headers as well or it is data leakage?
if response.status() != 200 {
eprintln!("Error getting blob: {:?}", response.status());
let status = response.status();
let headers = response.headers().clone();
let ms_error_code = headers
.get("x-ms-error-code")
.and_then(|v| v.to_str().ok())
.unwrap_or("<missing>");
let ms_request_id = headers
.get("x-ms-request-id")
.and_then(|v| v.to_str().ok())
.unwrap_or("<missing>");
let content_type = headers
.get("content-type")
.and_then(|v| v.to_str().ok())
.unwrap_or("<missing>");
let body_preview = match response.bytes().await {
Ok(bytes) => {
let mut preview = String::from_utf8_lossy(&bytes).into_owned();
const MAX_LEN: usize = 4096;
if preview.len() > MAX_LEN {
preview.truncate(MAX_LEN);
preview.push_str("…<truncated>");
}
preview
}
Err(e) => format!("<failed to read body: {e}>"),
};

eprintln!(
"Error getting blob: {status} (x-ms-error-code={ms_error_code}, x-ms-request-id={ms_request_id}, content-type={content_type}) body={body_preview}"
);
return received_file;
}
received_file.headers = response.headers().clone();
Expand Down