From 650560bd754eeed8677680f669bf1b0bbf8307ae Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Dec 19 2016 16:43:24 +0000 Subject: Merge #6566 `Make signunsigned use krb` --- diff --git a/scripts/sigulsign_unsigned.py b/scripts/sigulsign_unsigned.py index 05c75c5..ccc9c46 100755 --- a/scripts/sigulsign_unsigned.py +++ b/scripts/sigulsign_unsigned.py @@ -28,10 +28,6 @@ errors = {} status = 0 rpmdict = {} unsigned = [] -# Should probably set these from a koji config file -SERVERCA = os.path.expanduser('~/.fedora-server-ca.cert') -CLIENTCA = os.path.expanduser('~/.fedora-upload-ca.cert') -CLIENTCERT = os.path.expanduser('~/.fedora.cert') # Setup a dict of our key names as sigul knows them to the actual key ID # that koji would use. This information can also be obtained using # SigulHelper() instances @@ -184,16 +180,15 @@ class KojiHelper(object): def __init__(self, arch=None): if arch: self.kojihub = \ - 'http://{arch}.koji.fedoraproject.org/kojihub'.format( + 'https://{arch}.koji.fedoraproject.org/kojihub'.format( arch=arch) else: self.kojihub = 'https://koji.fedoraproject.org/kojihub' self.serverca = os.path.expanduser('~/.fedora-server-ca.cert') self.clientca = os.path.expanduser('~/.fedora-upload-ca.cert') self.clientcert = os.path.expanduser('~/.fedora.cert') - self.kojisession = koji.ClientSession(self.kojihub) - self.kojisession.ssl_login(self.clientcert, self.clientca, - self.serverca) + self.kojisession = koji.ClientSession(self.kojihub, {'krb_rdns': False}) + self.kojisession.krb_login() def listTagged(self, tag, inherit=False): """ Return list of SRPM NVRs for a tag