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

URL preview blacklisting fixes #5155

Merged
merged 4 commits into from May 10, 2019

Conversation

Projects
None yet
2 participants
@anoadragon453
Copy link
Member

commented May 8, 2019

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 added some commits May 8, 2019

Merge branch 'develop' into anoa/blacklist_fixes
* develop:
  Fix bogus imports in tests (#5154)

@anoadragon453 anoadragon453 force-pushed the anoa/blacklist_fixes branch from 550f0eb to 8e0817e May 8, 2019

@codecov

This comment has been minimized.

Copy link

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 matrix-org/synapse-core May 8, 2019

@richvdh

richvdh approved these changes May 9, 2019

Copy link
Member

left a comment

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.

This comment has been minimized.

Copy link
@richvdh

richvdh May 9, 2019

Member

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

24 checks passed

buildkite/synapse Build #1323 passed (15 minutes, 46 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 17 seconds)
Details
buildkite/synapse/isort Passed (17 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (16 seconds)
Details
buildkite/synapse/packaging Passed (17 seconds)
Details
buildkite/synapse/pep-8 Passed (56 seconds)
Details
buildkite/synapse/pipeline Passed (3 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-4 Passed (12 minutes, 30 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-5 Passed (12 minutes, 16 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite Passed (6 minutes, 28 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite-slash-old-deps Passed (8 minutes, 19 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-4 Passed (13 minutes, 32 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (13 minutes, 55 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (7 minutes, 58 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (8 minutes, 45 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (13 minutes, 16 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (13 minutes, 45 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (7 minutes, 49 seconds)
Details
ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
codecov/patch 94.73% of diff hit (target 0%)
Details
codecov/project 61.74% (target 0%)
Details

@anoadragon453 anoadragon453 deleted the anoa/blacklist_fixes branch May 10, 2019

anoadragon453 added a commit that referenced this pull request May 10, 2019

Merge branch 'develop' into anoa/blacklist_ip_ranges
* 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 join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.