Use type aliases for different ID types and add puppet type

config/bridge.go

@@ -19,12 +19,19 @@ package config
 import (
 	"bytes"
 	"text/template"
+	"maunium.net/go/mautrix-appservice"
+	"strings"
+	"strconv"
 )
 
 type BridgeConfig struct {
-	UsernameTemplate    string             `yaml:"username_template"`
-	DisplaynameTemplate string             `yaml:"displayname_template"`
-	StateStore          string             `yaml:"state_store_path"`
+	UsernameTemplate    string `yaml:"username_template"`
+	DisplaynameTemplate string `yaml:"displayname_template"`
+
+	CommandPrefix string `yaml:"command_prefix"`
+
+	Permissions PermissionConfig `yaml:"permissions"`
+
 	usernameTemplate    *template.Template `yaml:"-"`
 	displaynameTemplate *template.Template `yaml:"-"`
 }
@@ -77,3 +84,87 @@ func (bc BridgeConfig) MarshalYAML() (interface{}, error) {
 	bc.UsernameTemplate = bc.FormatUsername("{{.Receiver}}", "{{.UserID}}")
 	return bc, nil
 }
+
+type PermissionConfig map[string]PermissionLevel
+
+type PermissionLevel int
+
+const (
+	PermissionLevelDefault PermissionLevel = 0
+	PermissionLevelUser    PermissionLevel = 10
+	PermissionLevelAdmin   PermissionLevel = 100
+)
+
+func (pc *PermissionConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	rawPC := make(map[string]string)
+	err := unmarshal(&rawPC)
+	if err != nil {
+		return err
+	}
+
+	if *pc == nil {
+		*pc = make(map[string]PermissionLevel)
+	}
+	for key, value := range rawPC {
+		switch strings.ToLower(value) {
+		case "user":
+			(*pc)[key] = PermissionLevelUser
+		case "admin":
+			(*pc)[key] = PermissionLevelAdmin
+		default:
+			val, err := strconv.Atoi(value)
+			if err != nil {
+				(*pc)[key] = PermissionLevelDefault
+			} else {
+				(*pc)[key] = PermissionLevel(val)
+			}
+		}
+	}
+	return nil
+}
+
+func (pc *PermissionConfig) MarshalYAML() (interface{}, error) {
+	if *pc == nil {
+		return nil, nil
+	}
+	rawPC := make(map[string]string)
+	for key, value := range *pc {
+		switch value {
+		case PermissionLevelUser:
+			rawPC[key] = "user"
+		case PermissionLevelAdmin:
+			rawPC[key] = "admin"
+		default:
+			rawPC[key] = strconv.Itoa(int(value))
+		}
+	}
+	return rawPC, nil
+}
+
+func (pc PermissionConfig) IsWhitelisted(userID string) bool {
+	return pc.GetPermissionLevel(userID) >= 10
+}
+
+func (pc PermissionConfig) IsAdmin(userID string) bool {
+	return pc.GetPermissionLevel(userID) >= 100
+}
+
+func (pc PermissionConfig) GetPermissionLevel(userID string) PermissionLevel {
+	permissions, ok := pc[userID]
+	if ok {
+		return permissions
+	}
+
+	_, homeserver := appservice.ParseUserID(userID)
+	permissions, ok = pc[homeserver]
+	if len(homeserver) > 0 && ok {
+		return permissions
+	}
+
+	permissions, ok = pc["*"]
+	if ok {
+		return permissions
+	}
+
+	return PermissionLevelDefault
+}

config/config.go

@@ -38,6 +38,8 @@ type Config struct {
 			URI  string `yaml:"uri"`
 		} `yaml:"database"`
 
+		StateStore string `yaml:"state_store_path"`
+
 		ID  string `yaml:"id"`
 		Bot struct {
 			Username    string `yaml:"username"`

config/registration.go

@@ -54,7 +54,7 @@ func (config *Config) copyToRegistration(registration *appservice.Registration)
 	registration.RateLimited = false
 	registration.SenderLocalpart = config.AppService.Bot.Username
 
-	userIDRegex, err := regexp.Compile(fmt.Sprintf("@%s:%s",
+	userIDRegex, err := regexp.Compile(fmt.Sprintf("^@%s:%s$",
 		config.Bridge.FormatUsername("[0-9]+", "[0-9]+"),
 		config.Homeserver.Domain))
 	if err != nil {