diff --git a/changelog.d/945.feature b/changelog.d/945.feature new file mode 100644 index 00000000..bf4e2350 --- /dev/null +++ b/changelog.d/945.feature @@ -0,0 +1,3 @@ +Add support for new connection type "Outgoing Webhooks". This feature allows you to send outgoing HTTP requests to other services +when a message appears in a Matrix room. See [the documentation](https://matrix-org.github.io/matrix-hookshot/latest/setup/webhooks.html) +for help with this feature. diff --git a/config.sample.yml b/config.sample.yml index 00201678..6360b22b 100644 --- a/config.sample.yml +++ b/config.sample.yml @@ -100,6 +100,7 @@ listeners: # #'allowJsTransformationFunctions' will allow users to write short transformation snippets in code, and thus is unsafe in untrusted environments # enabled: false +# outbound: false # enableHttpGet: false # urlPrefix: https://example.com/webhook/ # userIdPrefix: _webhooks_ diff --git a/docs/setup/webhooks.md b/docs/setup/webhooks.md index 57938164..d3cc096d 100644 --- a/docs/setup/webhooks.md +++ b/docs/setup/webhooks.md @@ -1,7 +1,7 @@ # Webhooks -Hookshot supports generic webhook support so that services can send messages into Matrix rooms without being aware of the Matrix protocol. This works -by having services hit a unique URL that then transforms a HTTP payload into a Matrix message. +Hookshot supports two kinds of webhooks, inbound (previously known as Generic Webhooks) and outbound. + ## Configuration @@ -10,6 +10,7 @@ You will need to add the following configuration to the config file. ```yaml generic: enabled: true + outbound: true # For outbound webhook support urlPrefix: https://example.com/mywebhookspath/ allowJsTransformationFunctions: false waitForComplete: false @@ -17,6 +18,11 @@ generic: # userIdPrefix: webhook_ ``` +## Inbound Webhooks + +Hookshot supports generic webhook support so that services can send messages into Matrix rooms without being aware of the Matrix protocol. This works +by having services hit a unique URL that then transforms a HTTP payload into a Matrix message. +
Previous versions of the bridge listened for requests on `/` rather than `/webhook`. While this behaviour will continue to work, administators are advised to use `/webhook`. @@ -50,7 +56,7 @@ namespaces: exclusive: true ``` -## Adding a webhook +### Adding a webhook To add a webhook to your room: - Invite the bot user to the room. @@ -58,7 +64,7 @@ To add a webhook to your room: - Say `!hookshot webhook example` where `example` is a name for your hook. - The bot will respond with the webhook URL to be sent to services. -## Webhook Handling +### Webhook Handling Hookshot handles `POST` and `PUT` HTTP requests by default. @@ -76,7 +82,7 @@ If the body *also* contains a `username` key, then the message will be prepended If the body does NOT contain a `text` field, the full payload will be sent to the room. This can be adapted into a message by creating a **JavaScript transformation function**. -### Payload formats +#### Payload formats If the request is a `POST`/`PUT`, the body of the request will be decoded and stored inside the event. Currently, Hookshot supports: @@ -88,7 +94,7 @@ If the request is a `POST`/`PUT`, the body of the request will be decoded and st Decoding is done in the order given above. E.g. `text/xml` would be parsed as XML. Any formats not described above are not decoded. -### GET requests +#### GET requests In previous versions of hookshot, it would also handle the `GET` HTTP method. This was disabled due to concerns that it was too easy for the webhook to be inadvertently triggered by URL preview features in clients and servers. If you still need this functionality, you can enable it in the config. @@ -102,7 +108,7 @@ to a string representation of that value. This change is not applied -### Wait for complete +#### Wait for complete It is possible to choose whether a webhook response should be instant, or after hookshot has handled the message. The reason for this is that some services expect a quick response time (like Slack) whereas others will wait for the request to complete. You @@ -111,7 +117,7 @@ can specify this either globally in your config, or on the widget with `waitForC If you make use of the `webhookResponse` feature, you will need to enable `waitForComplete` as otherwise hookshot will immeditately respond with it's default response values. -## JavaScript Transformations +### JavaScript Transformations
Although every effort has been made to securely sandbox scripts, running untrusted code from users is always risky. Ensure safe permissions @@ -130,7 +136,7 @@ Please seek out documentation from your client on how to achieve this. The script string should be set within the state event under the `transformationFunction` key. -### Script API +#### Script API Transformation scripts have a versioned API. You can check the version of the API that the hookshot instance supports at runtime by checking the `HookshotApiVersion` variable. If the variable is undefined, it should be considered `v1`. @@ -141,7 +147,7 @@ Scripts are executed synchronously and expect the `result` variable to be set. If the script contains errors or is otherwise unable to work, the bridge will send an error to the room. You can check the logs of the bridge for a more precise error. -### V2 API +#### V2 API The `v2` api expects an object to be returned from the `result` variable. @@ -176,7 +182,7 @@ if (data.counter === undefined) { ``` -### V1 API +#### V1 API The v1 API expects `result` to be a string. The string will be automatically interpreted as Markdown and transformed into HTML. All webhook messages will be prefixed with `Received webhook:`. If `result` is falsey (undefined, false or null) then the message will be `No content`. @@ -192,3 +198,36 @@ if (data.counter > data.maxValue) { result = `*Everything is fine*, the counter is under by ${data.maxValue - data.counter}` } ``` + +## Outbound webhooks + +You can also configure Hookshot to send outgoing requests to other services when a message appears +on Matrix. To do so, you need to configure hookshot to enable outgoing messages with: + +```yaml +generic: + outbound: true +``` + +### Request format + +Requests can be sent to any service that accepts HTTP requests. You may configure Hookshot to either use the HTTP `PUT` (default) +or `POST` methods. + +Each request will contain 3 headers which you may use to authenticate and direct traffic: + + - 'X-Matrix-Hookshot-EventId' contains the event's ID. + - 'X-Matrix-Hookshot-RoomId' contains the room ID where the message was sent. + - 'X-Matrix-Hookshot-Token' is the unique authentication token provided when you created the webhook. Use this + to verify that the message came from Hookshot. + +The payloads are formatted as `multipart/form-data`. + +The first file contains the event JSON data, proviced as the `event` file. This is a raw representation of the Matrix event data. If the +event was encrypted, this will be the **decrypted** body. + +If any media is linked to in the event, then a second file will be present named `media` which will contain the media referenced in +the event. + +All events that occur in the room will be sent to the outbound URL, so be careful to ensure your remote service can filter the +traffic appropriately (e.g. check the `type` in the event JSON) diff --git a/package.json b/package.json index 0fe78286..b017eccc 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "@octokit/rest": "^20.0.2", "@octokit/webhooks": "^12.0.10", "@sentry/node": "^7.52.1", - "@vector-im/compound-design-tokens": "^0.1.0", - "@vector-im/compound-web": "^0.9.4", + "@vector-im/compound-design-tokens": "^1.3.0", + "@vector-im/compound-web": "^4.8.0", "ajv": "^8.11.0", "axios": "^1.6.3", "cors": "^2.8.5", @@ -86,6 +86,7 @@ "@rollup/plugin-alias": "^5.1.0", "@tsconfig/node18": "^18.2.2", "@types/ajv": "^1.0.0", + "@types/busboy": "^1.5.4", "@types/chai": "^4.2.22", "@types/cors": "^2.8.12", "@types/express": "^4.17.14", @@ -100,6 +101,7 @@ "@typescript-eslint/eslint-plugin": "^6.17.0", "@typescript-eslint/parser": "^6.17.0", "@uiw/react-codemirror": "^4.12.3", + "busboy": "^1.6.0", "chai": "^4.3.4", "eslint": "^8.49.0", "eslint-config-preact": "^1.3.0", @@ -116,5 +118,6 @@ "ts-node": "^10.9.1", "typescript": "^5.3.3", "vite": "^5.0.13" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/spec/util/fixtures.ts b/spec/util/fixtures.ts new file mode 100644 index 00000000..ae6de768 --- /dev/null +++ b/spec/util/fixtures.ts @@ -0,0 +1 @@ +export const TEST_FILE = Buffer.from(`<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 width="793.322px" height="340.809px" viewBox="0 0 793.322 340.809" enable-background="new 0 0 793.322 340.809"
	 xml:space="preserve">
<path opacity="0.5" fill="#FFFFFF" d="M34.004,340.809H2c-1.104,0-2-0.896-2-2V2c0-1.104,0.896-2,2-2h32.004c1.104,0,2,0.896,2,2
	v7.71c0,1.104-0.896,2-2,2h-21.13v317.386h21.13c1.104,0,2,0.896,2,2.001v7.712C36.004,339.913,35.108,340.809,34.004,340.809
	L34.004,340.809z"/>
<path opacity="0.5" fill="#FFFFFF" d="M10.875,9.711v321.386h23.13v7.711H1.999V2.001h32.006v7.71H10.875z"/>
<path opacity="0.5" fill="#FFFFFF" d="M252.402,233.711h-32.993c-1.104,0-2-0.896-2-2v-68.073c0-3.949-0.154-7.722-0.457-11.213
	c-0.289-3.282-1.074-6.153-2.332-8.53c-1.204-2.276-3.017-4.119-5.384-5.476c-2.393-1.362-5.775-2.056-10.042-2.056
	c-4.238,0-7.674,0.798-10.213,2.371c-2.565,1.596-4.604,3.701-6.053,6.258c-1.498,2.643-2.51,5.694-3.013,9.067
	c-0.526,3.513-0.793,7.125-0.793,10.741v66.91c0,1.104-0.896,2-2,2h-32.991c-1.104,0-2-0.896-2-2v-67.373
	c0-3.435-0.078-6.964-0.228-10.485c-0.148-3.251-0.767-6.278-1.841-8.995c-1.018-2.571-2.667-4.584-5.047-6.153
	c-2.372-1.552-6.029-2.341-10.865-2.341c-1.372,0-3.265,0.328-5.629,0.976c-2.28,0.624-4.536,1.826-6.705,3.577
	c-2.152,1.732-4.036,4.306-5.605,7.655c-1.569,3.356-2.367,7.877-2.367,13.438v69.701c0,1.104-0.895,2-2,2H68.857
	c-1.104,0-2-0.896-2-2V111.594c0-1.104,0.896-1.999,2-1.999h31.13c1.104,0,2,0.896,2,1.999v11.007
	c3.834-4.499,8.248-8.152,13.173-10.896c6.396-3.559,13.799-5.362,22.002-5.362c7.846,0,15.127,1.548,21.642,4.604
	c5.794,2.722,10.424,7.26,13.791,13.52c3.449-4.362,7.833-8.306,13.071-11.752c6.422-4.228,14.102-6.371,22.824-6.371
	c6.499,0,12.625,0.807,18.209,2.399c5.686,1.628,10.635,4.271,14.712,7.857c4.088,3.605,7.318,8.357,9.601,14.123
	c2.25,5.719,3.391,12.649,3.391,20.604v80.384C254.402,232.815,253.507,233.711,252.402,233.711L252.402,233.711z"/>
<path opacity="0.5" fill="#FFFFFF" d="M99.988,111.595v16.264h0.463c4.338-6.191,9.563-10.998,15.684-14.406
	c6.117-3.402,13.129-5.11,21.027-5.11c7.588,0,14.521,1.475,20.793,4.415c6.274,2.945,11.038,8.131,14.291,15.567
	c3.56-5.265,8.4-9.913,14.521-13.94c6.117-4.025,13.358-6.042,21.724-6.042c6.351,0,12.234,0.776,17.66,2.325
	c5.418,1.549,10.065,4.027,13.938,7.434c3.869,3.41,6.889,7.863,9.062,13.357c2.167,5.504,3.253,12.122,3.253,19.869v80.385H219.41
	v-68.074c0-4.025-0.154-7.82-0.465-11.385c-0.313-3.56-1.161-6.656-2.555-9.293c-1.395-2.631-3.45-4.724-6.157-6.274
	c-2.711-1.543-6.391-2.322-11.037-2.322s-8.403,0.896-11.269,2.671c-2.868,1.784-5.112,4.109-6.737,6.971
	c-1.626,2.869-2.711,6.12-3.252,9.762c-0.545,3.638-0.814,7.318-0.814,11.035v66.91h-32.991v-67.375c0-3.562-0.081-7.087-0.23-10.57
	c-0.158-3.487-0.814-6.7-1.978-9.645c-1.162-2.94-3.099-5.304-5.809-7.088c-2.711-1.775-6.699-2.671-11.965-2.671
	c-1.551,0-3.603,0.349-6.156,1.048c-2.556,0.697-5.036,2.016-7.435,3.949c-2.404,1.938-4.454,4.726-6.158,8.363
	c-1.705,3.642-2.556,8.402-2.556,14.287v69.701h-32.99V111.595H99.988z"/>
<path opacity="0.5" fill="#FFFFFF" d="M304.909,236.733c-5.883,0-11.46-0.729-16.574-2.163c-5.192-1.464-9.806-3.774-13.713-6.871
	c-3.944-3.117-7.068-7.111-9.282-11.871c-2.205-4.733-3.324-10.412-3.324-16.876c0-7.13,1.293-13.117,3.846-17.797
	c2.542-4.674,5.877-8.464,9.912-11.263c3.97-2.752,8.556-4.842,13.63-6.209c4.901-1.322,9.937-2.394,14.961-3.184
	c4.986-0.775,9.949-1.404,14.754-1.872c4.679-0.452,8.88-1.139,12.489-2.039c3.412-0.854,6.118-2.09,8.042-3.672
	c1.666-1.37,2.416-3.384,2.292-6.151c-0.002-3.289-0.502-5.816-1.492-7.595c-0.998-1.798-2.283-3.15-3.927-4.138
	c-1.703-1.02-3.725-1.713-6.012-2.062c-2.47-0.37-5.146-0.557-7.947-0.557c-6.034,0-10.789,1.271-14.135,3.783
	c-3.233,2.424-5.155,6.64-5.714,12.527c-0.098,1.026-0.961,1.812-1.992,1.812h-32.992c-0.552,0-1.079-0.229-1.457-0.629
	c-0.376-0.402-0.572-0.941-0.54-1.491c0.485-8.073,2.55-14.894,6.142-20.272c3.548-5.331,8.147-9.682,13.661-12.931
	c5.424-3.191,11.612-5.498,18.392-6.857c6.684-1.335,13.5-2.013,20.26-2.013c6.096,0,12.365,0.437,18.626,1.296
	c6.377,0.88,12.285,2.622,17.562,5.177c5.376,2.604,9.845,6.29,13.282,10.951c3.498,4.744,5.271,11.048,5.271,18.731v62.494
	c0,5.307,0.306,10.462,0.915,15.319c0.576,4.64,1.572,8.116,2.963,10.338c0.385,0.616,0.407,1.395,0.055,2.031
	c-0.353,0.635-1.022,1.03-1.75,1.03h-33.457c-0.861,0-1.624-0.55-1.898-1.367c-0.646-1.941-1.176-3.939-1.572-5.936
	c-0.141-0.696-0.267-1.402-0.38-2.12c-4.825,4.184-10.349,7.24-16.474,9.105C320.033,235.609,312.489,236.733,304.909,236.733
	L304.909,236.733z M341.941,176.661c-0.809,0.409-1.676,0.768-2.596,1.074c-2.161,0.72-4.511,1.326-6.988,1.807
	c-2.442,0.475-5.033,0.872-7.699,1.186c-2.631,0.311-5.251,0.697-7.784,1.146c-2.329,0.433-4.705,1.035-7.051,1.792
	c-2.194,0.711-4.114,1.667-5.699,2.842c-1.531,1.128-2.785,2.587-3.731,4.335c-0.917,1.709-1.385,3.97-1.385,6.719
	c0,2.598,0.465,4.778,1.385,6.481c0.928,1.722,2.142,3.035,3.716,4.018c1.644,1.026,3.601,1.757,5.816,2.17
	c2.344,0.439,4.799,0.663,7.297,0.663c6.105,0,10.836-0.996,14.063-2.961c3.244-1.973,5.666-4.349,7.199-7.062
	c1.568-2.78,2.542-5.62,2.892-8.436c0.376-3.019,0.565-5.436,0.565-7.187V176.661L341.941,176.661z"/>
<path opacity="0.5" fill="#FFFFFF" d="M273.544,129.255c3.405-5.113,7.744-9.215,13.012-12.316
	c5.264-3.097,11.186-5.303,17.771-6.621c6.582-1.315,13.205-1.976,19.865-1.976c6.042,0,12.158,0.428,18.354,1.277
	c6.195,0.855,11.85,2.522,16.962,4.997c5.111,2.477,9.292,5.926,12.546,10.338c3.253,4.414,4.879,10.262,4.879,17.543v62.494
	c0,5.428,0.31,10.611,0.931,15.567c0.615,4.959,1.701,8.676,3.251,11.153H347.66c-0.621-1.86-1.126-3.755-1.511-5.693
	c-0.39-1.933-0.661-3.908-0.813-5.923c-5.267,5.422-11.465,9.217-18.585,11.386c-7.127,2.163-14.407,3.251-21.842,3.251
	c-5.733,0-11.077-0.698-16.033-2.09c-4.958-1.395-9.293-3.562-13.01-6.51c-3.718-2.938-6.622-6.656-8.713-11.147
	s-3.138-9.84-3.138-16.033c0-6.813,1.199-12.43,3.604-16.84c2.399-4.417,5.495-7.939,9.295-10.575
	c3.793-2.632,8.129-4.607,13.01-5.923c4.878-1.315,9.795-2.358,14.752-3.137c4.957-0.772,9.835-1.393,14.638-1.857
	c4.801-0.466,9.062-1.164,12.779-2.093c3.718-0.929,6.658-2.282,8.829-4.065c2.165-1.781,3.172-4.375,3.02-7.785
	c0-3.56-0.58-6.389-1.742-8.479c-1.161-2.09-2.711-3.719-4.646-4.88c-1.937-1.161-4.183-1.936-6.737-2.325
	c-2.557-0.382-5.309-0.58-8.248-0.58c-6.506,0-11.617,1.395-15.335,4.183c-3.716,2.788-5.889,7.437-6.506,13.94h-32.991
	C268.199,140.794,270.132,134.363,273.544,129.255z M338.713,175.838c-2.09,0.696-4.337,1.275-6.736,1.741
	c-2.402,0.465-4.918,0.853-7.551,1.161c-2.635,0.313-5.268,0.698-7.899,1.163c-2.48,0.461-4.919,1.086-7.317,1.857
	c-2.404,0.779-4.495,1.822-6.274,3.138c-1.784,1.317-3.216,2.985-4.3,4.994c-1.085,2.014-1.626,4.571-1.626,7.668
	c0,2.94,0.541,5.422,1.626,7.431c1.084,2.017,2.558,3.604,4.416,4.765s4.025,1.976,6.507,2.438c2.475,0.466,5.031,0.698,7.665,0.698
	c6.505,0,11.537-1.082,15.103-3.253c3.561-2.166,6.192-4.762,7.899-7.785c1.702-3.019,2.749-6.072,3.137-9.174
	c0.384-3.097,0.58-5.576,0.58-7.434v-12.316C342.547,174.173,340.805,175.14,338.713,175.838z"/>
<path opacity="0.5" fill="#FFFFFF" d="M444.542,234.874c-5.187,0-10.173-0.361-14.823-1.069c-4.802-0.732-9.104-2.183-12.779-4.313
	c-3.789-2.185-6.821-5.341-9.006-9.375c-2.163-3.986-3.26-9.232-3.26-15.59v-68.859h-17.981c-1.104,0-2-0.896-2-1.999v-22.073
	c0-1.104,0.896-1.999,2-1.999h17.981V75.582c0-1.104,0.896-2,2-2h32.992c1.104,0,2,0.896,2,2v34.014h22.162c1.104,0,2,0.896,2,1.999
	v22.073c0,1.104-0.896,1.999-2,1.999h-22.162v57.479c0,6.229,1.198,8.731,2.202,9.733c1.004,1.007,3.506,2.205,9.738,2.205
	c1.804,0,3.542-0.076,5.161-0.225c1.604-0.144,3.174-0.367,4.669-0.665c0.13-0.026,0.261-0.039,0.391-0.039
	c0.458,0,0.907,0.159,1.27,0.454c0.463,0.379,0.73,0.946,0.73,1.546v25.555c0,0.979-0.707,1.813-1.672,1.974
	c-2.834,0.472-6.041,0.794-9.527,0.957C451.015,234.798,447.718,234.874,444.542,234.874L444.542,234.874z"/>
<path opacity="0.5" fill="#FFFFFF" d="M463.825,111.595v22.072h-24.161v59.479c0,5.573,0.928,9.292,2.788,11.149
	c1.856,1.859,5.576,2.788,11.152,2.788c1.859,0,3.638-0.076,5.343-0.232c1.703-0.152,3.33-0.388,4.878-0.696v25.557
	c-2.788,0.465-5.887,0.773-9.293,0.931c-3.407,0.149-6.737,0.23-9.99,0.23c-5.111,0-9.953-0.35-14.521-1.048
	c-4.571-0.695-8.597-2.047-12.081-4.063c-3.486-2.011-6.236-4.88-8.248-8.597c-2.016-3.714-3.021-8.595-3.021-14.639v-70.859h-19.98
	v-22.072h19.98V75.583h32.992v36.012H463.825z"/>
<path opacity="0.5" fill="#FFFFFF" d="M512.613,233.711h-32.991c-1.104,0-2-0.896-2-2V111.594c0-1.104,0.896-1.999,2-1.999h31.366
	c1.104,0,2,0.896,2,1.999v15.069c0.967-1.516,2.034-2.978,3.199-4.382c2.754-3.312,5.949-6.182,9.496-8.522
	c3.545-2.332,7.385-4.169,11.415-5.462c4.056-1.298,8.327-1.954,12.691-1.954c2.341,0,4.953,0.418,7.766,1.243
	c0.852,0.25,1.437,1.032,1.437,1.92v30.67c0,0.6-0.269,1.167-0.732,1.547c-0.361,0.296-0.808,0.452-1.265,0.452
	c-0.133,0-0.265-0.013-0.398-0.039c-1.484-0.3-3.299-0.565-5.392-0.787c-2.098-0.224-4.136-0.339-6.062-0.339
	c-5.706,0-10.572,0.95-14.467,2.823c-3.862,1.86-7.012,4.428-9.361,7.629c-2.389,3.263-4.115,7.12-5.127,11.47
	c-1.043,4.479-1.574,9.409-1.574,14.647v54.132C514.613,232.815,513.717,233.711,512.613,233.711L512.613,233.711z"/>
<path opacity="0.5" fill="#FFFFFF" d="M510.988,111.595V133.9h0.465c1.546-3.72,3.636-7.163,6.272-10.341
	c2.634-3.172,5.652-5.885,9.06-8.131c3.405-2.242,7.047-3.985,10.923-5.228c3.868-1.237,7.898-1.859,12.081-1.859
	c2.168,0,4.566,0.39,7.202,1.163v30.67c-1.551-0.312-3.41-0.584-5.576-0.814c-2.17-0.233-4.26-0.35-6.274-0.35
	c-6.041,0-11.152,1.01-15.332,3.021c-4.182,2.014-7.55,4.761-10.107,8.247c-2.555,3.487-4.379,7.55-5.462,12.198
	c-1.083,4.645-1.625,9.682-1.625,15.102v54.133h-32.991V111.595H510.988z"/>
<path opacity="0.5" fill="#FFFFFF" d="M603.923,233.711H570.93c-1.104,0-2-0.896-2-2V111.594c0-1.104,0.896-1.999,2-1.999h32.994
	c1.104,0,2,0.896,2,1.999v120.117C605.923,232.815,605.027,233.711,603.923,233.711L603.923,233.711z M603.923,95.006H570.93
	c-1.104,0-2-0.896-2-1.999V65.825c0-1.104,0.896-2,2-2h32.994c1.104,0,2,0.896,2,2v27.182
	C605.923,94.11,605.027,95.006,603.923,95.006L603.923,95.006z"/>
<path opacity="0.5" fill="#FFFFFF" d="M570.93,93.007V65.824h32.994v27.183H570.93z M603.924,111.595v120.117H570.93V111.595
	H603.924z"/>
<path opacity="0.5" fill="#FFFFFF" d="M742.163,233.711h-37.64c-0.671,0-1.297-0.335-1.667-0.896l-23.426-35.352l-23.426,35.352
	c-0.369,0.561-0.995,0.896-1.667,0.896h-36.938c-0.741,0-1.424-0.411-1.77-1.067c-0.345-0.654-0.3-1.449,0.118-2.061l42.435-62.055
	l-38.71-55.793c-0.424-0.613-0.474-1.408-0.128-2.069c0.343-0.658,1.028-1.071,1.771-1.071h37.636c0.665,0,1.287,0.33,1.658,0.882
	l19.477,28.893l19.255-28.884c0.372-0.556,0.996-0.891,1.665-0.891h36.475c0.746,0,1.43,0.415,1.776,1.078
	c0.343,0.66,0.289,1.46-0.139,2.071l-38.69,55.082l43.578,62.744c0.424,0.61,0.474,1.408,0.128,2.066
	C743.591,233.298,742.908,233.711,742.163,233.711L742.163,233.711z"/>
<path opacity="0.5" fill="#FFFFFF" d="M621.115,111.595h37.637l21.144,31.365l20.911-31.365h36.476l-39.496,56.226l44.377,63.892
	h-37.64l-25.093-37.87l-25.094,37.87h-36.938l43.213-63.193L621.115,111.595z"/>
<path opacity="0.5" fill="#FFFFFF" d="M791.322,340.809h-32.008c-1.105,0-2-0.896-2-2v-7.712c0-1.105,0.896-2.001,2-2.001h21.13
	V11.71h-21.13c-1.105,0-2-0.896-2-2V2c0-1.104,0.896-2,2-2h32.008c1.104,0,2,0.896,2,2v336.809
	C793.322,339.913,792.426,340.809,791.322,340.809L791.322,340.809z"/>
<path opacity="0.5" fill="#FFFFFF" d="M782.443,331.097V9.711h-23.13v-7.71h32.008v336.807h-32.008v-7.711H782.443z"/>
<path d="M10.875,9.711v321.386h23.13v7.711H1.999V2.001h32.006v7.71H10.875z"/>
<path d="M99.988,111.595v16.264h0.463c4.338-6.191,9.563-10.998,15.684-14.406c6.117-3.402,13.129-5.11,21.027-5.11
	c7.588,0,14.521,1.475,20.793,4.415c6.274,2.945,11.038,8.131,14.291,15.567c3.56-5.265,8.4-9.913,14.521-13.94
	c6.117-4.025,13.358-6.042,21.724-6.042c6.351,0,12.234,0.776,17.66,2.325c5.418,1.549,10.065,4.027,13.938,7.434
	c3.869,3.41,6.889,7.863,9.062,13.357c2.167,5.504,3.253,12.122,3.253,19.869v80.385H219.41v-68.074
	c0-4.025-0.154-7.82-0.465-11.385c-0.313-3.56-1.161-6.656-2.555-9.293c-1.395-2.631-3.45-4.724-6.157-6.274
	c-2.711-1.543-6.391-2.322-11.037-2.322s-8.403,0.896-11.269,2.671c-2.868,1.784-5.112,4.109-6.737,6.971
	c-1.626,2.869-2.711,6.12-3.252,9.762c-0.545,3.638-0.814,7.318-0.814,11.035v66.91h-32.991v-67.375c0-3.562-0.081-7.087-0.23-10.57
	c-0.158-3.487-0.814-6.7-1.978-9.645c-1.162-2.94-3.099-5.304-5.809-7.088c-2.711-1.775-6.699-2.671-11.965-2.671
	c-1.551,0-3.603,0.349-6.156,1.048c-2.556,0.697-5.036,2.016-7.435,3.949c-2.404,1.938-4.454,4.726-6.158,8.363
	c-1.705,3.642-2.556,8.402-2.556,14.287v69.701h-32.99V111.595H99.988z"/>
<path d="M273.544,129.255c3.405-5.113,7.744-9.215,13.012-12.316c5.264-3.097,11.186-5.303,17.771-6.621
	c6.582-1.315,13.205-1.976,19.865-1.976c6.042,0,12.158,0.428,18.354,1.277c6.195,0.855,11.85,2.522,16.962,4.997
	c5.111,2.477,9.292,5.926,12.546,10.338c3.253,4.414,4.879,10.262,4.879,17.543v62.494c0,5.428,0.31,10.611,0.931,15.567
	c0.615,4.959,1.701,8.676,3.251,11.153H347.66c-0.621-1.86-1.126-3.755-1.511-5.693c-0.39-1.933-0.661-3.908-0.813-5.923
	c-5.267,5.422-11.465,9.217-18.585,11.386c-7.127,2.163-14.407,3.251-21.842,3.251c-5.733,0-11.077-0.698-16.033-2.09
	c-4.958-1.395-9.293-3.562-13.01-6.51c-3.718-2.938-6.622-6.656-8.713-11.147s-3.138-9.84-3.138-16.033
	c0-6.813,1.199-12.43,3.604-16.84c2.399-4.417,5.495-7.939,9.295-10.575c3.793-2.632,8.129-4.607,13.01-5.923
	c4.878-1.315,9.795-2.358,14.752-3.137c4.957-0.772,9.835-1.393,14.638-1.857c4.801-0.466,9.062-1.164,12.779-2.093
	c3.718-0.929,6.658-2.282,8.829-4.065c2.165-1.781,3.172-4.375,3.02-7.785c0-3.56-0.58-6.389-1.742-8.479
	c-1.161-2.09-2.711-3.719-4.646-4.88c-1.937-1.161-4.183-1.936-6.737-2.325c-2.557-0.382-5.309-0.58-8.248-0.58
	c-6.506,0-11.617,1.395-15.335,4.183c-3.716,2.788-5.889,7.437-6.506,13.94h-32.991
	C268.199,140.794,270.132,134.363,273.544,129.255z M338.713,175.838c-2.09,0.696-4.337,1.275-6.736,1.741
	c-2.402,0.465-4.918,0.853-7.551,1.161c-2.635,0.313-5.268,0.698-7.899,1.163c-2.48,0.461-4.919,1.086-7.317,1.857
	c-2.404,0.779-4.495,1.822-6.274,3.138c-1.784,1.317-3.216,2.985-4.3,4.994c-1.085,2.014-1.626,4.571-1.626,7.668
	c0,2.94,0.541,5.422,1.626,7.431c1.084,2.017,2.558,3.604,4.416,4.765s4.025,1.976,6.507,2.438c2.475,0.466,5.031,0.698,7.665,0.698
	c6.505,0,11.537-1.082,15.103-3.253c3.561-2.166,6.192-4.762,7.899-7.785c1.702-3.019,2.749-6.072,3.137-9.174
	c0.384-3.097,0.58-5.576,0.58-7.434v-12.316C342.547,174.173,340.805,175.14,338.713,175.838z"/>
<path d="M463.825,111.595v22.072h-24.161v59.479c0,5.573,0.928,9.292,2.788,11.149c1.856,1.859,5.576,2.788,11.152,2.788
	c1.859,0,3.638-0.076,5.343-0.232c1.703-0.152,3.33-0.388,4.878-0.696v25.557c-2.788,0.465-5.887,0.773-9.293,0.931
	c-3.407,0.149-6.737,0.23-9.99,0.23c-5.111,0-9.953-0.35-14.521-1.048c-4.571-0.695-8.597-2.047-12.081-4.063
	c-3.486-2.011-6.236-4.88-8.248-8.597c-2.016-3.714-3.021-8.595-3.021-14.639v-70.859h-19.98v-22.072h19.98V75.583h32.992v36.012
	H463.825z"/>
<path d="M510.988,111.595V133.9h0.465c1.546-3.72,3.636-7.163,6.272-10.341c2.634-3.172,5.652-5.885,9.06-8.131
	c3.405-2.242,7.047-3.985,10.923-5.228c3.868-1.237,7.898-1.859,12.081-1.859c2.168,0,4.566,0.39,7.202,1.163v30.67
	c-1.551-0.312-3.41-0.584-5.576-0.814c-2.17-0.233-4.26-0.35-6.274-0.35c-6.041,0-11.152,1.01-15.332,3.021
	c-4.182,2.014-7.55,4.761-10.107,8.247c-2.555,3.487-4.379,7.55-5.462,12.198c-1.083,4.645-1.625,9.682-1.625,15.102v54.133h-32.991
	V111.595H510.988z"/>
<path d="M570.93,93.007V65.824h32.994v27.183H570.93z M603.924,111.595v120.117H570.93V111.595H603.924z"/>
<path d="M621.115,111.595h37.637l21.144,31.365l20.911-31.365h36.476l-39.496,56.226l44.377,63.892h-37.64l-25.093-37.87
	l-25.094,37.87h-36.938l43.213-63.193L621.115,111.595z"/>
<path d="M782.443,331.097V9.711h-23.13v-7.71h32.008v336.807h-32.008v-7.711H782.443z"/>
</svg>
`, "base64"); \ No newline at end of file diff --git a/spec/webhooks.spec.ts b/spec/webhooks.spec.ts new file mode 100644 index 00000000..9238caa4 --- /dev/null +++ b/spec/webhooks.spec.ts @@ -0,0 +1,201 @@ +import { E2ESetupTestTimeout, E2ETestEnv, E2ETestMatrixClient } from "./util/e2e-test"; +import { describe, it, beforeEach, afterEach } from "@jest/globals"; +import { OutboundHookConnection } from "../src/Connections"; +import { TextualMessageEventContent } from "matrix-bot-sdk"; +import { IncomingHttpHeaders, createServer } from "http"; +import busboy, { FileInfo } from "busboy"; +import { TEST_FILE } from "./util/fixtures"; + +async function createOutboundConnection(user: E2ETestMatrixClient, botMxid: string, roomId: string) { + const join = user.waitForRoomJoin({ sender: botMxid, roomId }); + const connectionEvent = user.waitForRoomEvent({ + eventType: OutboundHookConnection.CanonicalEventType, + stateKey: 'test', + sender: botMxid + }); + await user.inviteUser(botMxid, roomId); + await user.setUserPowerLevel(botMxid, roomId, 50); + await join; + + // Note: Here we create the DM proactively so this works across multiple + // tests. + // Get the DM room so we can get the token. + const dmRoomId = await user.dms.getOrCreateDm(botMxid); + + await user.sendText(roomId, '!hookshot outbound-hook test http://localhost:8111/test-path'); + // Test the contents of this. + await connectionEvent; + + const msgPromise = user.waitForRoomEvent({ sender: botMxid, eventType: "m.room.message", roomId: dmRoomId }); + const { data: msgData } = await msgPromise; + + const [_match, token ] = /(.+)<\/code>/.exec((msgData.content as unknown as TextualMessageEventContent).formatted_body ?? "") ?? []; + return token; +} + +/** + * + * @returns + */ +function awaitOutboundWebhook() { + return new Promise<{headers: IncomingHttpHeaders, files: {name: string, file: Buffer, info: FileInfo}[]}>((resolve, reject) => { + const server = createServer((req, res) => { + const bb = busboy({headers: req.headers}); + const files: {name: string, file: Buffer, info: FileInfo}[] = []; + bb.on('file', (name, stream, info) => { + const buffers: Buffer[] = []; + stream.on('data', d => { + buffers.push(d) + }); + stream.once('close', () => { + files.push({name, info, file: Buffer.concat(buffers)}) + }); + }); + + bb.once('close', () => { + res.writeHead(200, { 'Content-Type': 'text/plain' }); + res.end('OK'); + resolve({ + headers: req.headers, + files, + }); + clearTimeout(timer); + server.close(); + }); + + req.pipe(bb); + }); + server.listen(8111); + let timer: NodeJS.Timeout; + timer = setTimeout(() => { + reject(new Error("Request did not arrive")); + server.close(); + }, 10000); + + }); +} + +describe('OutboundHooks', () => { + let testEnv: E2ETestEnv; + + beforeAll(async () => { + const webhooksPort = 9500 + E2ETestEnv.workerId; + testEnv = await E2ETestEnv.createTestEnv({ + matrixLocalparts: ['user'], + config: { + generic: { + enabled: true, + outbound: true, + urlPrefix: `http://localhost:${webhooksPort}` + }, + listeners: [{ + port: webhooksPort, + bindAddress: '0.0.0.0', + // Bind to the SAME listener to ensure we don't have conflicts. + resources: ['webhooks'], + }], + } + }); + await testEnv.setUp(); + }, E2ESetupTestTimeout); + + afterAll(() => { + return testEnv?.tearDown(); + }); + + it('should be able to create a new webhook and push an event.', async () => { + const user = testEnv.getUser('user'); + const roomId = await user.createRoom({ name: 'My Test Webhooks room'}); + const token = await createOutboundConnection(user, testEnv.botMxid, roomId); + const gotWebhookRequest = awaitOutboundWebhook(); + + const eventId = await user.sendText(roomId, 'hello!'); + const { headers, files } = await gotWebhookRequest; + expect(headers['x-matrix-hookshot-roomid']).toEqual(roomId); + expect(headers['x-matrix-hookshot-eventid']).toEqual(eventId); + expect(headers['x-matrix-hookshot-token']).toEqual(token); + + // And check the JSON payload + const [event, media] = files; + expect(event.name).toEqual('event'); + expect(event.info.mimeType).toEqual('application/json'); + expect(event.info.filename).toEqual('event_data.json'); + const eventJson = JSON.parse(event.file.toString('utf-8')); + + // Check that the content looks sane. + expect(eventJson.room_id).toEqual(roomId); + expect(eventJson.event_id).toEqual(eventId); + expect(eventJson.sender).toEqual(await user.getUserId()); + expect(eventJson.content.body).toEqual('hello!'); + + // No media should be present. + expect(media).toBeUndefined(); + }); + + it('should be able to create a new webhook and push a media attachment.', async () => { + const user = testEnv.getUser('user'); + const roomId = await user.createRoom({ name: 'My Test Webhooks room'}); + await createOutboundConnection(user, testEnv.botMxid, roomId); + const gotWebhookRequest = awaitOutboundWebhook(); + + const mxcUrl = await user.uploadContent(TEST_FILE, 'image/svg+xml', "matrix.svg"); + await user.sendMessage(roomId, { + url: mxcUrl, + msgtype: "m.file", + body: "matrix.svg", + }) + const { files } = await gotWebhookRequest; + const [event, media] = files; + expect(event.info.mimeType).toEqual('application/json'); + expect(event.info.filename).toEqual('event_data.json'); + const eventJson = JSON.parse(event.file.toString('utf-8')); + expect(eventJson.content.body).toEqual('matrix.svg'); + + + expect(media.info.mimeType).toEqual('image/svg+xml'); + expect(media.info.filename).toEqual('matrix.svg'); + expect(media.file).toEqual(TEST_FILE); + }); + + // TODO: This requires us to support Redis in test conditions, as encryption is not possible + // in hookshot without it at the moment. + + // it.only('should be able to create a new webhook and push an encrypted media attachment.', async () => { + // const user = testEnv.getUser('user'); + // const roomId = await user.createRoom({ name: 'My Test Webhooks room', initial_state: [{ + // content: { + // "algorithm": "m.megolm.v1.aes-sha2" + // }, + // state_key: "", + // type: "m.room.encryption" + // }]}); + // await createOutboundConnection(user, testEnv.botMxid, roomId); + // const gotWebhookRequest = awaitOutboundWebhook(); + + // const encrypted = await user.crypto.encryptMedia(Buffer.from(TEST_FILE)); + // const mxc = await user.uploadContent(TEST_FILE); + // await user.sendMessage(roomId, { + // msgtype: "m.image", + // body: "matrix.svg", + // info: { + // mimetype: "image/svg+xml", + // }, + // file: { + // url: mxc, + // ...encrypted.file, + // }, + // }); + + // const { headers, files } = await gotWebhookRequest; + // const [event, media] = files; + // expect(event.info.mimeType).toEqual('application/json'); + // expect(event.info.filename).toEqual('event_data.json'); + // const eventJson = JSON.parse(event.file.toString('utf-8')); + // expect(eventJson.content.body).toEqual('matrix.svg'); + + + // expect(media.info.mimeType).toEqual('image/svg+xml'); + // expect(media.info.filename).toEqual('matrix.svg'); + // expect(media.file).toEqual(TEST_FILE); + // }); +}); diff --git a/src/Bridge.ts b/src/Bridge.ts index af0b336e..f968c804 100644 --- a/src/Bridge.ts +++ b/src/Bridge.ts @@ -1164,10 +1164,14 @@ export class Bridge { } if (!existingConnections.length) { // Is anyone interested in this state? - const connection = await this.connectionManager.createConnectionForState(roomId, new StateEvent(event), true); - if (connection) { - log.info(`New connected added to ${roomId}: ${connection.toString()}`); - this.connectionManager.push(connection); + try { + const connection = await this.connectionManager.createConnectionForState(roomId, new StateEvent(event), true); + if (connection) { + log.info(`New connected added to ${roomId}: ${connection.toString()}`); + this.connectionManager.push(connection); + } + } catch (ex) { + log.error(`Failed to handle connection for state ${event.type} in ${roomId}`, ex); } } diff --git a/src/Connections/GenericHook.ts b/src/Connections/GenericHook.ts index 5aa87de0..80cee3ad 100644 --- a/src/Connections/GenericHook.ts +++ b/src/Connections/GenericHook.ts @@ -467,7 +467,6 @@ export class GenericHookConnection extends BaseConnection implements IConnection successful, response: webhookResponse, }; - } public static getProvisionerDetails(botUserId: string) { @@ -492,7 +491,7 @@ export class GenericHookConnection extends BaseConnection implements IConnection ...(showSecrets ? { secrets: { url: new URL(this.hookId, this.config.parsedUrlPrefix), hookId: this.hookId, - } as GenericHookSecrets} : undefined) + } satisfies GenericHookSecrets} : undefined) } } diff --git a/src/Connections/OutboundHook.ts b/src/Connections/OutboundHook.ts new file mode 100644 index 00000000..a6c4301b --- /dev/null +++ b/src/Connections/OutboundHook.ts @@ -0,0 +1,281 @@ +import axios, { isAxiosError } from "axios"; +import { BaseConnection } from "./BaseConnection"; +import { Connection, IConnection, IConnectionState, InstantiateConnectionOpts, ProvisionConnectionOpts } from "./IConnection"; +import { ApiError, ErrCode, Logger } from "matrix-appservice-bridge"; +import { MatrixEvent } from "../MatrixEvent"; +import { FileMessageEventContent, Intent, StateEvent } from "matrix-bot-sdk"; +import { randomUUID } from "crypto"; +import UserAgent from "../UserAgent"; +import { hashId } from "../libRs"; +import { GetConnectionsResponseItem } from "../provisioning/api"; + +export interface OutboundHookConnectionState extends IConnectionState { + name: string, + url: string; + method?: "PUT"|"POST"; +} + +export interface OutboundHookSecrets { + token: string; +} + +export type OutboundHookResponseItem = GetConnectionsResponseItem; + + +const log = new Logger("OutboundHookConnection"); + +/** + * Handles rooms connected to an outbound generic service. + */ +@Connection +export class OutboundHookConnection extends BaseConnection implements IConnection { + static readonly CanonicalEventType = "uk.half-shot.matrix-hookshot.outbound-hook"; + static readonly ServiceCategory = "genericOutbound"; + + static readonly EventTypes = [ + OutboundHookConnection.CanonicalEventType, + ]; + + private static getAccountDataKey(stateKey: string) { + return `${OutboundHookConnection.CanonicalEventType}:${stateKey}`; + } + + static validateState(state: Record): OutboundHookConnectionState { + const {url, method, name} = state; + if (typeof url !== "string") { + throw new ApiError('Outbound URL must be a string', ErrCode.BadValue); + } + + if (typeof name !== "string") { + throw new ApiError("A webhook name must be a string.", ErrCode.BadValue); + } + + try { + const validatedUrl = new URL(url); + if (validatedUrl.protocol !== "http:" && validatedUrl.protocol !== "https:") { + throw new ApiError('Outbound URL protocol must be http or https', ErrCode.BadValue); + } + } catch (ex) { + if (ex instanceof ApiError) { + throw ex; + } + throw new ApiError('Outbound URL is invalid', ErrCode.BadValue); + } + + if (method === "PUT" || method === "POST" || method === undefined) { + return { + name, + url, + method: method ?? 'PUT', + }; + } + throw new ApiError('Outbound Method must be one of PUT,POST', ErrCode.BadValue); + } + + static async createConnectionForState(roomId: string, event: StateEvent>, {intent, config, tokenStore}: InstantiateConnectionOpts) { + if (!config.generic) { + throw Error('Generic webhooks are not configured'); + } + // Generic hooks store the hookId in the account data + const state = this.validateState(event.content); + const token = await tokenStore.getGenericToken("outboundHookToken", hashId(`${roomId}:${event.stateKey}`)); + + if (!token) { + throw new Error(`Missing stored token for connection`); + } + + return new OutboundHookConnection( + roomId, + state, + token, + event.stateKey, + intent, + ); + } + + static async provisionConnection(roomId: string, userId: string, data: Record = {}, {intent, config, tokenStore}: ProvisionConnectionOpts) { + if (!config.generic) { + throw Error('Generic Webhooks are not configured'); + } + if (!config.generic.outbound) { + throw Error('Outbound support for Generic Webhooks is not configured'); + } + + const token = `hs-ob-${randomUUID()}`; + + if (typeof data.name !== "string" || data.name.length < 3 || data.name.length > 64) { + throw new ApiError("A webhook name must be between 3-64 characters.", ErrCode.BadValue); + } + + const validState = OutboundHookConnection.validateState(data); + + const stateKey = data.name; + const tokenKey = hashId(`${roomId}:${stateKey}`); + await tokenStore.storeGenericToken("outboundHookToken", tokenKey, token); + + await intent.underlyingClient.sendStateEvent(roomId, this.CanonicalEventType, stateKey, validState); + const connection = new OutboundHookConnection(roomId, validState, token, stateKey, intent); + return { + connection, + stateEventContent: validState, + } + } + + /** + * @param state Should be a pre-validated state object returned by {@link validateState} + */ + constructor( + roomId: string, + private state: OutboundHookConnectionState, + public readonly outboundToken: string, + stateKey: string, + private readonly intent: Intent, + ) { + super(roomId, stateKey, OutboundHookConnection.CanonicalEventType); + } + + public isInterestedInStateEvent(eventType: string, stateKey: string) { + return OutboundHookConnection.EventTypes.includes(eventType) && this.stateKey === stateKey; + } + + /** + * Check for any embedded media in the event, and if present then extract it as a blob. This + * function also returns event content with the encryption details stripped from the event contents. + * @param ev The Matrix event to inspect for embedded media. + * @returns A blob and event object if media is found, otherwise null. + * @throws If media was expected (due to the msgtype) but not provided, or if the media could not + * be found or decrypted. + */ + private async extractMedia(ev: MatrixEvent): Promise<{blob: Blob, event: MatrixEvent}|null> { + // Check for non-extendable event types first. + const content = ev.content as FileMessageEventContent; + + if (!["m.image", "m.audio", "m.file", "m.video"].includes(content.msgtype)) { + return null; + } + + const client = this.intent.underlyingClient; + let data: { data: Buffer, contentType?: string}; + if (client.crypto && content.file) { + data = { + data: await client.crypto.decryptMedia(content.file), + contentType: content.info?.mimetype + }; + const strippedContent = {...ev, content: { + ...content, + file: null, + }}; + return { + blob: new File([await client.crypto.decryptMedia(content.file)], content.body, { type: data.contentType }), + event: strippedContent + } + } else if (content.url) { + data = await this.intent.underlyingClient.downloadContent(content.url); + return { + blob: new File([data.data], content.body, { type: data.contentType }), + event: ev, + }; + } + + throw Error('Missing file or url key on event, not handling media'); + } + + + public async onEvent(ev: MatrixEvent): Promise { + // The event content first. + const multipartBlob = new FormData(); + try { + const mediaResult = await this.extractMedia(ev); + if (mediaResult) { + multipartBlob.set('event', new Blob([JSON.stringify(mediaResult?.event)], { + type: 'application/json', + }), "event_data.json"); + multipartBlob.set('media', mediaResult.blob); + } + } catch (ex) { + log.warn(`Failed to get media for ${ev.event_id} in ${this.roomId}`, ex); + } + + if (!multipartBlob.has('event')) { + multipartBlob.set('event', new Blob([JSON.stringify(ev)], { + type: 'application/json', + }), "event_data.json"); + } + + try { + await axios.request({ + url: this.state.url, + data: multipartBlob, + method: this.state.method, + responseType: 'text', + validateStatus: (status) => status >= 200 && status <= 299, + headers: { + 'User-Agent': UserAgent, + 'X-Matrix-Hookshot-RoomId': this.roomId, + 'X-Matrix-Hookshot-EventId': ev.event_id, + 'X-Matrix-Hookshot-Token': this.outboundToken, + }, + }); + log.info(`Sent webhook for ${ev.event_id}`); + } catch (ex) { + if (!isAxiosError(ex)) { + log.error(`Failed to send outbound webhook`, ex); + throw ex; + } + if (ex.status) { + log.error(`Failed to send outbound webhook: HTTP ${ex.status}`); + } else { + log.error(`Failed to send outbound webhook: ${ex.code}`); + } + log.debug("Response from server", ex.response?.data); + } + } + + public static getProvisionerDetails(botUserId: string) { + return { + service: "genericOutbound", + eventType: OutboundHookConnection.CanonicalEventType, + type: "Webhook", + botUserId: botUserId, + } + } + + public getProvisionerDetails(showSecrets = false): OutboundHookResponseItem { + return { + ...OutboundHookConnection.getProvisionerDetails(this.intent.userId), + id: this.connectionId, + config: { + url: this.state.url, + method: this.state.method, + name: this.state.name, + }, + ...(showSecrets ? { secrets: { + token: this.outboundToken, + } satisfies OutboundHookSecrets} : undefined) + } + } + + public async onRemove() { + log.info(`Removing ${this.toString()} for ${this.roomId}`); + // Do a sanity check that the event exists. + await this.intent.underlyingClient.getRoomStateEvent(this.roomId, OutboundHookConnection.CanonicalEventType, this.stateKey); + await this.intent.underlyingClient.sendStateEvent(this.roomId, OutboundHookConnection.CanonicalEventType, this.stateKey, { disabled: true }); + // TODO: Remove token + + } + + public async provisionerUpdateConfig(userId: string, config: Record) { + config = { ...this.state, ...config }; + const validatedConfig = OutboundHookConnection.validateState(config); + await this.intent.underlyingClient.sendStateEvent(this.roomId, OutboundHookConnection.CanonicalEventType, this.stateKey, + { + ...validatedConfig, + } + ); + this.state = validatedConfig; + } + + public toString() { + return `OutboundHookConnection ${this.roomId}`; + } +} \ No newline at end of file diff --git a/src/Connections/SetupConnection.ts b/src/Connections/SetupConnection.ts index 59877fb0..c642b3e4 100644 --- a/src/Connections/SetupConnection.ts +++ b/src/Connections/SetupConnection.ts @@ -1,6 +1,6 @@ import { BotCommands, botCommand, compileBotCommands, HelpFunction } from "../BotCommands"; import { CommandConnection } from "./CommandConnection"; -import { GenericHookConnection, GenericHookConnectionState, GitHubRepoConnection, JiraProjectConnection, JiraProjectConnectionState } from "."; +import { GenericHookConnection, GenericHookConnectionState, GitHubRepoConnection, JiraProjectConnection, JiraProjectConnectionState, OutboundHookConnection } from "."; import { CommandError } from "../errors"; import { BridgePermissionLevel } from "../config/Config"; import markdown from "markdown-it"; @@ -18,6 +18,8 @@ import { HoundConnection } from "./HoundConnection"; const md = new markdown(); const log = new Logger("SetupConnection"); +const OUTBOUND_DOCS_LINK = "https://matrix-org.github.io/matrix-hookshot/latest/setup/webhooks.html"; + /** * Handles setting up a room with connections. This connection is "virtual" in that it has * no state, and is only invoked when messages from other clients fall through. @@ -284,6 +286,35 @@ export class SetupConnection extends CommandConnection { return this.client.sendHtmlNotice(this.roomId, md.renderInline(`Removed webhook \`${name}\``)); } + + + @botCommand("outbound-hook", { help: "Create an outbound webhook.", requiredArgs: ["name", "url"], includeUserId: true, category: GenericHookConnection.ServiceCategory}) + public async onOutboundHook(userId: string, name: string, url: string) { + if (!this.config.generic?.outbound) { + throw new CommandError("not-configured", "The bridge is not configured to support webhooks."); + } + + await this.checkUserPermissions(userId, "webhooks", GitHubRepoConnection.CanonicalEventType); + + const { connection }= await OutboundHookConnection.provisionConnection(this.roomId, userId, {name, url}, this.provisionOpts); + this.pushConnections(connection); + + const adminRoom = await this.getOrCreateAdminRoom(this.intent, userId); + const safeRoomId = encodeURIComponent(this.roomId); + + await this.client.sendHtmlNotice( + adminRoom.roomId, + md.renderInline( + `You have bridged the webhook "${name}" in https://matrix.to/#/${safeRoomId} .\n` + + // Line break before and no full stop after URL is intentional. + // This makes copying and pasting the URL much easier. + `Please use the secret token \`${connection.outboundToken}\` when validating the request.\n` + + `See the [documentation](${OUTBOUND_DOCS_LINK}) for more information`, + )); + return this.client.sendNotice(this.roomId, `Room configured to bridge outbound webhooks. See admin room for the secret token.`); + } + + @botCommand("figma file", { help: "Bridge a Figma file to the room.", requiredArgs: ["url"], includeUserId: true, category: FigmaFileConnection.ServiceCategory}) public async onFigma(userId: string, url: string) { if (!this.config.figma) { diff --git a/src/Connections/index.ts b/src/Connections/index.ts index d56143c9..c06b97cb 100644 --- a/src/Connections/index.ts +++ b/src/Connections/index.ts @@ -10,4 +10,5 @@ export * from "./GitlabRepo"; export * from "./IConnection"; export * from "./JiraProject"; export * from "./FigmaFileConnection"; -export * from "./FeedConnection"; \ No newline at end of file +export * from "./FeedConnection"; +export * from "./OutboundHook"; \ No newline at end of file diff --git a/src/Widgets/BridgeWidgetApi.ts b/src/Widgets/BridgeWidgetApi.ts index 0962d5d0..16ff84fd 100644 --- a/src/Widgets/BridgeWidgetApi.ts +++ b/src/Widgets/BridgeWidgetApi.ts @@ -100,7 +100,8 @@ export class BridgeWidgetApi extends ProvisioningApi { general: true, github: !!this.config.github, gitlab: !!this.config.gitlab, - generic: !!this.config.generic, + generic: !!this.config.generic?.enabled, + genericOutbound: !!this.config.generic?.outbound, jira: !!this.config.jira, figma: !!this.config.figma, feeds: !!this.config.feeds?.enabled, diff --git a/src/config/Config.ts b/src/config/Config.ts index 83288f97..3884a0c7 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -9,10 +9,9 @@ import { BridgeConfigActorPermission, BridgePermissions } from "../libRs"; import { ConfigError } from "../errors"; import { ApiError, ErrCode } from "../api"; import { GithubInstance, GITHUB_CLOUD_URL } from "../github/GithubInstance"; -import { Logger } from "matrix-appservice-bridge"; +import { DefaultDisallowedIpRanges, Logger } from "matrix-appservice-bridge"; import { BridgeConfigCache } from "./sections/cache"; import { BridgeConfigQueue } from "./sections"; -import { DefaultConfigRoot } from "./Defaults"; const log = new Logger("Config"); @@ -296,10 +295,13 @@ export interface BridgeGenericWebhooksConfigYAML { allowJsTransformationFunctions?: boolean; waitForComplete?: boolean; enableHttpGet?: boolean; + outbound?: boolean; + disallowedIpRanges?: string[]; } export class BridgeConfigGenericWebhooks { public readonly enabled: boolean; + public readonly outbound: boolean; @hideKey() public readonly parsedUrlPrefix: URL; @@ -311,6 +313,7 @@ export class BridgeConfigGenericWebhooks { public readonly enableHttpGet: boolean; constructor(yaml: BridgeGenericWebhooksConfigYAML) { this.enabled = yaml.enabled || false; + this.outbound = yaml.outbound || false; this.enableHttpGet = yaml.enableHttpGet || false; try { this.parsedUrlPrefix = makePrefixedUrl(yaml.urlPrefix); @@ -757,6 +760,9 @@ remove "useLegacySledStore" from your configuration file, and restart Hookshot. } if (this.generic && this.generic.enabled) { services.push("generic"); + if (this.generic.outbound) { + services.push("genericOutbound"); + } } if (this.github) { services.push("github"); @@ -788,6 +794,7 @@ remove "useLegacySledStore" from your configuration file, and restart Hookshot. case "gitlab": config = this.gitlab?.publicConfig; break; + case "genericOutbound": case "jira": config = {}; break; diff --git a/src/tokens/UserTokenStore.ts b/src/tokens/UserTokenStore.ts index 9a30df73..c02d590a 100644 --- a/src/tokens/UserTokenStore.ts +++ b/src/tokens/UserTokenStore.ts @@ -26,8 +26,8 @@ const LEGACY_ACCOUNT_DATA_TYPE = "uk.half-shot.matrix-github.password-store:"; const LEGACY_ACCOUNT_DATA_GITLAB_TYPE = "uk.half-shot.matrix-github.gitlab.password-store:"; const log = new Logger("UserTokenStore"); -export type TokenType = "github"|"gitlab"|"jira"; -export const AllowedTokenTypes = ["github", "gitlab", "jira"]; +export type TokenType = "github"|"gitlab"|"jira"|"generic"; +export const AllowedTokenTypes = ["github", "gitlab", "jira", "generic"]; interface StoredTokenData { encrypted: string|string[]; @@ -165,6 +165,37 @@ export class UserTokenStore extends TypedEmitter { return null; } + public async storeGenericToken(namespace: string, key: string, token: string) { + const finalTokenKey = `generic:${namespace}:${key}` + const tokenParts: string[] = this.tokenEncryption.encrypt(token); + const data: StoredTokenData = { + encrypted: tokenParts, + keyId: this.keyId, + algorithm: "rsa-pkcs1v15", + }; + await this.intent.underlyingClient.setAccountData(finalTokenKey, data); + log.debug(`Stored token ${namespace}`); + } + + public async getGenericToken(namespace: string, key: string): Promise { + const finalTokenKey = `generic:${namespace}:${key}` + const obj = await this.intent.underlyingClient.getSafeAccountData(finalTokenKey); + if (!obj || "deleted" in obj) { + return null; + } + // For legacy we just assume it's the current configured key. + const algorithm = stringToAlgo(obj.algorithm ?? "rsa"); + const keyId = obj.keyId ?? this.keyId; + + if (keyId !== this.keyId) { + throw new Error(`Stored data was encrypted with a different key to the one currently configured`); + } + + const encryptedParts = typeof obj.encrypted === "string" ? [obj.encrypted] : obj.encrypted; + const token = this.tokenEncryption.decrypt(encryptedParts, algorithm); + return token; + } + public static parseGitHubToken(token: string): GitHubOAuthToken { if (!token.startsWith('{')) { // Old style token diff --git a/web/components/RoomConfigView.tsx b/web/components/RoomConfigView.tsx index 4a8c23b6..3ce4af35 100644 --- a/web/components/RoomConfigView.tsx +++ b/web/components/RoomConfigView.tsx @@ -4,6 +4,7 @@ import style from "./RoomConfigView.module.scss"; import { ConnectionCard } from "./ConnectionCard"; import { FeedsConfig } from "./roomConfig/FeedsConfig"; import { GenericWebhookConfig } from "./roomConfig/GenericWebhookConfig"; +import { OutboundWebhookConfig } from "./roomConfig/OutboundWebhookConfig"; import { GithubRepoConfig } from "./roomConfig/GithubRepoConfig"; import { GitlabRepoConfig } from "./roomConfig/GitlabRepoConfig"; import { JiraProjectConfig } from "./roomConfig/JiraProjectConfig"; @@ -25,6 +26,7 @@ interface IProps { enum ConnectionType { Feeds = "feeds", Generic = "generic", + GenericOutbound = "genericOutbound", Github = "github", Gitlab = "gitlab", Jira = "jira", @@ -65,12 +67,19 @@ const connections: Record = { component: JiraProjectConfig, }, [ConnectionType.Generic]: { - displayName: 'Generic Webhook', + displayName: 'Inbound (Generic) Webhook', description: "Create a webhook which can be used to connect any service to Matrix", icon: WebhookIcon, darkIcon: true, component: GenericWebhookConfig, }, + [ConnectionType.GenericOutbound]: { + displayName: 'Outbound Webhook', + description: "Create a webhook which can be used to connect any service to Matrix", + icon: WebhookIcon, + darkIcon: true, + component: OutboundWebhookConfig, + }, }; export default function RoomConfigView(props: IProps) { diff --git a/web/components/roomConfig/GenericWebhookConfig.tsx b/web/components/roomConfig/GenericWebhookConfig.tsx index 6a5ae3aa..ec583f41 100644 --- a/web/components/roomConfig/GenericWebhookConfig.tsx +++ b/web/components/roomConfig/GenericWebhookConfig.tsx @@ -103,7 +103,7 @@ interface ServiceConfig { } const RoomConfigText = { - header: 'Generic Webhooks', + header: 'Inbound (Generic) Webhooks', createNew: 'Create new webhook', listCanEdit: 'Your webhooks', listCantEdit: 'Configured webhooks', diff --git a/web/components/roomConfig/OutboundWebhookConfig.tsx b/web/components/roomConfig/OutboundWebhookConfig.tsx new file mode 100644 index 00000000..d64b6517 --- /dev/null +++ b/web/components/roomConfig/OutboundWebhookConfig.tsx @@ -0,0 +1,85 @@ +import { FunctionComponent, createRef } from "preact"; +import { useCallback, useState } from "preact/hooks" +import { BridgeConfig } from "../../BridgeAPI"; +import type { OutboundHookConnectionState, OutboundHookResponseItem } from "../../../src/Connections/OutboundHook"; +import { ConnectionConfigurationProps, RoomConfig } from "./RoomConfig"; +import { InputField, ButtonSet, Button } from "../elements"; +import WebhookIcon from "../../icons/webhook.png"; + +const ConnectionConfiguration: FunctionComponent> = ({existingConnection, onSave, onRemove, isUpdating}) => { + const [outboundUrl, setOutboundUrl] = useState(existingConnection?.config.url ?? ''); + + const nameRef = createRef(); + + const canEdit = !existingConnection || (existingConnection?.canEdit ?? false); + const handleSave = useCallback((evt: Event) => { + evt.preventDefault(); + if (!canEdit) { + return; + } + onSave({ + name: nameRef?.current?.value || existingConnection?.config.name || "Generic Webhook", + url: outboundUrl, + }); + }, [canEdit, onSave, nameRef, outboundUrl, existingConnection]); + + const onUrlChange = useCallback((evt: any) => { + setOutboundUrl(evt.target?.value); + }, [setOutboundUrl]); + + const [tokenRevealed, setTokenRevealed] = useState(false); + + const revealToken = useCallback((evt: any) => { + evt.preventDefault(); + setTokenRevealed(true); + }, [setTokenRevealed]); + + + + return
+ + + + + + + + + + + + + + { canEdit && } + { canEdit && existingConnection && } + +
; +}; + +interface ServiceConfig { + allowJsTransformationFunctions: boolean, + waitForComplete: boolean, +} + +const RoomConfigText = { + header: 'Outbound Webhooks', + createNew: 'Create new webhook', + listCanEdit: 'Your webhooks', + listCantEdit: 'Configured webhooks', +}; + +const RoomConfigListItemFunc = (c: OutboundHookResponseItem) => c.config.name; + +export const OutboundWebhookConfig: BridgeConfig = ({ roomId, showHeader }) => { + return + headerImg={WebhookIcon} + darkHeaderImg={true} + showHeader={showHeader} + roomId={roomId} + type="genericOutbound" + connectionEventType="uk.half-shot.matrix-hookshot.outbound-hook" + text={RoomConfigText} + listItemName={RoomConfigListItemFunc} + connectionConfigComponent={ConnectionConfiguration} + />; +}; diff --git a/yarn.lock b/yarn.lock index 9f45fb74..8c9071cd9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -610,6 +610,13 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== +"@floating-ui/core@^1.0.0": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.2.tgz#d37f3e0ac1f1c756c7de45db13303a266226851a" + integrity sha512-+2XpQV9LLZeanU4ZevzRnGFg2neDeKHgFLjP6YLW+tly0IvrhqT4u8enLGjLH3qeh85g19xY5rsAusfwTdn5lg== + dependencies: + "@floating-ui/utils" "^0.2.0" + "@floating-ui/core@^1.4.2": version "1.5.2" resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.5.2.tgz#53a0f7a98c550e63134d504f26804f6b83dbc071" @@ -617,6 +624,14 @@ dependencies: "@floating-ui/utils" "^0.1.3" +"@floating-ui/dom@^1.0.0": + version "1.6.5" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.5.tgz#323f065c003f1d3ecf0ff16d2c2c4d38979f4cb9" + integrity sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw== + dependencies: + "@floating-ui/core" "^1.0.0" + "@floating-ui/utils" "^0.2.0" + "@floating-ui/dom@^1.5.1": version "1.5.3" resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.5.3.tgz#54e50efcb432c06c23cd33de2b575102005436fa" @@ -632,11 +647,32 @@ dependencies: "@floating-ui/dom" "^1.5.1" +"@floating-ui/react-dom@^2.0.8", "@floating-ui/react-dom@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.1.0.tgz#4f0e5e9920137874b2405f7d6c862873baf4beff" + integrity sha512-lNzj5EQmEKn5FFKc04+zasr09h/uX8RtJRNj5gUXsSQIXHVWTVh+hVAg1vOMCexkX8EgvemMvIFpQfkosnVNyA== + dependencies: + "@floating-ui/dom" "^1.0.0" + +"@floating-ui/react@^0.26.9": + version "0.26.17" + resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.26.17.tgz#efa2e1a0dea3d9d308965c5ccd49756bb64a883d" + integrity sha512-ESD+jYWwqwVzaIgIhExrArdsCL1rOAzryG/Sjlu8yaD3Mtqi3uVyhbE2V7jD58Mo52qbzKz2eUY/Xgh5I86FCQ== + dependencies: + "@floating-ui/react-dom" "^2.1.0" + "@floating-ui/utils" "^0.2.0" + tabbable "^6.0.0" + "@floating-ui/utils@^0.1.3": version "0.1.6" resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.6.tgz#22958c042e10b67463997bd6ea7115fe28cbcaf9" integrity sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A== +"@floating-ui/utils@^0.2.0": + version "0.2.2" + resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5" + integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw== + "@humanwhocodes/config-array@^0.11.13": version "0.11.13" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297" @@ -1325,6 +1361,19 @@ dependencies: "@babel/runtime" "^7.13.10" +"@radix-ui/react-context-menu@^2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@radix-ui/react-context-menu/-/react-context-menu-2.1.5.tgz#1bdbd72761439f9166f75dc4598f276265785c83" + integrity sha512-R5XaDj06Xul1KGb+WP8qiOh7tKJNz2durpLBXAGZjSVtctcRFCuEvy2gtMwRJGePwQQE5nV77gs4FwRi8T+r2g== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/primitive" "1.0.1" + "@radix-ui/react-context" "1.0.1" + "@radix-ui/react-menu" "2.0.6" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-use-callback-ref" "1.0.1" + "@radix-ui/react-use-controllable-state" "1.0.1" + "@radix-ui/react-context@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.0.1.tgz#fe46e67c96b240de59187dcb7a1a50ce3e2ec00c" @@ -1523,7 +1572,7 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-primitive" "1.0.3" -"@radix-ui/react-slot@1.0.2": +"@radix-ui/react-slot@1.0.2", "@radix-ui/react-slot@^1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.2.tgz#a9ff4423eade67f501ffb32ec22064bc9d3099ab" integrity sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg== @@ -1859,6 +1908,13 @@ resolved "https://registry.yarnpkg.com/@types/btoa-lite/-/btoa-lite-1.0.2.tgz#82bb6aab00abf7cff3ca2825abe010c0cd536ae5" integrity sha512-ZYbcE2x7yrvNFJiU7xJGrpF/ihpkM7zKgw8bha3LNJSesvTtUNxbpzaT7WXBIryf6jovisrxTBvymxMeLLj1Mg== +"@types/busboy@^1.5.4": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@types/busboy/-/busboy-1.5.4.tgz#0038c31102ca90f2a7f0d8bc27ee5ebf1088e230" + integrity sha512-kG7WrUuAKK0NoyxfQHsVE6j1m01s6kMma64E+OZenQABMQyTJop1DumUWcLwAQ2JzpefU7PDYoRDKl8uZosFjw== + dependencies: + "@types/node" "*" + "@types/caseless@*": version "0.12.5" resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.5.tgz#db9468cb1b1b5a925b8f34822f1669df0c5472f5" @@ -2273,24 +2329,27 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== -"@vector-im/compound-design-tokens@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-0.1.0.tgz#1a574fba872ff93b1de8490f475e30b922cd02a2" - integrity sha512-vnDrd1CPPR7CwQLss/JnIE1ga6QwmCkhgBvXm1huMhCs7nIiqf90Sbgc0WugbHNaRXGEEhMVGrE69DaQIUcqOA== +"@vector-im/compound-design-tokens@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-1.3.0.tgz#1d04f006a9e56b920432095d08d7c84c0933ebc7" + integrity sha512-RXcyEAdxNzekMhVuvxtLPt9zb6yT2N+5cnb2Hul9zwRiF7+XEHpD36+IF6V0QOXk2pkN0wOr3jCvc9eOWOq9SQ== dependencies: svg2vectordrawable "^2.9.1" -"@vector-im/compound-web@^0.9.4": - version "0.9.4" - resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-0.9.4.tgz#89ac6d136c5f9d553de0e8540398a8a4b6cdeb6f" - integrity sha512-L1N0xe3G7k35b3i+5teYg1nplsbz8p+VOxIGWIPU4H7D4PBCxhf9i7ft8aJjLsIdIaInJkqjvKwPU+Yb/yvgUQ== +"@vector-im/compound-web@^4.8.0": + version "4.8.0" + resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-4.8.0.tgz#1fe11d78549694f8d91b40065994bad19a7cebf2" + integrity sha512-kyB8wQPbdTUFWIzAbb4HcZ4iisUUpbm0xwmEjV9ZNN1/EIodidW6nLeYATh3Vc1fBvTGTgbFiPc1DiAcBuudiw== dependencies: + "@floating-ui/react" "^0.26.9" + "@floating-ui/react-dom" "^2.0.8" + "@radix-ui/react-context-menu" "^2.1.5" "@radix-ui/react-dropdown-menu" "^2.0.6" "@radix-ui/react-form" "^0.0.3" "@radix-ui/react-separator" "^1.0.3" + "@radix-ui/react-slot" "^1.0.2" "@radix-ui/react-tooltip" "^1.0.6" classnames "^2.3.2" - graphemer "^1.4.0" vaul "^0.7.0" abbrev@1: @@ -2859,6 +2918,13 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== +busboy@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893" + integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA== + dependencies: + streamsearch "^1.1.0" + bytes@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" @@ -7429,6 +7495,11 @@ stream-length@^1.0.2: dependencies: bluebird "^2.6.2" +streamsearch@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764" + integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== + string-argv@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" @@ -7442,7 +7513,16 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -7509,7 +7589,14 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -7626,6 +7713,11 @@ svgpath@^2.5.0: resolved "https://registry.yarnpkg.com/svgpath/-/svgpath-2.6.0.tgz#5b160ef3d742b7dfd2d721bf90588d3450d7a90d" integrity sha512-OIWR6bKzXvdXYyO4DK/UWa1VA1JeKq8E+0ug2DG98Y/vOmMpfZNj+TIG988HjfYSqtcy/hFOtZq/n/j5GSESNg== +tabbable@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97" + integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew== + tdigest@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.2.tgz#96c64bac4ff10746b910b0e23b515794e12faced" @@ -8126,7 +8218,7 @@ workerpool@6.2.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -8144,6 +8236,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"