Removed max 8192 bytes, fixes #8424
This commit is contained in:
parent
10011b361b
commit
e7cbbd8b73
1 changed files with 2 additions and 6 deletions
|
@ -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()
|
||||||
|
|
Loading…
Reference in a new issue