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

Resolve File download fails if the file is marked as malware in OneDrive (Issue #153) (#155)

Browse source 
* Gracefully handle the situation where OneDrive has marked a file as malware and will not provide the file for download
This commit is contained in:
abraunegg 2018-09-13 08:41:46 +10:00 committed by GitHub
parent 4dfdd18d09
commit 4919a58246
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/onedrive.d
View file

@ -206,13 +206,13 @@ final class OneDriveApi
// Return the requested details of the specified id
// https://docs.microsoft.com/en-us/onedrive/developer/rest-api/api/driveitem_get
JSONValue getFileSize(const(char)[] driveId, const(char)[] id)
JSONValue getFileDetails(const(char)[] driveId, const(char)[] id)
{
checkAccessTokenExpired();
const(char)[] url;
// string driveByIdUrl = "https://graph.microsoft.com/v1.0/drives/";
url = driveByIdUrl ~ driveId ~ "/items/" ~ id;
url ~= "?select=size";
url ~= "?select=size,malware";
return get(url);
}

39
src/sync.d
View file

@ -45,6 +45,11 @@ private bool changeHasParentReferenceId(const ref JSONValue item)
return ("id" in item["parentReference"]) != null;
}
private bool isMalware(const ref JSONValue item)
{
return ("malware" in item) != null;
}
// construct an Item struct from a JSON driveItem
private Item makeItem(const ref JSONValue driveItem)
{
@ -147,6 +152,8 @@ final class SyncEngine
private string accountType;
// free space remaining at init()
private long remainingFreeSpace;
// is file malware flag
private bool malwareDetected = false;
this(Config cfg, OneDriveApi onedrive, ItemDatabase itemdb, SelectiveSync selectiveSync)
{
@ -488,6 +495,9 @@ final class SyncEngine
{
Item item = makeItem(driveItem);
// Reset the malwareDetected flag for this item
malwareDetected = false;
if (isItemRoot(driveItem) || !item.parentId || isRoot) {
item.parentId = null; // ensures that it has no parent
item.driveId = driveId; // HACK: makeItem() cannot set the driveId property of the root
@ -574,11 +584,14 @@ final class SyncEngine
applyNewItem(item, path);
}
// save the item in the db
if (cached) {
itemdb.update(item);
} else {
itemdb.insert(item);
if (malwareDetected == false){
// save the item in the db
// if the file was detected as malware and NOT downloaded, we dont want to falsify the DB as downloading it as otherwise the next pass will think it was deleted, thus delete the remote item
if (cached) {
itemdb.update(item);
} else {
itemdb.insert(item);
}
}
}
@ -649,8 +662,20 @@ final class SyncEngine
{
assert(item.type == ItemType.file);
write("Downloading file ", path, " ... ");
JSONValue fileSizeDetails = onedrive.getFileSize(item.driveId, item.id);
auto fileSize = fileSizeDetails["size"].integer;
JSONValue fileDetails = onedrive.getFileDetails(item.driveId, item.id);
// Issue #153 Debugging
//log.log("File Details: ", fileDetails);
if (isMalware(fileDetails)){
// OneDrive reports that this file is malware
log.error("ERROR: MALWARE DETECTED IN FILE - DOWNLOAD SKIPPED");
// set global flag
malwareDetected = true;
return;
}
auto fileSize = fileDetails["size"].integer;
try {
onedrive.downloadById(item.driveId, item.id, path, fileSize);
} catch (OneDriveException e) {