Bug 825886: When moving bugs from one product to another, I should be able to keep a security bug private across groups that I'm not a member of

1 files changed, 25 insertions, 27 deletions

diff --git a/extensions/BMO/lib/Data.pm b/extensions/BMO/lib/Data.pm
index 2b4ccb729..9a5ca0799 100644
--- a/extensions/BMO/lib/Data.pm
+++ b/extensions/BMO/lib/Data.pm
@@ -35,7 +35,7 @@ our @EXPORT = qw( $cf_visible_in_products
                   $status_trusted_wanters
                   $status_trusted_setters
                   $other_setters
-                  %always_fileable_group
+                  @always_fileable_groups
                   %group_auto_cc
                   %product_sec_groups
                   %create_bug_formats );
@@ -368,34 +368,35 @@ our $other_setters = {
     'cf_colo_site'  => ['infra', 'build'],
 };
 
-# Groups in which you can always file a bug, whoever you are.
-our %always_fileable_group = (
-    'addons-security'                   => 1,
-    'bugzilla-security'                 => 1,
-    'client-services-security'          => 1,
-    'consulting'                        => 1,
-    'core-security'                     => 1,
-    'finance'                           => 1,
-    'infra'                             => 1,
-    'infrasec'                          => 1,
-    'l20n-security'                     => 1,
-    'marketing-private'                 => 1,
-    'mozilla-confidential'              => 1,
-    'mozilla-corporation-confidential'  => 1,
-    'mozilla-foundation-confidential'   => 1,
-    'mozilla-engagement'                => 1,
-    'mozilla-messaging-confidential'    => 1,
-    'partner-confidential'              => 1,
-    'payments-confidential'             => 1,
-    'tamarin-security'                  => 1,
-    'websites-security'                 => 1,
-    'webtools-security'                 => 1,
-    'winqual-data'                      => 1,
+# Groups in which you can always file a bug, regardless of product or user.
+our @always_fileable_groups = qw(
+    addons-security
+    bugzilla-security
+    client-services-security
+    consulting
+    core-security
+    finance
+    infra
+    infrasec
+    l20n-security
+    marketing-private
+    mozilla-confidential
+    mozilla-corporation-confidential
+    mozilla-foundation-confidential
+    mozilla-engagement
+    mozilla-messaging-confidential
+    partner-confidential
+    payments-confidential
+    tamarin-security
+    websites-security
+    webtools-security
+    winqual-data
 );
 
 # Mapping of products to their security bits
 our %product_sec_groups = (
     "addons.mozilla.org"           => 'client-services-security',
+    "Air Mozilla"                  => 'mozilla-corporation-confidential',
     "Android Background Services"  => 'mozilla-services-security',
     "AUS"                          => 'client-services-security',
     "Bugzilla"                     => 'bugzilla-security',
@@ -450,9 +451,6 @@ our %group_auto_cc = (
     },
 );
 
-# Default security groups for products should always been fileable
-map { $always_fileable_group{$_} = 1 } values %product_sec_groups;
-
 # Force create-bug template by product
 # Users in 'include' group will be fored into using the form.
 our %create_bug_formats = (