Settings: use existing "migrations" section

Author: 6543

custom/conf/app.example.ini

@@ -1187,6 +1187,12 @@ QUEUE_CONN_STR = "addrs=127.0.0.1:6379 db=0"
 MAX_ATTEMPTS = 3
 ; Backoff time per http/https request retry (seconds)
 RETRY_BACKOFF = 3
+; Allowlist for migrating, default is blank. Blank means everything will be allowed.
+; Multiple domains could be separated by commas.
+ALLOWLISTED_DOMAINS =
+; Blocklist for migrating, default is blank. Multiple domains could be separated by commas.
+; When ALLOWLISTED_DOMAINS is not blank, this option will be ignored.
+BLOCKLISTED_DOMAINS =
 
 ; default storage for attachments, lfs and avatars
 [storage]
@@ -1212,11 +1218,3 @@ STORAGE_TYPE = local
 ;MINIO_LOCATION = us-east-1
 ; Minio enabled ssl only available when STORAGE_TYPE is `minio`
 ;MINIO_USE_SSL = false
-
-[migration]
-; Allowlist for migrating, default is blank. Blank means everything will be allowed.
-; Multiple domains could be separated by commas.
-ALLOWLISTED_DOMAINS =
-; Blocklist for migrating, default is blank. Multiple domains could be separated by commas.
-; When ALLOWLISTED_DOMAINS is not blank, this option will be ignored.
-BLOCKLISTED_DOMAINS =

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -846,6 +846,8 @@ Task queue configuration has been moved to `queue.task`. However, the below conf
 
 - `MAX_ATTEMPTS`: **3**: Max attempts per http/https request on migrations.
 - `RETRY_BACKOFF`: **3**: Backoff time per http/https request retry (seconds)
+- `ALLOWLISTED_DOMAINS`: ****: Domains allowlist for migrating repositories, default is blank. It means everything will be allowed. Multiple domains could be separated by commas.
+- `BLOCKLISTED_DOMAINS`: ****: Domains blocklist for migrating repositories, default is blank. Multiple domains could be separated by commas. When `ALLOWLISTED_DOMAINS` is not blank, this option will be ignored.
 
 ## Mirror (`mirror`)
 
@@ -902,11 +904,6 @@ MINIO_USE_SSL = false
 
 And used by `[attachment]`, `[lfs]` and etc. as `STORAGE_TYPE`.
 
-## Migraions (`migration`)
-
-- `ALLOWLISTED_DOMAINS`: ****: Domains allowlist for migrating repositories, default is blank. It means everything will be allowed. Multiple domains could be separated by commas.
-- `BLOCKLISTED_DOMAINS`: ****: Domains blocklist for migrating repositories, default is blank. Multiple domains could be separated by commas. When `ALLOWLISTED_DOMAINS` is not blank, this option will be ignored.
-
 ## Other (`other`)
 
 - `SHOW_FOOTER_BRANDING`: **false**: Show Gitea branding in the footer.

docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

@@ -313,6 +313,8 @@ IS_INPUT_FILE = false
 
 - `MAX_ATTEMPTS`: **3**: 在迁移过程中的 http/https 请求重试次数。
 - `RETRY_BACKOFF`: **3**: 等待下一次重试的时间，单位秒。
+- `ALLOWLISTED_DOMAINS`: ****: 迁移仓库的域名白名单，默认为空，表示允许从任意域名迁移仓库，多个域名用逗号分隔。
+- `BLOCKLISTED_DOMAINS`: ****: 迁移仓库的域名黑名单，默认为空，多个域名用逗号分隔。如果 `ALLOWLISTED_DOMAINS` 不为空，此选项将会被忽略。
 
 ## LFS (`lfs`)
 
@@ -363,11 +365,6 @@ MINIO_USE_SSL = false
 
 然后你在 `[attachment]`, `[lfs]` 等中可以把这个名字用作 `STORAGE_TYPE` 的值。
 
