Added separate Path and File variables for HTTP requests

v2/pkg/protocols/http/build_request.go

@@ -8,6 +8,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"path"
 	"regexp"
 	"strings"
 	"time"
@@ -272,13 +273,23 @@ func generateVariables(parsed *url.URL, trailingSlash bool) map[string]interface
 		parsed.Path = strings.TrimSuffix(parsed.Path, "/")
 	}
 
+	escapedPath := parsed.EscapedPath()
+	directory := path.Dir(escapedPath)
+	if directory == "." {
+		directory = ""
+	}
+	base := path.Base(escapedPath)
+	if base == "." {
+		base = ""
+	}
 	return map[string]interface{}{
 		"BaseURL":  parsed.String(),
 		"RootURL":  fmt.Sprintf("%s://%s", parsed.Scheme, parsed.Host),
 		"Hostname": parsed.Host,
 		"Host":     domain,
 		"Port":     port,
-		"Path":     parsed.EscapedPath(),
+		"Path":     directory,
+		"File":     base,
 		"Scheme":   parsed.Scheme,
 	}
 }

v2/pkg/protocols/http/build_request_test.go

@@ -28,7 +28,8 @@ func TestVariables(t *testing.T) {
 	require.Equal(t, values["BaseURL"], parsed.String(), "incorrect baseurl")
 	require.Equal(t, values["RootURL"], "http://localhost:9001", "incorrect rootURL")
 	require.Equal(t, values["Host"], "localhost", "incorrect domain name")
-	require.Equal(t, values["Path"], "/test/123", "incorrect path")
+	require.Equal(t, values["Path"], "/test", "incorrect path")
+	require.Equal(t, values["File"], "123", "incorrect file")
 	require.Equal(t, values["Port"], "9001", "incorrect port number")
 	require.Equal(t, values["Scheme"], "http", "incorrect scheme")
 	require.Equal(t, values["Hostname"], "localhost:9001", "incorrect hostname")