X-Git-Url: https://git.exim.org/buildfarm-server.git/blobdiff_plain/951769e19786631c2773665ac3db90cadd1b453c..ee5bc1519ff7fc99022fa43408384da96daf98ed:/cgi-bin/register.pl diff --git a/cgi-bin/register.pl b/cgi-bin/register.pl index 7f8d6fc..1e3aba4 100755 --- a/cgi-bin/register.pl +++ b/cgi-bin/register.pl @@ -1,5 +1,13 @@ #!/usr/bin/perl +=comment + +Copyright (c) 2003-2010, Andrew Dunstan + +See accompanying License file for license details + +=cut + use strict; use DBI; use Template; @@ -7,67 +15,25 @@ use CGI; use Template; use Captcha::reCAPTCHA; -use vars qw($dbhost $dbname $dbuser $dbpass $dbport $notifyapp $captcha_pubkey $captcha_privkey); +use vars qw($dbhost $dbname $dbuser $dbpass $dbport $notifyapp + $captcha_pubkey $captcha_privkey $template_dir $default_host); require "$ENV{BFConfDir}/BuildFarmWeb.pl"; -#require "BuildFarmWeb.pl"; my $dsn="dbi:Pg:dbname=$dbname"; $dsn .= ";host=$dbhost" if $dbhost; $dsn .= ";port=$dbport" if $dbport; -my $header = < - - - - PostgreSQL BuildFarm Application - - - - - -

- -

-EOS - -my $footer = < -

-Hosting for the PostgreSQL Buildfarm is generously -provided by: -CommandPrompt, -The PostgreSQL Company -

- - -EOS - +my $template_opts = { INCLUDE_PATH => $template_dir}; +my $template = new Template($template_opts); my $query = new CGI; my $params = $query->Vars; -my ($os, $osv, $comp, $compv, $arch, $email, $owner, $challenge, $response ) = @{$params}{ - qw(os osv comp compv arch email owner recaptcha_challenge_field recaptcha_response_field)}; +my ($os, $osv, $comp, $compv, $arch, $email, $owner, $challenge, $response ) = + @{$params}{ + qw(os osv comp compv arch email owner recaptcha_challenge_field + recaptcha_response_field)}; my $captcha = Captcha::reCAPTCHA->new; my $captcha_ok = $captcha->check_answer @@ -78,19 +44,20 @@ my $captcha_ok = $captcha->check_answer ); -unless ($os && $osv && $comp && $compv && $arch && $email && $owner && $captcha_ok->{is_valid}) +unless ($os && $osv && $comp && $compv && $arch && $email && $owner && + $captcha_ok->{is_valid}) { - print "Content-Type: text/html\n\n", - $header, - "

You need to complete all the form items. Please try again.

\n", - $footer; - exit; + print "Content-Type: text/html\n\n"; + $template->process('register-incomplete.tt'); + exit; } -# some idiot has a script that tries to talk to me -# this should catch and dispose of him -if ((grep {/rgergerger|\@pgbuildfarm\.org|Content-Type:|http:|mailto:|href=|None|Unknown/} $os,$osv,$comp,$compv,$arch,$email,$owner) - || ($email =~ /john.*\@aol.com/) ) +# these filters should catch and dispose of idiots, +# although I hope they are redundant now we're using captchas. + +if ((grep + {/\@pgbuildfarm\.org|Content-Type:|http:|mailto:|href=|None|Unknown/} + $os,$osv,$comp,$compv,$arch,$email,$owner)) { print "Status: 403 Forbidden - go away idiot\n", @@ -118,6 +85,12 @@ foreach (split "" ,"$os$osv$comp$compv$arch$owner") } # reject junk with too many transitions into/outof upper case + +=comment + +# disable this check now, probably redundant with captchas +# and we just got a false positive + if ($counttrans > 20) { print @@ -126,6 +99,7 @@ if ($counttrans > 20) exit; } +=cut my $secret = ""; @@ -157,12 +131,10 @@ my $sth=$db->prepare($statement); my $rv=$sth->execute($dummyname,$secret,$os,$osv,$comp,$compv, $arch,$owner,$email); my $err=$db->errstr; -print "Content-type: text/html\n\n"; -print $header - , "

PostgreSQL BuildFarm Application received

\n" - , "

Thank you. You should hear from us shortly.

" - , $footer; +# everything looks OK, so tell them so +print "Content-type: text/html\n\n"; +$template->process('register-ok.tt'); $sth->finish; $db->disconnect; @@ -172,14 +144,17 @@ use Mail::Send; my $msg = new Mail::Send; -my $me = `id -un`; +my $me = `id -un`; chomp($me); +my $host = `hostname`; chomp ($host); +$host = $default_host unless ($host =~ m/[.]/ || !defined($default_host)); -my $host = `hostname`; +my $from_addr = "Exim Build Farm <$me\@$host>"; +$from_addr =~ tr /\r\n//d; -$msg->set('From',"PG Build Farm <$me\@$host>"); +$msg->set('From',$from_addr); $msg->to(@$notifyapp); -$msg->subject('New Buildfarm Application'); +$msg->subject('New BuildFarm Application'); my $fh = $msg->open; print $fh "\n\nName: $dummyname\n", "OS: $os: $osv\n",