wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rpm_key: Decode bytes to string to work with Python 3 (Fixes #20326) (#20385)

Browse source 
* rpm_key: Decode bytes to string to work with Python 3 (#20326)

The read() method will return bytes we need to then decode() those bytes
to a string before trying to match() it using the re module.

* Make the rpm_key pgp regex more robust on both py2 and py3
This commit is contained in:
Lucas Alvares Gomes 2017-04-08 00:22:39 +01:00 committed by Toshio Kuratomi
parent 86c714548f
commit cee8cc2a52
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/modules/packaging/os/rpm_key.py
View file

@ -75,12 +75,19 @@ import re
import os.path import os.path
import tempfile import tempfile
# import module snippets
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.urls import fetch_url
from ansible.module_utils._text import to_native
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-----).*"
return re.match(pgp_regex, string, re.DOTALL) return bool(re.match(pgp_regex, to_native(string, errors='surrogate_or_strict'), re.DOTALL))
class RpmKey:
class RpmKey(object):
def __init__(self, module): def __init__(self, module):
# If the key is a url, we need to check if it's present to be idempotent, # If the key is a url, we need to check if it's present to be idempotent,
@ -122,7 +129,6 @@ class RpmKey:
else: else:
module.exit_json(changed=False) module.exit_json(changed=False)
def fetch_key(self, url): 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"""
rsp, info = fetch_url(self.module, url) rsp, info = fetch_url(self.module, url)
@ -212,9 +218,5 @@ def main():
RpmKey(module) RpmKey(module)
# import module snippets
from ansible.module_utils.basic import *
from ansible.module_utils.urls import *
if __name__ == '__main__': if __name__ == '__main__':
main() main()