Changeset 32361 for main/trunk

Timestamp:

2018-08-23T13:27:10+12:00 (6 years ago)

Author:

kjdon

Message:

added a new field to Param - sensitive. currently have default value, and save. if save is true, it will be saved into the tomcat session and passed through for each request. The request (with all its parameters) gets added into the page as pageRequest node. I have just noticed that password params etc are in here, so are in the page XML, and get into the javascript source - all params stored in gs.cgiParams. Don't want this so the new sensitive field is set to true for any params that we don't want to appear in the paramList in the response. sensitive is false by default.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSParams.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSParams.java

@@ -73 +73 @@
   public static final String EXPAND_CONTENTS = "ec";
   public static final String NO_TEXT = "noText";
+  
     //Administration
     public static final String PASSWORD = "password";
@@ -78 +79 @@
     public static final String S_NEW_PASSWORD = "s1.newPassword";
     public static final String S_OLD_PASSWORD = "s1.oldPassword";
-    
+  public static final String S_NEW_EMAIL="s1.newEmail";
+    public static final String S_NEW_USERNAME = "s1.newUsername";
+    public static final String S_PREV_USERNAME = "s1.prevUsername";
+
+  // Authentication
+  public static final String S_RECAPTCHA_RESPONSE = "s1.g-recaptcha-response";
+  public static final String S_USERNAME = "s1.username";
+  public static final String S_EMAIL = "s1.email";
     //Facets
     public static final String S_FACETS = "s1.facets";
@@ -129 +137 @@
         addParameter(NO_TEXT, false);
         addParameter(DOC_EDIT, false);
-        addParameter(PASSWORD, false);
-        addParameter(S_PASSWORD, false);
-        addParameter(S_NEW_PASSWORD, false);
-        addParameter(S_OLD_PASSWORD, false);
-        
+        addParameter(PASSWORD, false, true);
+        addParameter(S_PASSWORD, false, true);
+        addParameter(S_NEW_PASSWORD, false, true);
+        addParameter(S_OLD_PASSWORD, false, true);
+        addParameter(S_RECAPTCHA_RESPONSE, false, true);
+        addParameter(S_USERNAME, false);
+        addParameter(S_EMAIL, false);
+        addParameter(S_NEW_USERNAME, false);
+        addParameter(S_PREV_USERNAME, false);
+        addParameter(S_NEW_EMAIL, false);
         addParameter(S_FACETS, false);
         addParameter(S_FACETS_QUERIES, false);
@@ -148 +161 @@
     public boolean addParameter(String name, boolean save)
     {
-        return addParameter(name, "", save);
-    }
-
+      return addParameter(name, "", save);
+    }
+
+  public boolean addParameter(String name, boolean save, boolean sensitive) {
+        if (this.param_map.containsKey(name))
+        {
+            // already there so could not add
+            return false;
+        }
+        this.param_map.put(name, new Param("", save, sensitive));
+        return true;
+  }
     public boolean addParameter(String name, String default_value, boolean save)
     {
@@ -183 +205 @@
     }
 
-    private class Param
+  public boolean isSensitive(String name) {
+    Param p = this.param_map.get(name);
+    if (p==null) {
+      return false;
+    }
+    return p.sensitive;
+  }
+
+  private class Param
     {
 
         public String default_value = null;
         public boolean save = true;
-
-        public Param(String default_value, boolean save)
+      public boolean sensitive = false;
+
+      public Param(String default_value, boolean save)
         {
             this.default_value = default_value;
             this.save = save;
         }
+
+      public Param(String default_value, boolean save, boolean sensitive) {
+            this.default_value = default_value;
+            this.save = save;
+            this.sensitive = sensitive;
+      }
+      
     }
 }