summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2023-10-24 14:33:37 +0100
committerDavid Robertson <davidr@element.io>2023-10-24 14:34:47 +0100
commit2f1065f81bf2f72c4d90f2afc42409f1dced1e89 (patch)
treedb7dd9ca186ad27a58fea72572e71f10ac65f903
parentMerge branch 'master' into develop (diff)
downloadsynapse-2f1065f81bf2f72c4d90f2afc42409f1dced1e89.tar.xz
Revert "Add test case to detect dodgy b64 encoding"
This reverts commit 5fe76b9434e22bb752c252dd9c66c3c2bfb90dfc.

I think I had this accidentally commited on my local develop branch, and
so it accidentally got merged into upstream develop.

This should re-land with corrections in #16504.
-rw-r--r--tests/http/test_proxyagent.py14
1 files changed, 0 insertions, 14 deletions
diff --git a/tests/http/test_proxyagent.py b/tests/http/test_proxyagent.py

index b48c2c293a..8164b0b78e 100644 --- a/tests/http/test_proxyagent.py +++ b/tests/http/test_proxyagent.py
@@ -217,20 +217,6 @@ class ProxyParserTests(TestCase): ) -class TestBasicProxyCredentials(TestCase): - def test_long_user_pass_string_encoded_without_newlines(self) -> None: - """Reproduces https://github.com/matrix-org/synapse/pull/16504.""" - creds = BasicProxyCredentials( - b"looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooonguser:pass@proxy.local:9988" - ) - auth_value = creds.as_proxy_authorization_value() - self.assertNotIn(b"\n", auth_value) - self.assertEqual( - creds.as_proxy_authorization_value(), - b"Basic: bG9vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vbmd1c2VyOnBhc3M=", - ) - - class MatrixFederationAgentTests(TestCase): def setUp(self) -> None: self.reactor = ThreadedMemoryReactorClock()