Test

We can't reliably distinguish HTTP data from other data on port 80 when fragmentation is used.
HTTP method code has a special case which tries to find HTTP method when fragmentation = 1 or 2 is used,
but not for other values.

README.md

@@ -18,14 +18,17 @@ Usage: goodbyedpi.exe [OPTION...]
  -s          remove space between host header and its value
  -f [value]  set HTTP fragmentation to value
  -e [value]  set HTTPS fragmentation to value
+ -a          additional space between Method and Request-URI (enables -s, may break sites)
 
- -1          enables all options, -f 2 -e 2 (most compatible mode, default)
- -2          enables all options, -f 2 -e 40 (better speed yet still compatible)
- -3          all options except HTTP fragmentation, -e 40 (even better speed)
- -4          all options except fragmentation (best speed)
+ -1          -p -r -s -f 2 -e 2 (most compatible mode, default)
+ -2          -p -r -s -f 2 -e 40 (better speed yet still compatible)
+ -3          -p -r -s -e 40 (even better speed)
+ -4          -p -r -s (best speed)
 ```
 
-Try to run `goodbyedpi.exe` without any arguments first. If you can open blocked websites it means your ISP has DPI which can be circumvented. This is the slowest mode.
+Try to run `goodbyedpi.exe -1 -a` first. If you can open blocked websites it means your ISP has DPI which can be circumvented. This is the slowest and prone to break websites mode, but suitable for most DPI.
+
+Try `-1` to see if it works too.
 
 Then try `goodbyedpi.exe -2`. It should be faster for HTTPS sites. Mode `-3` speed ups HTTP websites.
 
@@ -35,17 +38,18 @@ Use `goodbyedpi.exe -4` if it works for your ISP's DPI. This is the fastest mode
 
 ### Passive DPI
 
-Most Passive DPI send HTTP 301 Redirect if you try to access blocked website over HTTP and TCP Reset in case of HTTPS, faster than destination website. Packets sent by DPI have always have IP Identification field equal to `0x0000` or `0x0001`, as seen with Russian providers. These packets are blocked by GoodbyeDPI.
+Most Passive DPI send HTTP 302 Redirect if you try to access blocked website over HTTP and TCP Reset in case of HTTPS, faster than destination website. Packets sent by DPI always have IP Identification field equal to `0x0000` or `0x0001`, as seen with Russian providers. These packets, if they redirect you to another website (censorship page), are blocked by GoodbyeDPI.
 
 ### Active DPI
 
-Active DPI is more tricky to fool. Currently the software uses 3 methods to circumvent Active DPI:
+Active DPI is more tricky to fool. Currently the software uses 4 methods to circumvent Active DPI:
 
 * TCP-level fragmentation for first data packet
 * Replacing `Host` header with `hoSt`
 * Removing space between header name and value in `Host` header
+* Adding additional space between HTTP Method (GET, POST etc) and URI
 
-These methods do not break any website as are fully compatible with TCP and HTTP standards, yet it's sufficient to prevent DPI data classification and to circumvent censorship.
+These methods should not break any website as they're fully compatible with TCP and HTTP standards, yet it's sufficient to prevent DPI data classification and to circumvent censorship. Additional space may break some websites, although it's acceptable by HTTP/1.1 specification (see 19.3 Tolerant Applications).
 
 The program loads WinDivert driver which uses Windows Filtering Platform to set filters and redirect packets to the userspace. It's running as long as console window is visible and terminates when you close the window.
 
@@ -61,6 +65,29 @@ And for x86_64:
 
 `make CPREFIX=x86_64-w64-mingw32 WINDIVERTHEADERS=/path/to/windivert/include WINDIVERTLIBS=/path/to/windivert/amd64`
 
+# How to install as Windows Service
+
+One way is using an [srvstart](http://www.rozanski.org.uk/software) program.  
+Unpack it to `goodbyedpi` directory and create 3 files:
+
+*goodbyedpi.ini*
+```INI
+[GoodByeDPI]
+startup=goodbyedpi.exe
+shutdown_method=winmessage
+auto_restart=n
+```
+*srvinstall.bat*
+```Batchfile
+srvstart install GoodByeDPI -c %CD%\goodbyedpi.ini
+```
+*srvremove.bat*
+```Batchfile
+srvstart remove GoodByeDPI
+```
+Run these batch files as Administrator to install/remove service.  
+Open Windows Services panel to run service or make it start automaticaly.
+
 # Similar projects
 
 [zapret](https://github.com/bol-van/zapret) by @bol-van (for Linux).

goodbyedpi.c

@@ -20,6 +20,21 @@
 #define TCP_HDR_LEN 20
 #define IPV4_TOTALLEN_OFFSET 2
 #define TCP_WINDOWSIZE_OFFSET 14
+
+#define DIVERT_NO_LOCALNETS_DST "(" \
+                   "(ip.DstAddr < 127.0.0.1 or ip.DstAddr > 127.255.255.255) and " \
+                   "(ip.DstAddr < 10.0.0.0 or ip.DstAddr > 10.255.255.255) and " \
+                   "(ip.DstAddr < 192.168.0.0 or ip.DstAddr > 192.168.255.255) and " \
+                   "(ip.DstAddr < 172.16.0.0 or ip.DstAddr > 172.31.255.255) and " \
+                   "(ip.DstAddr < 169.254.0.0 or ip.DstAddr > 169.254.255.255)" \
+                   ")"
+#define DIVERT_NO_LOCALNETS_SRC "(" \
+                   "(ip.SrcAddr < 127.0.0.1 or ip.SrcAddr > 127.255.255.255) and " \
+                   "(ip.SrcAddr < 10.0.0.0 or ip.SrcAddr > 10.255.255.255) and " \
+                   "(ip.SrcAddr < 192.168.0.0 or ip.SrcAddr > 192.168.255.255) and " \
+                   "(ip.SrcAddr < 172.16.0.0 or ip.SrcAddr > 172.31.255.255) and " \
+                   "(ip.SrcAddr < 169.254.0.0 or ip.SrcAddr > 169.254.255.255)" \
+                   ")"
     
 static HANDLE filters[MAX_FILTERS];
 static int filter_num = 0;
@@ -27,7 +42,18 @@ static const char *http10_redirect_302 = "HTTP/1.0 302 ";
 static const char *http11_redirect_302 = "HTTP/1.1 302 ";
 static const char *http_host_find = "\r\nHost: ";
 static const char *http_host_replace = "\r\nhoSt: ";
+static const char *http_useragent_find = "\r\nUser-Agent: ";
 static const char *location_http = "\r\nLocation: http://";
+static const char *connection_close = "\r\nConnection: close";
+static const char *http_methods[] = {
+    "GET ",
+    "HEAD ",
+    "POST ",
+    "PUT ",
+    "DELETE ",
+    "CONNECT ",
+    "OPTIONS ",
+};
 
 static char* dumb_memmem(const char* haystack, int hlen, const char* needle, int nlen) {
     // naive implementation
@@ -42,9 +68,15 @@ static char* dumb_memmem(const char* haystack, int hlen, const char* needle, int
 }
 
 static HANDLE init(char *filter, UINT64 flags) {
+    LPTSTR errormessage = NULL;
     filter = WinDivertOpen(filter, WINDIVERT_LAYER_NETWORK, 0, flags);
     if (filter != INVALID_HANDLE_VALUE)
         return filter;
+    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
+                  FORMAT_MESSAGE_IGNORE_INSERTS,
+                  NULL, GetLastError(), MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
+                  (LPTSTR)&errormessage, 0, NULL);
+    printf("%s", errormessage);
     return NULL;
 }
 
@@ -72,8 +104,9 @@ static int is_passivedpi_redirect(const char *pktdata, int pktlen) {
     if (memcmp(pktdata, http11_redirect_302, strlen(http11_redirect_302)) == 0 ||
         memcmp(pktdata, http10_redirect_302, strlen(http10_redirect_302)) == 0)
     {
-        /* Then check if this is a redirect to new http site */
-        if (dumb_memmem(pktdata, pktlen, location_http, strlen(location_http))) {
+        /* Then check if this is a redirect to new http site with Connection: close */
+        if (dumb_memmem(pktdata, pktlen, location_http, strlen(location_http)) &&
+            dumb_memmem(pktdata, pktlen, connection_close, strlen(connection_close))) {
             return 1;
         }
     }
@@ -86,14 +119,39 @@ static PVOID find_host_header(const char *pktdata, int pktlen) {
                 http_host_find, strlen(http_host_find));
 }
 
-static void change_window_size(char *pkt, int size) {
+/* Finds User-Agent header with \r\n before it */
+static PVOID find_useragent_header(const char *pktdata, int pktlen) {
+    return dumb_memmem(pktdata, pktlen,
+                http_useragent_find, strlen(http_useragent_find));
+}
+
+static void change_window_size(const char *pkt, int size) {
     *(uint16_t*)(pkt + IPV4_HDR_LEN + TCP_WINDOWSIZE_OFFSET) = htons(size);
 }
 
+/* HTTP method end without trailing space */
+static PVOID find_http_method_end(const char *pkt, int offset) {
+    int i;
+    for (i = 0; i<(sizeof(http_methods) / sizeof(*http_methods)); i++) {
+        if (memcmp(pkt, http_methods[i], strlen(http_methods[i])) == 0) {
+            return (char*)pkt + strlen(http_methods[i]) - 1;
+        }
+        /* Try to find HTTP method in a second part of fragmented packet */
+        if ((offset == 1 || offset == 2) &&
+            memcmp(pkt, http_methods[i] + offset,
+                   strlen(http_methods[i]) - offset) == 0
+           )
+        {
+            return (char*)pkt + strlen(http_methods[i]) - offset - 1;
+        }
+    }
+    return NULL;
+}
+
 int main(int argc, char *argv[]) {
     static const char fragment_size_message[] =
                 "Fragment size should be in range [0 - 65535]\n";
-    int i, should_reinject = 0;
+    int i, should_reinject, should_recalc_checksum = 0;
     int opt;
     HANDLE w_filter = NULL;
     WINDIVERT_ADDRESS addr;
@@ -106,11 +164,11 @@ int main(int argc, char *argv[]) {
 
     int do_passivedpi = 0, do_fragment_http = 0,
         do_fragment_https = 0, do_host = 0,
-        do_host_removespace = 0;
+        do_host_removespace = 0, do_additional_space = 0;
     int http_fragment_size = 2;
     int https_fragment_size = 2;
-    char *data_addr, *data_addr_rn, *host_addr;
-    int host_len, fromhost_uptoend_len;
+    char *data_addr, *data_addr_rn, *host_addr, *useragent_addr, *method_addr;
+    int data_len, host_len;
 
     printf("GoodbyeDPI: Passive DPI blocker and Active DPI circumvention utility\n");
 
@@ -120,7 +178,7 @@ int main(int argc, char *argv[]) {
             = do_fragment_http = do_fragment_https = 1;
     }
 
-    while ((opt = getopt(argc, argv, "1234prsf:e:")) != -1) {
+    while ((opt = getopt(argc, argv, "1234prsaf:e:")) != -1) {
         switch (opt) {
             case '1':
                 do_passivedpi = do_host = do_host_removespace \
@@ -147,6 +205,10 @@ int main(int argc, char *argv[]) {
             case 's':
                 do_host_removespace = 1;
                 break;
+            case 'a':
+                do_additional_space = 1;
+                do_host_removespace = 1;
+                break;
             case 'f':
                 do_fragment_http = 1;
                 http_fragment_size = atoi(optarg);
@@ -168,42 +230,58 @@ int main(int argc, char *argv[]) {
                 " -p          block passive DPI\n"
                 " -r          replace Host with hoSt\n"
                 " -s          remove space between host header and its value\n"
+                " -a          additional space between Method and Request-URI (enables -s, may break sites)\n"
                 " -f [value]  set HTTP fragmentation to value\n"
                 " -e [value]  set HTTPS fragmentation to value\n"
                 "\n"
-                " -1          enables all options, -f 2 -e 2 (most compatible mode, default)\n"
-                " -2          enables all options, -f 2 -e 40 (better speed yet still compatible)\n"
-                " -3          all options except HTTP fragmentation, -e 40 (even better speed)\n"
-                " -4          all options except fragmentation (best speed)\n");
+                " -1          -p -r -s -f 2 -e 2 (most compatible mode, default)\n"
+                " -2          -p -r -s -f 2 -e 40 (better speed yet still compatible)\n"
+                " -3          -p -r -s -e 40 (even better speed)\n"
+                " -4          -p -r -s (best speed)\n");
                 exit(EXIT_FAILURE);
         }
     }
 
     printf("Block passive: %d, Fragment HTTP: %d, Fragment HTTPS: %d, "
-           "hoSt: %d, Host no space: %d\n",
+           "hoSt: %d, Host no space: %d, Additional space: %d\n",
            do_passivedpi, (do_fragment_http ? http_fragment_size : 0),
            (do_fragment_https ? https_fragment_size : 0),
-           do_host, do_host_removespace);
+           do_host, do_host_removespace, do_additional_space);
+
+    if (do_fragment_http && http_fragment_size > 2) {
+        printf("WARNING: HTTP fragmentation values > 2 are not fully compatible "
+               "with other options. Please use values <= 2 or disable HTTP fragmentation "
+               "completely.\n");
+    }
 
     printf("\nOpening filter\n");
     filter_num = 0;
 
     if (do_passivedpi) {
-        /* Filter for inbound RST packets with ID = 0 or 1 */
-        filters[filter_num] = init("inbound and (ip.Id == 0x0001 or ip.Id == 0x0000) and "
-                        "(tcp.SrcPort == 443 or tcp.SrcPort == 80) and tcp.Rst",
-                        WINDIVERT_FLAG_DROP);
+        /* IPv4 filter for inbound RST packets with ID = 0 or 1 */
+        filters[filter_num] = init(
+            "inbound and ip and tcp and "
+            "(ip.Id == 0x0001 or ip.Id == 0x0000) and "
+            "(tcp.SrcPort == 443 or tcp.SrcPort == 80) and tcp.Rst and "
+            DIVERT_NO_LOCALNETS_SRC,
+            WINDIVERT_FLAG_DROP);
         filter_num++;
     }
 
     /* 
-     * Filter for inbound HTTP redirection packets and
+     * IPv4 filter for inbound HTTP redirection packets and
      * active DPI circumvention
      */
-    filters[filter_num] = init("(inbound and (ip.Id == 0x0001 or ip.Id == 0x0000) and tcp.SrcPort == 80 and tcp.Ack) "
-                      "or (inbound and (tcp.SrcPort == 80 or tcp.SrcPort == 443) and tcp.Ack and tcp.Syn) "
-                      "or (outbound and (tcp.DstPort == 80 or tcp.DstPort == 443) and tcp.Ack)",
-                      0);
+    filters[filter_num] = init("ip and tcp and "
+        "(inbound and (("
+         "((ip.Id == 0x0001 or ip.Id == 0x0000) and tcp.SrcPort == 80 and tcp.Ack) or "
+         "((tcp.SrcPort == 80 or tcp.SrcPort == 443) and tcp.Ack and tcp.Syn)"
+         ") and " DIVERT_NO_LOCALNETS_SRC ") or "
+        "(outbound and "
+         "(tcp.DstPort == 80 or tcp.DstPort == 443) and tcp.Ack and "
+         DIVERT_NO_LOCALNETS_DST ")"
+        ")",
+        0);
 
     w_filter = filters[filter_num];
     filter_num++;
@@ -217,85 +295,35 @@ int main(int argc, char *argv[]) {
     signal(SIGINT, sigint_handler);
 
     while (1) {
-        if (WinDivertRecv(w_filter, packet, sizeof(packet), &addr, &packetLen)) {
-            //printf("Got %s packet, len=%d!\n", addr.Direction ? "inbound" : "outbound",
-            //       packetLen);
-            should_reinject = 1;
+         if (WinDivertRecv(w_filter, packet, sizeof(packet), &addr, &packetLen)) {
+            printf("Got %s packet, len=%d!\n", addr.Direction ? "inbound" : "outbound",
+                   packetLen);
 
+            // do nothing for DATA packet
             if (WinDivertHelperParsePacket(packet, packetLen, &ppIpHdr,
                 NULL, NULL, NULL, &ppTcpHdr, NULL, &packet_data, &packet_dataLen)) {
-                //printf("Got parsed packet, len=%d!\n", packet_dataLen);
-                /* Got a packet WITH DATA */
-
-                /* Handle INBOUND packet with data and find HTTP REDIRECT in there */
-                if (addr.Direction == WINDIVERT_DIRECTION_INBOUND && packet_dataLen > 16) {
-                    /* If INBOUND packet with DATA (tcp.Ack) */
-
-                    /* Drop packets from filter with HTTP 30x Redirect */
-                    if (do_passivedpi && is_passivedpi_redirect(packet_data, packet_dataLen)) {
-                        //printf("Dropping HTTP Redirect packet!\n");
-                        should_reinject = 0;
-                    }
-                }
-                /* Handle OUTBOUND packet, search for Host header */
-                else if (addr.Direction == WINDIVERT_DIRECTION_OUTBOUND && 
-                         packet_dataLen > 16 && ppTcpHdr->DstPort == htons(80) &&
-                        (do_host || do_host_removespace)) {
-
-                    data_addr = find_host_header(packet_data, packet_dataLen);
-
-                    if (do_host && data_addr) {
-                        /* Replace "Host: " with "hoSt: " */
-                        memcpy(data_addr, http_host_replace, strlen(http_host_replace));
-                        //printf("Replaced Host header!\n");
-                    }
-
-                    if (do_host_removespace && data_addr) {
-                        host_addr = data_addr + strlen(http_host_find);
-
-                        fromhost_uptoend_len = packet_dataLen - ((PVOID)host_addr - packet_data);
-                        data_addr_rn = dumb_memmem(host_addr,
-                                                    fromhost_uptoend_len,
-                                                    "\r\n", 2);
-                        if (data_addr_rn) {
-                            host_len = data_addr_rn - host_addr;
-                            if (host_len <= 64) {
-                                /* Move memory left by 1 byte and reduce packet size for 1 byte */
-                                memmove(host_addr - 1, host_addr, fromhost_uptoend_len);
-                                /* Reduce "Total Length" in IP header by 1 byte */
-                                *(uint16_t*)(packet + IPV4_TOTALLEN_OFFSET) = ntohs(
-                                     htons(*(uint16_t*)(packet + IPV4_TOTALLEN_OFFSET)) - 1);
-                                /* Reduce packetLen by 1 byte */
-                                packetLen--;
-                                //printf("Replaced Host header!\n");
-                            }
-                        }
-                    }
-                    WinDivertHelperCalcChecksums(packet, packetLen, 0);
-                }
             }
-            /* Else if we got TCP packet without data */
+
+            // reduce window size on non-data packet
             else if (WinDivertHelperParsePacket(packet, packetLen, &ppIpHdr,
                 NULL, NULL, NULL, &ppTcpHdr, NULL, NULL, NULL)) {
                 /* If we got SYN+ACK packet */
                 if (addr.Direction == WINDIVERT_DIRECTION_INBOUND && 
                     ppTcpHdr->Syn == 1) {
-                    //printf("Changing Window Size!\n");
-                    if (do_fragment_http && ppTcpHdr->DstPort == htons(80)) {
+                    printf("Changing Window Size!\n");
+                    if (do_fragment_http && ppTcpHdr->SrcPort == htons(80)) {
                         change_window_size(packet, http_fragment_size);
                         WinDivertHelperCalcChecksums(packet, packetLen, 0);
                     }
-                    else if (do_fragment_https && ppTcpHdr->DstPort != htons(80)) {
+                    else if (do_fragment_https && ppTcpHdr->SrcPort != htons(80)) {
                         change_window_size(packet, https_fragment_size);
                         WinDivertHelperCalcChecksums(packet, packetLen, 0);
                     }
                 }
             }
-
-            if (should_reinject) {
-                //printf("Re-injecting!\n");
-                WinDivertSend(w_filter, packet, packetLen, &addr, NULL);
-            }
+            // uncomment this to make it work
+            //WinDivertHelperCalcChecksums(packet, packetLen, 0);
+            WinDivertSend(w_filter, packet, packetLen, &addr, NULL);
         }
         else {
             // error, ignore