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.

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

fix regression in trackingspamprevention and warning in bound parameter checking code #17683

Merged
merged 7 commits into from Jun 18, 2021
Merged

fix regression in trackingspamprevention and warning in bound parameter checking code #17683

merged 7 commits into from Jun 18, 2021

Conversation

diosmosis
Copy link
Member

Description:

Changes:

  • allow option to disable allowed host check since trackingspamprevention makes a request to amazonaws
  • bound parameters can be a single string rather than an array
  • disable testdox and add build message output to enable it if the build hangs

Review

  • Functional review done
  • Potential edge cases thought about (behavior of the code with strange input, with strange internal state or possible interactions with other Matomo subsystems)
  • Usability review done (is anything maybe unclear or think about anything that would cause people to reach out to support)
  • Security review done see checklist
  • Code review done
  • Tests were added if useful/possible
  • Reviewed for breaking changes
  • Developer changelog updated if needed
  • Documentation added if needed
  • Existing documentation updated if needed

@diosmosis diosmosis added the Needs Review PRs that need a code review label Jun 17, 2021
@diosmosis diosmosis added this to the 4.4.0 milestone Jun 17, 2021
@diosmosis diosmosis added the not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. label Jun 17, 2021
sgiehl
sgiehl requested changes Jun 17, 2021
View reviewed changes
core/bootstrap.php Outdated
@@ -37,6 +37,7 @@
@date_default_timezone_set('UTC');

disableEaccelerator();
printTestDoxHint();
Copy link
Member

Choose a reason for hiding this comment

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

Seems that currently printed in any case. Shouldn't that only be shown when running tests and if testdox isn't enabled?

Copy link
Member Author

Choose a reason for hiding this comment

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

@sgiehl I can add this, but given testdox will rarely be used, and will only be set manually, I didn't think it was worth the added complexity. Let me know if this is still an important change.

@diosmosis
Copy link
Member Author

Also note: after merging, TrackingSpamPrevention's minimum required matomo will need to be updated

@sgiehl
Copy link
Member

sgiehl commented Jun 17, 2021 via email

@diosmosis
Copy link
Member Author

@sgiehl I see, nevermind, phpstorm gave me the wrong bootstrap file. It should be in the test's bootstrap.php.

@diosmosis diosmosis requested a review from sgiehl June 17, 2021 18:32
@sgiehl sgiehl merged commit 482cf02 into 4.x-dev Jun 18, 2021
@sgiehl sgiehl deleted the fix-build branch June 18, 2021 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sgiehl sgiehl Awaiting requested review from sgiehl

Assignees
No one assigned
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Milestone
4.4.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@diosmosis @sgiehl