-## Migraions (`migration`)
-
-- `ALLOWLISTED_DOMAINS`: ****: 迁移仓库的域名白名单，默认为空，表示允许从任意域名迁移仓库，多个域名用逗号分隔。
-- `BLOCKLISTED_DOMAINS`: ****: 迁移仓库的域名黑名单，默认为空，多个域名用逗号分隔。如果 `ALLOWLISTED_DOMAINS` 不为空，此选项将会被忽略。
-
 ## Other (`other`)
 
 - `SHOW_FOOTER_BRANDING`: 为真则在页面底部显示Gitea的字样。

modules/migrations/migrate.go

@@ -37,7 +37,7 @@ func isMigrateURLAllowed(remoteURL string) (bool, error) {
 	}
 
 	if strings.EqualFold(u.Scheme, "http") || strings.EqualFold(u.Scheme, "https") {
-		if len(setting.Migration.AllowlistedDomains) > 0 {
+		if len(setting.Migrations.AllowlistedDomains) > 0 {
 			if !allowlist.Match(u.Host) {
 				return false, fmt.Errorf("Migrate from %v is not allowed", u.Host)
 			}
@@ -345,12 +345,12 @@ var (
 // Init migrations service
 func Init() error {
 	var err error
-	allowlist, err = matchlist.NewMatchlist(setting.Migration.AllowlistedDomains...)
+	allowlist, err = matchlist.NewMatchlist(setting.Migrations.AllowlistedDomains...)
 	if err != nil {
 		return fmt.Errorf("init migration allowlist domains failed: %v", err)
 	}
 
-	blocklist, err = matchlist.NewMatchlist(setting.Migration.BlocklistedDomains...)
+	blocklist, err = matchlist.NewMatchlist(setting.Migrations.BlocklistedDomains...)
 	if err != nil {
 		return fmt.Errorf("init migration blocklist domains failed: %v", err)
 	}

modules/migrations/migrate_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func TestMigrateWhiteBlocklist(t *testing.T) {
-	setting.Migration.AllowlistedDomains = []string{"github.com"}
+	setting.Migrations.AllowlistedDomains = []string{"github.com"}
 	assert.NoError(t, Init())
 
 	allowed, err := isMigrateURLAllowed("https://gitlab.com/gitlab/gitlab.git")
@@ -24,8 +24,8 @@ func TestMigrateWhiteBlocklist(t *testing.T) {
 	assert.True(t, allowed)
 	assert.NoError(t, err)
 
-	setting.Migration.AllowlistedDomains = []string{}
-	setting.Migration.BlocklistedDomains = []string{"github.com"}
+	setting.Migrations.AllowlistedDomains = []string{}
+	setting.Migrations.BlocklistedDomains = []string{"github.com"}
 	assert.NoError(t, Init())
 
 	allowed, err = isMigrateURLAllowed("https://gitlab.com/gitlab/gitlab.git")

modules/setting/migrate.go

@@ -7,8 +7,10 @@ package setting
 var (
 	// Migrations settings
 	Migrations = struct {
-		MaxAttempts  int
-		RetryBackoff int
+		MaxAttempts        int
+		RetryBackoff       int
+		AllowlistedDomains []string
+		BlocklistedDomains []string
 	}{
 		MaxAttempts:  3,
 		RetryBackoff: 3,
@@ -19,4 +21,7 @@ func newMigrationsService() {
 	sec := Cfg.Section("migrations")
 	Migrations.MaxAttempts = sec.Key("MAX_ATTEMPTS").MustInt(Migrations.MaxAttempts)
 	Migrations.RetryBackoff = sec.Key("RETRY_BACKOFF").MustInt(Migrations.RetryBackoff)
+
+	Migrations.AllowlistedDomains = sec.Key("ALLOWLISTED_DOMAINS").Strings(",")
+	Migrations.BlocklistedDomains = sec.Key("BLOCKLISTED_DOMAINS").Strings(",")
 }