# This script is invoked when the yarrg client uploads to
# the chiark database.
-# This is part of ypp-sc-tools, a set of third-party tools for assisting
-# players of Yohoho Puzzle Pirates.
+# This is part of the YARRG website. YARRG is a tool and website
+# for assisting players of Yohoho Puzzle Pirates.
#
# Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
# are used without permission. This program is not endorsed or
# sponsored by Three Rings.
-# All calls contain:
-# clientname "ypp-sc-tools"
-# clientversion 2.1-g2e06a26 [from git-describe --tags HEAD]
-# clientfixes "lastpage" [space separated list]
-#
-# Timestamp requests contain:
-# requesttimestamp
-#
-# Uploads contain:
-# ocean canonical mixed case
-# island canonical mixed case
-# data filename=deduped.tsv.gz output of yarrg --tsv
-
-
use strict (qw(vars));
use POSIX;
use MIME::Entity;
use CGI qw/:standard -private_tempfiles/;
-setlocale(LC_CTYPE, "en_GB.UTF-8");
+set_ctype_utf8();
our $now= time; defined $now or die $!;
my $re_any= "^(.*)\$";
-parse_info_serverside();
-
sub fail ($) {
my ($msg) = @_;
addlog("failing $msg");
print header(-status=>'400 Bad commodity update',
-type=>'text/plain',
-charset=>'us-ascii');
- print "Error: $msg\n";
+ print "\nError: $msg\n";
exit 0;
}
my %o;
+if (param('get_source')) {
+ # There's another copy of this in dictionary-update-receiver. Sorry.
+ print header('application/octet-stream') or die $!;
+ source_tarball('..', sub { print $_[0] or die $!; });
+ exit 0;
+}
+
+parse_info_serverside();
+
my $midtmp= "_mid-pid$$.hold";
open MIDTMP, ">$midtmp" or die "$midtmp $!";
stat MIDTMP or die $!;
my $arches= $oceans{$o{'ocean'}};
fail("unknown ocean") unless $arches;
+parse_info_serverside_ocean($o{'ocean'});
+
my $island_found= 0;
foreach my $islands (values %$arches) {
my $sources= $islands->{$o{'island'}};
fail("unknown island") unless $island_found;
$o{'timestamp'}= must_param('timestamp', "^([1-9]\\d{1,20})\$");
-fail("clock skew") if $o{'timestamp'} >= $now;
+fail("clock skew") if $o{'timestamp'} > $now;
my $indatafh= upload('data');
defined $indatafh or fail("data is not a file");
unlink $mid or $!==&ENOENT or die "$mid $!";
}
+$o{'instance'}= $ENV{'YARRG_INSTANCE'};
my $mcontent= MIME::Entity->build(To => 'yarrg-commod-updates',
- Subject => $pwd,
+ Subject => $ENV{'YARRG_INSTANCE'},
Type => 'multipart/mixed',
Boundary => '=',
'Message-ID' => $mid,
$?=0; close M; $? and fail("sendmail failed code $?");
print header(-type=>'text/plain', -charset=>'us-ascii'),
- "OK\n"
+ "OK\nThank you for your submission to YARRG.\n"
or die $!;
addlog("accepted $o{'clientspec'}");