tubes/remote: Support Server Name Indication and enable by default (#…

…1644)

* tubes/remote: Support Server Name Indication and enable by default

This allows customizing the server_name via sni="custom" or sending the
name specified in the host parameter via sni=True.

We switch to the SSLContext.wrap_socket API because ssl.wrap_socket is
deprecated and does not support SNI.

Unfortunately, SSLContext.wrap_socket dropped some of the parameters
that are supported by ssl.wrap_socket. These parameters have been moved
to the SSLContext API and can now be used by passing a custom SSLContext
to the ssl_context parameter of `remote`.

* update CHANGELOG.md

CHANGELOG.md

@@ -62,6 +62,7 @@ The table below shows which release corresponds to each branch, and what date th
 - [#1616][1616] Fix `cyclic` cli for 64 bit integers
 - [#1632][1632] Enable usage of Pwntools in jupyter
 - [#1633][1633] Open a shell if `pwn template` cannot download the remote file
+- [#1644][1644] Enable and support SNI for SSL-wrapped tubes
 
 [1602]: https://github.com/Gallopsled/pwntools/pull/1602
 [1606]: https://github.com/Gallopsled/pwntools/pull/1606

pwnlib/tubes/remote.py

@@ -25,6 +25,8 @@ class remote(sock):
         typ: The string "tcp" or "udp" or an integer to pass to :func:`socket.getaddrinfo`.
         timeout: A positive number, None or the string "default".
         ssl(bool): Wrap the socket with SSL
+        ssl_context(ssl.SSLContext): Specify SSLContext used to wrap the socket.
+        sni: Set 'server_hostname' in ssl_args based on the host parameter.
         sock(socket.socket): Socket to inherit, rather than connecting
         ssl_args(dict): Pass ssl.wrap_socket named arguments in a dictionary.
 
@@ -56,7 +58,8 @@ class remote(sock):
 
     def __init__(self, host, port,
                  fam = "any", typ = "tcp",
-                 ssl=False, sock=None, ssl_args=None, *args, **kwargs):
+                 ssl=False, sock=None, ssl_context=None, ssl_args=None, sni=True,
+                 *args, **kwargs):
         super(remote, self).__init__(*args, **kwargs)
 
         self.rport  = int(port)
@@ -82,7 +85,13 @@ def __init__(self, host, port,
             self.lhost, self.lport = self.sock.getsockname()[:2]
 
             if ssl:
-                self.sock = _ssl.wrap_socket(self.sock,**(ssl_args or {}))
+                ssl_args = ssl_args or {}
+                ssl_context = ssl_context or _ssl.SSLContext(_ssl.PROTOCOL_TLSv1_2)
+                if isinstance(sni, str):
+                    ssl_args["server_hostname"] = sni
+                elif sni:
+                    ssl_args["server_hostname"] = host
+                self.sock = ssl_context.wrap_socket(self.sock,**ssl_args)
 
     def _connect(self, fam, typ):
         sock    = None