merge upstream changes

tests/Dockerfile

@@ -11,6 +11,22 @@ WORKDIR $SYNAPSE_CONFIG_DIR
 RUN chown -R 991:991 . \
  && /start.py generate \
  && sed -i 's=/data=/srv=;s=8008=80=;s=#sup=sup=;' homeserver.yaml \
+ && echo "" >> homeserver.yaml \
+ && echo "rc_message:" >> homeserver.yaml \
+ && echo "  burst_count: 1000" >> homeserver.yaml \
+ && echo "rc_registration:" >> homeserver.yaml \
+ && echo "  burst_count: 1000" >> homeserver.yaml \
+ && echo "rc_registration_token_validity:" >> homeserver.yaml \
+ && echo "  burst_count: 1000" >> homeserver.yaml \
+ && echo "rc_login:" >> homeserver.yaml \
+ && echo "  address:" >> homeserver.yaml \
+ && echo "    burst_count: 1000" >> homeserver.yaml \
+ && echo "  account:" >> homeserver.yaml \
+ && echo "    burst_count: 1000" >> homeserver.yaml \
+ && echo "  failed_attempts:" >> homeserver.yaml \
+ && echo "    burst_count: 1000" >> homeserver.yaml \
+ && echo "rc_joins:" >> homeserver.yaml \
+ && echo "  burst_count: 1000" >> homeserver.yaml \
  && python -m synapse.app.homeserver --config-path homeserver.yaml --generate-keys
 
 RUN pip install --no-cache-dir markdown matrix-nio httpx coverage

tests/example_gitlab_gchat.json

@@ -0,0 +1 @@
+{"text":"John Doe pushed to branch \u003chttps://gitlab.com/jdoe/test/commits/master|master\u003e of \u003chttps://gitlab.com/jdoe/test|John Doe / test\u003e (\u003chttps://gitlab.com/jdoe/test/compare/b76004b20503d4d506e51a670de095cc063e4707...3517b06c64c9d349e2213650d6c009db0471361e|Compare changes\u003e)\n\u003chttps://gitlab.com/jdoe/test/-/commit/3517b06c64c9d349e2213650d6c009db0471361e|3517b06c\u003e: Merge branch 'prod' into 'master' - John Doe\n\n\u003chttps://gitlab.com/jdoe/test/-/commit/1f661795b220c5fe352f391eb8de3ac4fcc6fc1d|1f661795\u003e: Merge branch 'revert-a827b196' into 'prod' - John Doe\n\n\u003chttps://gitlab.com/jdoe/test/-/commit/b76004b20503d4d506e51a670de095cc063e4707|b76004b2\u003e: Merge branch 'revert-a827b196' into 'master' - John Doe"}

tests/example_gitlab_teams.json

@@ -0,0 +1 @@
+{"sections":[{"activityTitle":"John Doe pushed to branch [master](https://gitlab.com/jdoe/test/commits/master)","activitySubtitle":"in [John Doe / test](https://gitlab.com/jdoe/test)","activityText":"[Compare changes](https://gitlab.com/jdoe/test/compare/b76004b20503d4d506e51a670de095cc063e4707...3517b06c64c9d349e2213650d6c009db0471361e)","activityImage":"https://secure.gravatar.com/avatar/80\u0026d=identicon"},{"text":"[3517b06c](https://gitlab.com/jdoe/test/-/commit/3517b06c64c9d349e2213650d6c009db0471361e): Merge branch 'prod' into 'master' - John Doe\n\n[1f661795](https://gitlab.com/jdoe/test/-/commit/1f661795b220c5fe352f391eb8de3ac4fcc6fc1d): Merge branch 'revert-a827b196' into 'prod' - John Doe\n\n[b76004b2](https://gitlab.com/jdoe/test/-/commit/b76004b20503d4d506e51a670de095cc063e4707): Merge branch 'revert-a827b196' into 'master' - John Doe"}],"title":"John Doe / test","summary":"John Doe pushed to branch [master](https://gitlab.com/jdoe/test/commits/master) of [John Doe / test](https://gitlab.com/jdoe/test) ([Compare changes](https://gitlab.com/jdoe/test/compare/b76004b20503d4d506e51a670de095cc063e4707...3517b06c64c9d349e2213650d6c009db0471361e))"}

