finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove U2F support (#20141)

Browse source 
- Completely remove U2F support from 1.18.0, 1.17.0 will be the last
release that U2F is somewhat supported. Users who used U2F would already
be warned about using U2F for a while now and should hopefully already
be migrated. But starting 1.18 definitely remove it.
This commit is contained in:
Gusted 2022-06-27 04:20:58 +02:00 • committed by GitHub
parent 5d3f99c7c6
commit 0048595811
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 4 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/setting/setting.go
View file

@ -402,11 +402,6 @@ var (
MaxTokenLength: math.MaxInt16,
}
// FIXME: DEPRECATED to be removed in v1.18.0
U2F = struct {
AppID string
}{}
// Metrics settings
Metrics = struct {
Enabled bool
@ -1103,16 +1098,6 @@ func loadFromConf(allowEmpty bool, extraConfig string) {
for _, emoji := range UI.CustomEmojis {
UI.CustomEmojisMap[emoji] = ":" + emoji + ":"
}
// FIXME: DEPRECATED to be removed in v1.18.0
U2F.AppID = strings.TrimSuffix(AppURL, "/")
if Cfg.Section("U2F").HasKey("APP_ID") {
log.Error("Deprecated setting `[U2F]` `APP_ID` present. This fallback will be removed in v1.18.0")
U2F.AppID = Cfg.Section("U2F").Key("APP_ID").MustString(strings.TrimSuffix(AppURL, "/"))
} else if Cfg.Section("u2f").HasKey("APP_ID") {
log.Error("Deprecated setting `[u2]` `APP_ID` present. This fallback will be removed in v1.18.0")
U2F.AppID = Cfg.Section("u2f").Key("APP_ID").MustString(strings.TrimSuffix(AppURL, "/"))
}
}
func parseAuthorizedPrincipalsAllow(values []string) ([]string, bool) {