Ticket #1229: proxy-2.patch

Chat

@@ -14 +14 @@
 #import <arpa/inet.h>
 #import <netdb.h>
 
+#import <SystemConfiguration/SystemConfiguration.h>
+#include <fnmatch.h>
+
 #pragma mark Declarations
 
 #define READQUEUE_CAPACITY  5           /* Initial capacity. */
@@ -38 +41 @@
     kDisconnectSoon = 0x08          // If set, disconnect as soon as nothing is queued.
 };
 
+
+static void writeFully( CFWriteStreamRef theWriteStream, UInt8 *buf, UInt16 n )
+{
+  while( n > 0 )
+  {
+    int rc = CFWriteStreamWrite( theWriteStream, buf, n );
+    NSLog(@"wrote: rc=%d", rc);
+    n   -= rc;
+    buf += rc;
+  }
+}
+
+
 @interface AsyncSocket (Private)
 - (BOOL) isSocketConnected;
 - (BOOL) areStreamsConnected;
@@ -62 +78 @@
 - (BOOL) configureStreamsAndReturnError:(NSError **)errPtr;
 - (BOOL) openStreamsAndReturnError:(NSError **)errPtr;
 - (void) doStreamOpen;
+- (void) doStreamOpen_callDidConnectToHost;
 - (void) closeWithError:(NSError *)err;
 - (void) recoverUnreadData;
 - (void) emptyQueues;
@@ -213 +230 @@
     theContext.release = nil;
     theContext.copyDescription = nil;
 
+  origHost = nil;
+
     return self;
 }
 
@@ -544 +563 @@
 // Creates the socket from a native socket.
 - (BOOL) createStreamsFromNative:(CFSocketNativeHandle)native error:(NSError **)errPtr
 {
+  /* 
+   * NOT UPDATED FOR PROXIES... is this used?
+   */
+
     // Create the socket & streams.
     CFStreamCreatePairWithSocket (kCFAllocatorDefault, native, &theReadStream, &theWriteStream);
     if (theReadStream == NULL || theWriteStream == NULL)
@@ -557 +580 @@
     return YES;
 }
 
+- (BOOL) getProxyInfoForHost:(NSString **)hostname onPort:(UInt16 *)port
+{
+  // this function based on firetalk_use_proxy() from old version of Colloquy..
+  
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSDictionary *proxyDict = nil;
+    NSArray *exceptionList = nil;
+  NSEnumerator *exceptions = nil;
+    NSString *object = nil;
+  id val;
+  
+  NSLog(@"orig host => %@:%d", *hostname, *port);
+
+    /* get proxy information */
+    proxyDict = (NSDictionary *)SCDynamicStoreCopyProxies( NULL );
+    [proxyDict autorelease];
+    if( ! proxyDict ) {
+        [pool release];
+        return NO;
+    }
+  
+    /* check if it's an excepted host */
+    exceptionList = [proxyDict objectForKey:(NSString *)kSCPropNetProxiesExceptionsList];
+  exceptions = [exceptionList objectEnumerator];
+    while( (object = [exceptions nextObject]) != nil ) {
+    if( [*hostname rangeOfString: object].location != NSNotFound ) {  // should be case-insensitive?
+//    if( [*hostname hasSuffix:object] ) {
+    
+            [pool release];
+      NSLog(@"excluded");
+            return NO;
+        }
+    }
+
+    /* now check if it's SOCKS */
+  val = [proxyDict objectForKey:(NSString *)kSCPropNetProxiesSOCKSEnable];
+    if( val && ! [[NSNumber numberWithInt:0] isEqualToNumber:val] ) {
+        [pool release];
+    NSLog(@"not implemented");
+        return NO;
+    }
+
+    /* or if we should use HTTPS */
+  val = [proxyDict objectForKey:(NSString *)kSCPropNetProxiesHTTPSEnable];
+    if( val && ! [[NSNumber numberWithInt:0] isEqualToNumber:val] ) {
+    
+    *hostname = [[proxyDict objectForKey:(NSString *)kSCPropNetProxiesHTTPSProxy] retain];
+    *port     = [[proxyDict objectForKey:(NSString *)kSCPropNetProxiesHTTPSPort] intValue];
+    
+        [pool release];
+    
+    NSLog(@"using proxy => %@:%d", *hostname, *port);
+    
+        return YES;
+    }
+
+    [pool release];
+    return NO;
+}
+
+
 - (BOOL) createStreamsToHost:(NSString *)hostname onPort:(UInt16)port error:(NSError **)errPtr
 {
+  origHost = hostname;
+  origPort = port;
+  
+  if ( ! [self getProxyInfoForHost:&hostname onPort:&port] )
+  {
+    // ok, we aren't using a proxy, so nil this back out:
+    origHost = nil;
+  }
+  
     // Create the socket & streams.
     CFStreamCreatePairWithSocketToHost (kCFAllocatorDefault, (CFStringRef)hostname, port, &theReadStream, &theWriteStream);
     if (theReadStream == NULL || theWriteStream == NULL)
@@ -623 +716 @@
     NSError *err = [self getAbortError];
     if (errPtr) *errPtr = err;
     return NO;
-};  
+};
 
 - (BOOL) openStreamsAndReturnError:(NSError **)errPtr
 {
@@ -638 +731 @@
         NSLog (@"AsyncSocket %p couldn't open write stream,", self);
         goto Failed;
     }
+  
     
