Improve error handling

Author: stain

src/main/java/org/commonwl/view/workflow/WorkflowController.java

@@ -127,22 +127,24 @@ public ModelAndView createWorkflow(@Valid WorkflowForm workflowForm, BindingResu
                         return new ModelAndView("redirect:" + gitInfo.getInternalUrl());
                     }
                 } catch (TransportException ex) {
+                    logger.warn("git.sshError " + workflowForm , ex);
                     bindingResult.rejectValue("url", "git.sshError");
                     return new ModelAndView("index");
                 } catch (GitAPIException ex) {
+                    logger.error("git.retrievalError " + workflowForm , ex);
                     bindingResult.rejectValue("url", "git.retrievalError");
-                    logger.error("Git API Error", ex);
                     return new ModelAndView("index");
                 } catch (WorkflowNotFoundException ex) {
+                    logger.warn("git.pathTraversal " + workflowForm , ex);
                     bindingResult.rejectValue("url", "git.pathTraversal");
                     return new ModelAndView("index");
                 } catch (Exception ex) {
+                    logger.warn("url.parsingError " + workflowForm , ex);
                     bindingResult.rejectValue("url", "url.parsingError");
                     return new ModelAndView("index");
                 }
             }
             gitInfo = workflow.getRetrievedFrom();
-
             // Redirect to the workflow
             return new ModelAndView("redirect:" + gitInfo.getInternalUrl());
         }
@@ -473,12 +475,16 @@ private ModelAndView getWorkflow(GitDetails gitDetails, RedirectAttributes redir
                             }
                         }
                     } catch (TransportException ex) {
+                        logger.warn("git.sshError " + workflowForm , ex);
                         errors.rejectValue("url", "git.sshError", "SSH URLs are not supported, please provide a HTTPS URL for the repository or submodules");
                     } catch (GitAPIException ex) {
+                        logger.error("git.retrievalError " + workflowForm, ex);
                         errors.rejectValue("url", "git.retrievalError", "The workflow could not be retrieved from the Git repository using the details given");
                     } catch (WorkflowNotFoundException ex) {
+                        logger.warn("git.pathTraversal " + workflowForm, ex);
                         errors.rejectValue("url", "git.pathTraversal", "The path given did not resolve to a location within the repository");
                     } catch (IOException ex) {
+                        logger.warn("git.parsingError " + workflowForm, ex);
                         errors.rejectValue("url", "url.parsingError", "The workflow could not be parsed from the given URL");
                     }
                 }

src/main/java/org/commonwl/view/workflow/WorkflowForm.java

@@ -75,4 +75,11 @@ public void setPath(String path) {
     private String trimTrailingSlashes(String url) {
         return url.replaceAll("\\/+$", "");
     }
+
+    @Override
+    public String toString() {
+        return "WorkflowForm [" + (url != null ? "url=" + url + ", " : "")
+                 + (branch != null ? "branch=" + branch + ", " : "") + (path != null ? "path=" + path : "") + "]";
+    }
+
 }

src/main/java/org/commonwl/view/workflow/WorkflowService.java

@@ -41,6 +41,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -307,6 +308,9 @@ public QueuedWorkflow createQueuedWorkflow(GitDetails gitInfo)
             }
 
             File workflowFile = new File(pathToWorkflowFile.toString());
+            if (! Files.isReadable(workflowFile.toPath())) {
+                throw new WorkflowNotFoundException();
+            }
             Workflow basicModel = cwlService.parseWorkflowNative(workflowFile);
 
             // Set origin details