Add error handling for upload, fix permissions for upload and fix upload for windows

Author: NeffIsBack

nxc/protocols/nfs.py

@@ -1,6 +1,6 @@
 from nxc.connection import connection
 from nxc.logger import NXCAdapter
-from pyNfsClient import Portmap, Mount, NFSv3, NFS_PROGRAM, NFS_V3, ACCESS3_READ, ACCESS3_MODIFY, ACCESS3_EXECUTE
+from pyNfsClient import Portmap, Mount, NFSv3, NFS_PROGRAM, NFS_V3, ACCESS3_READ, ACCESS3_MODIFY, ACCESS3_EXECUTE, NFSSTAT3
 import re
 import uuid
 import math
@@ -323,19 +323,17 @@ def put_file(self):
 
                 # Create file
                 self.logger.display(f"Trying to create {remote_file_path}{file_name}")
-                self.nfs3.create(dir_handle, file_name, 1, auth=self.auth)
-                self.logger.success(f"{file_name} successfully created.")
+                res = self.nfs3.create(dir_handle, file_name, create_mode=1, mode=0o777, auth=self.auth)
+                if res["status"] != 0:
+                    raise Exception(NFSSTAT3[res["status"]])
+                else:
+                    file_handle = res["resok"]["obj"]["handle"]["data"]
+                self.logger.success(f"{file_name} successfully created")
             except Exception as e:
-                self.logger.fail(f"{file_name} was not created.")
-                self.logger.debug(f"Error while creating remote file: {e}")
-                exit(-1)
+                self.logger.fail(f"{file_name} was not created: {e}")
+                return
 
             try:
-                # Mount the NFS share to write the file
-                mnt_info = self.mount.mnt(remote_file_path + "/" + file_name, self.auth)
-                file_handle = mnt_info["mountinfo"]["fhandle"]
-                attrs = self.nfs3.getattr(file_handle, auth=self.auth)
-                self.auth["uid"] = attrs["attributes"]["uid"]
                 with open(local_file_path, "rb") as file:
                     file_data = file.read().decode()
 
@@ -344,9 +342,7 @@ def put_file(self):
                 self.nfs3.write(file_handle, 0, len(file_data), file_data, 1, auth=self.auth)
                 self.logger.success(f"Data from {local_file_path} successfully written to {remote_file_path}")
             except Exception as e:
-                self.logger.fail(f"{local_file_path} was not writed.")
-                self.logger.debug(f"Error while creating remote file: {e}")
-                exit(-1)
+                self.logger.fail(f"Could not write to {local_file_path}: {e}")
 
             # Unmount the share
             self.mount.umnt(self.auth)

nxc/protocols/nfs/proto_args.py

@@ -7,6 +7,6 @@ def proto_args(parser, parents):
     dgroup.add_argument("--shares", action="store_true", help="List NFS shares")
     dgroup.add_argument("--enum-shares", nargs="?", type=int, const=3, help="Authenticate and enumerate exposed shares recursively (default depth: %(const)s)")
     dgroup.add_argument("--get-file", nargs=2, metavar="FILE", help="Download remote NFS file.\n--get-file remote_file local_file")
-    dgroup.add_argument("--put-file", nargs=2, metavar="FILE", help="Upload remote NFS file.\n--put-file local_file remote_file")
+    dgroup.add_argument("--put-file", nargs=2, metavar="FILE", help="Upload remote NFS file with chmod 777 permissions.\n--put-file local_file remote_file")
 
     return parser