ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-05 08:41:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge authentication options back into a single field to prevent losing options beyond the first (#57507)

Browse source 
* Merge authentication options back into a single field to prevent losing options beyond the first

* Add integration test and changelog

* Fix multiple options for local type connections. Also fix sorting errors between local type connections that lack a src

* Build again because of github problems?

* Add spaces before comments
This commit is contained in:
ECRR 2019-06-10 03:16:01 -04:00 • committed by Martin Krizek
parent c001391555
commit 5cc6486a2b
3 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/ansible/modules/database/postgresql/postgresql_pg_hba.py
View file

@ -481,20 +481,19 @@ class PgHbaRule(dict):
msg = "Rule {0} has unknown type: {1}."
raise PgHbaValueError(msg.format(line, cols[0]))
if cols[0] == 'local':
if cols[3] not in PG_HBA_METHODS:
raise PgHbaValueError("Rule {0} of 'local' type has invalid auth-method {1}"
"on 4th column ".format(line, cols[3]))
cols.insert(3, None)
cols.insert(3, None)
cols.insert(3, None) # No address
cols.insert(3, None) # No IP-mask
if len(cols) < 6:
cols.insert(4, None) # No IP-mask
elif cols[5] not in PG_HBA_METHODS:
cols.insert(4, None) # No IP-mask
if cols[5] not in PG_HBA_METHODS:
raise PgHbaValueError("Rule {0} of '{1}' type has invalid auth-method '{2}'".format(line, cols[0], cols[5]))
if len(cols) < 7:
cols.insert(6, None) # No auth-options
else:
if len(cols) < 6:
cols.insert(4, None)
elif cols[5] not in PG_HBA_METHODS:
cols.insert(4, None)
if len(cols) < 7:
cols.insert(7, None)
if cols[5] not in PG_HBA_METHODS:
raise PgHbaValueError("Rule {0} has no valid method.".format(line))
cols[6] = " ".join(cols[6:]) # combine all auth-options
rule = dict(zip(PG_HBA_HDR, cols[:7]))
for key, value in rule.items():
if value:
@ -574,7 +573,7 @@ class PgHbaRule(dict):
return myweight < hisweight
try:
return self['src'] < other['src']
except TypeError:
except (TypeError, KeyError):
return self.source_type_weight() < other.source_type_weight()
errormessage = 'We have two rules ({1}, {2})'.format(self, other)
errormessage += ' with exact same weight. Please file a bug.'
@ -624,6 +623,9 @@ class PgHbaRule(dict):
Basically make sure that IPv6Networks are sorted higher than IPv4Networks.
This is a 'when all else fails' solution in __lt__.
"""
if self['type'] == 'local':
return 3
sourceobj = self.source()
if isinstance(sourceobj, ipaddress.IPv4Network):
return 2