security improvements
This commit is contained in:
@@ -41,7 +41,6 @@ func (r *MembershipRepository) FindUserByIDWithPermissions(ctx context.Context,
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
|
||||
// CreateUser creates a new user.
|
||||
func (r *MembershipRepository) CreateUser(ctx context.Context, user *model.User) error {
|
||||
db := r.db.WithContext(ctx)
|
||||
|
||||
@@ -17,73 +17,9 @@ func NewServerRepository(db *gorm.DB) *ServerRepository {
|
||||
BaseRepository: NewBaseRepository[model.Server, model.ServerFilter](db, model.Server{}),
|
||||
}
|
||||
|
||||
// Run migrations
|
||||
if err := repo.migrateServerTable(); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return repo
|
||||
}
|
||||
|
||||
// migrateServerTable ensures all required columns exist with proper defaults
|
||||
func (r *ServerRepository) migrateServerTable() error {
|
||||
// Create a temporary table with all required columns
|
||||
if err := r.db.Exec(`
|
||||
CREATE TABLE IF NOT EXISTS servers_new (
|
||||
id INTEGER PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
ip TEXT NOT NULL,
|
||||
port INTEGER NOT NULL DEFAULT 9600,
|
||||
path TEXT NOT NULL,
|
||||
service_name TEXT NOT NULL,
|
||||
date_created DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
from_steam_cmd BOOLEAN NOT NULL DEFAULT 1
|
||||
)
|
||||
`).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Copy data from old table, setting defaults for new columns
|
||||
if err := r.db.Exec(`
|
||||
INSERT INTO servers_new (
|
||||
id,
|
||||
name,
|
||||
ip,
|
||||
port,
|
||||
path,
|
||||
service_name,
|
||||
date_created,
|
||||
from_steam_cmd
|
||||
)
|
||||
SELECT
|
||||
id,
|
||||
COALESCE(name, 'Server ' || id) as name,
|
||||
COALESCE(ip, '127.0.0.1') as ip,
|
||||
COALESCE(port, 9600) as port,
|
||||
path,
|
||||
COALESCE(service_name, 'ACC-Server-' || id) as service_name,
|
||||
COALESCE(date_created, CURRENT_TIMESTAMP) as date_created,
|
||||
COALESCE(from_steam_cmd, 1) as from_steam_cmd
|
||||
FROM servers
|
||||
`).Error; err != nil {
|
||||
// If the old table doesn't exist, this is a fresh install
|
||||
if err := r.db.Exec(`DROP TABLE IF EXISTS servers_new`).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Replace old table with new one
|
||||
if err := r.db.Exec(`DROP TABLE IF EXISTS servers`).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := r.db.Exec(`ALTER TABLE servers_new RENAME TO servers`).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetFirstByServiceName
|
||||
// Gets first row from Server table.
|
||||
//
|
||||
@@ -100,4 +36,4 @@ func (r *ServerRepository) GetFirstByServiceName(ctx context.Context, serviceNam
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ func (r *StateHistoryRepository) GetPlayerCountOverTime(ctx context.Context, fil
|
||||
rawQuery := `
|
||||
SELECT
|
||||
DATETIME(MIN(date_created)) as timestamp,
|
||||
AVG(player_count) as count
|
||||
ROUND(AVG(player_count)) as count
|
||||
FROM state_histories
|
||||
WHERE server_id = ? AND date_created BETWEEN ? AND ?
|
||||
GROUP BY strftime('%Y-%m-%d %H', date_created)
|
||||
|
||||
Reference in New Issue
Block a user