mleku/relayer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #130 from fiatjaf/fix-auth

Browse Source 
fix auth
This commit is contained in:
mattn
2025-03-28 22:51:57 +09:00
committed by GitHub
parent 125f2a8a3b 22490d2af5
commit 2ac450021c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extra.go
View File

@@ -5,9 +5,12 @@ import "context"
const AUTH_CONTEXT_KEY = iota const AUTH_CONTEXT_KEY = iota
func GetAuthStatus(ctx context.Context) (pubkey string, ok bool) { func GetAuthStatus(ctx context.Context) (pubkey string, ok bool) {
authedPubkey := ctx.Value(AUTH_CONTEXT_KEY) value := ctx.Value(AUTH_CONTEXT_KEY)
if authedPubkey == nil { if value == nil {
return "", false return "", false
} }
return authedPubkey.(string), true if ws, ok := value.(*WebSocket); ok {
return ws.authed, true
}
return "", false
} }

3
handlers.go
View File

@@ -293,7 +293,6 @@ func (s *Server) doAuth(ctx context.Context, ws *WebSocket, request []json.RawMe
} }
if pubkey, ok := nip42.ValidateAuthEvent(&evt, ws.challenge, auther.ServiceURL()); ok { if pubkey, ok := nip42.ValidateAuthEvent(&evt, ws.challenge, auther.ServiceURL()); ok {
ws.authed = pubkey ws.authed = pubkey
ctx = context.WithValue(ctx, AUTH_CONTEXT_KEY, pubkey)
ws.WriteJSON(nostr.OKEnvelope{EventID: evt.ID, OK: true}) ws.WriteJSON(nostr.OKEnvelope{EventID: evt.ID, OK: true})
} else { } else {
ws.WriteJSON(nostr.OKEnvelope{EventID: evt.ID, OK: false, Reason: "error: failed to authenticate"}) ws.WriteJSON(nostr.OKEnvelope{EventID: evt.ID, OK: false, Reason: "error: failed to authenticate"})
@@ -324,6 +323,8 @@ func (s *Server) handleMessage(ctx context.Context, ws *WebSocket, message []byt
var typ string var typ string
json.Unmarshal(request[0], &typ) json.Unmarshal(request[0], &typ)
ctx = context.WithValue(ctx, AUTH_CONTEXT_KEY, ws)
switch typ { switch typ {
case "EVENT": case "EVENT":
notice = s.doEvent(ctx, ws, request, store) notice = s.doEvent(ctx, ws, request, store)