umputun/reproxy
1
1
Fork 0
mirror of https://github.com/umputun/reproxy.git synced 2024-10-05 13:47:11 +03:00
Code Issues Projects Releases Wiki Activity

Add 'X-Forwarded-URL' to request header (#176)

Browse Source 
* Add 'X-Forwarded-URL' to request header

'X-Forwarded-URL' has been added to the request header in the proxy core to improve redirection handling.

* lint: address unused param warn, supress for tests
This commit is contained in:
Umputun 2024-03-15 16:53:10 -05:00 committed by GitHub
parent 616c1df314
commit d2a4f56833
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.golangci.yml
View File

@ -68,6 +68,12 @@ issues:
linters:
- gosec
- dupl
- linters:
- unparam
- unused
- revive
path: _test\.go$
text: "unused-parameter"
exclude-use-default: false
service:

2
app/main.go
View File

@ -358,7 +358,7 @@ func makePluginConductor(ctx context.Context) proxy.MiddlewareProvider {
conductor := &plugin.Conductor{
Address: opts.Plugin.Listen,
RPCDialer: plugin.RPCDialerFunc(func(network, address string) (plugin.RPCClient, error) {
RPCDialer: plugin.RPCDialerFunc(func(_, address string) (plugin.RPCClient, error) {
return rpc.Dial("tcp", address)
}),
}

5
app/proxy/proxy.go
View File

@ -212,6 +212,7 @@ func (h *Http) proxyHandler() http.HandlerFunc {
uu := ctx.Value(ctxURL).(*url.URL)
keepHost := ctx.Value(ctxKeepHost).(bool)
r.Header.Add("X-Forwarded-Host", r.Host)
r.Header.Set("X-Forwarded-URL", r.URL.String())
if h.SSLConfig.SSLMode == SSLAuto || h.SSLConfig.SSLMode == SSLStatic {
h.setHeaderIfNotExists(r, "X-Forwarded-Proto", "https")
h.setHeaderIfNotExists(r, "X-Forwarded-Port", "443")
@ -352,7 +353,7 @@ func (h *Http) matchHandler(next http.Handler) http.Handler {
func (h *Http) assetsHandler() http.HandlerFunc {
if h.AssetsLocation == "" || h.AssetsWebRoot == "" {
return func(writer http.ResponseWriter, request *http.Request) {}
return func(_ http.ResponseWriter, _ *http.Request) {}
}
var notFound []byte
@ -370,7 +371,7 @@ func (h *Http) assetsHandler() http.HandlerFunc {
fs, err := h.fileServer(h.AssetsWebRoot, h.AssetsLocation, h.AssetsSPA, notFound)
if err != nil {
log.Printf("[WARN] can't initialize assets server, %v", err)
return func(writer http.ResponseWriter, request *http.Request) {}
return func(_ http.ResponseWriter, _ *http.Request) {}
}
return h.CacheControl.Middleware(fs).ServeHTTP
}

5
app/proxy/proxy_test.go
View File

@ -39,6 +39,7 @@ func TestHttp_Do(t *testing.T) {
require.Equal(t, "127.0.0.1", r.Header.Get("X-Forwarded-For"))
require.Empty(t, r.Header.Get("X-Forwarded-Proto")) // ssl auto only
require.Empty(t, r.Header.Get("X-Forwarded-Port"))
require.NotEmpty(t, r.Header.Get("X-Forwarded-URL"), "X-Forwarded-URL header must be set")
fmt.Fprintf(w, "response %s", r.URL.String())
}))
@ -65,7 +66,7 @@ func TestHttp_Do(t *testing.T) {
client := http.Client{}
t.Run("to 127.0.0.1, good", func(t *testing.T) {
req, err := http.NewRequest("GET", "http://127.0.0.1:"+strconv.Itoa(port)+"/api/something", http.NoBody)
req, err := http.NewRequest("GET", "http://127.0.0.1:"+strconv.Itoa(port)+"/api/something?xxx=yyy", http.NoBody)
require.NoError(t, err)
resp, err := client.Do(req)
require.NoError(t, err)
@ -75,7 +76,7 @@ func TestHttp_Do(t *testing.T) {
body, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, "response /567/something", string(body))
assert.Equal(t, "response /567/something?xxx=yyy", string(body))
assert.Equal(t, "reproxy", resp.Header.Get("App-Name"))
assert.Equal(t, "v1", resp.Header.Get("h1"))
assert.Equal(t, "vv1", resp.Header.Get("hh1"))