Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: setters of INBOUND_DATA_ERROR and OUTBOUND_DATA_ERROR #1078

Merged
merged 2 commits into from
Jun 13, 2024
Merged

fix: setters of INBOUND_DATA_ERROR and OUTBOUND_DATA_ERROR #1078

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79f2179
fix: setters of INBOUND_DATA_ERROR and OUTBOUND_DATA_ERROR
M4tteoP Jun 10, 2024
d3acc6a
Merge branch 'main' into data_error_flag
jcchavezs Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
github.com/anuraaga/go-modsecurity v0.0.0-20220824035035-b9a4099778df h1:YWiVl53v0R8Knj/k+4slO0SXPL67Y4dXWiOIWNzrkew=
github.com/anuraaga/go-modsecurity v0.0.0-20220824035035-b9a4099778df/go.mod h1:7jguE759ADzy2EkxGRXigiC0ER1Yq2IFk2qNtwgzc7U=
github.com/corazawaf/libinjection-go v0.1.3 h1:PUplAYho1BBl0tIVbhDsNRuVGIeUYSiCEc9oQpb2rJU=
github.com/corazawaf/libinjection-go v0.1.3/go.mod h1:OP4TM7xdJ2skyXqNX1AN1wN5nNZEmJNuWbNPOItn7aw=
github.com/corazawaf/libinjection-go v0.2.0 h1:Bjuy4s3xO9TSkp3GruliP7rFqNUmPI6rl5trsqipPno=
github.com/corazawaf/libinjection-go v0.2.0/go.mod h1:OP4TM7xdJ2skyXqNX1AN1wN5nNZEmJNuWbNPOItn7aw=
github.com/foxcpp/go-mockdns v1.1.0 h1:jI0rD8M0wuYAxL7r/ynTrCQQq0BVqfB99Vgk7DlmewI=
github.com/foxcpp/go-mockdns v1.1.0/go.mod h1:IhLeSFGed3mJIAXPH2aiRQB+kqz7oqu8ld2qVbOu7Wk=
github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
github.com/mccutchen/go-httpbin/v2 v2.13.4 h1:KjUeehEAcWG+ce5WJVtP3cyquL0Qe/jQ4UWe/N1BVDw=
github.com/mccutchen/go-httpbin/v2 v2.13.4/go.mod h1:f4DUXYlU6yH0V81O4lJIwqpmYdTXXmYwzxMnYEimFPk=
github.com/mccutchen/go-httpbin/v2 v2.14.0 h1:9N7GUf8+JunYMFd+yHPIVYApC6KYgqtF0pHIcTGYcVQ=
github.com/mccutchen/go-httpbin/v2 v2.14.0/go.mod h1:f4DUXYlU6yH0V81O4lJIwqpmYdTXXmYwzxMnYEimFPk=
github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM=
Expand Down
4 changes: 2 additions & 2 deletions internal/corazawaf/transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,7 @@ func (tx *Transaction) ReadRequestBodyFrom(r io.Reader) (*types.Interruption, in
}

