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

Merge pull request #1423 from slingamn/import_certfps

Browse Source 
enhancements to database import
This commit is contained in:
Shivaram Lingamneni 2020-12-04 01:40:29 -08:00 committed by GitHub
commit 79e3f4a15c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
irc/import.go
View File

@ -30,6 +30,7 @@ type userImport struct {
RegisteredAt int64 `json:"registeredAt"` RegisteredAt int64 `json:"registeredAt"`
Vhost string Vhost string
AdditionalNicks []string `json:"additionalNicks"` AdditionalNicks []string `json:"additionalNicks"`
Certfps []string
} }
type channelImport struct { type channelImport struct {
@ -83,9 +84,19 @@ func doImportDBGeneric(config *Config, dbImport databaseImport, credsType Creden
log.Printf("invalid username %s: %v", username, err) log.Printf("invalid username %s: %v", username, err)
continue continue
} }
var certfps []string
for _, certfp := range userInfo.Certfps {
normalizedCertfp, err := utils.NormalizeCertfp(certfp)
if err == nil {
certfps = append(certfps, normalizedCertfp)
} else {
log.Printf("invalid certfp %s for %s\n", username, certfp)
}
}
credentials := AccountCredentials{ credentials := AccountCredentials{
Version: credsType, Version: credsType,
PassphraseHash: []byte(userInfo.Hash), PassphraseHash: []byte(userInfo.Hash),
Certfps: certfps,
} }
marshaledCredentials, err := json.Marshal(&credentials) marshaledCredentials, err := json.Marshal(&credentials)
if err != nil { if err != nil {
@ -104,6 +115,9 @@ func doImportDBGeneric(config *Config, dbImport databaseImport, credsType Creden
if len(userInfo.AdditionalNicks) != 0 { if len(userInfo.AdditionalNicks) != 0 {
tx.Set(fmt.Sprintf(keyAccountAdditionalNicks, cfUsername), marshalReservedNicks(userInfo.AdditionalNicks), nil) tx.Set(fmt.Sprintf(keyAccountAdditionalNicks, cfUsername), marshalReservedNicks(userInfo.AdditionalNicks), nil)
} }
for _, certfp := range certfps {
tx.Set(fmt.Sprintf(keyCertToAccount, certfp), cfUsername, nil)
}
} }
for chname, chInfo := range dbImport.Channels { for chname, chInfo := range dbImport.Channels {