Merge pull request #794 from erkin/current

T3354: Handle user break and prematurely closed stdin in strip-private

2 files changed, 14 insertions, 14 deletions

diff --git a/python/vyos/remote.py b/python/vyos/remote.py
index ad9706a82..18e772cc8 100644
--- a/python/vyos/remote.py
+++ b/python/vyos/remote.py
@@ -57,11 +57,11 @@ def download_sftp(local_path, hostname, remote_path,\
 
 def upload_tftp(local_path, hostname, remote_path, port=69):
     with open(local_path, 'rb') as file:
-        cmd(f'curl -s -T - tftp://{hostname}:{port}/{remote_path}', stderr=None, input=file.read())
+        cmd(f'curl -s -T - tftp://{hostname}:{port}/{remote_path}', stderr=None, input=file.read()).encode()
 
 def download_tftp(local_path, hostname, remote_path, port=69):
     with open(local_path, 'wb') as file:
-        file.write(cmd(f'curl -s tftp://{hostname}:{port}/{remote_path}', stderr=None))
+        file.write(cmd(f'curl -s tftp://{hostname}:{port}/{remote_path}', stderr=None).encode())
 
 def download_http(urlstring, local_path):
     with open(local_path, 'wb') as file:
@@ -79,10 +79,6 @@ def download(local_path, urlstring):
         username = url.username if url.username else 'anonymous'
         download_ftp(local_path, url.hostname, url.path, username, url.password)
     elif url.scheme == 'sftp' or url.scheme == 'scp':
-        # None means we don't want to use password authentication.
-        # An empty string (what urlparse returns when a password doesn't
-        # exist in the URL) means the password is an empty string.
-        password = url.password if url.password else None
         download_sftp(local_path, url.hostname, url.path, url.username, password)
     elif url.scheme == 'tftp':
         download_tftp(local_path, url.hostname, url.path)
@@ -98,7 +94,6 @@ def upload(local_path, urlstring):
         username = url.username if url.username else 'anonymous'
         upload_ftp(local_path, url.hostname, url.path, username, url.password)
     elif url.scheme == 'sftp' or url.scheme == 'scp':
-        password = url.password if url.password else None
         upload_sftp(local_path, url.hostname, url.path, url.username, password)
     elif url.scheme == 'tftp':
         upload_tftp(local_path, url.hostname, url.path)
diff --git a/src/helpers/strip-private.py b/src/helpers/strip-private.py
index 023298eec..420a039eb 100755
--- a/src/helpers/strip-private.py
+++ b/src/helpers/strip-private.py
@@ -79,13 +79,18 @@ def strip_lines(rules: tuple) -> None:
     """
     Read stdin line by line and apply the given stripping rules.
     """
-    for line in sys.stdin:
-        if not args.keep_address:
-            line = strip_address(line)
-        for (condition, regexp, subst) in rules:
-            if condition:
-                line = regexp.sub(subst, line)
-        print(line, end='')
+    try:
+        for line in sys.stdin:
+            if not args.keep_address:
+                line = strip_address(line)
+            for (condition, regexp, subst) in rules:
+                if condition:
+                    line = regexp.sub(subst, line)
+            print(line, end='')
+    # stdin can be cut for any reason, such as user interrupt or the pager terminating before the text can be read.
+    # All we can do is gracefully exit.
+    except (BrokenPipeError, EOFError, KeyboardInterrupt):
+        sys.exit(1)
 
 if __name__ == "__main__":
     args = parser.parse_args()