cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed max 8192 bytes, fixes #8424

Browse source
This commit is contained in:
Jonathan Mainguy 2014-08-04 20:55:49 -04:00
parent 10011b361b
commit e7cbbd8b73
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packaging/rpm_key
View file

@ -65,10 +65,6 @@ import os.path
import re import re
import tempfile import tempfile
# Attempt to download at most 8192 bytes.
# Should be more than enough for all keys
MAXBYTES = 8192
def is_pubkey(string): def is_pubkey(string):
"""Verifies if string is a pubkey""" """Verifies if string is a pubkey"""
pgp_regex = ".*?(-----BEGIN PGP PUBLIC KEY BLOCK-----.*?-----END PGP PUBLIC KEY BLOCK-----).*" pgp_regex = ".*?(-----BEGIN PGP PUBLIC KEY BLOCK-----.*?-----END PGP PUBLIC KEY BLOCK-----).*"
@ -118,11 +114,11 @@ class RpmKey:
module.exit_json(changed=False) module.exit_json(changed=False)
def fetch_key(self, url, maxbytes=MAXBYTES): def fetch_key(self, url):
"""Downloads a key from url, returns a valid path to a gpg key""" """Downloads a key from url, returns a valid path to a gpg key"""
try: try:
rsp, info = fetch_url(self.module, url) rsp, info = fetch_url(self.module, url)
key = rsp.read(maxbytes) key = rsp.read()
if not is_pubkey(key): if not is_pubkey(key):
self.module.fail_json(msg="Not a public key: %s" % url) self.module.fail_json(msg="Not a public key: %s" % url)
tmpfd, tmpname = tempfile.mkstemp() tmpfd, tmpname = tempfile.mkstemp()