Infrastructure/fedora-infrastructure
1
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Don't forget to take out spaces from the keyid.

Browse source
This commit is contained in:
Ricky Zhou (周家杰) 2008-03-04 19:16:23 -05:00
parent 9916019c9c
commit bd658239ac
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fas/fas/cla.py
View file

@ -99,13 +99,14 @@ class CLA(controllers.Controller):
data = StringIO.StringIO(signature.file.read()) data = StringIO.StringIO(signature.file.read())
plaintext = StringIO.StringIO() plaintext = StringIO.StringIO()
verified = False verified = False
ret = subprocess.call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid]) keyid = re.sub('\s', '', person.gpg_keyid)
ret = subprocess.call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', keyid])
if ret != 0: if ret != 0:
turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net")) turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
turbogears.redirect('/cla/view/sign') turbogears.redirect('/cla/view/sign')
return dict() return dict()
#try: #try:
# subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid]) # subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', keyid])
#except subprocess.CalledProcessError: #except subprocess.CalledProcessError:
# turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net")) # turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
# turbogears.redirect('/cla/view/sign') # turbogears.redirect('/cla/view/sign')
@ -121,7 +122,7 @@ class CLA(controllers.Controller):
if len(sigs): if len(sigs):
sig = sigs[0] sig = sigs[0]
# This might still assume a full fingerprint. # This might still assume a full fingerprint.
key = ctx.get_key(re.sub('\s', '', person.gpg_keyid)) key = ctx.get_key(keyid)
fpr = key.subkeys[0].fpr fpr = key.subkeys[0].fpr
if sig.fpr != fpr: if sig.fpr != fpr:
turbogears.flash(_("Your signature's fingerprint did not match the fingerprint registered in FAS.")) turbogears.flash(_("Your signature's fingerprint did not match the fingerprint registered in FAS."))

7
fas/fas/user.py
View file

@ -384,13 +384,14 @@ Please go to https://admin.fedoraproject.org/fas/ to change it.
# CLA one), think of how to make sure this doesn't get # CLA one), think of how to make sure this doesn't get
# full of random keys (keep a clean Fedora keyring) # full of random keys (keep a clean Fedora keyring)
# TODO: MIME stuff? # TODO: MIME stuff?
ret = subprocess.call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid]) keyid = re.sub('\s', '', person.gpg_keyid)
ret = subprocess.call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', keyid])
if ret != 0: if ret != 0:
turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net")) turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
turbogears.redirect('/cla/view/sign') turbogears.redirect('/cla/view/sign')
return dict() return dict()
#try: #try:
# subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid]) # subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', keyid])
#except subprocess.CalledProcessError: #except subprocess.CalledProcessError:
# turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net")) # turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
else: else:
@ -401,7 +402,7 @@ Please go to https://admin.fedoraproject.org/fas/ to change it.
ctx.armor = True ctx.armor = True
signer = ctx.get_key(re.sub('\s', '', config.get('gpg_fingerprint'))) signer = ctx.get_key(re.sub('\s', '', config.get('gpg_fingerprint')))
ctx.signers = [signer] ctx.signers = [signer]
recipient = ctx.get_key(re.sub('\s', '', person.gpg_keyid)) recipient = ctx.get_key(keyid)
def passphrase_cb(uid_hint, passphrase_info, prev_was_bad, fd): def passphrase_cb(uid_hint, passphrase_info, prev_was_bad, fd):
os.write(fd, '%s\n' % config.get('gpg_passphrase')) os.write(fd, '%s\n' % config.get('gpg_passphrase'))
ctx.passphrase_cb = passphrase_cb ctx.passphrase_cb = passphrase_cb