summary refs log tree commit diff
path: root/synapse/handlers/federation.py (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix resync remote devices on receive PDU in worker mode. (#7815)Erik Johnston2020-07-101-8/+19
* Fix recursion error when fetching auth chain over federation (#7817)Erik Johnston2020-07-101-12/+37
* Add `HomeServer.signing_key` property (#7805)Richard van der Hoff2020-07-081-1/+1
* Merge branch 'master' into developPatrick Cloke2020-07-021-3/+3
|\
| * Correctly handle outliers as prev events over federationErik Johnston2020-07-021-3/+3
* | Add early returns to `_check_for_soft_fail` (#7769)Richard van der Hoff2020-07-011-64/+55
* | Type checking for `FederationHandler` (#7770)Richard van der Hoff2020-07-011-17/+30
* | Yield during large v2 state res. (#7735)Erik Johnston2020-06-241-0/+1
* | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-161-5/+4
* | Replace iteritems/itervalues/iterkeys with native versions. (#7692)Patrick Cloke2020-06-151-12/+10
* | Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-101-2/+10
|/
* Fix exceptions when fetching events from a down host. (#7622)Erik Johnston2020-06-031-1/+1
* Add option to move event persistence off master (#7517)Erik Johnston2020-05-221-6/+10
* Add ability to wait for replication streams (#7542)Erik Johnston2020-05-221-10/+23
* Fix exception reporting due to HTTP request errors. (#7556)Erik Johnston2020-05-221-0/+7
* Convert federation handler to async/await. (#7459)Patrick Cloke2020-05-111-18/+14
* async/await is_server_admin (#7363)Andrew Morgan2020-05-011-11/+10
* Convert some of the federation handler methods to async/await. (#7338)Patrick Cloke2020-04-241-25/+24
* Rewrite prune_old_outbound_device_pokes for efficiency (#7159)Richard van der Hoff2020-03-301-23/+2
* Store room version on invite (#6983)Richard van der Hoff2020-02-261-0/+12
* Remove redundant store_room call (#6979)Richard van der Hoff2020-02-241-23/+0
* Upsert room version when we join over federation (#6968)Richard van der Hoff2020-02-241-10/+12
* Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-211-9/+9
* Limit the number of events that can be requested when backfilling events (#6864)Patrick Cloke2020-02-061-0/+4
* pass room version into FederationClient.send_join (#6854)Richard van der Hoff2020-02-061-2/+1
* Merge pull request #6823 from matrix-org/rav/redact_changes/5Richard van der Hoff2020-02-061-6/+2
|\
| * Pass room version object into `FederationClient.get_pdu`Richard van der Hoff2020-02-051-6/+2
* | Merge tag 'v1.10.0rc2' into developErik Johnston2020-02-061-14/+60
|\ \ | |/ |/|
| * Check sender_key matches on inbound encrypted events. (#6850)Erik Johnston2020-02-051-13/+59
| * Fix detecting unknown devices from remote encrypted events. (#6848)Erik Johnston2020-02-041-1/+1
* | make FederationHandler.send_invite asyncRichard van der Hoff2020-02-031-3/+2
* | make FederationHandler.on_get_missing_events asyncRichard van der Hoff2020-02-031-5/+4
* | make FederationHandler.user_joined_room asyncRichard van der Hoff2020-02-031-3/+3
* | make FederationHandler._clean_room_for_join asyncRichard van der Hoff2020-02-031-4/+4
* | make FederationHandler._notify_persisted_event asyncRichard van der Hoff2020-02-031-4/+6
* | make FederationHandler.persist_events_and_notify asyncRichard van der Hoff2020-02-031-10/+10
* | make FederationHandler._make_and_verify_event asyncRichard van der Hoff2020-02-031-5/+10
* | make FederationHandler.do_remotely_reject_invite asyncRichard van der Hoff2020-02-031-6/+7
* | make FederationHandler._check_for_soft_fail asyncRichard van der Hoff2020-02-031-13/+9
* | make FederationHandler._persist_auth_tree asyncRichard van der Hoff2020-02-031-11/+7
* | make FederationHandler.do_invite_join asyncRichard van der Hoff2020-02-031-16/+14
* | make FederationHandler.on_event_auth asyncRichard van der Hoff2020-02-031-5/+4
* | make FederationHandler.on_exchange_third_party_invite_request asyncRichard van der Hoff2020-02-031-14/+12
* | make FederationHandler.construct_auth_difference asyncRichard van der Hoff2020-02-031-3/+4
* | make FederationHandler._update_context_for_auth_events asyncRichard van der Hoff2020-02-031-10/+10
* | make FederationHandler._update_auth_events_and_context_for_auth asyncRichard van der Hoff2020-02-031-20/+21
* | make FederationHandler.do_auth asyncRichard van der Hoff2020-02-031-10/+14
* | make FederationHandler._prep_event asyncRichard van der Hoff2020-02-031-23/+10
* | make FederationHandler._handle_new_event asyncRichard van der Hoff2020-02-031-6/+7
* | make FederationHandler._handle_new_events asyncRichard van der Hoff2020-02-031-8/+6
* | make FederationHandler.on_make_leave_request asyncRichard van der Hoff2020-02-031-13/+10
* | make FederationHandler.on_send_leave_request asyncRichard van der Hoff2020-02-031-5/+3
* | make FederationHandler.on_make_join_request asyncRichard van der Hoff2020-02-031-13/+10
* | make FederationHandler.on_invite_request asyncRichard van der Hoff2020-02-031-5/+4
* | make FederationHandler.on_send_join_request asyncRichard van der Hoff2020-02-031-9/+7
* | make FederationHandler.on_query_auth asyncRichard van der Hoff2020-02-031-7/+6
|/
* pass room_version into compute_event_signature (#6807)Richard van der Hoff2020-01-311-1/+4
* Merge pull request #6820 from matrix-org/rav/get_room_version_idRichard van der Hoff2020-01-311-9/+9
|\
| * s/get_room_version/get_room_version_id/Richard van der Hoff2020-01-311-9/+9
* | Fix bug with getting missing auth event during join 500'ed (#6810)Erik Johnston2020-01-311-1/+5
|/
* pass room version into FederationHandler.on_invite_request (#6805)Richard van der Hoff2020-01-301-3/+3
* Resync remote device list when detected as stale. (#6786)Erik Johnston2020-01-301-2/+16
* Detect unknown remote devices and mark cache as stale (#6776)Erik Johnston2020-01-281-0/+20
* Pass room version object into event_auth.check and check_redaction (#6788)Richard van der Hoff2020-01-281-7/+11
* Add `rooms.room_version` column (#6729)Erik Johnston2020-01-271-15/+50
* Add StateMap type alias (#6715)Erik Johnston2020-01-161-6/+4
* Fix conditions failing if min_depth = 0Brendan Abolivier2020-01-071-2/+2
* Merge branch 'master' into developRichard van der Hoff2019-12-201-1/+4
|\
| * Fix exceptions when attempting to backfill (#6576)Richard van der Hoff2019-12-201-1/+4
* | Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-201-7/+7
* | Merge release-v1.7.1 into developRichard van der Hoff2019-12-181-0/+1
|\|
| * Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-161-1/+1
| * Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-161-163/+80
| * sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-161-0/+1
| * Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-161-24/+54
| * Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-161-18/+21
| * Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-161-6/+95
* | Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-161-1/+1
* | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-161-167/+80
* | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-131-0/+1
* | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-121-23/+51
* | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-111-22/+28
* | convert to async: FederationHandler._process_received_pduRichard van der Hoff2019-12-111-11/+10
* | convert to async: FederationHandler._get_state_for_roomRichard van der Hoff2019-12-111-21/+21
* | convert to async: FederationHandler.on_receive_pduRichard van der Hoff2019-12-111-27/+22
* | Convert federation backfill to asyncRichard van der Hoff2019-12-111-25/+22
* | Clean up some logging (#6515)Richard van der Hoff2019-12-111-18/+19
* | Prevent redacted events from appearing in message search (#6377)Andrew Morgan2019-12-111-2/+5
* | Prevent message search in upgraded rooms we're not in (#6385)Andrew Morgan2019-12-111-2/+2
* | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-101-6/+95
|/
* Stronger typing in the federation handler (#6480)Richard van der Hoff2019-12-051-24/+57
* Sanity-check the rooms of auth events before pulling them in. (#6472)Richard van der Hoff2019-12-051-9/+25
* get rid of (most of) have_events from _update_auth_events_and_context_for_aut...Richard van der Hoff2019-12-041-38/+24
* Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-031-0/+8
* Propagate reason in remotely rejected invitesErik Johnston2019-11-281-2/+2
* Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-271-2/+2
|\
| * Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-261-3/+8
| |\
| * | Fix 3PID invite exchangeBrendan Abolivier2019-11-191-1/+1
| * | Implement per-room message retention policiesBrendan Abolivier2019-11-041-1/+1
* | | remove confusing fixmeRichard van der Hoff2019-11-261-6/+0
* | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/4Richard van der Hoff2019-11-181-2/+2
|\ \ \ | | |/ | |/|
| * | Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-121-2/+2
* | | Use get_events_as_list rather than lots of calls to get_eventRichard van der Hoff2019-11-081-16/+8
* | | Update some docstrings and commentsRichard van der Hoff2019-11-081-8/+31
* | | Simplify _update_auth_events_and_context_for_authRichard van der Hoff2019-11-081-11/+9
|/ /
* | Fix bug which caused rejected events to be stored with the wrong room state ...Richard van der Hoff2019-11-061-0/+1
* | Add some checks that we aren't using state from rejected events (#6330)Richard van der Hoff2019-11-051-1/+5
|/
* Factor out an _AsyncEventContextImpl (#6298)Richard van der Hoff2019-11-011-19/+19
* Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-011-1/+29
* Update black to 19.10b0 (#6304)Amber Brown2019-11-011-4/+5
* Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-311-9/+10
|\
| * Port to use state storageErik Johnston2019-10-301-9/+10
* | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-311-16/+20
|/
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-301-3/+19
|\
| * Fix log line that was printing undefined value (#6278)Andrew Morgan2019-10-301-1/+1
| * Improve signature checking on some federation APIs (#6262)Richard van der Hoff2019-10-281-2/+18
* | Use new EventPersistenceStoreErik Johnston2019-10-231-1/+2
|/
* Remove Auth.check method (#6217)Richard van der Hoff2019-10-181-3/+4
* rip out some unreachable codeRichard van der Hoff2019-10-171-102/+0
* TypoBrendan Abolivier2019-10-041-1/+1
* LintBrendan Abolivier2019-10-041-3/+1
* Incorporate reviewBrendan Abolivier2019-10-041-14/+8
* Add test caseBrendan Abolivier2019-10-031-1/+1
* LintBrendan Abolivier2019-10-021-1/+3
* Don't 500 code when trying to exchange a revoked 3PID inviteBrendan Abolivier2019-10-021-2/+13
* Remove origin parameter from add_display_name_to_third_party_invite and add p...Andrew Morgan2019-09-111-1/+6
* Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-301-1/+1
* Implement a structured logging output system. (#5680)Amber Brown2019-08-281-2/+3
* Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-011-0/+3
|\
| * Don't log as exception when failing durig backfillErik Johnston2019-07-301-0/+3
* | Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-0/+25
|/
* Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-261-2/+35
|\
| * Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-261-2/+35
* | Replace returnValue with return (#5736)Amber Brown2019-07-231-42/+40
|/
* Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-041-21/+22
* Run Black. (#5482)Amber Brown2019-06-201-521/+363
* Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorErik Johnston2019-06-191-9/+19
|\
| * Fix loglineErik Johnston2019-06-181-1/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_mi...Erik Johnston2019-06-181-132/+289
| |\
| * | Handle the case of `get_missing_events` failingErik Johnston2019-04-101-9/+20
* | | Add some logging to 3pid invite sig verification (#5015)David Baker2019-06-181-8/+38
| |/ |/|
* | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateErik Johnston2019-06-171-6/+0
|\ \
| * | Fix 3PID invite room state over federation.Erik Johnston2019-06-141-6/+0
* | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-141-2/+66
|/ /
* | Add logging when request fails and clarify we ignore errors.Erik Johnston2019-06-051-4/+12
* | Fix handling of failures when calling /event_auth.Erik Johnston2019-06-031-12/+38
* | Simplifications and comments in do_auth (#5227)Richard van der Hoff2019-05-231-120/+181
* | Exclude soft-failed events from fwd-extremity candidates. (#5146)Richard van der Hoff2019-05-211-1/+6
|/
* Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-011-8/+5
* Factor out soft fail checksErik Johnston2019-03-081-5/+22
* Implement soft failErik Johnston2019-03-061-1/+76
* clarify commentsErik Johnston2019-03-051-8/+11
* Only check history visibility when filteringErik Johnston2019-03-041-1/+3
* s/get_forward_events/get_successor_events/Erik Johnston2019-03-041-1/+1
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n...Erik Johnston2019-03-041-3/+31
|\
| * Fix typoErik Johnston2019-02-251-1/+1
| * More commentsErik Johnston2019-02-251-0/+4
| * Assert rather than clobber the valuesErik Johnston2019-02-251-2/+2
| * Add comments and paranoiaErik Johnston2019-02-251-2/+23
| * Fix backfill storing incorrect state for eventsErik Johnston2019-02-221-1/+4
* | Update commentsErik Johnston2019-02-271-3/+13
* | Stop backpaginating when events not visibleErik Johnston2019-02-201-0/+31
|/
* Fix flake8 (#4519)Amber Brown2019-01-301-1/+1
* Use snder and not event ID domain to check if oursErik Johnston2019-01-291-0/+8
* Fixup calls to `comput_event_signature`Erik Johnston2019-01-291-1/+1
* Merge pull request #4494 from matrix-org/erikj/fixup_event_validatorErik Johnston2019-01-291-2/+5
|\
| * Split up event validation between event and builderErik Johnston2019-01-281-2/+5
* | Pass through room version to event authErik Johnston2019-01-251-8/+12
|/
* Require event format version to parse or create eventsErik Johnston2019-01-251-28/+44
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-251-31/+18
|\
| * Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-241-2/+15
| |\
| | * Review commentsErik Johnston2019-01-241-0/+5
| | * Add room_version param to get_pduErik Johnston2019-01-231-2/+10
| * | Remove unecessary setting of outlier bitErik Johnston2019-01-241-2/+0
| * | Use term 'out of band membership' insteadErik Johnston2019-01-241-2/+2
| * | Clarify the invite flowsErik Johnston2019-01-231-1/+11
| * | Remove unnecessary '_sign_event'Erik Johnston2019-01-231-14/+0
| * | Store rejected remote invite events as outliersErik Johnston2019-01-231-32/+12
| |/
* / Implement MSC 1813 - Add room version to make APIsErik Johnston2019-01-231-1/+1
|/
* Remove hack to support rejoining roomsErik Johnston2018-11-091-74/+42
* Simplify to always drop events if server isn't in the roomErik Johnston2018-11-091-14/+9
* Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-061-24/+24
* Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-241-15/+15
|\
| * CommentErik Johnston2018-10-241-2/+5
| * Rename resolve_events_with_factoryErik Johnston2018-10-241-2/+2
| * Fix up use of resolve_events_with_factoryErik Johnston2018-10-161-13/+10
* | Remove redundant run_as_background_process() from pusherpoolRichard van der Hoff2018-10-221-2/+2
* | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-161-7/+5
|/
* Avoid reraise, to improve stacktracesRichard van der Hoff2018-10-011-10/+10
* Include event when resolving state for missing prevsRichard van der Hoff2018-09-271-2/+16
* Include state from remote servers in pdu handlingRichard van der Hoff2018-09-271-4/+19
* Fix "unhashable type: 'list'" exception in federation handlingRichard van der Hoff2018-09-271-7/+12
* more commentsRichard van der Hoff2018-09-271-4/+3
* Clarifications in FederationHandlerRichard van der Hoff2018-09-271-2/+11
* Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2Richard van der Hoff2018-09-271-0/+4
|\
| * Logging improvementsRichard van der Hoff2018-09-261-0/+4
* | Include eventid in log lines when processing incoming federation transactions...Richard van der Hoff2018-09-271-26/+39
|/
* Comments and interface cleanup for on_receive_pduRichard van der Hoff2018-09-201-23/+46
* Improve the logging when handling a federation transaction (#3904)Richard van der Hoff2018-09-191-55/+109
* Bump timeout on get_missing_events requestRichard van der Hoff2018-09-181-1/+30
* Port handlers/ to Python 3 (#3803)Amber Brown2018-09-071-3/+3
* Remove unnecessary resolve_events_with_state_mapErik Johnston2018-08-221-1/+1
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-201-20/+59
|\
| * Fix logcontexts for running pushersRichard van der Hoff2018-08-171-2/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-151-1/+1
| |\
| | * Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-101-1/+1
| * | Use federation handler function rather than duplicateErik Johnston2018-08-151-7/+7
| * | Move clean_room_for_join to masterErik Johnston2018-08-091-2/+14
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-091-2/+11
| |\|
| * | Add EDU/query handling over replicationErik Johnston2018-08-061-11/+13
| * | Add replication APIs for persisting federation eventsErik Johnston2018-08-061-9/+35
* | | Remove redundant room_version checksErik Johnston2018-08-201-1/+1
* | | Choose state algorithm based on room versionErik Johnston2018-08-091-2/+6
| |/ |/|
* | include known room versions in outgoing make_joinsRichard van der Hoff2018-08-061-2/+11
|/
* Merge branch 'master' into developRichard van der Hoff2018-08-021-6/+23
|\
| * Avoid extra db lookupsRichard van der Hoff2018-08-021-27/+11
| * Validation for events/rooms in fed requestsRichard van der Hoff2018-08-021-1/+34
* | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-021-87/+88
|\ \
| * | update docsErik Johnston2018-08-011-3/+5
| * | _persist_auth_tree no longer returns anythingErik Johnston2018-08-011-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_...Erik Johnston2018-07-301-1/+1
| |\ \
| * | | Split out DB writes in federation handlerErik Johnston2018-07-251-83/+82
* | | | rename replication_layer to federation_clientRichard van der Hoff2018-07-311-14/+14
| |/ / |/| |
* | | Fix a minor documentation typo in on_make_leaveTravis Ralston2018-07-251-1/+1
|/ /
* | Handle delta_ids being None in _update_context_for_auth_eventsRichard van der Hoff2018-07-231-7/+6
* | Add support for updating stateErik Johnston2018-07-231-9/+23
* | Use new gettersErik Johnston2018-07-231-7/+16
* | Make the rest of the .iterwhatever go away (#3562)Amber Brown2018-07-211-9/+9
* | Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacksRichard van der Hoff2018-07-181-43/+0
|\ \ | |/ |/|
| * Merge branch 'develop' into rav/drop_re_signing_hacksRichard van der Hoff2018-07-041-51/+153
| |\
| * | Remove event re-signing hacksRichard van der Hoff2018-06-071-43/+0
* | | Move filter_events_for_server out of FederationHandlerRichard van der Hoff2018-07-161-138/+6
* | | run isortAmber Brown2018-07-091-18/+22
| |/ |/|
* | try and clean upAmber Brown2018-06-271-3/+6
* | pep8Amber Brown2018-06-271-6/+4
* | cleanupsAmber Brown2018-06-271-13/+15
* | handle federation not telling us about prev_eventsAmber Brown2018-06-271-25/+62
* | Actually fix itErik Johnston2018-06-251-3/+3
* | CommentErik Johnston2018-06-251-0/+8
* | Fix bug with assuming wrong typeErik Johnston2018-06-251-2/+2
* | Add fast path to _filter_events_for_serverErik Johnston2018-06-251-1/+34
* | Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibili...Erik Johnston2018-06-251-0/+13
* | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility"Richard van der Hoff2018-06-221-13/+0
* | Merge pull request #3431 from matrix-org/rav/erasure_visibilityErik Johnston2018-06-221-0/+13
|\ \
| * | Filter out erased messagesRichard van der Hoff2018-06-121-0/+13
* | | Merge pull request #3428 from matrix-org/erikj/persisted_pduErik Johnston2018-06-221-18/+26
|\| |
| * | simplify get_persisted_pduRichard van der Hoff2018-06-121-18/+26
* | | Remove run_on_reactor (#3395)Amber Brown2018-06-141-5/+1
|/ /
* / Fix event filtering in get_missing_events handlerRichard van der Hoff2018-06-081-0/+4
|/
* Consistently use six's iteritems and wrap lazy keys/values in list() if they'...Amber Brown2018-05-311-9/+8