diff options
| author | Gusted <williamzijl7@hotmail.com> | 2022-06-27 04:20:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-26 21:20:58 -0500 |
| commit | 004859581148bf8f404599e143932236cb8122a5 (patch) | |
| tree | b541ef049bace3e97fd963ac51b335e85a541483 /modules/setting | |
| parent | 5d3f99c7c6d0f2c304dc13c6fa6aa675daf310cc (diff) | |
| download | gitea-004859581148bf8f404599e143932236cb8122a5.tar.gz gitea-004859581148bf8f404599e143932236cb8122a5.zip | |
Remove U2F support (#20141)
- 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.
Diffstat (limited to 'modules/setting')
| -rw-r--r-- | modules/setting/setting.go | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 7be0842b56..5400bf5b9f 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -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) { |