Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Ensure the body is a string before comparing push rules #7701

Merged
merged 3 commits into from
Jun 15, 2020

Conversation

clokep
Copy link
Member

@clokep clokep commented Jun 15, 2020

Fixes #7700 by adding a type check to ensure the body is a string before applying regular expressions.

@clokep
Copy link
Member Author

clokep commented Jun 15, 2020

I think this has been broken since 29c353c so..."forever" (0.34 maybe?)

@clokep clokep requested a review from a team June 15, 2020 19:09
@clokep
Copy link
Member Author

clokep commented Jun 15, 2020

Some of this code could still use better tests, but I expanded the ones that were easy.

@clokep clokep merged commit cc32fa7 into develop Jun 15, 2020
@clokep clokep deleted the clokep/push-rules branch June 15, 2020 20:20
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit '03619324f':
  Create a ListenerConfig object (#7681)
  Fix changelog wording
  1.15.1
  Wrap register_device coroutine in an ensureDeferred (#7684)
  Ensure the body is a string before comparing push rules. (#7701)
  Ensure etag is a string for GET room_keys/version response (#7691)
  Update m.id.phone to use 'phone' instead of 'number' (#7687)
  Fix "There was no active span when trying to log." error (#7698)
  Enable 3PID add/bind/unbind endpoints on r0 routes
  Discard RDATA from already seen positions. (#7648)
  Replace iteritems/itervalues/iterkeys with native versions. (#7692)
  Fix warnings about losing log context during UI auth. (#7688)
  Fix a typo when comparing the URI & method during UI Auth. (#7689)
  Remove "user_id" from GET /presence. (#7606)
  Increase the default SAML session expirary time to 15 minutes. (#7664)
  fix typo in sample_config.yaml (#7652)
  Take out a lock before modifying _CACHES (#7663)
  Add option to enable encryption by default for new rooms (#7639)
  Clean-up the fallback login code. (#7657)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

_contains_display_name evaluator barfs on events with no body
2 participants