github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

webconfig: Use tempfile instead of ~/.cache (#6522)

Browse Source 
OpenBSD uses [unveil(2)](https://man.openbsd.org/unveil) in chromium and
firefox. This means that things outside of directories like ~/Downloads or /tmp are not visible to the
browsers.

Change webconfig so it uses tempfile.NamedTemporaryFile to create our temp file.
This commit is contained in:
Aaron Bieber 2020-01-23 11:52:26 -07:00 committed by Fabian Homborg
parent dbbe8a2da5
commit 903fe9de48
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
share/tools/web_config/webconfig.py
View File

@ -21,6 +21,7 @@ import socket
import string import string
import subprocess import subprocess
import sys import sys
import tempfile
from itertools import chain from itertools import chain
FISH_BIN_PATH = False # will be set later FISH_BIN_PATH = False # will be set later
@ -1477,32 +1478,14 @@ url = "http://localhost:%d/%s/%s" % (PORT, authkey, initial_tab)
# Create temporary file to hold redirect to real server. This prevents exposing # Create temporary file to hold redirect to real server. This prevents exposing
# the URL containing the authentication key on the command line (see # the URL containing the authentication key on the command line (see
# CVE-2014-2914 or https://github.com/fish-shell/fish-shell/issues/1438). # CVE-2014-2914 or https://github.com/fish-shell/fish-shell/issues/1438).
if "XDG_CACHE_HOME" in os.environ: f = tempfile.NamedTemporaryFile(prefix='web_config', suffix='.html', mode='w')
dirname = os.path.expanduser(os.path.expandvars("$XDG_CACHE_HOME/fish/"))
else:
dirname = os.path.expanduser("~/.cache/fish/")
os.umask(0o0077)
try:
os.makedirs(dirname, 0o0700)
except OSError as e:
if e.errno == 17:
pass
else:
raise e
randtoken = "".join(
random.choice(string.ascii_uppercase + string.digits) for _ in range(6)
)
filename = dirname + "web_config-%s.html" % randtoken
f = open(filename, "w")
f.write(redirect_template_html % (url, url)) f.write(redirect_template_html % (url, url))
f.close() f.flush()
# Open temporary file as URL # Open temporary file as URL
# Use open on macOS >= 10.12.5 to work around #4035. # Use open on macOS >= 10.12.5 to work around #4035.
fileurl = "file://" + filename fileurl = "file://" + f.name
esc = get_special_ansi_escapes() esc = get_special_ansi_escapes()
print( print(
@ -1536,4 +1519,4 @@ except KeyboardInterrupt:
print("\nShutting down.") print("\nShutting down.")
# Clean up temporary file # Clean up temporary file
os.remove(filename) f.close()