130187c7be
P0 fixes: - WebSocket origin checking (reject untrusted origins) - WS session token moved from URL query param to first message frame - WebAuthn login cookie now uses Secure flag via shared SetSessionCookie - PostgreSQL sslmode configurable via POSTGRES_SSLMODE env (default: require) - Fixed DatabaseDSN to use real password instead of masked placeholder P1 fixes: - Per-IP rate limiting middleware (auth: 5 req/s, invites: 2 req/s) - Security headers on all responses (CSP, X-Frame-Options, nosniff, etc.) - WS broadcasts scoped to server members (prevents cross-server data leak) - Webhook tokens stored as SHA-256 hashes (not plaintext) P2 fixes: - CSRF protection via Origin header validation on state-changing requests - MANAGE_CHANNELS permission enforced on channel update/delete - Upload validation: 25MB limit, extension allowlist, server-side MIME check - File serve: path traversal protection + Content-Disposition: attachment Files: 23 changed, +499/-100. Builds clean (go build, go vet, npm build). Zero CVEs (govulncheck, npm audit).
207 lines
5.2 KiB
Go
207 lines
5.2 KiB
Go
package gateway
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"encoding/json"
|
|
"log/slog"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/gorilla/websocket"
|
|
)
|
|
|
|
const (
|
|
writeWait = 10 * time.Second
|
|
pongWait = 60 * time.Second
|
|
pingPeriod = (pongWait * 9) / 10
|
|
maxMessageSize = 4096
|
|
)
|
|
|
|
var upgrader = websocket.Upgrader{
|
|
ReadBufferSize: 1024,
|
|
WriteBufferSize: 1024,
|
|
CheckOrigin: func(r *http.Request) bool { return true }, // default: allow all (overridden by SetAllowedOrigins)
|
|
}
|
|
|
|
// SetAllowedOrigins replaces the default upgrader with one that validates
|
|
// the Origin header against a trusted set. Call once at startup.
|
|
func SetAllowedOrigins(origins []string) {
|
|
originSet := make(map[string]struct{}, len(origins))
|
|
for _, o := range origins {
|
|
originSet[o] = struct{}{}
|
|
}
|
|
upgrader = websocket.Upgrader{
|
|
ReadBufferSize: 1024,
|
|
WriteBufferSize: 1024,
|
|
CheckOrigin: func(r *http.Request) bool {
|
|
origin := r.Header.Get("Origin")
|
|
if origin == "" {
|
|
return false
|
|
}
|
|
_, ok := originSet[origin]
|
|
return ok
|
|
},
|
|
}
|
|
}
|
|
|
|
// Client is a middleman between the websocket connection and the hub.
|
|
type Client struct {
|
|
Hub *Hub
|
|
Conn *websocket.Conn
|
|
UserID string
|
|
send chan []byte
|
|
}
|
|
|
|
// readPump pumps messages from the websocket connection to the hub.
|
|
func (c *Client) readPump() {
|
|
defer func() {
|
|
c.Hub.Unregister(c)
|
|
c.Conn.Close()
|
|
}()
|
|
|
|
c.Conn.SetReadLimit(maxMessageSize)
|
|
c.Conn.SetReadDeadline(time.Now().Add(pongWait))
|
|
c.Conn.SetPongHandler(func(string) error {
|
|
c.Conn.SetReadDeadline(time.Now().Add(pongWait))
|
|
return nil
|
|
})
|
|
|
|
for {
|
|
_, raw, err := c.Conn.ReadMessage()
|
|
if err != nil {
|
|
if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseNormalClosure) {
|
|
c.Hub.logger.Warn("websocket read error", "error", err, "user_id", c.UserID)
|
|
}
|
|
break
|
|
}
|
|
|
|
var event Event
|
|
if err := json.Unmarshal(raw, &event); err != nil {
|
|
c.Hub.logger.Warn("invalid event JSON", "error", err, "user_id", c.UserID)
|
|
continue
|
|
}
|
|
|
|
// Record activity for idle detection.
|
|
c.Hub.RecordActivity(c.UserID)
|
|
|
|
// Handle client-sent events (e.g. TYPING_START, PRESENCE_UPDATE)
|
|
// For now, broadcast them to all clients
|
|
switch event.Type {
|
|
case EventTypingStart, EventPresenceUpdate:
|
|
c.Hub.BroadcastEvent(event)
|
|
default:
|
|
c.Hub.logger.Info("received event from client", "type", event.Type, "user_id", c.UserID)
|
|
}
|
|
}
|
|
}
|
|
|
|
// writePump pumps messages from the hub to the websocket connection.
|
|
func (c *Client) writePump() {
|
|
ticker := time.NewTicker(pingPeriod)
|
|
defer func() {
|
|
ticker.Stop()
|
|
c.Conn.Close()
|
|
}()
|
|
|
|
for {
|
|
select {
|
|
case message, ok := <-c.send:
|
|
c.Conn.SetWriteDeadline(time.Now().Add(writeWait))
|
|
if !ok {
|
|
c.Conn.WriteMessage(websocket.CloseMessage, []byte{})
|
|
return
|
|
}
|
|
|
|
w, err := c.Conn.NextWriter(websocket.TextMessage)
|
|
if err != nil {
|
|
return
|
|
}
|
|
w.Write(message)
|
|
|
|
// Drain queued messages into the current write
|
|
n := len(c.send)
|
|
for i := 0; i < n; i++ {
|
|
w.Write([]byte{'\n'})
|
|
w.Write(<-c.send)
|
|
}
|
|
|
|
if err := w.Close(); err != nil {
|
|
return
|
|
}
|
|
|
|
case <-ticker.C:
|
|
c.Conn.SetWriteDeadline(time.Now().Add(writeWait))
|
|
if err := c.Conn.WriteMessage(websocket.PingMessage, nil); err != nil {
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// authMessage is the first frame the client must send after connecting.
|
|
type authMessage struct {
|
|
Token string `json:"token"`
|
|
}
|
|
|
|
// ServeWS handles websocket requests from the peer. It upgrades the
|
|
// connection first, then waits for an auth message frame containing the
|
|
// session token. This avoids leaking the token in the URL (which would
|
|
// appear in server logs, browser history, and Referer headers).
|
|
func ServeWS(db *sql.DB, hub *Hub, logger *slog.Logger, w http.ResponseWriter, r *http.Request) {
|
|
conn, err := upgrader.Upgrade(w, r, nil)
|
|
if err != nil {
|
|
logger.Error("websocket upgrade failed", "error", err)
|
|
return
|
|
}
|
|
|
|
// Short deadline for the auth frame; we don't want unauthenticated
|
|
// connections hanging around consuming resources.
|
|
conn.SetReadDeadline(time.Now().Add(10 * time.Second))
|
|
_, raw, err := conn.ReadMessage()
|
|
if err != nil {
|
|
logger.Warn("ws auth: failed to read auth message", "error", err)
|
|
conn.WriteMessage(websocket.TextMessage, []byte(`{"error":"auth timeout"}`))
|
|
conn.Close()
|
|
return
|
|
}
|
|
|
|
var auth authMessage
|
|
if err := json.Unmarshal(raw, &auth); err != nil || auth.Token == "" {
|
|
logger.Warn("ws auth: invalid auth message")
|
|
conn.WriteMessage(websocket.TextMessage, []byte(`{"error":"missing token"}`))
|
|
conn.Close()
|
|
return
|
|
}
|
|
|
|
var userID string
|
|
err = db.QueryRowContext(context.Background(),
|
|
`SELECT user_id FROM sessions WHERE token = $1 AND expires_at > NOW()`,
|
|
auth.Token,
|
|
).Scan(&userID)
|
|
if err != nil {
|
|
logger.Warn("ws auth: invalid session", "error", err)
|
|
conn.WriteMessage(websocket.TextMessage, []byte(`{"error":"invalid session"}`))
|
|
conn.Close()
|
|
return
|
|
}
|
|
|
|
// Auth succeeded. Clear the auth deadline (readPump sets its own).
|
|
conn.SetReadDeadline(time.Time{})
|
|
|
|
// Send ready signal so the client knows auth passed.
|
|
conn.WriteMessage(websocket.TextMessage, []byte(`{"type":"ready"}`))
|
|
|
|
client := &Client{
|
|
Hub: hub,
|
|
Conn: conn,
|
|
UserID: userID,
|
|
send: make(chan []byte, 256),
|
|
}
|
|
|
|
hub.Register(client)
|
|
|
|
go client.writePump()
|
|
go client.readPump()
|
|
}
|