[RFC/PATCHv2 2/4 (resent)] gitweb: Add option to force version match
From: Jakub Narebski <hidden>
Date: 2016-06-15 22:47:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: John 'Warthog9' Hawley <warthog9@kernel.org> This adds $git_versions_must_match variable, which is set to true value checks that we are running on the same version of git that we shipped with, and if not throw '500 Internal Server Error' error. What is checked is the version of gitweb (embedded in building gitweb.cgi), against version of runtime git binary used. Gitweb can usually run with a mismatched git install. This is more here to give an obvious warning as to whats going on vs. silently failing. By default this feature is turned off. Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org> Signed-off-by: Jakub Narebski <redacted> --- I don't quite see the reason behind such option, and I think that error (instead of for example warning) on version mismatch is too much. In short: this change is meant to avoid situation where version mismatch results in silent error, but it would work only if it would be default on; on the other hand having it default on is I think too inconvenient, so I changed it to default off, which perhaps defeats the stated purpose of this patch. This is an RFC because formatting of error page is a bit rough, and (ab)uses exist CSS classes instead of creating new classnames for semantic markup. Differences from original version, by J.H.: * Changed name and flipped meaning of config variable, from $missmatch_git to $git_versions_must_match * $git_versions_must_match is boolean flag - do not compare with an empty string. * Changed error message a bit, fixed style, added entry in README gitweb/README | 3 +++ gitweb/gitweb.perl | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/gitweb/README b/gitweb/README
index 6c2c8e1..608b0f8 100644
--- a/gitweb/README
+++ b/gitweb/README@@ -233,6 +233,9 @@ not include variables usually directly set during build): If server load exceed this value then return "503 Service Unavailable" error. Server load is taken to be 0 if gitweb cannot determine its value. Set it to undefined value to turn it off. The default is 300. + * $git_versions_must_match + If set, gitweb fails with 500 Internal Server Error if the version of gitweb + doesn't match version of git binary. The default is false. Projects list file format
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 3222131..b9bd865 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl@@ -221,6 +221,9 @@ our %avatar_size = ( 'double' => 32 ); +# If it is true, exit if gitweb version and git binary version don't match +our $git_versions_must_match = 0; + # Used to set the maximum load that we will still respond to gitweb queries. # If server load exceed this value then return "503 server busy" error. # If gitweb cannot determined server load, it is taken to be 0.
@@ -581,6 +584,36 @@ if (defined $maxload && get_loadavg() > $maxload) { our $git_version = qx("$GIT" --version) =~ m/git version (.*)$/ ? $1 : "unknown"; $number_of_git_cmds++; +# Throw an error if git versions does not match, if $git_versions_must_match is true. +if ($git_versions_must_match && + $git_version ne $version) { + git_header_html('500 - Internal Server Error'); + my $admin_contact = + defined $ENV{'SERVER_ADMIN'} ? ", $ENV{'SERVER_ADMIN'}," : ''; + print <<"EOT"; +<div class="page_body"> +<br /><br /> +500 - Internal Server Error +<br /> +</div> +<hr /> +<div class="readme"> +<h1 align="center">*** Warning ***</h1> +<p> +This version of gitweb was compiled for <b>@{[esc_html($version)]}</b>, +however git version <b>@{[esc_html($git_version)]}</b> was found on server, +and administrator requested strict version checking. +</p> +<p> +Please contact the server administrator${admin_contact} to either configure +gitweb to allow mismatched versions, or update git or gitweb installation. +</p> +</div> +EOT + git_footer_html(); + exit; +} + $projects_list ||= $projectroot; # ======================================================================
--
1.6.5.3