X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FGitInfo.php;h=6270b27fdd3382179217016f7b5aaa02de659aea;hb=ff18d57c636047c9b56cee26772f7a2f0edd4e21;hp=8095fd7308761ff182624386236d9d79927120a1;hpb=cb615a80599a409976518e7564cc6d993b772714;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/GitInfo.php b/includes/GitInfo.php
index 8095fd7308..6270b27fdd 100644
--- a/includes/GitInfo.php
+++ b/includes/GitInfo.php
@@ -37,6 +37,11 @@ class GitInfo {
 	 */
 	protected $basedir;
 
+	/**
+	 * Location of the repository
+	 */
+	protected $repoDir;
+
 	/**
 	 * Path to JSON cache file for pre-computed git information.
 	 */
@@ -58,6 +63,7 @@ class GitInfo {
 	 * @see precomputeValues
 	 */
 	public function __construct( $repoDir, $usePrecomputed = true ) {
+		$this->repoDir = $repoDir;
 		$this->cacheFile = self::getCacheFilePath( $repoDir );
 		wfDebugLog( 'gitinfo',
 			"Computed cacheFile={$this->cacheFile} for {$repoDir}"
@@ -230,8 +236,11 @@ class GitInfo {
 					'--format=format:%ct',
 					'HEAD',
 				];
+				$gitDir = realpath( $this->basedir );
 				$result = Shell::command( $cmd )
-					->environment( [ 'GIT_DIR' => $this->basedir ] )
+					->environment( [ 'GIT_DIR' => $gitDir ] )
+					->restrict( Shell::RESTRICT_DEFAULT | Shell::NO_NETWORK )
+					->whitelistPaths( [ $gitDir, $this->repoDir ] )
 					->execute();
 
 				if ( $result->getExitCode() === 0 ) {
@@ -297,9 +306,9 @@ class GitInfo {
 			$config = "{$this->basedir}/config";
 			$url = false;
 			if ( is_readable( $config ) ) {
-				MediaWiki\suppressWarnings();
+				Wikimedia\suppressWarnings();
 				$configArray = parse_ini_file( $config, true );
-				MediaWiki\restoreWarnings();
+				Wikimedia\restoreWarnings();
 				$remote = false;
 
 				// Use the "origin" remote repo if available or any other repo if not.