diff --git a/cmd/anubis/main.go b/cmd/anubis/main.go index 6ad10274..a9fce5e2 100644 --- a/cmd/anubis/main.go +++ b/cmd/anubis/main.go @@ -31,8 +31,8 @@ import ( "github.com/TecharoHQ/anubis/data" "github.com/TecharoHQ/anubis/internal" libanubis "github.com/TecharoHQ/anubis/lib" + "github.com/TecharoHQ/anubis/lib/config" botPolicy "github.com/TecharoHQ/anubis/lib/policy" - "github.com/TecharoHQ/anubis/lib/policy/config" "github.com/TecharoHQ/anubis/lib/thoth" "github.com/TecharoHQ/anubis/web" "github.com/facebookgo/flagenv" diff --git a/cmd/robots2policy/main.go b/cmd/robots2policy/main.go index 3bb7219d..69fb2f96 100644 --- a/cmd/robots2policy/main.go +++ b/cmd/robots2policy/main.go @@ -12,7 +12,7 @@ import ( "regexp" "strings" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "sigs.k8s.io/yaml" ) diff --git a/internal/log.go b/internal/log.go index fb2f2509..4b8bd02f 100644 --- a/internal/log.go +++ b/internal/log.go @@ -2,6 +2,7 @@ package internal import ( "fmt" + "io" "log" "log/slog" "net/http" @@ -9,7 +10,7 @@ import ( "strings" ) -func InitSlog(level string) { +func InitSlog(level string, sink io.Writer) *slog.Logger { var programLevel slog.Level if err := (&programLevel).UnmarshalText([]byte(level)); err != nil { fmt.Fprintf(os.Stderr, "invalid log level %s: %v, using info\n", level, err) @@ -19,11 +20,12 @@ func InitSlog(level string) { leveler := &slog.LevelVar{} leveler.Set(programLevel) - h := slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{ + h := slog.NewJSONHandler(sink, &slog.HandlerOptions{ AddSource: true, Level: leveler, }) - slog.SetDefault(slog.New(h)) + result := slog.New(h) + return result } func GetRequestLogger(base *slog.Logger, r *http.Request) *slog.Logger { @@ -39,8 +41,7 @@ func GetRequestLogger(base *slog.Logger, r *http.Request) *slog.Logger { "user_agent", r.UserAgent(), "accept_language", r.Header.Get("Accept-Language"), "priority", r.Header.Get("Priority"), - "x-forwarded-for", - r.Header.Get("X-Forwarded-For"), + "x-forwarded-for", r.Header.Get("X-Forwarded-For"), "x-real-ip", r.Header.Get("X-Real-Ip"), ) } diff --git a/internal/ogtags/cache_test.go b/internal/ogtags/cache_test.go index 89ba2299..9f2c1243 100644 --- a/internal/ogtags/cache_test.go +++ b/internal/ogtags/cache_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/store" "github.com/TecharoHQ/anubis/lib/store/memory" ) diff --git a/internal/ogtags/fetch_test.go b/internal/ogtags/fetch_test.go index 864e8f2b..402cb184 100644 --- a/internal/ogtags/fetch_test.go +++ b/internal/ogtags/fetch_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/store/memory" "golang.org/x/net/html" ) diff --git a/internal/ogtags/integration_test.go b/internal/ogtags/integration_test.go index af56668b..f13f75f4 100644 --- a/internal/ogtags/integration_test.go +++ b/internal/ogtags/integration_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/store/memory" ) diff --git a/internal/ogtags/mem_test.go b/internal/ogtags/mem_test.go index 7d2ac0cb..3770a73f 100644 --- a/internal/ogtags/mem_test.go +++ b/internal/ogtags/mem_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/store/memory" "golang.org/x/net/html" ) diff --git a/internal/ogtags/ogtags.go b/internal/ogtags/ogtags.go index f0c0adf3..62cd89c2 100644 --- a/internal/ogtags/ogtags.go +++ b/internal/ogtags/ogtags.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/store" ) diff --git a/internal/ogtags/ogtags_fuzz_test.go b/internal/ogtags/ogtags_fuzz_test.go index 499d9f52..6355eebf 100644 --- a/internal/ogtags/ogtags_fuzz_test.go +++ b/internal/ogtags/ogtags_fuzz_test.go @@ -7,7 +7,7 @@ import ( "testing" "unicode/utf8" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/store/memory" "golang.org/x/net/html" ) diff --git a/internal/ogtags/ogtags_test.go b/internal/ogtags/ogtags_test.go index 7441119c..2b931a81 100644 --- a/internal/ogtags/ogtags_test.go +++ b/internal/ogtags/ogtags_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/store/memory" ) diff --git a/internal/ogtags/parse_test.go b/internal/ogtags/parse_test.go index 55e536a3..2c92cbfb 100644 --- a/internal/ogtags/parse_test.go +++ b/internal/ogtags/parse_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/store/memory" "golang.org/x/net/html" ) diff --git a/lib/anubis.go b/lib/anubis.go index 68dd9bc5..4fc154ed 100644 --- a/lib/anubis.go +++ b/lib/anubis.go @@ -27,10 +27,10 @@ import ( "github.com/TecharoHQ/anubis/internal/dnsbl" "github.com/TecharoHQ/anubis/internal/ogtags" "github.com/TecharoHQ/anubis/lib/challenge" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/localization" "github.com/TecharoHQ/anubis/lib/policy" "github.com/TecharoHQ/anubis/lib/policy/checker" - "github.com/TecharoHQ/anubis/lib/policy/config" "github.com/TecharoHQ/anubis/lib/store" // challenge implementations diff --git a/lib/anubis_test.go b/lib/anubis_test.go index b05196fc..ecafd7d8 100644 --- a/lib/anubis_test.go +++ b/lib/anubis_test.go @@ -20,8 +20,8 @@ import ( "github.com/TecharoHQ/anubis/data" "github.com/TecharoHQ/anubis/internal" "github.com/TecharoHQ/anubis/lib/challenge" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/policy" - "github.com/TecharoHQ/anubis/lib/policy/config" "github.com/TecharoHQ/anubis/lib/store" "github.com/TecharoHQ/anubis/lib/thoth/thothmock" ) diff --git a/lib/challenge/interface.go b/lib/challenge/interface.go index c7a19449..4bef2e7f 100644 --- a/lib/challenge/interface.go +++ b/lib/challenge/interface.go @@ -6,8 +6,8 @@ import ( "sort" "sync" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/policy" - "github.com/TecharoHQ/anubis/lib/policy/config" "github.com/TecharoHQ/anubis/lib/store" "github.com/a-h/templ" ) diff --git a/lib/challenge/proofofwork/proofofwork_test.go b/lib/challenge/proofofwork/proofofwork_test.go index c0611a53..6b12afeb 100644 --- a/lib/challenge/proofofwork/proofofwork_test.go +++ b/lib/challenge/proofofwork/proofofwork_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/TecharoHQ/anubis/lib/challenge" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/policy" - "github.com/TecharoHQ/anubis/lib/policy/config" ) func mkRequest(t *testing.T, values map[string]string) *http.Request { diff --git a/lib/config.go b/lib/config.go index 1c4d7a00..888bf6d2 100644 --- a/lib/config.go +++ b/lib/config.go @@ -18,9 +18,9 @@ import ( "github.com/TecharoHQ/anubis/internal" "github.com/TecharoHQ/anubis/internal/ogtags" "github.com/TecharoHQ/anubis/lib/challenge" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/localization" "github.com/TecharoHQ/anubis/lib/policy" - "github.com/TecharoHQ/anubis/lib/policy/config" "github.com/TecharoHQ/anubis/web" "github.com/TecharoHQ/anubis/xess" "github.com/a-h/templ" diff --git a/lib/policy/config/asn.go b/lib/config/asn.go similarity index 100% rename from lib/policy/config/asn.go rename to lib/config/asn.go diff --git a/lib/policy/config/asn_test.go b/lib/config/asn_test.go similarity index 100% rename from lib/policy/config/asn_test.go rename to lib/config/asn_test.go diff --git a/lib/policy/config/check.go b/lib/config/check.go similarity index 100% rename from lib/policy/config/check.go rename to lib/config/check.go diff --git a/lib/policy/config/config.go b/lib/config/config.go similarity index 100% rename from lib/policy/config/config.go rename to lib/config/config.go diff --git a/lib/policy/config/config_test.go b/lib/config/config_test.go similarity index 99% rename from lib/policy/config/config_test.go rename to lib/config/config_test.go index c35ceefb..8702780b 100644 --- a/lib/policy/config/config_test.go +++ b/lib/config/config_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/TecharoHQ/anubis/data" - . "github.com/TecharoHQ/anubis/lib/policy/config" + . "github.com/TecharoHQ/anubis/lib/config" ) func p[V any](v V) *V { return &v } diff --git a/lib/policy/config/expressionorlist.go b/lib/config/expressionorlist.go similarity index 100% rename from lib/policy/config/expressionorlist.go rename to lib/config/expressionorlist.go diff --git a/lib/policy/config/expressionorlist_test.go b/lib/config/expressionorlist_test.go similarity index 100% rename from lib/policy/config/expressionorlist_test.go rename to lib/config/expressionorlist_test.go diff --git a/lib/policy/config/geoip.go b/lib/config/geoip.go similarity index 100% rename from lib/policy/config/geoip.go rename to lib/config/geoip.go diff --git a/lib/policy/config/geoip_test.go b/lib/config/geoip_test.go similarity index 100% rename from lib/policy/config/geoip_test.go rename to lib/config/geoip_test.go diff --git a/lib/policy/config/impressum.go b/lib/config/impressum.go similarity index 100% rename from lib/policy/config/impressum.go rename to lib/config/impressum.go diff --git a/lib/policy/config/impressum_test.go b/lib/config/impressum_test.go similarity index 100% rename from lib/policy/config/impressum_test.go rename to lib/config/impressum_test.go diff --git a/lib/policy/config/opengraph.go b/lib/config/opengraph.go similarity index 100% rename from lib/policy/config/opengraph.go rename to lib/config/opengraph.go diff --git a/lib/policy/config/opengraph_test.go b/lib/config/opengraph_test.go similarity index 100% rename from lib/policy/config/opengraph_test.go rename to lib/config/opengraph_test.go diff --git a/lib/policy/config/store.go b/lib/config/store.go similarity index 100% rename from lib/policy/config/store.go rename to lib/config/store.go diff --git a/lib/policy/config/store_test.go b/lib/config/store_test.go similarity index 97% rename from lib/policy/config/store_test.go rename to lib/config/store_test.go index 227b06bf..40726854 100644 --- a/lib/policy/config/store_test.go +++ b/lib/config/store_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/store/bbolt" "github.com/TecharoHQ/anubis/lib/store/valkey" ) diff --git a/lib/policy/config/testdata/bad/badregexes.json b/lib/config/testdata/bad/badregexes.json similarity index 100% rename from lib/policy/config/testdata/bad/badregexes.json rename to lib/config/testdata/bad/badregexes.json diff --git a/lib/policy/config/testdata/bad/badregexes.yaml b/lib/config/testdata/bad/badregexes.yaml similarity index 100% rename from lib/policy/config/testdata/bad/badregexes.yaml rename to lib/config/testdata/bad/badregexes.yaml diff --git a/lib/policy/config/testdata/bad/import_and_bot.json b/lib/config/testdata/bad/import_and_bot.json similarity index 100% rename from lib/policy/config/testdata/bad/import_and_bot.json rename to lib/config/testdata/bad/import_and_bot.json diff --git a/lib/policy/config/testdata/bad/import_and_bot.yaml b/lib/config/testdata/bad/import_and_bot.yaml similarity index 100% rename from lib/policy/config/testdata/bad/import_and_bot.yaml rename to lib/config/testdata/bad/import_and_bot.yaml diff --git a/lib/policy/config/testdata/bad/import_invalid_file.json b/lib/config/testdata/bad/import_invalid_file.json similarity index 100% rename from lib/policy/config/testdata/bad/import_invalid_file.json rename to lib/config/testdata/bad/import_invalid_file.json diff --git a/lib/policy/config/testdata/bad/import_invalid_file.yaml b/lib/config/testdata/bad/import_invalid_file.yaml similarity index 100% rename from lib/policy/config/testdata/bad/import_invalid_file.yaml rename to lib/config/testdata/bad/import_invalid_file.yaml diff --git a/lib/policy/config/testdata/bad/impressum-no-footer.yaml b/lib/config/testdata/bad/impressum-no-footer.yaml similarity index 100% rename from lib/policy/config/testdata/bad/impressum-no-footer.yaml rename to lib/config/testdata/bad/impressum-no-footer.yaml diff --git a/lib/policy/config/testdata/bad/impressum-no-page-contents.yaml b/lib/config/testdata/bad/impressum-no-page-contents.yaml similarity index 100% rename from lib/policy/config/testdata/bad/impressum-no-page-contents.yaml rename to lib/config/testdata/bad/impressum-no-page-contents.yaml diff --git a/lib/policy/config/testdata/bad/invalid.json b/lib/config/testdata/bad/invalid.json similarity index 100% rename from lib/policy/config/testdata/bad/invalid.json rename to lib/config/testdata/bad/invalid.json diff --git a/lib/policy/config/testdata/bad/invalid.yaml b/lib/config/testdata/bad/invalid.yaml similarity index 100% rename from lib/policy/config/testdata/bad/invalid.yaml rename to lib/config/testdata/bad/invalid.yaml diff --git a/lib/policy/config/testdata/bad/multiple_expression_types.json b/lib/config/testdata/bad/multiple_expression_types.json similarity index 100% rename from lib/policy/config/testdata/bad/multiple_expression_types.json rename to lib/config/testdata/bad/multiple_expression_types.json diff --git a/lib/policy/config/testdata/bad/multiple_expression_types.yaml b/lib/config/testdata/bad/multiple_expression_types.yaml similarity index 100% rename from lib/policy/config/testdata/bad/multiple_expression_types.yaml rename to lib/config/testdata/bad/multiple_expression_types.yaml diff --git a/lib/policy/config/testdata/bad/nobots.json b/lib/config/testdata/bad/nobots.json similarity index 100% rename from lib/policy/config/testdata/bad/nobots.json rename to lib/config/testdata/bad/nobots.json diff --git a/lib/policy/config/testdata/bad/nobots.yaml b/lib/config/testdata/bad/nobots.yaml similarity index 100% rename from lib/policy/config/testdata/bad/nobots.yaml rename to lib/config/testdata/bad/nobots.yaml diff --git a/lib/policy/config/testdata/bad/opengraph_bad_ttl.yaml b/lib/config/testdata/bad/opengraph_bad_ttl.yaml similarity index 100% rename from lib/policy/config/testdata/bad/opengraph_bad_ttl.yaml rename to lib/config/testdata/bad/opengraph_bad_ttl.yaml diff --git a/lib/policy/config/testdata/bad/regex_ends_newline.json b/lib/config/testdata/bad/regex_ends_newline.json similarity index 100% rename from lib/policy/config/testdata/bad/regex_ends_newline.json rename to lib/config/testdata/bad/regex_ends_newline.json diff --git a/lib/policy/config/testdata/bad/regex_ends_newline.yaml b/lib/config/testdata/bad/regex_ends_newline.yaml similarity index 100% rename from lib/policy/config/testdata/bad/regex_ends_newline.yaml rename to lib/config/testdata/bad/regex_ends_newline.yaml diff --git a/lib/policy/config/testdata/bad/status-codes-0.json b/lib/config/testdata/bad/status-codes-0.json similarity index 100% rename from lib/policy/config/testdata/bad/status-codes-0.json rename to lib/config/testdata/bad/status-codes-0.json diff --git a/lib/policy/config/testdata/bad/status-codes-0.yaml b/lib/config/testdata/bad/status-codes-0.yaml similarity index 100% rename from lib/policy/config/testdata/bad/status-codes-0.yaml rename to lib/config/testdata/bad/status-codes-0.yaml diff --git a/lib/policy/config/testdata/bad/threshold-challenge-without-challenge.yaml b/lib/config/testdata/bad/threshold-challenge-without-challenge.yaml similarity index 100% rename from lib/policy/config/testdata/bad/threshold-challenge-without-challenge.yaml rename to lib/config/testdata/bad/threshold-challenge-without-challenge.yaml diff --git a/lib/policy/config/testdata/bad/thresholds.yaml b/lib/config/testdata/bad/thresholds.yaml similarity index 100% rename from lib/policy/config/testdata/bad/thresholds.yaml rename to lib/config/testdata/bad/thresholds.yaml diff --git a/lib/policy/config/testdata/bad/unparseable.json b/lib/config/testdata/bad/unparseable.json similarity index 100% rename from lib/policy/config/testdata/bad/unparseable.json rename to lib/config/testdata/bad/unparseable.json diff --git a/lib/policy/config/testdata/bad/unparseable.yaml b/lib/config/testdata/bad/unparseable.yaml similarity index 100% rename from lib/policy/config/testdata/bad/unparseable.yaml rename to lib/config/testdata/bad/unparseable.yaml diff --git a/lib/policy/config/testdata/good/allow_everyone.json b/lib/config/testdata/good/allow_everyone.json similarity index 100% rename from lib/policy/config/testdata/good/allow_everyone.json rename to lib/config/testdata/good/allow_everyone.json diff --git a/lib/policy/config/testdata/good/allow_everyone.yaml b/lib/config/testdata/good/allow_everyone.yaml similarity index 100% rename from lib/policy/config/testdata/good/allow_everyone.yaml rename to lib/config/testdata/good/allow_everyone.yaml diff --git a/lib/policy/config/testdata/good/block_cf_workers.json b/lib/config/testdata/good/block_cf_workers.json similarity index 100% rename from lib/policy/config/testdata/good/block_cf_workers.json rename to lib/config/testdata/good/block_cf_workers.json diff --git a/lib/policy/config/testdata/good/block_cf_workers.yaml b/lib/config/testdata/good/block_cf_workers.yaml similarity index 100% rename from lib/policy/config/testdata/good/block_cf_workers.yaml rename to lib/config/testdata/good/block_cf_workers.yaml diff --git a/lib/policy/config/testdata/good/challenge_cloudflare.yaml b/lib/config/testdata/good/challenge_cloudflare.yaml similarity index 100% rename from lib/policy/config/testdata/good/challenge_cloudflare.yaml rename to lib/config/testdata/good/challenge_cloudflare.yaml diff --git a/lib/policy/config/testdata/good/challengemozilla.json b/lib/config/testdata/good/challengemozilla.json similarity index 100% rename from lib/policy/config/testdata/good/challengemozilla.json rename to lib/config/testdata/good/challengemozilla.json diff --git a/lib/policy/config/testdata/good/challengemozilla.yaml b/lib/config/testdata/good/challengemozilla.yaml similarity index 100% rename from lib/policy/config/testdata/good/challengemozilla.yaml rename to lib/config/testdata/good/challengemozilla.yaml diff --git a/lib/policy/config/testdata/good/entropy.yaml b/lib/config/testdata/good/entropy.yaml similarity index 100% rename from lib/policy/config/testdata/good/entropy.yaml rename to lib/config/testdata/good/entropy.yaml diff --git a/lib/policy/config/testdata/good/everything_blocked.json b/lib/config/testdata/good/everything_blocked.json similarity index 100% rename from lib/policy/config/testdata/good/everything_blocked.json rename to lib/config/testdata/good/everything_blocked.json diff --git a/lib/policy/config/testdata/good/everything_blocked.yaml b/lib/config/testdata/good/everything_blocked.yaml similarity index 100% rename from lib/policy/config/testdata/good/everything_blocked.yaml rename to lib/config/testdata/good/everything_blocked.yaml diff --git a/lib/policy/config/testdata/good/geoip_us.yaml b/lib/config/testdata/good/geoip_us.yaml similarity index 100% rename from lib/policy/config/testdata/good/geoip_us.yaml rename to lib/config/testdata/good/geoip_us.yaml diff --git a/lib/policy/config/testdata/good/git_client.json b/lib/config/testdata/good/git_client.json similarity index 100% rename from lib/policy/config/testdata/good/git_client.json rename to lib/config/testdata/good/git_client.json diff --git a/lib/policy/config/testdata/good/git_client.yaml b/lib/config/testdata/good/git_client.yaml similarity index 100% rename from lib/policy/config/testdata/good/git_client.yaml rename to lib/config/testdata/good/git_client.yaml diff --git a/lib/policy/config/testdata/good/import_filesystem.json b/lib/config/testdata/good/import_filesystem.json similarity index 100% rename from lib/policy/config/testdata/good/import_filesystem.json rename to lib/config/testdata/good/import_filesystem.json diff --git a/lib/policy/config/testdata/good/import_filesystem.yaml b/lib/config/testdata/good/import_filesystem.yaml similarity index 100% rename from lib/policy/config/testdata/good/import_filesystem.yaml rename to lib/config/testdata/good/import_filesystem.yaml diff --git a/lib/policy/config/testdata/good/import_keep_internet_working.json b/lib/config/testdata/good/import_keep_internet_working.json similarity index 100% rename from lib/policy/config/testdata/good/import_keep_internet_working.json rename to lib/config/testdata/good/import_keep_internet_working.json diff --git a/lib/policy/config/testdata/good/import_keep_internet_working.yaml b/lib/config/testdata/good/import_keep_internet_working.yaml similarity index 100% rename from lib/policy/config/testdata/good/import_keep_internet_working.yaml rename to lib/config/testdata/good/import_keep_internet_working.yaml diff --git a/lib/policy/config/testdata/good/impressum.yaml b/lib/config/testdata/good/impressum.yaml similarity index 100% rename from lib/policy/config/testdata/good/impressum.yaml rename to lib/config/testdata/good/impressum.yaml diff --git a/lib/policy/config/testdata/good/no-thresholds.yaml b/lib/config/testdata/good/no-thresholds.yaml similarity index 100% rename from lib/policy/config/testdata/good/no-thresholds.yaml rename to lib/config/testdata/good/no-thresholds.yaml diff --git a/lib/policy/config/testdata/good/old_xesite.json b/lib/config/testdata/good/old_xesite.json similarity index 100% rename from lib/policy/config/testdata/good/old_xesite.json rename to lib/config/testdata/good/old_xesite.json diff --git a/lib/policy/config/testdata/good/opengraph_all_good.yaml b/lib/config/testdata/good/opengraph_all_good.yaml similarity index 100% rename from lib/policy/config/testdata/good/opengraph_all_good.yaml rename to lib/config/testdata/good/opengraph_all_good.yaml diff --git a/lib/policy/config/testdata/good/simple-weight.yaml b/lib/config/testdata/good/simple-weight.yaml similarity index 100% rename from lib/policy/config/testdata/good/simple-weight.yaml rename to lib/config/testdata/good/simple-weight.yaml diff --git a/lib/policy/config/testdata/good/status-codes-paranoid.json b/lib/config/testdata/good/status-codes-paranoid.json similarity index 100% rename from lib/policy/config/testdata/good/status-codes-paranoid.json rename to lib/config/testdata/good/status-codes-paranoid.json diff --git a/lib/policy/config/testdata/good/status-codes-paranoid.yaml b/lib/config/testdata/good/status-codes-paranoid.yaml similarity index 100% rename from lib/policy/config/testdata/good/status-codes-paranoid.yaml rename to lib/config/testdata/good/status-codes-paranoid.yaml diff --git a/lib/policy/config/testdata/good/status-codes-rfc.json b/lib/config/testdata/good/status-codes-rfc.json similarity index 100% rename from lib/policy/config/testdata/good/status-codes-rfc.json rename to lib/config/testdata/good/status-codes-rfc.json diff --git a/lib/policy/config/testdata/good/status-codes-rfc.yaml b/lib/config/testdata/good/status-codes-rfc.yaml similarity index 100% rename from lib/policy/config/testdata/good/status-codes-rfc.yaml rename to lib/config/testdata/good/status-codes-rfc.yaml diff --git a/lib/policy/config/testdata/good/thresholds.yaml b/lib/config/testdata/good/thresholds.yaml similarity index 100% rename from lib/policy/config/testdata/good/thresholds.yaml rename to lib/config/testdata/good/thresholds.yaml diff --git a/lib/policy/config/testdata/good/weight-no-weight.yaml b/lib/config/testdata/good/weight-no-weight.yaml similarity index 100% rename from lib/policy/config/testdata/good/weight-no-weight.yaml rename to lib/config/testdata/good/weight-no-weight.yaml diff --git a/lib/policy/config/testdata/hack-test.json b/lib/config/testdata/hack-test.json similarity index 100% rename from lib/policy/config/testdata/hack-test.json rename to lib/config/testdata/hack-test.json diff --git a/lib/policy/config/testdata/hack-test.yaml b/lib/config/testdata/hack-test.yaml similarity index 100% rename from lib/policy/config/testdata/hack-test.yaml rename to lib/config/testdata/hack-test.yaml diff --git a/lib/policy/config/threshold.go b/lib/config/threshold.go similarity index 100% rename from lib/policy/config/threshold.go rename to lib/config/threshold.go diff --git a/lib/policy/config/threshold_test.go b/lib/config/threshold_test.go similarity index 100% rename from lib/policy/config/threshold_test.go rename to lib/config/threshold_test.go diff --git a/lib/policy/config/weight.go b/lib/config/weight.go similarity index 100% rename from lib/policy/config/weight.go rename to lib/config/weight.go diff --git a/lib/config_test.go b/lib/config_test.go index af31ca6b..f3dc0a4c 100644 --- a/lib/config_test.go +++ b/lib/config_test.go @@ -18,7 +18,7 @@ func TestInvalidChallengeMethod(t *testing.T) { } func TestBadConfigs(t *testing.T) { - finfos, err := os.ReadDir("policy/config/testdata/bad") + finfos, err := os.ReadDir("config/testdata/bad") if err != nil { t.Fatal(err) } @@ -26,7 +26,7 @@ func TestBadConfigs(t *testing.T) { for _, st := range finfos { st := st t.Run(st.Name(), func(t *testing.T) { - if _, err := LoadPoliciesOrDefault(t.Context(), filepath.Join("policy", "config", "testdata", "bad", st.Name()), anubis.DefaultDifficulty); err == nil { + if _, err := LoadPoliciesOrDefault(t.Context(), filepath.Join("config", "testdata", "bad", st.Name()), anubis.DefaultDifficulty); err == nil { t.Fatal(err) } else { t.Log(err) @@ -36,7 +36,7 @@ func TestBadConfigs(t *testing.T) { } func TestGoodConfigs(t *testing.T) { - finfos, err := os.ReadDir("policy/config/testdata/good") + finfos, err := os.ReadDir("config/testdata/good") if err != nil { t.Fatal(err) } @@ -46,13 +46,13 @@ func TestGoodConfigs(t *testing.T) { t.Run(st.Name(), func(t *testing.T) { t.Run("with-thoth", func(t *testing.T) { ctx := thothmock.WithMockThoth(t) - if _, err := LoadPoliciesOrDefault(ctx, filepath.Join("policy", "config", "testdata", "good", st.Name()), anubis.DefaultDifficulty); err != nil { + if _, err := LoadPoliciesOrDefault(ctx, filepath.Join("config", "testdata", "good", st.Name()), anubis.DefaultDifficulty); err != nil { t.Fatal(err) } }) t.Run("without-thoth", func(t *testing.T) { - if _, err := LoadPoliciesOrDefault(t.Context(), filepath.Join("policy", "config", "testdata", "good", st.Name()), anubis.DefaultDifficulty); err != nil { + if _, err := LoadPoliciesOrDefault(t.Context(), filepath.Join("config", "testdata", "good", st.Name()), anubis.DefaultDifficulty); err != nil { t.Fatal(err) } }) diff --git a/lib/policy/bot.go b/lib/policy/bot.go index 479bccc3..25c04870 100644 --- a/lib/policy/bot.go +++ b/lib/policy/bot.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/TecharoHQ/anubis/internal" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/policy/checker" - "github.com/TecharoHQ/anubis/lib/policy/config" ) type Bot struct { diff --git a/lib/policy/celchecker.go b/lib/policy/celchecker.go index 2b06392a..033bcfea 100644 --- a/lib/policy/celchecker.go +++ b/lib/policy/celchecker.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/TecharoHQ/anubis/internal" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/policy/expressions" "github.com/google/cel-go/cel" "github.com/google/cel-go/common/types" diff --git a/lib/policy/checkresult.go b/lib/policy/checkresult.go index 31737dda..c75ccb36 100644 --- a/lib/policy/checkresult.go +++ b/lib/policy/checkresult.go @@ -3,7 +3,7 @@ package policy import ( "log/slog" - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" ) type CheckResult struct { diff --git a/lib/policy/policy.go b/lib/policy/policy.go index 27bd6661..665f4c08 100644 --- a/lib/policy/policy.go +++ b/lib/policy/policy.go @@ -8,8 +8,8 @@ import ( "log/slog" "sync/atomic" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/policy/checker" - "github.com/TecharoHQ/anubis/lib/policy/config" "github.com/TecharoHQ/anubis/lib/store" "github.com/TecharoHQ/anubis/lib/thoth" "github.com/prometheus/client_golang/prometheus" diff --git a/lib/policy/policy_test.go b/lib/policy/policy_test.go index 103728ac..b5228574 100644 --- a/lib/policy/policy_test.go +++ b/lib/policy/policy_test.go @@ -26,7 +26,7 @@ func TestDefaultPolicyMustParse(t *testing.T) { func TestGoodConfigs(t *testing.T) { - finfos, err := os.ReadDir("config/testdata/good") + finfos, err := os.ReadDir("../config/testdata/good") if err != nil { t.Fatal(err) } @@ -35,7 +35,7 @@ func TestGoodConfigs(t *testing.T) { st := st t.Run(st.Name(), func(t *testing.T) { t.Run("with-thoth", func(t *testing.T) { - fin, err := os.Open(filepath.Join("config", "testdata", "good", st.Name())) + fin, err := os.Open(filepath.Join("..", "config", "testdata", "good", st.Name())) if err != nil { t.Fatal(err) } @@ -48,7 +48,7 @@ func TestGoodConfigs(t *testing.T) { }) t.Run("without-thoth", func(t *testing.T) { - fin, err := os.Open(filepath.Join("config", "testdata", "good", st.Name())) + fin, err := os.Open(filepath.Join("..", "config", "testdata", "good", st.Name())) if err != nil { t.Fatal(err) } @@ -65,7 +65,7 @@ func TestGoodConfigs(t *testing.T) { func TestBadConfigs(t *testing.T) { ctx := thothmock.WithMockThoth(t) - finfos, err := os.ReadDir("config/testdata/bad") + finfos, err := os.ReadDir("../config/testdata/bad") if err != nil { t.Fatal(err) } @@ -73,7 +73,7 @@ func TestBadConfigs(t *testing.T) { for _, st := range finfos { st := st t.Run(st.Name(), func(t *testing.T) { - fin, err := os.Open(filepath.Join("config", "testdata", "bad", st.Name())) + fin, err := os.Open(filepath.Join("..", "config", "testdata", "bad", st.Name())) if err != nil { t.Fatal(err) } diff --git a/lib/policy/thresholds.go b/lib/policy/thresholds.go index 1f77f631..7e79ac51 100644 --- a/lib/policy/thresholds.go +++ b/lib/policy/thresholds.go @@ -1,7 +1,7 @@ package policy import ( - "github.com/TecharoHQ/anubis/lib/policy/config" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/policy/expressions" "github.com/google/cel-go/cel" ) diff --git a/web/index.go b/web/index.go index 7b171ea1..6ff90527 100644 --- a/web/index.go +++ b/web/index.go @@ -4,8 +4,8 @@ import ( "github.com/a-h/templ" "github.com/TecharoHQ/anubis/lib/challenge" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/localization" - "github.com/TecharoHQ/anubis/lib/policy/config" ) func Base(title string, body templ.Component, impressum *config.Impressum, localizer *localization.SimpleLocalizer) templ.Component { diff --git a/web/index.templ b/web/index.templ index 8e34ea4b..a6752fab 100644 --- a/web/index.templ +++ b/web/index.templ @@ -3,8 +3,8 @@ package web import ( "fmt" "github.com/TecharoHQ/anubis" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/localization" - "github.com/TecharoHQ/anubis/lib/policy/config" "github.com/TecharoHQ/anubis/xess" ) diff --git a/web/index_templ.go b/web/index_templ.go index 0442aa04..71a70064 100644 --- a/web/index_templ.go +++ b/web/index_templ.go @@ -11,8 +11,8 @@ import templruntime "github.com/a-h/templ/runtime" import ( "fmt" "github.com/TecharoHQ/anubis" + "github.com/TecharoHQ/anubis/lib/config" "github.com/TecharoHQ/anubis/lib/localization" - "github.com/TecharoHQ/anubis/lib/policy/config" "github.com/TecharoHQ/anubis/xess" )