feat(android): secure Ti.Network.Socket (#13774)

Co-authored-by: Chris Barber <chris@cb1inc.com>
tidev · May 20, 2023 · 0f5743d · 0f5743d
1 parent ffebf85
commit 0f5743d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/android/modules/network/src/java/ti/modules/titanium/network/socket/TCPProxy.java b/android/modules/network/src/java/ti/modules/titanium/network/socket/TCPProxy.java
@@ -21,6 +21,8 @@
 import org.appcelerator.titanium.util.TiConvert;
 import org.appcelerator.titanium.util.TiStreamHelper;
 
+import javax.net.ssl.SSLSocketFactory;
+
 import ti.modules.titanium.BufferProxy;
 
 @Kroll.proxy(creatableInModule = SocketModule.class)
@@ -35,6 +37,7 @@ public class TCPProxy extends KrollProxy implements TiStream
 	private KrollDict acceptOptions = null;
 	private int state = 0;
 
+	private boolean secure = false;
 	public TCPProxy()
 	{
 		super();
@@ -47,6 +50,7 @@ public void connect() throws Exception
 		if ((state != SocketModule.LISTENING) && (state != SocketModule.CONNECTED)) {
 			Object host = getProperty("host");
 			Object port = getProperty("port");
+			secure = TiConvert.toBoolean(getProperty("secure"), false);
 			if ((host != null) && (port != null) && (TiConvert.toInt(port) > 0)) {
 				new ConnectedSocketThread().start();
 
@@ -191,17 +195,25 @@ public void run()
 		{
 			String host = TiConvert.toString(getProperty("host"));
 			Object timeoutProperty = getProperty("timeout");
+			secure = TiConvert.toBoolean(getProperty("secure"), false);
 
 			try {
-				if (timeoutProperty != null) {
-					int timeout = TiConvert.toInt(timeoutProperty, 0);
-
+				if (secure) {
+					SSLSocketFactory s = (SSLSocketFactory) SSLSocketFactory.getDefault();
+					clientSocket = s.createSocket();
+				} else {
 					clientSocket = new Socket();
-					clientSocket.connect(new InetSocketAddress(host, TiConvert.toInt(getProperty("port"))), timeout);
+				}
+
+				InetSocketAddress endpoint = new InetSocketAddress(host, TiConvert.toInt(getProperty("port")));
 
+				if (timeoutProperty != null) {
+					int timeout = TiConvert.toInt(timeoutProperty, 0);
+					clientSocket.connect(endpoint, timeout);
 				} else {
-					clientSocket = new Socket(host, TiConvert.toInt(getProperty("port")));
+					clientSocket.connect(endpoint);
 				}
+
 				updateState(SocketModule.CONNECTED, "connected", buildConnectedCallbackArgs());
 
 			} catch (UnknownHostException e) {

diff --git a/apidoc/Titanium/Network/Socket/TCP.yml b/apidoc/Titanium/Network/Socket/TCP.yml
@@ -182,6 +182,13 @@ properties:
     description: |
         Can only be modified when this socket is in the [INITIALIZED](Titanium.Network.Socket.INITIALIZED) state.
 
+  - name: secure
+    type: Boolean
+    summary: Creates a secure socket.
+    since: "12.1.0"
+    default: false
+    platforms: [android]
+
   - name: listenQueueSize
     type: Number
     summary: Max number of pending incoming connections to be allowed when the socket is