Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the secret does not have null bytes

Browse Source
This commit is contained in:
Kovid Goyal 2016-06-02 21:52:38 +05:30
parent e0e7adb6d5
commit 881fab7dd9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/win_file_dialogs.py
View File

@ -113,7 +113,7 @@ def run_file_dialog(
from calibre.gui2 import sanitize_env_vars from calibre.gui2 import sanitize_env_vars
with sanitize_env_vars(): with sanitize_env_vars():
env = os.environ.copy() env = os.environ.copy()
secret = os.urandom(32) secret = os.urandom(32).replace(b'\0', b' ')
pipename = '\\\\.\\pipe\\%s' % uuid4() pipename = '\\\\.\\pipe\\%s' % uuid4()
data = [serialize_string('PIPENAME', pipename), serialize_secret(secret)] data = [serialize_string('PIPENAME', pipename), serialize_secret(secret)]
parent = parent or None parent = parent or None
@ -306,7 +306,7 @@ class PipeServer(Thread):
def test(helper=HELPER): def test(helper=HELPER):
pipename = '\\\\.\\pipe\\%s' % uuid4() pipename = '\\\\.\\pipe\\%s' % uuid4()
echo = '\U0001f431 Hello world!' echo = '\U0001f431 Hello world!'
secret = os.urandom(32) secret = os.urandom(32).replace(b'\0', b' ')
data = serialize_string('PIPENAME', pipename) + serialize_string('ECHO', echo) + serialize_secret(secret) data = serialize_string('PIPENAME', pipename) + serialize_string('ECHO', echo) + serialize_secret(secret)
server = PipeServer(pipename) server = PipeServer(pipename)
p = subprocess.Popen([helper], stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen([helper], stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE)