[优化] POW 与 WAF 合并

openflare_server/model/database_schema_version.go

@@ -4,7 +4,7 @@ import "time"
 
 const (
 	legacyDatabaseSchemaVersion  = 1
-	currentDatabaseSchemaVersion = 13
+	currentDatabaseSchemaVersion = 14
 	databaseSchemaVersionRowID   = 1
 )
 

openflare_server/model/migrations.go

@@ -1413,6 +1413,8 @@ func ensureDefaultWAFRuleGroup(db *gorm.DB) error {
 		CountryBlacklist:  "[]",
 		RegionWhitelist:   "[]",
 		RegionBlacklist:   "[]",
+		PoWEnabled:        false,
+		PoWConfig:         "{}",
 		BlockResponseBody: "",
 	}
 	if err := db.Create(&group).Error; err != nil {
@@ -1449,6 +1451,27 @@ func validateDatabaseSchemaV13(db *gorm.DB, backend string) error {
 	return nil
 }
 
+// migrateV14 adds PoW policy fields to WAF rule groups.
+func migrateV14(db *gorm.DB, backend string) error {
+	if err := applyCurrentSchema(db, backend); err != nil {
+		return err
+	}
+	return ensureDefaultWAFRuleGroup(db)
+}
+
+func validateDatabaseSchemaV14(db *gorm.DB, backend string) error {
+	if err := validateDatabaseSchemaV13(db, backend); err != nil {
+		return err
+	}
+	if !db.Migrator().HasColumn(&WAFRuleGroup{}, "pow_enabled") {
+		return fmt.Errorf("column waf_rule_groups.pow_enabled is missing")
+	}
+	if !db.Migrator().HasColumn(&WAFRuleGroup{}, "pow_config") {
+		return fmt.Errorf("column waf_rule_groups.pow_config is missing")
+	}
+	return nil
+}
+
 func databaseSchemaMigrations() []databaseSchemaMigration {
 	return []databaseSchemaMigration{
 		{fromVersion: 1, toVersion: 2, migrate: migrateV2, validate: validateDatabaseSchemaV2},
@@ -1463,6 +1486,7 @@ func databaseSchemaMigrations() []databaseSchemaMigration {
 		{fromVersion: 10, toVersion: 11, migrate: migrateV11, validate: validateDatabaseSchemaV11},
 		{fromVersion: 11, toVersion: 12, migrate: migrateV12, validate: validateDatabaseSchemaV12},
 		{fromVersion: 12, toVersion: 13, migrate: migrateV13, validate: validateDatabaseSchemaV13},
+		{fromVersion: 13, toVersion: 14, migrate: migrateV14, validate: validateDatabaseSchemaV14},
 	}
 }
 

openflare_server/model/waf.go

@@ -15,6 +15,8 @@ type WAFRuleGroup struct {
 	CountryBlacklist  string    `json:"country_blacklist" gorm:"type:text;not null;default:'[]'"`
 	RegionWhitelist   string    `json:"region_whitelist" gorm:"type:text;not null;default:'[]'"`
 	RegionBlacklist   string    `json:"region_blacklist" gorm:"type:text;not null;default:'[]'"`
+	PoWEnabled        bool      `json:"pow_enabled" gorm:"not null;default:false"`
+	PoWConfig         string    `json:"pow_config" gorm:"type:text;not null;default:'{}'"`
 	Remark            string    `json:"remark" gorm:"size:255"`
 	CreatedAt         time.Time `json:"created_at"`
 	UpdatedAt         time.Time `json:"updated_at"`
@@ -62,6 +64,8 @@ func (group *WAFRuleGroup) Update() error {
 		"country_blacklist":   group.CountryBlacklist,
 		"region_whitelist":    group.RegionWhitelist,
 		"region_blacklist":    group.RegionBlacklist,
+		"pow_enabled":         group.PoWEnabled,
+		"pow_config":          group.PoWConfig,
 		"remark":              group.Remark,
 	}).Error
 }