GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-11 06:29:29 +01:00
Code Issues Projects Releases Wiki Activity

fix #1439

Browse Source 
Validate imported databases for confusable nicks
This commit is contained in:
Shivaram Lingamneni 2020-12-07 13:35:58 -05:00
parent e61735aa2c
commit c8c1ddfb41
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
irc/import.go
View File

@ -80,13 +80,24 @@ func doImportDBGeneric(config *Config, dbImport databaseImport, credsType Creden
tx.Set(keyCloakSecret, utils.GenerateSecretKey(), nil) tx.Set(keyCloakSecret, utils.GenerateSecretKey(), nil)
cfUsernames := make(utils.StringSet) cfUsernames := make(utils.StringSet)
skeletonToUsername := make(map[string]string)
warnSkeletons := false
for username, userInfo := range dbImport.Users { for username, userInfo := range dbImport.Users {
cfUsername, err := CasefoldName(username) cfUsername, err := CasefoldName(username)
if err != nil { skeleton, skErr := Skeleton(username)
log.Printf("invalid username %s: %v", username, err) if err != nil || skErr != nil {
log.Printf("invalid username %s: %v\n", username, err)
continue continue
} }
if existingSkelUser, ok := skeletonToUsername[skeleton]; ok {
log.Printf("Users %s and %s have confusable nicknames; this may render one or both accounts unusable\n", username, existingSkelUser)
warnSkeletons = true
} else {
skeletonToUsername[skeleton] = username
}
var certfps []string var certfps []string
for _, certfp := range userInfo.Certfps { for _, certfp := range userInfo.Certfps {
normalizedCertfp, err := utils.NormalizeCertfp(certfp) normalizedCertfp, err := utils.NormalizeCertfp(certfp)
@ -103,7 +114,7 @@ func doImportDBGeneric(config *Config, dbImport databaseImport, credsType Creden
} }
marshaledCredentials, err := json.Marshal(&credentials) marshaledCredentials, err := json.Marshal(&credentials)
if err != nil { if err != nil {
log.Printf("invalid credentials for %s: %v", username, err) log.Printf("invalid credentials for %s: %v\n", username, err)
continue continue
} }
tx.Set(fmt.Sprintf(keyAccountExists, cfUsername), "1", nil) tx.Set(fmt.Sprintf(keyAccountExists, cfUsername), "1", nil)
@ -178,6 +189,11 @@ func doImportDBGeneric(config *Config, dbImport databaseImport, credsType Creden
} }
} }
if warnSkeletons {
log.Printf("NOTE: you may be able to avoid confusability issues by changing the server casemapping setting to `ascii`\n")
log.Printf("However, this will prevent the use of non-ASCII Unicode characters in nicknames\n")
}
return nil return nil
} }