handling data from the client properly for gzdecoding and
authorPaul J R <me@pjr.cc>
Thu, 25 Oct 2012 06:14:31 +0000 (17:14 +1100)
committerPaul J R <me@pjr.cc>
Thu, 25 Oct 2012 06:14:31 +0000 (17:14 +1100)
receiving/sending properly.... painful experience

gwvpmini/gwvpmini_gitbackend.php

index 27ccee7..424c108 100644 (file)
@@ -289,14 +289,6 @@ function gwvpmini_callGitBackend($username, $repo)
                
                error_log("path trans'd is /$repo_base/$repo.git/$euri from $ruri with ".$_REQUEST["q"]." $strrem pre is ".print_r($_REQUEST,true)." and foff ".print_r($headers, true));
                
-               if(isset($headers["Content-Encoding"])) {
-                       if($headers["Content-Encoding"] == "gzip") {
-                               error_log("DAM YOU GIT CLIENT");
-                       }
-               }
-               
-               
-
                $pwd = "/$repo_base/";
                
                $proc = proc_open("/usr/lib/git-core/git-http-backend", array(array("pipe","rb"),array("pipe","wb"),array("file","/tmp/err", "a")), $pipes, $pwd, $procenv);
@@ -332,19 +324,29 @@ function gwvpmini_callGitBackend($username, $repo)
                
                $stlimit = 0;
                $fp = fopen("/tmp/gitup.".rand(0,4000000), "w");
