[Catalyst-commits] r9139 - in Catalyst-Runtime/5.80/trunk: . lib t

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-01-29 20:26:06 +0000 (Thu, 29 Jan 2009)
New Revision: 9139

Removed:
   Catalyst-Runtime/5.80/trunk/t/unit_parameter_redact.t
Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
Log:
Back out 9138:9137 in favour of a more generic implementation

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-01-29 20:12:53 UTC (rev 9138)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-01-29 20:26:06 UTC (rev 9139)
@@ -1,9 +1,5 @@
 # This file documents the revision history for Perl extension Catalyst.
 
-Not yet released
-        - Allow redaction of parameters in debug output by configuration
-          (Byron Young)
-
 5.8000_05 2008-29-01 00:00
         - Text::SimpleTable's go as wide as $ENV{COLUMNS} (jhannah)
           Patch written by Oleg Kostyuk <cub.uanic at gmail.com>

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2009-01-29 20:12:53 UTC (rev 9138)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2009-01-29 20:26:06 UTC (rev 9139)
@@ -1806,10 +1806,15 @@
     $c->prepare_parameters;
     $c->prepare_uploads;
 
-    if ( $c->debug ) {
-        $c->log_parameters( 
-            'Body Parameters are', $c->request->body_parameters
-        );
+    if ( $c->debug && keys %{ $c->req->body_parameters } ) {
+        my $t = Text::SimpleTable->new( [ 35, 'Parameter' ], [ 36, 'Value' ] );
+        for my $key ( sort keys %{ $c->req->body_parameters } ) {
+            my $param = $c->req->body_parameters->{$key};
+            my $value = defined($param) ? $param : '';
+            $t->row( $key,
+                ref $value eq 'ARRAY' ? ( join ', ', @$value ) : $value );
+        }
+        $c->log->debug( "Body Parameters are:\n" . $t->draw );
     }
 }
 
@@ -1895,65 +1900,15 @@
 
     $c->engine->prepare_query_parameters( $c, @_ );
 
-    if ( $c->debug ) {
-        $c->log_parameters( 
-            'Query Parameters are', $c->request->query_parameters 
-        );
-    }
-}
-
-=head2 $c->log_parameters($name, $parameters)
-
-Logs a hash reference of key value pairs, with a caption above the table.
-
-Looks like:
-
- [debug] Query Parameters are:
- .-------------------------------------+--------------------------------------.
- | Parameter                           | Value                                |
- +-------------------------------------+--------------------------------------+
- | search                              | Moose                                |
- | searchtype                          | modules                              |
- '-------------------------------------+--------------------------------------'
-
-If there are query parameters you don't want to display in this output, such
-as passwords or other sensitive input, you can configure your application to
-redact those parameters:
-
-  C<< MyApp->config->{Debug}->{redact_parameters} = [ 'password' ] >>
-
-In that case, the output will look like:
-
- [debug] Query Parameters are:
- .-------------------------------------+--------------------------------------.
- | Parameter                           | Value                                |
- +-------------------------------------+--------------------------------------+
- | password                            | (redacted by config)                 |
- | username                            | some_user                            |
- '-------------------------------------+--------------------------------------'
-
-=cut
-
-sub log_parameters {
-    my ( $c, $name, $parameters ) = @_;
-
-    my $skip = $c->config->{Debug}->{redact_parameters};
-    if ( 
-        ( not defined $skip or ref $skip eq 'ARRAY' )
-        && keys %{ $parameters } 
-     ) {
-        my $t = Text::SimpleTable->new( 
-            [ 35, 'Parameter' ], [ 36, 'Value' ] );
-        my %skip_params = map { $_ => $_ } @{ $skip || [] };
-        for my $key ( sort keys %$parameters ) {
-            my $param = $parameters->{$key};
+    if ( $c->debug && keys %{ $c->request->query_parameters } ) {
+        my $t = Text::SimpleTable->new( [ 35, 'Parameter' ], [ 36, 'Value' ] );
+        for my $key ( sort keys %{ $c->req->query_parameters } ) {
+            my $param = $c->req->query_parameters->{$key};
             my $value = defined($param) ? $param : '';
-            $value = '(redacted by config)' if exists $skip_params{$key};
-
             $t->row( $key,
                 ref $value eq 'ARRAY' ? ( join ', ', @$value ) : $value );
         }
-        $c->log->debug( "$name:\n" . $t->draw );
+        $c->log->debug( "Query Parameters are:\n" . $t->draw );
     }
 }
 
@@ -2610,8 +2565,6 @@
 
 bricas: Brian Cassidy <bricas at cpan.org>
 
-Byron Young <Byron.Young at riverbed.com>
-
 Caelum: Rafael Kitover <rkitover at io.com>
 
 chansen: Christian Hansen

Deleted: Catalyst-Runtime/5.80/trunk/t/unit_parameter_redact.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/unit_parameter_redact.t	2009-01-29 20:12:53 UTC (rev 9138)
+++ Catalyst-Runtime/5.80/trunk/t/unit_parameter_redact.t	2009-01-29 20:26:06 UTC (rev 9139)
@@ -1,42 +0,0 @@
-#!perl
-
-use Test::More tests => 2;
-
-use strict;
-use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/lib";
-
-my @MESSAGES = ();
-
-{
-    package Catalyst::Log::Unit;
-    use base qw/Catalyst::Log/;
-
-}
-
-use Catalyst::Test 'TestApp';
-
-TestApp->setup;
-
-my $unit = Catalyst::Log::Unit->new;
-
-TestApp->log( $unit);
-
-TestApp->config->{Debug}->{redact_parameters} = [ 'and this' ];
-
-TestApp->log_parameters(
-    'Query Parameters are',
-    {
-        'this is' => 'a unit test',
-        'and this' => 'is hidden' 
-    }
-);
-
-my $body = $unit->_body;
-
-like($body, qr/this is\s*\|\s*a unit test/);
-like($body, qr/and this\s*\|\s*\(redacted by config\)/);
-
-