mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
Read the request body before replying, and generate certificates portably
httpsrv parsed Content-Length and never read what followed. The reply is followed by a close, and closing a socket that still holds unread data resets the connection instead of ending it, so a POST could cost the client the reply it was about to read. Windows does that reliably; the same test passes on Linux and macOS, which is why it looked flaky. Drain the body, bounded at a megabyte. The test CA was built with -addext, which LibreSSL - the openssl on a stock macOS - does not apply the same way, leaving a certificate that is not usable as a CA and a client that cannot build a chain to it. Put the extensions in a file both accept, and verify the generated chain before any of it is handed to a proxy, so a failure there is not read as a fault in the proxy.
This commit is contained in:
1 parent
527f0704a4
commit
488317da1d
3 files changed
+72
-19
No files matched your search
+39
-19
@@ -104,6 +104,8 @@ class Certs:
|
||||
self.other = self.dir + "/other.pem"
|
||||
self.other_key = self.dir + "/other.key"
|
||||
self.cache = self.dir + "/cache/"
|
||||
self.verified = False
|
||||
self.verify_output = ""
|
||||
|
||||
|
||||
class Failure(Exception):
|
||||
@@ -435,28 +437,38 @@ class Tester:
|
||||
os.makedirs(c.cache, exist_ok=True)
|
||||
csr = c.dir + "/server.csr"
|
||||
ext = c.dir + "/server.ext"
|
||||
ca_ext = c.dir + "/ca.ext"
|
||||
with open(ext, "w") as fp:
|
||||
fp.write("subjectAltName=IP:127.0.0.1,DNS:localhost\n")
|
||||
# A CA without these is not usable as one. They go in a file rather
|
||||
# than in -addext, which LibreSSL - the openssl on a stock macOS -
|
||||
# does not apply the same way.
|
||||
with open(ca_ext, "w") as fp:
|
||||
fp.write("basicConstraints=critical,CA:TRUE\n"
|
||||
"keyUsage=critical,keyCertSign,cRLSign\n"
|
||||
"subjectKeyIdentifier=hash\n")
|
||||
|
||||
# OpenSSL 3 refuses to trust a CA without these extensions
|
||||
ca_ext = ["-addext", "basicConstraints=critical,CA:TRUE",
|
||||
"-addext", "keyUsage=critical,keyCertSign,cRLSign"]
|
||||
steps = [
|
||||
["openssl", "genrsa", "-out", c.ca_key, "2048"],
|
||||
["openssl", "req", "-x509", "-new", "-nodes", "-key", c.ca_key,
|
||||
"-sha256", "-days", "3650", "-subj", "/CN=3proxy-test-ca",
|
||||
"-out", c.ca] + ca_ext,
|
||||
["openssl", "genrsa", "-out", c.other_key, "2048"],
|
||||
["openssl", "req", "-x509", "-new", "-nodes", "-key", c.other_key,
|
||||
"-sha256", "-days", "3650", "-subj", "/CN=3proxy-test-other-ca",
|
||||
"-out", c.other] + ca_ext,
|
||||
["openssl", "genrsa", "-out", c.server_key, "2048"],
|
||||
["openssl", "req", "-new", "-key", c.server_key,
|
||||
"-subj", "/CN=127.0.0.1", "-out", csr],
|
||||
["openssl", "x509", "-req", "-in", csr, "-CA", c.ca,
|
||||
"-CAkey", c.ca_key, "-CAcreateserial", "-out", c.server,
|
||||
"-days", "3650", "-sha256", "-extfile", ext],
|
||||
]
|
||||
def ca_steps(key, csr_path, out, name):
|
||||
return [
|
||||
["openssl", "genrsa", "-out", key, "2048"],
|
||||
["openssl", "req", "-new", "-nodes", "-key", key,
|
||||
"-subj", "/CN=" + name, "-out", csr_path],
|
||||
["openssl", "x509", "-req", "-in", csr_path, "-signkey", key,
|
||||
"-days", "3650", "-sha256", "-extfile", ca_ext, "-out", out],
|
||||
]
|
||||
|
||||
steps = (
|
||||
ca_steps(c.ca_key, c.dir + "/ca.csr", c.ca, "3proxy-test-ca") +
|
||||
ca_steps(c.other_key, c.dir + "/other.csr", c.other,
|
||||
"3proxy-test-other-ca") +
|
||||
[
|
||||
["openssl", "genrsa", "-out", c.server_key, "2048"],
|
||||
["openssl", "req", "-new", "-key", c.server_key,
|
||||
"-subj", "/CN=127.0.0.1", "-out", csr],
|
||||
["openssl", "x509", "-req", "-in", csr, "-CA", c.ca,
|
||||
"-CAkey", c.ca_key, "-CAcreateserial", "-out", c.server,
|
||||
"-days", "3650", "-sha256", "-extfile", ext],
|
||||
])
|
||||
for step in steps:
|
||||
done = subprocess.run(step, stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT, timeout=60)
|
||||
@@ -464,6 +476,14 @@ class Tester:
|
||||
self._certs = False
|
||||
return None
|
||||
|
||||
# If the chain does not verify, the fault is in the generation, not
|
||||
# in whatever is about to present it.
|
||||
check = subprocess.run(["openssl", "verify", "-CAfile", c.ca, c.server],
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT, timeout=60)
|
||||
c.verified = check.returncode == 0
|
||||
c.verify_output = check.stdout.decode("utf-8", "replace").strip()
|
||||
|
||||
self._certs = c
|
||||
return c
|
||||
|
||||
|
||||
Reference in new issue
Block a user