lfg2025/archy
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 12 Wiki Activity

Exercise existing purchase regressions through streamed Files copies

Browse Source
This commit is contained in:
archipelago
2026-10-06 06:03:20 -04:00
parent 9ce04627dd
commit 6fba95fe5a
2 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/archipelago/src/api/rpc/content.rs
+9 -3
View File
@@ -180,7 +180,7 @@ async fn cache_peer_response(
async fn file_cached_purchase_in_files(
data_dir: &std::path::Path,
item: &crate::content_owned::OwnedItem,
) -> Result<()> {
) -> Result<String> {
let folder = if item.mime_type.starts_with("image/") || item.mime_type.starts_with("video/") {
"Photos"
} else if item.mime_type.starts_with("audio/") {
@@ -201,8 +201,14 @@ async fn file_cached_purchase_in_files(
let (_, file) = crate::content_owned::open_owned(data_dir, &item.onion, &item.content_id)
.await?
.context("Purchase unavailable")?;
crate::container::filebrowser::save_new_file_from(&root.join(folder), name, file).await?;
Ok(())
let path =
crate::container::filebrowser::save_new_file_from(&root.join(folder), name, file).await?;
Ok(format!(
"{folder}/{}",
path.file_name()
.and_then(|name| name.to_str())
.context("Invalid Files name")?
))
}
impl RpcHandler {
core/archipelago/src/api/rpc/content_tests.rs
+44 -12
View File
@@ -31,7 +31,24 @@ async fn files_copy_routes_media_and_sanitizes_the_filename() {
("audio/mpeg", "Music"),
("text/plain", "Documents"),
] {
let relative = file_purchase_in_files(dir.path(), "../name #?.bin", mime, b"paid")
crate::content_owned::record_purchase(
dir.path(),
"seller.onion",
"id",
"../name #?.bin",
mime,
b"paid",
1,
"cashu",
"now",
)
.await
.unwrap();
let item = crate::content_owned::list_owned_checked(dir.path())
.await
.unwrap()
.remove(0);
let relative = file_cached_purchase_in_files(dir.path(), &item)
.await
.unwrap();
assert!(relative.starts_with(&format!("{folder}/name #?")));
@@ -47,11 +64,26 @@ async fn files_copy_routes_media_and_sanitizes_the_filename() {
#[tokio::test]
async fn unavailable_files_storage_is_reported_without_creating_a_fake_installation() {
let dir = tempfile::tempdir().unwrap();
assert!(
file_purchase_in_files(dir.path(), "name", "text/plain", b"bytes")
.await
.is_err()
);
crate::content_owned::record_purchase(
dir.path(),
"seller.onion",
"id",
"name",
"text/plain",
b"bytes",
1,
"cashu",
"now",
)
.await
.unwrap();
let item = crate::content_owned::list_owned_checked(dir.path())
.await
.unwrap()
.remove(0);
assert!(file_cached_purchase_in_files(dir.path(), &item)
.await
.is_err());
assert!(!dir.path().join("filebrowser").exists());
}
@@ -76,7 +108,7 @@ fn seller_errors_are_bounded_printable_and_identified_as_peer_text() {
async fn known_purchase_never_becomes_a_new_spend_when_cache_or_index_is_unavailable() {
let dir = tempfile::tempdir().unwrap();
assert!(
existing_paid_content(dir.path(), "seller.onion", "id", None)
existing_paid_content(dir.path(), "seller.onion", "id", None, false)
.await
.unwrap()
.is_none()
@@ -94,8 +126,8 @@ async fn known_purchase_never_becomes_a_new_spend_when_cache_or_index_is_unavail
)
.await
.unwrap();
for (id, filename) in [("id", None), ("duplicate-id", Some("/file.txt"))] {
let cached = existing_paid_content(dir.path(), "seller.onion", id, filename)
for (id, filename) in [("id", None, false), ("duplicate-id", Some("/file.txt"))] {
let cached = existing_paid_content(dir.path(), "seller.onion", id, filename, false)
.await
.unwrap()
.unwrap();
@@ -104,7 +136,7 @@ async fn known_purchase_never_becomes_a_new_spend_when_cache_or_index_is_unavail
assert_eq!(cached["data"], "cGFpZA==");
}
assert!(
existing_paid_content(dir.path(), "different.onion", "id", None)
existing_paid_content(dir.path(), "different.onion", "id", None, false)
.await
.unwrap()
.is_none()
@@ -113,7 +145,7 @@ async fn known_purchase_never_becomes_a_new_spend_when_cache_or_index_is_unavail
.await
.unwrap();
assert!(
existing_paid_content(dir.path(), "seller.onion", "id", None)
existing_paid_content(dir.path(), "seller.onion", "id", None, false)
.await
.unwrap_err()
.to_string()
@@ -123,7 +155,7 @@ async fn known_purchase_never_becomes_a_new_spend_when_cache_or_index_is_unavail
.await
.unwrap();
assert!(
existing_paid_content(dir.path(), "seller.onion", "other-id", None)
existing_paid_content(dir.path(), "seller.onion", "other-id", None, false)
.await
.unwrap_err()
.to_string()