add migration logic for 0.2.x (#8)

This commit is contained in:
Tiger Wang (王豫) 2022-08-28 20:40:51 -04:00 committed by GitHub
parent 5417c6b94b
commit 675ecb55f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 445 additions and 110 deletions

View File

@ -1,2 +1,2 @@
LEGACY_WITHOUT_VERSION v0.3.6-alpha2
v0.3.5 v0.3.6-alpha2
LEGACY_WITHOUT_VERSION v0.3.6-alpha3
v0.3.5 v0.3.6-alpha3

View File

@ -5,5 +5,5 @@ RuntimePath=/var/run/casaos
LogPath = /var/log/casaos
LogSaveName = user-service
LogFileExt = log
DBPath = /var/lib/casaos
DBPath = /var/lib/casaos/db
UserDataPath = /var/lib/casaos

View File

@ -40,19 +40,20 @@ func main() {
}
if !*forceFlag {
serviceEnabled, err := systemctl.IsServiceEnabled(userServiceName)
isRunning, err := systemctl.IsServiceRunning(userServiceName)
if err != nil {
_logger.Error("Failed to check if %s is enabled", userServiceName)
_logger.Error("Failed to check if %s is running", userServiceName)
panic(err)
}
if serviceEnabled {
_logger.Info("%s is already enabled. If migration is still needed, try with -f.", userServiceName)
if isRunning {
_logger.Info("%s is running. If migration is still needed, try with -f.", userServiceName)
os.Exit(1)
}
}
migrationTools := []interfaces.MigrationTool{
NewMigrationToolFor032AndOlder(),
NewMigrationToolFor033_034_035(),
}
@ -85,6 +86,6 @@ func main() {
}
if err := selectedMigrationTool.PostMigrate(); err != nil {
panic(err)
_logger.Error("Migration succeeded, but post-migration failed: %s", err)
}
}

View File

@ -1,96 +0,0 @@
package main
import (
interfaces "github.com/IceWhaleTech/CasaOS-Common"
"github.com/IceWhaleTech/CasaOS-Common/utils/version"
"github.com/IceWhaleTech/CasaOS-UserService/pkg/config"
"github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/file"
"gopkg.in/ini.v1"
)
type migrationTool struct{}
func (u *migrationTool) IsMigrationNeeded() (bool, error) {
_logger.Info("Checking if migration is needed for CasaoS version between 0.3.3 and 0.3.5...")
minorVersion, err := version.DetectMinorVersion()
if err != nil {
return false, err
}
if minorVersion != 3 {
return false, nil
}
// this is the best way to tell if CasaOS version is between 0.3.3 and 0.3.5
isUserDataInDatabase, err := version.IsUserDataInDatabase()
if err != nil {
return false, err
}
if !isUserDataInDatabase {
return false, nil
}
return true, nil
}
func (u *migrationTool) PreMigrate() error {
_logger.Info("Copying %s to %s if it doesn't exist...", userServiceConfigSampleFilePath, config.UserServiceConfigFilePath)
if err := file.CopySingleFile(userServiceConfigSampleFilePath, config.UserServiceConfigFilePath, "skip"); err != nil {
return err
}
return nil
}
func (u *migrationTool) Migrate() error {
_logger.Info("Loading legacy %s...", version.LegacyCasaOSConfigFilePath)
legacyConfigFile, err := ini.Load(version.LegacyCasaOSConfigFilePath)
if err != nil {
return err
}
// LogPath
logPath, err := legacyConfigFile.Section("app").GetKey("LogPath")
if err != nil {
return err
}
// LogFileExt
logFileExt, err := legacyConfigFile.Section("app").GetKey("LogFileExt")
if err != nil {
return err
}
// DBPath
dbPath, err := legacyConfigFile.Section("app").GetKey("DBPath")
if err != nil {
return err
}
// UserDataPath
userDataPath, err := legacyConfigFile.Section("app").GetKey("UserDataPath")
if err != nil {
return err
}
_logger.Info("Updating %s with settings from legacy configuration...", config.UserServiceConfigFilePath)
config.InitSetup(config.UserServiceConfigFilePath)
config.AppInfo.LogPath = logPath.Value()
config.AppInfo.LogFileExt = logFileExt.Value()
config.AppInfo.DBPath = dbPath.Value()
config.AppInfo.UserDataPath = userDataPath.Value()
config.SaveSetup(config.UserServiceConfigFilePath)
return nil
}
func (u *migrationTool) PostMigrate() error {
return nil
}
func NewMigrationToolFor033_034_035() interfaces.MigrationTool {
return &migrationTool{}
}

View File

@ -0,0 +1,191 @@
package main
import (
"os"
"path/filepath"
"strconv"
"strings"
"time"
interfaces "github.com/IceWhaleTech/CasaOS-Common"
"github.com/IceWhaleTech/CasaOS-Common/utils/version"
"github.com/IceWhaleTech/CasaOS-UserService/pkg/config"
"github.com/IceWhaleTech/CasaOS-UserService/pkg/sqlite"
"github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/encryption"
"github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/file"
"github.com/IceWhaleTech/CasaOS-UserService/service"
"github.com/IceWhaleTech/CasaOS-UserService/service/model"
"gopkg.in/ini.v1"
)
type migrationTool1 struct{}
func (u *migrationTool1) IsMigrationNeeded() (bool, error) {
if _, err := os.Stat(version.LegacyCasaOSConfigFilePath); err != nil {
_logger.Info("`%s` not found, migration is not needed.", version.LegacyCasaOSConfigFilePath)
return false, nil
}
majorVersion, minorVersion, patchVersion, err := version.DetectLegacyVersion()
if err != nil {
if err == version.ErrLegacyVersionNotFound {
return false, nil
}
return false, err
}
if majorVersion != 0 {
return false, nil
}
if minorVersion == 2 {
_logger.Info("Migration is needed for a CasaOS version 0.2.x...")
return true, nil
}
if minorVersion == 3 && patchVersion < 2 {
_logger.Info("Migration is needed for a CasaOS version between 0.3.0 and 0.3.2...")
return true, nil
}
return false, nil
}
func (u *migrationTool1) PreMigrate() error {
_logger.Info("Copying %s to %s if it doesn't exist...", userServiceConfigSampleFilePath, config.UserServiceConfigFilePath)
if err := file.CopySingleFile(userServiceConfigSampleFilePath, config.UserServiceConfigFilePath, "skip"); err != nil {
return err
}
extension := "." + time.Now().Format("20060102") + ".bak"
_logger.Info("Creating a backup %s if it doesn't exist...", version.LegacyCasaOSConfigFilePath+extension)
return file.CopySingleFile(version.LegacyCasaOSConfigFilePath, version.LegacyCasaOSConfigFilePath+extension, "skip")
}
func (u *migrationTool1) Migrate() error {
_logger.Info("Loading legacy %s...", version.LegacyCasaOSConfigFilePath)
legacyConfigFile, err := ini.Load(version.LegacyCasaOSConfigFilePath)
if err != nil {
return err
}
migrateConfigurationFile1(legacyConfigFile)
return migrateUser1(legacyConfigFile)
}
func (u *migrationTool1) PostMigrate() error {
_logger.Info("Deleting legacy `user` section in %s...", version.LegacyCasaOSConfigFilePath)
legacyConfigFile, err := ini.Load(version.LegacyCasaOSConfigFilePath)
if err != nil {
return err
}
legacyConfigFile.DeleteSection("user")
return legacyConfigFile.SaveTo(version.LegacyCasaOSConfigFilePath)
}
func NewMigrationToolFor032AndOlder() interfaces.MigrationTool {
return &migrationTool1{}
}
func migrateConfigurationFile1(legacyConfigFile *ini.File) {
_logger.Info("Updating %s with settings from legacy configuration...", config.UserServiceConfigFilePath)
config.InitSetup(config.UserServiceConfigFilePath)
// LogPath
if logPath, err := legacyConfigFile.Section("app").GetKey("LogPath"); err == nil {
_logger.Info("[app] LogPath = %s", logPath.Value())
config.AppInfo.LogPath = logPath.Value()
}
if logPath, err := legacyConfigFile.Section("app").GetKey("LogSavePath"); err == nil {
_logger.Info("[app] LogSavePath = %s", logPath.Value())
config.AppInfo.LogPath = logPath.Value()
}
// LogFileExt
if logFileExt, err := legacyConfigFile.Section("app").GetKey("LogFileExt"); err == nil {
_logger.Info("[app] LogFileExt = %s", logFileExt.Value())
config.AppInfo.LogFileExt = logFileExt.Value()
}
// UserDataPath
if userDataPath, err := legacyConfigFile.Section("app").GetKey("UserDataPath"); err == nil {
_logger.Info("[app] UserDataPath = %s", userDataPath.Value())
config.AppInfo.UserDataPath = userDataPath.Value()
}
_logger.Info("Saving %s...", config.UserServiceConfigFilePath)
config.SaveSetup(config.UserServiceConfigFilePath)
}
func migrateUser1(legacyConfigFile *ini.File) error {
_logger.Info("Migrating user from configuration file to database...")
user := model.UserDBModel{Role: "admin"}
// UserName
if userName, err := legacyConfigFile.Section("user").GetKey("UserName"); err == nil {
_logger.Info("[user] UserName = %s", userName.Value())
user.Username = userName.Value()
}
// Email
if userEmail, err := legacyConfigFile.Section("user").GetKey("Email"); err == nil {
_logger.Info("[user] Email = %s", userEmail.Value())
user.Email = userEmail.Value()
}
// NickName
if userNickName, err := legacyConfigFile.Section("user").GetKey("NickName"); err == nil {
_logger.Info("[user] NickName = %s", userNickName.Value())
user.Nickname = userNickName.Value()
}
// Password
if userPassword, err := legacyConfigFile.Section("user").GetKey("PWD"); err == nil {
_logger.Info("[user] Password = %s", strings.Repeat("*", len(userPassword.Value())))
user.Password = encryption.GetMD5ByStr(userPassword.Value())
}
newDB := sqlite.GetDb(config.AppInfo.DBPath)
userService := service.NewUserService(newDB)
if len(user.Username) == 0 {
_logger.Info("No user found in legacy configuration file. Skipping...")
return nil
}
if userService.GetUserInfoByUserName(user.Username).Id > 0 {
_logger.Info("User `%s` already exists in user database at %s. Skipping...", user.Username, config.AppInfo.DBPath)
return nil
}
_logger.Info("Creating user %s in database at %s...", user.Username, config.AppInfo.DBPath)
user = userService.CreateUser(user)
if user.Id > 0 {
userPath := config.AppInfo.UserDataPath + "/" + strconv.Itoa(user.Id)
_logger.Info("Creating user data path: %s", userPath)
if err := file.MkDir(userPath); err != nil {
return err
}
if legacyProjectPath, err := legacyConfigFile.Section("app").GetKey("ProjectPath"); err == nil {
appOrderJSONFile := filepath.Join(legacyProjectPath.Value(), "app_order.json")
if _, err := os.Stat(appOrderJSONFile); err == nil {
_logger.Info("Moving %s to %s...", appOrderJSONFile, userPath)
if err := os.Rename(appOrderJSONFile, filepath.Join(userPath, "app_order.json")); err != nil {
return err
}
}
}
}
return nil
}

View File

@ -0,0 +1,239 @@
package main
import (
"database/sql"
"os"
"path/filepath"
"time"
interfaces "github.com/IceWhaleTech/CasaOS-Common"
"github.com/IceWhaleTech/CasaOS-Common/utils/version"
"github.com/IceWhaleTech/CasaOS-UserService/pkg/config"
"github.com/IceWhaleTech/CasaOS-UserService/pkg/sqlite"
"github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/file"
"github.com/IceWhaleTech/CasaOS-UserService/service"
"github.com/IceWhaleTech/CasaOS-UserService/service/model"
"gopkg.in/ini.v1"
)
type migrationTool2 struct{}
func (u *migrationTool2) IsMigrationNeeded() (bool, error) {
if _, err := os.Stat(version.LegacyCasaOSConfigFilePath); err != nil {
_logger.Info("`%s` not found, migration is not needed.", version.LegacyCasaOSConfigFilePath)
return false, nil
}
majorVersion, minorVersion, patchVersion, err := version.DetectLegacyVersion()
if err != nil {
if err == version.ErrLegacyVersionNotFound {
return false, nil
}
return false, err
}
if majorVersion != 0 {
return false, nil
}
if minorVersion != 3 {
return false, nil
}
if patchVersion < 3 || patchVersion > 5 {
return false, nil
}
// legacy version has to be between 0.3.3 and 0.3.5
_logger.Info("Migration is needed for a CasaOS version between 0.3.3 and 0.3.5...")
return true, nil
}
func (u *migrationTool2) PreMigrate() error {
_logger.Info("Copying %s to %s if it doesn't exist...", userServiceConfigSampleFilePath, config.UserServiceConfigFilePath)
if err := file.CopySingleFile(userServiceConfigSampleFilePath, config.UserServiceConfigFilePath, "skip"); err != nil {
return err
}
extension := "." + time.Now().Format("20060102") + ".bak"
_logger.Info("Creating a backup %s if it doesn't exist...", version.LegacyCasaOSConfigFilePath+extension)
if err := file.CopySingleFile(version.LegacyCasaOSConfigFilePath, version.LegacyCasaOSConfigFilePath+extension, "skip"); err != nil {
return err
}
legacyConfigFile, err := ini.Load(version.LegacyCasaOSConfigFilePath)
if err != nil {
return err
}
dbPath := legacyConfigFile.Section("app").Key("DBPath").String()
dbFile := filepath.Join(dbPath, "db", "casaOS.db")
_logger.Info("Creating a backup %s if it doesn't exist...", dbFile+extension)
if err := file.CopySingleFile(dbFile, dbFile+extension, "skip"); err != nil {
return err
}
return nil
}
func (u *migrationTool2) Migrate() error {
_logger.Info("Loading legacy %s...", version.LegacyCasaOSConfigFilePath)
legacyConfigFile, err := ini.Load(version.LegacyCasaOSConfigFilePath)
if err != nil {
return err
}
migrateConfigurationFile2(legacyConfigFile)
return migrateUser2(legacyConfigFile)
}
func (u *migrationTool2) PostMigrate() error {
legacyConfigFile, err := ini.Load(version.LegacyCasaOSConfigFilePath)
if err != nil {
return err
}
dbPath := legacyConfigFile.Section("app").Key("DBPath").String()
dbFile := filepath.Join(dbPath, "db", "casaOS.db")
if _, err := os.Stat(dbFile); err != nil {
return err
}
legacyDB, err := sql.Open("sqlite3", dbFile)
if err != nil {
return err
}
defer legacyDB.Close()
if tableExists, err := isTableExist(legacyDB, "o_users"); err != nil {
return err
} else if tableExists {
_logger.Info("Dropping `o_users` table in legacy database...")
if _, err = legacyDB.Exec("DROP TABLE o_users"); err != nil {
_logger.Error("Failed to drop `o_users` table in legacy database: %s", err)
}
}
return nil
}
func NewMigrationToolFor033_034_035() interfaces.MigrationTool {
return &migrationTool2{}
}
func migrateConfigurationFile2(legacyConfigFile *ini.File) {
_logger.Info("Updating %s with settings from legacy configuration...", config.UserServiceConfigFilePath)
config.InitSetup(config.UserServiceConfigFilePath)
// LogPath
if logPath, err := legacyConfigFile.Section("app").GetKey("LogPath"); err == nil {
_logger.Info("[app] LogPath = %s", logPath.Value())
config.AppInfo.LogPath = logPath.Value()
}
// LogFileExt
if logFileExt, err := legacyConfigFile.Section("app").GetKey("LogFileExt"); err == nil {
_logger.Info("[app] LogFileExt = %s", logFileExt.Value())
config.AppInfo.LogFileExt = logFileExt.Value()
}
// DBPath
if dbPath, err := legacyConfigFile.Section("app").GetKey("DBPath"); err == nil {
_logger.Info("[app] DBPath = %s", dbPath.Value())
config.AppInfo.DBPath = dbPath.Value() + "/db"
}
// UserDataPath
if userDataPath, err := legacyConfigFile.Section("app").GetKey("UserDataPath"); err == nil {
_logger.Info("[app] UserDataPath = %s", userDataPath.Value())
config.AppInfo.UserDataPath = userDataPath.Value()
}
_logger.Info("Saving %s...", config.UserServiceConfigFilePath)
config.SaveSetup(config.UserServiceConfigFilePath)
}
func migrateUser2(legacyConfigFile *ini.File) error {
_logger.Info("Migrating user from legacy database to user database...")
user := model.UserDBModel{Role: "admin"}
dbPath := legacyConfigFile.Section("app").Key("DBPath").String()
dbFile := filepath.Join(dbPath, "db", "casaOS.db")
if _, err := os.Stat(dbFile); err != nil {
return err
}
legacyDB, err := sql.Open("sqlite3", dbFile)
if err != nil {
return err
}
defer legacyDB.Close()
if tableExists, err := isTableExist(legacyDB, "o_users"); err != nil {
return err
} else if !tableExists {
_logger.Info("Table `o_users` not found in legacy database. Skipping...")
return nil
}
sqlStatement := "SELECT id, username, password, role, email, nickname, avatar, description, created_at FROM o_users ORDER BY id ASC"
rows, err := legacyDB.Query(sqlStatement)
if err != nil {
return err
}
defer rows.Close()
newDB := sqlite.GetDb(config.AppInfo.DBPath)
userService := service.NewUserService(newDB)
for rows.Next() {
if err := rows.Scan(
&user.Id,
&user.Username,
&user.Password,
&user.Role,
&user.Email,
&user.Nickname,
&user.Avatar,
&user.Description,
&user.CreatedAt,
); err != nil {
return err
}
if userService.GetUserAllInfoByName(user.Username).Id > 0 {
_logger.Info("User %s already exists in user database at %s, skipping...", user.Username, config.AppInfo.DBPath)
continue
}
_logger.Info("Creating user %s in user database...", user.Username)
user = userService.CreateUser(user)
}
return nil
}
func isTableExist(legacyDB *sql.DB, tableName string) (bool, error) {
rows, err := legacyDB.Query("SELECT name FROM sqlite_master WHERE type='table' AND name= ?", tableName)
if err != nil {
return false, err
}
defer rows.Close()
return rows.Next(), nil
}

View File

@ -1,3 +1,3 @@
package common
const Version = "0.3.5"
const Version = "0.3.6"

4
go.mod
View File

@ -1,9 +1,9 @@
module github.com/IceWhaleTech/CasaOS-UserService
go 1.18
go 1.19
require (
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220825191226-4519f1880f68
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220829003259-cf7e89c30d78
github.com/IceWhaleTech/CasaOS-Gateway v0.0.0-20220804231126-285796241a3b
github.com/gin-contrib/gzip v0.0.6
github.com/gin-gonic/gin v1.8.1

4
go.sum
View File

@ -1,6 +1,6 @@
github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220825191226-4519f1880f68 h1:KMFS0/08mKgZqsM8fd5If/1NOLwtIvi7dljFEkJCdSw=
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220825191226-4519f1880f68/go.mod h1:XGqdbedN9UlF3/rylcXKJ2BW4ayugBmEMa4Z0tk2KbQ=
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220829003259-cf7e89c30d78 h1:Cxy+bTjqpl0txx6gn2/D7O/E6G2SW5c6Ve7RXUin5K4=
github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220829003259-cf7e89c30d78/go.mod h1:5sqNKg5cEH7IUnCklLSTrVoGx1dMBhm9DFDsCYVPvPQ=
github.com/IceWhaleTech/CasaOS-Gateway v0.0.0-20220804231126-285796241a3b h1:IiMCqvGelQLGTX151gqVwrzoPQVJy8Q2JAvkhjiQ6tY=
github.com/IceWhaleTech/CasaOS-Gateway v0.0.0-20220804231126-285796241a3b/go.mod h1:jcURlZtPPQJJvfIW4ZgDTtpFfak7bPTvKZUxWxf62M8=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=

View File

@ -42,7 +42,7 @@ func init() {
logger.LogInit(config.AppInfo.LogPath, config.AppInfo.LogSaveName, config.AppInfo.LogFileExt)
if len(*dbFlag) == 0 {
*dbFlag = config.AppInfo.DBPath + "/db"
*dbFlag = config.AppInfo.DBPath
}
sqliteDB := sqlite.GetDb(*dbFlag)