tests/example_grafana_9x.json

@@ -0,0 +1,41 @@
+{
+    "receiver": "",
+    "status": "firing",
+    "alerts": [
+        {
+            "status": "firing",
+            "labels": {
+                "alertname": "TestAlert",
+                "instance": "Grafana"
+            },
+            "annotations": {
+                "summary": "Notification test"
+            },
+            "startsAt": "2022-09-07T15:00:26.722304913+02:00",
+            "endsAt": "0001-01-01T00:00:00Z",
+            "generatorURL": "",
+            "fingerprint": "57c6d9296de2ad39",
+            "silenceURL": "https://grafana.example.com/alerting/silence/new?alertmanager=grafana&matcher=alertname%3DTestAlert&matcher=instance%3DGrafana",
+            "dashboardURL": "",
+            "panelURL": "",
+            "valueString": "[ metric='foo' labels={instance=bar} value=10 ]"
+        }
+    ],
+    "groupLabels": {},
+    "commonLabels": {
+        "alertname": "TestAlert",
+        "instance": "Grafana"
+    },
+    "commonAnnotations": {
+        "summary": "Notification test"
+    },
+    "externalURL": "https://grafana.example.com/",
+    "version": "1",
+    "groupKey": "{alertname=\"TestAlert\", instance=\"Grafana\"}2022-09-07 15:00:26.722304913 +0200 CEST m=+246580.963796811",
+    "truncatedAlerts": 0,
+    "orgId": 1,
+    "title": "[FIRING:1]  (TestAlert Grafana)",
+    "state": "alerting",
+    "message": "**Firing**\n\nValue: [ metric='foo' labels={instance=bar} value=10 ]\nLabels:\n - alertname = TestAlert\n - instance = Grafana\nAnnotations:\n - summary = Notification test\nSilence: https://grafana.example.com/alerting/silence/new?alertmanager=grafana&matcher=alertname%3DTestAlert&matcher=instance%3DGrafana\n",
+    "key": "ak"
+}

tests/test_github.py

@@ -127,3 +127,4 @@ class GithubFormatterTest(unittest.IsolatedAsyncioTestCase):
             ).json(),
             {"status": 401, "ret": "Invalid SHA-256 HMAC digest"},
         )
+        await client.close()

tests/test_gitlab_gchat.py

@@ -0,0 +1,54 @@
+"""
+Test module for gitlab "google chat" formatter.
+
+"""
+
+import unittest
+
+import httpx
+import nio
+
+from .start import BOT_URL, FULL_ID, KEY, MATRIX_ID, MATRIX_PW, MATRIX_URL
+
+
+class GitlabGchatFormatterTest(unittest.IsolatedAsyncioTestCase):
+    """Gitlab "google chat" formatter test class."""
+
+    async def test_gitlab_gchat_body(self):
+        """Send a markdown message, and check the result."""
+        messages = []
+        client = nio.AsyncClient(MATRIX_URL, MATRIX_ID)
+
+        await client.login(MATRIX_PW)
+        room = await client.room_create()
+
+        with open("tests/example_gitlab_gchat.json") as f:
+            example_gitlab_gchat_request = f.read()
+        self.assertEqual(
+            httpx.post(
+                f"{BOT_URL}/{room.room_id}",
+                params={"formatter": "gitlab_gchat", "key": KEY},
+                content=example_gitlab_gchat_request,
+            ).json(),
+            {"status": 200, "ret": "OK"},
+        )
+
+        sync = await client.sync()
+        messages = await client.room_messages(room.room_id, sync.next_batch)
+        await client.close()
+
+        message = messages.chunk[0]
+        self.assertEqual(message.sender, FULL_ID)
+        self.assertEqual(
+            message.body,
+            "John Doe pushed to branch [master](https://gitlab.com/jdoe/test/commits/m"
+            + "aster) of [John Doe / test](https://gitlab.com/jdoe/test) ([Compare chan"
+            + "ges](https://gitlab.com/jdoe/test/compare/b76004b20503d4d506e51a670de095"
+            + "cc063e4707...3517b06c64c9d349e2213650d6c009db0471361e))\n[3517b06c](http"
+            + "s://gitlab.com/jdoe/test/-/commit/3517b06c64c9d349e2213650d6c009db047136"
+            + "1e): Merge branch 'prod' into 'master' - John Doe\n\n[1f661795](https://"
+            + "gitlab.com/jdoe/test/-/commit/1f661795b220c5fe352f391eb8de3ac4fcc6fc1d):"
+            + " Merge branch 'revert-a827b196' into 'prod' - John Doe\n\n[b76004b2](htt"
+            + "ps://gitlab.com/jdoe/test/-/commit/b76004b20503d4d506e51a670de095cc063e4"
+            + "707): Merge branch 'revert-a827b196' into 'master' - John Doe",
+        )

