Gate scanned filters with `trust-scan-filters`

1 file changed, 13 insertions, 22 deletions

diff --git a/source/cgit.c b/source/cgit.c
index 36f3b25..eb13709 100644
--- a/source/cgit.c
+++ b/source/cgit.c
@@ -539,8 +539,8 @@ static void apply_config(const char *name, const char *value)
 		ctx.cfg.enable_header = atoi(value);
 	else if (!strcmp(name, "snapshots"))
 		ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
-	else if (!strcmp(name, "enable-filter-overrides"))
-		ctx.cfg.enable_filter_overrides = atoi(value);
+	else if (!strcmp(name, "trust-scan-filters"))
+		ctx.cfg.trust_scan_filters = atoi(value);
 	else if (!strcmp(name, "enable-follow-links"))
 		ctx.cfg.enable_follow_links = atoi(value);
 	else if (!strcmp(name, "enable-http-clone"))
@@ -1215,26 +1215,17 @@ void cgit_repo_config(struct cgit_repo *repo, const char *name, const char *valu
 		repo->hide = atoi(value);
 	else if (!strcmp(name, "ignore"))
 		repo->ignore = atoi(value);
-	else if (
-		!strcmp(name, "about-filter")	||
-		!strcmp(name, "commit-filter")	||
-		!strcmp(name, "source-filter")	||
-		!strcmp(name, "email-filter")	||
-		!strcmp(name, "trailer-filter")
-	) {
-		if (!ctx.cfg.enable_filter_overrides)
-			fprintf(stderr, "[cgit] Ignoring repo %s: enable-filter-overrides is not set\n", name);
-		else if (!strcmp(name, "about-filter"))
-			repo->about_filter = cgit_new_filter(value, ABOUT);
-		else if (!strcmp(name, "commit-filter"))
-			repo->commit_filter = cgit_new_filter(value, COMMIT);
-		else if (!strcmp(name, "source-filter"))
-			repo->source_filter = cgit_new_filter(value, SOURCE);
-		else if (!strcmp(name, "email-filter"))
-			repo->email_filter = cgit_new_filter(value, EMAIL);
-		else
-			repo->trailer_filter = cgit_new_filter(value, TRAILER);
-	} else
+	else if (!strcmp(name, "about-filter"))
+		repo->about_filter = cgit_new_filter(value, ABOUT);
+	else if (!strcmp(name, "commit-filter"))
+		repo->commit_filter = cgit_new_filter(value, COMMIT);
+	else if (!strcmp(name, "source-filter"))
+		repo->source_filter = cgit_new_filter(value, SOURCE);
+	else if (!strcmp(name, "email-filter"))
+		repo->email_filter = cgit_new_filter(value, EMAIL);
+	else if (!strcmp(name, "trailer-filter"))
+		repo->trailer_filter = cgit_new_filter(value, TRAILER);
+	else
 		fprintf(stderr, "[cgit] Unknown repo config key: %s\n", name);
 }