+  if (origHost != nil)
+  {
+    char buf[255];
+    UInt16 n;
+    
+    const char *host = [origHost UTF8String];
+    
+    // ok, we use a proxy... so we need to take care of interacting with
+    // proxy server now:
+    n = snprintf( buf, sizeof(buf), "CONNECT %s:%hu HTTP/1.1\nProxy-Connection: keep-alive\nConnection: keep-alive\nHost: %s\nUser-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_3; en-us) AppleWebKit/525.18 (KHTML, like Gecko) Version/3.1.1 Safari/525.20\n\n", host, origPort, host );
+    writeFully( theWriteStream, (UInt8 *)buf, n );
+printf("send: %s\n", buf );
+    
+    // for now, this is cheezy.. just look for \r\n without
+    // any error handling:
+    UInt8 lc, c = 0;
+    while(TRUE)
+    {
+      lc = c;
+      int n = CFReadStreamRead( theReadStream, &c, 1 );
+      if(!n)
+        return NO;
+      if( (lc == '\r') && (c == '\n') )
+        break;
+printf("%c",c);
+    }
+    
+    // this is skipped in doStreamOpen if we use a proxy, because the
+    // act of writing to the stream indirectly causes doStreamOpen to
+    // be called.. but we don't actually want to call the delegate until
+    // the above proxy communications are taken care of (otherwise the
+    // delegate could sneek in and write something before the "CONNECT ..."
+    // bit, which really confuses the proxy server:
+    [self doStreamOpen_callDidConnectToHost];
+  }
+  
     return YES;
     
 Failed:;
@@ -648 +778 @@
     return NO;
 }
 
+- (void) doStreamOpen_callDidConnectToHost
+{
+  // Call the delegate.
+    CFDataRef peer = CFSocketCopyPeerAddress (theSocket);
+    theFlags |= kDidCallConnectDeleg;
+    if ([theDelegate respondsToSelector:@selector(socket:didConnectToHost:port:)])
+        [theDelegate socket:self
+             didConnectToHost:[self addressHost:peer]
+            port:[self addressPort:peer]];
+    CFRelease (peer);  
+}
+
 // Called when read or write streams open. When the socket is connected and both streams are open, consider the AsyncSocket instance to be ready.
 - (void) doStreamOpen
 {
@@ -661 +803 @@
             [self closeWithError:err];
         }
         
+        // Immediately deal with any already-queued requests.
+        [self maybeDequeueRead];
+        [self maybeDequeueWrite];
+        
         // Schedule a poll timer to make up for lost ready-to-read/write notifications. This doesn't have to have a tight poll interval, since it is a backup system.
         [thePollTimer invalidate];
         [thePollTimer release];
         thePollTimer = [[NSTimer scheduledTimerWithTimeInterval:POLL_INTERVAL target:self selector:@selector(doPoll:) userInfo:nil repeats:YES] retain];
-
-        // Call the delegate.
-        CFDataRef peer = CFSocketCopyPeerAddress (theSocket);
-        theFlags |= kDidCallConnectDeleg;
-        if ([theDelegate respondsToSelector:@selector(socket:didConnectToHost:port:)])
-            [theDelegate socket:self
-                 didConnectToHost:[self addressHost:peer]
-                             port:[self addressPort:peer]];
-        CFRelease (peer);
-        
-        // Immediately deal with any already-queued requests.
-        [self maybeDequeueRead];
-        [self maybeDequeueWrite];
+    
+    if( origHost == nil )
+      [self doStreamOpen_callDidConnectToHost];
     }
 }
 

Chat

@@ -260 +260 @@
         MVSafeCopyAssign( &_currentNickname, newNickname );
 
     if( connectiongOrConnected )
+{
+printf("sending NICK (2)\n");
         [self sendRawMessageImmediatelyWithFormat:@"NICK %@", newNickname];
 }
+}
 
 - (NSString *) nickname {
     return _currentNickname;
@@ -603 +606 @@
 - (BOOL) socketWillConnect:(AsyncSocket *) sock {
     MVAssertCorrectThreadRequired( _connectionThread );
 
+/* 
+ * Now handled in AsyncSocket:
+ * 
     if( [[self proxyServer] length] && [self proxyServerPort] ) {
         if( _proxy == MVChatConnectionHTTPSProxy || _proxy == MVChatConnectionHTTPProxy ) {
             NSMutableDictionary *settings = [[NSMutableDictionary allocWithZone:nil] init];
@@ -636 +642 @@
             [settings release];
         }
     }
+ * 
+ * maybe following part should be handled in AsyncSocket too??
+ */
 
     if( [self isSecure] ) {
         CFReadStreamSetProperty( [sock getCFReadStream], kCFStreamPropertySocketSecurityLevel, kCFStreamSocketSecurityLevelNegotiatedSSL );
@@ -716 +725 @@
     MVAssertCorrectThreadRequired( _connectionThread );
 
     if( [[self password] length] ) [self sendRawMessageImmediatelyWithFormat:@"PASS %@", [self password]];
+printf("sending NICK\n");
     [self sendRawMessageImmediatelyWithFormat:@"NICK %@", [self preferredNickname]];
     [self sendRawMessageImmediatelyWithFormat:@"USER %@ 0 * :%@", ( [[self username] length] ? [self username] : @"anonymous" ), ( [[self realName] length] ? [self realName] : @"anonymous" )];
 

Chat

@@ -78 +78 @@
     NSTimer *thePollTimer;
     id theDelegate;
     Byte theFlags;
+  
+  NSString *origHost;  // nil if we aren't using a HTTPS proxy
+  UInt16    origPort;  // not valid if we aren't using a HTTPS proxy
 
     long theUserData;
 }