From 32398bff24f054f4e9b48b97ecb70ce72267296c Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Tue, 6 Oct 2020 06:50:37 +0200 Subject: [PATCH 1/3] DBD/File,DBI/DBD/SqlEngine: bump copyright year Bump copyright years for both since there has been done work in meantime ... including intended f_dir= fix for CVE-2014-10401 Signed-off-by: Jens Rehsack --- lib/DBD/File.pm | 4 ++-- lib/DBI/DBD/SqlEngine.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/DBD/File.pm b/lib/DBD/File.pm index dd4312b..fb14e9a 100644 --- a/lib/DBD/File.pm +++ b/lib/DBD/File.pm @@ -9,7 +9,7 @@ # # The original author is Jochen Wiedmann. # -# Copyright (C) 2009-2013 by H.Merijn Brand & Jens Rehsack +# Copyright (C) 2009-2020 by H.Merijn Brand & Jens Rehsack # Copyright (C) 2004 by Jeff Zucker # Copyright (C) 1998 by Jochen Wiedmann # @@ -1430,7 +1430,7 @@ The original author is Jochen Wiedmann. =head1 COPYRIGHT AND LICENSE - Copyright (C) 2009-2013 by H.Merijn Brand & Jens Rehsack + Copyright (C) 2009-2020 by H.Merijn Brand & Jens Rehsack Copyright (C) 2004-2009 by Jeff Zucker Copyright (C) 1998-2004 by Jochen Wiedmann diff --git a/lib/DBI/DBD/SqlEngine.pm b/lib/DBI/DBD/SqlEngine.pm index fb755ab..8e933f7 100644 --- a/lib/DBI/DBD/SqlEngine.pm +++ b/lib/DBI/DBD/SqlEngine.pm @@ -9,7 +9,7 @@ # # The original author is Jochen Wiedmann. # -# Copyright (C) 2009-2013 by H.Merijn Brand & Jens Rehsack +# Copyright (C) 2009-2020 by H.Merijn Brand & Jens Rehsack # Copyright (C) 2004 by Jeff Zucker # Copyright (C) 1998 by Jochen Wiedmann # @@ -2216,7 +2216,7 @@ The original authors are Jochen Wiedmann and Jeff Zucker. =head1 COPYRIGHT AND LICENSE - Copyright (C) 2009-2013 by H.Merijn Brand & Jens Rehsack + Copyright (C) 2009-2020 by H.Merijn Brand & Jens Rehsack Copyright (C) 2004-2009 by Jeff Zucker Copyright (C) 1998-2004 by Jochen Wiedmann -- 2.41.0 From 27b10b5c3aacabc091046beaba478e671bb6111c Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Tue, 6 Oct 2020 08:23:55 +0200 Subject: [PATCH 2/3] t/51dbm_file.t: add test from RT#99508 Add test with f_dir="something-not-existing" as reported in RT#99508 to verify when it's fixed for real. Signed-off-by: Jens Rehsack --- t/51dbm_file.t | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/t/51dbm_file.t b/t/51dbm_file.t index d9824cf..686a3d2 100644 --- a/t/51dbm_file.t +++ b/t/51dbm_file.t @@ -15,6 +15,27 @@ use DBI; do "./t/lib.pl"; +{ + # test issue reported in RT#99508 + my @msg; + eval { + local $SIG{__DIE__} = sub { push @msg, @_ }; + my $dbh = DBI->connect ("dbi:DBM:f_dir=./hopefully-doesnt-existst;sql_identifier_case=1;RaiseError=1"); + }; + like ("@msg", qr{.*hopefully-doesnt-existst.*}, "Cannot open from non-existing directory with attributes in DSN"); + + @msg = (); + eval { + local $SIG{__DIE__} = sub { push @msg, @_ }; + my $dbh = DBI->connect ("dbi:DBM:", , undef, undef, { + f_dir => "./hopefully-doesnt-existst", + sql_identifier_case => 1, + RaiseError => 1, + }); + }; + like ("@msg", qr{.*hopefully-doesnt-existst}, "Cannot open from non-existing directory with attributes in HASH"); +} + my $dir = test_dir(); my $dbh = DBI->connect( 'dbi:DBM:', undef, undef, { @@ -23,6 +44,8 @@ my $dbh = DBI->connect( 'dbi:DBM:', undef, undef, { } ); +ok( $dbh, "Connect with driver attributes in hash" ); + ok( $dbh->do(q/drop table if exists FRED/), 'drop table' ); my $dirfext = $^O eq 'VMS' ? '.sdbm_dir' : '.dir'; -- 2.41.0 From 19d0fb169eed475e1c053e99036b8668625cfa94 Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Tue, 6 Oct 2020 10:22:17 +0200 Subject: [PATCH 3/3] lib/DBD/File.pm: fix CVE-2014-10401 Dig into the root cause of RT#99508 - which resulted in CVE-2014-10401 - and figure out that DBI->parse_dsn is the wrong helper to parse our attributes in DSN, since in DBD::dr::connect only the "dbname" remains from DSN which causes parse_dsn to bailout. Parsing on our own similar to parse_dsn shows the way out. Signed-off-by: Jens Rehsack --- lib/DBD/File.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/DBD/File.pm b/lib/DBD/File.pm index fb14e9a..f55076f 100644 --- a/lib/DBD/File.pm +++ b/lib/DBD/File.pm @@ -109,7 +109,11 @@ sub connect # We do not (yet) care about conflicting attributes here # my $dbh = DBI->connect ("dbi:CSV:f_dir=test", undef, undef, { f_dir => "text" }); # will test here that both test and text should exist - if (my $attr_hash = (DBI->parse_dsn ($dbname))[3]) { + # + # Parsing on our own similar to parse_dsn to find attributes in 'dbname' parameter. + if ($dbname) { + my @attrs = split /;/ => $dbname; + my $attr_hash = { map { split /\s*=>?\s*|\s*,\s*/, $_} @attrs }; if (defined $attr_hash->{f_dir} && ! -d $attr_hash->{f_dir}) { my $msg = "No such directory '$attr_hash->{f_dir}"; $drh->set_err (2, $msg); @@ -120,7 +124,6 @@ sub connect if ($attr and defined $attr->{f_dir} && ! -d $attr->{f_dir}) { my $msg = "No such directory '$attr->{f_dir}"; $drh->set_err (2, $msg); - $attr->{RaiseError} and croak $msg; return; } -- 2.41.0