[Bast-commits] r5680 - in DBIx-Class/0.08/trunk: lib/DBIx/Class/Storage/DBI t

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-03-03 21:43:48 +0000 (Tue, 03 Mar 2009)
New Revision: 5680

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase.pm
   DBIx-Class/0.08/trunk/t/74mssql.t
Log:
Clarify sybase/nobindvars problem (should have never merged in the 1st place)

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/NoBindVars.pm	2009-03-03 21:38:32 UTC (rev 5679)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/NoBindVars.pm	2009-03-03 21:43:48 UTC (rev 5680)
@@ -50,12 +50,12 @@
 
   foreach my $bound (@$bind) {
     my $col = shift @$bound;
-    my $do_quote = $self->should_quote_data_type($col);
+    my $datatype = 'FIXME!!!';
     foreach my $data (@$bound) {
         if(ref $data) {
             $data = ''.$data;
         }
-        $data = $self->_dbh->quote($data) if $do_quote;
+        $data = $self->_dbh->quote($data) if $self->should_quote_data_type($datatype, $data);
         $new_sql .= shift(@sql_part) . $data;
     }
   }
@@ -67,14 +67,18 @@
 =head2 should_quote_data_type
 
 This method is called by L</_prep_for_execute> for every column in
-order to determine if its value should be quoted or not. The sole
-argument is the current column data type, and the return value is
-interpreted as: true - do quote, false - do not quote. You should
-override this in you Storage::DBI::<database> subclass, if your
-RDBMS does not like quotes around certain datatypes (e.g. Sybase
-and integer columns). The default method always returns true (do
-quote).
+order to determine if its value should be quoted or not. The arguments
+are the current column data type and the actual bind value. The return
+value is interpreted as: true - do quote, false - do not quote. You should
+override this in you Storage::DBI::<database> subclass, if your RDBMS
+does not like quotes around certain datatypes (e.g. Sybase and integer
+columns). The default method always returns true (do quote).
 
+ WARNING!!!
+
+ Always validate that the bind-value is valid for the current datatype.
+ Otherwise you may very well open the door to SQL injection attacks.
+
 =cut
 
 sub should_quote_data_type { 1 }

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase.pm	2009-03-03 21:38:32 UTC (rev 5679)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Sybase.pm	2009-03-03 21:43:48 UTC (rev 5680)
@@ -5,12 +5,23 @@
 
 use base qw/DBIx::Class::Storage::DBI::NoBindVars/;
 
-my %noquote = map { $_ => 1 } qw(int integer);
+my $noquote = {
+    int => qr/^ \-? \d+ $/x,
+    integer => qr/^ \-? \d+ $/x,
 
+    # TODO maybe need to add float/real/etc
+};
+
 sub should_quote_data_type {
   my $self = shift;
-  my ($type) = @_;
-  return 0 if $noquote{$type};
+  my ($type, $value) = @_;
+
+  return $self->next::method(@_) if not defined $value;
+
+  if (my $re = $noquote->{$type}) {
+    return 0 if $value =~ $re;
+  }
+
   return $self->next::method(@_);
 }
 

Modified: DBIx-Class/0.08/trunk/t/74mssql.t
===================================================================
--- DBIx-Class/0.08/trunk/t/74mssql.t	2009-03-03 21:38:32 UTC (rev 5679)
+++ DBIx-Class/0.08/trunk/t/74mssql.t	2009-03-03 21:43:48 UTC (rev 5680)
@@ -40,7 +40,7 @@
 
 # Test LIMIT
 for (1..6) {
-    $schema->resultset('Artist')->create( { name => 'Artist ' . $_ } );
+    $schema->resultset('Artist')->create( { name => 'Artist ' . $_, rank => $_ } );
 }
 
 my $it = $schema->resultset('Artist')->search( { },