Changeset 32985

Timestamp:

2019-04-05T14:24:29+13:00 (5 years ago)

Author:

kjdon

Message:

mods to store new humanverify settings. in collectionConfig security element, set humanVerify=true to trigger the verify page. set useRecaptcha=true if you want a recaptcha on the verify page. The Authentication servicerack must be active in siteConfig, and recaptcha site and secret key elements must be present with valid keys.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -33 +33 @@
 import org.apache.log4j.Logger;
 import org.greenstone.gsdl3.core.ModuleInterface;
+import org.greenstone.gsdl3.service.Authentication;
 import org.greenstone.gsdl3.util.CustomClassLoader;
 import org.greenstone.gsdl3.util.Dictionary;
@@ -80 +81 @@
     /** Stores the scope of any security rules (either collection or document) */
     protected boolean _securityScopeCollection = true;
-
+        protected boolean _humanVerify = false;
+        protected boolean _useRecaptcha = false; // for human verify
+        protected String _siteKey = null; // for recaptcha
+        protected String _secretKey = null; // for recaptcha
+  
     protected HashMap<String, ArrayList<Element>> _documentSets = new HashMap<String, ArrayList<Element>>();
     protected ArrayList<HashMap<String, ArrayList<String>>> _securityExceptions = new ArrayList<HashMap<String, ArrayList<String>>>();
 
     protected XMLTransformer transformer = null;
-    /**
-     * A class loader that knows about the collection resources directory can
-     * put properties files, dtds etc in here
-     */
-    //CustomClassLoader class_loader = null;
 
     /** same as setClusterName */
@@ -339 +339 @@
         }
 
+        String humanVerify = securityBlock.getAttribute("humanVerify");
+        if (humanVerify.equals("true")) {
+          _humanVerify = true;
+        }
+
+        String useRecaptcha = securityBlock.getAttribute("useRecaptcha");
+        if (useRecaptcha.equals("true")) {
+
+          Authentication authen_services =(Authentication) this.router.getModuleMap().get(Authentication.AUTHENTICATION_SERVICE);
+          if (authen_services != null) {
+            String siteKey = authen_services.getRecaptchaSiteKey();
+            String secretKey = authen_services.getRecaptchaSecretKey();
+
+            if (siteKey != null && secretKey != null) {
+              _useRecaptcha = true;
+              _siteKey = siteKey;
+              _secretKey = secretKey;
+            }
+          }
+        }
         if (scope.toLowerCase().equals("collection"))
         {
@@ -497 +517 @@
         response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_SECURITY);
 
+        if (_humanVerify) {
+          response.setAttribute("humanVerify", "true");
+          if (_useRecaptcha) {
+            response.setAttribute("siteKey", _siteKey);
+            response.setAttribute("secretKey", _secretKey);
+          }
+        }
         String oid = request.getAttribute("oid");
         if (oid.contains("."))