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

Fix stdin test & rename it for prevention

Browse Source
This commit is contained in:
5bentz 2018-03-25 17:40:45 +02:00
parent cf2db9e005
commit 799507372c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/passff.py
View File

@ -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"]
@ -85,13 +85,13 @@ if __name__ == "__main__":
'stderr': subprocess.PIPE, 'stderr': subprocess.PIPE,
'env': env 'env': env
} }
if 'stdin' is not None: if std_input is not None:
proc_params['stdin'] = subprocess.PIPE 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.Popen(cmd, **proc_params)
if stdin is not None: if std_input is not None:
proc_in = bytes(stdin, charset) proc_in = bytes(std_input, charset)
proc_out, proc_err = proc.communicate(input=proc_in) proc_out, proc_err = proc.communicate(input=proc_in)
else: else:
proc_out, proc_err = proc.communicate() proc_out, proc_err = proc.communicate()