-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* master: Add config options for how much to obfuscate email addresses in 3rd party invites (#311) Remove : from allowed client_secret chars (#309) Riot -> Element (#308)
- Loading branch information
Showing
14 changed files
with
734 additions
and
667 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Replace instances of Riot with Element. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Sydent now correctly enforces the valid characters in the `client_secret` parameter used in various endpoints. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Add config options for controlling how email addresses are obfuscated in third party invites. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,144 +1,144 @@ | ||
| Date: %(date)s | ||
| From: %(from)s | ||
| To: %(to)s | ||
| Message-ID: %(messageid)s | ||
| Subject: %(subject_header_value)s | ||
| MIME-Version: 1.0 | ||
| Content-Type: multipart/alternative; | ||
| boundary="7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ" | ||
|
|
||
| --7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Disposition: inline | ||
| Hi, | ||
| %(sender_display_name)s has invited you into a room %(bracketed_room_name)s on | ||
| Matrix. To join the conversation, either pick a Matrix client from | ||
| https://matrix.org/docs/projects/try-matrix-now.html or use the single-click | ||
| link below to join via Riot (requires Chrome, Firefox, Safari, iOS or Android) | ||
| https://riot.im/app/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fmatrix.org%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s | ||
| About Matrix: | ||
| Matrix.org is an open standard for interoperable, decentralised, real-time communication | ||
| over IP, supporting group chat, file transfer, voice and video calling, integrations to | ||
| other apps, bridges to other communication systems and much more. It can be used to power | ||
| Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - or anywhere | ||
| you need a standard HTTP API for publishing and subscribing to data whilst tracking the | ||
| conversation history. | ||
| Matrix defines the standard, and provides open source reference implementations of | ||
| Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you | ||
| create new communication solutions or extend the capabilities and reach of existing ones. | ||
| Thanks, | ||
| Matrix | ||
| --7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ | ||
| Content-Type: multipart/related; | ||
| boundary="M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR"; | ||
| type="text/html" | ||
| --M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR | ||
| Content-Type: text/html; charset=UTF-8 | ||
| Content-Disposition: inline | ||
|
|
||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <style type="text/css"> | ||
| body { | ||
| margin: 0px; | ||
| } | ||
| pre, code { | ||
| word-break: break-word; | ||
| white-space: pre-wrap; | ||
| } | ||
| #page { | ||
| font-family: 'Open Sans', Helvetica, Arial, Sans-Serif; | ||
| font-color: #454545; | ||
| font-size: 12pt; | ||
| width: 100%%; | ||
| padding: 20px; | ||
| } | ||
| #inner { | ||
| width: 640px; | ||
| } | ||
| .header { | ||
| width: 100%%; | ||
| height: 87px; | ||
| color: #454545; | ||
| border-bottom: 4px solid #e5e5e5; | ||
| } | ||
| .logo { | ||
| text-align: right; | ||
| margin-left: 20px; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <table id="page"> | ||
| <tr> | ||
| <td> </td> | ||
| <td id="inner"> | ||
| <table class="header"> | ||
| <tr> | ||
| <td> | ||
| </td> | ||
| <td class="logo"> | ||
| <img src="http://matrix.org/img/matrix-120x51.png" width="120" height="51" alt="[matrix]"/> | ||
| </td> | ||
| </tr> | ||
| </table> | ||
|
|
||
| <p>Hi,</p> | ||
|
|
||
| <p>%(sender_display_name_forhtml)s has invited you into a room %(bracketed_room_name_forhtml)s on | ||
| Matrix. To join the conversation, either <a href="https://matrix.org/docs/projects/try-matrix-now.html">pick a Matrix client</a> or use the single-click | ||
| link below to join via Riot (requires | ||
| <a href="https://www.google.com/chrome">Chrome</a>, | ||
| <a href="https://www.getfirefox.com">Firefox</a> or | ||
| <a href="https://www.apple.com/safari">Safari</a> on the web, | ||
| or iOS or Android on mobile.)</p> | ||
| </p> | ||
|
|
||
| <p> | ||
| <a | ||
| href="https://riot.im/app/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fmatrix.org%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s">Join the conversation.</a> | ||
| </p> | ||
|
|
||
| <br> | ||
| <p>About Matrix:</p> | ||
|
|
||
| <p>Matrix.org is an open standard for interoperable, decentralised, real-time communication | ||
| over IP, supporting group chat, file transfer, voice and video calling, integrations to | ||
| other apps, bridges to other communication systems and much more. It can be used to power | ||
| Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - or anywhere | ||
| you need a standard HTTP API for publishing and subscribing to data whilst tracking the | ||
| conversation history.</p> | ||
|
|
||
| <p>Matrix defines the standard, and provides open source reference implementations of | ||
| Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you | ||
| create new communication solutions or extend the capabilities and reach of existing ones.</p> | ||
|
|
||
| <p>Thanks,</p> | ||
|
|
||
| <p>Matrix</p> | ||
| </td> | ||
| <td> </td> | ||
| </tr> | ||
| </table> | ||
| </body> | ||
| </html> | ||
| --M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR-- | ||
|
|
||
| --7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ-- | ||
| Date: %(date)s | ||
| From: %(from)s | ||
| To: %(to)s | ||
| Message-ID: %(messageid)s | ||
| Subject: %(subject_header_value)s | ||
| MIME-Version: 1.0 | ||
| Content-Type: multipart/alternative; | ||
| boundary="7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ" | ||
|
|
||
| --7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Disposition: inline | ||
| Hi, | ||
| %(sender_display_name)s has invited you into a room %(bracketed_room_name)s on | ||
| Matrix. To join the conversation, either pick a Matrix client from | ||
| https://matrix.org/docs/projects/try-matrix-now.html or use the single-click | ||
| link below to join via Element (requires Chrome, Firefox, Safari, iOS or Android) | ||
| https://app.element.io/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fmatrix.org%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s | ||
| About Matrix: | ||
| Matrix.org is an open standard for interoperable, decentralised, real-time communication | ||
| over IP, supporting group chat, file transfer, voice and video calling, integrations to | ||
| other apps, bridges to other communication systems and much more. It can be used to power | ||
| Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - or anywhere | ||
| you need a standard HTTP API for publishing and subscribing to data whilst tracking the | ||
| conversation history. | ||
| Matrix defines the standard, and provides open source reference implementations of | ||
| Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you | ||
| create new communication solutions or extend the capabilities and reach of existing ones. | ||
| Thanks, | ||
| Matrix | ||
| --7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ | ||
| Content-Type: multipart/related; | ||
| boundary="M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR"; | ||
| type="text/html" | ||
| --M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR | ||
| Content-Type: text/html; charset=UTF-8 | ||
| Content-Disposition: inline | ||
|
|
||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <style type="text/css"> | ||
| body { | ||
| margin: 0px; | ||
| } | ||
| pre, code { | ||
| word-break: break-word; | ||
| white-space: pre-wrap; | ||
| } | ||
| #page { | ||
| font-family: 'Open Sans', Helvetica, Arial, Sans-Serif; | ||
| font-color: #454545; | ||
| font-size: 12pt; | ||
| width: 100%%; | ||
| padding: 20px; | ||
| } | ||
| #inner { | ||
| width: 640px; | ||
| } | ||
| .header { | ||
| width: 100%%; | ||
| height: 87px; | ||
| color: #454545; | ||
| border-bottom: 4px solid #e5e5e5; | ||
| } | ||
| .logo { | ||
| text-align: right; | ||
| margin-left: 20px; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <table id="page"> | ||
| <tr> | ||
| <td> </td> | ||
| <td id="inner"> | ||
| <table class="header"> | ||
| <tr> | ||
| <td> | ||
| </td> | ||
| <td class="logo"> | ||
| <img src="http://matrix.org/img/matrix-120x51.png" width="120" height="51" alt="[matrix]"/> | ||
| </td> | ||
| </tr> | ||
| </table> | ||
|
|
||
| <p>Hi,</p> | ||
|
|
||
| <p>%(sender_display_name_forhtml)s has invited you into a room %(bracketed_room_name_forhtml)s on | ||
| Matrix. To join the conversation, either <a href="https://matrix.org/docs/projects/try-matrix-now.html">pick a Matrix client</a> or use the single-click | ||
| link below to join via Element (requires | ||
| <a href="https://www.google.com/chrome">Chrome</a>, | ||
| <a href="https://www.getfirefox.com">Firefox</a> or | ||
| <a href="https://www.apple.com/safari">Safari</a> on the web, | ||
| or iOS or Android on mobile.)</p> | ||
| </p> | ||
|
|
||
| <p> | ||
| <a | ||
| href="https://app.element.io/#/room/%(room_id_forurl)s?email=%(to_forurl)s&signurl=https%%3A%%2F%%2Fmatrix.org%%2F_matrix%%2Fidentity%%2Fapi%%2Fv1%%2Fsign-ed25519%%3Ftoken%%3D%(token)s%%26private_key%%3D%(ephemeral_private_key)s&room_name=%(room_name_forurl)s&room_avatar_url=%(room_avatar_url_forurl)s&inviter_name=%(sender_display_name_forurl)s&guest_access_token=%(guest_access_token_forurl)s&guest_user_id=%(guest_user_id_forurl)s">Join the conversation.</a> | ||
| </p> | ||
|
|
||
| <br> | ||
| <p>About Matrix:</p> | ||
|
|
||
| <p>Matrix.org is an open standard for interoperable, decentralised, real-time communication | ||
| over IP, supporting group chat, file transfer, voice and video calling, integrations to | ||
| other apps, bridges to other communication systems and much more. It can be used to power | ||
| Instant Messaging, VoIP/WebRTC signalling, Internet of Things communication - or anywhere | ||
| you need a standard HTTP API for publishing and subscribing to data whilst tracking the | ||
| conversation history.</p> | ||
|
|
||
| <p>Matrix defines the standard, and provides open source reference implementations of | ||
| Matrix-compatible Servers, Clients, Client SDKs and Application Services to help you | ||
| create new communication solutions or extend the capabilities and reach of existing ones.</p> | ||
|
|
||
| <p>Thanks,</p> | ||
|
|
||
| <p>Matrix</p> | ||
| </td> | ||
| <td> </td> | ||
| </tr> | ||
| </table> | ||
| </body> | ||
| </html> | ||
| --M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR-- | ||
|
|
||
| --7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ-- |
Oops, something went wrong.