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

URL preview blacklisting fixes #5155

Merged
merged 4 commits into from
May 10, 2019
Merged

URL preview blacklisting fixes #5155

merged 4 commits into from
May 10, 2019

Conversation

anoadragon453
Copy link
Member

Split out from #5043

Prevents a SynapseError being raised inside of a IResolutionReceiver and instead opts to just return 0 results. This thus means that we have to lump a failed lookup and a blacklisted lookup together with the same error message, but the substitute should be generic enough to cover both cases.

@anoadragon453 anoadragon453 force-pushed the anoa/blacklist_fixes branch from 550f0eb to 8e0817e Compare May 8, 2019 21:33
@codecov
Copy link

codecov bot commented May 8, 2019

Codecov Report

Merging #5155 into develop will increase coverage by <.01%.
The diff coverage is 94.73%.

@@             Coverage Diff             @@
##           develop    #5155      +/-   ##
===========================================
+ Coverage    61.74%   61.74%   +<.01%     
===========================================
  Files          336      336              
  Lines        34632    34636       +4     
  Branches      5688     5691       +3     
===========================================
+ Hits         21383    21387       +4     
  Misses       11721    11721              
  Partials      1528     1528

@anoadragon453 anoadragon453 requested a review from a team May 8, 2019 22:43
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

lgtm modulo changelog nit. Please fix and (squash-)merge!

@@ -0,0 +1 @@
Prevent an exception from being raised in a IResolutionReceiver and use a more generic error message for blacklisted URL previews.
Copy link
Member

Choose a reason for hiding this comment

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

I'd call it a misc to be honest, unless we can think of a way to phrase it in a way that a user might recognise as a bugfix.

@anoadragon453 anoadragon453 merged commit 2f48c4e into develop May 10, 2019
@anoadragon453 anoadragon453 deleted the anoa/blacklist_fixes branch May 10, 2019 17:32
anoadragon453 added a commit that referenced this pull request May 10, 2019
* develop: (45 commits)
  URL preview blacklisting fixes (#5155)
  Revert 085ae34
  Add a DUMMY stage to captcha-only registration flow
  Make Prometheus snippet less confusing on the metrics collection doc (#4288)
  Set syslog identifiers in systemd units (#5023)
  Run Black on the tests again (#5170)
  Add AllowEncodedSlashes to apache (#5068)
  remove instructions for jessie installation (#5164)
  Run `black` on per_destination_queue
  Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)
  Fix bogus imports in tests (#5154)
  add options to require an access_token to GET /profile and /publicRooms on CS API (#5083)
  Do checks on aliases for incoming m.room.aliases events (#5128)
  Remove the requirement to authenticate for /admin/server_version. (#5122)
  Fix spelling in server notices admin API docs (#5142)
  Fix sample config
  0.99.3.2
  include disco in deb build target list
  changelog
  Debian: we now need libpq-dev.
  ...
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.

2 participants