JakeHillion/drgn
1
0
Fork 0
mirror of https://github.com/JakeHillion/drgn.git synced 2024-12-22 01:03:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

drgn.internal.sudohelper: pass privileged command as string instead of path

Browse Source 
At Meta, our Python executables are packaged in a way that doesn't leave
the original .py or .pyc files easily accessible or importable. This
makes the sudohelper fail with:

  can't open file '/proc/self/fd/3/drgn/internal/sudohelper.pyc': [Errno 2] No such file or directory

We can work around this by passing the helper command as a string
literal. It's ugly, but it works with our Meta package and with
traditional installations.

Signed-off-by: Omar Sandoval <osandov@osandov.com>
This commit is contained in:
Omar Sandoval 2024-07-19 11:54:22 -07:00
parent 7e8c5d7bb2
commit f8168da4e2
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drgn/internal/sudohelper.py
View File

@ -3,7 +3,6 @@
"""Helper for opening a file as root and transmitting it via unix socket"""
import array
import os
from pathlib import Path
import pickle
import socket
@ -12,6 +11,31 @@ import sys
import tempfile
from typing import Union
_OPEN_VIA_SUDO_COMMAND = r"""
import array
import os
import pickle
import socket
import sys
sockpath = sys.argv[1]
filename = sys.argv[2]
flags = int(sys.argv[3])
mode = int(sys.argv[4])
sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
sock.connect(sockpath)
try:
fd = os.open(filename, flags, mode)
fds = array.array("i", [fd])
sock.sendmsg(
[b"success"],
[(socket.SOL_SOCKET, socket.SCM_RIGHTS, fds)],
)
except Exception as e:
sock.sendmsg([pickle.dumps(e)])
"""
def open_via_sudo(
path: Union[Path, str],
@ -31,7 +55,8 @@ def open_via_sudo(
f"[sudo] password for %p to open {path}: ",
sys.executable,
"-B",
__file__,
"-c",
_OPEN_VIA_SUDO_COMMAND,
sockpath,
path,
str(flags),
@ -48,26 +73,3 @@ def open_via_sudo(
fds.frombytes(data)
return fds[0]
raise pickle.loads(msg)
def main() -> None:
sockpath = sys.argv[1]
filename = sys.argv[2]
flags = int(sys.argv[3])
mode = int(sys.argv[4])
sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
sock.connect(sockpath)
try:
fd = os.open(filename, flags, mode)
fds = array.array("i", [fd])
sock.sendmsg(
[b"success"],
[(socket.SOL_SOCKET, socket.SCM_RIGHTS, fds)],
)
except Exception as e:
sock.sendmsg([pickle.dumps(e)])
if __name__ == "__main__":
main()