updated the selenium test pages app to be deployable to heroku

fixed the find_by_playground and disabled the file upload and shutdown for server deplou

Author: eviltester

java/.gitignore

@@ -0,0 +1 @@
+/upload/

java/pom.xml

@@ -7,7 +7,7 @@
 <groupId>uk.co.compendiumdev.testing</groupId>
 <artifactId>testapp</artifactId>
 <packaging>pom</packaging>
-<version>1-3-5</version>
+<version>1-3-6</version>
 <!-- <version>1.3</version>-->
 
 <!--
@@ -42,8 +42,9 @@ v1.4 - split into multiple pom.xnl
 
         <!--
         1.3.1 has a fix for search engine page because the javascript for cookies was not loaded
+        1.3.2 fixed find_by_playground, and updated for heroku release
         -->
-        <seleniumtestpages.version>1-3-1</seleniumtestpages.version>
+        <seleniumtestpages.version>1-3-2</seleniumtestpages.version>
         <testingappsroot.version>1-1-0</testingappsroot.version>
 
         <!-- Last release was...
@@ -67,7 +68,8 @@ v1.4 - split into multiple pom.xnl
         <!-- 1.3.3 has compendiumdevapps 1.1.1 -->
         <!-- 1-3-4 has restlisticator 1-2-1 and thepulper 1-2-3 -->
         <!-- 1-3-5 has updated to thepulper 1-2-4 -->
-        <collectedapp.version>1-3-5</collectedapp.version>
+        <!-- 1-3-6 has updated the selenium test pages to work with heroku -->
+        <collectedapp.version>1-3-6</collectedapp.version>
 
 
         <herokumaven.version>1.2.0</herokumaven.version>

java/testingapps/pom.xml

@@ -5,7 +5,7 @@
    <parent>
         <groupId>uk.co.compendiumdev.testing</groupId>
         <artifactId>testapp</artifactId>
-        <version>1-3-5</version>
+        <version>1-3-6</version>
     </parent>
 
     <groupId>uk.co.compendiumdev.testing</groupId>

java/testingapps/seleniumtestpages/Procfile

