3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-23 03:02:48 +01:00

Merge pull request #129 from euank/disallow-colon-nick

strings: disallow ':' in nicks
This commit is contained in:
Daniel Oaks 2017-07-26 17:17:41 +10:00 committed by GitHub
commit c7cf79648e
4 changed files with 109 additions and 21 deletions

View File

@ -369,12 +369,7 @@ func (conf *Config) TLSListeners() map[string]*tls.Config {
if err != nil {
log.Fatal(err)
}
name, err := CasefoldName(s)
if err == nil {
tlsListeners[name] = config
} else {
log.Println("Could not casefold TLS listener:", err.Error())
}
tlsListeners[s] = config
}
return tlsListeners
}

View File

@ -44,8 +44,7 @@ func CasefoldChannel(name string) (string, error) {
// , is used as a separator
// * is used in mask matching
// ? is used in mask matching
if strings.Contains(lowered, " ") || strings.Contains(lowered, ",") ||
strings.Contains(lowered, "*") || strings.Contains(lowered, "?") {
if strings.ContainsAny(lowered, " ,*?") {
return "", errInvalidCharacter
}
@ -73,11 +72,7 @@ func CasefoldName(name string) (string, error) {
// # is a channel prefix
// ~&@%+ are channel membership prefixes
// - I feel like disallowing
if strings.Contains(lowered, " ") || strings.Contains(lowered, ",") ||
strings.Contains(lowered, "*") || strings.Contains(lowered, "?") ||
strings.Contains(lowered, ".") || strings.Contains(lowered, "!") ||
strings.Contains(lowered, "@") ||
strings.Contains("#~&@%+-", string(lowered[0])) {
if strings.ContainsAny(lowered, " ,*?.!@:") || strings.ContainsAny(string(lowered[0]), "#~&@%+-") {
return "", errInvalidCharacter
}

105
irc/strings_test.go Normal file
View File

@ -0,0 +1,105 @@
// Copyright (c) 2017 Euan Kemp
// released under the MIT license
package irc
import (
"fmt"
"testing"
)
func TestCasefoldChannel(t *testing.T) {
type channelTest struct {
channel string
folded string
err bool
}
testCases := []channelTest{
{
channel: "#foo",
folded: "#foo",
},
{
channel: "#rfc1459[noncompliant]",
folded: "#rfc1459[noncompliant]",
},
{
channel: "#{[]}",
folded: "#{[]}",
},
{
channel: "#FOO",
folded: "#foo",
},
{
channel: "#bang!",
folded: "#bang!",
},
{
channel: "#",
folded: "#",
},
}
for _, errCase := range []string{
"", "#*starpower", "# NASA", "#interro?", "OOF#", "foo",
} {
testCases = append(testCases, channelTest{channel: errCase, err: true})
}
for i, tt := range testCases {
t.Run(fmt.Sprintf("case %d: %s", i, tt.channel), func(t *testing.T) {
res, err := CasefoldChannel(tt.channel)
if tt.err {
if err == nil {
t.Errorf("expected error")
}
return
}
if tt.folded != res {
t.Errorf("expected %v to be %v", tt.folded, res)
}
})
}
}
func TestCasefoldName(t *testing.T) {
type nameTest struct {
name string
folded string
err bool
}
testCases := []nameTest{
{
name: "foo",
folded: "foo",
},
{
name: "FOO",
folded: "foo",
},
}
for _, errCase := range []string{
"", "#", "foo,bar", "star*man*junior", "lo7t?",
"f.l", "excited!nick", "foo@bar", ":trail",
"~o", "&o", "@o", "%h", "+v", "-m",
} {
testCases = append(testCases, nameTest{name: errCase, err: true})
}
for i, tt := range testCases {
t.Run(fmt.Sprintf("case %d: %s", i, tt.name), func(t *testing.T) {
res, err := CasefoldName(tt.name)
if tt.err {
if err == nil {
t.Errorf("expected error")
}
return
}
if tt.folded != res {
t.Errorf("expected %v to be %v", tt.folded, res)
}
})
}
}

View File

@ -11,8 +11,6 @@ import (
"io/ioutil"
"log"
"github.com/oragono/oragono/irc"
"gopkg.in/yaml.v2"
)
@ -48,12 +46,7 @@ func (conf *Config) TLSListeners() map[string]*tls.Config {
if err != nil {
log.Fatal(err)
}
name, err := irc.CasefoldName(s)
if err == nil {
tlsListeners[name] = config
} else {
log.Println("Could not casefold TLS listener:", err.Error())
}
tlsListeners[name] = config
}
return tlsListeners
}