From 28288739f35bbfc0253bdcb9d7d106698d0d3e92 Mon Sep 17 00:00:00 2001
From: Nicolas Carlier <n.carlier@nunux.org>
Date: Sat, 1 Feb 2020 08:47:18 +0000
Subject: [PATCH] feat(): allow scripts with extensions

---
 README.md                              | 11 ++++++-----
 pkg/tools/script_resolver.go           |  6 ++++--
 pkg/tools_test/script_resolver_test.go |  8 +++++++-
 scripts/examples/echo.js               | 15 +++++++++++++++
 scripts/examples/node.sh               |  3 ---
 5 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100755 scripts/examples/echo.js
 delete mode 100755 scripts/examples/node.sh

diff --git a/README.md b/README.md
index 7cc7890..7689a7a 100644
--- a/README.md
+++ b/README.md
@@ -60,14 +60,19 @@ You can override the default using the `WHD_SCRIPTS_DIR` environment variable or
 |--> /github
   |--> /build.sh
   |--> /deploy.sh
-|--> /ping.sh
+|--> /push.js
+|--> /echo.sh
 |--> ...
 ```
 
+Note that Webhookd is able to run any type of file in this directory as long as the file is executable.
+For example, you can execute a Node.js file if you give execution rights to the file and add the appropriate `#!` header (in this case: `#!/usr/bin/env node`).
+
 ### Webhook URL
 
 The directory structure define the webhook URL.
 
+You can omit the script extension. If you do, webhookd will search for a `.sh` file.
 If the script exists, the output the will be streamed to the HTTP response.
 
 The streaming technology depends on the HTTP method used.
@@ -97,7 +102,6 @@ $ curl -v -XPOST http://localhost:8080/foo/bar
 < X-Hook-Id: 7
 foo foo foo
 bar bar bar
-done
 ```
 
 Output using  `GET` (`Server-sent events`):
@@ -111,8 +115,6 @@ $ curl -v -XGET http://localhost:8080/foo/bar
 data: foo foo foo
 
 data: bar bar bar
-
-data: done
 ```
 
 ### Webhook parameters
@@ -146,7 +148,6 @@ $ curl --data @test.json http://localhost:8080/echo?foo=bar
 Query parameter: foo=bar
 Header parameter: user-agent=curl/7.52.1
 Script parameter: {"foo": "bar"}
-done
 ```
 
 ### Webhook timeout configuration
diff --git a/pkg/tools/script_resolver.go b/pkg/tools/script_resolver.go
index 5983e1b..44f432f 100644
--- a/pkg/tools/script_resolver.go
+++ b/pkg/tools/script_resolver.go
@@ -2,7 +2,6 @@ package tools
 
 import (
 	"errors"
-	"fmt"
 	"os"
 	"path"
 	"strings"
@@ -10,7 +9,10 @@ import (
 
 // ResolveScript is resolving the target script.
 func ResolveScript(dir, name string) (string, error) {
-	script := path.Clean(path.Join(dir, fmt.Sprintf("%s.sh", name)))
+	if path.Ext(name) == "" {
+		name = name + ".sh"
+	}
+	script := path.Clean(path.Join(dir, name))
 	if !strings.HasPrefix(script, dir) {
 		return "", errors.New("Invalid script path: " + name)
 	}
diff --git a/pkg/tools_test/script_resolver_test.go b/pkg/tools_test/script_resolver_test.go
index 0b5f07c..61732d3 100644
--- a/pkg/tools_test/script_resolver_test.go
+++ b/pkg/tools_test/script_resolver_test.go
@@ -22,5 +22,11 @@ func TestNotResolveScript(t *testing.T) {
 func TestResolveBadScript(t *testing.T) {
 	_, err := tools.ResolveScript("../../scripts", "../tests/test_simple")
 	assert.NotNil(t, err, "")
-	assert.Equal(t, "Invalid script path: ../tests/test_simple", err.Error(), "")
+	assert.Equal(t, "Invalid script path: ../tests/test_simple.sh", err.Error(), "")
+}
+
+func TestResolveScriptWithExtension(t *testing.T) {
+	_, err := tools.ResolveScript("../../scripts", "node.js")
+	assert.NotNil(t, err, "")
+	assert.Equal(t, "Script not found: ../../scripts/node.js", err.Error(), "")
 }
diff --git a/scripts/examples/echo.js b/scripts/examples/echo.js
new file mode 100755
index 0000000..82b00c8
--- /dev/null
+++ b/scripts/examples/echo.js
@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+
+const os = require('os')
+
+// Usage: http POST :8080/examples/echo.js msg==hello foo=bar
+
+console.log("Echo script:")
+
+console.log("Hostname=", os.hostname())
+
+console.log("User-Agent=", process.env["user_agent"])
+
+console.log("msg=", process.env["msg"])
+
+console.log("body=", process.argv)
diff --git a/scripts/examples/node.sh b/scripts/examples/node.sh
deleted file mode 100755
index caf0f3f..0000000
--- a/scripts/examples/node.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-console.log("hello world!")