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

Differentiate between interact matchers and markers #1560

Merged
merged 2 commits into from
Feb 2, 2022
Merged

Differentiate between interact matchers and markers #1560

merged 2 commits into from
Feb 2, 2022

Conversation

Mzack9999
Copy link
Member

@Mzack9999 Mzack9999 commented Feb 1, 2022 •
edited by ehsandeep
Loading

Proposed changes

This PR improves interact matcher/markers identification logic. Previously a request without markers but with an interact matcher was considered with interact markers.

Checklist

  • Pull request is created against the dev branch
  • All checks passed (lint, unit/integration/regression tests etc.) with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

@Mzack9999 Mzack9999 added the Type: Bug Inconsistencies or issues which will cause an issue or problem for users or implementors. label Feb 1, 2022
@Mzack9999 Mzack9999 self-assigned this Feb 1, 2022
@Mzack9999 Mzack9999 added the Status: Review Needed The issue has a PR attached to it which needs to be reviewed label Feb 1, 2022
@Mzack9999 Mzack9999 linked an issue Feb 1, 2022 that may be closed by this pull request
Interactsh matcher issue with non interactsh matcher in OR condition #1553
Closed
Ice3man543
Ice3man543 approved these changes Feb 2, 2022
View reviewed changes
Copy link
Member

@Ice3man543 Ice3man543 left a comment

Choose a reason for hiding this comment

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

lgtm!

@ehsandeep ehsandeep merged commit 2875be8 into dev Feb 2, 2022
@ehsandeep ehsandeep deleted the issue-1553-mixed-matchers branch February 2, 2022 17:46
@ehsandeep ehsandeep added Status: Completed Nothing further to be done with this issue. Awaiting to be closed. and removed Status: Review Needed The issue has a PR attached to it which needs to be reviewed labels Feb 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehsandeep ehsandeep ehsandeep approved these changes

@Ice3man543 Ice3man543 Ice3man543 approved these changes

Assignees

@Mzack9999 Mzack9999

Labels
Status: Completed Nothing further to be done with this issue. Awaiting to be closed. Type: Bug Inconsistencies or issues which will cause an issue or problem for users or implementors.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Interactsh matcher issue with non interactsh matcher in OR condition
3 participants
@Mzack9999 @ehsandeep @Ice3man543