Attachment 312754 Details for Bug 453613 – a patch fix all of above patches including UI clean

[patch] a patch fix all of above patches including UI clean

bug453613.patch (text/plain), 9.60 KB, created by eric_liu on 2008-07-28 07:37:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: eric_liu

Created: 2008-07-28 07:37:12 UTC

Size: 9.60 KB

patch

obsolete

>Index: attachment.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/attachment.cgi,v
>retrieving revision 1.13
>diff -u -r1.13 attachment.cgi
>--- attachment.cgi	19 Jun 2008 14:16:48 -0000	1.13
>+++ attachment.cgi	28 Jul 2008 07:28:36 -0000
>@@ -147,6 +147,7 @@
>   validateDescription();
>   validateContentType() unless $::FORM{'ispatch'};
>   validateObsolete() if $::FORM{'obsolete'};
>+  validateMd5sumOverride() if $::FORM{'md5sumoverride'};
>   insert($data);
> }
> elsif ($action eq "edit") 
>@@ -390,6 +391,19 @@
>     $::FORM{'isprivate'} = $::FORM{'isprivate'} ? 1 : 0;
> }
> 
>+sub validateMd5sumOverride
>+{
>+    # Verify that the $md5sumOverride is legal either way and that the user 
>+    # has permissions to set it , since the UI uses
>+    # an HTML checkbox to represent this flag, and unchecked HTML checkboxes
>+    # do not get sent in HTML requests.
>+    # 3rd
>+    trick_taint($::FORM{'md5sumoverride'});
>+    $::FORM{'md5sumoverride'} = $::FORM{'md5sumoverride'} ? 1 : 0;
>+    UserInGroup('hwcert_edit') ||
>+    			ThrowUserError("md5sum_override_permission_deny");
>+}
>+
> sub validateData
> {
>   my $maxsize = $::FORM{'ispatch'} ? Param('maxpatchsize') : Param('maxattachmentsize');
>@@ -916,15 +930,23 @@
> 
> sub insert
> {
>-  my ($data) = @_;
>-
>-  # Insert a new attachment into the database.
>-
>-  # move duplicate checking here, it's already added to the db if we wait until processResultsRPM
>-  # this should be reworked and is perhaps the starting point for merging the post.cgi code
>+  my ($data) = shift @_;
>   my $md5sum = GenMd5File($filename, $data);
>-  SendSQL2("SELECT filename FROM cert_rpms WHERE md5sum = " . SqlQuote($md5sum));
>-  FetchOneColumn2() && ThrowUserError("duplicate_attachment");
>+  my $md5sumoverride =  $::FORM{'md5sumoverride'} ? 1 : 0;
>+  my $duplicate_package_comment;
>+  
>+  SendSQL2("SELECT attach_id, bug_id FROM cert_records
>+	            JOIN cert_rpms ON cert_records.id = cert_rpms.cert_id
>+             WHERE md5sum  = ". SqlQuote($md5sum));
>+  while (my @row = FetchSQLData2()){
>+     if($md5sumoverride){
>+        my $attach_id = shift @row;
>+        my $bug_id = shift @row;
>+        $duplicate_package_comment .= "\n $filename already attached as attachment $attach_id in bug $bug_id";
>+     }else{
>+        FetchOneColumn2() && ThrowUserError("duplicate_attachment");
>+     }  
>+  }		
> 
>   # Escape characters in strings that will be used in SQL statements.
>   my $sqlfilename = SqlQuote($filename);
>@@ -942,19 +964,17 @@
>   trick_taint($thedata);
> 
>   # Insert the attachment into the database.
>-  my $query="INSERT INTO attachments (bug_id, creation_ts, filename, description, mimetype, ispatch, isprivate, submitter_id, thedata)
>-           VALUES ($::FORM{'bugid'}, now(), $sqlfilename, $description, $contenttype, $::FORM{'ispatch'}, $isprivate, $::userid, ?)";
>-
>-  $logger->debug("sql query before execution: [ $query ]");
>+  my $query="INSERT INTO attachments 
>+                         (bug_id, creation_ts, filename, description, mimetype, ispatch, isprivate, submitter_id, thedata)
>+                  VALUES ($::FORM{'bugid'}, now(), $sqlfilename, $description, $contenttype, $::FORM{'ispatch'}, $isprivate, $::userid, ?)";
>   SendSQL($query, $thedata);
>-  $logger->debug("sql query executed");
> 
>   # Retrieve the ID of the newly created attachment record.
>   SendSQL(Bugzilla::DB::LastKey('attachments', 'attach_id'));
>   my $attachid = FetchOneColumn();
> 
>   # Insert a comment about the new attachment into the database.
>-  my $comment = "Created an attachment (id=$attachid) $filename\n";
>+  my $comment = "\nCreated an attachment (id=$attachid) $filename\n";
>   $comment .= ("\n" . $::FORM{'comment'} . "\n") if $::FORM{'comment'};
> 
>   my $attachasresult= $::FORM{'attachasresult'};
>@@ -962,13 +982,14 @@
>   # Support hwcert results package parsing when mimetype is right and checkbox "attachasresult" is checked.
>   if ( $contenttype =~ /redhat-package-manager|x-rpm|octet-stream|x-pn-realaudio/ && $attachasresult eq "true")
>   {
>-     $comment.= processResultsRpm($::FORM{'bugid'}, $filename, $attachid, $attachasresult, $data );
>+     $comment.= processResultsRpm($::FORM{'bugid'}, $filename, $md5sum, $attachid, $attachasresult, $data );
>   }
> 
>   use Text::Wrap;
>   $Text::Wrap::columns = 80;
>   $Text::Wrap::huge = 'overflow';
>   $comment = Text::Wrap::wrap('', '', $comment);
>+  $comment .= $duplicate_package_comment;
> 
>   AppendComment($::FORM{'bugid'}, 
>                 $::COOKIE{"Bugzilla_login"},
>Index: hwcert.pl
>===================================================================
>RCS file: /cvs/qa/hwcert/hwcert.pl,v
>retrieving revision 1.53
>diff -u -r1.53 hwcert.pl
>--- hwcert.pl	19 Jun 2008 14:18:57 -0000	1.53
>+++ hwcert.pl	28 Jul 2008 07:28:38 -0000
>@@ -1005,13 +1005,11 @@
> {
>   my $bug_id = shift @_;
>   my $filename = shift @_;
>+  my $md5sum = shift@_;
>   my $attachid = shift @_;
>   my $attachasresult =shift @_;
>   my ($data) = @_;
> 
>-  # Process a results rpm inserting test results into the cert database
>-  my $md5sum = GenMd5File($filename, $data);
>-
>   # Create a local package
>   my $rpmlocation = CreateRpm($md5sum, $filename, $data);
>   # Judge the file which attached by IE if it's not a rpm.
>@@ -1044,10 +1042,6 @@
>       return;
>   }
> 
>-  # Verify we haven't already seen this package
>-  SendSQL2("SELECT filename FROM cert_rpms WHERE md5sum = " . SqlQuote($md5sum));
>-  FetchOneColumn2() && ThrowUserError("duplicate_attachment");
>-
>   # Explode into scratch directory so we can get the system.conf and hardware.py information
>   my $scratchlocation = CreateScratch($md5sum, $rpmlocation);
> 
>Index: template/en/default/bug/upload_packages.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/bug/upload_packages.html.tmpl,v
>retrieving revision 1.3
>diff -u -r1.3 upload_packages.html.tmpl
>--- template/en/default/bug/upload_packages.html.tmpl	19 Jun 2008 14:20:58 -0000	1.3
>+++ template/en/default/bug/upload_packages.html.tmpl	28 Jul 2008 07:29:00 -0000
>@@ -8,8 +8,6 @@
>       if (rpm_pattern.test(filename)) {
>           if (rhr2_pattern.test(filename)) {
>               document.getElementById("attachasresult").checked=false;
>-              document.getElementById("attachasresult_warning").innerHTML=
>-              "Filename matches /rhr/ : rhr2 has been deprecated.";
>               document.getElementById("attachasresult_warning").style.display = "block";
>           } else if (hts_pattern.test(filename)) {
>               document.getElementById("attachasresult").checked=true;
>@@ -22,9 +20,6 @@
>              document.getElementById("attachasresult").checked=false;
>              document.getElementById("attachasresult_warning").style.display = "none";
>       } 
>-      document.getElementById("attachasresult_prompt").innerHTML=
>-      "<b><font color='gray'>System-set</b></font>";
>-      document.getElementById("attachasresult_prompt").style.display = "inline";
>   }
>   </script>
>     <hr/>
>@@ -41,7 +36,7 @@
>         <input type="hidden" name="action" value="insert">
>         <input type="hidden" name="contenttypemethod" value="autodetect">
>         <em>Enter the path to the results package or spec file on your computer.</em><br/>
>-        <input type="file" name="data" id="data" size="50" onchange="verify_filename()" >
>+        <input type="file" name="data" id="data" size="50" onchange="verify_filename();" >
>       </td>
>     </tr>
>     <tr>
>@@ -50,7 +45,7 @@
>         <em>Describe the attachment briefly.</em><br>
>         <input type="text" name="description" size="60" maxlength="200">
>       </td>
>-    <tr>
>+    </tr>
>     <tr>
>       <th>Comment:</th>
>       <td>
>@@ -59,11 +54,11 @@
>       </td>
>     </tr>
>     <tr>
>-      <th>Attach&nbsp;as&nbsp;result:</th>
>+      <th>Options:</th>
>       <td>
>-        <input type="checkbox" name="attachasresult" id="attachasresult" value="true" checked onclick="document.getElementById('attachasresult_prompt').innerHTML='<b><font color=\'blue\'>User-set</b></font>';document.getElementById('attachasresult_prompt').style.display = 'inline';">
>-        <div id = "attachasresult_prompt" style = "display:inline"><b><font color='gray'>System-set</b></font></div>
>-        <div id = "attachasresult_warning" style = "display:none"></div>
>+        <input type="checkbox" name="attachasresult" id="attachasresult" value="true" checked>Attach as result
>+        <div id = "attachasresult_warning" style = "display:none">"Filename matches /rhr/ : rhr2 has been deprecated."</div>
>+        <input type="checkbox" name="md5sumoverride" value="md5sumoverride"> Override md5sum check
>       </td>
>     </tr>
>     </table>
>Index: template/en/default/global/user-error.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/global/user-error.html.tmpl,v
>retrieving revision 1.14
>diff -u -r1.14 user-error.html.tmpl
>--- template/en/default/global/user-error.html.tmpl	19 Jun 2008 14:21:59 -0000	1.14
>+++ template/en/default/global/user-error.html.tmpl	28 Jul 2008 07:29:01 -0000
>@@ -883,7 +883,12 @@
>   [% ELSIF error == "unknown_make" %]
>     [% title = "Illegal Make" %]
>     Make has been defined as UnknownMake; please configure field:Make before continuing.
>-
>+  [% ELSIF error == "md5sum_override_permission_deny"%]
>+    [% title = "Md5sum Override Permission Deny" %]
>+   You are not authorized to override the duplicate md5sum check.
>+  [% ELSIF error == "md5sum_override_permission_deny"%]
>+  		[% title = "Md5sum Override Permission Deny" %]
>+  		Md5sum Override Permission Deny; Only the hwcert_edit group members can override the package.
>   [% ELSE %]
>     [% title = "Error string not found" %]
>     The user error string <code>[% error FILTER html %]</code> was not found.

Actions: View | Diff

Attachments on bug 453613: 311105 | 311359 | 311524 | 311916 | 312278 | 312754 | 312935