Bug 1207721 - change the insider group from core-security to core-security-release

diff --git a/describekeywords.cgi b/describekeywords.cgi
index 056f582698a0954baaba626def991ef0fbc2b5b0..3850125cc8363faea79bd1b4c97e44acb4ca19fa 100755 (executable)
--- a/describekeywords.cgi
+++ b/describekeywords.cgi
@@ -40,7 +40,7 @@ Bugzilla->switch_to_shadow_db;
 
 # Hide bug counts for security keywords from users who aren't a member of the
 # security group
-my $can_see_security = Bugzilla->user->in_group('core-security');
+my $can_see_security = Bugzilla->user->in_group('core-security-release');
 my $keywords = Bugzilla::Keyword->get_all_with_bug_count();
 foreach my $keyword (@$keywords) {
     $keyword->{'bug_count'} = 0

diff --git a/docker/generate_bmo_data.pl b/docker/generate_bmo_data.pl
index bc314e1a62b5bb217cebe8ba315629441bc1f3a8..90294c08040f9470f33cca9d93fd1e44e24a0d0c 100755 (executable)
--- a/docker/generate_bmo_data.pl
+++ b/docker/generate_bmo_data.pl
@@ -346,6 +346,13 @@ my @groups = (
         bug_group    => 1,
         all_products => 1,
     },
+    {
+        name         => 'core-security-release',
+        description  => 'Release-track Client Security Bug',
+        no_admin     => 1,
+        bug_group    => 1,
+        all_products => 1,
+    },
     {
         name         => 'can_edit_comments',
         description  => 'Members of this group will be able to edit comments',
@@ -427,7 +434,7 @@ my %set_params = (
                                  '&long_desc_type=substring',
     defaultseverity           => 'normal',
     edit_comments_group       => 'can_edit_comments',
-    insidergroup              => 'core-security',
+    insidergroup              => 'core-security-release',
     last_visit_keep_days      => '28',
     lxr_url                   => 'http://mxr.mozilla.org/mozilla',
     lxr_root                  => 'mozilla/',

diff --git a/qa/config/generate_test_data.pl b/qa/config/generate_test_data.pl
index 8244649670eb04dfe6bdce3165b96bfeba5557d2..ea4b7479f85671d058a331c9d661c84c7801ba9b 100644 (file)
--- a/qa/config/generate_test_data.pl
+++ b/qa/config/generate_test_data.pl
@@ -564,7 +564,7 @@ $dbh->do('INSERT INTO group_group_map VALUES (?, ?, 0)',
          undef, $editbugs->id, $canconfirm->id);
 
 # BMO: Update default security group settings for new products
-my $default_security_group = Bugzilla::Group->new({ name => 'core-security' });
+my $default_security_group = Bugzilla::Group->new({ name => 'core-security-release' });
 $default_security_group ||= Bugzilla::Group->new({ name => 'Master' });
 if ($default_security_group) {
     $dbh->do('UPDATE products SET security_group_id = ? WHERE security_group_id IS NULL',

diff --git a/qa/t/test_strict_isolation.t b/qa/t/test_strict_isolation.t
deleted file mode 100644 (file)
index 48ef222..0000000
--- a/qa/t/test_strict_isolation.t
+++ /dev/null
@@ -1,155 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-use strict;
-use warnings;
-use lib qw(lib);
-
-use Test::More "no_plan";
-
-use QA::Util;
-
-my ($sel, $config) = get_selenium();
-my $qa_user = $config->{QA_Selenium_TEST_user_login};
-my $no_privs_user = $config->{unprivileged_user_login};
-
-log_in($sel, $config, 'admin');
-set_parameters($sel, { "Group Security" => {"strict_isolation-on" => undef} });
-
-# Restrict the bug to the "Master" group, so that we can check that only
-# allowed people can be CC'ed to the bug.
-
-file_bug_in_product($sel, 'Another Product');
-$sel->select_ok("component", "label=c2");
-$sel->select_ok("version", "label=Another2");
-my $bug_summary = "Test isolation";
-$sel->type_ok("short_desc", $bug_summary);
-$sel->type_ok("comment", "Unallowed users refused");
-my $master_gid = $sel->get_attribute('//input[@type="checkbox" and @name="groups" and @value="Master"]@id');
-$sel->check_ok($master_gid);
-$master_gid =~ s/group_//;
-$sel->click_ok('commit');
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-my $bug1_id = $sel->get_value('//input[@name="id" and @type="hidden"]');
-$sel->is_text_present_ok('has been added to the database', "Bug $bug1_id created");
-
-# At that point, CANEDIT is off and so everybody can be CC'ed to the bug.
-
-$sel->click_ok("cc_edit_area_showhide");
-$sel->type_ok("newcc", "$qa_user, $no_privs_user");
-$sel->click_ok("commit");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->is_text_present_ok("Changes submitted for bug $bug1_id");
-go_to_bug($sel, $bug1_id);
-$sel->click_ok("cc_edit_area_showhide");
-$sel->add_selection_ok("cc", "label=$no_privs_user");
-$sel->add_selection_ok("cc", "label=$qa_user");
-$sel->check_ok("removecc");
-$sel->click_ok("commit");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->is_text_present_ok("Changes submitted for bug $bug1_id");
-
-# Now enable CANEDIT for the "Master" group. This will enable strict isolation
-# for the product.
-
-edit_product($sel, "Another Product");
-$sel->click_ok("link=Edit Group Access Controls:");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Edit Group Controls for Another Product");
-$sel->check_ok("canedit_$master_gid");
-$sel->click_ok("submit");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Update group access controls for Another Product");
-
-# Non-members can no longer be CC'ed to the bug.
-
-go_to_bug($sel, $bug1_id);
-$sel->click_ok("cc_edit_area_showhide");
-$sel->type_ok("newcc", $no_privs_user);
-$sel->click_ok("commit");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Invalid User Group");
-$sel->is_text_present_ok("User '$no_privs_user' is not able to edit the 'Another Product' Product");
-$sel->go_back_ok();
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_like(qr/^$bug1_id /);
-$sel->click_ok("cc_edit_area_showhide");
-$sel->type_ok("newcc", $qa_user);
-$sel->click_ok("commit");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Invalid User Group");
-$sel->is_text_present_ok("User '$qa_user' is not able to edit the 'Another Product' Product");
-
-# Now set QA_Selenium_TEST user as a member of the Master group.
-
-go_to_admin($sel);
-$sel->click_ok("link=Users");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Search users");
-$sel->type_ok("matchstr", $qa_user);
-$sel->select_ok("matchtype", "label=exact (find this user)");
-$sel->click_ok("search");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Edit user QA-Selenium-TEST <$qa_user>");
-$sel->check_ok("group_$master_gid");
-$sel->click_ok("update");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("User $qa_user updated");
-
-# The QA_Selenium_TEST user can now be CC'ed to the bug.
-
-go_to_bug($sel, $bug1_id);
-$sel->click_ok("cc_edit_area_showhide");
-$sel->type_ok("newcc", $qa_user);
-$sel->click_ok("commit");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->is_text_present_ok("Changes submitted for bug $bug1_id");
-go_to_bug($sel, $bug1_id);
-$sel->click_ok("cc_edit_area_showhide");
-$sel->add_selection_ok("cc", "label=$qa_user");
-$sel->check_ok("removecc");
-$sel->click_ok("commit");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->is_text_present_ok("Changes submitted for bug $bug1_id");
-
-# The powerless user still cannot be CC'ed.
-
-go_to_bug($sel, $bug1_id);
-$sel->click_ok("cc_edit_area_showhide");
-$sel->type_ok("newcc", "$qa_user, $no_privs_user");
-$sel->click_ok("commit");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Invalid User Group");
-$sel->is_text_present_ok("User '$no_privs_user' is not able to edit the 'Another Product' Product");
-
-# Reset parameters back to defaults.
-
-set_parameters($sel, { "Group Security" => {"strict_isolation-off" => undef} });
-
-go_to_admin($sel);
-$sel->click_ok("link=Users");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Search users");
-$sel->type_ok("matchstr", $qa_user);
-$sel->select_ok("matchtype", "label=exact (find this user)");
-$sel->click_ok("search");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Edit user QA-Selenium-TEST <$qa_user>");
-$sel->uncheck_ok("group_$master_gid");
-$sel->click_ok("update");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("User $qa_user updated");
-
-edit_product($sel, "Another Product");
-$sel->click_ok("link=Edit Group Access Controls:");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Edit Group Controls for Another Product");
-$sel->uncheck_ok("canedit_$master_gid");
-$sel->click_ok("submit");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Update group access controls for Another Product");
-logout($sel);