Revert "Merge branch 'develop' into babolivier/account_expiration"

This reverts commit 8631413, reversing changes made to 0650483.
matrix-org · Apr 17, 2019 · af5d18e · af5d18e
1 parent d20142c
commit af5d18e
Show file tree

Hide file tree

Showing 190 changed files with 4,789 additions and 4,916 deletions.
diff --git a/changelog.d/4474.misc b/changelog.d/4474.misc
diff --git a/changelog.d/4555.bugfix b/changelog.d/4555.bugfix
diff --git a/changelog.d/4942.bugfix b/changelog.d/4942.bugfix
diff --git a/changelog.d/4947.feature b/changelog.d/4947.feature
diff --git a/changelog.d/4949.misc b/changelog.d/4949.misc
diff --git a/changelog.d/4953.misc b/changelog.d/4953.misc
diff --git a/changelog.d/4954.misc b/changelog.d/4954.misc
diff --git a/changelog.d/4955.bugfix b/changelog.d/4955.bugfix
diff --git a/changelog.d/4956.bugfix b/changelog.d/4956.bugfix
diff --git a/changelog.d/4959.misc b/changelog.d/4959.misc
diff --git a/changelog.d/4965.misc b/changelog.d/4965.misc
diff --git a/changelog.d/4968.misc b/changelog.d/4968.misc
diff --git a/changelog.d/4969.misc b/changelog.d/4969.misc
diff --git a/changelog.d/4974.misc b/changelog.d/4974.misc
diff --git a/changelog.d/4981.bugfix b/changelog.d/4981.bugfix
diff --git a/changelog.d/4982.misc b/changelog.d/4982.misc
diff --git a/changelog.d/4985.misc b/changelog.d/4985.misc
diff --git a/changelog.d/4987.misc b/changelog.d/4987.misc
diff --git a/changelog.d/4989.feature b/changelog.d/4989.feature
diff --git a/changelog.d/4990.bugfix b/changelog.d/4990.bugfix
diff --git a/changelog.d/4991.feature b/changelog.d/4991.feature
diff --git a/changelog.d/4992.misc b/changelog.d/4992.misc
diff --git a/changelog.d/4996.misc b/changelog.d/4996.misc
diff --git a/changelog.d/4998.misc b/changelog.d/4998.misc
diff --git a/changelog.d/4999.bugfix b/changelog.d/4999.bugfix
diff --git a/changelog.d/5001.misc b/changelog.d/5001.misc
diff --git a/changelog.d/5002.feature b/changelog.d/5002.feature
diff --git a/changelog.d/5003.bugfix b/changelog.d/5003.bugfix
diff --git a/changelog.d/5007.misc b/changelog.d/5007.misc
diff --git a/changelog.d/5010.feature b/changelog.d/5010.feature
diff --git a/changelog.d/5020.feature b/changelog.d/5020.feature
diff --git a/changelog.d/5024.misc b/changelog.d/5024.misc
diff --git a/changelog.d/5028.misc b/changelog.d/5028.misc
diff --git a/changelog.d/5030.misc b/changelog.d/5030.misc
diff --git a/changelog.d/5032.bugfix b/changelog.d/5032.bugfix
diff --git a/demo/start.sh b/demo/start.sh
@@ -27,27 +27,17 @@ for port in 8080 8081 8082; do
         --config-path "$DIR/etc/$port.config" \
         --report-stats no
 
