waldek
/
jetforce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for keylog file to client tool

This commit is contained in:
Michael Lazar 2020-07-11 23:58:25 -04:00
parent efe41ece85
commit 7ec8edee7f
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -17,6 +17,9 @@
errback will now be invoked when the TCP connection is closed. errback will now be invoked when the TCP connection is closed.
- Added a new example that demonstrates streaming data to client connections - Added a new example that demonstrates streaming data to client connections
(examples/chatroom.py). (examples/chatroom.py).
- The jetforce-client tool now supports writing TLS keys to a logfile to
facilitate debugging TLS connections using tools like Wireshark.
### v0.4.0 (2020-06-09) ### v0.4.0 (2020-06-09)

15
jetforce_client.py
View File

@ -25,6 +25,7 @@ def fetch(url, host=None, port=None, use_sni=False):
with socket.create_connection((host, port)) as sock: with socket.create_connection((host, port)) as sock:
with context.wrap_socket(sock, server_hostname=sni) as ssock: with context.wrap_socket(sock, server_hostname=sni) as ssock:
ssock.sendall((url + "\r\n").encode()) ssock.sendall((url + "\r\n").encode())
fp = ssock.makefile("rb", buffering=0) fp = ssock.makefile("rb", buffering=0)
data = fp.read(1024) data = fp.read(1024)
while data: while data:
@ -32,8 +33,13 @@ def fetch(url, host=None, port=None, use_sni=False):
sys.stdout.buffer.flush() sys.stdout.buffer.flush()
data = fp.read(1024) data = fp.read(1024)
# Send a close_notify alert
# ssock.setblocking(False)
# ssock.unwrap()
def run_client(): def run_client():
# fmt: off
parser = argparse.ArgumentParser(description="A simple gemini client") parser = argparse.ArgumentParser(description="A simple gemini client")
parser.add_argument("url") parser.add_argument("url")
parser.add_argument("--host", help="Server host") parser.add_argument("--host", help="Server host")
@ -41,9 +47,9 @@ def run_client():
parser.add_argument("--tls-certfile", help="Client certificate") parser.add_argument("--tls-certfile", help="Client certificate")
parser.add_argument("--tls-keyfile", help="Client private key") parser.add_argument("--tls-keyfile", help="Client private key")
parser.add_argument("--tls-alpn-protocol", help="Protocol for ALPN negotiation") parser.add_argument("--tls-alpn-protocol", help="Protocol for ALPN negotiation")
parser.add_argument( parser.add_argument("--tls-enable-sni", action="store_true", help="Specify the hostname using SNI")
"--tls-enable-sni", action="store_true", help="Specify the hostname using SNI" parser.add_argument("--tls-keylog", help="Keylog file for TLS debugging (requires python 3.8+)")
) # fmt: on
args = parser.parse_args() args = parser.parse_args()
if args.tls_certfile: if args.tls_certfile:
@ -52,6 +58,9 @@ def run_client():
if args.tls_alpn_protocol: if args.tls_alpn_protocol:
context.set_alpn_protocols([args.tls_alpn_protocol]) context.set_alpn_protocols([args.tls_alpn_protocol])
if args.tls_keylog:
context.keylog_filename = args.tls_keylog
fetch(args.url, args.host, args.port, args.tls_enable_sni) fetch(args.url, args.host, args.port, args.tls_enable_sni)