Mathis/llamactl
1
0
Fork 0
mirror of https://github.com/lordmathis/llamactl.git synced 2025-12-22 17:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'enabled' field from API key model and related database operations

Browse Source
This commit is contained in:
Matúš Námešný
2025-12-06 17:59:11 +01:00
parent 80d5d44a0b
commit c37c1b8161
5 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/auth/key.go
View File

@@ -20,7 +20,6 @@ type APIKey struct {
UserID string UserID string
PermissionMode PermissionMode PermissionMode PermissionMode
ExpiresAt *int64 ExpiresAt *int64
Enabled bool
CreatedAt int64 CreatedAt int64
UpdatedAt int64 UpdatedAt int64
LastUsedAt *int64 LastUsedAt *int64

22
pkg/database/apikeys.go
View File

@@ -18,8 +18,8 @@ func (db *sqliteDB) CreateKey(ctx context.Context, key *auth.APIKey, permissions
// Insert the API key // Insert the API key
query := ` query := `
INSERT INTO api_keys (key_hash, name, user_id, permission_mode, expires_at, enabled, created_at, updated_at) INSERT INTO api_keys (key_hash, name, user_id, permission_mode, expires_at, created_at, updated_at)
VALUES (?, ?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?, ?)
` `
var expiresAt sql.NullInt64 var expiresAt sql.NullInt64
@@ -29,7 +29,7 @@ func (db *sqliteDB) CreateKey(ctx context.Context, key *auth.APIKey, permissions
result, err := tx.ExecContext(ctx, query, result, err := tx.ExecContext(ctx, query,
key.KeyHash, key.Name, key.UserID, key.PermissionMode, key.KeyHash, key.Name, key.UserID, key.PermissionMode,
expiresAt, key.Enabled, key.CreatedAt, key.UpdatedAt, expiresAt, key.CreatedAt, key.UpdatedAt,
) )
if err != nil { if err != nil {
return fmt.Errorf("failed to insert API key: %w", err) return fmt.Errorf("failed to insert API key: %w", err)
@@ -61,7 +61,7 @@ func (db *sqliteDB) CreateKey(ctx context.Context, key *auth.APIKey, permissions
// GetKeyByID retrieves an API key by ID // GetKeyByID retrieves an API key by ID
func (db *sqliteDB) GetKeyByID(ctx context.Context, id int) (*auth.APIKey, error) { func (db *sqliteDB) GetKeyByID(ctx context.Context, id int) (*auth.APIKey, error) {
query := ` query := `
SELECT id, key_hash, name, user_id, permission_mode, expires_at, enabled, created_at, updated_at, last_used_at SELECT id, key_hash, name, user_id, permission_mode, expires_at, created_at, updated_at, last_used_at
FROM api_keys FROM api_keys
WHERE id = ? WHERE id = ?
` `
@@ -72,7 +72,7 @@ func (db *sqliteDB) GetKeyByID(ctx context.Context, id int) (*auth.APIKey, error
err := db.QueryRowContext(ctx, query, id).Scan( err := db.QueryRowContext(ctx, query, id).Scan(
&key.ID, &key.KeyHash, &key.Name, &key.UserID, &key.PermissionMode, &key.ID, &key.KeyHash, &key.Name, &key.UserID, &key.PermissionMode,
&expiresAt, &key.Enabled, &key.CreatedAt, &key.UpdatedAt, &lastUsedAt, &expiresAt, &key.CreatedAt, &key.UpdatedAt, &lastUsedAt,
) )
if err != nil { if err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
@@ -94,7 +94,7 @@ func (db *sqliteDB) GetKeyByID(ctx context.Context, id int) (*auth.APIKey, error
// GetUserKeys retrieves all API keys for a user // GetUserKeys retrieves all API keys for a user
func (db *sqliteDB) GetUserKeys(ctx context.Context, userID string) ([]*auth.APIKey, error) { func (db *sqliteDB) GetUserKeys(ctx context.Context, userID string) ([]*auth.APIKey, error) {
query := ` query := `
SELECT id, key_hash, name, user_id, permission_mode, expires_at, enabled, created_at, updated_at, last_used_at SELECT id, key_hash, name, user_id, permission_mode, expires_at, created_at, updated_at, last_used_at
FROM api_keys FROM api_keys
WHERE user_id = ? WHERE user_id = ?
ORDER BY created_at DESC ORDER BY created_at DESC
@@ -114,7 +114,7 @@ func (db *sqliteDB) GetUserKeys(ctx context.Context, userID string) ([]*auth.API
err := rows.Scan( err := rows.Scan(
&key.ID, &key.KeyHash, &key.Name, &key.UserID, &key.PermissionMode, &key.ID, &key.KeyHash, &key.Name, &key.UserID, &key.PermissionMode,
&expiresAt, &key.Enabled, &key.CreatedAt, &key.UpdatedAt, &lastUsedAt, &expiresAt, &key.CreatedAt, &key.UpdatedAt, &lastUsedAt,
) )
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to scan API key: %w", err) return nil, fmt.Errorf("failed to scan API key: %w", err)
@@ -133,12 +133,12 @@ func (db *sqliteDB) GetUserKeys(ctx context.Context, userID string) ([]*auth.API
return keys, nil return keys, nil
} }
// GetActiveKeys retrieves all enabled, non-expired API keys // GetActiveKeys retrieves all non-expired API keys
func (db *sqliteDB) GetActiveKeys(ctx context.Context) ([]*auth.APIKey, error) { func (db *sqliteDB) GetActiveKeys(ctx context.Context) ([]*auth.APIKey, error) {
query := ` query := `
SELECT id, key_hash, name, user_id, permission_mode, expires_at, enabled, created_at, updated_at, last_used_at SELECT id, key_hash, name, user_id, permission_mode, expires_at, created_at, updated_at, last_used_at
FROM api_keys FROM api_keys
WHERE enabled = 1 AND (expires_at IS NULL OR expires_at > ?) WHERE expires_at IS NULL OR expires_at > ?
ORDER BY created_at DESC ORDER BY created_at DESC
` `
@@ -157,7 +157,7 @@ func (db *sqliteDB) GetActiveKeys(ctx context.Context) ([]*auth.APIKey, error) {
err := rows.Scan( err := rows.Scan(
&key.ID, &key.KeyHash, &key.Name, &key.UserID, &key.PermissionMode, &key.ID, &key.KeyHash, &key.Name, &key.UserID, &key.PermissionMode,
&expiresAt, &key.Enabled, &key.CreatedAt, &key.UpdatedAt, &lastUsedAt, &expiresAt, &key.CreatedAt, &key.UpdatedAt, &lastUsedAt,
) )
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to scan API key: %w", err) return nil, fmt.Errorf("failed to scan API key: %w", err)

1
pkg/database/migrations/001_initial_schema.up.sql
View File

@@ -36,7 +36,6 @@ CREATE TABLE IF NOT EXISTS api_keys (
user_id TEXT NOT NULL, user_id TEXT NOT NULL,
permission_mode TEXT NOT NULL CHECK(permission_mode IN ('allow_all', 'per_instance')) DEFAULT 'per_instance', permission_mode TEXT NOT NULL CHECK(permission_mode IN ('allow_all', 'per_instance')) DEFAULT 'per_instance',
expires_at INTEGER NULL, expires_at INTEGER NULL,
enabled INTEGER NOT NULL DEFAULT 1,
created_at INTEGER NOT NULL, created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL, updated_at INTEGER NOT NULL,
last_used_at INTEGER NULL last_used_at INTEGER NULL

6
pkg/server/handlers_auth.go
View File

@@ -32,7 +32,6 @@ type CreateKeyResponse struct {
UserID string `json:"user_id"` UserID string `json:"user_id"`
PermissionMode auth.PermissionMode `json:"permission_mode"` PermissionMode auth.PermissionMode `json:"permission_mode"`
ExpiresAt *int64 `json:"expires_at"` ExpiresAt *int64 `json:"expires_at"`
Enabled bool `json:"enabled"`
CreatedAt int64 `json:"created_at"` CreatedAt int64 `json:"created_at"`
UpdatedAt int64 `json:"updated_at"` UpdatedAt int64 `json:"updated_at"`
LastUsedAt *int64 `json:"last_used_at"` LastUsedAt *int64 `json:"last_used_at"`
@@ -46,7 +45,6 @@ type KeyResponse struct {
UserID string `json:"user_id"` UserID string `json:"user_id"`
PermissionMode auth.PermissionMode `json:"permission_mode"` PermissionMode auth.PermissionMode `json:"permission_mode"`
ExpiresAt *int64 `json:"expires_at"` ExpiresAt *int64 `json:"expires_at"`
Enabled bool `json:"enabled"`
CreatedAt int64 `json:"created_at"` CreatedAt int64 `json:"created_at"`
UpdatedAt int64 `json:"updated_at"` UpdatedAt int64 `json:"updated_at"`
LastUsedAt *int64 `json:"last_used_at"` LastUsedAt *int64 `json:"last_used_at"`
@@ -142,7 +140,6 @@ func (h *Handler) CreateKey() http.HandlerFunc {
UserID: "system", UserID: "system",
PermissionMode: req.PermissionMode, PermissionMode: req.PermissionMode,
ExpiresAt: req.ExpiresAt, ExpiresAt: req.ExpiresAt,
Enabled: true,
CreatedAt: now, CreatedAt: now,
UpdatedAt: now, UpdatedAt: now,
} }
@@ -171,7 +168,6 @@ func (h *Handler) CreateKey() http.HandlerFunc {
UserID: apiKey.UserID, UserID: apiKey.UserID,
PermissionMode: apiKey.PermissionMode, PermissionMode: apiKey.PermissionMode,
ExpiresAt: apiKey.ExpiresAt, ExpiresAt: apiKey.ExpiresAt,
Enabled: apiKey.Enabled,
CreatedAt: apiKey.CreatedAt, CreatedAt: apiKey.CreatedAt,
UpdatedAt: apiKey.UpdatedAt, UpdatedAt: apiKey.UpdatedAt,
LastUsedAt: apiKey.LastUsedAt, LastUsedAt: apiKey.LastUsedAt,
@@ -210,7 +206,6 @@ func (h *Handler) ListKeys() http.HandlerFunc {
UserID: key.UserID, UserID: key.UserID,
PermissionMode: key.PermissionMode, PermissionMode: key.PermissionMode,
ExpiresAt: key.ExpiresAt, ExpiresAt: key.ExpiresAt,
Enabled: key.Enabled,
CreatedAt: key.CreatedAt, CreatedAt: key.CreatedAt,
UpdatedAt: key.UpdatedAt, UpdatedAt: key.UpdatedAt,
LastUsedAt: key.LastUsedAt, LastUsedAt: key.LastUsedAt,
@@ -260,7 +255,6 @@ func (h *Handler) GetKey() http.HandlerFunc {
UserID: key.UserID, UserID: key.UserID,
PermissionMode: key.PermissionMode, PermissionMode: key.PermissionMode,
ExpiresAt: key.ExpiresAt, ExpiresAt: key.ExpiresAt,
Enabled: key.Enabled,
CreatedAt: key.CreatedAt, CreatedAt: key.CreatedAt,
UpdatedAt: key.UpdatedAt, UpdatedAt: key.UpdatedAt,
LastUsedAt: key.LastUsedAt, LastUsedAt: key.LastUsedAt,

1
webui/src/types/apiKey.ts
View File

@@ -9,7 +9,6 @@ export interface ApiKey {
user_id: string user_id: string
permission_mode: PermissionMode permission_mode: PermissionMode
expires_at: number | null expires_at: number | null
enabled: boolean
created_at: number created_at: number
updated_at: number updated_at: number
last_used_at: number | null last_used_at: number | null