tests/test_gitlab_teams.py

@@ -0,0 +1,55 @@
+"""
+Test module for gitlab "teams" formatter.
+
+"""
+
+import unittest
+
+import httpx
+import nio
+
+from .start import BOT_URL, FULL_ID, KEY, MATRIX_ID, MATRIX_PW, MATRIX_URL
+
+
+class GitlabTeamsFormatterTest(unittest.IsolatedAsyncioTestCase):
+    """Gitlab "teams" formatter test class."""
+
+    async def test_gitlab_teams_body(self):
+        """Send a markdown message, and check the result."""
+        messages = []
+        client = nio.AsyncClient(MATRIX_URL, MATRIX_ID)
+
+        await client.login(MATRIX_PW)
+        room = await client.room_create()
+
+        with open("tests/example_gitlab_teams.json") as f:
+            example_gitlab_teams_request = f.read()
+        self.assertEqual(
+            httpx.post(
+                f"{BOT_URL}/{room.room_id}",
+                params={"formatter": "gitlab_teams", "key": KEY},
+                content=example_gitlab_teams_request,
+            ).json(),
+            {"status": 200, "ret": "OK"},
+        )
+
+        sync = await client.sync()
+        messages = await client.room_messages(room.room_id, sync.next_batch)
+        await client.close()
+
+        message = messages.chunk[0]
+        self.assertEqual(message.sender, FULL_ID)
+        self.assertEqual(
+            message.body,
+            "John Doe pushed to branch [master](https://gitlab.com/jdoe/test/commits"
+            + "/master) in [John Doe / test](https://gitlab.com/jdoe/test) \u2192 [Com"
+            + "pare changes](https://gitlab.com/jdoe/test/compare/b76004b20503d4d506e5"
+            + "1a670de095cc063e4707...3517b06c64c9d349e2213650d6c009db0471361e)  \n\n*"
+            + " [3517b06c](https://gitlab.com/jdoe/test/-/commit/3517b06c64c9d349e2213"
+            + "650d6c009db0471361e): Merge branch 'prod' into 'master' - John Doe  \n*"
+            + " [1f661795](https://gitlab.com/jdoe/test/-/commit/1f661795b220c5fe352f3"
+            + "91eb8de3ac4fcc6fc1d): Merge branch 'revert-a827b196' into 'prod' - John"
+            + " Doe  \n* [b76004b2](https://gitlab.com/jdoe/test/-/commit/b76004b20503"
+            + "d4d506e51a670de095cc063e4707): Merge branch 'revert-a827b196' into 'mas"
+            + "ter' - John Doe",
+        )

tests/test_grafana_9x.py

