New server, FileBin instead of $ENV{BFConfDir}, and custom Captcha

[buildfarm-server.git] / cgi-bin / register.pl

diff --git a/cgi-bin/register.pl b/cgi-bin/register.pl
index 5d83e7961f68391860c5c69b1a2fc71c56724381..80663b67aefb6ad09f9751bf7950ff38b2ce718a 100755 (executable)
--- a/cgi-bin/register.pl
+++ b/cgi-bin/register.pl
@@ -13,12 +13,12 @@ use DBI;
 use Template;
 use CGI;
 use Template;
-use Captcha::reCAPTCHA;
 
 use vars qw($dbhost $dbname $dbuser $dbpass $dbport $notifyapp 
-                       $captcha_pubkey $captcha_privkey $template_dir $default_host);
+                       $template_dir $default_host);
 
-require "$ENV{BFConfDir}/BuildFarmWeb.pl";
+use FindBin qw($RealBin);
+require "$RealBin/../BuildFarmWeb.pl";
 
 my $dsn="dbi:Pg:dbname=$dbname";
 $dsn .= ";host=$dbhost" if $dbhost;
@@ -30,22 +30,18 @@ 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 $captcha = Captcha::reCAPTCHA->new;
-my $captcha_ok = $captcha->check_answer
-    (
-     $captcha_privkey, 
-     $ENV{'REMOTE_ADDR'},
-     $challenge, $response
-     );
+my ($os, $osv, $comp, $compv, $arch, $email, $owner, $arg1, $arg2, $argop, $res ) = 
+  @{$params}{qw(os osv comp compv arch email owner arg1 arg2 op res)};
 
+$argop = '-' if !$argop or $argop ne '+';
+$arg1 = int($arg1 || 0);
+$arg2 = int($arg2 || 0);
+$res = int($res || 0);
+my $captcha_ok = ($arg1 and $argop and $arg2 and $res
+                  and int(eval "$arg1 $argop $arg2") == $res) ? 1 : 0;
 
 unless ($os && $osv && $comp && $compv && $arch && $email && $owner && 
-               $captcha_ok->{is_valid})
+               $captcha_ok)
 {
     print "Content-Type: text/html\n\n";
     $template->process('register-incomplete.tt');
@@ -85,6 +81,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 
@@ -93,6 +95,7 @@ if ($counttrans > 20)
     exit;   
 }
 
+=cut
 
 
 my $secret = "";
@@ -141,13 +144,13 @@ my $me = `id -un`; chomp($me);
 my $host = `hostname`; chomp ($host);
 $host = $default_host unless ($host =~ m/[.]/ || !defined($default_host));
 
-my $from_addr = "PG Build Farm <$me\@$host>";
+my $from_addr = "Exim Build Farm <$me\@$host>";
 $from_addr =~ tr /\r\n//d;
 
 $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",
@@ -155,9 +158,3 @@ print $fh "\n\nName: $dummyname\n",
     "Comp: $comp: $compv\n",
     "Owner: $owner <$email>\n";
 $fh->close;
-
-
-
-
-
-