Attachment 294615 Details for Bug 406321 – patch for bugs 406321 and 406141

[patch] patch for bugs 406321 and 406141

patch_for_406321_and_406141 (text/plain), 4.71 KB, created by Noura El hawary on 2008-02-12 01:59:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noura El hawary

Created: 2008-02-12 01:59:27 UTC

Size: 4.71 KB

patch

obsolete

>Index: Bugzilla/Bug.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/Bug.pm,v
>retrieving revision 1.16
>diff -u -r1.16 Bug.pm
>--- Bugzilla/Bug.pm	4 Feb 2008 22:25:26 -0000	1.16
>+++ Bugzilla/Bug.pm	12 Feb 2008 01:55:56 -0000
>@@ -359,6 +359,42 @@
>     # Update the bug instance as well
>     $bug->{creation_ts} = $timestamp;
> 
>+    # REDHAT EXTENSION START 406321
>+    # REDHAT If group is security, then add security-response-team@redhat.com 
>+    # REDHAT to cclist and only allow cc's in the groups assigned.
>+    foreach my $groupid (@$groups) {
>+        if ($groupid == 71) {
>+            my $ccid = login_to_id("security-response-team\@redhat.com");
>+            my %unique_ccids;
>+            map { $unique_ccids{$_} = 1 } @$cc_ids;
>+            push (@$cc_ids, $ccid) if !$unique_ccids{$ccid};
>+
>+            my @tempccids = ();
>+            foreach my $gid (@$groups) {
>+                my $group_obj = new Bugzilla::Group($gid);
>+                my $gname = $group_obj->name;
>+                foreach my $ccid (@$cc_ids) {
>+                    my $cc_user =  new Bugzilla::User($ccid);
>+                    if ($cc_user->in_group($gname)){
>+                        push @tempccids, $ccid;
>+                    }
>+                }
>+            }
>+            @$cc_ids = @tempccids;
>+
>+            # Add Security keyword
>+            my $keyword_found = 0;
>+            my $keyword_obj = Bugzilla::Keyword->check("Security");
>+            foreach my $keyword_id (map($_->id, @$keywords)) {
>+                if ($keyword_id == $keyword_obj->id){
>+                    $keyword_found = 1;
>+                }    
>+            }
>+            push (@$keywords, $keyword_obj) if !$keyword_found;
>+        }
>+    }
>+    # REDHAT EXTENSION END 406321
>+
>     # Add the CCs
>     my $sth_cc = $dbh->prepare('INSERT INTO cc (bug_id, who) VALUES (?,?)');
>     foreach my $user_id (@$cc_ids) {
>@@ -1721,6 +1757,7 @@
> sub set_product {
>     my ($self, $name, $params) = @_;
>     my $old_product = $self->product_obj;
>+
>     my $product = $self->_check_product($name);
>     
>     my $product_changed = 0;
>@@ -1730,6 +1767,14 @@
>         $self->{product_obj} = $product;
>         # For update()
>         $self->{_old_product_name} = $old_product->name;
>+    
>+        # REDHAT EXTENSION START 406141
>+        # If the old product is a RHEL product and the user is not a redhat.com account then deny the change.
>+        if ( $self->{_old_product_name} =~ /Red Hat Enterprise Linux/ and not Bugzilla->user->login =~ /.*\@redhat\.com$/ ) {
>+            ThrowUserError("product_change_denied");
>+        }
>+        # REDHAT EXTENSION END 406141
>+
>         # Delete fields that depend upon the old Product value.
>         delete $self->{choices};
>         delete $self->{milestoneurl};
>@@ -3207,6 +3252,23 @@
>     # $PrivilegesRequired = 2 : the assignee or an empowered user;
>     # $PrivilegesRequired = 3 : an empowered user.
>     
>+    # REDHAT EXTENSION START 406141
>+    # allow CLOSED status on RHEL products if user is a RH employee OR in the rhel_beta group
>+    if ( $field eq 'bug_status' ) {
>+        if ( $newvalue eq 'CLOSED' && $self->product_obj->name =~ /Red Hat Enterprise Linux/ ) {
>+            if ( not ( $user->login =~ /.*\@redhat\.com$/ or $user->in_group('rhel_beta') ) ) {
>+                $$PrivilegesRequired = 3;
>+                return 0;
>+            }
>+        }
>+    }
>+    # Disallow priority change if not in the setpriority group
>+    if ( $field eq "priority" and $newvalue ne $oldvalue and not $user->in_group('setpriority') ) {
>+        $$PrivilegesRequired = 3;
>+        return 0;
>+    }
>+    # REDHAT EXTENSION END 406141
>+    
>     # Only users in the time-tracking group can change time-tracking fields.
>     if ( grep($_ eq $field, qw(deadline estimated_time remaining_time)) ) {
>         my $tt_group = Bugzilla->params->{timetrackinggroup};
>Index: template/en/default/global/user-error.html.tmpl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/global/user-error.html.tmpl,v
>retrieving revision 1.9
>diff -u -r1.9 user-error.html.tmpl
>--- template/en/default/global/user-error.html.tmpl	11 Feb 2008 03:19:45 -0000	1.9
>+++ template/en/default/global/user-error.html.tmpl	12 Feb 2008 01:57:01 -0000
>@@ -1320,6 +1320,10 @@
>     You are not permitted to edit [% terms.bugs %] in product 
>     [%+ product FILTER html %].
> 
>+  [% ELSIF error == "product_change_denied" %]
>+    [% title = "Product Change Denied" %]
>+    You are not permitted to change products for this [% terms.bug %].
>+
>   [% ELSIF error == "product_has_bugs" %]
>     [% title = BLOCK %]Product has [% terms.Bugs %][% END %]
>     [% admindocslinks = {'products.html' => 'Administering products'} %]

Actions: View | Diff

Attachments on bug 406321: 294536 | 294537 | 294615