add pgp_key support contact field for /.well-known/matrix/support (MSC4439)

matrix-org/matrix-spec-proposals#4439

Signed-off-by: June Strawberry <june@girlboss.ceo>

Author: x86pup

Cargo.toml

@@ -392,6 +392,7 @@ features = [
     "unstable-msc4310",
     "unstable-msc4311",
     "unstable-msc4383",
+    "unstable-msc4439",
     "unstable-msc4466",
     "unstable-extensible-events",
 ]

src/api/client/well_known.rs

@@ -38,38 +38,24 @@ pub(crate) async fn well_known_support(
 	_body: Ruma<discover_support::Request>,
 ) -> Result<discover_support::Response> {
 	let support_page = services
-		.server
 		.config
 		.well_known
 		.support_page
 		.as_ref()
 		.map(ToString::to_string);
 
-	let role = services
-		.server
-		.config
-		.well_known
-		.support_role
-		.clone();
+	let role = services.config.well_known.support_role.clone();
 
 	// support page or role must be either defined for this to be valid
 	if support_page.is_none() && role.is_none() {
 		return Err!(Request(NotFound("Not found.")));
 	}
 
-	let email_address = services
-		.server
-		.config
-		.well_known
-		.support_email
-		.clone();
+	let email_address = services.config.well_known.support_email.clone();
 
-	let matrix_id = services
-		.server
-		.config
-		.well_known
-		.support_mxid
-		.clone();
+	let matrix_id = services.config.well_known.support_mxid.clone();
+
+	let pgp_key = services.config.well_known.support_pgp_key.clone();
 
 	// if a role is specified, an email address or matrix id is required
 	if role.is_some() && (email_address.is_none() && matrix_id.is_none()) {
@@ -80,7 +66,7 @@ pub(crate) async fn well_known_support(
 	let mut contacts: Vec<Contact> = vec![];
 
 	if let Some(role) = role {
-		let contact = Contact { role, email_address, matrix_id };
+		let contact = Contact { role, email_address, matrix_id, pgp_key };
 
 		contacts.push(contact);
 	}

src/core/config/mod.rs

@@ -2811,6 +2811,21 @@ pub struct WellKnownConfig {
 	/// reloadable: yes
 	pub support_mxid: Option<OwnedUserId>,
 
+	/// The PGP key (i.e. OpenPGP) that one may use for encrypted communications
+	/// for the above support role. No specific format is mandated for this
+	/// field or by the spec proposal. This field can contain a URL to a PGP
+	/// key, the 64-bit long ID, the OPENPGPKEY DNS record, or just the full
+	/// fingerprint.
+	///
+	/// Full/raw key content must not be here.
+	///
+	/// As this is a spec proposal (MSC4439), the identifier/prefix for this
+	/// field is currently "dev.zirco.msc4439.pgp_key"
+	///
+	/// reloadable: yes
+	/// example: "openpgp4fpr:8B77919975EAFA5E2456EE03665FE73077489DB0"
+	pub support_pgp_key: Option<String>,
+
 	/// LiveKit JWT endpoint.
 	/// Required for Element Call / MatrixRTC (MSC4143).
 	///

tuwunel-example.toml

@@ -2462,6 +2462,22 @@
 #
 #support_mxid =
 
+# The PGP key (i.e. OpenPGP) that one may use for encrypted communications
+# for the above support role. No specific format is mandated for this
+# field or by the spec proposal. This field can contain a URL to a PGP
+# key, the 64-bit long ID, the OPENPGPKEY DNS record, or just the full
+# fingerprint.
+#
+# Full/raw key content must not be here.
+#
+# As this is a spec proposal (MSC4439), the identifier/prefix for this
+# field is currently "dev.zirco.msc4439.pgp_key"
+#
+# reloadable: yes
+# example: "openpgp4fpr:8B77919975EAFA5E2456EE03665FE73077489DB0"
+#
+#support_pgp_key =
+
 # LiveKit JWT endpoint.
 # Required for Element Call / MatrixRTC (MSC4143).
 #