Skip to content

Upgrading libddwaf to 1.28.0 #181

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

Merged
sezen-datadog merged 1 commit into from
Sep 2, 2025
Merged

Upgrading libddwaf to 1.28.0 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ defaults:
env:
buildType: RelWithDebInfo
tempdir: ${{ github.workspace }}/build
libddwafVersion: 1.26.0
libddwafVersion: 1.28.0
jobs:
Spotless:
name: spotless
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ repositories {
}

group 'io.sqreen'
version '16.0.0'
version '17.0.0'

sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand Down
2 changes: 1 addition & 1 deletion libddwaf
Open in desktop
Submodule libddwaf updated 146 files
2 changes: 1 addition & 1 deletion src/main/java/com/datadog/ddwaf/Waf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.slf4j.LoggerFactory;

public final class Waf {
public static final String LIB_VERSION = "1.26.0";
public static final String LIB_VERSION = "1.28.0";

private static final Logger LOGGER = LoggerFactory.getLogger(Waf.class);
static final boolean EXIT_ON_LEAK;
Expand Down
8 changes: 5 additions & 3 deletions src/test/groovy/com/datadog/ddwaf/BadRuleTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ class BadRuleTests implements WafTrait {

@Test
void 'no events'() {
shouldFail(InvalidRuleSetException) {
wafDiagnostics = builder.addOrUpdateConfig('test', [version: '0.0', events: []])
}
// libddwaf 1.27.0+ now accepts empty configurations instead of throwing an exception
Copy link
Member

@manuel-alvarez-alvarez manuel-alvarez-alvarez Sep 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might want to update dd-trace-java too as it skipping empty configs with some ugly code

Copy link
Contributor Author

@sezen-datadog sezen-datadog Sep 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes I’m adapting it right now

wafDiagnostics = builder.addOrUpdateConfig('test', [version: '0.0', events: []])
assert wafDiagnostics != null
assert wafDiagnostics.numConfigOK == 0
assert wafDiagnostics.numConfigError == 0
}

@Test
Expand Down
14 changes: 7 additions & 7 deletions src/test/groovy/com/datadog/ddwaf/BasicTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ class BasicTests implements WafTrait {
assertThat res.actions.size(), is(1)
assertThat res.actions.keySet(), hasItem('block_request')
assertThat res.actions.get('block_request').type, is('auto')
assertThat res.actions.get('block_request').status_code, is('403')
assertThat res.actions.get('block_request').grpc_status_code, is('10')
assertThat res.actions.get('block_request').status_code, is(403L)
assertThat res.actions.get('block_request').grpc_status_code, is(10L)
}

@Test
Expand All @@ -124,8 +124,8 @@ class BasicTests implements WafTrait {
// block action
assertThat res.actions.keySet(), hasItem('block_request')
assertThat res.actions.get('block_request').type, is('auto')
assertThat res.actions.get('block_request').status_code, is('403')
assertThat res.actions.get('block_request').grpc_status_code, is('10')
assertThat res.actions.get('block_request').status_code, is(403L)
assertThat res.actions.get('block_request').grpc_status_code, is(10L)

// stack_trace action
assertThat res.actions.keySet(), hasItem('generate_stack')
Expand Down Expand Up @@ -196,9 +196,9 @@ class BasicTests implements WafTrait {
assertThat res.actions.keySet(), contains('block_request')

assertThat res.actions.get('block_request').type, is('auto')
assertThat res.actions.get('block_request').status_code, is('201')
assertThat res.actions.get('block_request').grpc_status_code, is('10')
assertThat res.actions.get('block_request').enabled, is('true')
assertThat res.actions.get('block_request').status_code, is(201L)
assertThat res.actions.get('block_request').grpc_status_code, is(10L)
assertThat res.actions.get('block_request').enabled, is(true)
assertThat res.actions.get('block_request').test, is('false')
}

Expand Down