gaschz/passff-host
1
0
Fork 0
mirror of https://codeberg.org/gaschz/passff-host.git synced 2025-06-06 18:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from 5bentz/fix_stdin_test

Browse Source 
Fix stdin test
This commit is contained in:
Thomas Vogt 2018-03-25 21:54:38 +02:00 committed by GitHub
commit 7821b0bd51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/passff.py
View File

@ -13,15 +13,15 @@ VERSION = "_VERSIONHOLDER_"
######################## Begin preferences section ############################# ######################## Begin preferences section #############################
################################################################################ ################################################################################
# Default command for MacOS: # Default command for MacOS:
#command = "/usr/local/bin/pass" #COMMAND = "/usr/local/bin/pass"
command = "/usr/bin/pass" COMMAND = "/usr/bin/pass"
commandArgs = [] COMMAND_ARGS = []
commandEnv = { COMMAND_ENV = {
"TREE_CHARSET": "ISO-8859-1", "TREE_CHARSET": "ISO-8859-1",
# Default PATH for MacOS: # Default PATH for MacOS:
#"PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin", #"PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
} }
charset = "UTF-8" CHARSET = "UTF-8"
################################################################################ ################################################################################
######################### End preferences section ############################## ######################### End preferences section ##############################
################################################################################ ################################################################################
@ -52,14 +52,14 @@ if __name__ == "__main__":
receivedMessage = getMessage() receivedMessage = getMessage()
opt_args = [] opt_args = []
pos_args = [] pos_args = []
stdin = None std_input = None
if len(receivedMessage) == 0: if len(receivedMessage) == 0:
pass pass
elif receivedMessage[0] == "insert": elif receivedMessage[0] == "insert":
opt_args = ["insert", "-m"] opt_args = ["insert", "-m"]
pos_args = [receivedMessage[1]] pos_args = [receivedMessage[1]]
stdin = receivedMessage[2] std_input = receivedMessage[2]
elif receivedMessage[0] == "generate": elif receivedMessage[0] == "generate":
pos_args = [receivedMessage[1], receivedMessage[2]] pos_args = [receivedMessage[1], receivedMessage[2]]
opt_args = ["generate"] opt_args = ["generate"]
@ -69,37 +69,31 @@ if __name__ == "__main__":
key = receivedMessage[0] key = receivedMessage[0]
key = "/" + (key[1:] if key[0] == "/" else key) key = "/" + (key[1:] if key[0] == "/" else key)
pos_args = [key] pos_args = [key]
opt_args += commandArgs opt_args += COMMAND_ARGS
# Set up (modified) command environment # Set up (modified) command environment
env = dict(os.environ) env = dict(os.environ)
if "HOME" not in env: if "HOME" not in env:
env["HOME"] = os.path.expanduser('~') env["HOME"] = os.path.expanduser('~')
for key, val in commandEnv.items(): for key, val in COMMAND_ENV.items():
env[key] = val env[key] = val
# Set up subprocess params # Set up subprocess params
cmd = [command] + opt_args + ['--'] + pos_args cmd = [COMMAND] + opt_args + ['--'] + pos_args
proc_params = { proc_params = {
'input': bytes(std_input, CHARSET) if std_input else None,
'stdout': subprocess.PIPE, 'stdout': subprocess.PIPE,
'stderr': subprocess.PIPE, 'stderr': subprocess.PIPE,
'env': env 'env': env
} }
if 'stdin' is not None:
proc_params['stdin'] = subprocess.PIPE
# Run and communicate with pass script # Run and communicate with pass script
proc = subprocess.Popen(cmd, **proc_params) proc = subprocess.run(cmd, **proc_params)
if stdin is not None:
proc_in = bytes(stdin, charset)
proc_out, proc_err = proc.communicate(input=proc_in)
else:
proc_out, proc_err = proc.communicate()
# Send response # Send response
sendMessage(encodeMessage({ sendMessage(encodeMessage({
"exitCode": proc.returncode, "exitCode": proc.returncode,
"stdout": proc_out.decode(charset), "stdout": proc.stdout.decode(CHARSET),
"stderr": proc_err.decode(charset), "stderr": proc.stderr.decode(CHARSET),
"version": VERSION "version": VERSION
})) }))