deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-05-10 09:46:40 +02:00
Code Issues Projects Releases Wiki Activity

Use correct path offset for sync_list exclusion matching (#1269)

Browse source 
* When processing sync_list entries, by default, if the path starts with '/', and offset of 1 is used to ensure correct path matching can be done. However, if the path starts with '!/' or '-/' to exclude a certain path, an offset of 1 was still being used, thus, exclusion matching was not occurring correctly. Use the correct offset, based on the 'sync_list' entry.
This commit is contained in:
abraunegg 2021-02-14 06:43:55 +11:00 committed by GitHub
parent 3ea16b619f
commit cd7b7b0b68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/selective.d
View file

@ -230,17 +230,31 @@ private bool isPathExcluded(string path, string[] allowedPaths)
// is this an inclusion path or finer grained exclusion?
switch (allowedPath[0]) {
case '-':
// allowed path starts with '-', this user wants to exclude this path
// sync_list path starts with '-', this user wants to exclude this path
exclude = true;
offset = 1;
// If the sync_list entry starts with '-/' offset needs to be 2, else 1
if (startsWith(allowedPath, "-/")){
// Offset needs to be 2
offset = 2;
} else {
// Offset needs to be 1
offset = 1;
}
break;
case '!':
// allowed path starts with '!', this user wants to exclude this path
// sync_list path starts with '!', this user wants to exclude this path
exclude = true;
offset = 1;
// If the sync_list entry starts with '!/' offset needs to be 2, else 1
if (startsWith(allowedPath, "!/")){
// Offset needs to be 2
offset = 2;
} else {
// Offset needs to be 1
offset = 1;
}
break;
case '/':
// allowed path starts with '/', this user wants to include this path
// sync_list path starts with '/', this user wants to include this path
// but a '/' at the start causes matching issues, so use the offset for comparison
exclude = false;
offset = 1;
@ -279,7 +293,7 @@ private bool isPathExcluded(string path, string[] allowedPaths)
log.vdebug("Evaluation against 'sync_list' result: parental path match");
finalResult = false;
} else {
log.vdebug("Evaluation against 'sync_list' result: parental path match but to be excluded");
log.vdebug("Evaluation against 'sync_list' result: parental path match but must be excluded");
finalResult = true;
}
}