sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Make sure we use the correct login stages

Browse source
This commit is contained in:
Till Faelligen 2022-02-15 14:13:22 +01:00
parent f8bebe5e5a
commit cbdbbb0839
1 changed files with 46 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
setup/config/config.go
View file

@ -263,6 +263,21 @@ func loadConfig(
return &c, nil return &c, nil
} }
type Terms struct {
Policies Policies `json:"policies"`
}
type En struct {
Name string `json:"name"`
URL string `json:"url"`
}
type PrivacyPolicy struct {
En En `json:"en"`
Version string `json:"version"`
}
type Policies struct {
PrivacyPolicy PrivacyPolicy `json:"privacy_policy"`
}
// Derive generates data that is derived from various values provided in // Derive generates data that is derived from various values provided in
// the config file. // the config file.
func (config *Dendrite) Derive() error { func (config *Dendrite) Derive() error {
@ -273,13 +288,39 @@ func (config *Dendrite) Derive() error {
// TODO: Add email auth type // TODO: Add email auth type
// TODO: Add MSISDN auth type // TODO: Add MSISDN auth type
if config.Global.UserConsentOptions.RequireAtRegistration {
uri := config.Global.BaseURL + "/_matrix/consent?v=" + config.Global.UserConsentOptions.Version
config.Derived.Registration.Params[authtypes.LoginTypeTerms] = Terms{
Policies: Policies{
PrivacyPolicy: PrivacyPolicy{
En: En{
Name: config.Global.UserConsentOptions.PolicyName,
URL: uri,
},
Version: config.Global.UserConsentOptions.Version,
},
},
}
}
if config.ClientAPI.RecaptchaEnabled { if config.ClientAPI.RecaptchaEnabled {
config.Derived.Registration.Params[authtypes.LoginTypeRecaptcha] = map[string]string{"public_key": config.ClientAPI.RecaptchaPublicKey} config.Derived.Registration.Params[authtypes.LoginTypeRecaptcha] = map[string]string{"public_key": config.ClientAPI.RecaptchaPublicKey}
config.Derived.Registration.Flows = append(config.Derived.Registration.Flows, }
authtypes.Flow{Stages: []authtypes.LoginType{authtypes.LoginTypeRecaptcha}})
} else { if config.Derived.Registration.Flows == nil {
config.Derived.Registration.Flows = append(config.Derived.Registration.Flows, config.Derived.Registration.Flows = append(config.Derived.Registration.Flows, authtypes.Flow{
authtypes.Flow{Stages: []authtypes.LoginType{authtypes.LoginTypeDummy}}) Stages: []authtypes.LoginType{authtypes.LoginTypeDummy},
})
}
// prepend each flow with LoginTypeTerms or LoginTypeRecaptcha
for i, flow := range config.Derived.Registration.Flows {
if config.Global.UserConsentOptions.RequireAtRegistration {
flow.Stages = append([]authtypes.LoginType{authtypes.LoginTypeTerms}, flow.Stages...)
}
if config.ClientAPI.RecaptchaEnabled {
flow.Stages = append([]authtypes.LoginType{authtypes.LoginTypeRecaptcha}, flow.Stages...)
}
config.Derived.Registration.Flows[i] = flow
} }
// Load application service configuration files // Load application service configuration files