# clientfixes "lastpage" [space separated list]
# data filename=deduped.tsv.gz output of ypp-commodities --tsv
+
use strict (qw(vars));
use POSIX;
+use MIME::Entity;
use Commods;
$CGI::POST_MAX= 3*1024*1024;
-$CGI::DISABLE_UPLOADS= 1;
use CGI qw/:standard -private_tempfiles/;
return $1;
}
-my $clientname= must_param('clientname',$re_any);
-my $clientinfo= $clients{$clientname};
+my %o;
+
+$o{'clientname'}= must_param('clientname',$re_any);
+my $clientinfo= $clients{$o{'clientname'}};
fail('unknown client') unless defined $clientinfo;
my $clientfixes= must_param('clientfixes', "^([-0-9a-z ]*)\$");
my @clientfixes= sort grep { m/./ } split /\s+/, $clientfixes;
-$clientfixes= "@clientfixes";
+$o{'clientfixes'}= "@clientfixes";
foreach my $bug (@$clientinfo) {
fail("client out of date - missing bugfix \`$bug'")
unless grep { $_ eq $bug } @clientfixes;
}
-my $clientversion= must_param('clientversion', "^(\\d[-+._0-9a-zA-Z]+)\$");
+$o{'clientversion'}= must_param('clientversion', "^(\\d[-+._0-9a-zA-Z]+)\$");
-my $ocean= must_param('ocean', $re_any);
-my $island= must_param('island', $re_any);
+$o{'ocean'}= must_param('ocean', $re_any);
+$o{'island'}= must_param('island', $re_any);
-my $arches= $oceans{$ocean};
+my $arches= $oceans{$o{'ocean'}};
fail("unknown ocean") unless $arches;
my $island_found= 0;
foreach my $islands (values %$arches) {
- my $sources= $islands->{$island};
+ my $sources= $islands->{$o{'island'}};
next unless $sources;
die if $island_found;
$island_found= $sources;
}
fail("unknown island") unless $island_found;
-my $timestamp= must_param('timestamp', "^([1-9]\\d{1,20})\$");
+$o{'timestamp'}= must_param('timestamp', "^([1-9]\\d{1,20})\$");
my $now= time; defined $now or die $!;
-fail("clock skew") if $timestamp >= $now;
-
-die if $ocean =~ m/\=/;
-die if $island =~ m/\=/;
+fail("clock skew") if $o{'timestamp'} >= $now;
my $indatafh= upload('data');
defined $indatafh or fail("data is not a file");
my $datafile= must_param('data',"^(deduped\\.tsv\\.gz)\$");
-our %done;
-
my $mcontent= MIME::Entity->build(To => 'yarrg-commod-updates',
Type => 'multipart/mixed',
Boundary => '=',
Charset => 'utf-8');
-our ($servername,$serverversion,$serverfixes);
-get_our_version('::server');
+get_our_version(\%o, 'server');
+foreach my $cs (qw(client server)) {
+ $o{"${cs}spec"}= join "\t", map { $o{$cs.$_} } qw(name version fixes);
+}
+
+my $metadata= '';
-my $clientspec= "$clientname $clientversion $clientfixes";
-my $serverspec= "$servername $serverversion $serverfixes";
+sub ksmap ($) {
+ my ($v) = @_;
+ my $i=0; grep { return $i if $_ eq $v; $i++ } qw(ocean island timestamp);
+ sprintf "z %d %s", (length $v) / 8, $v;
+}
-foreach my $vn (qw(ocean island timestamp
- clientspec clientname clientversion clientfixes
- serverspec servername serverversion serverfixes)) {
- my $mpart= MIME::Entity->build(Type => 'text/plain',
- Charset => 'utf-8',
- Disposition => 'inline',
- Data => $$vn);
- $mcontent->add_part($mpart);
+foreach my $vn (sort { ksmap($a) cmp ksmap($b) } keys %o) {
+ my $val= $o{$vn};
+ die if $val =~ m/\n|\r/;
+ $metadata .= "$vn\t$o{$vn}\n";
}
-my $gunzchild= open(GZ, "-|") or die $!;
+my $mdpart= MIME::Entity->build(Top => 0,
+ Type => 'text/plain',
+ Charset => 'utf-8',
+ Disposition => 'inline',
+ Encoding => 'quoted-printable',
+ Filename => 'metadata',
+ Data => $metadata);
+$mcontent->add_part($mdpart);
+
+my $gunzchild= open(GZ, "-|"); defined $gunzchild or die $!;
if (!$gunzchild) {
open STDIN, "<&=", $indatafh or die $!;
- execlp 'gunzip'; die $!;
+ exec 'gunzip'; die $!;
}
+my $dedupedtsv= pipethrough_prep();
+
while (<GZ>) {
- !m/\P{IsPrint}/ or die bad_data('nonprinting char(s)');
- !m/\\/ or bad_data('data contains backslashes');
- my @v= split /\t/;
- @v==6 or bad_data('wrong number of fields');
- my ($commod,$stall) = @v;
- defined $commods{$commod} or bad_data("unknown commodity \`$commod'");
- $stall =~ m/^\p{IsUpper}/ or bad_data("stall not capitalised");
- !exists $done{$commod,$stall} or bad_data("repeated data");
- $done{$commod,$stall}= 1;
- foreach my $i (2..5) {
- my $f= $v[$i];
- $f =~ m/^(0|[1-9][0-9]{0,5}|\>1000)$/ or bad_data("bad field");
- ($i % 1) or ($f !~ m/\>/) or bad_data("> in price");
- }
+ my @v= check_tsv_line($_,\&fail);
+ print $dedupedtsv join('\t',@v),"\n" or die $!;
}
+
GZ->error and die $!;
$?=0; close GZ; $? and fail("gunzip for check failed code $?");
-my $mdatafile= MIME::Entity->build(Type => 'application/octet-streak',
+my $launderedgz= pipethrough_run($dedupedtsv,undef,'gzip','gzip');
+
+my $mdatafile= MIME::Entity->build(Top => 0,
+ Type => 'application/octet-stream',
Disposition => 'attachment',
Encoding => 'base64',
- File => $datafile);
+ Filename => 'deduped.tsv.gz',
+ Data => $launderedgz);
$mcontent->add_part($mdatafile);
-open M, "|/usr/sbin/sendmail -t -oi -oee -odq"
+open M, "|/usr/sbin/sendmail -t -oi -oee -odb"
or fail("fork sendmail failed! ($!)");
$mcontent->print(\*M);
M->error and fail("write sendmail failed! ($!)");
$?=0; close M; $? and fail("sendmail failed code $?");
+
+print header(-type=>'text/plain', -charset=>'us-ascii'),
+ "OK\n"
+ or die $!;
~yarrgweb / ypp-sc-tools.web-live.git / blobdiff