Changeset 143 for trunk

Timestamp:

Oct 8, 2007, 4:35:12 AM (17 years ago)

Author:

quentin

Message:

SSL support for VNC proxy

Location:

trunk/vnc/vnc_javasrc

Files:

• Makefile (modified) (3 diffs)
• SIPBTrustManager.java (added)
• SocketWrapper.java (added)
• VNCProxyConnectSocketFactory.java (modified) (2 diffs)
• VNCProxyConnectSocketWrapper.java (added)
• trust.store (added)

trunk/vnc/vnc_javasrc/Makefile

@@ -20 +20 @@
           VNCProxyConnectSocketFactory.class VNCProxyConnectSocket.class \
           HTTPConnectSocket.class ReloginPanel.class \
-          InStream.class MemInStream.class ZlibInStream.class
+          InStream.class MemInStream.class ZlibInStream.class \
+          VNCProxyConnectSocketWrapper.class SocketWrapper.class SocketWrapper\$$WrappingSocketImpl.class SIPBTrustManager.class
 
 SOURCES = VncViewer.java RfbProto.java AuthPanel.java VncCanvas.java \
@@ -30 +31 @@
           VNCProxyConnectSocketFactory.java VNCProxyConnectSocket.java \
           HTTPConnectSocket.java ReloginPanel.java \
-          InStream.java MemInStream.java ZlibInStream.java
+          InStream.java MemInStream.java ZlibInStream.java \
+          VNCProxyConnectSocketWrapper.java SocketWrapper.java SIPBTrustManager.java
+
+EXTRAJAR = trust.store
 
 all: $(CLASSES) $(ARCHIVE)
@@ -38 +42 @@
 
 $(ARCHIVE): $(CLASSES) $(MANIFEST)
-        $(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
+        $(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES) $(EXTRAJAR)
 
 install: $(CLASSES) $(ARCHIVE)

trunk/vnc/vnc_javasrc/VNCProxyConnectSocketFactory.java

@@ -27 +27 @@
 import java.applet.*;
 import java.net.*;
+import javax.net.ssl.*;
 import java.io.*;
 
 class VNCProxyConnectSocketFactory implements SocketFactory {
+
+    SSLSocketFactory factory;
+    
+    public VNCProxyConnectSocketFactory() {
+        try {
+            SSLContext c = SSLContext.getInstance("SSL");
+            c.init(null,
+                   new TrustManager[] { new SIPBTrustManager() },
+                   null);
+            factory =
+                (SSLSocketFactory)c.getSocketFactory();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
   public Socket createSocket(String host, int port, Applet applet)
@@ -58 +74 @@
     System.out.println("VNCProxy CONNECT via proxy " + host +
                        " port " + port + " to vm " + vmname);
-    VNCProxyConnectSocket s =
-      new VNCProxyConnectSocket(host, port, vmname, authtoken);
+    SSLSocket ssls = (SSLSocket)factory.createSocket(host, port);
+    ssls.startHandshake();
+    VNCProxyConnectSocketWrapper s =
+      new VNCProxyConnectSocketWrapper(ssls, vmname, authtoken);
 
     return (Socket)s;