Skip to content

fix(homeserver): escaped chars in sql like #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MCarlomagno wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(homeserver): escaped chars in sql like #531

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7dcdac
fix: escaped chars in sql like
MCarlomagno Jul 30, 2026
035c611
fix: use native starts_with
MCarlomagno Jul 31, 2026
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
59 changes: 55 additions & 4 deletions pubky-homeserver/src/persistence/sql/entities/entry/repository.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::{
},
shared::webdav::{EntryPath, StoragePath},
};
use sea_query::{Alias, Expr, Iden, Order, PostgresQueryBuilder, Query, SimpleExpr};
use sea_query::{Alias, Expr, Func, Iden, Order, PostgresQueryBuilder, Query, SimpleExpr};
use sea_query_binder::SqlxBinder;
use sqlx::{postgres::PgRow, Row};

Expand Down Expand Up @@ -181,7 +181,12 @@ impl EntryRepository {
USER_TABLE,
Expr::col((ENTRY_TABLE, EntryIden::User)).eq(Expr::col((USER_TABLE, UserIden::Id))),
)
.and_where(Expr::col((ENTRY_TABLE, EntryIden::Path)).like(format!("{}%", full_path))) // Everything that starts with the path
.and_where(
Func::cust(Alias::new("starts_with"))
.arg(Expr::col((ENTRY_TABLE, EntryIden::Path)))
.arg(&full_path)
.into(),
)
.and_where(Expr::col((USER_TABLE, UserIden::PublicKey)).eq(path.pubkey().z32()))
.limit(1)
.to_owned();
Expand Down Expand Up @@ -292,7 +297,12 @@ impl EntryRepository {
USER_TABLE,
Expr::col((ENTRY_TABLE, EntryIden::User)).eq(Expr::col((USER_TABLE, UserIden::Id))),
)
.and_where(Expr::col((ENTRY_TABLE, EntryIden::Path)).like(format!("{}%", dir_path))) // Everything that starts with the path
.and_where(
Func::cust(Alias::new("starts_with"))
.arg(Expr::col((ENTRY_TABLE, EntryIden::Path)))
.arg(&dir_path)
.into(),
)
.and_where(Expr::col((USER_TABLE, UserIden::PublicKey)).eq(path.pubkey().z32()))
.to_owned();

Expand Down Expand Up @@ -379,7 +389,12 @@ impl EntryRepository {
USER_TABLE,
Expr::col((ENTRY_TABLE, EntryIden::User)).eq(Expr::col((USER_TABLE, UserIden::Id))),
)
.and_where(Expr::col((ENTRY_TABLE, EntryIden::Path)).like(format!("{}%", full_path))) // Everything that starts with the path
.and_where(
Func::cust(Alias::new("starts_with"))
.arg(Expr::col((ENTRY_TABLE, EntryIden::Path)))
.arg(&full_path)
.into(),
)
.and_where(Expr::col((USER_TABLE, UserIden::PublicKey)).eq(path.pubkey().z32()))
.to_owned();

Expand Down Expand Up @@ -819,6 +834,19 @@ mod tests {
}
}
assert_eq!(set.len(), 6);

// Treat `_` literally so a lookalike sibling is not included.
create_entry_for_path(&db, user.id, "/test/myXfolder/secret.txt").await;
let entries = EntryRepository::list_shallow(
&EntryPath::new(user_pubkey, StoragePath::new("/test/my_folder/").unwrap()),
None,
None,
false,
&mut db.pool().into(),
)
.await
.unwrap();
assert!(entries.is_empty());
}

#[tokio::test]
Expand Down Expand Up @@ -1138,6 +1166,19 @@ mod tests {
}
}
assert_eq!(set.len(), 7);

// Treat `%` literally so a lookalike sibling is not included.
create_entry_for_path(&db, user.id, "/test/myANYfolder/secret.txt").await;
let entries = EntryRepository::list_deep(
&EntryPath::new(user_pubkey, StoragePath::new("/test/my%folder/").unwrap()),
None,
None,
false,
&mut db.pool().into(),
)
.await
.unwrap();
assert!(entries.is_empty());
}

#[tokio::test]
Expand Down Expand Up @@ -1319,5 +1360,15 @@ mod tests {
.await
.unwrap();
assert!(!exists);

// Treat `_` literally so a lookalike sibling does not make the directory exist.
create_entry_for_path(&db, user.id, "/test/ghostX/secret.txt").await;
let exists = EntryRepository::contains_directory(
&EntryPath::new(user_pubkey, StoragePath::new("/test/ghost_/").unwrap()),
&mut db.pool().into(),
)
.await
.unwrap();
assert!(!exists);
}
}
Loading