bugzilla · CyberShadow · Mar 16, 2018 · Mar 16, 2018 · Mar 16, 2018 · Mar 16, 2018
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,9 @@
 /data
 /localconfig
 /localconfig.*
+/conf/env.conf
 /index.html
+/errors/
 /error_reports
 /.DS_Store
 /template_cache

diff --git a/Bugzilla.pm b/Bugzilla.pm
@@ -46,6 +46,7 @@ use File::Spec::Functions;
 use Safe;
 use JSON::XS qw(decode_json);
 use Scope::Guard;
+use URI;
 
 use parent qw(Bugzilla::CPAN);
 
@@ -124,6 +125,14 @@ sub template_inner {
 }
 
-
+our $in_extensions = 0;
-
+our $in_extensions = 0;
 sub extensions {
+  # Guard against extensions querying the extension list during initialization
+  # (through this method or has_extension).
+  # The extension list is not fully populated at that point,
+  # so the results would not be meaningful.
+  state $recursive = 0;
-  state $recursive = 0;
-  state $recursive = 0;
+  die "Recursive attempt to load/query extensions" if $recursive;
-  die "Recursive attempt to load/query extensions" if $recursive;
+  die "Recursive attempt to load/query extensions" if $in_extensions > 0;
-  die "Recursive attempt to load/query extensions" if $recursive;
+  die "Recursive attempt to load/query extensions" if $in_extensions > 0;
+  $recursive = 1;
-  $recursive = 1;
+  local $in_extensions = $in_extensions + 1;
-  $recursive = 1;
+  local $in_extensions = $in_extensions + 1;
+
   state $extensions;
   return $extensions if $extensions;
   my $extension_packages = Bugzilla::Extension->load_all();
@@ -133,9 +142,20 @@ sub extensions {
       push @$extensions, $package;
     }
   }
+  $recursive = 0;
-  $recursive = 0;
-  $recursive = 0;
   return $extensions;
 }
 
+sub has_extension {
+  my ($class, $name) = @_;
+  my $cache = $class->request_cache;
+  if (!$cache->{extensions_hash}) {
+    my %extensions = map { $_->NAME => 1 } @{Bugzilla->extensions};
+    $cache->{extensions_hash} = \%extensions;
+  }
+  return exists $cache->{extensions_hash}{$name};
+}
+
 sub cgi {
   return request_cache->{cgi} ||= Bugzilla::CGI->new;
 }
@@ -162,6 +182,12 @@ sub localconfig {
     ||= Bugzilla::Localconfig->new(read_localconfig());
 }
 
+sub urlbase {
+  my ($class) = @_;
+
+  # Since this could be modified, we have to return a new one every time.
+  return URI->new($class->localconfig->{urlbase});
+}
 
 sub params {
   return request_cache->{params} ||= Bugzilla::Config::read_param_file();

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
@@ -540,7 +540,7 @@ sub send_cookie {
   }
 
   # Add the default path and the domain in.
-  state $uri = URI->new(Bugzilla->localconfig->urlbase);
+  state $uri = Bugzilla->urlbase;
   $paramhash{'-path'} = $uri->path;
 
   # we don't set the domain.

diff --git a/Bugzilla/Config/General.pm b/Bugzilla/Config/General.pm
@@ -24,6 +24,14 @@ use constant get_param_list => (
     checker  => \&check_email
   },
 
+  {
+    name     => 'nobody_user',
+    type     => 't',
+    no_reset => '1',
+    default  => 'nobody@mozilla.org',
+    checker  => \&check_email
+  },
+
   {
     name    => 'docs_urlbase',
     type    => 't',

diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
@@ -4227,7 +4227,7 @@ sub _migrate_group_owners {
   my $dbh = Bugzilla->dbh;
   return if $dbh->bz_column_info('groups', 'owner_user_id');
   $dbh->bz_add_column('groups', 'owner_user_id', {TYPE => 'INT3'});
-  my $nobody = Bugzilla::User->check('nobody@mozilla.org');
+  my $nobody = Bugzilla::User->check(Bugzilla->params->{'nobody_user'});
   $dbh->do('UPDATE groups SET owner_user_id = ?', undef, $nobody->id);
 }
 

diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
@@ -55,6 +55,51 @@ use constant HTTPD_ENV => qw(
   NYTPROF_DIR
 );
 
+sub _error_page {
+  my ($code, $title, $description) = @_;
+  my $host = Bugzilla->urlbase->host;
+
+  return <<EOT;
+<!DOCTYPE HTML>
+<html>
+    <head>
+        <title>$title</title>
+        <style>
+            body {
+                margin: 1em 2em;
+                background-color: #455372;
+                color: #ddd;
+                font-family: sans-serif;
+            }
+            h1, h3 {
+                color: #fff;
+            }
+            a {
+                color: #fff;
+                text-decoration: none;
+            }
+            #buggie {
+                float: left;
+            }
+            #content {
+                margin-left: 100px;
+                padding-top: 20px;
+            }
+        </style>
+    </head>
+    <body>
+        <img src="/images/buggie.png" id="buggie" alt="buggie" width="78" height="215">
+        <div id="content">
+            <h1>$title</h1>
+            <p>$description</p>
+            <h3>Error $code</h3>
+            <p><a href="/">$host</a></p>
+        </div>
+    </body>
+</html>
+EOT
+}
+
 ###############
 # Permissions #
 ###############