+               $from_client_data = "";
                // i was going to use stream_select, but i feel this works better like this
                while($continue) {
                        // do client
+                       
+                       // lets start again....
+                               
                        if(!feof($fh)) {
-                               $from_client_data = fread($fh,8192);
+                               if(isset($headers["Content-Length"])) {
+                                       $cl = $headers["Content-Length"];
+                                       while(strlen($from_client_data) < $cl) {
+                                               error_log("re-read ".strlen($from_client_data));
+                                               $from_client_data .= fread($fh, $cl);
+                                       }
+                               } else  $from_client_data = fread($fh,8192);
                                
-                               // TODO: BIG TODO: must rewrite this bit. I need to read the entire client bit if its posting in one piece so i can then decode.
-                               // if the client sends more then 8192, i could be very well screwed. must handle content-length on read...
+                               // TODO: BIG TODO: must rewrite this bit. its ugly as sin, it works, but it probably shouldnt.
                                
                                if(isset($headers["Content-Encoding"])) {
                                        if($headers["Content-Encoding"] == "gzip") {
                                                //error_log("DAM YOU GIT CLIENT and your retarded gzip encoding");
                                                $from_client_data = gzinflate(substr($from_client_data, 10));
+                                               //$from_client_data = gzdecode($from_client_data);
                                        }
                                }
                                if($from_client_data !== false) {
@@ -389,6 +391,7 @@ function gwvpmini_callGitBackend($username, $repo)
                                }
                                
                                if($from_cgi_data !== false) {
+                                       error_log("send to client");
                                        echo $from_cgi_data;
                                        flush();
                                }
@@ -398,18 +401,20 @@ function gwvpmini_callGitBackend($username, $repo)
                                $cgi_len = 0;
                        }
                        
+                       flush();
+                       
                        if(feof($pipes[1])) $continue = false;
                        else {
                                if($client_len == 0 && $cgi_len == 0) {
                                        usleep(200000);
                                        error_log("sleep tick");
                                        $stlimit++;
-                                       if($stlimit > 50) $continue = false;
+                                       if($stlimit > 5000) $continue = false;
                                } else {
                                        $stlimit = 0;
                                        error_log("sizes: $client_len, $cgi_len");
                                        if($cgi_len > 0) {
-                                               error_log("from cgi: \"$from_cgi_data\"");
+                                               //error_log("from cgi: \"$from_cgi_data\"");
                                        }
                                }
                        }
@@ -480,4 +485,115 @@ function gwvpmini_createGitRepo($name, $ownerid, $desc, $defperms, $clonefrom, $
        return true;
 }
 
+function gzdecode($data,&$filename='',&$error='',$maxlength=null)\r
+{\r
+       $len = strlen($data);\r
+       if ($len < 18 || strcmp(substr($data,0,2),"\x1f\x8b")) {\r
+               $error = "Not in GZIP format.";\r
+               return null;  // Not GZIP format (See RFC 1952)\r
+       }\r
+       $method = ord(substr($data,2,1));  // Compression method\r
+       $flags  = ord(substr($data,3,1));  // Flags\r
+       if ($flags & 31 != $flags) {\r
+               $error = "Reserved bits not allowed.";\r
+               return null;\r
+       }\r
+       // NOTE: $mtime may be negative (PHP integer limitations)\r
+       $mtime = unpack("V", substr($data,4,4));\r
+       $mtime = $mtime[1];\r
+       $xfl   = substr($data,8,1);\r
+       $os    = substr($data,8,1);\r
+       $headerlen = 10;\r
+       $extralen  = 0;\r
+       $extra     = "";\r
+       if ($flags & 4) {\r
+               // 2-byte length prefixed EXTRA data in header\r
+               if ($len - $headerlen - 2 < 8) {\r
+                       return false;  // invalid\r
+               }\r
+               $extralen = unpack("v",substr($data,8,2));\r
+               $extralen = $extralen[1];\r
+               if ($len - $headerlen - 2 - $extralen < 8) {\r
+                       return false;  // invalid\r
+               }\r
+               $extra = substr($data,10,$extralen);\r
+               $headerlen += 2 + $extralen;\r
+       }\r
+       $filenamelen = 0;\r
+       $filename = "";\r
+       if ($flags & 8) {\r
+               // C-style string\r
+               if ($len - $headerlen - 1 < 8) {\r
+                       return false; // invalid\r
+               }\r
+               $filenamelen = strpos(substr($data,$headerlen),chr(0));\r
+               if ($filenamelen === false || $len - $headerlen - $filenamelen - 1 < 8) {\r
+                       return false; // invalid\r
+               }\r
+               $filename = substr($data,$headerlen,$filenamelen);\r
+               $headerlen += $filenamelen + 1;\r
+       }\r
+       $commentlen = 0;\r
+       $comment = "";\r
+       if ($flags & 16) {\r
+               // C-style string COMMENT data in header\r
+               if ($len - $headerlen - 1 < 8) {\r
+                       return false;    // invalid\r
+               }\r
+               $commentlen = strpos(substr($data,$headerlen),chr(0));\r
+               if ($commentlen === false || $len - $headerlen - $commentlen - 1 < 8) {\r
+                       return false;    // Invalid header format\r
+               }\r
+               $comment = substr($data,$headerlen,$commentlen);\r
+               $headerlen += $commentlen + 1;\r
+       }\r
+       $headercrc = "";\r
+       if ($flags & 2) {\r
+               // 2-bytes (lowest order) of CRC32 on header present\r
+               if ($len - $headerlen - 2 < 8) {\r
+                       return false;    // invalid\r
+               }\r
+               $calccrc = crc32(substr($data,0,$headerlen)) & 0xffff;\r
+               $headercrc = unpack("v", substr($data,$headerlen,2));\r
+               $headercrc = $headercrc[1];\r
+               if ($headercrc != $calccrc) {\r
+                       $error = "Header checksum failed.";\r
+                       return false;    // Bad header CRC\r
+               }\r
+               $headerlen += 2;\r
+       }\r
+       // GZIP FOOTER\r
+       $datacrc = unpack("V",substr($data,-8,4));\r
+       $datacrc = sprintf('%u',$datacrc[1] & 0xFFFFFFFF);\r
+       $isize = unpack("V",substr($data,-4));\r
+       $isize = $isize[1];\r
+       // decompression:\r
+       $bodylen = $len-$headerlen-8;\r
+       if ($bodylen < 1) {\r
+               // IMPLEMENTATION BUG!\r
+               return null;\r
+       }\r
+       $body = substr($data,$headerlen,$bodylen);\r
+       $data = "";\r
+       if ($bodylen > 0) {\r
+               switch ($method) {\r
+                       case 8:\r
+                               // Currently the only supported compression method:\r
+                               $data = gzinflate($body,$maxlength);\r
+                               break;\r
+                       default:\r
+                               $error = "Unknown compression method.";\r
+                               return false;\r
+               }\r
+       }  // zero-byte body content is allowed\r
+       // Verifiy CRC32\r
+       $crc   = sprintf("%u",crc32($data));\r
+       $crcOK = $crc == $datacrc;\r
+       $lenOK = $isize == strlen($data);\r
+       if (!$lenOK || !$crcOK) {\r
+               $error = ( $lenOK ? '' : 'Length check FAILED. ') . ( $crcOK ? '' : 'Checksum FAILED.');\r
+               return false;\r
+       }\r
+       return $data;\r
+}
 ?>
\ No newline at end of file