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

Jump to bottom

feat(libddwaf): bump to 1.20.1 #2913

Merged
merged 15 commits into from
Nov 8, 2024
Merged

feat(libddwaf): bump to 1.20.1 #2913

merged 15 commits into from
Nov 8, 2024

Conversation

Leiyks
Copy link
Contributor

@Leiyks Leiyks commented Oct 28, 2024 •
edited by jira bot
Loading

Description

Bump version of libddwaf to 1.20.1.

Also update the Toolchain Docker image to make it compatible with this later versions of the WAF:

  • Removed musl / llvm builds from the toolchain docker image as we can rely only on gcc and libstdc++ instead.
  • Added linux_user to fix some issues on the integration tests when running on Linux.
  • Removed now unnecessary files that were used to build the Toolchain docker image.

Reviewer checklist

  • Test coverage seems ok.
  • Appropriate labels assigned.

Related Jiras: APPSEC-55147, APPSEC-55607

@Leiyks Leiyks requested a review from a team as a code owner October 28, 2024 10:06
@Leiyks Leiyks force-pushed the APPSEC-55147-PHP-Upgrade-libddwaf-to-v1.20 branch from fcf9699 to e134b5d Compare October 28, 2024 13:04
@codecov-commenter
Copy link

codecov-commenter commented Oct 28, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.39%. Comparing base (a1ec6f8) to head (e8009f4).
Report is 18 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #2913   +/-   ##
=========================================
  Coverage     72.39%   72.39%           
  Complexity     2527     2527           
=========================================
  Files           135      135           
  Lines         14399    14399           
  Branches        989      989           
=========================================
  Hits          10424    10424           
  Misses         3432     3432           
  Partials        543      543
Flag Coverage Δ
appsec-extension 68.34% <ø> (ø)
tracer-php 73.97% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a1ec6f8...e8009f4. Read the comment docs.

@Leiyks Leiyks force-pushed the APPSEC-55147-PHP-Upgrade-libddwaf-to-v1.20 branch from 16a5999 to e9c979f Compare November 6, 2024 09:37
Leiyks and others added 6 commits November 6, 2024 10:39
@Leiyks
test(dockerfile: toolchain): update LLVM version to 16.0.6
52b13f1 
Signed-off-by: Alexandre Rulleau <[email protected]>
@Leiyks
test(dockerfile: toolchain): wip
b6b6068 
Signed-off-by: Alexandre Rulleau <[email protected]>
@Leiyks
test(dockerfile: toolchain): simplify Dockerfile
1ea01b4 
Signed-off-by: Alexandre Rulleau <[email protected]>
@Anilm3 @Leiyks
Fixes:
f2143b7 
 * Create linux_users group with gid=1000
 * Create linux_user with uid=1000
 * Simplify toolchain and include cmake release
 * Reinstate checksums and delete unnecessary files
@Leiyks
chore(test: gradle): restore cache check
18c0c78 
Signed-off-by: Alexandre Rulleau <[email protected]>
@Leiyks
chore(tests: integration): format Dockerfile
ed92c43 
Signed-off-by: Alexandre Rulleau <[email protected]>
@Leiyks Leiyks force-pushed the APPSEC-55147-PHP-Upgrade-libddwaf-to-v1.20 branch from e9c979f to 689af82 Compare November 6, 2024 12:38
@Leiyks Leiyks mentioned this pull request Nov 6, 2024
Closed
2 tasks
@Leiyks Leiyks changed the title feat(libddwaf): bump to 1.20.0 feat(libddwaf): bump to 1.20.1 Nov 6, 2024
@Leiyks
fix(tests: integration): fix recommended settings
45c33a2 
Signed-off-by: Alexandre Rulleau <[email protected]>
@Leiyks
feat(libddwaf): bump to 1.20.0
6affbc9 
Signed-off-by: Alexandre Rulleau <[email protected]>
@Leiyks
test(libddwaf): bump to 1.20.0
4317f0a 
Signed-off-by: Alexandre Rulleau <[email protected]>
@Leiyks
test(libddwaf): bump to 1.20.1
eb6621d 
Signed-off-by: Alexandre Rulleau <[email protected]>
@Leiyks
test(libddwaf): bump to 1.20.1
7734dc2 
Signed-off-by: Alexandre Rulleau <[email protected]>
@Leiyks
test(helper): fix tests
3072923 
Signed-off-by: Alexandre Rulleau <[email protected]>
@Leiyks Leiyks force-pushed the APPSEC-55147-PHP-Upgrade-libddwaf-to-v1.20 branch from 689af82 to 3072923 Compare November 6, 2024 16:50
Anilm3
Anilm3 approved these changes Nov 8, 2024
View reviewed changes
Copy link
Contributor

@Anilm3 Anilm3 left a comment

Choose a reason for hiding this comment

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

lgtm

@Leiyks
Copy link
Contributor Author

Leiyks commented Nov 8, 2024

/merge

@dd-devflow
Copy link

dd-devflow bot commented Nov 8, 2024 •
edited
Loading

Devflow running: /merge

View all feedbacks in Devflow UI.

2024-11-08 13:28:34 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in master is 0s.

2024-11-08 14:22:24 UTC ❌ MergeQueue: This merge request was updated

This PR is rejected because it was updated

@Anilm3 Anilm3 merged commit d47c723 into master Nov 8, 2024
718 of 743 checks passed
@Anilm3 Anilm3 deleted the APPSEC-55147-PHP-Upgrade-libddwaf-to-v1.20 branch November 8, 2024 16:04
@github-actions github-actions bot added this to the 1.5.0 milestone Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Anilm3 Anilm3 Anilm3 approved these changes

@estringana estringana Awaiting requested review from estringana

Assignees
No one assigned
Labels
area:asm mergequeue-status: rejected
Projects
None yet
Milestone
1.5.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Leiyks @codecov-commenter @Anilm3 @estringana @cataphract