if tx.requestBodyBuffer.length == tx.RequestBodyLimit {
tx.variables.inboundDataError.Set("1")
if tx.WAF.RequestBodyLimitAction == types.BodyLimitActionReject {
return setAndReturnBodyLimitInterruption(tx)
}
Expand Down Expand Up @@ -1121,7 +1122,6 @@ func (tx *Transaction) WriteResponseBody(b []byte) (*types.Interruption, int, er
runProcessResponseBody = false
)
if tx.responseBodyBuffer.length+writingBytes >= tx.ResponseBodyLimit {
// TODO: figure out ErrorData vs DataError: https://github.com/corazawaf/coraza/issues/564
tx.variables.outboundDataError.Set("1")
if tx.WAF.ResponseBodyLimitAction == types.BodyLimitActionReject {
// We interrupt this transaction in case ResponseBodyLimitAction is Reject
Expand Down Expand Up @@ -1173,7 +1173,6 @@ func (tx *Transaction) ReadResponseBodyFrom(r io.Reader) (*types.Interruption, i
if l, ok := r.(ByteLenger); ok {
writingBytes = int64(l.Len())
if tx.responseBodyBuffer.length+writingBytes >= tx.ResponseBodyLimit {
// TODO: figure out ErrorData vs DataError: https://github.com/corazawaf/coraza/issues/564
tx.variables.outboundDataError.Set("1")
if tx.WAF.ResponseBodyLimitAction == types.BodyLimitActionReject {
return setAndReturnBodyLimitInterruption(tx)
Expand All @@ -1194,6 +1193,7 @@ func (tx *Transaction) ReadResponseBodyFrom(r io.Reader) (*types.Interruption, i
}

if tx.responseBodyBuffer.length == tx.ResponseBodyLimit {
tx.variables.outboundDataError.Set("1")
if tx.WAF.ResponseBodyLimitAction == types.BodyLimitActionReject {
return setAndReturnBodyLimitInterruption(tx)
}
Expand Down
18 changes: 16 additions & 2 deletions internal/corazawaf/transaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,17 +171,20 @@ func TestWriteRequestBody(t *testing.T) {
requestBodyLimitAction types.BodyLimitAction
avoidRequestBodyLimitActionInit bool
shouldInterrupt bool
limitReached bool // If the limit is reached, INBOUND_DATA_ERROR should be set
}{
{
name: "LimitNotReached",
requestBodyLimit: urlencodedBodyLen + 2,
requestBodyLimitAction: types.BodyLimitAction(-1),
limitReached: false,
},
{
name: "LimitReachedAndRejects",
requestBodyLimit: urlencodedBodyLen - 3,
requestBodyLimitAction: types.BodyLimitActionReject,
shouldInterrupt: true,
limitReached: true,
},
{
name: "LimitReachedAndRejectsDefaultValue",
Expand All @@ -190,11 +193,13 @@ func TestWriteRequestBody(t *testing.T) {
// requestBodyLimitAction: types.BodyLimitActionReject,
avoidRequestBodyLimitActionInit: true,
shouldInterrupt: true,
limitReached: true,
},
{
name: "LimitReachedAndPartialProcessing",
requestBodyLimit: urlencodedBodyLen - 3,
requestBodyLimitAction: types.BodyLimitActionProcessPartial,
limitReached: true,
},
}

Expand Down Expand Up @@ -232,7 +237,9 @@ func TestWriteRequestBody(t *testing.T) {
t.Fatalf("Failed to write body buffer: %s", err.Error())
}
}

if testCase.limitReached && tx.variables.inboundDataError.Get() != "1" {
t.Fatalf("Expected INBOUND_DATA_ERROR to be set")
}
if testCase.shouldInterrupt {
if it == nil {
t.Fatal("Expected interruption, got nil")
Expand Down Expand Up @@ -485,28 +492,33 @@ func TestWriteResponseBody(t *testing.T) {
responseBodyLimit int
responseBodyLimitAction types.BodyLimitAction
shouldInterrupt bool
limitReached bool // If the limit is reached, OUTBOUND_DATA_ERROR should be set
}{
{
name: "LimitNotReached",
responseBodyLimit: urlencodedBodyLen + 2,
responseBodyLimitAction: types.BodyLimitAction(-1),
limitReached: false,
},
{
name: "LimitReachedAndRejects",
responseBodyLimit: urlencodedBodyLen - 3,
responseBodyLimitAction: types.BodyLimitActionReject,
shouldInterrupt: true,
limitReached: true,
},
{
name: "LimitReachedAndPartialProcessing",
responseBodyLimit: urlencodedBodyLen - 3,
responseBodyLimitAction: types.BodyLimitActionProcessPartial,
limitReached: true,
},
{
name: "LimitReachedAndPartialProcessingDefaultValue",
responseBodyLimit: urlencodedBodyLen - 3,
// Omitting requestBodyLimitAction defaults to ProcessPartial
// responseBodyLimitAction: types.BodyLimitActionProcessPartial,
limitReached: true,
},
}

Expand Down Expand Up @@ -548,7 +560,9 @@ func TestWriteResponseBody(t *testing.T) {
t.Fatalf("Failed to write body buffer: %s", err.Error())
}
}

if testCase.limitReached && tx.variables.outboundDataError.Get() != "1" {
t.Fatalf("Expected OUTBOUND_DATA_ERROR to be set")
}
if testCase.shouldInterrupt {
if it == nil {
t.Fatal("Expected interruption, got nil")
Expand Down
Loading