Add a separate proxy configuration option for Bridge -> HS

duo · Mar 3, 2023 · 9b88db0 · 9b88db0
1 parent d3c7c3f
commit 9b88db0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git a/example-config.yaml b/example-config.yaml
@@ -71,6 +71,8 @@ appservice:
 
 # Bridge config
 bridge:
+    # Proxy for homeserver connection.
+    hs_proxy:
     # Localpart template of MXIDs for WeChat users.
     username_template: _wechat_{{.}}
     # Displayname template for WeChat users.

diff --git a/internal/config/bridgeconfig.go b/internal/config/bridgeconfig.go
@@ -18,6 +18,8 @@ const (
 )
 
 type BridgeConfig struct {
+	HomeserverProxy string `yaml:"hs_proxy"`
+
 	UsernameTemplate    string `yaml:"username_template"`
 	DisplaynameTemplate string `yaml:"displayname_template"`
 	ListenAddress       string `yaml:"listen_address"`

diff --git a/internal/config/upgrade.go b/internal/config/upgrade.go
@@ -9,6 +9,7 @@ import (
 func DoUpgrade(helper *up.Helper) {
 	bridgeconfig.Upgrader.DoUpgrade(helper)
 
+	helper.Copy(up.Str, "bridge", "hs_proxy")
 	helper.Copy(up.Str, "bridge", "username_template")
 	helper.Copy(up.Str, "bridge", "displayname_template")
 	helper.Copy(up.Str, "bridge", "listen_address")

diff --git a/internal/wechat/service.go b/internal/wechat/service.go
@@ -265,6 +265,7 @@ func (ws *WechatService) getConn(client *WechatClient) *Conn {
 	if conn, ok := ws.conns[client.getConnKey()]; ok {
 		return conn
 	} else {
+		// a better connection pick?
 		for k, v := range ws.conns {
 			client.setConnKey(k)
 			return v

diff --git a/internal/wechatbridge.go b/internal/wechatbridge.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"net/http"
+	"net/url"
 	"os"
 	"sync"
 	"time"
@@ -101,6 +103,14 @@ func (br *WechatBridge) Init() {
 	)
 
 	br.WebsocketHandler = NewWebsocketCommandHandler(br)
+
+	if br.Config.Bridge.HomeserverProxy != "" {
+		if proxyUrl, err := url.Parse(br.Config.Bridge.HomeserverProxy); err != nil {
+			br.Log.Warnfln("Failed to parse bridge.hs_proxy: %v", err)
+		} else {
+			br.AS.HTTPClient.Transport = &http.Transport{Proxy: http.ProxyURL(proxyUrl)}
+		}
+	}
 }
 
 func (br *WechatBridge) Start() {