From 17bc339856f3d99696c53883c1415225e6b968ba Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@koha-community.org>
Date: Mon, 22 Jun 2015 10:56:26 +0200
Subject: [PATCH] [PASSED QA] Bug 14426: Escape or use placeholders for sql
parameters
Does this patch enough to prevent sql injection in borrowers_out.pl?
====================================================================
1. "Criteria" Parameter, Payload: ELT(1=1,'evil') / ELT(1=2,'evil')
====================================================================
echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
186\r\n\r\nFilter=P_COM&Filter=&Limit=&output=file&basename=Export&MIME=CSV&sep=%3B&report_name=&do_it=1&userid=<username>&password=<password>&branch=&koha_login_context=intranet&Criteria=ELT(1=2,'evil')"
| nc testbox 9002
echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
186\r\n\r\nFilter=P_COM&Filter=&Limit=&output=file&basename=Export&MIME=CSV&sep=%3B&report_name=&do_it=1&userid=<username>&password=<password>&branch=&koha_login_context=intranet&Criteria=ELT(1=1,'evil')"
| nc testbox 9002
====================================================================
2. "Filter" Parameter, Payload: P_COM'+AND+'a'='a / P_COM'+AND+'a'='b
====================================================================
echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
183\r\n\r\nkoha_login_context=intranet&Limit=&Criteria=branchcode&output=file&basename=Export&MIME=CSV&sep=;&report_name=&do_it=1&userid=<userid>&password=<password>&branch=&Filter=P_COM'+AND+'a'='a"
| nc testbox 9002
echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
183\r\n\r\nkoha_login_context=intranet&Limit=&Criteria=branchcode&output=file&basename=Export&MIME=CSV&sep=;&report_name=&do_it=1&userid=<userid>&password=<password>&branch=&Filter=P_COM'+AND+'a'='b"
| nc testbox 9002
====================================================================
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
reports/borrowers_out.pl | 41 ++++++++++++++++++++++++++---------------
1 file changed, 26 insertions(+), 15 deletions(-)
diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl
index 7ca848a..55f29ef 100755
--- a/reports/borrowers_out.pl
+++ b/reports/borrowers_out.pl
@@ -174,17 +174,19 @@ sub calculate {
$colorder .= $column;
my $strsth2;
- $strsth2 .= "select distinct $colfield FROM borrowers WHERE 1";
- if ($colfilter[0]) {
+ $strsth2 .= "select distinct " . $dbh->quote($colfield) . " FROM borrowers WHERE 1";
+ my @query_args;
+ if ( $colfilter[0] ) {
$colfilter[0] =~ s/\*/%/g;
- $strsth2 .= " and $column LIKE '$colfilter[0]' " ;
+ $strsth2 .= " and " . $dbh->quote($column) . "LIKE ?" ;
+ push @query_args, $colfilter[0];
}
- $strsth2 .=" group by $colfield";
- $strsth2 .=" order by $colorder";
+ $strsth2 .=" group by " . $dbh->quote($colfield);
+ $strsth2 .=" order by " . $dbh->quote($colorder);
# warn "". $strsth2;
my $sth2 = $dbh->prepare( $strsth2 );
- $sth2->execute;
+ $sth2->execute( @query_args );
while (my ($celvalue) = $sth2->fetchrow) {
my %cell;
# my %ft;
@@ -217,21 +219,30 @@ sub calculate {
# Processing calculation
$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
- $strcalc .= " , $colfield " if ($colfield);
+ $strcalc .= " , " . $dbh->quote($colfield) if ($colfield);
$strcalc .= " FROM borrowers ";
$strcalc .= "WHERE 1 ";
- @$filters[0]=~ s/\*/%/g if (@$filters[0]);
- $strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
-
+ my @query_args;
+ if ( @$filters[0] ) {
+ @$filters[0]=~ s/\*/%/g;
+ $strcalc .= " AND borrowers.categorycode like ?";
+ push @query_args, @$filters[0];
+ }
$strcalc .= " AND NOT EXISTS (SELECT * FROM issues WHERE issues.borrowernumber=borrowers.borrowernumber ";
- $strcalc .= " AND issues.timestamp> '" . @$filters[1] . "'" if (@$filters[1]);
+ if ( @$filters[1] ) {
+ $strcalc .= " AND issues.timestamap > ?";
+ push @query_args, @$filters[1];
+ }
$strcalc .= ") ";
$strcalc .= " AND NOT EXISTS (SELECT * FROM old_issues WHERE old_issues.borrowernumber=borrowers.borrowernumber ";
- $strcalc .= " AND old_issues.timestamp> '" . @$filters[1] . "'" if (@$filters[1]);
+ if ( @$filters[1] ) {
+ $strcalc .= " AND old_issues.timestamp > ?";
+ push @query_args, @$filters[1];
+ }
$strcalc .= ") ";
$strcalc .= " group by borrowers.borrowernumber";
- $strcalc .= ", $colfield" if ($column);
- $strcalc .= " order by $colfield " if ($colfield);
+ $strcalc .= ", " . $dbh->quote($colfield) if ($column);
+ $strcalc .= " order by " . $dbh->quote($colfield) if ($colfield);
my $max;
if ($line) {
if (@loopcol) {
@@ -241,7 +252,7 @@ sub calculate {
}
my $dbcalc = $dbh->prepare($strcalc);
- $dbcalc->execute;
+ $dbcalc->execute( @query_args );
# warn "filling table";
my $previous_col;
$i=1;
--
1.9.1