Skip to content

bugzilla
bugzilla
Commit 7827fe4d authored by justdave%syndicomm.com's avatar justdave%syndicomm.com
Browse files
Options

Fix for bug 154008: some basic (but incomplete) maintenance on bug_email.pl,…

Fix for bug 154008: some basic (but incomplete) maintenance on bug_email.pl, also fixes a possible security hole with a misuse of a system() call. Patches by Erik Anderson <erikba@teamworkgroup.com> and Brad Baetz <bbaetz@student.usyd.edu.au> r= myk, justdave
parent 689a307b
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 11 deletions
contrib/bug_email.pl
View file @ 7827fe4d
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
# #
# You need to work with bug_email.pl the MIME::Parser installed. # You need to work with bug_email.pl the MIME::Parser installed.
# #
# $Id: bug_email.pl,v 1.9 2001/05/25 12:48:47 jake%acutex.net Exp $ # $Id: bug_email.pl,v 1.10 2002/07/25 01:47:19 justdave%syndicomm.com Exp $
############################################################### ###############################################################
# 02/12/2000 (SML) # 02/12/2000 (SML)
...@@ -70,7 +70,9 @@ use diagnostics; ...@@ -70,7 +70,9 @@ use diagnostics;
use strict; use strict;
use MIME::Parser; use MIME::Parser;
push @INC, "../."; # this script now lives in contrib chdir '..'; # this script lives in contrib
push @INC, "contrib/.";
push @INC, ".";
require "globals.pl"; require "globals.pl";
require "BugzillaEmail.pm"; require "BugzillaEmail.pm";
...@@ -736,10 +738,10 @@ my $parser = new MIME::Parser; ...@@ -736,10 +738,10 @@ my $parser = new MIME::Parser;
# Create and set the output directory: # Create and set the output directory:
# FIXME: There should be a $BUGZILLA_HOME variable (SML) # FIXME: There should be a $BUGZILLA_HOME variable (SML)
(-d "../data/mimedump-tmp") or mkdir "../data/mimedump-tmp",0755 or die "mkdir: $!"; (-d "data/mimedump-tmp") or mkdir "data/mimedump-tmp",0755 or die "mkdir: $!";
(-w "../data/mimedump-tmp") or die "can't write to directory"; (-w "data/mimedump-tmp") or die "can't write to directory";
$parser->output_dir("../data/mimedump-tmp"); $parser->output_dir("data/mimedump-tmp");
# Read the MIME message: # Read the MIME message:
my $entity = $parser->read(\*STDIN) or die "couldn't parse MIME stream"; my $entity = $parser->read(\*STDIN) or die "couldn't parse MIME stream";
...@@ -1233,8 +1235,14 @@ END ...@@ -1233,8 +1235,14 @@ END
my $long_desc_query = "INSERT INTO longdescs SET bug_id=$id, who=$userid, bug_when=\'$bug_when\', thetext=" . SqlQuote($comment); my $long_desc_query = "INSERT INTO longdescs SET bug_id=$id, who=$userid, bug_when=\'$bug_when\', thetext=" . SqlQuote($comment);
SendSQL($long_desc_query); SendSQL($long_desc_query);
# Cool, the mail was successfull # Cool, the mail was successful
system("cd .. ; ./processmail $id '$Sender'"); # chdir back to the main directory which has the processmail script
# Oh, for a processmail module....
use Cwd;
my $old_cwd = getcwd();
chdir("..");
system("./processmail", $id, $SenderShort);
chdir($old_cwd);
} else { } else {
$id = 0xFFFF; # TEST ! $id = 0xFFFF; # TEST !
print "\n-------------------------------------------------------------------------\n"; print "\n-------------------------------------------------------------------------\n";
......
contrib/bugzilla_email_append.pl
View file @ 7827fe4d
...@@ -32,7 +32,9 @@ use diagnostics; ...@@ -32,7 +32,9 @@ use diagnostics;
use strict; use strict;
use MIME::Parser; use MIME::Parser;
push @INC, "../."; # this script lives in contrib chdir ".."; # this script lives in contrib, change to main
push @INC, "contrib";
push @INC, "."; # this script lives in contrib
require "globals.pl"; require "globals.pl";
require "BugzillaEmail.pm"; require "BugzillaEmail.pm";
...@@ -43,10 +45,10 @@ my $Comment = ""; ...@@ -43,10 +45,10 @@ my $Comment = "";
# Create and set the output directory: # Create and set the output directory:
# FIXME: There should be a $BUGZILLA_HOME variable (SML) # FIXME: There should be a $BUGZILLA_HOME variable (SML)
(-d "../data/mimedump-tmp") or mkdir "../data/mimedump-tmp",0755 or die "mkdir: $!"; (-d "data/mimedump-tmp") or mkdir "data/mimedump-tmp",0755 or die "mkdir: $!";
(-w "../data/mimedump-tmp") or die "can't write to directory"; (-w "data/mimedump-tmp") or die "can't write to directory";
$parser->output_dir("../data/mimedump-tmp"); $parser->output_dir("data/mimedump-tmp");
# Read the MIME message: # Read the MIME message:
my $entity = $parser->read(\*STDIN) or die "couldn't parse MIME stream"; my $entity = $parser->read(\*STDIN) or die "couldn't parse MIME stream";
...@@ -120,6 +122,7 @@ system("cd .. ; ./processmail $found_id '$SenderShort'"); ...@@ -120,6 +122,7 @@ system("cd .. ; ./processmail $found_id '$SenderShort'");
sub DealWithError { sub DealWithError {
my ($reason) = @_; my ($reason) = @_;
print $reason . "\n"; print $reason . "\n";
exit 100;
} }
# Yanking this wholesale from bug_email, 'cause I know this works. I'll # Yanking this wholesale from bug_email, 'cause I know this works. I'll
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment