External/ergo
1
0
Fork 1
mirror of https://github.com/ergochat/ergo.git synced 2025-12-20 02:00:11 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

restrict ASCII mode to printable characters only

Browse source
This commit is contained in:
Shivaram Lingamneni 2019-12-22 09:57:49 -05:00
parent 781bb6b051
commit 4391b1ba5a
2 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
irc/strings.go
View file

@ -9,7 +9,6 @@ import (
"fmt"
"regexp"
"strings"
"unicode"
"github.com/oragono/confusables"
"golang.org/x/text/cases"
@ -262,15 +261,18 @@ func CanonicalizeMaskWildcard(userhost string) (expanded string, err error) {
}
func foldASCII(str string) (result string, err error) {
if !IsPureASCII(str) {
if !IsPrintableASCII(str) {
return "", errInvalidCharacter
}
return strings.ToLower(str), nil
}
func IsPureASCII(str string) bool {
func IsPrintableASCII(str string) bool {
for i := 0; i < len(str); i++ {
if unicode.MaxASCII < str[i] {
// allow space here because it's technically printable;
// it will be disallowed later by CasefoldName/CasefoldChannel
chr := str[i]
if chr < ' ' || chr > '~' {
return false
}
}