X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;ds=sidebyside;f=lib%2FGruntmaster%2FHandlers.pm;h=c9a6c70d99c534e1c38d621f693d5477a3bbb4f1;hb=b746d00261803eb0e9e000225ca89a41fa0a8079;hp=2ce155bc5566e0ff036dc26a7e55d6a6353bbaca;hpb=2a1215b3e1653723eb89ee83a1a0e7ff3b860040;p=gruntmaster-handlers.git

diff --git a/lib/Gruntmaster/Handlers.pm b/lib/Gruntmaster/Handlers.pm
index 2ce155b..c9a6c70 100644
--- a/lib/Gruntmaster/Handlers.pm
+++ b/lib/Gruntmaster/Handlers.pm
@@ -5,11 +5,8 @@ use strict;
 use warnings;
 our $VERSION = '0.001';
 
-use constant FORMAT_EXTENSION => {
-  CPP => 'cpp',
-};
-
 use Apache2::Access;
+use Apache2::Authen::Passphrase qw/pwcheck pwset USER_REGEX/;
 use Apache2::AuthzCaps qw/hascaps/;
 use Apache2::RequestRec;
 use Apache2::RequestIO;
@@ -22,45 +19,82 @@ use Cwd qw/cwd/;
 use File::Basename qw/fileparse/;
 use File::Temp qw/tempdir/;
 use File::Copy qw/move/;
-use YAML::Any qw/LoadFile DumpFile/;
+use Gruntmaster::Data qw/contest_start contest_end push_job set_job_inmeta insert_user PUBLISH/;
+use Gruntmaster::Page::Log;
+
+sub aputs{
+	my ($r, $str) = @_;
+	$r->set_content_length(length $str);
+	$r->puts($str);
+	$r->content_type('text/plain');
+	OK
+}
 
 sub submit{
   my $r = shift;
-  chdir $r->dir_config('root');
   my $req = Apache2::Request->new($r);
-  my ($problem, $format, $contest) = map {scalar $req->param($_)} 'problem', 'prog_format', 'contest';
-  my $ext = FORMAT_EXTENSION->{$format};
-  my $prog = $req->upload('prog');
-  die if defined $contest && $contest !~ /^\w+$/;
-
-  if (defined $contest) {
-	my $meta = LoadFile "ct/$contest/meta.yml";
-	die unless time >= $meta->{start} && time <= $meta->{end}
-  }
-
-  my $dir = tempdir;
-  $prog->link("$dir/prog.$ext");
-  DumpFile "$dir/meta.yml", {
-	files => {
-	  prog => {
-		format => $format,
-		name => 'prog.cpp',
+  my ($problem, $format, $contest, $private) = map {scalar $req->param($_)} 'problem', 'prog_format', 'contest', 'private';
+  my $prog;
+  $req->upload('prog')->slurp($prog);
+  die if defined $contest && $contest !~ /^\w+$/ ;
+  die if defined $contest && (time < contest_start $contest || time > contest_end $contest);
+
+  my $job = push_job (
+	  date => time,
+	  problem => $problem,
+	  user => $r->user,
+	  defined $private ? (private => $private) : (),
+	  defined $contest ? (contest => $contest, private => 1) : (),
+	  filesize => length $prog,
+	  extension => Gruntmaster::Page::Log::FORMAT_EXTENSION->{$format},
+  );
+
+  set_job_inmeta $job, {
+	  files => {
+		  prog => {
+			  format => $format,
+			  name => 'prog.' . Gruntmaster::Page::Log::FORMAT_EXTENSION->{$format},
+			  content => $prog,
+		  }
 	  }
-	},
-	problem => $problem,
-	user => $r->user,
-	date => time,
-	defined $contest ? (contest => $contest) : (),
   };
 
-  my $jobname = int rand 1_000_000_000;
-  $jobname = int rand 1_000_000_000 while -d "jobs/$jobname";
-  move $dir, "jobs/$jobname" or die $!;
-
+  PUBLISH 'jobs', $job;
   $r->print("Job submitted");
   OK
 }
 
+sub register{
+	my $r = shift;
+	my $req = Apache2::Request->new($r);
+	my ($username, $password, $confirm_password, $name, $email, $town, $university) = map {scalar $req->param($_)} 'username', 'password', 'confirm_password', 'name', 'email', 'town', 'university';
+
+	local $Apache2::Authen::Passphrase::rootdir = $r->dir_config('AuthenPassphraseRootdir');
+	return aputs $r, 'Bad username. Allowed characters are letters, digits and underscores, and the username must be between 2 and 20 characters long.' unless $username =~ USER_REGEX;
+	return aputs $r, 'Username already in use' if -e "$Apache2::Authen::Passphrase::rootdir/$username.yml";
+	return aputs $r, 'The two passwords do not match' unless $password eq $confirm_password;
+	pwset $username, $password;
+
+	insert_user $username, name => $name, email => $email, town => $town, university => $university;
+
+	aputs $r, 'Registered successfully';
+}
+
+sub passwd{
+	my $r = shift;
+	my $req = Apache2::Request->new($r);
+	my ($oldpass, $newpass, $confirm) = map {scalar $req->param($_)} 'password', 'new_password', 'confirm_new_password';
+
+	local $Apache2::Authen::Passphrase::rootdir = $r->dir_config('AuthenPassphraseRootdir');
+	return aputs $r, 'Incorrect password' unless eval { pwcheck $r->user, $oldpass; 1 };
+	return aputs $r, 'The two passwords do not match' unless $newpass eq $confirm;
+
+	pwset $r->user, $newpass;
+	aputs $r, 'Password changed successfully';
+}
+
+=begin comment
+
 sub private{
   my $r = shift;
   my $dir = (fileparse $r->uri)[1];
@@ -82,6 +116,10 @@ sub private{
   DECLINED
 }
 
+=end comment
+
+=cut
+
 1;
 __END__
 # Below is stub documentation for your module. You'd better edit it!