Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CP-41348: Convert swtpm-wrapper to Python 3 #4860

Merged
merged 1 commit into from
Dec 1, 2022
Merged

CP-41348: Convert swtpm-wrapper to Python 3 #4860

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions ocaml/xenopsd/scripts/swtpm-wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python3
#
# Copyright (C) 2022 Citrix Systems R&D Ltd.
#
Expand All @@ -12,7 +12,6 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.

from __future__ import print_function
import os
import stat
import socket
Expand All @@ -24,7 +23,7 @@ import ctypes
import ctypes.util
import struct
from resource import getrlimit, RLIMIT_CORE, RLIMIT_FSIZE, setrlimit
from urlparse import urlparse
from urllib.parse import urlparse

CLONE_NEWNS = 0x00020000 # mount namespace
CLONE_NEWNET = 0x40000000 # network namespace
Expand Down Expand Up @@ -159,7 +158,7 @@ def main(argv):
tpm_args = []

swtpm_pid_full = os.path.join(tpm_dir, "swtpm-%d.pid" % domid)
open(swtpm_pid_full, 'wa').close()
open(swtpm_pid_full, 'wb').close()
os.chown(swtpm_pid_full, uid, uid)

if depriv:
Expand All @@ -172,7 +171,7 @@ def main(argv):

urandom = os.path.join(dev_dir, "urandom")
if not os.path.exists(urandom):
os.mknod(urandom, 0666 | stat.S_IFCHR, os.makedev(1, 9))
os.mknod(urandom, 0o666 | stat.S_IFCHR, os.makedev(1, 9))

if os.path.exists(os.path.join(tpm_dir, ".lock")):
os.chown(os.path.join(tpm_dir, ".lock"), uid, uid)
Expand Down Expand Up @@ -209,7 +208,9 @@ def main(argv):
"--pid", "file=%s" % swtpm_pid,
"-t"] + tpm_args

swtpm = subprocess.Popen(tpm_args,executable=tpm_exe, preexec_fn=prepare_exec(), env=tpm_env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
swtpm = subprocess.Popen(tpm_args,executable=tpm_exe, preexec_fn=prepare_exec(),
pass_fds=(sock.fileno(),), env=tpm_env,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
print("Exec: %s %s" % (tpm_exe, " ".join(tpm_args)))

sys.stdout.flush()
Expand Down