mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-28 09:13:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Appservice config: handle regexp parsing errors

Browse source 
Signed-off-by: diamondburned <datutbrus@gmail.com>
Signed-off-by: Bohdan Horbeshko <bodqhrohro@gmail.com>
This commit is contained in:
Bohdan Horbeshko 2021-05-05 22:08:06 +03:00
parent 9d435bb559
commit 96f5bc1f7e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
setup/config/config_appservice.go
View file

@ -224,7 +224,7 @@ func setupRegexps(asAPI *AppServiceAPI, derived *Derived) (err error) {
} }
if err = compileNamespaceRegexes(namespaceSlice); err != nil { if err = compileNamespaceRegexes(namespaceSlice); err != nil {
return err return fmt.Errorf("invalid regex in appservice %q, namespace %q: %w", appservice.ID, key, err)
} }
} }
} }
@ -276,9 +276,12 @@ func appendExclusiveNamespaceRegexs(
func compileNamespaceRegexes(namespaces []ApplicationServiceNamespace) (err error) { func compileNamespaceRegexes(namespaces []ApplicationServiceNamespace) (err error) {
for index, namespace := range namespaces { for index, namespace := range namespaces {
// Compile this regex into a Regexp object for later use // Compile this regex into a Regexp object for later use
if namespaces[index].RegexpObject, err = regexp.Compile(namespace.Regex); err != nil { r, err := regexp.Compile(namespace.Regex)
return err if err != nil {
return fmt.Errorf("regex at namespace %d: %w", index, err)
} }
namespaces[index].RegexpObject = r
} }
return nil return nil