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

Do checks on aliases for incoming m.room.aliases events #5128

Merged
merged 14 commits into from May 8, 2019

Conversation

2 participants
@babolivier
Copy link
Member

commented May 2, 2019

Follow-up to #5124

Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended.

@babolivier babolivier requested a review from matrix-org/synapse-core May 2, 2019

babolivier added some commits May 2, 2019

@codecov

This comment has been minimized.

Copy link

commented May 2, 2019

Codecov Report

Merging #5128 into develop will increase coverage by 0.04%.
The diff coverage is 94.44%.

@@             Coverage Diff             @@
##           develop    #5128      +/-   ##
===========================================
+ Coverage    61.69%   61.74%   +0.04%     
===========================================
  Files          336      335       -1     
  Lines        34549    34525      -24     
  Branches      5674     5678       +4     
===========================================
+ Hits         21316    21318       +2     
+ Misses       11702    11681      -21     
+ Partials      1531     1526       -5
Show resolved Hide resolved synapse/handlers/message.py Outdated
Show resolved Hide resolved synapse/handlers/message.py Outdated
Show resolved Hide resolved synapse/handlers/message.py Outdated
Show resolved Hide resolved tests/rest/client/v1/test_directory.py Outdated

babolivier added some commits May 3, 2019

Update docstring
Make docstring clearer about what's returned by context.get_current_state_ids and context.get_prev_state_ids
Doc

@babolivier babolivier requested a review from matrix-org/synapse-core May 3, 2019

@babolivier babolivier added this to In progress in Homeserver Task Board via automation May 8, 2019

@richvdh
Copy link
Member

left a comment

a few questions about the comments; otherwise lgtm.

Show resolved Hide resolved synapse/events/validator.py Outdated
Show resolved Hide resolved synapse/handlers/message.py Outdated
Show resolved Hide resolved synapse/handlers/message.py Outdated
Show resolved Hide resolved synapse/handlers/message.py Outdated
Show resolved Hide resolved synapse/handlers/message.py

@babolivier babolivier requested a review from matrix-org/synapse-core May 8, 2019

@richvdh

richvdh approved these changes May 8, 2019

Copy link
Member

left a comment

lgtm!

@babolivier babolivier merged commit 1473058 into develop May 8, 2019

24 checks passed

buildkite/synapse Build #1265 passed (23 minutes, 49 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 14 seconds)
Details
buildkite/synapse/isort Passed (51 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (13 seconds)
Details
buildkite/synapse/packaging Passed (1 minute)
Details
buildkite/synapse/pep-8 Passed (57 seconds)
Details
buildkite/synapse/pipeline Passed (9 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-4 Passed (12 minutes, 50 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-5 Passed (12 minutes, 39 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite Passed (7 minutes, 21 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite-slash-old-deps Passed (8 minutes, 20 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-4 Passed (13 minutes, 36 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (13 minutes, 29 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (7 minutes, 48 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (7 minutes, 48 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (13 minutes, 11 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (13 minutes, 7 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (7 minutes, 20 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.44% of diff hit (target 0%)
Details
codecov/project 61.74% (target 0%)
Details

Homeserver Task Board automation moved this from In progress to Done May 8, 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.