Add starttls lua support

tong · Apr 11, 2024 · 8cc8d2b · 8cc8d2b
1 parent aaec633
commit 8cc8d2b
Showing 1 changed file with 83 additions and 84 deletions.
diff --git a/src/xmpp/StartTLS.hx b/src/xmpp/StartTLS.hx
@@ -2,120 +2,119 @@ package xmpp;
 
 #if python
 class Socket extends sys.net.Socket {
-    public inline function handshake() {
-        trace('TODO handshake');
-        //SSLSocket.do_handshake()
-    }
+	public inline function handshake() {
+		trace('TODO handshake');
+		// SSLSocket.do_handshake()
+	}
 }
 #end
 
-#if (sys||lua)
+#if (sys || lua)
 private typedef SSLSocket =
-    #if python xmpp.Socket;
-    #elseif (cpp||hl||lua||neko) sys.ssl.Socket;
-    #elseif macro sys.ssl.Socket;
-    #elseif doc_gen Any;
-    #end
+	#if python
+	xmpp.Socket;
+	#elseif (cpp || hl || lua || neko)
+	sys.ssl.Socket;
+	#elseif macro
+	sys.ssl.Socket;
+	#elseif doc_gen
+	Any;
+	#end
 #elseif nodejs
-#elseif dog_gen
+#elseif doc_gen
 #end
 
 /**
 
-    XMPP includes a method for securing the stream from tampering and eavesdropping.
-    This channel encryption method makes use of the Transport Layer Security (TLS) protocol [TLS], along with a "STARTTLS" extension.
+	XMPP includes a method for securing the stream from tampering and eavesdropping.
+	This channel encryption method makes use of the Transport Layer Security (TLS) protocol [TLS], along with a "STARTTLS" extension.
 
 	https://xmpp.org/rfcs/rfc3920.html#tls
 **/
 class StartTLS {
-
 	public static inline var XMLNS = 'urn:ietf:params:xml:ns:xmpp-tls';
 
+	/**
+		Ask to start tls negotiation.
+	**/
 	public static function startTLS(stream:Stream, callback:(success:Bool) -> Void) {
 		stream.input = str -> {
-            var xml = try Xml.parse(str).firstElement() catch(e) {
-                callback(false);
-                return;
-            }
-            callback((xml.get("xmlns") == XMLNS) ? switch xml.nodeName {
-                case 'proceed': true;
-                case _: false;
-            } : false);
+			var xml = try Xml.parse(str).firstElement() catch (e) {
+				callback(false);
+				return;
+			}
+			callback((xml.get("xmlns") == XMLNS) ? switch xml.nodeName {
+				case 'proceed': true;
+				case _: false;
+			} : false);
 		};
 		stream.send(XML.create('starttls').set('xmlns', XMLNS));
 	}
 
-    #if (macro||cpp||hl||lua||neko||python)
-
-    /**
-        Upgrades a `sys.net.Socket` to `sys.ssl.Socket`
-    **/
-    @:access(sys.net.Socket)
-    public static function upgrade(sock: sys.net.Socket, host: sys.net.Host) : SSLSocket {
-
-        #if macro
-        final s = new sys.ssl.Socket();
-        s.socket = sock.socket;
+	#if (macro || cpp || hl || lua || neko || python)
+	/**
+		Upgrades a `sys.net.Socket` to `sys.ssl.Socket`
+	**/
+	@:access(sys.net.Socket)
+	public static function upgrade(sock:sys.net.Socket, host:sys.net.Host):SSLSocket {
+		#if macro
+		final s = new sys.ssl.Socket();
+		s.socket = sock.socket;
 		s.ssl = new mbedtls.Ssl();
-        sys.ssl.Mbedtls.setSocket(s.ssl, s.socket);
+		sys.ssl.Mbedtls.setSocket(s.ssl, s.socket);
 		s.handshakeDone = false;
 		if (s.hostname == null)
-		    s.hostname = host.host;
+			s.hostname = host.host;
 		if (s.hostname != null)
 			s.ssl.set_hostname(s.hostname);
-        #elseif python
-        final ctx = python.lib.Ssl.create_default_context(python.lib.ssl.Purpose.SERVER_AUTH);
-        final s = new xmpp.Socket();
-        s.__s = ctx.wrap_socket(sock.__s, false, true, true, host.host);
-        s.__rebuildIoStreams();
-        #end
-
-        #if cpp
-        final s = new sys.ssl.Socket();
-        s.__s = sock.__s;
-        s.conf = s.buildSSLConfig(false);
+		#elseif python
+		final ctx = python.lib.Ssl.create_default_context(python.lib.ssl.Purpose.SERVER_AUTH);
+		final s = new xmpp.Socket();
+		s.__s = ctx.wrap_socket(sock.__s, false, true, true, host.host);
+		s.__rebuildIoStreams();
+		#end
+
+		#if cpp
+		final s = new sys.ssl.Socket();
+		s.__s = sock.__s;
+		s.conf = s.buildSSLConfig(false);
 		s.ssl = cpp.NativeSsl.ssl_new(s.conf);
 		cpp.NativeSsl.ssl_set_socket(s.ssl, s.__s);
-        s.setHostname(host.host);
+		s.setHostname(host.host);
 		cpp.NativeSsl.ssl_set_hostname(s.ssl, s.hostname);
 		s.handshakeDone = false;
-
-        #elseif hl
-        final s = new sys.ssl.Socket();
-        s.__s = sock.__s;
-        s.conf = s.buildConfig(false);
+		#elseif hl
+		final s = new sys.ssl.Socket();
+		s.__s = sock.__s;
+		s.conf = s.buildConfig(false);
 		s.ssl = new sys.ssl.Context(s.conf);
-        s.ssl.setSocket(s.__s);
+		s.ssl.setSocket(s.__s);
 		s.hostname = host.host;
-        s.ssl.setHostname(@:privateAccess host.host.toUtf8());
-        s.handshakeDone = false;
-
-        #elseif neko
-        final s = new sys.ssl.Socket();
-        s.__s = sock.__s;
-        s.ctx = s.buildSSLContext(false);
-        s.ssl = sys.ssl.Socket.ssl_new(s.ctx);
-        sys.ssl.Socket.ssl_set_socket(s.ssl, s.__s);
-        s.setHostname(host.host);
-        sys.ssl.Socket.ssl_set_hostname(s.ssl, untyped host.host.__s);
-        //sys.ssl.Socket.ssl_set_hostname(s.ssl, untyped s.hostname.__s);
-        s.handshakeDone = false;
-        #elseif lua
-        final s = new sys.ssl.Socket();
-        //s.__s = sock.__s;
-        trace('TODO');
-
-        #end
-        //s.handshake();
-        return s;
-    }
-
-    #elseif nodejs
-
-    public static inline function upgrade(sock: js.node.net.Socket, ?options: js.node.tls.TLSSocket.TLSSocketOptions) : js.node.tls.TLSSocket {
-        return new js.node.tls.TLSSocket(sock, options);
-    }
-
-    #end
+		s.ssl.setHostname(@:privateAccess host.host.toUtf8());
+		s.handshakeDone = false;
+		#elseif neko
+		final s = new sys.ssl.Socket();
+		s.__s = sock.__s;
+		s.ctx = s.buildSSLContext(false);
+		s.ssl = sys.ssl.Socket.ssl_new(s.ctx);
+		sys.ssl.Socket.ssl_set_socket(s.ssl, s.__s);
+		s.setHostname(host.host);
+		sys.ssl.Socket.ssl_set_hostname(s.ssl, untyped host.host.__s);
+		// sys.ssl.Socket.ssl_set_hostname(s.ssl, untyped s.hostname.__s);
+		s.handshakeDone = false;
+		#elseif lua
+		final s = new sys.ssl.Socket();
+		s._sslSocket = s.wrap(sock._socket);
+		s.input = new sys.net.SocketInput(s._sslSocket);
+		s.output = new sys.net.SocketOutput(s._sslSocket);
+		s.handshake();
+		#end
+		// s.handshake();
+		return s;
+	}
+	#elseif nodejs
+	public static inline function upgrade(sock:js.node.net.Socket, ?options:js.node.tls.TLSSocket.TLSSocketOptions):js.node.tls.TLSSocket {
+		return new js.node.tls.TLSSocket(sock, options);
+	}
+	#end
 }
-