support migrating anope databases

irc/import.go

@@ -9,7 +9,6 @@ import (
 	"io/ioutil"
 	"log"
 	"strconv"
-	"strings"
 
 	"github.com/tidwall/buntdb"
 
@@ -17,13 +16,12 @@ import (
 )
 
 type userImport struct {
-	Name               string
-	Hash               string
-	Email              string
-	RegisteredAt       int64 `json:"registeredAt"`
-	Vhost              string
-	AdditionalNicks    []string `json:"additionalNicks"`
-	RegisteredChannels []string
+	Name            string
+	Hash            string
+	Email           string
+	RegisteredAt    int64 `json:"registeredAt"`
+	Vhost           string
+	AdditionalNicks []string `json:"additionalNicks"`
 }
 
 type channelImport struct {
@@ -33,7 +31,10 @@ type channelImport struct {
 	Topic        string
 	TopicSetBy   string `json:"topicSetBy"`
 	TopicSetAt   int64  `json:"topicSetAt"`
-	Amode        map[string]int
+	Amode        map[string]string
+	Modes        string
+	Key          string
+	Limit        int
 }
 
 type databaseImport struct {
@@ -43,7 +44,23 @@ type databaseImport struct {
 	Channels map[string]channelImport
 }
 
-func doImportAthemeDB(config *Config, dbImport databaseImport, tx *buntdb.Tx) (err error) {
+func serializeAmodes(raw map[string]string) (result []byte, err error) {
+	processed := make(map[string]int, len(raw))
+	for accountName, mode := range raw {
+		if len(mode) != 1 {
+			return nil, fmt.Errorf("invalid mode %s for account %s", mode, accountName)
+		}
+		cfname, err := CasefoldName(accountName)
+		if err != nil {
+			return nil, fmt.Errorf("invalid amode recipient %s: %w", accountName, err)
+		}
+		processed[cfname] = int(mode[0])
+	}
+	result, err = json.Marshal(processed)
+	return
+}
+
+func doImportDBGeneric(config *Config, dbImport databaseImport, credsType CredentialsVersion, tx *buntdb.Tx) (err error) {
 	requiredVersion := 1
 	if dbImport.Version != requiredVersion {
 		return fmt.Errorf("unsupported version of the db for import: version %d is required", requiredVersion)
@@ -63,7 +80,7 @@ func doImportAthemeDB(config *Config, dbImport databaseImport, tx *buntdb.Tx) (e
 			continue
 		}
 		credentials := AccountCredentials{
-			Version:        CredentialsAtheme,
+			Version:        credsType,
 			PassphraseHash: []byte(userInfo.Hash),
 		}
 		marshaledCredentials, err := json.Marshal(&credentials)
@@ -83,9 +100,6 @@ func doImportAthemeDB(config *Config, dbImport databaseImport, tx *buntdb.Tx) (e
 		if len(userInfo.AdditionalNicks) != 0 {
 			tx.Set(fmt.Sprintf(keyAccountAdditionalNicks, cfUsername), marshalReservedNicks(userInfo.AdditionalNicks), nil)
 		}
-		if len(userInfo.RegisteredChannels) != 0 {
-			tx.Set(fmt.Sprintf(keyAccountChannels, cfUsername), strings.Join(userInfo.RegisteredChannels, ","), nil)
-		}
 	}
 
 	for chname, chInfo := range dbImport.Channels {
@@ -94,23 +108,43 @@ func doImportAthemeDB(config *Config, dbImport databaseImport, tx *buntdb.Tx) (e
 			log.Printf("invalid channel name %s: %v", chname, err)
 			continue
 		}
+		cffounder, err := CasefoldName(chInfo.Founder)
+		if err != nil {
+			log.Printf("invalid founder %s for channel %s: %v", chInfo.Founder, chname, err)
+			continue
+		}
 		tx.Set(fmt.Sprintf(keyChannelExists, cfchname), "1", nil)
 		tx.Set(fmt.Sprintf(keyChannelName, cfchname), chname, nil)
 		tx.Set(fmt.Sprintf(keyChannelRegTime, cfchname), strconv.FormatInt(chInfo.RegisteredAt, 10), nil)
-		tx.Set(fmt.Sprintf(keyChannelFounder, cfchname), chInfo.Founder, nil)
+		tx.Set(fmt.Sprintf(keyChannelFounder, cfchname), cffounder, nil)
+		accountChannelsKey := fmt.Sprintf(keyAccountChannels, cffounder)
+		founderChannels, fcErr := tx.Get(accountChannelsKey)
+		if fcErr != nil || founderChannels == "" {
+			founderChannels = cfchname
+		} else {
+			founderChannels = fmt.Sprintf("%s,%s", founderChannels, cfchname)
+		}
+		tx.Set(accountChannelsKey, founderChannels, nil)
 		if chInfo.Topic != "" {
 			tx.Set(fmt.Sprintf(keyChannelTopic, cfchname), chInfo.Topic, nil)
 			tx.Set(fmt.Sprintf(keyChannelTopicSetTime, cfchname), strconv.FormatInt(chInfo.TopicSetAt, 10), nil)
 			tx.Set(fmt.Sprintf(keyChannelTopicSetBy, cfchname), chInfo.TopicSetBy, nil)
 		}
 		if len(chInfo.Amode) != 0 {
-			m, err := json.Marshal(chInfo.Amode)
+			m, err := serializeAmodes(chInfo.Amode)
 			if err == nil {
 				tx.Set(fmt.Sprintf(keyChannelAccountToUMode, cfchname), string(m), nil)
 			} else {
 				log.Printf("couldn't serialize amodes for %s: %v", chname, err)
 			}
 		}
+		tx.Set(fmt.Sprintf(keyChannelModes, cfchname), chInfo.Modes, nil)
+		if chInfo.Key != "" {
+			tx.Set(fmt.Sprintf(keyChannelPassword, cfchname), chInfo.Key, nil)
+		}
+		if chInfo.Limit > 0 {
+			tx.Set(fmt.Sprintf(keyChannelUserLimit, cfchname), strconv.Itoa(chInfo.Limit), nil)
+		}
 	}
 
 	return nil
@@ -119,9 +153,11 @@ func doImportAthemeDB(config *Config, dbImport databaseImport, tx *buntdb.Tx) (e
 func doImportDB(config *Config, dbImport databaseImport, tx *buntdb.Tx) (err error) {
 	switch dbImport.Source {
 	case "atheme":
-		return doImportAthemeDB(config, dbImport, tx)
+		return doImportDBGeneric(config, dbImport, CredentialsAtheme, tx)
+	case "anope":
+		return doImportDBGeneric(config, dbImport, CredentialsAnope, tx)
 	default:
-		return fmt.Errorf("only imports from atheme are currently supported")
+		return fmt.Errorf("unsupported import source: %s", dbImport.Source)
 	}
 }