dd-trace-py icon indicating copy to clipboard operation
dd-trace-py copied to clipboard

fix(asm): only report actor.ip on attack (backport #4316)

Open mergify[bot] opened this issue 3 years ago • 0 comments

This is an automatic backport of pull request #4316 done by Mergify. Cherry-pick of f2a52a27a14dc615edb9fd13e220a74f5d6828ba has failed:

On branch mergify/bp/1.5/pr-4316
Your branch is up to date with 'origin/1.5'.

You are currently cherry-picking commit f2a52a27.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ddtrace/contrib/trace_utils.py
	new file:   releasenotes/notes/asm-fix-ipaddress-actorip-only-on-attack-c118a0560c0c0119.yaml
	modified:   tests/appsec/test_processor.py
	modified:   tests/contrib/flask/test_flask_appsec.py
	modified:   tests/tracer/test_trace_utils.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ddtrace/appsec/processor.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

mergify[bot] avatar Oct 14 '22 16:10 mergify[bot]