From 8782cbb1c99e52d25a5157b0d3b794459f2b631a Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander Date: Sun, 13 Mar 2011 22:03:22 -0700 Subject: Bug 622943: Simple auditing of changes to Bugzilla::Object subclass objects r=dkl, a=mkanat --- Bugzilla/Object.pm | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) (limited to 'Bugzilla/Object.pm') diff --git a/Bugzilla/Object.pm b/Bugzilla/Object.pm index 6c5289453..1cad3e829 100644 --- a/Bugzilla/Object.pm +++ b/Bugzilla/Object.pm @@ -43,6 +43,7 @@ use constant VALIDATOR_DEPENDENCIES => {}; # XXX At some point, this will be joined with FIELD_MAP. use constant REQUIRED_FIELD_MAP => {}; use constant EXTRA_REQUIRED_FIELDS => (); +use constant AUDIT_UPDATES => 1; # This allows the JSON-RPC interface to return Bugzilla::Object instances # as though they were hashes. In the future, this may be modified to return @@ -392,6 +393,8 @@ sub update { { object => $self, old_object => $old_self, changes => \%changes }); + $self->audit_log(\%changes) if $self->AUDIT_UPDATES; + $dbh->bz_commit_transaction(); if (wantarray) { @@ -406,11 +409,43 @@ sub remove_from_db { Bugzilla::Hook::process('object_before_delete', { object => $self }); my $table = $self->DB_TABLE; my $id_field = $self->ID_FIELD; - Bugzilla->dbh->do("DELETE FROM $table WHERE $id_field = ?", - undef, $self->id); + my $dbh = Bugzilla->dbh; + $dbh->bz_start_transaction(); + $self->audit_log(AUDIT_REMOVE); + $dbh->do("DELETE FROM $table WHERE $id_field = ?", undef, $self->id); + $dbh->bz_commit_transaction(); undef $self; } +sub audit_log { + my ($self, $changes) = @_; + my $class = ref $self; + my $dbh = Bugzilla->dbh; + my $user_id = Bugzilla->user->id || undef; + my $sth = $dbh->prepare( + 'INSERT INTO audit_log (user_id, class, object_id, field, + removed, added, at_time) + VALUES (?,?,?,?,?,?,LOCALTIMESTAMP(0))'); + # During creation or removal, $changes is actually just a string + # indicating whether we're creating or removing the object. + if ($changes eq AUDIT_CREATE or $changes eq AUDIT_REMOVE) { + # We put the object's name in the "added" or "removed" field. + # We do this thing with NAME_FIELD because $self->name returns + # the wrong thing for Bugzilla::User. + my $name = $self->{$self->NAME_FIELD}; + my @added_removed = $changes eq AUDIT_CREATE ? (undef, $name) + : ($name, undef); + $sth->execute($user_id, $class, $self->id, $changes, @added_removed); + return; + } + + # During update, it's the actual %changes hash produced by update(). + foreach my $field (keys %$changes) { + my ($from, $to) = @{ $changes->{$field} }; + $sth->execute($user_id, $class, $self->id, $field, $from, $to); + } +} + ############################### #### Subroutines ###### ############################### @@ -522,6 +557,8 @@ sub insert_create_data { Bugzilla::Hook::process('object_end_of_create', { class => $class, object => $object }); + $object->audit_log(AUDIT_CREATE); + return $object; } -- cgit v1.2.3-24-g4f1b