a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apache2-mod-proxy: better handling regexp extraction (#9609) 

* apache2-mod-proxy: better handling regexp extraction

* add changelog frag
pull/9618/head
Alexei Znamensky 2025-01-24 08:32:59 +13:00 committed by GitHub
parent a5d2e3ec80
commit bf5c7f8be8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/9609-apache2-mod-proxy-revamp4.yml Normal file
View File

@ -0,0 +1,2 @@
minor_changes:
- apache2_mod_proxy - better handling regexp extraction (https://github.com/ansible-collections/community.general/pull/9609).

8
plugins/modules/apache2_mod_proxy.py
View File

@ -220,14 +220,14 @@ else:
HAS_BEAUTIFULSOUP = True HAS_BEAUTIFULSOUP = True
# balancer member attributes extraction regexp: # balancer member attributes extraction regexp:
EXPRESSION = r"(b=([\w\.\-]+)&w=(https?|ajp|wss?|ftp|[sf]cgi)://([\w\.\-]+):?(\d*)([/\w\.\-]*)&?[\w\-\=]*)" EXPRESSION = re.compile(r"(b=([\w\.\-]+)&w=(https?|ajp|wss?|ftp|[sf]cgi)://([\w\.\-]+):?(\d*)([/\w\.\-]*)&?[\w\-\=]*)")
# Apache2 server version extraction regexp: # Apache2 server version extraction regexp:
APACHE_VERSION_EXPRESSION = r"SERVER VERSION: APACHE/([\d.]+)" APACHE_VERSION_EXPRESSION = re.compile(r"SERVER VERSION: APACHE/([\d.]+)")
def regexp_extraction(string, _regexp, groups=1): def regexp_extraction(string, _regexp, groups=1):
""" Returns the capture group (default=1) specified in the regexp, applied to the string """ """ Returns the capture group (default=1) specified in the regexp, applied to the string """
regexp_search = re.search(string=str(string), pattern=str(_regexp)) regexp_search = _regexp.search(string)
if regexp_search: if regexp_search:
if regexp_search.group(groups) != '': if regexp_search.group(groups) != '':
return str(regexp_search.group(groups)) return str(regexp_search.group(groups))
@ -251,7 +251,7 @@ class BalancerMember(object):
""" """
def __init__(self, management_url, balancer_url, module): def __init__(self, management_url, balancer_url, module):
self.host = regexp_extraction(management_url, str(EXPRESSION), 4) self.host = regexp_extraction(management_url, EXPRESSION, 4)
self.management_url = str(management_url) self.management_url = str(management_url)
self.protocol = regexp_extraction(management_url, EXPRESSION, 3) self.protocol = regexp_extraction(management_url, EXPRESSION, 3)
self.port = regexp_extraction(management_url, EXPRESSION, 5) self.port = regexp_extraction(management_url, EXPRESSION, 5)