Merge "Workaround peer name starting with hyphen" into stable/ussuri
This commit is contained in:
commit
fbbe316ef2
|
@ -45,7 +45,9 @@ def base64_sha1_string(string_to_hash):
|
|||
# break backwards compatibility with existing loadbalancers.
|
||||
hash_str = hashlib.sha1(string_to_hash.encode('utf-8')).digest() # nosec
|
||||
b64_str = base64.b64encode(hash_str, str.encode('_-', 'ascii'))
|
||||
return b64_str.decode('UTF-8')
|
||||
b64_sha1 = b64_str.decode('UTF-8')
|
||||
# https://github.com/haproxy/haproxy/issues/644
|
||||
return re.sub(r"^-", "x", b64_sha1)
|
||||
|
||||
|
||||
def get_network_driver():
|
||||
|
|
|
@ -89,3 +89,18 @@ class TestConfig(base.TestCase):
|
|||
exp_codes = '201-200, 205'
|
||||
self.assertEqual(utils.expand_expected_codes(exp_codes),
|
||||
{'205'})
|
||||
|
||||
def test_base64_sha1_string(self):
|
||||
str_to_sha1 = [
|
||||
# no special cases str (no altchars)
|
||||
('77e7d60d-e137-4246-8a84-a25db33571cd',
|
||||
'iVZVQ5AKmk2Ae0uGLP0Ue4OseRM='),
|
||||
# backward compat amphorae with - in str[1:]
|
||||
('9c6e5f27-a0da-4ceb-afe5-5a81230be42e',
|
||||
'NjrNgt3Egl-H5ScbYM5ChtUH3M8='),
|
||||
# sha1 would start with -, now replaced with x
|
||||
('4db4a3cf-9fef-4057-b1fd-b2afbf7a8a0f',
|
||||
'xxqntK8jJ_gE3QEmh-D1-XgCW_E=')
|
||||
]
|
||||
for str, sha1 in str_to_sha1:
|
||||
self.assertEqual(sha1, utils.base64_sha1_string(str))
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
An amphora image update is recommended to pick up a workaround to an
|
||||
HAProxy issue where it would fail to reload on configuration change should
|
||||
the local peer name start with "-x".
|
||||
fixes:
|
||||
- |
|
||||
Workaround an HAProxy issue where it would fail to reload on configuration
|
||||
change should the local peer name start with "-x".
|
Loading…
Reference in New Issue