From e4dfffc24ca572965c513356c7c8a19f82a22c64 Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Tue, 10 Nov 2009 21:21:52 +0000 Subject: Bug 526165: Make it impossible to set creation_ts via Bugzilla::Bug->create Patch by Max Kanat-Alexander r=dkl, a=mkanat --- Bugzilla/Bug.pm | 6 +++--- Bugzilla/Migrate.pm | 7 ++++++- Bugzilla/WebService/Bug.pm | 7 ------- post_bug.cgi | 8 ++++---- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 1c8b8b965..107b3f6af 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -590,10 +590,10 @@ sub run_create_validators { $class->_check_qa_contact($params->{qa_contact}, $component); $params->{cc} = $class->_check_cc($component, $params->{cc}); - # Callers cannot set Reporter, currently. + # Callers cannot set reporter, creation_ts, or delta_ts. $params->{reporter} = $class->_check_reporter(); - - $params->{creation_ts} ||= Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)'); + $params->{creation_ts} = + Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)'); $params->{delta_ts} = $params->{creation_ts}; if ($params->{estimated_time}) { diff --git a/Bugzilla/Migrate.pm b/Bugzilla/Migrate.pm index c8f601521..40249bf50 100644 --- a/Bugzilla/Migrate.pm +++ b/Bugzilla/Migrate.pm @@ -767,7 +767,12 @@ sub insert_bugs { my $created = Bugzilla::Bug->create($bug); $self->debug('Created bug ' . $created->id); Bugzilla->set_user($super_user); - + + if (defined $bug->{creation_ts}) { + $dbh->do('UPDATE bugs SET creation_ts = ?, delta_ts = ? + WHERE bug_id = ?', undef, $bug->{creation_ts}, + $bug->{creation_ts}, $created->id); + } if (defined $bug->{delta_ts}) { $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?', undef, $bug->{delta_ts}, $created->id); diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm index aea30cedb..006fa0fee 100644 --- a/Bugzilla/WebService/Bug.pm +++ b/Bugzilla/WebService/Bug.pm @@ -282,17 +282,10 @@ sub search { sub create { my ($self, $params) = @_; - Bugzilla->login(LOGIN_REQUIRED); - $params = _map_fields($params); - # WebService users can't set the creation date of a bug. - delete $params->{'creation_ts'}; - my $bug = Bugzilla::Bug->create($params); - Bugzilla::BugMail::Send($bug->bug_id, { changer => $bug->reporter->login }); - return { id => $self->type('int', $bug->bug_id) }; } diff --git a/post_bug.cgi b/post_bug.cgi index a482913cd..ed483aec9 100755 --- a/post_bug.cgi +++ b/post_bug.cgi @@ -103,9 +103,6 @@ if (defined $cgi->param('maketemplate')) { umask 0; -# get current time -my $timestamp = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)'); - # Group Validation my @selected_groups; foreach my $group (grep(/^bit-\d+$/, $cgi->param())) { @@ -160,7 +157,6 @@ my %bug_params; foreach my $field (@bug_fields) { $bug_params{$field} = $cgi->param($field); } -$bug_params{'creation_ts'} = $timestamp; $bug_params{'cc'} = [$cgi->param('cc')]; $bug_params{'groups'} = \@selected_groups; $bug_params{'comment'} = $comment; @@ -176,6 +172,10 @@ my $bug = Bugzilla::Bug->create(\%bug_params); # Get the bug ID back. my $id = $bug->bug_id; +# We do this directly from the DB because $bug->creation_ts has the seconds +# formatted out of it (which should be fixed some day). +my $timestamp = $dbh->selectrow_array( + 'SELECT creation_ts FROM bugs WHERE bug_id = ?', undef, $id); # Set Version cookie, but only if the user actually selected # a version on the page. -- cgit v1.2.3-24-g4f1b