Skip to content

Commit

Permalink
Bug 1079065: [SECURITY] Always use the 3 arguments form for open() to…
Browse files Browse the repository at this point in the history
… prevent shell code injection

r=dylan,a=simon
  • Loading branch information
gerv authored and dklawren committed Jan 21, 2015
1 parent 367d9c2 commit 4dabf1a
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Bugzilla/Attachment.pm
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ sub data {
# If there's no attachment data in the database, the attachment is stored
# in a local file, so retrieve it from there.
if (length($self->{data}) == 0) {
if (open(AH, $self->_get_local_filename())) {
if (open(AH, '<', $self->_get_local_filename())) {
# file is actually on disk.
$self->{is_on_filesystem} = 1;
local $/;
Expand Down Expand Up @@ -412,7 +412,7 @@ sub datasize {
# is stored in a local file, and so retrieve its size from the file,
# or the attachment has been deleted.
unless ($self->{datasize}) {
if (open(AH, $self->_get_local_filename())) {
if (open(AH, '<', $self->_get_local_filename())) {
# file is actually on disk.
$self->{is_on_filesystem} = 1;
binmode AH;
Expand Down
2 changes: 1 addition & 1 deletion Bugzilla/Error.pm
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ sub _throw_error {
$val = "*****" if $val =~ /password|http_pass/i;
$mesg .= "[$$] " . Data::Dumper->Dump([$val],["env($var)"]);
}
open(ERRORLOGFID, ">>$datadir/errorlog");
open(ERRORLOGFID, ">>", "$datadir/errorlog");
print ERRORLOGFID "$mesg\n";
close ERRORLOGFID;
}
Expand Down
4 changes: 2 additions & 2 deletions Bugzilla/Install/CPAN.pm
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ sub set_cpan_config {
# Calling a senseless autoload that does nothing makes us
# automatically load any existing configuration.
# We want to avoid the "invalid command" message.
open(my $saveout, ">&STDOUT");
open(STDOUT, '>/dev/null');
open(my $saveout, ">&", "STDOUT");
open(STDOUT, '>', '/dev/null');
eval { CPAN->ignore_this_error_message_from_bugzilla; };
undef $@;
close(STDOUT);
Expand Down
2 changes: 1 addition & 1 deletion Bugzilla/Install/Filesystem.pm
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ sub _update_old_charts {
($in_file =~ /\.orig$/i));

rename("$in_file", "$in_file.orig") or next;
open(IN, "$in_file.orig") or next;
open(IN, "<", "$in_file.orig") or next;
open(OUT, '>', $in_file) or next;

# Fields in the header
Expand Down
2 changes: 1 addition & 1 deletion collectstats.pl
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ sub regenerate_stats {
return;
}
if (open DATA, ">$file") {
if (open DATA, ">", $file) {
my $fields = join('|', ('DATE', @statuses, @resolutions));
my $product_name = $product->name;
print DATA <<FIN;
Expand Down
2 changes: 1 addition & 1 deletion reports.cgi
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ sub generate_chart {
my ($dir, $image_file, $product, $datasets) = @_;
my $data_file = $dir . '/' . $product->id;
if (! open FILE, $data_file) {
if (!open(FILE, '<', $data_file)) {
ThrowCodeError('chart_data_not_generated', {'product' => $product});
}
Expand Down
2 changes: 1 addition & 1 deletion search_plugin.cgi
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ print $cgi->header('application/xml');

# Get the contents of favicon.ico
my $filename = bz_locations()->{'libpath'} . "/images/favicon.ico";
if (open(IN, $filename)) {
if (open(IN, '<', $filename)) {
local $/;
binmode IN;
$vars->{'favicon'} = <IN>;
Expand Down
6 changes: 3 additions & 3 deletions showdependencygraph.cgi
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ sub CreateImagemap {
my $map = "<map name=\"imagemap\">\n";
my $default = "";

open MAP, "<$mapfilename";
open MAP, "<", $mapfilename;
while(my $line = <MAP>) {
if($line =~ /^default ([^ ]*)(.*)$/) {
$default = qq{<area alt="" shape="default" href="$1">\n};
Expand Down Expand Up @@ -258,7 +258,7 @@ if ($webdotbase =~ /^https?:/) {
error => $! });

binmode $pngfh;
open(DOT, "\"$webdotbase\" -Tpng $filename|");
open(DOT, '-|', "\"$webdotbase\" -Tpng $filename");
binmode DOT;
print $pngfh $_ while <DOT>;
close DOT;
Expand Down Expand Up @@ -287,7 +287,7 @@ if ($webdotbase =~ /^https?:/) {
error => $! });

binmode $mapfh;
open(DOT, "\"$webdotbase\" -Tismap $filename|");
open(DOT, '-|', "\"$webdotbase\" -Tismap $filename");
binmode DOT;
print $mapfh $_ while <DOT>;
close DOT;
Expand Down
6 changes: 3 additions & 3 deletions testserver.pl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
my $sgid = 0;
if (!ON_WINDOWS) {
foreach my $pscmd (@pscmds) {
open PH, "$pscmd 2>/dev/null |";
open PH, '-|', "$pscmd 2>/dev/null";
while (my $line = <PH>) {
if ($line =~ /^(?:\S*\/)?(?:httpd|apache?)2?\s+(\d+)$/) {
$sgid = $1 if $1 > $sgid;
Expand Down Expand Up @@ -267,7 +267,7 @@ sub check_image {

sub create_file {
my ($filename, $content) = @_;
open(FH, ">$filename")
open(FH, ">", $filename)
or die "Failed to create $filename: $!\n";
binmode FH;
print FH $content;
Expand All @@ -276,7 +276,7 @@ sub create_file {

sub read_file {
my ($filename) = @_;
open(FH, $filename)
open(FH, '<', $filename)
or die "Failed to open $filename: $!\n";
binmode FH;
my $content = <FH>;
Expand Down

0 comments on commit 4dabf1a

Please sign in to comment.