X-Git-Url: http://git.pjr.cc/?p=gwvp.git;a=blobdiff_plain;f=gwvplib%2Fgwvpgitcontrol.php;fp=gwvplib%2Fgwvpgitcontrol.php;h=5ac3df65895c0b97706f07855dae266a09a4537d;hp=a59a02b9605efa8e237863083551ef8cd5b38b2f;hb=70007a4ed44735f9d9c82fdff2d6600e2fdbfbd9;hpb=507bc8f2818a42d751ed6e2e2fc68ee2bde94016

diff --git a/gwvplib/gwvpgitcontrol.php b/gwvplib/gwvpgitcontrol.php
index a59a02b..5ac3df6 100644
--- a/gwvplib/gwvpgitcontrol.php
+++ b/gwvplib/gwvpgitcontrol.php
@@ -43,23 +43,29 @@ function gwvp_gitBackendInterface()
 	// TODO: we need to stop passing the repo name around as "repo.git", it needs to be just "repo"
 	
 	$repo = "";
-	$repoid = -1;
+	$repoid = false;
 	$newloc = "/";
 	if(isset($_REQUEST["q"])) {
 		$query = $_REQUEST["q"];
 		$qspl = explode("/", $query);
-		$repo = $qspl[1];
-		$repoid = gwvp_resolvRepoPerms($repo);
+		// TODO do this with 
+		$repo = preg_replace("/\.git$/", "", $qspl[1]);
+		$repoid = gwvp_GetRepoId($repo);
 		for($i=2; $i < count($qspl); $i++) {
 			$newloc .= "/".$qspl[$i];
 		}
 	}
 	
-	if($repoid == -1) {
+	if($repoid == false) {
 		gwvp_fourZeroFour();
 		return;
 	}
 	
+	// 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");
+	
+	
 	// so now we have the repo
 	// next we determine if this is a read or a write
 	$write = false;
@@ -79,12 +85,14 @@ function gwvp_gitBackendInterface()
 			gwvp_AskForBasicAuth();
 			return;
 		} else {
-			$perms = gwvp_resolvRepoPerms($person["id"], $repoid);
+			error_log("checking perms for $person against $repoid");
+			$perms = gwvp_resolvRepoPerms(gwvp_getUserId($person), $repoid);
 			if($perms < 3) {
 				gwvp_fourZeroThree();
 				return;
 			} else {
 				// here we pass to the git backend
+				error_log("perms are $perms and im allowed");
 				gwvp_callGitBackend($person["username"], $repo);
 			}
 		}
@@ -102,8 +110,10 @@ function gwvp_gitBackendInterface()
 			gwvp_AskForBasicAuth();
 			return;
 		} else {
-			$perms = gwvp_resolvRepoPerms($person["id"], $repoid);
+			$perms = gwvp_resolvRepoPerms(gwvp_getUserId($person), $repoid);
 			if($perms < 3) {
+				$dump = print_r($person, true);
+				error_log("in basic read, called 403 for $perms $dump");
 				gwvp_fourZeroThree();
 				return;
 			}
@@ -111,9 +121,9 @@ function gwvp_gitBackendInterface()
 	}
 	
 	// 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/$newloc")) {
+	if(file_exists("$repo_base/$repo.git/$newloc")) {
 		error_log("would ask $repo,$actual_repo_name for $repo/$newloc from $repo_base/$repo/$newloc");
-		$fh = fopen("$repo_base/$repo/$newloc", "rb");
+		$fh = fopen("$repo_base/$repo.git/$newloc", "rb");
 		
 		error_log("pushing file");
 		while(!feof($fh)) {
@@ -248,13 +258,13 @@ function gwvp_canManageRepo($userid, $repoid)
 	return false;
 }
 
-function gwvp_callGitBackend($username, $reponame)
+function gwvp_callGitBackend($username, $repo)
 {
 	// this is where things become a nightmare
 		$fh   = fopen('php://input', "r");
 		
 		$ruri = $_SERVER["REQUEST_URI"];
-		$strrem = "git/$repo";
+		$strrem = "git/$repo.git";
 		$euri = str_replace($strrem, "", $_REQUEST["q"]);
 		//$euri = preg_replace("/^git\/$repo\.git/", "", $_REQUEST["q"]);
 		
@@ -284,7 +294,7 @@ function gwvp_callGitBackend($username, $reponame)
 		// setup env
 		if(isset($procenv))	unset($procenv);
 		$procenv["GATEWAY_INTERFACE"] = "CGI/1.1";
-		$procenv["PATH_TRANSLATED"] = "/tmp/$repo/$euri";
+		$procenv["PATH_TRANSLATED"] = "/tmp/$repo.git/$euri";
 		$procenv["REQUEST_METHOD"] = "$rmeth";
 		$procenv["GIT_HTTP_EXPORT_ALL"] = "1";
 		$procenv["QUERY_STRING"] = "$qs";
@@ -302,7 +312,7 @@ function gwvp_callGitBackend($username, $reponame)
 			$procenv["CONTENT_LENGTH"] = $_SERVER["CONTENT_LENGTH"];
 		}
 		
-		error_log("path trans'd is /tmp/$repo/$euri from $ruri with ".$_REQUEST["q"]." $strrem");
+		error_log("path trans'd is /tmp/$repo.git/$euri from $ruri with ".$_REQUEST["q"]." $strrem");