Changeset 7735

Timestamp:

03/21/07 19:35:12 (22 months ago)

Author:

BradNeuberg

Message:

Created infrastructure to be able to give a 'testDomain' and a 'testDomainAddress' to test disconnected web applications on your own local machine -- Polipo doesn't look up the etc/hosts file, which would be difficult to parse, so we use this as an alternative. Tested on Safari, Firefox, and IE on Windows and Mac/x86

Location:

trunk/src/dot

Files:

• Makefile (modified) (1 diff)
• proxy-build/mac/x86/config (modified) (1 diff)
• proxy-build/mac/x86/dot (modified) (previous)
• proxy-build/win/config (modified) (1 diff)
• proxy-build/win/dot.exe (modified) (previous)
• proxy/client.c (modified) (2 diffs)
• proxy/client.h (modified) (1 diff)
• proxy/config.mac (modified) (1 diff)
• proxy/config.sample (modified) (1 diff)
• proxy/config.win (modified) (1 diff)
• proxy/http.c (modified) (2 diffs)
• proxy/http.h (modified) (1 diff)
• proxy/local.c (modified) (2 diffs)

trunk/src/dot/Makefile

@@ -35 +35 @@
         cp -f proxy/config.win proxy-build/win/config
         cp -f proxy/default-pac proxy-build/win/.offline-pac
+        cp -f proxy/default-pac proxy-build/win/offline-pac
 
 run:

trunk/src/dot/proxy-build/mac/x86/config

@@ -41 +41 @@
 # socksParentProxy = "localhost:9050"
 # socksProxyType = socks5
+
+# A test URL that will actually resolve to the address given by 
+# 'testDomainAddress'; useful because Polipo does not resolve your local 
+# etc/hosts.conf file, which can
+# make testing disconnected web applications running on your local machine
+# difficult
+testDomain = "brad.com"
+testDomainAddress = "127.0.0.1"
 
 

trunk/src/dot/proxy-build/win/config

@@ -41 +41 @@
 # socksParentProxy = "localhost:9050"
 # socksProxyType = socks5
+
+# A test URL that will actually resolve to the address given by 
+# 'testDomainAddress'; useful because Polipo does not resolve your local 
+# etc/hosts.conf file, which can
+# make testing disconnected web applications running on your local machine
+# difficult
+testDomain = "brad.com"
+testDomainAddress = "192.168.1.108"
 
 

trunk/src/dot/proxy/client.c

@@ -870 +870 @@
        URL then remove it. */
     url = removeBrowserBust(url);
+    
+    /* if the domain is a fake domain, such as brad.com, that should
+       actually resolve against the local host then transform it. */
+    url = handleTestDomain(url);
 
     i = httpParseHeaders(1, url,
@@ -2321 +2325 @@
     return internAtom(buffer);
 }
+
+/** Inside of the Polipo configuration file, a fake 'testDomain' 
+    can be specified that will actually resolve to the address
+    given in 'testDomainAddress', such as 127.0.0.1; this can be 
+    useful for testing disconnected web applications that are 
+    running on your local laptop. */
+AtomPtr handleTestDomain(AtomPtr url){
+    char buffer[4096];
+    char *paramLoc = NULL;
+    char *testDomainPtr = NULL;
+    int finalLength, end, urlLoc, bufferLoc, finishedFinding = 0;
+    
+    assert(url != NULL);
+    
+    if(urlIsLocal(url->string, url->length))
+        return url;
+    
+    if(testDomain == NULL || testDomainAddress == NULL)
+        return url;
+        
+    /* prevent buffer overflow attack */
+    /* the length after we have replaced the domain in 
+        'testDomain' with 'testDomainAddress' */
+    finalLength = url->length - testDomain->length 
+                    + testDomainAddress->length;
+    if(finalLength >= 4095)
+        return url;
+    
+    /* do we have the test domain in our url? */    
+    paramLoc = strstr(url->string, testDomain->string);
+    if(paramLoc == NULL)
+        return url;
+        
+    /* convert this into an actual location now using
+       pointer arithmetic */
+    end = paramLoc - url->string;
+        
+    /* copy up to this into our buffer */
+    strncpy(buffer, url->string, end);
+    buffer[end] = '\0';
+    
+    /* now add the new address */
+    strncat(buffer, testDomainAddress->string, 
+            testDomainAddress->length);
+    bufferLoc = strlen(buffer);
+    
+    /* in the original string, find where the end of
+        testDomain is */
+    testDomainPtr = testDomain->string;
+    while(finishedFinding == 0){
+        if(*testDomainPtr != *paramLoc){
+            finishedFinding = 1;
+            break;
+        }
+        paramLoc++;
+        testDomainPtr++;
+    }
+    urlLoc = paramLoc - url->string;
+    
+    /* now add the rest of this to our buffer */
+    while(urlLoc < url->length){
+        buffer[bufferLoc] = url->string[urlLoc];
+        bufferLoc++;
+        urlLoc++;
+    }
+    buffer[bufferLoc] = '\0';
+    
+    /* decommision the old AtomPtr and create a new one */
+    releaseAtom(url);
+    return internAtom(buffer);
+}

