- Update CI (add new tests)

- Add path scan with regex (find .php/.ph/.sh scripts). When found, try
  to stat path for potential fix for the [file not exists problem]

Signed-off-by: Valery Piashchynski <[email protected]>

3 files changed, 60 insertions, 6 deletions

diff --git a/plugins/server/command.go b/plugins/server/command.go
new file mode 100644
index 00000000..527cc224
--- /dev/null
+++ b/plugins/server/command.go
@@ -0,0 +1,33 @@
+package server
+
+import (
+	"os"
+	"regexp"
+
+	"github.com/spiral/errors"
+)
+
+// pattern for the path finding
+const pattern string = `^\/*([A-z0-9/.:-]+\.(php|sh|ph))$`
+
+func (server *Plugin) scanCommand(cmd []string) error {
+	const op = errors.Op("server_command_scan")
+	r, err := regexp.Compile(pattern)
+	if err != nil {
+		return err
+	}
+
+	for i := 0; i < len(cmd); i++ {
+		if r.MatchString(cmd[i]) {
+			// try to stat
+			_, err := os.Stat(cmd[i])
+			if err != nil {
+				return errors.E(op, err)
+			}
+
+			// stat successful
+			return nil
+		}
+	}
+	return errors.E(errors.Str("scan failed, possible path not found"), op)
+}
diff --git a/plugins/server/command_test.go b/plugins/server/command_test.go
new file mode 100644
index 00000000..24051fba
--- /dev/null
+++ b/plugins/server/command_test.go
@@ -0,0 +1,14 @@
+package server
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestServerCommandChecker(t *testing.T) {
+	s := &Plugin{}
+	cmd1 := "php ../../tests/client.php"
+	assert.NoError(t, s.scanCommand(strings.Split(cmd1, " ")))
+}
diff --git a/plugins/server/plugin.go b/plugins/server/plugin.go
index 7f694f3c..00639f43 100644
--- a/plugins/server/plugin.go
+++ b/plugins/server/plugin.go
@@ -24,10 +24,11 @@ import (
 // PluginName for the server
 const PluginName = "server"
 
-// RR_RELAY env variable key (internal)
-const RR_RELAY = "RR_RELAY" //nolint:stylecheck
-// RR_RPC env variable key (internal) if the RPC presents
-const RR_RPC = "RR_RPC" //nolint:stylecheck
+// RrRelay env variable key (internal)
+const RrRelay = "RR_RELAY"
+
+// RrRPC env variable key (internal) if the RPC presents
+const RrRPC = "RR_RPC"
 
 // Plugin manages worker
 type Plugin struct {
@@ -93,6 +94,12 @@ func (server *Plugin) CmdFactory(env Env) (func() *exec.Cmd, error) {
 		return nil, errors.E(op, errors.Str("minimum command should be `<executable> <script>"))
 	}
 
+	// try to find a path here
+	err := server.scanCommand(cmdArgs)
+	if err != nil {
+		server.log.Info("scan command", "error", err)
+	}
+
 	return func() *exec.Cmd {
 		cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...) //nolint:gosec
 		utils.IsolateProcess(cmd)
@@ -183,13 +190,13 @@ func (server *Plugin) initFactory() (transport.Factory, error) {
 }
 
 func (server *Plugin) setEnv(e Env) []string {
-	env := append(os.Environ(), fmt.Sprintf(RR_RELAY+"=%s", server.cfg.Server.Relay))
+	env := append(os.Environ(), fmt.Sprintf(RrRelay+"=%s", server.cfg.Server.Relay))
 	for k, v := range e {
 		env = append(env, fmt.Sprintf("%s=%s", strings.ToUpper(k), v))
 	}
 
 	if server.cfg.RPC != nil && server.cfg.RPC.Listen != "" {
-		env = append(env, fmt.Sprintf("%s=%s", RR_RPC, server.cfg.RPC.Listen))
+		env = append(env, fmt.Sprintf("%s=%s", RrRPC, server.cfg.RPC.Listen))
 	}
 
 	// set env variables from the config