Changeset 14331

Timestamp:

2007-08-07T14:51:40+12:00 (17 years ago)

Author:

qq6

Message:

create an etc dir under the site if the etc is not exiting

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/service/Authentication.java (modified) (6 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/Authentication.java

@@ -6 +6 @@
 import org.greenstone.gsdl3.util.UserQueryResult;
 import org.greenstone.gsdl3.util.UserTermInfo;
+import org.greenstone.gsdl3.util.GlobalProperties;
 
 import org.w3c.dom.Element;
@@ -19 +20 @@
 import org.apache.log4j.*;
 
-import org.greenstone.gsdl3.util.GSXML;
-import org.greenstone.gsdl3.util.GSPath;
-import org.greenstone.gsdl3.util.GlobalProperties;
-import org.greenstone.gsdl3.util.UserQueryResult;
-
 import java.net.InetAddress;
+import java.net.URLEncoder;
 import java.util.Properties;
 import java.util.Date;
 import java.util.regex.Pattern;
 import java.io.File;
-
+import java.io.UnsupportedEncodingException;
 //import javax.mail.*;
 //import javax.mail.internet.*;
@@ -38 +35 @@
 
 import org.apache.log4j.*;
-
-import org.greenstone.gsdl3.util.DerbyWrapper;
-
 
 public class Authentication
@@ -102 +96 @@
     }
   
-    protected Element processAuthentication(Element request) throws SQLException{
+    protected Element processAuthentication(Element request) throws SQLException, UnsupportedEncodingException{
 
     // Create a new (empty) result message
@@ -144 +138 @@
 
         if (p_name.equals("aup")){
-        aup = p_value;
+        aup = URLEncoder.encode(p_value,"UTF-8");
         }else if (p_name.equals("un")) {
-        un = p_value;
+        un = URLEncoder.encode(p_value,"UTF-8");
         }else if(p_name.equals("pw")) {
-        pw = p_value;
+        pw = URLEncoder.encode(p_value,"UTF-8");
         }else if(p_name.equals("umun")) {
-        umun = p_value;
+        umun = URLEncoder.encode(p_value,"UTF-8");
         }else if(p_name.equals("umpw")) {
-        umpw = p_value;
+        umpw = URLEncoder.encode(p_value,"UTF-8");
         }else if (p_name.equals("umas")){
-        umas=p_value;
+        umas = URLEncoder.encode(p_value,"UTF-8");
         }else if (p_name.equals("umgp")){
-        umgp=p_value;
+        umgp = URLEncoder.encode(p_value,"UTF-8");
         }else if (p_name.equals("umc")){
-        umc=p_value;
+        umc = URLEncoder.encode(p_value,"UTF-8");
         }else if (p_name.equals("asn")){
-        asn=p_value;
+        asn = URLEncoder.encode(p_value,"UTF-8");
         }else if (p_name.equals("uan")){
-        uan=p_value;
+        uan = URLEncoder.encode(p_value,"UTF-8");
         }else if (p_name.equals("cm")){
-        cm=p_value;
+        cm = URLEncoder.encode(p_value,"UTF-8");
         }else if(p_name.equals("umpw1")) {
-        umpw1 = p_value;
+        umpw1 = URLEncoder.encode(p_value,"UTF-8");
         }else if(p_name.equals("umpw2")) {
-        umpw2 = p_value;
+        umpw2 = URLEncoder.encode(p_value,"UTF-8");
         }else if(p_name.equals("oumun")) {
-        oumun = p_value;
+        oumun = URLEncoder.encode(p_value,"UTF-8");
         }
         
@@ -191 +185 @@
     File usersDB_file =new File(usersDB_dir);
     if (!usersDB_file.exists()){
+        String etc_dir = this.site_home + File.separatorChar + "etc";
+        File etc_file =new File(etc_dir);
+        if (!etc_file.exists()){
+        boolean success = etc_file.mkdir();
+        if (!success){
+            logger.error("Couldn't create the etc dir under "+this.site_home + ".");
+            return result;
+        }
+        }
         derbyWrapper.connectDatabase(usersDB_dir,true);
         derbyWrapper.createDatabase();