NUKE

lib/config/config.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/TecharoHQ/anubis/data"
+	"git.sad.ovh/sophie/nuke/data"
 	"k8s.io/apimachinery/pkg/util/yaml"
 )
 
@@ -63,10 +63,6 @@ type BotConfig struct {
 	Challenge      *ChallengeRules   `json:"challenge,omitempty" yaml:"challenge,omitempty"`
 	Weight         *Weight           `json:"weight,omitempty" yaml:"weight,omitempty"`
 
-	// Thoth features
-	GeoIP *GeoIP `json:"geoip,omitempty"`
-	ASNs  *ASNs  `json:"asns,omitempty"`
-
 	Name       string   `json:"name" yaml:"name"`
 	Action     Rule     `json:"action" yaml:"action"`
 	RemoteAddr []string `json:"remote_addresses,omitempty" yaml:"remote_addresses,omitempty"`
@@ -81,8 +77,6 @@ func (b BotConfig) Zero() bool {
 		b.Action != "",
 		len(b.RemoteAddr) != 0,
 		b.Challenge != nil,
-		b.GeoIP != nil,
-		b.ASNs != nil,
 	} {
 		if cond {
 			return false
@@ -102,9 +96,7 @@ func (b *BotConfig) Valid() error {
 	allFieldsEmpty := b.UserAgentRegex == nil &&
 		b.PathRegex == nil &&
 		len(b.RemoteAddr) == 0 &&
-		len(b.HeadersRegex) == 0 &&
-		b.ASNs == nil &&
-		b.GeoIP == nil
+		len(b.HeadersRegex) == 0
 
 	if allFieldsEmpty && b.Expression == nil {
 		errs = append(errs, ErrBotMustHaveUserAgentOrPath)