From 8e738262adf78f081473d32419c2fbc07811da4b Mon Sep 17 00:00:00 2001
From: danielfleischer <daniel.fleischer@amobee.com>
Date: Thu, 12 Nov 2020 15:00:48 +0200
Subject: [PATCH] utils/fs: checking files ownership in 'move' (#4348) (#4832)

utils/fs: checking files ownership in 'move' (#4348)
---
 dvc/exceptions.py |  5 +++++
 dvc/utils/fs.py   | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/dvc/exceptions.py b/dvc/exceptions.py
index 1a4a44f99d..7e6a5745e5 100644
--- a/dvc/exceptions.py
+++ b/dvc/exceptions.py
@@ -227,6 +227,11 @@ def __init__(self, path, hint=None):
         )
 
 
+class FileOwnershipError(DvcException):
+    def __init__(self, path):
+        super().__init__(f"file '{path}' not owned by user! ")
+
+
 class DvcIgnoreInCollectedDirError(DvcException):
     def __init__(self, ignore_dirname):
         super().__init__(
diff --git a/dvc/utils/fs.py b/dvc/utils/fs.py
index d80bce6ede..a5cdf1ca88 100644
--- a/dvc/utils/fs.py
+++ b/dvc/utils/fs.py
@@ -8,7 +8,7 @@
 import nanotime
 from shortuuid import uuid
 
-from dvc.exceptions import DvcException
+from dvc.exceptions import DvcException, FileOwnershipError
 from dvc.system import System
 from dvc.utils import dict_md5
 
@@ -95,15 +95,21 @@ def move(src, dst, mode=None):
     dst = os.path.abspath(dst)
     tmp = f"{dst}.{uuid()}"
 
+    try:
+        if mode is not None:
+            os.chmod(src, mode)
+    except OSError as e:
+        if e.errno not in [errno.EACCES, errno.EPERM]:
+            raise
+        else:
+            raise FileOwnershipError(src)
+
     if os.path.islink(src):
         shutil.copy(src, tmp)
-        os.unlink(src)
+        _unlink(src, _chmod)
     else:
         shutil.move(src, tmp)
 
-    if mode is not None:
-        os.chmod(tmp, mode)
-
     shutil.move(tmp, dst)