Merge remote-tracking branch 'origin/master' into packed-workflows

MarkRobbo · MarkRobbo · commit 1cdc0770ad4b · 2017-08-17T15:14:09.000+01:00
# Conflicts:
#	src/main/java/org/commonwl/view/workflow/WorkflowFormValidator.java
#	src/main/java/org/commonwl/view/workflow/WorkflowService.java
diff --git a/src/main/java/org/commonwl/view/cwl/CWLService.java b/src/main/java/org/commonwl/view/cwl/CWLService.java
@@ -19,20 +19,27 @@
 
 package org.commonwl.view.cwl;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
+import static org.apache.commons.io.FileUtils.readFileToString;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.jena.iri.IRI;
+import org.apache.jena.iri.IRIFactory;
 import org.apache.jena.ontology.OntModelSpec;
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Statement;
-import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.riot.RiotException;
 import org.commonwl.view.docker.DockerService;
 import org.commonwl.view.git.GitDetails;
@@ -47,15 +54,11 @@
 import org.springframework.stereotype.Service;
 import org.yaml.snakeyaml.Yaml;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-
-import static org.apache.commons.io.FileUtils.readFileToString;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
 
 /**
  * Provides CWL parsing for workflows to gather an overview
@@ -65,6 +68,7 @@
 public class CWLService {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final IRIFactory iriFactory = IRIFactory.iriImplementation();
 
     // Autowired properties/services
     private final RDFService rdfService;
@@ -273,42 +277,18 @@ public Workflow parseWorkflowWithCwltool(Workflow basicModel,
             String inputName = rdfService.stepNameFromURI(gitPath, input.get("name").toString());
 
             CWLElement wfInput = new CWLElement();
-
-            // Array types
             if (input.contains("type")) {
-                StmtIterator itr = input.get("type").asResource().listProperties();
-                if (itr.hasNext()) {
-                    while (itr.hasNext()) {
-                        Statement complexType = itr.nextStatement();
-                        if (complexType.getPredicate().toString()
-                                .equals("https://w3id.org/cwl/salad#items")) {
-                            if (wfInputs.containsKey(inputName)
-                                    && wfInputs.get(inputName).getType().equals("?")) {
-                                wfInput.setType(typeURIToString(complexType.getObject().toString()) + "[]?");
-                            } else {
-                                wfInput.setType(typeURIToString(complexType.getObject().toString()) + "[]");
-                            }
-                        }
-                    }
+                String type;
+                if (input.get("type").toString().equals("https://w3id.org/cwl/salad#array")) {
+                    type = typeURIToString(input.get("items").toString()) + "[]";
                 } else {
-                    // Optional types
-                    if (input.get("type").toString().equals("https://w3id.org/cwl/salad#null")) {
-                        if (wfInputs.containsKey(inputName)) {
-                            CWLElement inputInMap = wfInputs.get(inputName);
-                            inputInMap.setType(inputInMap.getType() + "?");
-                        } else {
-                            wfInput.setType("?");
-                        }
-                    } else if (wfInput.getType() != null && wfInput.getType().equals("?")
-                            && !wfInput.getType().endsWith("[]")) {
-                        wfInput.setType(typeURIToString(input.get("type").toString()) + "?");
-                    } else {
-                        // Standard type
-                        wfInput.setType(typeURIToString(input.get("type").toString()));
-                    }
+                    type = typeURIToString(input.get("type").toString());
+                }
+                if (input.contains("null")) {
+                    type += " (Optional)";
                 }
+                wfInput.setType(type);
             }
-
             if (input.contains("format")) {
                 String format = input.get("format").toString();
                 setFormat(wfInput, format);
@@ -330,41 +310,17 @@ public Workflow parseWorkflowWithCwltool(Workflow basicModel,
             CWLElement wfOutput = new CWLElement();
 
             String outputName = rdfService.stepNameFromURI(gitPath, output.get("name").toString());
-
-            // Array types
             if (output.contains("type")) {
-                StmtIterator itr = output.get("type").asResource().listProperties();
-                if (itr.hasNext()) {
-                    while (itr.hasNext()) {
-                        Statement complexType = itr.nextStatement();
-                        if (complexType.getPredicate().toString()
-                                .equals("https://w3id.org/cwl/salad#items")) {
-                            if (wfOutputs.containsKey(outputName)
-                                    && wfOutputs.get(outputName).getType().equals("?")) {
-                                wfOutput.setType(typeURIToString(complexType.getObject().toString()) + "[]?");
-                            } else {
-                                wfOutput.setType(typeURIToString(complexType.getObject().toString()) + "[]");
-                            }
-                        }
-                    }
+                String type;
+                if (output.get("type").toString().equals("https://w3id.org/cwl/salad#array")) {
+                    type = typeURIToString(output.get("items").toString()) + "[]";
                 } else {
-                    // Standard types
-                    if (wfOutput.getType() != null && wfOutput.getType().equals("?")) {
-                        wfOutput.setType(typeURIToString(output.get("type").toString()) + "?");
-                    } else {
-                        wfOutput.setType(typeURIToString(output.get("type").toString()));
-                    }
-
-                    // Optional types
-                    if (output.get("type").toString().equals("https://w3id.org/cwl/salad#null")) {
-                        if (wfOutputs.containsKey(outputName)) {
-                            CWLElement outputInMap = wfOutputs.get(outputName);
-                            outputInMap.setType(outputInMap.getType() + "?");
-                        } else {
-                            wfOutput.setType("?");
-                        }
-                    }
+                    type = typeURIToString(output.get("type").toString());
                 }
+                if (output.contains("null")) {
+                    type += " (Optional)";
+                }
+                wfOutput.setType(type);
             }
 
             if (output.contains("src")) {
@@ -408,8 +364,10 @@ public Workflow parseWorkflowWithCwltool(Workflow basicModel,
                 // Add new step
                 CWLStep wfStep = new CWLStep();
 
-                Path workflowPath = Paths.get(step.get("wf").toString()).getParent();
-                Path runPath = Paths.get(step.get("run").toString());
+                IRI wfStepUri = iriFactory.construct(step.get("wf").asResource().getURI());
+                IRI workflowPath = wfStepUri.resolve("./");
+
+                IRI runPath = iriFactory.construct(step.get("run").asResource().getURI());
                 wfStep.setRun(workflowPath.relativize(runPath).toString());
                 wfStep.setRunType(rdfService.strToRuntype(step.get("runtype").toString()));
 
@@ -538,9 +496,9 @@ private void setFormat(CWLElement inputOutput, String format) {
                 rdfService.addToOntologies(ontModel);
             }
             String formatLabel = rdfService.getOntLabel(format);
-            inputOutput.setType(inputOutput.getType() + " (" + formatLabel + ")");
+            inputOutput.setType(inputOutput.getType() + " [" + formatLabel + "]");
         } catch (RiotException ex) {
-            inputOutput.setType(inputOutput.getType() + " (format)");
+            inputOutput.setType(inputOutput.getType() + " [format]");
         }
     }
 
diff --git a/src/main/java/org/commonwl/view/cwl/CWLTool.java b/src/main/java/org/commonwl/view/cwl/CWLTool.java
@@ -117,6 +117,7 @@ private String runCwltoolOnWorkflow(String argument, String workflowUrl) throws
                 inputGobbler.join();
                 return inputGobbler.getContent();
             } else {
+                errorGobbler.join();
                 throw new CWLValidationException(errorGobbler.getContent());
             }
         } catch (IOException|InterruptedException e) {
diff --git a/src/main/java/org/commonwl/view/cwl/RDFService.java b/src/main/java/org/commonwl/view/cwl/RDFService.java
@@ -158,15 +158,29 @@ public String getOntLabel(String ontologyURI) {
     public ResultSet getInputs(String path, String workflowURI) {
         ParameterizedSparqlString inputsQuery = new ParameterizedSparqlString();
         inputsQuery.setCommandText(queryCtx +
-                "SELECT ?name ?type ?format ?label ?doc\n" +
+                "SELECT ?name ?type ?items ?null ?format ?label ?doc\n" +
                 "WHERE {\n" +
                 "  GRAPH ?graphName {" +
                 "    ?wf rdf:type cwl:Workflow .\n" +
                 "    ?wf cwl:inputs ?name .\n" +
-                "    OPTIONAL { ?name sld:type ?type }\n" +
+                "    OPTIONAL {\n" +
+                "      { \n" +
+                "        ?name sld:type ?type\n" +
+                "        FILTER(?type != sld:null) \n" +
+                "        FILTER (!isBlank(?type))\n" +
+                "      } UNION { \n" +
+                "        ?name sld:type ?arraytype .\n" +
+                "        ?arraytype sld:type ?type .\n" +
+                "        ?arraytype sld:items ?items \n" +
+                "      }\n" +
+                "    }\n" +
+                "    OPTIONAL { \n" +
+                "      ?name sld:type ?null\n" +
+                "      FILTER(?null = sld:null)\n" +
+                "    }\n" +
                 "    OPTIONAL { ?name cwl:format ?format }\n" +
                 "    OPTIONAL { ?name sld:label|rdfs:label ?label }\n" +
-                "    OPTIONAL { ?name sld:doc|rdfs:comment ?doc }\n" +
+                "    OPTIONAL { ?name sld:doc|rdfs:comment ?doc }" +
                 "    FILTER(regex(str(?wf), ?wfFilter, \"i\" ))" +
                 "  }" +
                 "}");
@@ -184,15 +198,29 @@ public ResultSet getInputs(String path, String workflowURI) {
     public ResultSet getOutputs(String path, String workflowURI) {
         ParameterizedSparqlString outputsQuery = new ParameterizedSparqlString();
         outputsQuery.setCommandText(queryCtx +
-                "SELECT ?name ?type ?format ?label ?doc\n" +
+                "SELECT ?name ?type ?items ?null ?format ?label ?doc\n" +
                 "WHERE {\n" +
                 "  GRAPH ?graphName {" +
                 "    ?wf rdf:type cwl:Workflow .\n" +
                 "    ?wf cwl:outputs ?name .\n" +
-                "    OPTIONAL { ?name sld:type ?type }\n" +
+                "    OPTIONAL {\n" +
+                "      { \n" +
+                "        ?name sld:type ?type\n" +
+                "        FILTER(?type != sld:null) \n" +
+                "        FILTER (!isBlank(?type))\n" +
+                "      } UNION { \n" +
+                "        ?name sld:type ?arraytype .\n" +
+                "        ?arraytype sld:type ?type .\n" +
+                "        ?arraytype sld:items ?items \n" +
+                "      }\n" +
+                "    }\n" +
+                "    OPTIONAL { \n" +
+                "      ?name sld:type ?null\n" +
+                "      FILTER(?null = sld:null)\n" +
+                "    }\n" +
                 "    OPTIONAL { ?name cwl:format ?format }\n" +
                 "    OPTIONAL { ?name sld:label|rdfs:label ?label }\n" +
-                "    OPTIONAL { ?name sld:doc|rdfs:comment ?doc }\n" +
+                "    OPTIONAL { ?name sld:doc|rdfs:comment ?doc }" +
                 "    FILTER(regex(str(?wf), ?wfFilter, \"i\" ))" +
                 "  }" +
                 "}");
diff --git a/src/main/java/org/commonwl/view/workflow/WorkflowController.java b/src/main/java/org/commonwl/view/workflow/WorkflowController.java
@@ -135,22 +135,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());
         }
@@ -498,12 +500,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");
                     }
                 }
diff --git a/src/main/java/org/commonwl/view/workflow/WorkflowForm.java b/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 : "") + "]";
+    }
+
 }
diff --git a/src/main/java/org/commonwl/view/workflow/WorkflowFormValidator.java b/src/main/java/org/commonwl/view/workflow/WorkflowFormValidator.java
@@ -98,15 +98,15 @@ public GitDetails validateAndParse(WorkflowForm form, Errors e) {
 
             // Github Dir URL
             m = githubDirPattern.matcher(form.getUrl());
-            if (m.find()) {
+            if (m.find() && ! m.group(2).endsWith(".git")) {
                 repoUrl = "https://github.com/" + m.group(1) + "/" + m.group(2) + ".git";
                 if (branch == null) branch = m.group(3);
                 if (path == null) path = m.group(4);
             }
 
             // Gitlab Dir URL
             m = gitlabDirPattern.matcher(form.getUrl());
-            if (m.find()) {
+            if (m.find() && ! m.group(2).endsWith(".git")) {
                 repoUrl = "https://gitlab.com/" + m.group(1) + "/" + m.group(2) + ".git";
                 if (branch == null) branch = m.group(3);
                 if (path == null) path = m.group(4);
diff --git a/src/main/java/org/commonwl/view/workflow/WorkflowService.java b/src/main/java/org/commonwl/view/workflow/WorkflowService.java
@@ -41,7 +41,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -212,7 +214,8 @@ public List<WorkflowOverview> getWorkflowsFromDirectory(GitDetails gitInfo) thro
 
             Path localPath = repo.getRepository().getWorkTree().toPath();
             Path pathToDirectory = localPath.resolve(gitInfo.getPath()).normalize().toAbsolutePath();
-            if (pathToDirectory.toString().equals("/")) {
+            Path root = Paths.get("/").toAbsolutePath();
+            if (pathToDirectory.equals(root)) {
                 pathToDirectory = localPath;
             } else if (!pathToDirectory.startsWith(localPath.normalize().toAbsolutePath())) {
                 // Prevent path traversal attacks
@@ -307,6 +310,9 @@ public QueuedWorkflow createQueuedWorkflow(GitDetails gitInfo)
             }
 
             File workflowFile = new File(pathToWorkflowFile.toString());
+            if (! Files.isReadable(workflowFile.toPath())) {
+                throw new WorkflowNotFoundException();
+            }
 
             // Handling of packed workflows
             String packedWorkflowId = gitInfo.getPackedId();
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -6,14 +6,14 @@
 applicationName = Common Workflow Language Viewer
 applicationURL = https://view.commonwl.org
 
-# Path to a directory in which the RO Bundles will be stored
-bundleStorage = /tmp
+# Path to a directory in which the RO Bundles will be stored, e.g. /tmp
+bundleStorage = ${java.io.tmpdir}
 
-# Path to a directory in which graphviz images will be stored
-graphvizStorage = /tmp
+# Path to a directory in which graphviz images will be stored, e.g. /tmp
+graphvizStorage = ${java.io.tmpdir}
 
-# Path to a directory in which git repositories will be checked out into
-gitStorage = /tmp
+# Path to a directory in which git repositories will be checked out into, e.g. /tmp
+gitStorage = ${java.io.tmpdir}
 
 # How long to cache workflows in days before checking for changes via Github
 cacheDays = 1
diff --git a/src/main/resources/templates/workflow.html b/src/main/resources/templates/workflow.html
@@ -26,7 +26,7 @@
     <meta name="twitter:site" content="@commonwl" />
     <meta name="twitter:title" th:content="${'CWL Workflow: ' + workflow.label}" />
     <meta name="twitter:description" th:if="${workflow.doc != null}" th:content="${workflow.doc}" />
-    <meta name="twitter:image" th:content="${appURL + '/workflows/' + workflow.id + '/graph/png'}" />
+    <meta name="twitter:image" th:content="@{${workflow.getVisualisationPng()}}" />
     <title th:text="${workflow.label + ' - Common Workflow Language Viewer'}">Common Workflow Language Viewer</title>
     <link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" type="text/css" th:href="@{/css/main-20170616.css}" href="../static/css/main-20170616.css" />
diff --git a/src/test/java/org/commonwl/view/cwl/CWLServiceTest.java b/src/test/java/org/commonwl/view/cwl/CWLServiceTest.java
diff --git a/src/test/java/org/commonwl/view/researchobject/ROBundleFactoryTest.java b/src/test/java/org/commonwl/view/researchobject/ROBundleFactoryTest.java
diff --git a/src/test/java/org/commonwl/view/workflow/WorkflowServiceTest.java b/src/test/java/org/commonwl/view/workflow/WorkflowServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ private String runCwltoolOnWorkflow(String argument, String workflowUrl) throws`
`117`	`117`	`inputGobbler.join();`
`118`	`118`	`return inputGobbler.getContent();`
`119`	`119`	`} else {`
	`120`	`+ errorGobbler.join();`
`120`	`121`	`throw new CWLValidationException(errorGobbler.getContent());`
`121`	`122`	`}`
`122`	`123`	`} catch (IOException\|InterruptedException e) {`
Original file line number	Diff line number	Diff line change
`@@ -135,22 +135,24 @@ public ModelAndView createWorkflow(@Valid WorkflowForm workflowForm, BindingResu`
`135`	`135`	`return new ModelAndView("redirect:" + gitInfo.getInternalUrl());`
`136`	`136`	`}`
`137`	`137`	`} catch (TransportException ex) {`
	`138`	`+ logger.warn("git.sshError " + workflowForm , ex);`
`138`	`139`	`bindingResult.rejectValue("url", "git.sshError");`
`139`	`140`	`return new ModelAndView("index");`
`140`	`141`	`} catch (GitAPIException ex) {`
	`142`	`+ logger.error("git.retrievalError " + workflowForm , ex);`
`141`	`143`	`bindingResult.rejectValue("url", "git.retrievalError");`
`142`		`- logger.error("Git API Error", ex);`
`143`	`144`	`return new ModelAndView("index");`
`144`	`145`	`} catch (WorkflowNotFoundException ex) {`
	`146`	`+ logger.warn("git.pathTraversal " + workflowForm , ex);`
`145`	`147`	`bindingResult.rejectValue("url", "git.pathTraversal");`
`146`	`148`	`return new ModelAndView("index");`
`147`	`149`	`} catch (Exception ex) {`
	`150`	`+ logger.warn("url.parsingError " + workflowForm , ex);`
`148`	`151`	`bindingResult.rejectValue("url", "url.parsingError");`
`149`	`152`	`return new ModelAndView("index");`
`150`	`153`	`}`
`151`	`154`	`}`
`152`	`155`	`gitInfo = workflow.getRetrievedFrom();`
`153`		`-`
`154`	`156`	`// Redirect to the workflow`
`155`	`157`	`return new ModelAndView("redirect:" + gitInfo.getInternalUrl());`
`156`	`158`	`}`
`@@ -498,12 +500,16 @@ private ModelAndView getWorkflow(GitDetails gitDetails, RedirectAttributes redir`
`498`	`500`	`}`
`499`	`501`	`}`
`500`	`502`	`} catch (TransportException ex) {`
	`503`	`+ logger.warn("git.sshError " + workflowForm , ex);`
`501`	`504`	`errors.rejectValue("url", "git.sshError", "SSH URLs are not supported, please provide a HTTPS URL for the repository or submodules");`
`502`	`505`	`} catch (GitAPIException ex) {`
	`506`	`+ logger.error("git.retrievalError " + workflowForm, ex);`
`503`	`507`	`errors.rejectValue("url", "git.retrievalError", "The workflow could not be retrieved from the Git repository using the details given");`
`504`	`508`	`} catch (WorkflowNotFoundException ex) {`
	`509`	`+ logger.warn("git.pathTraversal " + workflowForm, ex);`
`505`	`510`	`errors.rejectValue("url", "git.pathTraversal", "The path given did not resolve to a location within the repository");`
`506`	`511`	`} catch (IOException ex) {`
	`512`	`+ logger.warn("git.parsingError " + workflowForm, ex);`
`507`	`513`	`errors.rejectValue("url", "url.parsingError", "The workflow could not be parsed from the given URL");`
`508`	`514`	`}`
`509`	`515`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,11 @@ public void setPath(String path) {`
`75`	`75`	`private String trimTrailingSlashes(String url) {`
`76`	`76`	`return url.replaceAll("\\/+$", "");`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+ @Override`
	`80`	`+ public String toString() {`
	`81`	`+ return "WorkflowForm [" + (url != null ? "url=" + url + ", " : "")`
	`82`	`+ + (branch != null ? "branch=" + branch + ", " : "") + (path != null ? "path=" + path : "") + "]";`
	`83`	`+ }`
	`84`	`+`
`78`	`85`	`}`