add x-real-ip forwarder & fix ua changer

Signed-off-by: Yonle <[email protected]>

Author: Yonle

config.example.yaml

@@ -31,3 +31,6 @@ max_connections_per_ip: 3
 
 # user agent to use on connecting to upstream
 user_agent: bostr2 (https://codeberg.org/Yonle/bostr2) on wss://bostr.example.com - nostr relay proxy aggregator
+
+# whenever forward client ip to upstream.
+forward_client_ip: false

config.go

@@ -16,7 +16,8 @@ type Config struct {
 	NIP_11              map[string]interface{} `yaml:"nip_11"`
 	Favicon             string
 	MaxConnectionsPerIP int    `yaml:"max_connections_per_ip"`
-	UserAgent           string `yaml:"user-agent"`
+	UserAgent           string `yaml:"user_agent"`
+	ForwardClientIP     bool   `yaml:"forward_client_ip"`
 }
 
 //go:embed config.example.yaml

http.go

@@ -109,9 +109,9 @@ func LoadFavicon() {
 }
 
 func ConfigureRelayHandler() {
-	h := http.Header{}
-	h.Add("User-Agent", config.UserAgent)
-	relayHandler.DialOptions.HTTPHeader = h
+	if len(config.UserAgent) > 0 {
+		relayHandler.UserAgent = config.UserAgent
+	}
 }
 
 func Serve() {

relayHandler/relayHandler.go

@@ -5,9 +5,10 @@ import (
 	"github.com/coder/websocket"
 )
 
-func NewSession(ctx context.Context) RelaySession {
+func NewSession(ctx context.Context, ip string) RelaySession {
 	return RelaySession{
-		ctx: ctx,
+		ctx:      ctx,
+		clientIP: ip,
 
 		relays: make(SessionRelays),
 

relayHandler/session.go

@@ -3,6 +3,7 @@ package relayHandler
 import (
 	"context"
 	"encoding/json"
+	"net/http"
 	"sync"
 	"time"
 
@@ -18,7 +19,8 @@ type RelaySession struct {
 	wg  sync.WaitGroup
 	mu  sync.RWMutex
 
-	relays SessionRelays
+	clientIP string
+	relays   SessionRelays
 
 	UpEVENT     MessageChan
 	UpEOSE      MessageChan
@@ -27,7 +29,7 @@ type RelaySession struct {
 	HowManyRelaysAreConnected int
 }
 
-var DialOptions = &websocket.DialOptions{}
+var UserAgent string = "bostr2 (https://codeberg.org/Yonle/bostr2) - nostr relay proxy aggregator"
 
 func (s *RelaySession) Init(r []string) {
 	s.wg.Add(len(r))
@@ -39,6 +41,16 @@ func (s *RelaySession) Init(r []string) {
 func (s *RelaySession) connect(url string) {
 	defer s.wg.Done()
 
+	h := http.Header{}
+	h.Add("User-Agent", UserAgent)
+	if len(s.clientIP) > 0 {
+		h.Add("X-Real-IP", s.clientIP)
+	}
+
+	DialOptions := &websocket.DialOptions{
+		HTTPHeader: h,
+	}
+
 listener:
 	for {
 		dialCtx, dialCancel := context.WithTimeout(s.ctx, 5*time.Second)

websocket.go

@@ -50,7 +50,12 @@ func Accept_Websocket(w http.ResponseWriter, r *http.Request, ip string, ua stri
 
 	go pingpong.Stare(ctx, cancel, conn)
 
-	var relaySession = relayHandler.NewSession(ctx)
+	var ip2up string
+	if config.ForwardClientIP {
+		ip2up = ip
+	}
+
+	var relaySession = relayHandler.NewSession(ctx, ip2up)
 	var s = Session{
 		ClientIP: ip,