Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Additional logging + dont unescape path when checking allowlist #31

Merged
merged 3 commits into from
Jul 24, 2023
Merged

Additional logging + dont unescape path when checking allowlist #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88a0d26
log allowlist rejects
tpetr Jul 21, 2023
a65bd11
check for allowlist match using unescaped path
tpetr Jul 24, 2023
5a4e84a
remove unused field
tpetr Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions it/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ func TestWireguardInboundProxy(t *testing.T) {
URL: internalServer.URL + "/allowed-post",
Methods: pkg.ParseHttpMethods([]string{"POST"}),
},
{
URL: internalServer.URL + "/allowed-path/:path",
Methods: pkg.ParseHttpMethods([]string{"POST"}),
},
},
Heartbeat: pkg.HeartbeatConfig{
URL: fmt.Sprintf("http://[%v]/ping", gatewayWireguardAddress),
Expand Down Expand Up @@ -177,6 +181,10 @@ func TestWireguardInboundProxy(t *testing.T) {
// it should proxy requests that match the allowlist
remoteHttpClient.AssertStatusCode(t, "GET", fmt.Sprintf("http://[%v]/proxy/%v/allowed-get", clientWireguardAddress, internalServer.URL), 200)
remoteHttpClient.AssertStatusCode(t, "POST", fmt.Sprintf("http://[%v]/proxy/%v/allowed-post", clientWireguardAddress, internalServer.URL), 200)
remoteHttpClient.AssertStatusCode(t, "POST", fmt.Sprintf("http://[%v]/proxy/%v/allowed-path/foobar", clientWireguardAddress, internalServer.URL), 200)

// it shouldnt decode urlencoded characters
remoteHttpClient.AssertStatusCode(t, "POST", fmt.Sprintf("http://[%v]/proxy/%v/allowed-path/%s", clientWireguardAddress, internalServer.URL, "foobar%2Fbla"), 200)

// it should reject requests that don't match the allowlist
remoteHttpClient.AssertStatusCode(t, "POST", fmt.Sprintf("http://[%v]/proxy/%v/allowed-get", clientWireguardAddress, internalServer.URL), 403)
Expand Down
2 changes: 1 addition & 1 deletion pkg/allowlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func (config AllowlistItem) Matches(method string, url *url.URL) bool {
}

matcher := urlpath.New(parsedUrl.Path)
if _, matches := matcher.Match(url.Path); matches {
if _, matches := matcher.Match(url.EscapedPath()); matches {
return true
}

Expand Down
7 changes: 7 additions & 0 deletions pkg/allowlist_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ func TestAllowlistPathMatch(t *testing.T) {
URL: "https://foo.com/variable-path/:variable",
Methods: ParseHttpMethods([]string{"GET"}),
},
AllowlistItem{
URL: "https://foo.com/variable-path/:variable/suffix",
Methods: ParseHttpMethods([]string{"GET"}),
},
}

// test path matching
Expand All @@ -108,4 +112,7 @@ func TestAllowlistPathMatch(t *testing.T) {
assertAllowlistMatch(t, allowlist, "GET", "https://foo.com/variable-path/a/b", false)
assertAllowlistMatch(t, allowlist, "GET", "https://foo.com/hardcoded-path", true)
assertAllowlistMatch(t, allowlist, "GET", "https://foo.com/hardcoded-path/bla", false)

assertAllowlistMatch(t, allowlist, "GET", "https://foo.com/variable-path/bla%2Fbla/suffix", true)
assertAllowlistMatch(t, allowlist, "GET", "https://foo.com/variable-path/bla/bla/suffix", false)
}
9 changes: 8 additions & 1 deletion pkg/inbound_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ func (config *InboundProxyConfig) Start(tnet *netstack.Net) error {
// setup http server
gin.SetMode(gin.ReleaseMode)
r := gin.New()
r.UseRawPath = true // we want this proxy to be transparent, so don't un-escape characters in the URL

// we want this proxy to be transparent, so don't un-escape characters in the URL
r.UseRawPath = true
r.UnescapePathValues = false

r.Use(gin.LoggerWithConfig(gin.LoggerConfig{
SkipPaths: config.Logging.SkipPaths,
}), gin.Recovery())
Expand All @@ -54,10 +58,13 @@ func (config *InboundProxyConfig) Start(tnet *netstack.Net) error {
if !exists {
c.Header(errorResponseHeader, "1")
c.JSON(http.StatusForbidden, gin.H{"error": "url is not in allowlist"})
log.Warnf("url is not in allowlist: %s %s", c.Request.Method, destinationUrl)
return
}

log.Infof("Proxying request: %s %s", c.Request.Method, destinationUrl)
log.Infof("Matched allowlist entry: %v", allowlistMatch)

proxy := httputil.ReverseProxy{
Director: func(req *http.Request) {
req.URL = destinationUrl
Expand Down