fix: handle includes without hosts #6
Conversation
| @@ -52,6 +53,12 @@ func (i *includeTag) Process(b []byte, req *http.Request) ([]byte, int) { | |||
| return nil, len(b) | |||
| } | |||
|
|
|||
| if strings.HasPrefix(i.src, "//") { | |||
| i.src = req.URL.Scheme + i.src | |||
There was a problem hiding this comment.
This looks like it should work, but for some reason req seems to be empty when calling this.
| @@ -52,6 +53,12 @@ func (i *includeTag) Process(b []byte, req *http.Request) ([]byte, int) { | |||
| return nil, len(b) | |||
| } | |||
|
|
|||
| if strings.HasPrefix(i.src, "//") { | |||
There was a problem hiding this comment.
You should probably use URL.ResolveReference() instead
There was a problem hiding this comment.
Because in the caddy's context, req.URL.Host is empty and only req.Host is filled.
There was a problem hiding this comment.
I mean you can build the base URL instance by yourself, but relying on this method will be safer as it will support all edge cases
This is probably the kind of code you don't want to maintain yourself: https://cs.opensource.google/go/go/+/refs/tags/go1.19.3:src/net/url/url.go;drc=a11cd6f69aec5c783656601fbc7b493e0d63f605;l=995
|
Got something working @dkarlovi // writer.go
// ...
func NewWriter(buf *bytes.Buffer, rw http.ResponseWriter, rq *http.Request) *Writer {
if rq.URL.Scheme == "" {
if rq.TLS != nil {
rq.URL.Scheme = "https"
} else {
rq.URL.Scheme = "http"
}
}
if rq.URL.Host == "" {
rq.URL.Host = rq.Host
}
return &Writer{
buf: buf,
Rq: rq,
rw: rw,
AsyncBuf: make([]chan []byte, 0),
Done: make(chan bool),
}
}
// ...// include.go
// ...
if e := i.loadAttributes(b[8:i.length]); e != nil {
return nil, len(b)
}
u, _ := url.Parse(i.src)
i.src = req.URL.ResolveReference(u).String()
// ... |
|
Feel free to close this if you've solved it differently. 👍 |
|
Resolved by #7 |
Fixes #4.