Fix dockerfile and revert any divergent changes from bmo

Author: dylanwh

Bugzilla.pm

@@ -13,7 +13,7 @@ use warnings;
 
 use Bugzilla::Logging;
 
-our $VERSION = '6.0';
+our $VERSION = '20190418.1';
 
 use Bugzilla::Auth;
 use Bugzilla::Auth::Persist::Cookie;

Bugzilla/App/Command/report_ping.pm

@@ -79,9 +79,9 @@ sub run {
       'Testing',
       sub {
         foreach my $result (@_) {
-          my @error = $report->test_row($result);
+          my @error = $report->test($result);
           if (@error) {
-            my $doc = $report->extract_content($result);
+            my (undef, $doc) = $report->prepare($result);
             die $json->encode({errors => \@error, result => $doc});
           }
         }
@@ -94,8 +94,7 @@ sub run {
       'Dumping',
       sub {
         foreach my $result (@_) {
-          my $doc = $report->extract_content($result);
-          my $id = $result->id;
+          my ($id, $doc) = $report->prepare($result);
           path($working_dir, "$id.json")->spurt($json->encode($doc));
         }
       }
@@ -106,7 +105,7 @@ sub run {
       $report,
       'Sending',
       sub {
-        Mojo::Promise->all(map { $report->send_row($_) } @_)->wait;
+        Mojo::Promise->all(map { $report->send($_) } @_)->wait;
       }
     );
   }

Bugzilla/Bug.pm

@@ -43,6 +43,7 @@ use base qw(Bugzilla::Object Exporter);
 @Bugzilla::Bug::EXPORT = qw(
   bug_alias_to_id
   LogActivityEntry
+  editable_bug_fields
 );
 
 my %CLEANUP;
@@ -4445,6 +4446,36 @@ sub bug_alias_to_id {
 # Subroutines
 #####################################################################
 
+# Returns a list of currently active and editable bug fields,
+# including multi-select fields.
+sub editable_bug_fields {
+  my @fields = Bugzilla->dbh->bz_table_columns('bugs');
+
+  # Add multi-select fields
+  push(@fields,
+    map { $_->name }
+      @{Bugzilla->fields({obsolete => 0, type => FIELD_TYPE_MULTI_SELECT})});
+
+  # Obsolete custom fields are not editable.
+  my @obsolete_fields = @{Bugzilla->fields({obsolete => 1, custom => 1})};
+  @obsolete_fields = map { $_->name } @obsolete_fields;
+  foreach
+    my $remove ("bug_id", "reporter", "creation_ts", "delta_ts", "lastdiffed",
+    @obsolete_fields)
+  {
+    my $location = firstidx { $_ eq $remove } @fields;
+
+    # Ensure field exists before attempting to remove it.
+    splice(@fields, $location, 1) if ($location > -1);
+  }
+
+  Bugzilla::Hook::process('bug_editable_bug_fields', {fields => \@fields});
+
+  # Sorted because the old @::log_columns variable, which this replaces,
+  # was sorted.
+  return sort(@fields);
+}
+
 # Emit a list of dependencies or regressions. Join with bug_status and bugs
 # tables to show bugs with open statuses first, and then the others
 sub list_relationship {
@@ -4523,10 +4554,8 @@ sub GetBugActivity {
     $suppwhere = "AND COALESCE(attachments.isprivate, 0) = 0";
   }
 
-  # Use DISTINCT and value comparison to suppress duplicated changes weirdly
-  # made at the same time by the same user
   my $query
-    = "SELECT DISTINCT fielddefs.name, bugs_activity.attach_id, "
+    = "SELECT fielddefs.name, bugs_activity.attach_id, "
     . $dbh->sql_date_format('bugs_activity.bug_when', '%Y.%m.%d %H:%i:%s')
     . " AS bug_when, bugs_activity.removed, bugs_activity.added, profiles.login_name,
                bugs_activity.comment_id
@@ -4537,7 +4566,6 @@ sub GetBugActivity {
     INNER JOIN profiles
             ON profiles.userid = bugs_activity.who
          WHERE bugs_activity.bug_id = ?
-           AND bugs_activity.removed != bugs_activity.added
                $datepart
                $attachpart
                $suppwhere ";
@@ -4591,17 +4619,6 @@ sub GetBugActivity {
       = @$entry;
     my %change;
     my $activity_visible = 1;
-    my $last_change = @$changes[-1] || {};
-
-    # Suppress any mid-air collision
-    if ( $when eq $operation->{'when'}
-      && $fieldname eq $last_change->{'fieldname'}
-      && $removed eq $last_change->{'removed'}
-      && $added eq $last_change->{'added'}
-      && $attachid eq $last_change->{'attachid'})
-    {
-      next;
-    }
 
     # check if the user should see this field's activity
     if ( $fieldname eq 'remaining_time'

Bugzilla/Constants.pm

@@ -740,7 +740,7 @@ sub DEFAULT_CSP {
       'https://crash-stop-addon.herokuapp.com',
     ],
     worker_src  => ['none',],
-    img_src     => ['self', 'data:', 'blob:', 'https://secure.gravatar.com'],
+    img_src     => ['self', 'blob:', 'https://secure.gravatar.com'],
     style_src   => ['self', 'unsafe-inline'],
     object_src  => ['none'],
     connect_src => [
@@ -756,7 +756,7 @@ sub DEFAULT_CSP {
       'https://treeherder.mozilla.org/api/failurecount/',
 
       # socorro lens
-      'https://crash-stats.mozilla.org/api/SuperSearch/',
+      'https://crash-stats.mozilla.com/api/SuperSearch/',
     ],
     font_src => [ 'self', 'https://fonts.gstatic.com' ],
     form_action => [
@@ -788,7 +788,7 @@ sub SHOW_BUG_MODAL_CSP {
       'unsafe-inline', 'unsafe-eval',
       'https://www.google-analytics.com'
     ],
-    img_src     => ['self', 'data:', 'https://secure.gravatar.com'],
+    img_src     => ['self', 'https://secure.gravatar.com'],
     media_src   => ['self'],
     connect_src => [
       'self',

Bugzilla/DB/Schema.pm

@@ -946,7 +946,6 @@ use constant ABSTRACT_SCHEMA => {
       password_change_reason => {TYPE => 'varchar(64)'},
       mfa                    => {TYPE => 'varchar(8)', DEFAULT => "''"},
       mfa_required_date      => {TYPE => 'DATETIME'},
-      forget_after_date      => {TYPE => 'DATETIME'},
     ],
     INDEXES => [
       profiles_login_name_idx  => {FIELDS => ['login_name'], TYPE => 'UNIQUE'},

Bugzilla/Hook.pm

@@ -542,21 +542,6 @@ table should be joined with the C<bugs> table. If omitted, LEFT is used.
 
 =back
 
-=head2 search_params_to_data_structure
-
-This happens in L<Bugzilla::Search/_params_to_data_structure> and allows you to
-modify the search params in any way, before the all the params are processed as
-a data structure. It's useful especially when you want to accept synonyms for
-param names and/or values.
-
-Params:
-
-=over
-
-=item C<search> - The L<Bugzilla::Search> object.
-
-=back
-
 =head2 search_operator_field_override
 
 This allows you to modify L<Bugzilla::Search/OPERATOR_FIELD_OVERRIDE>,

Bugzilla/Install/DB.pm

@@ -758,10 +758,6 @@ sub update_table_definitions {
     {TYPE => 'varchar(8)',, DEFAULT => "''"});
 
   $dbh->bz_add_column('profiles', 'mfa_required_date', {TYPE => 'DATETIME'});
-
-  # 2019-05-08 [email protected] - Bug 1550145
-  $dbh->bz_add_column('profiles', 'forget_after_date', {TYPE => 'DATETIME'});
-
   _migrate_group_owners();
 
   $dbh->bz_add_column('groups', 'idle_member_removal',

Bugzilla/Install/Filesystem.pm

@@ -21,7 +21,7 @@ use warnings;
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
-use Bugzilla::Install::Localconfig;
+use Bugzilla::Install::Localconfig qw(ENV_KEYS);
 
 use Bugzilla::Install::Util qw(install_string);
 use Bugzilla::Util;

Bugzilla/Install/Localconfig.pm

@@ -30,7 +30,6 @@ use English qw($EGID);
 use List::Util qw(first);
 use Tie::Hash::NamedCapture;
 use Safe;
-use Package::Stash;
 use Term::ANSIColor;
 use Sys::Hostname qw(hostname);
 
@@ -39,6 +38,7 @@ use parent qw(Exporter);
 our @EXPORT_OK = qw(
   read_localconfig
   update_localconfig
+  ENV_KEYS
 );
 
 # might want to change this for upstream
@@ -107,6 +107,12 @@ use constant LOCALCONFIG_VARS => (
   {name => 'datadog_port',        default => 8125,},
 );
 
+
+use constant ENV_KEYS => (
+  (map { ENV_PREFIX . $_->{name} } LOCALCONFIG_VARS),
+  (map { ENV_PREFIX . $_ } PARAM_OVERRIDE),
+);
+
 sub _read_localconfig_from_env {
   my %localconfig;
 
@@ -137,8 +143,7 @@ sub _read_localconfig_from_file {
 
   my %localconfig;
   if (-e $filename) {
-    my $s = Safe->new;
-    my $stash = Package::Stash->new($s->root);
+    my $s = new Safe;
 
     # Some people like to store their database password in another file.
     $s->permit('dofile');
@@ -154,30 +159,45 @@ sub _read_localconfig_from_file {
 
     my @read_symbols;
     if ($include_deprecated) {
+
+      # First we have to get the whole symbol table
+      my $safe_root = $s->root;
+      my %safe_package;
+      { no strict 'refs'; %safe_package = %{$safe_root . "::"}; }
+
       # And now we read the contents of every var in the symbol table.
       # However:
       # * We only include symbols that start with an alphanumeric
       #   character. This excludes symbols like "_<./localconfig"
       #   that show up in some perls.
       # * We ignore the INC symbol, which exists in every package.
-      # * Perl 5.10 includes default symbol tables which
+      # * Perl 5.10 imports a lot of random symbols that all
       #   contain "::", and we want to ignore those.
       @read_symbols
-        = grep { /^[A-Za-z0-1]/ and !/^INC$/ and !/::/ } $stash->list_all_symbols();
+        = grep { /^[A-Za-z0-1]/ and !/^INC$/ and !/::/ } (keys %safe_package);
     }
     else {
       @read_symbols = map($_->{name}, LOCALCONFIG_VARS);
     }
     foreach my $var (@read_symbols) {
-      # We don't know the type of any setting.
-      # So we figure out its type by trying first a scalar, then an array, then a hash.
-
-      foreach my $sigil (qw( $ @ % )) {
-        my $symbol = $sigil . $var;
-        if ($stash->has_symbol($symbol)) {
-          my $val = $stash->get_symbol($symbol);
-          $localconfig{$var} = ref($val) eq 'SCALAR' ? $$val : $val;
-        }
+      my $glob = $s->varglob($var);
+
+      # We can't get the type of a variable out of a Safe automatically.
+      # We can only get the glob itself. So we figure out its type this
+      # way, by trying first a scalar, then an array, then a hash.
+      #
+      # The interesting thing is that this converts all deprecated
+      # array or hash vars into hashrefs or arrayrefs, but that's
+      # fine since as I write this all modern localconfig vars are
+      # actually scalars.
+      if (defined $$glob) {
+        $localconfig{$var} = $$glob;
+      }
+      elsif (@$glob) {
+        $localconfig{$var} = \@$glob;
+      }
+      elsif (%$glob) {
+        $localconfig{$var} = \%$glob;
       }
     }
   }

Bugzilla/Markdown.pm

@@ -50,7 +50,7 @@ sub render_html {
   local $Bugzilla::Template::COLOR_QUOTES = 0;
 
   if ($markdown =~ /^\s*$MARKDOWN_OFF\n/s) {
-    my $text = $self->bugzilla_shorthand->(trim($markdown), $bug);
+    my $text = $self->bugzilla_shorthand->( trim($markdown) );
     my $dom = Mojo::DOM->new($text);
     $dom->find('*')->each(sub {
       my ($e) = @_;
@@ -88,7 +88,7 @@ sub render_html {
         && any { $child->parent->tag eq $_ } @valid_text_parent_tags)
       {
         my $text = $child->content;
-        $child->replace(Mojo::DOM->new($bugzilla_shorthand->($text, $bug)));
+        $child->replace(Mojo::DOM->new($bugzilla_shorthand->($text)));
       }
       return $child;
     });