From 2682dc1a8d0e3b0e5abfcbeabbf13804a8285d8d Mon Sep 17 00:00:00 2001
From: Timothy Prepscius <tprepscius>
Date: Sun, 29 Sep 2013 19:22:24 -0400
Subject: [PATCH] makes captcha not activate if no private key

---
 .../core/src/core/server/captcha/Captcha.java | 19 +++++++++++++++++++
 .../streamserver/MailServerSessionDb.java     | 14 ++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/java/core/src/core/server/captcha/Captcha.java b/java/core/src/core/server/captcha/Captcha.java
index 839952a..25eae00 100644
--- a/java/core/src/core/server/captcha/Captcha.java
+++ b/java/core/src/core/server/captcha/Captcha.java
@@ -16,12 +16,20 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Random;
 
+import core.constants.ConstantsServer;
 import core.server.captcha.sql.Catalog;
+import core.util.ExternalResource;
+import core.util.LogOut;
 import core.util.Passwords;
 
 
 public class Captcha 
 {
+	boolean USE_CAPTCHA = 
+		!ExternalResource.
+			getTrimmedString(ConstantsServer.RECAPTCHA_PRIVATE_KEY).equals("NONE");
+		
+	static LogOut log = new LogOut(Captcha.class);
 	Random random = new SecureRandom();
 	Catalog catalog = new Catalog();
 	
@@ -29,6 +37,11 @@ public class Captcha
 		SignUp = "SignUp", 
 		CreateBucket = "CreateBucket";
 	
+	public Captcha () throws Exception
+	{
+		
+	}
+	
 	public void prune () throws SQLException, IOException
 	{
 		Connection connection = openConnection();
@@ -76,6 +89,12 @@ public class Captcha
 	{
 		prune();
 		
+		if (!USE_CAPTCHA)
+		{
+			log.debug("Not using captcha, because no private key present.");
+			return;
+		}
+
 		Connection connection = openConnection();
 
 		try
diff --git a/java/core/src/mail/streamserver/MailServerSessionDb.java b/java/core/src/mail/streamserver/MailServerSessionDb.java
index dd240fc..1dc5145 100644
--- a/java/core/src/mail/streamserver/MailServerSessionDb.java
+++ b/java/core/src/mail/streamserver/MailServerSessionDb.java
@@ -28,11 +28,6 @@ import core.util.Triple;
 
 public class MailServerSessionDb implements SRPServerUserSessionDb
 {
-	boolean USE_CAPTCHA = 
-		!ExternalResource.
-			getTrimmedString(ConstantsServer.RECAPTCHA_PRIVATE_KEY).equals("NONE");
-	
-	
 	static LogOut log = new LogOut(MailServerSessionDb.class);
 	MailUserDb db;
 	MailExtraDb payment;
@@ -79,13 +74,8 @@ public class MailServerSessionDb implements SRPServerUserSessionDb
 		{
 			ExternalData externalData = ExternalDataFactory.createInstance();
 
-			if (USE_CAPTCHA)
-			{
-				String token = SimpleSerializer.deserialize(extra);
-				captcha.useToken(token, Captcha.SignUp);
-			}
-			else
-				System.out.println("Not checking captcha!");
+			String token = SimpleSerializer.deserialize(extra);
+			captcha.useToken(token, Captcha.SignUp);
 			
 			db.createUser(version, userName, v.toByteArray(), s.toByteArray());
 			payment.addDaysTo(userName,0);