Changeset 29869 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

Timestamp:

2015-05-12T21:47:35+12:00 (9 years ago)

Author:

ak19

Message:

First part of commit for ensuring the user is authenticated when running the scripts used by the online metadata editor. Running metaserver, BuildAndActivate and other GS2Construct.java commands should not be possible from a web browser.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java (modified) (8 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -33 +33 @@
     public static final int BUILD = 2;
     public static final int ACTIVATE = 3;
+    public static final int SET_METADATA_SERVER = 4;
 
     /**
@@ -118 +119 @@
         case ACTIVATE:
             activateCollection();
+            break;
+        case SET_METADATA_SERVER:
+            setMetadataForCollection();
             break;
         default:
@@ -202 +206 @@
         command.add("-collectdir");
         command.add(GSFile.collectDir(this.site_home));
+        command.add("-removeold"); // saves some seconds processing time when this flag's added in explicitly
         command.addAll(extractParameters(this.process_params));
         command.add(this.collection_name);
@@ -272 +277 @@
         command.add("-collectdir");
         command.add(GSFile.collectDir(this.site_home));
+        command.add("-removeold"); // saves some seconds processing time when this flag's added in explicitly
         command.addAll(extractParameters(this.process_params));
         command.add(this.collection_name);
@@ -279 +285 @@
 
         if (runPerlCommand(command_str))
+        {
+            // success!! - need to send the final completed message
+            sendProcessComplete(new ConstructionEvent(this, GSStatus.COMPLETED, ""));
+        }// else an error message has already been sent, do nothing     
+
+    }
+
+
+    protected void setMetadataForCollection()
+    {
+        sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection metadata: setMetadata for collection."));
+
+        Vector<String> command = new Vector<String>();
+
+        String perlPath = GlobalProperties.getProperty("perl.path", "perl");
+        if (perlPath.charAt(perlPath.length() - 1) != File.separatorChar)
+        {
+            perlPath = perlPath + File.separator;
+        }
+
+        String cgi_directory = GlobalProperties.getGSDL3Home() + File.separator + "WEB-INF" + File.separator + "cgi";
+        command.add(perlPath + "perl");
+        command.add("-S");
+        //command.add(GlobalProperties.getGSDL3Home() + File.separator + "WEB-INF" + File.separator + "cgi" + File.separator + "metadata-server.pl");
+        command.add(cgi_directory + File.separator + "metadata-server.pl");
+        
+        // Need to set QUERY_STRING and REQUEST_METHOD=GET in environment
+        // http://www.cgi101.com/class/ch3/text.html
+        String[] envvars = {
+            "QUERY_STRING=" + this.query_string,
+            "REQUEST_METHOD=GET"
+        };
+
+        String[] command_str = {};
+        command_str = command.toArray(command_str);
+
+        // http://www.cgi101.com/class/ch3/text.html
+        // setenv QUERY_STRING and REQUEST_METHOD = GET.
+        if (runPerlCommand(command_str, envvars, new File(cgi_directory)))
+                   //new File(GlobalProperties.getGSDL3Home() + File.separator + "WEB-INF" + File.separator + "cgi")))
         {
             // success!! - need to send the final completed message
@@ -316 +362 @@
 
     /** returns true if completed correctly, false otherwise */
-    protected boolean runPerlCommand(String[] command)
+    protected boolean runPerlCommand(String[] command) {
+    return runPerlCommand(command, null, null);
+    }
+
+    protected boolean runPerlCommand(String[] command, String[] envvars, File dir)
     {
         int sepIndex = this.gsdl3home.lastIndexOf(File.separator);
@@ -329 +379 @@
         args.add("PERL_PERTURB_KEYS=0");
 
+        if(envvars != null) {
+            for(int i = 0; i < envvars.length; i++) {
+            args.add(envvars[i]);
+            }
+        }
+
         for (String a : System.getenv().keySet())
         {
@@ -345 +401 @@
             Runtime rt = Runtime.getRuntime();
             sendProcessBegun(new ConstructionEvent(this, GSStatus.ACCEPTED, "starting"));
-            Process prcs = rt.exec(command, args.toArray(new String[args.size()]));
+            Process prcs = (dir == null) 
+                ? rt.exec(command, args.toArray(new String[args.size()]))
+                : rt.exec(command, args.toArray(new String[args.size()]), dir);
 
             InputStreamReader eisr = new InputStreamReader(prcs.getErrorStream());