mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 09:02:15 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

sfx: support ubuntu and openrc:

Browse source 
-- ubuntu does not let root follow symlinks created by other users
-- openrc expects copyparty to die if you kill the sfx parent
This commit is contained in:
ed 2020-08-23 22:32:44 +00:00
parent 82e568d4c9
commit f550a8171d
1 changed files with 39 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
scripts/sfx.py
View file

@ -2,7 +2,7 @@
# coding: utf-8 # coding: utf-8
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
import re, os, sys, stat, time, shutil, tarfile, hashlib, platform, tempfile import re, os, sys, time, shutil, signal, tarfile, hashlib, platform, tempfile
import subprocess as sp import subprocess as sp
""" """
@ -29,6 +29,7 @@ STAMP = None
PY2 = sys.version_info[0] == 2 PY2 = sys.version_info[0] == 2
sys.dont_write_bytecode = True sys.dont_write_bytecode = True
me = os.path.abspath(os.path.realpath(__file__)) me = os.path.abspath(os.path.realpath(__file__))
cpp = None
def eprint(*args, **kwargs): def eprint(*args, **kwargs):
@ -305,17 +306,19 @@ def hashfile(fn):
def unpack(): def unpack():
"""unpacks the tar yielded by `data`""" """unpacks the tar yielded by `data`"""
name = "pe-copyparty" name = "pe-copyparty"
tag = "v" + str(STAMP)
withpid = "{}.{}".format(name, os.getpid()) withpid = "{}.{}".format(name, os.getpid())
top = tempfile.gettempdir() top = tempfile.gettempdir()
final = os.path.join(top, name) final = os.path.join(top, name)
mine = os.path.join(top, withpid) mine = os.path.join(top, withpid)
tar = os.path.join(mine, "tar") tar = os.path.join(mine, "tar")
tag_mine = os.path.join(mine, "v" + str(STAMP))
tag_final = os.path.join(final, "v" + str(STAMP))
if os.path.exists(tag_final): try:
msg("found early") if tag in os.listdir(final):
return final msg("found early")
return final
except:
pass
nwrite = 0 nwrite = 0
os.mkdir(mine) os.mkdir(mine)
@ -338,12 +341,15 @@ def unpack():
os.remove(tar) os.remove(tar)
with open(tag_mine, "wb") as f: with open(os.path.join(mine, tag), "wb") as f:
f.write(b"h\n") f.write(b"h\n")
if os.path.exists(tag_final): try:
msg("found late") if tag in os.listdir(final):
return final msg("found late")
return final
except:
pass
try: try:
if os.path.islink(final): if os.path.islink(final):
@ -428,10 +434,15 @@ def get_payload():
def confirm(): def confirm():
msg() msg()
msg("*** hit enter to exit ***") msg("*** hit enter to exit ***")
raw_input() if PY2 else input() try:
raw_input() if PY2 else input()
except:
pass
def run(tmp, py): def run(tmp, py):
global cpp
msg("OK") msg("OK")
msg("will use:", py) msg("will use:", py)
msg("bound to:", tmp) msg("bound to:", tmp)
@ -447,8 +458,11 @@ def run(tmp, py):
pass pass
fp_py = os.path.join(tmp, "py") fp_py = os.path.join(tmp, "py")
with open(fp_py, "wb") as f: try:
f.write(py.encode("utf-8") + b"\n") with open(fp_py, "wb") as f:
f.write(py.encode("utf-8") + b"\n")
except:
pass
# avoid loading ./copyparty.py # avoid loading ./copyparty.py
cmd = [ cmd = [
@ -460,16 +474,21 @@ def run(tmp, py):
] + list(sys.argv[1:]) ] + list(sys.argv[1:])
msg("\n", cmd, "\n") msg("\n", cmd, "\n")
p = sp.Popen(str(x) for x in cmd) cpp = sp.Popen(str(x) for x in cmd)
try: try:
p.wait() cpp.wait()
except: except:
p.wait() cpp.wait()
if p.returncode != 0: if cpp.returncode != 0:
confirm() confirm()
sys.exit(p.returncode) sys.exit(cpp.returncode)
def bye(sig, frame):
if cpp is not None:
cpp.terminate()
def main(): def main():
@ -504,6 +523,8 @@ def main():
# skip 0 # skip 0
signal.signal(signal.SIGTERM, bye)
tmp = unpack() tmp = unpack()
fp_py = os.path.join(tmp, "py") fp_py = os.path.join(tmp, "py")
if os.path.exists(fp_py): if os.path.exists(fp_py):