[upload] Enable sos uploads of files bigger than 1Gb

Uploads of files greater than 1Gb switch to go to sftp. The
code incorrectly tried to write to the home directory in sftp,
but should switch into the /{user} directory instead so
proper permissions exist.

Related: RHEL-52919

Signed-off-by: David Wolstromer <dwolstro@redhat.com>

Author: dwolstroRH

sos/upload/targets/__init__.py

@@ -465,7 +465,7 @@ def get_upload_password(self):
                 self.upload_password or
                 self._upload_password)
 
-    def upload_sftp(self, user=None, password=None):
+    def upload_sftp(self, user=None, password=None, user_dir=None):
         """Attempts to upload the archive to an SFTP location.
 
         Due to the lack of well maintained, secure, and generally widespread
@@ -540,10 +540,13 @@ def upload_sftp(self, user=None, password=None):
             raise Exception("Unable to connect via SFTP to "
                             f"{self.get_upload_url_string()}")
 
-        put_cmd = (f'put {self.upload_archive_name} '
-                   f'{self._get_sftp_upload_name()}')
+        # certain implementations require file to be put in the user dir
+        put_cmd = (
+            f"put {self.upload_archive_name} "
+            f"{f'{user_dir}/' if user_dir else ''}"
+            f"{self._get_sftp_upload_name()}"
+        )
         ret.sendline(put_cmd)
-
         put_expects = [
             '100%',
             pexpect.TIMEOUT,

sos/upload/targets/redhat.py

@@ -145,7 +145,7 @@ def _get_sftp_upload_name(self):
         return fname
 
     # pylint: disable=too-many-branches
-    def upload_sftp(self, user=None, password=None):
+    def upload_sftp(self, user=None, password=None, user_dir=None):
         """Override the base upload_sftp to allow for setting an on-demand
         generated anonymous login for the RH SFTP server if a username and
         password are not given
@@ -217,7 +217,8 @@ def upload_sftp(self, user=None, password=None):
                     f"{anon.status_code}): {anon.json()}"
                 )
         if _user and _token:
-            return super().upload_sftp(user=_user, password=_token)
+            return super().upload_sftp(user=_user, password=_token,
+                                       user_dir=_user)
         raise Exception("Could not retrieve valid or anonymous credentials")
 
     def check_file_too_big(self, archive):