highperfocused/khatru
1
0
Fork 0
mirror of https://github.com/fiatjaf/khatru.git synced 2025-03-17 13:22:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolve relative icon and banner urls in nip11 handler.

Browse Source
This commit is contained in:
fiatjaf 2025-02-23 18:20:54 -03:00
parent 6e224b9437
commit 7c6031f4e5
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handlers.go
View File

@ -126,7 +126,7 @@ func (rl *Relay) HandleWebsocket(w http.ResponseWriter, r *http.Request) {
websocket.CloseAbnormalClosure, // 1006 websocket.CloseAbnormalClosure, // 1006
4537, // some client seems to send many of these 4537, // some client seems to send many of these
) { ) {
rl.Log.Printf("unexpected close error from %s: %v\n", r.Header.Get("X-Forwarded-For"), err) rl.Log.Printf("unexpected close error from %s: %v\n", GetIPFromRequest(r), err)
} }
ws.cancel() ws.cancel()
return return

10
nip11.go
View File

@ -3,6 +3,7 @@ package khatru
import ( import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"strings"
) )
func (rl *Relay) HandleNIP11(w http.ResponseWriter, r *http.Request) { func (rl *Relay) HandleNIP11(w http.ResponseWriter, r *http.Request) {
@ -20,6 +21,15 @@ func (rl *Relay) HandleNIP11(w http.ResponseWriter, r *http.Request) {
info.AddSupportedNIP(77) info.AddSupportedNIP(77)
} }
// resolve relative icon and banner URLs against base URL
baseURL := rl.getBaseURL(r)
if info.Icon != "" && !strings.HasPrefix(info.Icon, "http://") && !strings.HasPrefix(info.Icon, "https://") {
info.Icon = strings.TrimSuffix(baseURL, "/") + "/" + strings.TrimPrefix(info.Icon, "/")
}
if info.Banner != "" && !strings.HasPrefix(info.Banner, "http://") && !strings.HasPrefix(info.Banner, "https://") {
info.Banner = strings.TrimSuffix(baseURL, "/") + "/" + strings.TrimPrefix(info.Banner, "/")
}
for _, ovw := range rl.OverwriteRelayInformation { for _, ovw := range rl.OverwriteRelayInformation {
info = ovw(r.Context(), r, info) info = ovw(r.Context(), r, info)
} }