nostr/nostr-rs-relay
1
0
Fork 0
mirror of https://github.com/scsibug/nostr-rs-relay.git synced 2024-05-19 21:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: postgresql tag filtering for odd-length hex-looking values

Browse Source 
The tag filtering code misses odd-length strings that contains only hex digits [0-9a-f].
This fix makes the condition for `has_plain_values` the inverse of the condition for `has_hex_values`.

Fixes #191
This commit is contained in:
Laszlo Megyer 2024-03-30 21:22:37 +00:00 committed by Greg Heartsfield
parent 39a3a258a0
commit b04ab76e73
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/repo/postgres.rs
View File

@ -812,13 +812,13 @@ fn query_from_filter(f: &ReqFilter) -> Option<QueryBuilder<Postgres>> {
.push_bind(key.to_string()) .push_bind(key.to_string())
.push(" AND ("); .push(" AND (");
let has_plain_values = val.iter().any(|v| !is_lower_hex(v)); let has_plain_values = val.iter().any(|v| (v.len() % 2 != 0 || !is_lower_hex(v)));
let has_hex_values = val.iter().any(|v| v.len() % 2 == 0 && is_lower_hex(v)); let has_hex_values = val.iter().any(|v| v.len() % 2 == 0 && is_lower_hex(v));
if has_plain_values { if has_plain_values {
query.push("value in ("); query.push("value in (");
// plain value match first // plain value match first
let mut tag_query = query.separated(", "); let mut tag_query = query.separated(", ");
for v in val.iter().filter(|v| !is_lower_hex(v)) { for v in val.iter().filter(|v| v.len() % 2 != 0 || !is_lower_hex(v)) {
tag_query.push_bind(v.as_bytes()); tag_query.push_bind(v.as_bytes());
} }
} }