Update Mautrix + deps & debug API

config/bridge.go

@@ -80,9 +80,7 @@ type BridgeConfig struct {
 	DefaultBridgeReceipts bool `yaml:"default_bridge_receipts"`
 	DefaultBridgePresence bool `yaml:"default_bridge_presence"`
 
-	DoublePuppetServerMap      map[string]string `yaml:"double_puppet_server_map"`
-	DoublePuppetAllowDiscovery bool              `yaml:"double_puppet_allow_discovery"`
-	LoginSharedSecretMap       map[string]string `yaml:"login_shared_secret_map"`
+	DoublePuppetConfig bridgeconfig.DoublePuppetConfig `yaml:",inline"`
 
 	MessageHandlingTimeout struct {
 		ErrorAfterStr string `yaml:"error_after"`
@@ -95,8 +93,9 @@ type BridgeConfig struct {
 	Encryption bridgeconfig.EncryptionConfig `yaml:"encryption"`
 
 	Provisioning struct {
-		Prefix       string `yaml:"prefix"`
-		SharedSecret string `yaml:"shared_secret"`
+		Prefix         string `yaml:"prefix"`
+		SharedSecret   string `yaml:"shared_secret"`
+		DebugEndpoints bool   `yaml:"debug_endpoints"`
 	} `yaml:"provisioning"`
 
 	Permissions bridgeconfig.PermissionConfig `yaml:"permissions"`
@@ -154,6 +153,10 @@ func (bc *BridgeConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
 
 var _ bridgeconfig.BridgeConfig = (*BridgeConfig)(nil)
 
+func (bc BridgeConfig) GetDoublePuppetConfig() bridgeconfig.DoublePuppetConfig {
+	return bc.DoublePuppetConfig
+}
+
 func (bc BridgeConfig) GetEncryptionConfig() bridgeconfig.EncryptionConfig {
 	return bc.Encryption
 }

config/config.go

@@ -29,7 +29,7 @@ type Config struct {
 
 func (config *Config) CanAutoDoublePuppet(userID id.UserID) bool {
 	_, homeserver, _ := userID.Parse()
-	_, hasSecret := config.Bridge.LoginSharedSecretMap[homeserver]
+	_, hasSecret := config.Bridge.DoublePuppetConfig.SharedSecretMap[homeserver]
 
 	return hasSecret
 }

config/upgrade.go

@@ -17,9 +17,9 @@
 package config
 
 import (
+	up "go.mau.fi/util/configupgrade"
+	"go.mau.fi/util/random"
 	"maunium.net/go/mautrix/bridge/bridgeconfig"
-	"maunium.net/go/mautrix/util"
-	up "maunium.net/go/mautrix/util/configupgrade"
 )
 
 func DoUpgrade(helper *up.Helper) {
@@ -50,7 +50,13 @@ func DoUpgrade(helper *up.Helper) {
 	helper.Copy(up.Bool, "bridge", "default_bridge_presence")
 	helper.Copy(up.Map, "bridge", "double_puppet_server_map")
 	helper.Copy(up.Bool, "bridge", "double_puppet_allow_discovery")
-	helper.Copy(up.Map, "bridge", "login_shared_secret_map")
+	if legacySecret, ok := helper.Get(up.Str, "bridge", "login_shared_secret"); ok && len(legacySecret) > 0 {
+		baseNode := helper.GetBaseNode("bridge", "login_shared_secret_map")
+		baseNode.Map[helper.GetBase("homeserver", "domain")] = up.StringNode(legacySecret)
+		baseNode.UpdateContent()
+	} else {
+		helper.Copy(up.Map, "bridge", "login_shared_secret_map")
+	}
 	helper.Copy(up.Map, "bridge", "message_handling_timeout")
 	helper.Copy(up.Str, "bridge", "command_prefix")
 	helper.Copy(up.Str, "bridge", "management_room_text", "welcome")
@@ -85,11 +91,12 @@ func DoUpgrade(helper *up.Helper) {
 
 	helper.Copy(up.Str, "bridge", "provisioning", "prefix")
 	if secret, ok := helper.Get(up.Str, "bridge", "provisioning", "shared_secret"); !ok || secret == "generate" {
-		sharedSecret := util.RandomString(64)
+		sharedSecret := random.String(64)
 		helper.Set(up.Str, sharedSecret, "bridge", "provisioning", "shared_secret")
 	} else {
 		helper.Copy(up.Str, "bridge", "provisioning", "shared_secret")
 	}
+	helper.Copy(up.Bool, "bridge", "provisioning", "debug_endpoints")
 
 	helper.Copy(up.Map, "bridge", "permissions")
 	//helper.Copy(up.Bool, "bridge", "relay", "enabled")

custompuppet.go

@@ -44,11 +44,11 @@ func (br *SlackBridge) newDoublePuppetClient(mxid id.UserID, accessToken string)
 		return nil, err
 	}
 
-	homeserverURL, found := br.Config.Bridge.DoublePuppetServerMap[homeserver]
+	homeserverURL, found := br.Config.Bridge.DoublePuppetConfig.ServerMap[homeserver]
 	if !found {
 		if homeserver == br.AS.HomeserverDomain {
 			homeserverURL = ""
-		} else if br.Config.Bridge.DoublePuppetAllowDiscovery {
+		} else if br.Config.Bridge.DoublePuppetConfig.AllowDiscovery {
 			resp, err := mautrix.DiscoverClientAPI(homeserver)
 			if err != nil {
 				return nil, fmt.Errorf("failed to find homeserver URL for %s: %v", homeserver, err)
@@ -173,7 +173,7 @@ func (puppet *Puppet) LoadRoom(_ id.RoomID) *mautrix.Room {
 // /////////////////////////////////////////////////////////////////////////////
 // additional puppet api
 // /////////////////////////////////////////////////////////////////////////////
-func (puppet *Puppet) clearCustomMXID() {
+func (puppet *Puppet) ClearCustomMXID() {
 	puppet.CustomMXID = ""
 	puppet.AccessToken = ""
 	puppet.customIntent = nil
@@ -204,29 +204,29 @@ func (puppet *Puppet) newCustomIntent() (*appservice.IntentAPI, error) {
 
 func (puppet *Puppet) StartCustomMXID(reloginOnFail bool) error {
 	if puppet.CustomMXID == "" {
-		puppet.clearCustomMXID()
+		puppet.ClearCustomMXID()
 
 		return nil
 	}
 
 	intent, err := puppet.newCustomIntent()
 	if err != nil {
-		puppet.clearCustomMXID()
+		puppet.ClearCustomMXID()
 
 		return err
 	}
 
 	resp, err := intent.Whoami()
 	if err != nil {
 		if !reloginOnFail || (errors.Is(err, mautrix.MUnknownToken) && !puppet.tryRelogin(err, "initializing double puppeting")) {
-			puppet.clearCustomMXID()
+			puppet.ClearCustomMXID()
 
 			return err
 		}
 
 		intent.AccessToken = puppet.AccessToken
 	} else if resp.UserID != puppet.CustomMXID {
-		puppet.clearCustomMXID()
+		puppet.ClearCustomMXID()
 
 		return ErrMismatchingMXID
 	}
@@ -287,7 +287,7 @@ func (puppet *Puppet) loginWithSharedSecret(mxid id.UserID, teamID string) (stri
 
 	puppet.log.Debugfln("Logging into %s with shared secret", mxid)
 
-	loginSecret := puppet.bridge.Config.Bridge.LoginSharedSecretMap[homeserver]
+	loginSecret := puppet.bridge.Config.Bridge.DoublePuppetConfig.SharedSecretMap[homeserver]
 
 	client, err := puppet.bridge.newDoublePuppetClient(mxid, "")
 	if err != nil {

database/attachment.go

@@ -22,8 +22,8 @@ import (
 
 	log "maunium.net/go/maulogger/v2"
 
+	"go.mau.fi/util/dbutil"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 )
 
 type Attachment struct {

database/backfill.go

@@ -22,7 +22,7 @@ import (
 
 	log "maunium.net/go/maulogger/v2"
 
-	"maunium.net/go/mautrix/util/dbutil"
+	"go.mau.fi/util/dbutil"
 )
 
 type BackfillQuery struct {

database/database.go

@@ -23,7 +23,7 @@ import (
 	_ "github.com/lib/pq"
 	_ "github.com/mattn/go-sqlite3"
 
-	"maunium.net/go/mautrix/util/dbutil"
+	"go.mau.fi/util/dbutil"
 
 	"go.mau.fi/mautrix-slack/database/upgrades"
 	"maunium.net/go/maulogger/v2"

database/emoji.go

@@ -5,8 +5,8 @@ import (
 
 	log "maunium.net/go/maulogger/v2"
 
+	"go.mau.fi/util/dbutil"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 )
 
 type EmojiQuery struct {

database/message.go

@@ -22,8 +22,8 @@ import (
 
 	log "maunium.net/go/maulogger/v2"
 
+	"go.mau.fi/util/dbutil"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 )
 
 type Message struct {

database/portal.go

@@ -21,8 +21,8 @@ import (
 
 	log "maunium.net/go/maulogger/v2"
 
+	"go.mau.fi/util/dbutil"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 )
 
 type ChannelType int64

database/puppet.go

@@ -21,8 +21,8 @@ import (
 
 	log "maunium.net/go/maulogger/v2"
 
+	"go.mau.fi/util/dbutil"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 )
 
 const (

database/reaction.go

@@ -22,8 +22,8 @@ import (
 
 	log "maunium.net/go/maulogger/v2"
 
+	"go.mau.fi/util/dbutil"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 )
 
 type Reaction struct {

database/teaminfo.go

@@ -21,8 +21,8 @@ import (
 
 	log "maunium.net/go/maulogger/v2"
 
+	"go.mau.fi/util/dbutil"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 )
 
 type TeamInfoQuery struct {

database/upgrades/upgrades.go

@@ -20,7 +20,7 @@ import (
 	"embed"
 	"errors"
 
-	"maunium.net/go/mautrix/util/dbutil"
+	"go.mau.fi/util/dbutil"
 )
 
 var Table dbutil.UpgradeTable

database/user.go

@@ -22,8 +22,8 @@ import (
 
 	log "maunium.net/go/maulogger/v2"
 
+	"go.mau.fi/util/dbutil"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 )
 
 type User struct {

database/userteam.go

@@ -22,8 +22,8 @@ import (
 
 	log "maunium.net/go/maulogger/v2"
 
+	"go.mau.fi/util/dbutil"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util/dbutil"
 
 	"github.com/slack-go/slack"
 )

example-config.yaml

@@ -265,6 +265,8 @@ bridge:
         # Shared secret for authentication. If set to "generate", a random secret will be generated,
         # or if set to "disable", the provisioning API will be disabled.
         shared_secret: generate
+        # Enable debug API at /debug with provisioning authentication.
+        debug_endpoints: false
 
     # Permissions for using the bridge.
     # Permitted values:

formatter.go

@@ -29,10 +29,10 @@ import (
 	"github.com/yuin/goldmark/text"
 	goldmarkUtil "github.com/yuin/goldmark/util"
 	"go.mau.fi/mautrix-slack/database"
+	"go.mau.fi/util/exmime"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/format"
 	"maunium.net/go/mautrix/id"
-	"maunium.net/go/mautrix/util"
 )
 
 var escapeFixer = regexp.MustCompile(`\\(__[^_]|\*\*[^*])`)
@@ -79,7 +79,7 @@ func (portal *Portal) renderSlackFile(file slack.File) event.MessageEventContent
 			content.Body = mimeClass
 		}
 
-		content.Body += util.ExtensionFromMimetype(file.Mimetype)
+		content.Body += exmime.ExtensionFromMimetype(file.Mimetype)
 	}
 
 	if strings.HasPrefix(file.Mimetype, "image") {

go.mod

@@ -5,28 +5,30 @@ go 1.19
 require (
 	github.com/gorilla/websocket v1.5.0
 	github.com/lib/pq v1.10.9
-	github.com/mattn/go-sqlite3 v1.14.17
+	github.com/mattn/go-sqlite3 v1.14.18
 	github.com/slack-go/slack v0.10.3
-	github.com/yuin/goldmark v1.5.4
+	github.com/yuin/goldmark v1.6.0
 	maunium.net/go/maulogger/v2 v2.4.1
-	maunium.net/go/mautrix v0.15.4
+	maunium.net/go/mautrix v0.16.2
 )
 
+require go.mau.fi/util v0.2.1
+
 require (
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/rs/zerolog v1.29.1 // indirect
-	github.com/tidwall/gjson v1.14.4 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/rs/zerolog v1.31.0 // indirect
+	github.com/tidwall/gjson v1.17.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
 	go.mau.fi/zeroconfig v0.1.2 // indirect
-	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
-	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
+	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	maunium.net/go/mauflag v1.0.0 // indirect