deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2026-03-14 14:35:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix 'skip_dir' and 'skip_file' shadow detection for rooted 'sync_list' paths (#3578)

Browse source 
This change corrects shadow validation for 'sync_list' include rules when evaluating against both 'skip_dir' and 'skip_file'.

Previously, rooted 'sync_list' paths (those starting with /) were not consistently normalised before validation, allowing some non-viable configurations to pass undetected. This could result in 'sync_list' include rules being silently shadowed by 'skip_dir' or 'skip_file'.

The validation logic now normalises rooted 'sync_list' paths to match runtime filtering semantics, ensuring shadowed include rules are reliably detected and reported as configuration errors.

This brings 'skip_dir' and 'skip_file' shadow detection into parity with actual sync behaviour and prevents contradictory client-side filtering configurations.
This commit is contained in:
abraunegg 2025-12-23 11:51:22 +11:00 • committed by GitHub
commit 9a48603d9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 51 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/clientSideFiltering.d
View file

@ -905,9 +905,42 @@ class ClientSideFiltering {
if (rule.empty) continue;
if (rule[0] == '!' || rule[0] == '-') continue;
// Normalise the rule to match how skip_dir rules are evaluated at runtime.
// skip_dir entries are relative to sync_dir. sync_list entries may be rooted (start with '/').
string candidate = rule;
// Normalise leading "./" (defensive)
if (candidate.length >= 2 && candidate[0 .. 2] == "./") {
candidate = candidate[2 .. $];
}
// Normalise sync_list rooted includes: "/Documents" -> "Documents"
if (candidate.length >= 1 && candidate[0] == '/') {
// Remove only the first '/', sync_list rules are single-rooted relative to sync_dir
candidate = candidate[1 .. $];
}
if (candidate.empty) continue;
// Use the *actual* runtime skip_dir evaluation logic (strict/non-strict)
// so the check matches real behaviour.
if (isDirNameExcluded(rule)) {
bool shadowed = false;
// Test as-is
if (isDirNameExcluded(candidate)) {
shadowed = true;
} else {
// Also test with a trailing slash where appropriate, so:
// skip_dir = "Documents/" correctly shadows sync_list = "/Documents"
// (Users often represent a directory root either way.)
if (candidate[$ - 1] != '/') {
if (isDirNameExcluded(candidate ~ "/")) {
shadowed = true;
}
}
}
if (shadowed) {
shadowedRules ~= rule;
}
}
@ -949,8 +982,24 @@ class ClientSideFiltering {
// (Users commonly include folders; skip_file patterns like '*.tmp' should not invalidate that.)
if (rule.length > 1 && rule[$ - 1] == '/') continue;
// Normalise the rule to match how skip_file rules are evaluated at runtime.
// skip_file entries are relative to sync_dir. sync_list entries may be rooted (start with '/').
string candidate = rule;
// Normalise leading "./" (defensive)
if (candidate.length >= 2 && candidate[0 .. 2] == "./") {
candidate = candidate[2 .. $];
}
// Normalise sync_list rooted includes: "/Documents/file.txt" -> "Documents/file.txt"
if (candidate.length >= 1 && candidate[0] == '/') {
candidate = candidate[1 .. $];
}
if (candidate.empty) continue;
// Use the *actual* runtime skip_file evaluation logic so this check matches real behaviour.
if (isFileNameExcluded(rule)) {
if (isFileNameExcluded(candidate)) {
shadowedRules ~= rule;
}
}