parra/ntfy
parra
/
ntfy
mirror of https://github.com/binwiederhier/ntfy.git
1
0
Fork 0
Code Releases Activity

allow + in usernames

This commit is contained in:
Hunter Kehoe 2024-04-03 21:58:29 -06:00
parent 130039f5c8
commit e4d22ebd8b
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
user/types.go
View File

@ -241,7 +241,7 @@ const (
)
var (
allowedUsernameRegex = regexp.MustCompile(`^[-_.@a-zA-Z0-9]+$`) // Does not include Everyone (*)
allowedUsernameRegex = regexp.MustCompile(`^[-_.+@a-zA-Z0-9]+$`) // Does not include Everyone (*)
allowedTopicRegex = regexp.MustCompile(`^[-_A-Za-z0-9]{1,64}$`) // No '*'
allowedTopicPatternRegex = regexp.MustCompile(`^[-_*A-Za-z0-9]{1,64}$`) // Adds '*' for wildcards!
allowedTierRegex = regexp.MustCompile(`^[-_A-Za-z0-9]{1,64}$`)

12
user/types_test.go
View File

@ -61,3 +61,15 @@ func TestTierContext(t *testing.T) {
require.Equal(t, "price_456", context["stripe_yearly_price_id"])
}
func TestUsernameRegex(t *testing.T) {
username := "phil"
username_email := "phil@ntfy.sh"
username_email_alias := "phil+alias@ntfy.sh"
username_invalid := "phil\rocks"
require.True(t, AllowedUsername(username))
require.True(t, AllowedUsername(username_email))
require.True(t, AllowedUsername(username_email_alias))
require.False(t, AllowedUsername(username_invalid))
}