@@ -0,0 +1 @@
+web: java $JAVA_OPTS -cp target/classes:target/dependency/*:target/* com.seleniumsimplified.MainTestPages

java/testingapps/seleniumtestpages/Procfile.mac.local

@@ -0,0 +1 @@
+web: java -cp ./target/seleniumtestpages-1-3-2-jar-with-dependencies.jar com.seleniumsimplified.MainTestPages

java/testingapps/seleniumtestpages/deploy-notes.md

@@ -0,0 +1,26 @@
+# deploy to heroku
+
+Development notes.
+
+First install heroku
+
+https://devcenter.heroku.com/articles/heroku-cli
+
+I'm on mac
+
+- `brew tap heroku/brew && brew install heroku`
+- `heroku plugins:install heroku-cli-deploy`
+- `heroku login`
+- `mvn package`
+- `heroku deploy:jar target/seleniumtestpages-1-3-2-jar-with-dependencies.jar --app testpages`
+
+had to add `:target/*` to the procfile when deploying fat app
+
+after deployment:
+
+https://testpages.herokuapp.com
+
+
+To run locally
+
+`heroku local -f Procfile.mac.local`

java/testingapps/seleniumtestpages/src/main/java/com/seleniumsimplified/MainTestPages.java

@@ -8,15 +8,29 @@
 
 import static spark.Spark.*;
 
-/**
- * Created by Alan on 15/06/2016.
- */
 public class MainTestPages {
 
+    static boolean hasHerokuAssignedPort(){
+        ProcessBuilder processBuilder = new ProcessBuilder();
+        return (processBuilder.environment().get("PORT") != null);
+    }
+
+    static int getHerokuAssignedPort() {
+        ProcessBuilder processBuilder = new ProcessBuilder();
+        if (hasHerokuAssignedPort()) {
+            return Integer.parseInt(processBuilder.environment().get("PORT"));
+        }
+        return -1; //return default port if heroku-port isn't set (i.e. on localhost)
+    }
+
     public static void main(String[] args) {
 
         Integer proxyport = 4567;    // default for spark
 
+        if(hasHerokuAssignedPort()) {
+            proxyport = getHerokuAssignedPort();
+        }
+
         for(String arg : args){
             if(arg.startsWith("-port")){
                 String[]details = arg.split("=");
@@ -35,7 +49,15 @@ public static void main(String[] args) {
 
 
         // add a shutdown url in case left running on port 4567
-        get("/shutdown", (req, res) -> {System.exit(0); return "";});
+        String envVar = System.getenv("SELENIUM_TEST_PAGES_DISALLOW_SHUTDOWN");
+        if(envVar != null && envVar.length()>0) {
+            // shutdown is not enabled
+        }else{
+            get("/shutdown", (req, res) -> {
+                System.exit(0);
+                return "";
+            });
+        }
 
 
         // because Spark is a singleton - these just have to register their routings, they don't need to do anything else

java/testingapps/seleniumtestpages/src/main/java/com/seleniumsimplified/seleniumtestpages/spark/app/FileUploadProcessor.java

@@ -1,7 +1,5 @@
 package com.seleniumsimplified.seleniumtestpages.spark.app;
 
-import org.eclipse.jetty.util.MultiMap;
-import org.eclipse.jetty.util.UrlEncoded;
 import spark.Request;
 import spark.Response;
 
@@ -18,27 +16,31 @@ public class FileUploadProcessor {
 
     private final Request req;
     private final Response res;
+    private final Boolean allowupload;
     private StringBuilder html;
 
-    public FileUploadProcessor(Request req, Response res) {
+    public FileUploadProcessor(Request req, Response res, Boolean allowupload) {
         this.req = req;
         this.res = res;
+        this.allowupload = allowupload; // need to configure not uploading when deployed to server
     }
 
     public String post() {
         html = new StringBuilder();
 
+        File uploadDir;
+        Path tempFile=null;
 
-        File uploadDir = new File("upload");
-        // create the upload directory if it does not exist
-        uploadDir.mkdir();
+        if(allowupload) {
+            uploadDir = new File("upload");
+            // create the upload directory if it does not exist
+            uploadDir.mkdir();
 
-
-        Path tempFile = null;
-        try {
-            tempFile = Files.createTempFile(uploadDir.toPath(), "", "");
-        } catch (IOException e) {
-            e.printStackTrace();
+            try {
+                tempFile = Files.createTempFile(uploadDir.toPath(), "", "");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
 
         req.attribute("org.eclipse.jetty.multipartConfig", new MultipartConfigElement("/temp"));
@@ -47,30 +49,35 @@ public String post() {
         File uploadedFile=null;
         boolean isImage = false;
 
-        try (InputStream input = req.raw().getPart("filename").getInputStream()) { // getPart needs to use same "name" as input field in form
+        String reportedName = "NoFileUploadsAllowed.txt";
 
-            Files.copy(input, tempFile, StandardCopyOption.REPLACE_EXISTING);
+        if(allowupload) {
+            try (InputStream input = req.raw().getPart("filename").getInputStream()) { // getPart needs to use same "name" as input field in form
 
-            uploadedFile = new File(tempFile.toFile().getPath() + "_" + req.raw().getPart("filename").getSubmittedFileName());
-            tempFile.toFile().renameTo(uploadedFile);
+                Files.copy(input, tempFile, StandardCopyOption.REPLACE_EXISTING);
 
-            if(req.raw().getPart("filename").getContentType().contains("image")){
-                isImage=true;
-            }
+                uploadedFile = new File(tempFile.toFile().getPath() + "_" + req.raw().getPart("filename").getSubmittedFileName());
+                tempFile.toFile().renameTo(uploadedFile);
 
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (ServletException e) {
-            e.printStackTrace();
-        }
+                if (req.raw().getPart("filename").getContentType().contains("image")) {
+                    isImage = true;
+                }
 
+                reportedName = uploadedFile.getName();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            } catch (ServletException e) {
+                e.printStackTrace();
+            }
+        }
 
 
 
         if(isImage) {
-            html.append("<h2>You uploaded this image:</h2><img src='/upload/" + uploadedFile.getName() + "'>\n");
+            html.append("<h2>You uploaded this image:</h2><img src='/upload/" + reportedName + "'>\n");
         }else{
-            html.append("<h2>You uploaded this file:</h2><a href='/upload/" + uploadedFile.getName() + "'/>" + uploadedFile.getName() + "</a>\n");
+            html.append("<h2>You uploaded this file:</h2><a href='/upload/" + reportedName + "'/>" + reportedName + "</a>\n");
         }
 
         return html.toString();

java/testingapps/seleniumtestpages/src/main/java/com/seleniumsimplified/seleniumtestpages/spark/app/SeleniumTestPagesForSpark.java

@@ -11,21 +11,20 @@ public class SeleniumTestPagesForSpark {
 
     public SeleniumTestPagesForSpark(){
 
-
-
         // create backwards compatibility with selenium page on compendiumdev.co.uk
         // avoid redirects
 
         get("/selenium", (req, res) -> {res.redirect("/selenium.html"); return "";});
         get("/selenium/", (req, res) -> {res.redirect("/selenium.html"); return "";});
+        get("/selenium/testpages/", (req, res) -> {res.redirect("/selenium.html"); return "";});
 
 
         get("/selenium/ajaxselect.php", (req, res) -> {return new PhpAjaxSelect(req,res).get();});
         get("/selenium/calculate.php", (req, res) -> {return new PhpCalculate(req,res).get();});
         post("/selenium/calculate.php", (req, res) -> {return new PhpCalculate(req,res).post();});
         get("/selenium/refresh.php", (req, res) -> {return new PhpRefresh(req,res).get();});
         post("/selenium/form_processor.php", (req, res) -> {return new PhpFormProcessor(req,res).post();});
-
+        get("/selenium/find_by_playground.php", (req, res) -> {return new ResourceReader().asString("/web/find_by_playground.html");});
 
         // some tests check the url of the asked for page so don't redirect this one
         get("/selenium/basic_web_page.html", (req, res) -> {return new ResourceReader().asString("/web/basic_web_page.html");});
@@ -37,6 +36,7 @@ public SeleniumTestPagesForSpark(){
         post("/calculate.php", (req, res) -> {return new PhpCalculate(req,res).post();});
         get("/refresh.php", (req, res) -> {return new PhpRefresh(req,res).get();});
         post("/form_processor.php", (req, res) -> {return new PhpFormProcessor(req,res).post();});
+        get("/find_by_playground.php", (req, res) -> {return new ResourceReader().asString("/web/find_by_playground.html");});
 
         //search.php  - do not use a search engine, just have a set of random urls that we put up so it looks like a search
         // testing, java, related
@@ -49,12 +49,21 @@ public SeleniumTestPagesForSpark(){
         //get("/find_by_playground.php", (req, res) -> {return new PhpFindByPlayground(req,res).get();});
 
         // the upload functionality makes this insecure for external sites - do not release with this active
-        post("/uploads/fileprocessor", (req, res) -> {return new FileUploadProcessor(req,res).post();});
+        post("/uploads/fileprocessor", (req, res) -> {
+            Boolean allowUploads = true; // assume working locally
+
+            String envVar = System.getenv("SELENIUM_TEST_PAGES_DISALLOW_UPLOAD");
+            if(envVar != null && envVar.length()>0){
+                allowUploads = false;
+            }
+            return new FileUploadProcessor(req,res, allowUploads).post();
+        });
+        get("/upload/NoFileUploadsAllowed.txt", (req, res) -> {return new ResourceReader().asString("/web/NoFileUploadsAllowed.txt");});
         get("/upload/*", (req, res) -> {return new UploadedFile(req,res).get("upload/"+req.splat()[0]);});
 
         // everything else just redirect
+        get("/selenium/testpages/*", (req, res) -> {res.redirect("/" + req.splat()[0]); return "";});
         get("/selenium/*", (req, res) -> {res.redirect("/" + req.splat()[0]); return "";});
 
-
     }
 }

java/testingapps/seleniumtestpages/src/main/resources/web/NoFileUploadsAllowed.txt

@@ -0,0 +1 @@
+File uploads are currently disabled.