@@ -344,6 +389,47 @@ sub FILESYSTEM {
       {perms => CGI_READ, overwrite => 1, contents => $yui3_all_css},
   );
 
+  # Create static error pages.
+  $create_dirs{"errors"}           = DIR_CGI_READ;
+  $create_files{"errors/401.html"} = {
+    perms     => CGI_READ,
+    overwrite => 1,
+    contents  => _error_page(
+      401, 'Authentication Required',
+      "This server could not verify that you are authorized to access
+            that URL. you either supplied the wrong credentials (e.g., bad
+            password), or your browser doesn't understand how to supply the
+            credentials required."
+    )
+  };
+  $create_files{"errors/403.html"} = {
+    perms     => CGI_READ,
+    overwrite => 1,
+    contents  => _error_page(
+      403,
+      'Access Denied',
+      "Access to the requested resource has been denied."
+    )
+  };
+  $create_files{"errors/404.html"} = {
+    perms     => CGI_READ,
+    overwrite => 1,
+    contents  => _error_page(
+      404,
+      'Object Not Found',
+      "The requested URL was not found on this server."
+    )
+  };
+  $create_files{"errors/500.html"} = {
+    perms     => CGI_READ,
+    overwrite => 1,
+    contents  => _error_page(
+      500,
+      'Internal Server Error',
+      "The server encountered an internal error and was unable to complete your request."
+    )
+  };
+
   Bugzilla::Hook::process(
     'install_filesystem',
     {
@@ -417,7 +503,7 @@ sub update_filesystem {
   # Delete old files that no longer need to exist
 
   # 2001-04-29 jake@bugzilla.org - Remove oldemailtech
-  #   http://bugzilla.mozilla.org/show_bugs.cgi?id=71552
+  #   http://bugzilla.mozilla.org/show_bug.cgi?id=71552
   if (-d 'shadow') {
     print "Removing shadow directory...\n";
     rmtree("shadow");

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
@@ -802,19 +802,21 @@ sub data {
   # BMO - to avoid massive amounts of joins, if we're selecting a lot of
   # tracking flags, replace them with placeholders. the values will be
   # retrieved later and injected into the result.
-  my %tf_map = map { $_ => 1 } Bugzilla->tracking_flag_names;
-  my @tf_selected = grep { exists $tf_map{$_} } @orig_fields;
-
-  # MySQL has a limit of 61 joins, and we want to avoid massive amounts of joins
-  # 30 ensures we won't hit the limit, nor generate too many joins
-  if (scalar @tf_selected > 30) {
-    foreach my $column (@tf_selected) {
-      $self->COLUMNS->{$column}->{name} = "'---'";
+  if (Bugzilla->has_extension('TrackingFlags')) {
+    my %tf_map = map { $_ => 1 } Bugzilla->tracking_flag_names;
+    my @tf_selected = grep { exists $tf_map{$_} } @orig_fields;
+
+    # MySQL has a limit of 61 joins, and we want to avoid massive amounts of joins
+    # 30 ensures we won't hit the limit, nor generate too many joins
+    if (scalar @tf_selected > 30) {
+      foreach my $column (@tf_selected) {
+        $self->COLUMNS->{$column}->{name} = "'---'";
+      }
+      $self->{tracking_flags} = \@tf_selected;
+    }
+    else {
+      $self->{tracking_flags} = [];
     }
-    $self->{tracking_flags} = \@tf_selected;
-  }
-  else {
-    $self->{tracking_flags} = [];
   }
 
   my $start_time = [gettimeofday()];
@@ -869,7 +871,7 @@ sub data {
   $self->{data} = [map { $data{$_} } @$bug_ids];
 
   # BMO - get tracking flags values, and insert into result
-  if (@{$self->{tracking_flags}}) {
+  if (Bugzilla->has_extension('TrackingFlags') && @{$self->{tracking_flags}}) {
 
     # read values
     my $values;

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
@@ -985,7 +985,7 @@ sub create {
       'sudoer' => sub { return Bugzilla->sudoer; },
 
       # Allow templates to access the "correct" URLBase value
-      'urlbase' => sub { return Bugzilla->localconfig->urlbase; },
+      'urlbase' => sub { Bugzilla->urlbase },
 
       # Allow templates to get the absolute path of the URLBase value
       'basepath' => sub { return Bugzilla->localconfig->basepath; },
@@ -1058,6 +1058,8 @@ sub create {
 
       'feature_enabled' => sub { return Bugzilla->feature(@_); },
 
+      'has_extension' => sub { return Bugzilla->has_extension(@_); },
+
       # field_descs can be somewhat slow to generate, so we generate
       # it only once per-language no matter how many times
       # $template->process() is called.

diff --git a/docs/en/rst/integrating/templates.rst b/docs/en/rst/integrating/templates.rst
@@ -262,7 +262,7 @@ customizing for your installation.
     It needs a couple of lines of boilerplate at the top like this::
 
         [% USE Bugzilla %]
-        [% cgi = Bugzilla.cgi %
+        [% cgi = Bugzilla.cgi %]
 
     Then, this template can reference the form fields you have created using
     the syntax ``[% cgi.param("field_name") %]``. When a bug report is

diff --git a/enter_bug.cgi b/enter_bug.cgi
@@ -37,6 +37,8 @@ use Bugzilla::Field;
 use Bugzilla::Status;
 use Bugzilla::UserAgent;
 
+use List::Util qw(any);
+
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
 my $cloned_bug;
@@ -322,10 +324,15 @@ else {
     = formvalue('bug_severity', Bugzilla->params->{'defaultseverity'});
 
   # BMO - use per-product default hw/os
-  $default{'rep_platform'}
-    = formvalue('rep_platform', $product->default_platform // detect_platform());
-  $default{'op_sys'}
-    = formvalue('op_sys', $product->default_op_sys // detect_op_sys());
+  if (any { $_->NAME eq 'BMO' } @{ Bugzilla->extensions }) {
+    $default{'rep_platform'}
+      = formvalue('rep_platform', $product->default_platform // detect_platform());
+    $default{'op_sys'}
+      = formvalue('op_sys', $product->default_op_sys // detect_op_sys());
+  } else {
+      $default{'rep_platform'} = formvalue('rep_platform', detect_platform());
+      $default{'op_sys'}       = formvalue('op_sys', detect_op_sys());
+  }
   $vars->{'rep_platform'} = detect_platform();
   $vars->{'rep_op_sys'}   = detect_op_sys();
 

diff --git a/errors/401.html b/errors/401.html
diff --git a/errors/403.html b/errors/403.html