mirror of
https://github.com/R0m1k3/FlowReader.git
synced 2026-10-11 17:28:05 +02:00
sécurité : correctifs XSS, SSRF, CSWSH, rate-limit et durcissement
- XSS stocké (critique) : sanitisation bluemonday sur tous les endpoints d'articles (List, ListByFeed, Favorites, Search, Get), pas seulement Get - SSRF (élevé) : nouveau utils/safehttp.go (ValidateExternalURL + client durci via Dialer.Control, bloque IP privées/loopback/link-local/metadata, anti-DNS-rebinding et limite de redirections) appliqué à l'extracteur et au parser - WebSocket CSWSH (élevé) : politique same-origin + override WS_ALLOWED_ORIGINS - rate-limiting (moyen) : token-bucket en mémoire sur /auth/* - token de session retiré du corps JSON (json:"-"), livré uniquement par le cookie HttpOnly - cookie Secure correct derrière un reverse-proxy (X-Forwarded-Proto + override COOKIE_SECURE) - admin : interdiction de supprimer son propre compte - en-têtes de sécurité (nosniff, X-Frame-Options, Referrer-Policy, Permissions-Policy) Note : backend non compilé localement (pas de toolchain Go) ; à valider via Docker. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
1 parent
10fdfdeccb
commit
3402e53954
11 files changed
+346
-23
No files matched your search
@@ -18,9 +18,8 @@ type ContentExtractor struct {
|
||||
// NewContentExtractor creates a new extractor instance.
|
||||
func NewContentExtractor() *ContentExtractor {
|
||||
return &ContentExtractor{
|
||||
client: &http.Client{
|
||||
Timeout: 10 * time.Second,
|
||||
},
|
||||
// SSRF-hardened client: refuses to connect to private/internal addresses.
|
||||
client: SafeHTTPClient(10 * time.Second),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,6 +29,11 @@ func (e *ContentExtractor) Extract(ctx context.Context, url string) (string, err
|
||||
return "", fmt.Errorf("empty URL")
|
||||
}
|
||||
|
||||
// Validate up-front (scheme + non-private host) before issuing the request.
|
||||
if _, err := ValidateExternalURL(url); err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
|
||||
if err != nil {
|
||||
return "", err
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
package utils
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"syscall"
|
||||
"time"
|
||||
)
|
||||
|
||||
// ErrBlockedHost is returned when a URL resolves to a non-public address.
|
||||
type ErrBlockedHost struct{ Host string }
|
||||
|
||||
func (e *ErrBlockedHost) Error() string {
|
||||
return fmt.Sprintf("blocked request to non-public host: %s", e.Host)
|
||||
}
|
||||
|
||||
// isDisallowedIP reports whether an IP is private, loopback, link-local,
|
||||
// unspecified, or otherwise unsafe to fetch (SSRF protection).
|
||||
func isDisallowedIP(ip net.IP) bool {
|
||||
if ip == nil {
|
||||
return true
|
||||
}
|
||||
if ip.IsLoopback() || ip.IsPrivate() || ip.IsUnspecified() ||
|
||||
ip.IsLinkLocalUnicast() || ip.IsLinkLocalMulticast() || ip.IsMulticast() {
|
||||
return true
|
||||
}
|
||||
// Block IPv4-mapped cloud metadata endpoint explicitly (169.254.169.254 is
|
||||
// already link-local, but keep an explicit guard for clarity/IPv6 forms).
|
||||
if v4 := ip.To4(); v4 != nil {
|
||||
// 0.0.0.0/8 and 100.64.0.0/10 (CGNAT) are also unsafe targets.
|
||||
if v4[0] == 0 {
|
||||
return true
|
||||
}
|
||||
if v4[0] == 100 && v4[1]&0xC0 == 64 {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// ValidateExternalURL parses raw, enforces http(s), and verifies that the host
|
||||
// does not resolve to any disallowed (private/internal) address. It returns the
|
||||
// parsed URL so callers can reuse the normalized form.
|
||||
func ValidateExternalURL(raw string) (*url.URL, error) {
|
||||
u, err := url.Parse(strings.TrimSpace(raw))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("invalid URL: %w", err)
|
||||
}
|
||||
if u.Scheme != "http" && u.Scheme != "https" {
|
||||
return nil, fmt.Errorf("unsupported scheme %q", u.Scheme)
|
||||
}
|
||||
host := u.Hostname()
|
||||
if host == "" {
|
||||
return nil, fmt.Errorf("missing host")
|
||||
}
|
||||
|
||||
// If the host is a literal IP, validate it directly.
|
||||
if ip := net.ParseIP(host); ip != nil {
|
||||
if isDisallowedIP(ip) {
|
||||
return nil, &ErrBlockedHost{Host: host}
|
||||
}
|
||||
return u, nil
|
||||
}
|
||||
|
||||
// Otherwise resolve and validate every returned address.
|
||||
ips, err := net.DefaultResolver.LookupIPAddr(context.Background(), host)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("resolving host: %w", err)
|
||||
}
|
||||
if len(ips) == 0 {
|
||||
return nil, &ErrBlockedHost{Host: host}
|
||||
}
|
||||
for _, addr := range ips {
|
||||
if isDisallowedIP(addr.IP) {
|
||||
return nil, &ErrBlockedHost{Host: host}
|
||||
}
|
||||
}
|
||||
return u, nil
|
||||
}
|
||||
|
||||
// SafeHTTPClient returns an *http.Client hardened against SSRF. A dial-time
|
||||
// Control hook re-validates the resolved IP for every connection, which also
|
||||
// defeats DNS-rebinding (TOCTOU) attacks that pass the up-front check.
|
||||
func SafeHTTPClient(timeout time.Duration) *http.Client {
|
||||
dialer := &net.Dialer{
|
||||
Timeout: 10 * time.Second,
|
||||
KeepAlive: 30 * time.Second,
|
||||
Control: func(_, address string, _ syscall.RawConn) error {
|
||||
host, _, err := net.SplitHostPort(address)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
ip := net.ParseIP(host)
|
||||
if isDisallowedIP(ip) {
|
||||
return &ErrBlockedHost{Host: host}
|
||||
}
|
||||
return nil
|
||||
},
|
||||
}
|
||||
|
||||
transport := &http.Transport{
|
||||
DialContext: dialer.DialContext,
|
||||
ForceAttemptHTTP2: true,
|
||||
MaxIdleConns: 100,
|
||||
IdleConnTimeout: 90 * time.Second,
|
||||
TLSHandshakeTimeout: 10 * time.Second,
|
||||
ExpectContinueTimeout: 1 * time.Second,
|
||||
}
|
||||
|
||||
return &http.Client{
|
||||
Timeout: timeout,
|
||||
Transport: transport,
|
||||
// Re-validate the target on each redirect hop and cap redirect depth.
|
||||
CheckRedirect: func(req *http.Request, via []*http.Request) error {
|
||||
if len(via) >= 5 {
|
||||
return fmt.Errorf("too many redirects")
|
||||
}
|
||||
if _, err := ValidateExternalURL(req.URL.String()); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
},
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user