}
-function gwvpmini_CreateRepoHooks($repopath, $cmdpath)
+function gwvpmini_CreateRepoHooks($repopath, $cmdpath, $reponame)
{
$fp = fopen("$repopath/hooks/pre-receive", "w");
if(!$fp) error_log("could not create pre-receive hook");
// TODO: think about this one
- $script = '#!/bin/bash'."\n\n".'DCOMMIT=`cat`'."\n".'START=`echo $DCOMMIT|cut -d " " -f 1`'."\n".'END=`echo $DCOMMIT|cut -d " " -f 2`'."\n".'REF=`echo $DCOMMIT|cut -d " " -f 3`'."\n\n";
- $script .= "php $cmdpath pre-receive ";
- $script .= '$START $END $REF'."\n\n";
+ //$script = '#!/bin/bash'."\n\n".'DCOMMIT=`cat`'."\n".'START=`echo $DCOMMIT|cut -d " " -f 1`'."\n".'END=`echo $DCOMMIT|cut -d " " -f 2`'."\n".'REF=`echo $DCOMMIT|cut -d " " -f 3`'."\n\n";
+ $script = "#!/bin/bash\n\nDCOMMIT=".'`cat`'."\n\nphp $cmdpath $reponame \$REMOTE_USER pre-receive \$DCOMMIT\n\n";
fwrite($fp, $script);
fclose($fp);
if(!$fp) error_log("could not create update hook");
// TODO: think about this one
- $script = "#!/bin/bash\n\n";
- $script .= "php $cmdpath update ";
- $script .= '$1 $2 $3'."\n\n";
+ unset($script);
+ $script = "#!/bin/bash\n\nphp $cmdpath $reponame \$REMOTE_USER update \$1 \$2 \$3\n\n";
fwrite($fp, $script);
fclose($fp);
/* bizare git problem that ignores 403's or continues on with a push despite them
- error_log("FLAP for ".$_SERVER["REQUEST_URI"]);
+ // error_log("FLAP for ".$_SERVER["REQUEST_URI"]);
if(isset($_REQUEST)) {
$dump = print_r($_REQUEST, true);
- error_log("FLAP, $dump");
+ // error_log("FLAP, $dump");
}
if(isset($_SERVER["PHP_AUTH_USER"])) {
- error_log("FLAP: donut hole");
+ // error_log("FLAP: donut hole");
}*/
-
+ error_log("REQUESTINBACKEND: ".print_r($_REQUEST, true));
$repo = "";
$repoid = false;
// we do an update server cause its weird and i cant figure out when it actually needs to happen
chdir("$repo_base/$repo.git");
- exec("/usr/bin/git update-server-info");
+ // dont believe i have to do this
+ //exec("/usr/bin/git update-server-info");
if(!file_exists("$repo_base/$repo.git/hooks/pre-receive") || !file_exists("$repo_base/$repo.git/hooks/update")) {
- error_log("WRITING HOOKS");
- gwvpmini_CreateRepoHooks("$repo_base/$repo.git", $cmd_line_tool);
+ // error_log("WRITING HOOKS");
+ gwvpmini_CreateRepoHooks("$repo_base/$repo.git", $cmd_line_tool, $repo);
}
$write = false;
if(isset($_REQUEST["service"])) {
if($_REQUEST["service"] == "git-receive-pack") {
- error_log("got write as receivepack in post");
+ // error_log("got write as receivepack in post");
$write = true;
}
}
-
+ if(preg_match("/.*git-receive-pack$/", $_REQUEST["q"])) $write = true;
//$write = true;
// THIS MAY CAUSE ISSUES LATER ON but we do it cause the git client ignores our 403 when it uses git-receive-pack after an auth
// no, this isnt a solution cause auth'd read attempts will come up as writes...
// next, figure out permissions for repo
$rid = gwvpmini_GetRepoId($repo);
$uid = -1;
- error_log("AT THIS POINT WE HAVE $uid, $rid, $repo $person");
+ // error_log("AT THIS POINT WE HAVE $uid, $rid, $repo $person");
if(!$person) {
if($write) {
- error_log("ASK FOR BASIC AUTH");
+ // error_log("ASK FOR BASIC AUTH");
gwvpmini_AskForBasicAuth();
return;
} else {
$perm = gwvpmini_GetRepoPerm($rid, "a");
if($perm < 1) {
- error_log("ASK FOR BASIC AUTH 2");
+ // error_log("ASK FOR BASIC AUTH 2");
gwvpmini_AskForBasicAuth();
return;
}
$perm = gwvpmini_GetRepoPerm($rid, $uid);
if($write) {
if($perm < 2) {
- error_log("SEND FOFF");
+ // error_log("SEND FOFF");
gwvpmini_fourZeroThree();
return;
}
}
// if its a write, we check (before and after) the branch/tag info to see if they were updated
- //if($write) {
- //}
+ if($write) {
+ error_log("REQUESTINBACKEND: processed as write");
+ } else {
+ error_log("REQUESTINBACKEND: processed as read");
+ }
gwvpmini_callGitBackend($person, $repo);
// if we made it this far, we a read and we have permissions to do so, just search the file from the repo
/*if(file_exists("$repo_base/$repo.git/$newloc")) {
- error_log("would ask $repo for $repo.git/$newloc from $repo_base/$repo.git/$newloc");
+ // error_log("would ask $repo for $repo.git/$newloc from $repo_base/$repo.git/$newloc");
$fh = fopen("$repo_base/$repo.git/$newloc", "rb");
- error_log("pushing file");
+ // error_log("pushing file");
while(!feof($fh)) {
echo fread($fh, 8192);
}
} else {
- error_log("would ask $repo for $repo/$newloc from $repo_base/$repo/$newloc, NE");
+ // error_log("would ask $repo for $repo/$newloc from $repo_base/$repo/$newloc, NE");
gwvpmini_fourZeroFour();
return;
}*/
function gwvpmini_canManageRepo($userid, $repoid)
{
// only the owner or an admin can do these tasks
- error_log("Checking repoid, $repoid against userid $userid");
+ // error_log("Checking repoid, $repoid against userid $userid");
if(gwvpmini_IsUserAdmin(null, null, $userid)) return true;
if(gwvpmini_IsRepoOwner($userid, $repoid)) return true;
$qs = "";
foreach($_REQUEST as $key => $var) {
if($key != "q") {
- //error_log("adding, $var from $key");
+ //// error_log("adding, $var from $key");
if($qs == "") $qs.="$key=$var";
else $qs.="&$key=$var";
}
$procenv["REMOTE_ADDR"] = $_SERVER["REMOTE_ADDR"];
$procenv["AUTH_TYPE"] = "Basic";
- //error_log("PROCENV: ".print_r($procenv,true));
+ //// error_log("PROCENV: ".print_r($procenv,true));
if(isset($_SERVER["CONTENT_TYPE"])) {
$procenv["CONTENT_TYPE"] = $_SERVER["CONTENT_TYPE"];
$procenv["CONTENT_LENGTH"] = $_SERVER["CONTENT_LENGTH"];
}
- error_log("path trans'd is /$repo_base/$repo.git/$euri from $ruri with ".$_REQUEST["q"]." $strrem");
+ // error_log("path trans'd is /$repo_base/$repo.git/$euri from $ruri with ".$_REQUEST["q"]." $strrem");
while(!$untilblank&&!feof($pipes[1])) {
$lines_t = fgets($pipes[1]);
$lines = trim($lines_t);
- error_log("got line: $lines");
+ // error_log("got line: $lines");
if($lines_t == "\r\n") {
$untilblank = true;
- error_log("now blank");
+ // error_log("now blank");
} else header($lines);
if($lines === false) {
- error_log("got an unexpexted exit...");
+ // error_log("got an unexpexted exit...");
exit(0);
}
$continue = true;
if(!stream_set_blocking($fh,0)) {
- error_log("cant set input non-blocking");
+ // error_log("cant set input non-blocking");
}
if(!stream_set_blocking($pipes[1],0)) {
- error_log("cant set pipe1 non-blocking");
+ // error_log("cant set pipe1 non-blocking");
}
+ $stlimit = 0;
$fp = fopen("/tmp/gitup.".rand(0,4000000), "w");
// i was going to use stream_select, but i feel this works better like this
while($continue) {
//fwrite($fl, $from_client_data);
$client_len = strlen($from_client_data);
} else {
- error_log("client end");
+ // error_log("client end");
$client_len = 0;
+ //$continue = false;
}
// do cgi
// TODO: find out why this happens
$from_cgi_data = preg_replace("/^\r\n/", "", $from_cgi_data_t);
if(strlen($from_cgi_data)!=strlen($from_cgi_data_t)) {
- error_log("MOOOKS - we did trunc");
+ // error_log("MOOOKS - we did trunc");
} else {
- error_log("MOOOKS - we did not trunc");
+ // error_log("MOOOKS - we did not trunc");
}
$firstline = false;
}
}
$cgi_len = strlen($from_cgi_data);
} else {
- error_log("cgi end");
+ // error_log("cgi end");
$cgi_len = 0;
}
else {
if($client_len == 0 && $cgi_len == 0) {
usleep(200000);
- error_log("sleep tick");
+ // error_log("sleep tick");
+ $stlimit++;
+ if($stlimit > 50) $continue = false;
} else {
- error_log("sizes: $client_len, $cgi_len");
+ $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\"");
}
}
}
// 0 - anyone can clone/read, only owner can write
// 1 - noone can clone/read, repo is visible (i.e. name), only owner can read/write repo
// 2 - only owner can see anything
-function gwvpmini_createGitRepo($name, $ownerid, $desc)
+function gwvpmini_createGitRepo($name, $ownerid, $desc, $defperms, $clonefrom, $isremoteclone)
{
$repo_base = gwvpmini_getConfigVal("repodir");
+ if($clonefrom !== false) {
+ error_log("how did i end up in clonefrom? $clonefrom");
+ if(!$isremoteclone) {
+ exec("/usr/bin/git clone --bare $repo_base/$clonefrom.git $repo_base/$name.git >> /tmp/gitlog 2>&1");
+ gwvpmini_AddRepo($name, $desc, $ownerid, $defperms, $clonefrom);
+ } else {
+ // we do this from an outside call in the background
+ gwvpmini_SendMessage(error, "Cant clone from remote repos yet");
+ return false;
+ }
+ } else {
+
// phew, this works, but i tell you this - bundles arent quite as nice as they should be
- error_log("would create $repo_base/$name.git");
- exec("/usr/bin/git init $repo_base/$name.git --bare > /tmp/gitlog 2>&1");
- chdir("$repo_base/$name.git");
- exec("/usr/bin/git update-server-info");
-
- // gwvpmini_AddRepo($reponame, $repodesc, $repoowner, $defaultperms = 0)
- gwvpmini_AddRepo($name, $desc, $ownerid);
+ // error_log("would create $repo_base/$name.git");
+ exec("/usr/bin/git init $repo_base/$name.git --bare >> /tmp/gitlog 2>&1");
+ chdir("$repo_base/$name.git");
+ exec("/usr/bin/git update-server-info");
+
+ // gwvpmini_AddRepo($reponame, $repodesc, $repoowner, $defaultperms = 0)
+ gwvpmini_AddRepo($name, $desc, $ownerid, $defperms, $clonefrom);
+ }
return true;
}