trunk/src/dot/proxy/client.h

@@ -67 +67 @@
                            StreamRequestPtr srequest);
 AtomPtr removeBrowserBust(AtomPtr url);
+AtomPtr handleTestDomain(AtomPtr url);

trunk/src/dot/proxy/config.mac

@@ -41 +41 @@
 # socksParentProxy = "localhost:9050"
 # socksProxyType = socks5
+
+# A test URL that will actually resolve to the address given by 
+# 'testDomainAddress'; useful because Polipo does not resolve your local 
+# etc/hosts.conf file, which can
+# make testing disconnected web applications running on your local machine
+# difficult
+testDomain = "brad.com"
+testDomainAddress = "127.0.0.1"
 
 

trunk/src/dot/proxy/config.sample

@@ -42 +42 @@
 # socksProxyType = socks5
 
+# A test URL that will actually resolve to the address given by 
+# 'testDomainAddress'; useful because Polipo does not resolve your local 
+# etc/hosts.conf file, which can
+# make testing disconnected web applications running on your local machine
+# difficult
+# testDomain = "brad.com"
+# testDomainAddress = "127.0.0.1"
 
 ### Memory

trunk/src/dot/proxy/config.win

@@ -41 +41 @@
 # socksParentProxy = "localhost:9050"
 # socksProxyType = socks5
+
+# A test URL that will actually resolve to the address given by 
+# 'testDomainAddress'; useful because Polipo does not resolve your local 
+# etc/hosts.conf file, which can
+# make testing disconnected web applications running on your local machine
+# difficult
+testDomain = "brad.com"
+testDomainAddress = "192.168.1.108"
 
 

trunk/src/dot/proxy/http.c

@@ -69 +69 @@
 
 int disableVia = 1;
+
+AtomPtr testDomain = NULL;
+AtomPtr testDomainAddress = NULL;
 
 /* 0 means that all failures lead to errors.  1 means that failures to
@@ -124 +127 @@
     CONFIG_VARIABLE(dontTrustVaryETag, CONFIG_TRISTATE,
                     "Whether to trust the ETag when there's Vary.");
+    CONFIG_VARIABLE(testDomain, CONFIG_ATOM,
+                    "Fake domain for resolving against 'testDomainAddress' for testing purposes.");
+    CONFIG_VARIABLE(testDomainAddress, CONFIG_ATOM,
+                    "The address to resolve for 'testDomain'.");
     preinitHttpParser();
 }

trunk/src/dot/proxy/http.h

@@ -142 +142 @@
 extern int disableVia;
 extern int dontTrustVaryETag;
+extern AtomPtr testDomain;
+extern AtomPtr testDomainAddress;
 
 void preinitHttp(void);

trunk/src/dot/proxy/local.c

@@ -173 +173 @@
     cut_length = (cut_end - cut_start) + 2;
     host_ptr = (char *)malloc((unsigned) cut_length);
+    if(host_ptr == NULL)
+        return -1;
     cut_ptr = host_ptr;
     for(index = cut_start; index <= cut_end 
@@ -186 +188 @@
 
     *host_results = host_ptr;
+    
+    /* if we have a 'testDomain', transform this host into
+        our 'testDomainAddress' value given in the config file. */
+    if(testDomain == NULL || testDomainAddress == NULL)
+        return 1;
+    
+    if(strlen(host_ptr) != testDomain->length)
+        return 1;
+        
+    if(strcmp(host_ptr, testDomain->string) != 0)
+        return 1;
+        
+    /* change the host to our full testDomainAddress */
+    free(host_ptr);
+    host_ptr = (char *)malloc((unsigned int)(testDomainAddress->length + 1));
+    if(host_ptr == NULL)
+        return -1;
+    strcpy(host_ptr, testDomainAddress->string);
+    *host_results = host_ptr;
+    
     return 1;
 }