Gitweb: Add support for HTTP basic auth

The Gitweb username and password can now be specified when updating the
repository.

Signed-off-by: Damien Regad <[email protected]>

Rebased on top of latest master, fixed undefined variable PHP notices.

Fixes #144

Author: wuttke

SourceGitweb/SourceGitweb.php

@@ -27,6 +27,16 @@ public function register() {
 
 	public $type = 'gitweb';
 
+	public function url_get_auth($url, $user, $pass) {
+		if (strlen($user) > 0 && strlen($pass) > 0) {
+			$urlParts = preg_split("/:\\/\\//", $url);
+			$urlWithCredentials = $urlParts[0] . "://" . $user . ":" . $pass . "@" .$urlParts[1];
+			return file_get_contents($urlWithCredentials);
+		} else {
+			return url_get($url);
+		}
+	}
+
 	public function show_type() {
 		return plugin_lang_get( 'gitweb' );
 	}
@@ -69,6 +79,8 @@ public function url_diff( $p_repo, $p_changeset, $p_file ) {
 	public function update_repo_form( $p_repo ) {
 		$t_gitweb_root = null;
 		$t_gitweb_project = null;
+		$t_gitweb_user = null;
+		$t_gitweb_pass = null;
 
 		if ( isset( $p_repo->info['gitweb_root'] ) ) {
 			$t_gitweb_root = $p_repo->info['gitweb_root'];
@@ -78,13 +90,21 @@ public function update_repo_form( $p_repo ) {
 			$t_gitweb_project = $p_repo->info['gitweb_project'];
 		}
 
+		if ( isset( $p_repo->info['gitweb_user'] ) ) {
+			$t_gitweb_user = $p_repo->info['gitweb_user'];
+		}
+
+		if ( isset( $p_repo->info['gitweb_pass'] ) ) {
+			$t_gitweb_pass = $p_repo->info['gitweb_pass'];
+		}
+
+
 		if ( isset( $p_repo->info['master_branch'] ) ) {
 			$t_master_branch = $p_repo->info['master_branch'];
 		} else {
 			$t_master_branch = 'master';
 		}
 ?>
-
 <div class="field-container">
 	<label><span><?php echo plugin_lang_get( 'gitweb_root' ) ?></span></label>
 	<span class="input">
@@ -101,6 +121,22 @@ public function update_repo_form( $p_repo ) {
 	<span class="label-style"></span>
 </div>
 
+<div class="field-container">
+	<label><span><?php echo plugin_lang_get( 'gitweb_user' ) ?></span></label>
+	<span class="input">
+		<input name="gitweb_user" maxlength="250" size="40" value="<?php echo string_attribute( $t_gitweb_user ) ?>"/>
+	</span>
+	<span class="label-style"></span>
+</div>
+
+<div class="field-container">
+	<label><span><?php echo plugin_lang_get( 'gitweb_pass' ) ?></span></label>
+	<span class="input">
+		<input name="gitweb_pass" maxlength="250" size="40" value="<?php echo string_attribute( $t_gitweb_pass ) ?>"/>
+	</span>
+	<span class="label-style"></span>
+</div>
+
 <div class="field-container">
 	<label><span><?php echo plugin_lang_get( 'master_branch' ) ?></span></label>
 	<span class="input">
@@ -115,10 +151,14 @@ public function update_repo_form( $p_repo ) {
 	public function update_repo( $p_repo ) {
 		$f_gitweb_root = gpc_get_string( 'gitweb_root' );
 		$f_gitweb_project = gpc_get_string( 'gitweb_project' );
+		$f_gitweb_user = gpc_get_string( 'gitweb_user' );
+		$f_gitweb_pass = gpc_get_string( 'gitweb_pass' );
 		$f_master_branch = gpc_get_string( 'master_branch' );
 
 		$p_repo->info['gitweb_root'] = $f_gitweb_root;
 		$p_repo->info['gitweb_project'] = $f_gitweb_project;
+		$p_repo->info['gitweb_user'] = $f_gitweb_user;
+		$p_repo->info['gitweb_pass'] = $f_gitweb_pass;
 		$p_repo->info['master_branch'] = $f_master_branch;
 
 		return $p_repo;
@@ -165,7 +205,7 @@ public function import_full( $p_repo ) {
 		else
 		{
 			$t_heads_url = $this->uri_base( $p_repo ) . 'a=heads';
-			$t_branches_input = url_get( $t_heads_url );
+			$t_branches_input = $this->url_get_auth( $t_heads_url, $p_repo->info['gitweb_user'], $p_repo->info['gitweb_pass'] );
 
 			$t_branches_input = str_replace( array("\r", "\n", '&lt;', '&gt;', '&nbsp;'), array('', '', '<', '>', ' '), $t_branches_input );
 
@@ -238,7 +278,7 @@ private function import_commits( $p_repo, $p_uri_base, $p_commit_ids, $p_branch=
 			# Handle branch names with '+' character
 			$t_fixed_id = str_replace('+', '%2B', $t_commit_id);
 			$t_commit_url = $this->uri_base( $p_repo ) . 'a=commit;h=' . $t_fixed_id;
-			$t_input = url_get( $t_commit_url );
+			$t_input = $this->url_get_auth( $t_commit_url, $p_repo->info['gitweb_user'], $p_repo->info['gitweb_pass'] );
 
 			if ( !$t_input ) {
 				echo "failed.\n";

SourceGitweb/lang/strings_english.txt

@@ -9,5 +9,7 @@ $s_plugin_SourceGitweb_title = 'Gitweb Integration';
 $s_plugin_SourceGitweb_description = 'Adds Gitweb integration to the Source Integration framework.';
 
 $s_plugin_SourceGitweb_gitweb_root = 'Gitweb Root URL';
+$s_plugin_SourceGitweb_gitweb_user = 'Gitweb Username';
+$s_plugin_SourceGitweb_gitweb_pass = 'Gitweb Password';
 $s_plugin_SourceGitweb_gitweb_project = 'Gitweb Project<br/><span class="small">(including ".git")</span>';
 $s_plugin_SourceGitweb_master_branch = 'Primary Branches<br/><span class="small">(comma-separated list)</span>';

SourceGitweb/lang/strings_german.txt

@@ -9,5 +9,7 @@ $s_plugin_SourceGitweb_title = 'Gitweb Integration';
 $s_plugin_SourceGitweb_description = 'Integration für Gitweb über die VCS Basisintegration.';
 
 $s_plugin_SourceGitweb_gitweb_root = 'Gitweb Basis-URL';
+$s_plugin_SourceGitweb_gitweb_user = 'Gitweb Benutzername';
+$s_plugin_SourceGitweb_gitweb_pass = 'Gitweb Passwort';
 $s_plugin_SourceGitweb_gitweb_project = 'Gitweb Projekt<br/><span class="small">(inkl. ".git")</span>';
 $s_plugin_SourceGitweb_master_branch = 'Hauptzweige<br/><span class="small">(kommaseparierte Liste)</span>';