rename setting options

Author: 6543

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

@@ -846,8 +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`: **\<empty\>**: Domains allowlist for migrating repositories, default is blank. It means everything will be allowed. Multiple domains could be separated by commas.
-- `BLOCKLISTED_DOMAINS`: **\<empty\>**: 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.
+- `ALLOWED_DOMAINS`: **\<empty\>**: Domains allowlist for migrating repositories, default is blank. It means everything will be allowed. Multiple domains could be separated by commas.
+- `BLOCKED_DOMAINS`: **\<empty\>**: Domains blocklist for migrating repositories, default is blank. Multiple domains could be separated by commas. When `ALLOWED_DOMAINS` is not blank, this option will be ignored.
 - `ALLOW_LOCALNETWORKS`: **false**: Allow private addresses defined by RFC 1918, RFC 1122, RFC 4632 and RFC 4291
 
 ## Mirror (`mirror`)

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

@@ -313,8 +313,8 @@ IS_INPUT_FILE = false
 
 - `MAX_ATTEMPTS`: **3**: 在迁移过程中的 http/https 请求重试次数。
 - `RETRY_BACKOFF`: **3**: 等待下一次重试的时间，单位秒。
-- `ALLOWLISTED_DOMAINS`: **\<empty\>**: 迁移仓库的域名白名单，默认为空，表示允许从任意域名迁移仓库，多个域名用逗号分隔。
-- `BLOCKLISTED_DOMAINS`: **\<empty\>**: 迁移仓库的域名黑名单，默认为空，多个域名用逗号分隔。如果 `ALLOWLISTED_DOMAINS` 不为空，此选项将会被忽略。
+- `ALLOWED_DOMAINS`: **\<empty\>**: 迁移仓库的域名白名单，默认为空，表示允许从任意域名迁移仓库，多个域名用逗号分隔。
+- `BLOCKED_DOMAINS`: **\<empty\>**: 迁移仓库的域名黑名单，默认为空，多个域名用逗号分隔。如果 `ALLOWED_DOMAINS` 不为空，此选项将会被忽略。
 - `ALLOW_LOCALNETWORKS`: **false**: Allow private addresses defined by RFC 1918
 
 ## LFS (`lfs`)

modules/migrations/migrate.go

@@ -41,7 +41,7 @@ func isMigrateURLAllowed(remoteURL string) error {
 	}
 
 	if strings.EqualFold(u.Scheme, "http") || strings.EqualFold(u.Scheme, "https") {
-		if len(setting.Migrations.AllowlistedDomains) > 0 {
+		if len(setting.Migrations.AllowedDomains) > 0 {
 			if !allowList.Match(u.Host) {
 				return &models.ErrMigrationNotAllowed{Host: u.Host}
 			}
@@ -356,12 +356,12 @@ func migrateRepository(downloader base.Downloader, uploader base.Uploader, opts
 // Init migrations service
 func Init() error {
 	var err error
-	allowList, err = matchlist.NewMatchlist(setting.Migrations.AllowlistedDomains...)
+	allowList, err = matchlist.NewMatchlist(setting.Migrations.AllowedDomains...)
 	if err != nil {
 		return fmt.Errorf("init migration allowList domains failed: %v", err)
 	}
 
-	blockList, err = matchlist.NewMatchlist(setting.Migrations.BlocklistedDomains...)
+	blockList, err = matchlist.NewMatchlist(setting.Migrations.BlockedDomains...)
 	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.Migrations.AllowlistedDomains = []string{"github.com"}
+	setting.Migrations.AllowedDomains = []string{"github.com"}
 	assert.NoError(t, Init())
 
 	err := isMigrateURLAllowed("https://gitlab.com/gitlab/gitlab.git")
@@ -22,8 +22,8 @@ func TestMigrateWhiteBlocklist(t *testing.T) {
 	err = isMigrateURLAllowed("https://github.com/go-gitea/gitea.git")
 	assert.NoError(t, err)
 
-	setting.Migrations.AllowlistedDomains = []string{}
-	setting.Migrations.BlocklistedDomains = []string{"github.com"}
+	setting.Migrations.AllowedDomains = []string{}
+	setting.Migrations.BlockedDomains = []string{"github.com"}
 	assert.NoError(t, Init())
 
 	err = isMigrateURLAllowed("https://gitlab.com/gitlab/gitlab.git")

modules/setting/migrations.go

@@ -13,8 +13,8 @@ var (
 	Migrations = struct {
 		MaxAttempts        int
 		RetryBackoff       int
-		AllowlistedDomains []string
-		BlocklistedDomains []string
+		AllowedDomains     []string
+		BlockedDomains     []string
 		AllowLocalNetworks bool
 	}{
 		MaxAttempts:  3,
@@ -27,13 +27,13 @@ func newMigrationsService() {
 	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(",")
-	for i := range Migrations.AllowlistedDomains {
-		Migrations.AllowlistedDomains[i] = strings.ToLower(Migrations.AllowlistedDomains[i])
+	Migrations.AllowedDomains = sec.Key("ALLOWED_DOMAINS").Strings(",")
+	for i := range Migrations.AllowedDomains {
+		Migrations.AllowedDomains[i] = strings.ToLower(Migrations.AllowedDomains[i])
 	}
-	Migrations.BlocklistedDomains = sec.Key("BLOCKLISTED_DOMAINS").Strings(",")
-	for i := range Migrations.BlocklistedDomains {
-		Migrations.BlocklistedDomains[i] = strings.ToLower(Migrations.BlocklistedDomains[i])
+	Migrations.BlockedDomains = sec.Key("BLOCKED_DOMAINS").Strings(",")
+	for i := range Migrations.BlockedDomains {
+		Migrations.BlockedDomains[i] = strings.ToLower(Migrations.BlockedDomains[i])
 	}
 
 	Migrations.AllowLocalNetworks = sec.Key("ALLOW_LOCALNETWORKS").MustBool(false)