updated deps; updated healthchecks.io integration

vendor/maunium.net/go/mautrix/id/crypto.go

@@ -7,8 +7,11 @@
 package id
 
 import (
+	"encoding/base64"
 	"fmt"
 	"strings"
+
+	"go.mau.fi/util/random"
 )
 
 // OlmMsgType is an Olm message type
@@ -44,6 +47,19 @@ const (
 	XSUsageUserSigning CrossSigningUsage = "user_signing"
 )
 
+type KeyBackupAlgorithm string
+
+const (
+	KeyBackupAlgorithmMegolmBackupV1 KeyBackupAlgorithm = "m.megolm_backup.v1.curve25519-aes-sha2"
+)
+
+// BackupVersion is an arbitrary string that identifies a server side key backup.
+type KeyBackupVersion string
+
+func (version KeyBackupVersion) String() string {
+	return string(version)
+}
+
 // A SessionID is an arbitrary string that identifies an Olm or Megolm session.
 type SessionID string
 
@@ -59,6 +75,12 @@ func (ed25519 Ed25519) String() string {
 	return string(ed25519)
 }
 
+func (ed25519 Ed25519) Bytes() []byte {
+	val, _ := base64.RawStdEncoding.DecodeString(string(ed25519))
+	// TODO handle errors
+	return val
+}
+
 func (ed25519 Ed25519) Fingerprint() string {
 	spacedSigningKey := make([]byte, len(ed25519)+(len(ed25519)-1)/4)
 	var ptr = 0
@@ -82,6 +104,12 @@ func (curve25519 Curve25519) String() string {
 	return string(curve25519)
 }
 
+func (curve25519 Curve25519) Bytes() []byte {
+	val, _ := base64.RawStdEncoding.DecodeString(string(curve25519))
+	// TODO handle errors
+	return val
+}
+
 // A DeviceID is an arbitrary string that references a specific device.
 type DeviceID string
 
@@ -147,3 +175,29 @@ type CrossSigningKey struct {
 	Key   Ed25519
 	First Ed25519
 }
+
+// Secret storage keys
+type Secret string
+
+func (s Secret) String() string {
+	return string(s)
+}
+
+const (
+	SecretXSMaster       Secret = "m.cross_signing.master"
+	SecretXSSelfSigning  Secret = "m.cross_signing.self_signing"
+	SecretXSUserSigning  Secret = "m.cross_signing.user_signing"
+	SecretMegolmBackupV1 Secret = "m.megolm_backup.v1"
+)
+
+// VerificationTransactionID is a unique identifier for a verification
+// transaction.
+type VerificationTransactionID string
+
+func NewVerificationTransactionID() VerificationTransactionID {
+	return VerificationTransactionID(random.String(32))
+}
+
+func (t VerificationTransactionID) String() string {
+	return string(t)
+}

vendor/maunium.net/go/mautrix/id/userid.go

@@ -36,19 +36,34 @@ var (
 	ErrEmptyLocalpart        = errors.New("empty localparts are not allowed")
 )
 
+// ParseCommonIdentifier parses a common identifier according to https://spec.matrix.org/v1.9/appendices/#common-identifier-format
+func ParseCommonIdentifier[Stringish ~string](identifier Stringish) (sigil byte, localpart, homeserver string) {
+	if len(identifier) == 0 {
+		return
+	}
+	sigil = identifier[0]
+	strIdentifier := string(identifier)
+	if strings.ContainsRune(strIdentifier, ':') {
+		parts := strings.SplitN(strIdentifier, ":", 2)
+		localpart = parts[0][1:]
+		homeserver = parts[1]
+	} else {
+		localpart = strIdentifier[1:]
+	}
+	return
+}
+
 // Parse parses the user ID into the localpart and server name.
 //
 // Note that this only enforces very basic user ID formatting requirements: user IDs start with
 // a @, and contain a : after the @. If you want to enforce localpart validity, see the
 // ParseAndValidate and ValidateUserLocalpart functions.
 func (userID UserID) Parse() (localpart, homeserver string, err error) {
-	if len(userID) == 0 || userID[0] != '@' || !strings.ContainsRune(string(userID), ':') {
-		// This error wrapping lets you use errors.Is() nicely even though the message contains the user ID
+	var sigil byte
+	sigil, localpart, homeserver = ParseCommonIdentifier(userID)
+	if sigil != '@' || homeserver == "" {
 		err = fmt.Errorf("'%s' %w", userID, ErrInvalidUserID)
-		return
 	}
-	parts := strings.SplitN(string(userID), ":", 2)
-	localpart, homeserver = strings.TrimPrefix(parts[0], "@"), parts[1]
 	return
 }