From 799507372c03c6b677d6827ed22c8f52030a64db Mon Sep 17 00:00:00 2001
From: 5bentz <github>
Date: Sun, 25 Mar 2018 17:40:45 +0200
Subject: [PATCH 1/3] Fix stdin test & rename it for prevention

---
 src/passff.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/passff.py b/src/passff.py
index 1760707..58f96c6 100755
--- a/src/passff.py
+++ b/src/passff.py
@@ -52,14 +52,14 @@ if __name__ == "__main__":
     receivedMessage = getMessage()
     opt_args = []
     pos_args = []
-    stdin = None
+    std_input = None
 
     if len(receivedMessage) == 0:
         pass
     elif receivedMessage[0] == "insert":
         opt_args = ["insert", "-m"]
         pos_args = [receivedMessage[1]]
-        stdin = receivedMessage[2]
+        std_input = receivedMessage[2]
     elif receivedMessage[0] == "generate":
         pos_args = [receivedMessage[1], receivedMessage[2]]
         opt_args = ["generate"]
@@ -85,13 +85,13 @@ if __name__ == "__main__":
         'stderr': subprocess.PIPE,
         'env': env
     }
-    if 'stdin' is not None:
+    if std_input is not None:
       proc_params['stdin'] = subprocess.PIPE
 
     # Run and communicate with pass script
     proc = subprocess.Popen(cmd, **proc_params)
-    if stdin is not None:
-      proc_in = bytes(stdin, charset)
+    if std_input is not None:
+      proc_in = bytes(std_input, charset)
       proc_out, proc_err = proc.communicate(input=proc_in)
     else:
       proc_out, proc_err = proc.communicate()

From ac4b33830ae8b3e0cc95236a1caad197ce1f74f8 Mon Sep 17 00:00:00 2001
From: 5bentz <github>
Date: Sun, 25 Mar 2018 17:49:14 +0200
Subject: [PATCH 2/3] Rewrite subprocess run (Python >= 3.5)

---
 src/passff.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/passff.py b/src/passff.py
index 58f96c6..ec9549b 100755
--- a/src/passff.py
+++ b/src/passff.py
@@ -81,25 +81,19 @@ if __name__ == "__main__":
     # Set up subprocess params
     cmd = [command] + opt_args + ['--'] + pos_args
     proc_params = {
+        'input': bytes(std_input, charset) if std_input else None,
         'stdout': subprocess.PIPE,
         'stderr': subprocess.PIPE,
         'env': env
     }
-    if std_input is not None:
-      proc_params['stdin'] = subprocess.PIPE
 
     # Run and communicate with pass script
-    proc = subprocess.Popen(cmd, **proc_params)
-    if std_input is not None:
-      proc_in = bytes(std_input, charset)
-      proc_out, proc_err = proc.communicate(input=proc_in)
-    else:
-      proc_out, proc_err = proc.communicate()
+    proc = subprocess.run(cmd, **proc_params)
 
     # Send response
     sendMessage(encodeMessage({
         "exitCode": proc.returncode,
-        "stdout": proc_out.decode(charset),
-        "stderr": proc_err.decode(charset),
+        "stdout": proc.stdout.decode(charset),
+        "stderr": proc.stderr.decode(charset),
         "version": VERSION
     }))

From b3ce9e77dda81df4227800ab1e7b3934abae703a Mon Sep 17 00:00:00 2001
From: 5bentz <github>
Date: Sun, 25 Mar 2018 18:01:46 +0200
Subject: [PATCH 3/3] Pref vars to uppercase (Pythonic constants)

---
 src/passff.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/passff.py b/src/passff.py
index ec9549b..3cd2ca1 100755
--- a/src/passff.py
+++ b/src/passff.py
@@ -13,15 +13,15 @@ VERSION = "_VERSIONHOLDER_"
 ######################## Begin preferences section #############################
 ################################################################################
 # Default command for MacOS:
-#command = "/usr/local/bin/pass"
-command     = "/usr/bin/pass"
-commandArgs = []
-commandEnv  = {
+#COMMAND = "/usr/local/bin/pass"
+COMMAND      = "/usr/bin/pass"
+COMMAND_ARGS = []
+COMMAND_ENV  = {
     "TREE_CHARSET": "ISO-8859-1",
     # Default PATH for MacOS:
     #"PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
 }
-charset     = "UTF-8"
+CHARSET      = "UTF-8"
 ################################################################################
 ######################### End preferences section ##############################
 ################################################################################
@@ -69,19 +69,19 @@ if __name__ == "__main__":
         key = receivedMessage[0]
         key = "/" + (key[1:] if key[0] == "/" else key)
         pos_args = [key]
-    opt_args += commandArgs
+    opt_args += COMMAND_ARGS
 
     # Set up (modified) command environment
     env = dict(os.environ)
     if "HOME" not in env:
         env["HOME"] = os.path.expanduser('~')
-    for key, val in commandEnv.items():
+    for key, val in COMMAND_ENV.items():
         env[key] = val
 
     # Set up subprocess params
-    cmd = [command] + opt_args + ['--'] + pos_args
+    cmd = [COMMAND] + opt_args + ['--'] + pos_args
     proc_params = {
-        'input': bytes(std_input, charset) if std_input else None,
+        'input': bytes(std_input, CHARSET) if std_input else None,
         'stdout': subprocess.PIPE,
         'stderr': subprocess.PIPE,
         'env': env
@@ -93,7 +93,7 @@ if __name__ == "__main__":
     # Send response
     sendMessage(encodeMessage({
         "exitCode": proc.returncode,
-        "stdout": proc.stdout.decode(charset),
-        "stderr": proc.stderr.decode(charset),
+        "stdout": proc.stdout.decode(CHARSET),
+        "stderr": proc.stderr.decode(CHARSET),
         "version": VERSION
     }))