@@ -0,0 +1,51 @@
+"""
+Test module for grafana v9 formatter.
+
+ref https://grafana.com/docs/grafana/latest/alerting/old-alerting/notifications/#webhook
+"""
+
+import unittest
+
+import httpx
+import nio
+
+from .start import BOT_URL, FULL_ID, MATRIX_ID, MATRIX_PW, MATRIX_URL
+
+
+class Grafana9xFormatterTest(unittest.IsolatedAsyncioTestCase):
+    """Grafana formatter test class."""
+
+    async def test_grafana_body(self):
+        """Send a markdown message, and check the result."""
+        messages = []
+        client = nio.AsyncClient(MATRIX_URL, MATRIX_ID)
+
+        await client.login(MATRIX_PW)
+        room = await client.room_create()
+
+        with open("tests/example_grafana_9x.json") as f:
+            example_grafana_request = f.read()
+        self.assertEqual(
+            httpx.post(
+                f"{BOT_URL}/{room.room_id}",
+                params={"formatter": "grafana_9x"},
+                content=example_grafana_request,
+            ).json(),
+            {"status": 200, "ret": "OK"},
+        )
+
+        sync = await client.sync()
+        messages = await client.room_messages(room.room_id, sync.next_batch)
+        await client.close()
+
+        message = messages.chunk[0]
+        self.assertEqual(message.sender, FULL_ID)
+        expected_body = (
+            "#### [FIRING:1]  (TestAlert Grafana)\n**Firing**\n\n\n\nValue: [ metr"
+            "ic='foo' labels={instance=bar} value=10 ]\n\nLabels:\n\n - alertname "
+            "= TestAlert\n\n - instance = Grafana\n\nAnnotations:\n\n - summary = "
+            "Notification test\n\nSilence: https://grafana.example.com/alerting/si"
+            "lence/new?alertmanager=grafana&matcher=alertname%3DTestAlert&matcher="
+            "instance%3DGrafana\n\n\n\n"
+        )
+        self.assertEqual(message.body, expected_body)

tests/test_grafana_forward.py

@@ -0,0 +1,51 @@
+"""
+Test version 9 compatibility of grafana formatter.
+
+ref https://grafana.com/docs/grafana/latest/alerting/old-alerting/notifications/#webhook
+"""
+
+import unittest
+
+import httpx
+import nio
+
+from .start import BOT_URL, FULL_ID, MATRIX_ID, MATRIX_PW, MATRIX_URL
+
+
+class GrafanaForwardFormatterTest(unittest.IsolatedAsyncioTestCase):
+    """Grafana formatter test class."""
+
+    async def test_grafana_body(self):
+        """Send a markdown message, and check the result."""
+        messages = []
+        client = nio.AsyncClient(MATRIX_URL, MATRIX_ID)
+
+        await client.login(MATRIX_PW)
+        room = await client.room_create()
+
+        with open("tests/example_grafana_9x.json") as f:
+            example_grafana_request = f.read()
+        self.assertEqual(
+            httpx.post(
+                f"{BOT_URL}/{room.room_id}",
+                params={"formatter": "grafana"},
+                content=example_grafana_request,
+            ).json(),
+            {"status": 200, "ret": "OK"},
+        )
+
+        sync = await client.sync()
+        messages = await client.room_messages(room.room_id, sync.next_batch)
+        await client.close()
+
+        message = messages.chunk[0]
+        self.assertEqual(message.sender, FULL_ID)
+        expected_body = (
+            "#### [FIRING:1]  (TestAlert Grafana)\n**Firing**\n\n\n\nValue: [ metr"
+            "ic='foo' labels={instance=bar} value=10 ]\n\nLabels:\n\n - alertname "
+            "= TestAlert\n\n - instance = Grafana\n\nAnnotations:\n\n - summary = "
+            "Notification test\n\nSilence: https://grafana.example.com/alerting/si"
+            "lence/new?alertmanager=grafana&matcher=alertname%3DTestAlert&matcher="
+            "instance%3DGrafana\n\n\n\n"
+        )
+        self.assertEqual(message.body, expected_body)