Skip to content

Consistently wrap UntrustedRegexp patterns in () for RE2

drew stachon requested to merge untrusted-regexp-match-groups-bugfix into master

What does this MR do?

This is a fix for a regression reported in #63115 (closed) / https://sentry.gitlab.net/gitlab/devgitlaborg/issues/795304/

Because of a difference in how RE2 and Ruby return matches from patterns with match groups, we optionally wrapped patterns in () if none were present. However this is insufficient since we started using actual match data instead of just a simple match-presence check in !27925 (merged).

The fix here removes the check for an existing match group, and instead opts directly in to the existing behavior for patterns without any match group. Specs are added to cover the cases that had been throwing the errors picked up in Sentry.

Does this MR meet the acceptance criteria?

Conformity

Performance and testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Elliot Rushton

Merge request reports