}
# read file from spool, and try unlink it. if cannot unlink -- exit
-# sets $requester (email), $problems, @md5 (arrays of md5's)
+# sets $requester (email), $problems, @md5 (arrays of md5's)
# and @url (map from md5 to urls)
sub read_spool_file()
{
open(F, "< $file") || exit 0;
$requester = <F>;
chomp $requester;
- $requester =~ /^[a-zA-Z_\-0-9\@\.]+$/
+ $requester =~ /^[a-zA-Z_0-9@.-]+$/
or die "$file: evil requester: $requester";
$req_login = "";
$requester =~ /^([^@]+)\@/ and $req_login = $1;
- $req_login =~ /^[a-z0-9A-Z_\.]+$/ or die "$file: evil requester $requester";
+ $req_login =~ /^[a-z0-9A-Z_.]+$/ or die "$file: evil requester $requester";
my $flags = <F>;
$force_reply++ if ($flags =~ /force-reply/);
-
+
while (<F>) {
if (/^ERROR/) {
s/^ERROR: //;
my ($md5, $url, $local_copy) = @_;
my $bn = basename($url);
-
+
if ($local_copy ne "$tmp_dir/$md5/$bn") {
if (system("mv -f \"$local_copy\" \"$tmp_dir/$md5/$bn\"")) {
$problems .= "FATAL: cannot move $local_copy to $tmp_dir\n";
}
$local_copy = "$tmp_dir/$md5/$bn";
}
-
+
if (open(D, "> $tmp_dir/$md5/$bn.desc")) {
print D "URL: $url\n";
print D "Login: $req_login\n";
my $dir = by_md5($md5, $url);
$dir =~ s|/[^/]+/[^/]+$||;
if (copy_to_df("$tmp_dir/$md5/", $dir) == 0) {
- $normal_out .=
+ $normal_out .=
"STORED: $url\n" .
"\t$md5 " . basename($url) . "\n" .
"\tSize: " . (-s $local_copy) . " bytes\n";
sub make_src_symlink($$)
{
my ($md5, $url) = @_;
-
+
return unless ($url =~ /^no-url/);
-
+
my $b = basename($url);
if (open(S, "> $tmp_dir/$b.link")) {
if ($url =~ /^no-url-copy/) {
sub handle_no_url($$)
{
my ($md5, $url) = @_;
-
+
unless ($url =~ m#://([^/]+)#) {
$problems .= "$url: corrupted! (no-url)";
return;
push @files, $bn;
if (got_on_distfiles($md5, $url)) {
- $normal_out .=
+ $normal_out .=
"ALREADY GOT: $url\n" .
"\t$md5 " . basename($url) . "\n";
make_src_symlink($md5, $url);
}
mkdir("$tmp_dir/$md5");
-
+
if ($url =~ /^no-url/) {
handle_no_url($md5, $url);
return;
}
-
+
open(W, "$cmd 2>&1 |");
while (<W>) {
$all_out .= $_;
splice(@files, 10, @files - 10, "...")
if (@files > 10);
-
- print EMAIL
+
+ print EMAIL
"From: $req_login <$requester>
To: $commits_list
Cc: $requester
while (<STDIN>) {
chomp;
- /^X-Spec: ([\+a-zA-Z0-9_\-\.]+\.spec)/i and $spec = $1;
- /^X-Branch: ([a-zA-Z0-9_\-]+)/i and $branch = $1;
- /^X-Login: ([a-zA-Z0-9_\.]+)/i and $from = $1;
- /^X-Flags: ([a-zA-Z0-9\-_ ]+)/i and $flags = $1;
+ /^X-Spec: ([a-z0-9_.+-]+\.spec)/i and $spec = $1;
+ /^X-Branch: ([a-z0-9_-]+)/i and $branch = $1;
+ /^X-Login: ([a-z0-9_.]+)/i and $from = $1;
+ /^X-Flags: ([a-z0-9_ -]+)/i and $flags = $1;
}
die "ill-formed request" if (!defined $from);