can set puppet id encryption in the config.yaml
This commit is contained in:
parent
be7c67981b
commit
b62a28ef64
|
@ -61,6 +61,12 @@ type BridgeConfig struct {
|
||||||
RequireCrossSigning bool `yaml:"require_cross_signing"`
|
RequireCrossSigning bool `yaml:"require_cross_signing"`
|
||||||
RequireVerification bool `yaml:"require_verification"`
|
RequireVerification bool `yaml:"require_verification"`
|
||||||
} `yaml:"key_sharing"`
|
} `yaml:"key_sharing"`
|
||||||
|
|
||||||
|
PuppetId struct {
|
||||||
|
Allow bool `yaml:"allow"`
|
||||||
|
Key string `yaml:"key"`
|
||||||
|
UsernameTemplatePrefix string `yaml:"username_template_prefix"`
|
||||||
|
} `yaml:"puppet_id"`
|
||||||
} `yaml:"encryption"`
|
} `yaml:"encryption"`
|
||||||
|
|
||||||
Permissions PermissionConfig `yaml:"permissions"`
|
Permissions PermissionConfig `yaml:"permissions"`
|
||||||
|
|
|
@ -99,10 +99,10 @@ func (config *Config) MakeAppService() (*appservice.AppService, error) {
|
||||||
as.HomeserverURL = config.Homeserver.Address
|
as.HomeserverURL = config.Homeserver.Address
|
||||||
as.Host.Hostname = config.AppService.Hostname
|
as.Host.Hostname = config.AppService.Hostname
|
||||||
as.Host.Port = config.AppService.Port
|
as.Host.Port = config.AppService.Port
|
||||||
patch.ThirdPartyIdEncrypt = true
|
patch.ThirdPartyIdEncrypt = config.Bridge.Encryption.PuppetId.Allow
|
||||||
patch.AsBotName = config.AppService.Bot.Username
|
patch.AsBotName = config.AppService.Bot.Username
|
||||||
patch.AsUserPrefix = "skype&"
|
patch.AsUserPrefix = config.Bridge.Encryption.PuppetId.UsernameTemplatePrefix
|
||||||
patch.XorKey = "hudsds1y"
|
patch.XorKey = config.Bridge.Encryption.PuppetId.Key
|
||||||
var err error
|
var err error
|
||||||
as.Registration, err = config.GetRegistration()
|
as.Registration, err = config.GetRegistration()
|
||||||
return as, err
|
return as, err
|
||||||
|
|
|
@ -168,6 +168,14 @@ bridge:
|
||||||
# It is recommended to also set private_chat_portal_meta to true when using this.
|
# It is recommended to also set private_chat_portal_meta to true when using this.
|
||||||
default: false
|
default: false
|
||||||
|
|
||||||
|
puppet_id:
|
||||||
|
# when set to true, the matrixid of the contact (puppet) from the bridge to the matrix will be encrypted into another string
|
||||||
|
default: false
|
||||||
|
# 8 characters
|
||||||
|
key: '12dsf323'
|
||||||
|
# Use the username_template prefix. (Warning: At present, username_template cannot be too complicated, otherwise this function may cause unknown errors)
|
||||||
|
username_template_prefix: 'skype&'
|
||||||
|
|
||||||
# Permissions for using the bridge.
|
# Permissions for using the bridge.
|
||||||
# Permitted values:
|
# Permitted values:
|
||||||
# relaybot - Talk through the relaybot (if enabled), no access otherwise
|
# relaybot - Talk through the relaybot (if enabled), no access otherwise
|
||||||
|
|
2
go.mod
2
go.mod
|
@ -18,4 +18,4 @@ require (
|
||||||
maunium.net/go/mautrix v0.8.0-rc.4
|
maunium.net/go/mautrix v0.8.0-rc.4
|
||||||
)
|
)
|
||||||
|
|
||||||
replace maunium.net/go/mautrix => github.com/pidongqianqian/mautrix-go v0.8.0-rc.4.0.20201126070406-7b13ac473bcc
|
replace maunium.net/go/mautrix => github.com/pidongqianqian/mautrix-go v0.8.0-rc.4.0.20201208081810-787323a21113
|
||||||
|
|
Loading…
Reference in New Issue