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

Fix: Error when trying to upload a file with weird non printable characters present (Issue #35) (#41)

Browse source 
* Implement an invalid whitespace filename check which currently checks for a 'new line' whitespace entry in a filename. Regex can be expanded if other files with similar characteristics are found.
This commit is contained in:
abraunegg 2018-07-02 19:40:54 +10:00 committed by GitHub
parent 871b3d72c4
commit 5e48ba96ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/sync.d
View file

@ -743,7 +743,13 @@ final class SyncEngine
log.vlog("Skipping item - invalid name (Microsoft Naming Convention): ", path);
return;
}
// Check for bad whitespace items
if (!containsBadWhiteSpace(path)) {
log.vlog("Skipping item - invalid name (Contains an invalid whitespace item): ", path);
return;
}
final switch (item.type) {
case ItemType.dir:
uploadDirDifferences(item, path);
@ -885,6 +891,12 @@ final class SyncEngine
log.vlog("Skipping item - invalid name (Microsoft Naming Convention): ", path);
return;
}
// Check for bad whitespace items
if (!containsBadWhiteSpace(path)) {
log.vlog("Skipping item - invalid name (Contains an invalid whitespace item): ", path);
return;
}
// filter out user configured items to skip
if (path != ".") {

30
src/util.d
View file

@ -10,6 +10,7 @@ import std.socket;
import std.stdio;
import std.string;
import std.algorithm;
import std.uri;
import qxor;
private string deviceName;
@ -170,6 +171,35 @@ bool isValidName(string path)
return matched;
}
bool containsBadWhiteSpace(string path)
{
// allow root item
if (path == ".") {
return true;
}
// https://github.com/abraunegg/onedrive/issues/35
// Issue #35 presented an interesting issue where the filename contained a newline item
// 'State-of-the-art, challenges, and open issues in the integration of Internet of'$'\n''Things and Cloud Computing.pdf'
// When the check to see if this file was present the GET request queries as follows:
// /v1.0/me/drive/root:/.%2FState-of-the-art%2C%20challenges%2C%20and%20open%20issues%20in%20the%20integration%20of%20Internet%20of%0AThings%20and%20Cloud%20Computing.pdf
// The '$'\n'' is translated to %0A which causes the OneDrive query to fail
// Check for the presence of '%0A' via regex
string itemName = encodeComponent(baseName(path));
auto invalidWhitespaceReg =
ctRegex!(
// Check for \n which is %0A when encoded
`%0A`
);
auto m = match(itemName, invalidWhitespaceReg);
return m.empty;
}
unittest
{
assert(multiGlobMatch(".hidden", ".*"));