From ebd89c7672e0bf5150fe1c2f89c2f88b90304e8d Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Tue, 16 Jun 2015 23:31:31 -0700 Subject: [PATCH] web access logging to DB --- FS/FS/Schema.pm | 12 +++++ FS/FS/access_user_log.pm | 136 +++++++++++++++++++++++++++++++++++++++++++++++ FS/MANIFEST | 2 - FS/t/access_user_log.t | 5 ++ htetc/handler.pl | 4 +- 5 files changed, 156 insertions(+), 3 deletions(-) create mode 100644 FS/FS/access_user_log.pm create mode 100644 FS/t/access_user_log.t diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 3a27b741b..bab179f33 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -4016,6 +4016,18 @@ sub tables_hashref { 'index' => [], }, + 'access_user_log' => { + 'columns' => [ + 'lognum', 'serial', '', '', '', '', + 'usernum', 'int', '', '', '', '', + 'path', 'varchar', '', 2*$char_d, '', '', + '_date', @date_type, '', '', + ], + 'primary_key' => 'lognum', + 'unique' => [], + 'index' => [ ['usernum'], ['path'], ['_date'] ], + }, + 'sched_item' => { 'columns' => [ 'itemnum', 'serial', '', '', '', '', diff --git a/FS/FS/access_user_log.pm b/FS/FS/access_user_log.pm new file mode 100644 index 000000000..884d250d6 --- /dev/null +++ b/FS/FS/access_user_log.pm @@ -0,0 +1,136 @@ +package FS::access_user_log; +use base qw( FS::Record ); + +use strict; +#use FS::Record qw( qsearch qsearchs ); +use FS::CurrentUser; + +=head1 NAME + +FS::access_user_log - Object methods for access_user_log records + +=head1 SYNOPSIS + + use FS::access_user_log; + + $record = new FS::access_user_log \%hash; + $record = new FS::access_user_log { 'column' => 'value' }; + + $error = $record->insert; + + $error = $new_record->replace($old_record); + + $error = $record->delete; + + $error = $record->check; + +=head1 DESCRIPTION + +An FS::access_user_log object represents a backoffice web server log entry. + FS::access_user_log inherits from FS::Record. The following fields are +currently supported: + +=over 4 + +=item lognum + +primary key + +=item usernum + +usernum + +=item path + +path + +=item _date + +_date + + +=back + +=head1 METHODS + +=over 4 + +=item new HASHREF + +Creates a new log entry. To add the log entry to the database, see L<"insert">. + +Note that this stores the hash reference, not a distinct copy of the hash it +points to. You can ask the object for a copy with the I method. + +=cut + +sub table { 'access_user_log'; } + +=item insert_new_path PATH + +Adds a log entry for PATH for the current user and timestamp. + +=cut + +sub insert_new_path { + my( $class, $path ) = @_; + + my $self = $class->new( { + 'usernum' => $FS::CurrentUser::CurrentUser->usernum, + 'path' => $path, + '_date' => time, + } ); + + my $error = $self->insert; + die $error if $error; + +} + +=item insert + +Adds this record to the database. If there is an error, returns the error, +otherwise returns false. + +=item delete + +Delete this record from the database. + +=item replace OLD_RECORD + +Replaces the OLD_RECORD with this one in the database. If there is an error, +returns the error, otherwise returns false. + +=item check + +Checks all fields to make sure this is a valid log entry. If there is +an error, returns the error, otherwise returns false. Called by the insert +and replace methods. + +=cut + +sub check { + my $self = shift; + + my $error = + $self->ut_numbern('lognum') + || $self->ut_foreign_key('usernum', 'access_user', 'usernum') + || $self->ut_text('path') + || $self->ut_number('_date') + ; + return $error if $error; + + $self->SUPER::check; +} + +=back + +=head1 BUGS + +=head1 SEE ALSO + +L + +=cut + +1; + diff --git a/FS/MANIFEST b/FS/MANIFEST index baf11356e..c828bd68b 100644 --- a/FS/MANIFEST +++ b/FS/MANIFEST @@ -776,7 +776,6 @@ FS/deploy_zone_block.pm t/deploy_zone_block.t FS/deploy_zone_vertex.pm t/deploy_zone_vertex.t - FS/circuit_type.pm t/circuit_type.t FS/circuit_provider.pm @@ -792,7 +791,6 @@ t/legacy_cust_history.t FS/quotation_pkg_tax.pm t/quotation_pkg_tax.t FS/h_svc_circuit.pm -FS/h_svc_circuit.t FS/FeeOrigin_Mixin.pm FS/cust_pkg_reason_fee.pm t/cust_pkg_reason_fee.t diff --git a/FS/t/access_user_log.t b/FS/t/access_user_log.t new file mode 100644 index 000000000..582b32ca1 --- /dev/null +++ b/FS/t/access_user_log.t @@ -0,0 +1,5 @@ +BEGIN { $| = 1; print "1..1\n" } +END {print "not ok 1\n" unless $loaded;} +use FS::access_user_log; +$loaded=1; +print "ok 1\n"; diff --git a/htetc/handler.pl b/htetc/handler.pl index 3c68e83ed..f41a3df70 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -6,6 +6,7 @@ use strict; use warnings; use FS::Mason qw( mason_interps ); use FS::Trace; +use FS::access_user_log; if ( %%%RT_ENABLED%%% ) { @@ -104,7 +105,6 @@ sub handler return -1 if defined( $r->content_type ) && $r->content_type !~ m!(^text/|\bxml\b)!io; - local $SIG{__WARN__}; local $SIG{__DIE__}; @@ -136,6 +136,8 @@ sub handler } + FS::access_user_log->insert_new_path( $r->uri ); + FS::Trace->log('handling request'); my %session; my $status; -- 2.11.0