X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=ticket.py;h=a52be173be217c32f74c5fd54d055ec50faf30dd;hp=8ba00d2f39a8472e3f775372cf38502dddf73437;hb=HEAD;hpb=191f762aee7f7412e3d3b3840de914b9326aa888 diff --git a/ticket.py b/ticket.py index 8ba00d2..a52be17 100644 --- a/ticket.py +++ b/ticket.py @@ -5,14 +5,20 @@ You must already have the key in the keyring. """ from subprocess import PIPE, Popen -from xmlrpclib import dumps, loads +from xmlrpc.client import dumps, loads -GPG = '/usr/bin/gpg' +# see also myplc/plc.d/gpg +import os.path +GPG = '/usr/bin/gpg1' if os.path.exists("/usr/bin/gpg1") else "/usr/bin/gpg" +def _popen_gpg(*args): + """Return a Popen object to GPG.""" + return Popen((GPG, '--batch', '--no-tty') + args, + stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True) def sign(data): """Return signed with the default GPG key.""" - msg = dumps((data,)) + msg = dumps((data,), methodresponse = True) p = _popen_gpg('--armor', '--sign', '--keyring', '/etc/planetlab/secring.gpg', '--no-default-keyring') p.stdin.write(msg) p.stdin.close() @@ -30,11 +36,8 @@ def verify(signed_msg): msg = p.stdout.read() p.stdout.close() p.stderr.close() - if p.wait(): return None # verification failed + if p.wait(): + return None # verification failed else: data, = loads(msg)[0] return data - -def _popen_gpg(*args): - """Return a Popen object to GPG.""" - return Popen((GPG, '--batch', '--no-tty') + args, stdin=PIPE, stdout=PIPE, stderr=PIPE)