-    printf '\n\n# Customisation made by demo/start.sh\n' >> $DIR/etc/$port.config
-    echo 'enable_registration: true' >> $DIR/etc/$port.config
-
     # Check script parameters
     if [ $# -eq 1 ]; then
         if [ $1 = "--no-rate-limit" ]; then
-            # messages rate limit
-            echo 'rc_messages_per_second: 1000' >> $DIR/etc/$port.config
-            echo 'rc_message_burst_count: 1000' >> $DIR/etc/$port.config
-
-            # registration rate limit
-            printf 'rc_registration:\n  per_second: 1000\n  burst_count: 1000\n' >> $DIR/etc/$port.config
-
-            # login rate limit
-            echo 'rc_login:' >> $DIR/etc/$port.config
-            printf '  address:\n    per_second: 1000\n    burst_count: 1000\n' >> $DIR/etc/$port.config
-            printf '  account:\n    per_second: 1000\n    burst_count: 1000\n' >> $DIR/etc/$port.config
-            printf '  failed_attempts:\n    per_second: 1000\n    burst_count: 1000\n' >> $DIR/etc/$port.config
+            # Set high limits in config file to disable rate limiting
+            perl -p -i -e 's/rc_messages_per_second.*/rc_messages_per_second: 1000/g' $DIR/etc/$port.config
+            perl -p -i -e 's/rc_message_burst_count.*/rc_message_burst_count: 1000/g' $DIR/etc/$port.config
         fi
     fi
 
+    perl -p -i -e 's/^enable_registration:.*/enable_registration: true/g' $DIR/etc/$port.config
+
     if ! grep -F "full_twisted_stacktraces" -q  $DIR/etc/$port.config; then
         echo "full_twisted_stacktraces: true" >> $DIR/etc/$port.config
     fi

diff --git a/docker/README.md b/docker/README.md
@@ -31,7 +31,6 @@ docker run \
     --mount type=volume,src=synapse-data,dst=/data \
     -e SYNAPSE_SERVER_NAME=my.matrix.host \
     -e SYNAPSE_REPORT_STATS=yes \
-    -p 8448:8448 \
     matrixdotorg/synapse:latest
 ```
 
@@ -58,10 +57,9 @@ configuration file there. Multiple application services are supported.
 Synapse requires a valid TLS certificate. You can do one of the following:
 
  * Provide your own certificate and key (as
-   `${DATA_PATH}/${SYNAPSE_SERVER_NAME}.tls.crt` and
-   `${DATA_PATH}/${SYNAPSE_SERVER_NAME}.tls.key`, or elsewhere by providing an
-   entire config as `${SYNAPSE_CONFIG_PATH}`). In this case, you should forward
-   traffic to port 8448 in the container, for example with `-p 443:8448`.
+   `${DATA_PATH}/${SYNAPSE_SERVER_NAME}.crt` and
+   `${DATA_PATH}/${SYNAPSE_SERVER_NAME}.key`, or elsewhere by providing an
+   entire config as `${SYNAPSE_CONFIG_PATH}`).
 
  * Use a reverse proxy to terminate incoming TLS, and forward the plain http
    traffic to port 8008 in the container. In this case you should set `-e
@@ -139,7 +137,7 @@ Database specific values (will use SQLite if not set):
   **NOTE**: You are highly encouraged to use postgresql! Please use the compose
   file to make it easier to deploy.
 * `POSTGRES_USER` - The user for the synapse postgres database. [default:
-  `synapse`]
+  `matrix`]
 
 Mail server specific values (will not send emails if not set):
 

diff --git a/docs/admin_api/delete_group.md b/docs/admin_api/delete_group.md
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
@@ -236,9 +236,6 @@ listeners:
 #  - medium: 'email'
 #    address: '[email protected]'
 
-# Used by phonehome stats to group together related servers.
-#server_context: context
-
 
 ## TLS ##
 
@@ -694,10 +691,6 @@ uploads_path: "DATADIR/uploads"
 #  - medium: msisdn
 #    pattern: '\+44'
 
-# Enable 3PIDs lookup requests to identity servers from this server.
-#
-#enable_3pid_lookup: true
-
 # If set, allows registration of standard or admin accounts by anyone who
 # has the shared secret, even if registration is otherwise disabled.
 #

diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db
@@ -58,11 +58,15 @@ BOOLEAN_COLUMNS = {
 
 
 APPEND_ONLY_TABLES = [
+    "event_content_hashes",
     "event_reference_hashes",
+    "event_signatures",
+    "event_edge_hashes",
     "events",
     "event_json",
     "state_events",
     "room_memberships",
+    "feedback",
     "topics",
     "room_names",
     "rooms",
@@ -84,6 +88,7 @@ APPEND_ONLY_TABLES = [
     "event_search",
     "presence_stream",
     "push_rules_stream",
+    "current_state_resets",
     "ex_outlier_stream",
     "cache_invalidation_stream",
     "public_room_list_stream",
@@ -806,7 +811,7 @@ class CursesProgress(Progress):
         middle_space = 1
 
         items = self.tables.items()
-        items = sorted(items, key=lambda i: (i[1]["perc"], i[0]))
+        items.sort(key=lambda i: (i[1]["perc"], i[0]))
 
         for i, (table, data) in enumerate(items):
             if i + 2 >= rows:

diff --git a/synapse/api/constants.py b/synapse/api/constants.py
@@ -69,7 +69,6 @@ class EventTypes(object):
     Redaction = "m.room.redaction"
     ThirdPartyInvite = "m.room.third_party_invite"
     Encryption = "m.room.encryption"
-    RelatedGroups = "m.room.related_groups"
 
     RoomHistoryVisibility = "m.room.history_visibility"
     CanonicalAlias = "m.room.canonical_alias"
@@ -103,6 +102,46 @@ class ThirdPartyEntityKind(object):
     LOCATION = "location"
 
 
+class RoomVersions(object):
+    V1 = "1"
+    V2 = "2"
+    V3 = "3"
+    STATE_V2_TEST = "state-v2-test"
+
+
+class RoomDisposition(object):
+    STABLE = "stable"
+    UNSTABLE = "unstable"
+
+
+# the version we will give rooms which are created on this server
+DEFAULT_ROOM_VERSION = RoomVersions.V1
+
+# vdh-test-version is a placeholder to get room versioning support working and tested
+# until we have a working v2.
+KNOWN_ROOM_VERSIONS = {
+    RoomVersions.V1,
+    RoomVersions.V2,
+    RoomVersions.V3,
+    RoomVersions.STATE_V2_TEST,
+    RoomVersions.V3,
+}
+
+
+class EventFormatVersions(object):
+    """This is an internal enum for tracking the version of the event format,
+    independently from the room version.
+    """
+    V1 = 1
+    V2 = 2
+
+
+KNOWN_EVENT_FORMAT_VERSIONS = {
+    EventFormatVersions.V1,
+    EventFormatVersions.V2,
+}
+
+
 ServerNoticeMsgType = "m.server_notice"
 ServerNoticeLimitReached = "m.server_notice.usage_limit_reached"
 

diff --git a/synapse/api/room_versions.py b/synapse/api/room_versions.py
diff --git a/synapse/app/federation_sender.py b/synapse/app/federation_sender.py
@@ -38,7 +38,7 @@
 from synapse.replication.slave.storage.registration import SlavedRegistrationStore
 from synapse.replication.slave.storage.transactions import SlavedTransactionStore
 from synapse.replication.tcp.client import ReplicationClientHandler
-from synapse.replication.tcp.streams._base import ReceiptsStream
+from synapse.replication.tcp.streams import ReceiptsStream
 from synapse.server import HomeServer
 from synapse.storage.engines import create_engine
 from synapse.types import ReadReceipt

diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
@@ -518,7 +518,6 @@ def phone_stats_home():
             uptime = 0
 
         stats["homeserver"] = hs.config.server_name
-        stats["server_context"] = hs.config.server_context
         stats["timestamp"] = now
         stats["uptime_seconds"] = uptime
         version = sys.version_info
@@ -559,6 +558,7 @@ def phone_stats_home():
 
         stats["database_engine"] = hs.get_datastore().database_engine_name
         stats["database_server_version"] = hs.get_datastore().get_server_version()
+
         logger.info("Reporting stats to matrix.org: %s" % (stats,))
         try:
             yield hs.get_simple_http_client().put_json(