Enforce pricelist write checks and auto-restart on DB settings change

README.md

@@ -85,6 +85,37 @@ auth:
 go run ./cmd/qfs -migrate
 ```
 
+### Минимальные права БД для пользователя квотаций
+
+Если нужен пользователь, который может работать с конфигурациями, но не может создавать/удалять прайслисты:
+
+```sql
+-- 1) Создать (или оставить существующего) пользователя
+CREATE USER IF NOT EXISTS 'quote_user'@'%' IDENTIFIED BY 'StrongPassword!';
+
+-- 2) Сбросить лишние права (без пересоздания пользователя)
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'quote_user'@'%';
+
+-- 3) Чтение данных для конфигуратора и синка
+GRANT SELECT ON RFQ_LOG.lot TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.qt_lot_metadata TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.qt_categories TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.qt_pricelists TO 'quote_user'@'%';
+GRANT SELECT ON RFQ_LOG.qt_pricelist_items TO 'quote_user'@'%';
+
+-- 4) Работа с конфигурациями
+GRANT SELECT, INSERT, UPDATE ON RFQ_LOG.qt_configurations TO 'quote_user'@'%';
+
+FLUSH PRIVILEGES;
+
+SHOW GRANTS FOR 'quote_user'@'%';
+```
+
+Важно:
+- не выдавайте `INSERT/UPDATE/DELETE` на `qt_pricelists` и `qt_pricelist_items`, если пользователь не должен управлять прайслистами;
+- если используется host-специфичный аккаунт (`'quote_user'@'192.168.x.x'`), назначьте права и для него;
+- после смены DB-настроек через `/setup` приложение перезапускается автоматически и подхватывает нового пользователя.
+
 ### 4. Импорт метаданных компонентов
 
 ```bash

cmd/migrate/main.go

@@ -66,7 +66,7 @@ func main() {
 
 	// Get all configurations from MariaDB
 	var configs []models.Configuration
-	if err := mariaDB.Preload("User").Find(&configs).Error; err != nil {
+	if err := mariaDB.Find(&configs).Error; err != nil {
 		log.Fatalf("Failed to fetch configurations: %v", err)
 	}
 
@@ -74,13 +74,10 @@ func main() {
 	localCount := local.CountConfigurations()
 	log.Printf("Found %d configurations in local SQLite", localCount)
 
-	if *dryRun {
+		if *dryRun {
 		log.Println("\n[DRY RUN] Would migrate the following configurations:")
 		for _, c := range configs {
 			userName := c.OwnerUsername
-			if userName == "" && c.User != nil {
-				userName = c.User.Username
-			}
 			if userName == "" {
 				userName = "unknown"
 			}
@@ -131,14 +128,10 @@ func main() {
 			UpdatedAt:        now,
 			SyncedAt:         &now,
 			SyncStatus:       "synced",
-			OriginalUserID:   c.UserID,
+			OriginalUserID:   derefUint(c.UserID),
 			OriginalUsername: c.OwnerUsername,
 		}
 
-		if localConfig.OriginalUsername == "" && c.User != nil {
-			localConfig.OriginalUsername = c.User.Username
-		}
-
 		if err := local.SaveConfiguration(localConfig); err != nil {
 			log.Printf("  ERROR: %s - %v", c.Name, err)
 			errors++
@@ -173,3 +166,10 @@ func main() {
 
 	fmt.Println("\nDone! You can now run the server with: go run ./cmd/server")
 }
+
+func derefUint(v *uint) uint {
+	if v == nil {
+		return 0
+	}
+	return *v
+}

cmd/qfs/main.go

@@ -19,6 +19,7 @@ import (
 
 	qfassets "git.mchus.pro/mchus/quoteforge"
 	"git.mchus.pro/mchus/quoteforge/internal/appstate"
+	"git.mchus.pro/mchus/quoteforge/internal/appmeta"
 	"git.mchus.pro/mchus/quoteforge/internal/config"
 	"git.mchus.pro/mchus/quoteforge/internal/db"
 	"git.mchus.pro/mchus/quoteforge/internal/handlers"
@@ -55,6 +56,7 @@ func main() {
 
 	exePath, _ := os.Executable()
 	slog.Info("starting qfs", "version", Version, "executable", exePath)
+	appmeta.SetVersion(Version)
 
 	resolvedConfigPath, err := appstate.ResolveConfigPath(*configPath)
 	if err != nil {
@@ -163,7 +165,9 @@ func main() {
 	}
 
 	gin.SetMode(cfg.Server.Mode)
-	router, syncService, err := setupRouter(cfg, local, connMgr, mariaDB, dbUser)
+	restartSig := make(chan struct{}, 1)
+
+	router, syncService, err := setupRouter(cfg, local, connMgr, mariaDB, dbUser, restartSig)
 	if err != nil {
 		slog.Error("failed to setup router", "error", err)
 		os.Exit(1)
@@ -205,9 +209,15 @@ func main() {
 
 	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
-	<-quit
 
-	slog.Info("shutting down server...")
+	shouldRestart := false
+	select {
+	case <-quit:
+		slog.Info("shutting down server...")
+	case <-restartSig:
+		shouldRestart = true
+		slog.Info("restarting application after connection settings update...")
+	}
 
 	// Stop background sync worker first
 	syncWorker.Stop()
@@ -222,6 +232,10 @@ func main() {
 	}
 
 	slog.Info("server stopped")
+
+	if shouldRestart {
+		restartProcess()
+	}
 }
 
 func setConfigDefaults(cfg *config.Config) {
@@ -392,7 +406,7 @@ func setupDatabaseFromDSN(dsn string) (*gorm.DB, error) {
 	return db, nil
 }
 
-func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.ConnectionManager, mariaDB *gorm.DB, dbUsername string) (*gin.Engine, *sync.Service, error) {
+func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.ConnectionManager, mariaDB *gorm.DB, dbUsername string, restartSig chan struct{}) (*gin.Engine, *sync.Service, error) {
 	// mariaDB may be nil if we're in offline mode
 
 	// Repositories
@@ -467,8 +481,8 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
 		return nil, nil, fmt.Errorf("creating sync handler: %w", err)
 	}
 
-	// Setup handler (for reconfiguration) - no restart signal in normal mode
-	setupHandler, err := handlers.NewSetupHandler(local, connMgr, templatesPath, nil)
+	// Setup handler (for reconfiguration)
+	setupHandler, err := handlers.NewSetupHandler(local, connMgr, templatesPath, restartSig)
 	if err != nil {
 		return nil, nil, fmt.Errorf("creating setup handler: %w", err)
 	}

cmd/qfs/versioning_api_test.go

@@ -37,7 +37,7 @@ func TestConfigurationVersioningAPI(t *testing.T) {
 
 	cfg := &config.Config{}
 	setConfigDefaults(cfg)
-	router, _, err := setupRouter(cfg, local, connMgr, nil, "tester")
+	router, _, err := setupRouter(cfg, local, connMgr, nil, "tester", nil)
 	if err != nil {
 		t.Fatalf("setup router: %v", err)
 	}

internal/appmeta/version.go

@@ -0,0 +1,26 @@
+package appmeta
+
+import "sync/atomic"
+
+var appVersion atomic.Value
+
+func init() {
+	appVersion.Store("dev")
+}
+
+// SetVersion configures the running application version string.
+func SetVersion(v string) {
+	if v == "" {
+		v = "dev"
+	}
+	appVersion.Store(v)
+}
+
+// Version returns the running application version string.
+func Version() string {
+	if v, ok := appVersion.Load().(string); ok && v != "" {
+		return v
+	}
+	return "dev"
+}
+

internal/handlers/pricelist.go

@@ -87,6 +87,15 @@ func (h *PricelistHandler) Get(c *gin.Context) {
 
 // Create creates a new pricelist from current prices
 func (h *PricelistHandler) Create(c *gin.Context) {
+	canWrite, debugInfo := h.service.CanWriteDebug()
+	if !canWrite {
+		c.JSON(http.StatusForbidden, gin.H{
+			"error": "pricelist write is not allowed",
+			"debug": debugInfo,
+		})
+		return
+	}
+
 	// Get the database username as the creator
 	createdBy := h.localDB.GetDBUser()
 	if createdBy == "" {
@@ -104,6 +113,15 @@ func (h *PricelistHandler) Create(c *gin.Context) {
 
 // Delete deletes a pricelist by ID
 func (h *PricelistHandler) Delete(c *gin.Context) {
+	canWrite, debugInfo := h.service.CanWriteDebug()
+	if !canWrite {
+		c.JSON(http.StatusForbidden, gin.H{
+			"error": "pricelist write is not allowed",
+			"debug": debugInfo,
+		})
+		return
+	}
+
 	idStr := c.Param("id")
 	id, err := strconv.ParseUint(idStr, 10, 32)
 	if err != nil {

internal/handlers/setup.go

@@ -148,6 +148,8 @@ func (h *SetupHandler) TestConnection(c *gin.Context) {
 
 // SaveConnection saves the connection settings and signals restart
 func (h *SetupHandler) SaveConnection(c *gin.Context) {
+	existingSettings, _ := h.localDB.GetSettings()
+
 	host := c.PostForm("host")
 	portStr := c.PostForm("port")
 	database := c.PostForm("database")
@@ -202,19 +204,29 @@ func (h *SetupHandler) SaveConnection(c *gin.Context) {
 		}
 	}
 
-	// Always restart to properly initialize all services with the new connection
-	restartRequired := h.restartSig == nil
+	settingsChanged := existingSettings == nil ||
+		existingSettings.Host != host ||
+		existingSettings.Port != port ||
+		existingSettings.Database != database ||
+		existingSettings.User != user ||
+		existingSettings.PasswordEncrypted != password
+
+	restartQueued := settingsChanged && h.restartSig != nil
 	c.JSON(http.StatusOK, gin.H{
 		"success":          true,
 		"message":          "Settings saved.",
-		"restart_required": restartRequired,
+		"restart_required": settingsChanged,
+		"restart_queued":   restartQueued,
 	})
 
 	// Signal restart after response is sent (if restart signal is configured)
-	if h.restartSig != nil {
+	if restartQueued {
 		go func() {
 			time.Sleep(500 * time.Millisecond) // Give time for response to be sent
-			h.restartSig <- struct{}{}
+			select {
+			case h.restartSig <- struct{}{}:
+			default:
+			}
 		}()
 	}
 }

internal/localdb/converters.go

@@ -31,7 +31,7 @@ func ConfigurationToLocal(cfg *models.Configuration) *LocalConfiguration {
 		CreatedAt:        cfg.CreatedAt,
 		UpdatedAt:        time.Now(),
 		SyncStatus:       "pending",
-		OriginalUserID:   cfg.UserID,
+		OriginalUserID:   derefUint(cfg.UserID),
 		OriginalUsername: cfg.OwnerUsername,
 	}
 
@@ -60,7 +60,6 @@ func LocalToConfiguration(local *LocalConfiguration) *models.Configuration {
 
 	cfg := &models.Configuration{
 		UUID:           local.UUID,
-		UserID:         local.OriginalUserID,
 		OwnerUsername:  local.OriginalUsername,
 		Name:           local.Name,
 		Items:          items,
@@ -76,10 +75,21 @@ func LocalToConfiguration(local *LocalConfiguration) *models.Configuration {
 	if local.ServerID != nil {
 		cfg.ID = *local.ServerID
 	}
+	if local.OriginalUserID != 0 {
+		userID := local.OriginalUserID
+		cfg.UserID = &userID
+	}
 
 	return cfg
 }
 
+func derefUint(v *uint) uint {
+	if v == nil {
+		return 0
+	}
+	return *v
+}
+
 // PricelistToLocal converts models.Pricelist to LocalPricelist
 func PricelistToLocal(pl *models.Pricelist) *LocalPricelist {
 	name := pl.Notification

internal/localdb/localdb.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"time"
 
+	"git.mchus.pro/mchus/quoteforge/internal/appmeta"
 	"github.com/glebarez/sqlite"
 	uuidpkg "github.com/google/uuid"
 	"gorm.io/gorm"
@@ -238,6 +239,7 @@ func (l *LocalDB) DeactivateConfiguration(uuid string) error {
 			VersionNo:         maxVersion + 1,
 			Data:              snapshot,
 			ChangeNote:        &note,
+			AppVersion:        appmeta.Version(),
 			CreatedAt:         time.Now(),
 		}
 		if err := tx.Create(version).Error; err != nil {
@@ -472,6 +474,16 @@ func (l *LocalDB) MarkChangesSynced(ids []int64) error {
 	return l.db.Where("id IN ?", ids).Delete(&PendingChange{}).Error
 }
 
+// PurgeOrphanConfigurationPendingChanges removes configuration pending changes
+// whose entity_uuid no longer exists in local_configurations.
+func (l *LocalDB) PurgeOrphanConfigurationPendingChanges() (int64, error) {
+	tx := l.db.Where(
+		"entity_type = ? AND entity_uuid NOT IN (SELECT uuid FROM local_configurations)",
+		"configuration",
+	).Delete(&PendingChange{})
+	return tx.RowsAffected, tx.Error
+}
+
 // GetPendingCount returns the total number of pending changes (alias for CountPendingChanges)
 func (l *LocalDB) GetPendingCount() int64 {
 	return l.CountPendingChanges()

internal/localdb/migrations.go

@@ -103,6 +103,7 @@ func backfillConfigurationVersions(tx *gorm.DB) error {
 				VersionNo:         1,
 				Data:              snapshot,
 				ChangeNote:        &note,
+				AppVersion:        "backfill",
 				CreatedAt:         chooseNonZeroTime(cfg.CreatedAt, time.Now()),
 			}
 			if err := tx.Create(&version).Error; err != nil {

internal/localdb/models.go

@@ -94,6 +94,7 @@ type LocalConfigurationVersion struct {
 	Data              string              `gorm:"type:text;not null" json:"data"`
 	ChangeNote        *string             `json:"change_note,omitempty"`
 	CreatedBy         *string             `json:"created_by,omitempty"`
+	AppVersion        string              `gorm:"size:64" json:"app_version,omitempty"`
 	CreatedAt         time.Time           `gorm:"not null;autoCreateTime;index:idx_lcv_config_created,sort:desc,priority:2" json:"created_at"`
 	Configuration     *LocalConfiguration `gorm:"foreignKey:ConfigurationUUID;references:UUID" json:"configuration,omitempty"`
 }

internal/models/configuration.go

@@ -42,8 +42,9 @@ func (c ConfigItems) Total() float64 {
 type Configuration struct {
 	ID             uint        `gorm:"primaryKey;autoIncrement" json:"id"`
 	UUID           string      `gorm:"size:36;uniqueIndex;not null" json:"uuid"`
-	UserID         uint        `gorm:"not null" json:"user_id"` // Legacy owner field (kept for backward compatibility)
+	UserID         *uint       `json:"user_id,omitempty"` // Legacy field, no longer required for ownership
 	OwnerUsername  string      `gorm:"size:100;not null;default:'';index" json:"owner_username"`
+	AppVersion     string      `gorm:"size:64" json:"app_version,omitempty"`
 	Name           string      `gorm:"size:200;not null" json:"name"`
 	Items          ConfigItems `gorm:"type:json;not null" json:"items"`
 	TotalPrice     *float64    `gorm:"type:decimal(12,2)" json:"total_price"`

internal/repository/configuration.go

@@ -19,7 +19,7 @@ func (r *ConfigurationRepository) Create(config *models.Configuration) error {
 
 func (r *ConfigurationRepository) GetByID(id uint) (*models.Configuration, error) {
 	var config models.Configuration
-	err := r.db.Preload("User").First(&config, id).Error
+	err := r.db.First(&config, id).Error
 	if err != nil {
 		return nil, err
 	}
@@ -28,7 +28,7 @@ func (r *ConfigurationRepository) GetByID(id uint) (*models.Configuration, error
 
 func (r *ConfigurationRepository) GetByUUID(uuid string) (*models.Configuration, error) {
 	var config models.Configuration
-	err := r.db.Preload("User").Where("uuid = ?", uuid).First(&config).Error
+	err := r.db.Where("uuid = ?", uuid).First(&config).Error
 	if err != nil {
 		return nil, err
 	}
@@ -47,12 +47,11 @@ func (r *ConfigurationRepository) ListByUser(ownerUsername string, offset, limit
 	var configs []models.Configuration
 	var total int64
 
-	ownerScope := "owner_username = ? OR (COALESCE(owner_username, '') = '' AND user_id IN (SELECT id FROM qt_users WHERE username = ?))"
+	ownerScope := "owner_username = ?"
 
-	r.db.Model(&models.Configuration{}).Where(ownerScope, ownerUsername, ownerUsername).Count(&total)
+	r.db.Model(&models.Configuration{}).Where(ownerScope, ownerUsername).Count(&total)
 	err := r.db.
-		Preload("User").
-		Where(ownerScope, ownerUsername, ownerUsername).
+		Where(ownerScope, ownerUsername).
 		Order("created_at DESC").
 		Offset(offset).
 		Limit(limit).
@@ -67,7 +66,6 @@ func (r *ConfigurationRepository) ListTemplates(offset, limit int) ([]models.Con
 
 	r.db.Model(&models.Configuration{}).Where("is_template = ?", true).Count(&total)
 	err := r.db.
-		Preload("User").
 		Where("is_template = ?", true).
 		Order("created_at DESC").
 		Offset(offset).
@@ -84,7 +82,6 @@ func (r *ConfigurationRepository) ListAll(offset, limit int) ([]models.Configura
 
 	r.db.Model(&models.Configuration{}).Count(&total)
 	err := r.db.
-		Preload("User").
 		Order("created_at DESC").
 		Offset(offset).
 		Limit(limit).

internal/services/local_configuration.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"time"
 
+	"git.mchus.pro/mchus/quoteforge/internal/appmeta"
 	"git.mchus.pro/mchus/quoteforge/internal/localdb"
 	"git.mchus.pro/mchus/quoteforge/internal/models"
 	"git.mchus.pro/mchus/quoteforge/internal/services/sync"
@@ -820,6 +821,7 @@ func (s *LocalConfigurationService) appendVersionTx(
 			Data:              snapshot,
 			ChangeNote:        &changeNote,
 			CreatedBy:         createdByPtr,
+			AppVersion:        appmeta.Version(),
 		}
 
 		if err := tx.Create(version).Error; err != nil {
@@ -915,6 +917,7 @@ func (s *LocalConfigurationService) rollbackToVersion(configurationUUID string,
 			Data:              target.Data,
 			ChangeNote:        &changeNote,
 			CreatedBy:         stringPtrOrNil(userID),
+			AppVersion:        appmeta.Version(),
 		}
 
 		if err := tx.Create(version).Error; err != nil {

internal/services/sync/service.go

@@ -7,6 +7,7 @@ import (
 	"log/slog"
 	"time"
 
+	"git.mchus.pro/mchus/quoteforge/internal/appmeta"
 	"git.mchus.pro/mchus/quoteforge/internal/db"
 	"git.mchus.pro/mchus/quoteforge/internal/localdb"
 	"git.mchus.pro/mchus/quoteforge/internal/models"
@@ -397,6 +398,13 @@ func (s *Service) SyncPricelistsIfNeeded() error {
 
 // PushPendingChanges pushes all pending changes to the server
 func (s *Service) PushPendingChanges() (int, error) {
+	removed, err := s.localDB.PurgeOrphanConfigurationPendingChanges()
+	if err != nil {
+		slog.Warn("failed to purge orphan configuration pending changes", "error", err)
+	} else if removed > 0 {
+		slog.Info("purged orphan configuration pending changes", "removed", removed)
+	}
+
 	changes, err := s.localDB.GetPendingChanges()
 	if err != nil {
 		return 0, fmt.Errorf("getting pending changes: %w", err)
@@ -605,15 +613,10 @@ func (s *Service) ensureConfigurationOwner(mariaDB *gorm.DB, cfg *models.Configu
 		return fmt.Errorf("owner username is empty")
 	}
 
-	userID, err := models.EnsureDBUser(mariaDB, ownerUsername)
-	if err != nil {
-		return err
-	}
-	if userID == 0 {
-		return fmt.Errorf("resolved user ID is 0 for owner %q", ownerUsername)
-	}
-
-	cfg.UserID = userID
+	// user_id is legacy and no longer used for ownership in local-first mode.
+	// Keep it NULL on writes; ownership is represented by owner_username.
+	cfg.UserID = nil
+	cfg.AppVersion = appmeta.Version()
 	return nil
 }
 
@@ -641,6 +644,10 @@ func (s *Service) resolveConfigurationPayloadForPush(change *localdb.PendingChan
 
 	currentCfg, currentVersionID, currentVersionNo, err := s.loadCurrentConfigurationState(payload.ConfigurationUUID)
 	if err != nil {
+		// Local config may be gone (e.g. stale queue item after delete/cleanup). Treat as no-op.
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return payload, payload.Snapshot, true, nil
+		}
 		// create->deactivate race: config may no longer be active/visible locally, skip stale create.
 		if change.Operation == "create" {
 			return payload, payload.Snapshot, true, nil

migrations/006_add_local_configuration_versions.sql

@@ -14,6 +14,7 @@ CREATE TABLE local_configuration_versions (
     data TEXT NOT NULL,
     change_note TEXT NULL,
     created_by TEXT NULL,
+    app_version TEXT NULL,
     created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     FOREIGN KEY (configuration_uuid) REFERENCES local_configurations(uuid),
     UNIQUE(configuration_uuid, version_no)
@@ -36,6 +37,7 @@ INSERT INTO local_configuration_versions (
     data,
     change_note,
     created_by,
+    app_version,
     created_at
 )
 SELECT
@@ -58,10 +60,12 @@ SELECT
         'synced_at', synced_at,
         'sync_status', sync_status,
         'original_user_id', original_user_id,
-        'original_username', original_username
+        'original_username', original_username,
+        'app_version', NULL
     ) AS data,
     'Initial snapshot backfill (v1)' AS change_note,
     NULL AS created_by,
+    NULL AS app_version,
     COALESCE(created_at, CURRENT_TIMESTAMP) AS created_at
 FROM local_configurations;
 

migrations/007_detach_configurations_from_qt_users.sql

@@ -0,0 +1,25 @@
+-- Detach qt_configurations from qt_users (ownership is owner_username text)
+-- Safe for MySQL 8+/MariaDB 10.2+ via INFORMATION_SCHEMA checks.
+
+SET @fk_exists := (
+    SELECT COUNT(*)
+    FROM information_schema.TABLE_CONSTRAINTS
+    WHERE CONSTRAINT_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'qt_configurations'
+      AND CONSTRAINT_NAME = 'fk_qt_configurations_user'
+      AND CONSTRAINT_TYPE = 'FOREIGN KEY'
+);
+
+SET @drop_fk_sql := IF(
+    @fk_exists > 0,
+    'ALTER TABLE qt_configurations DROP FOREIGN KEY fk_qt_configurations_user',
+    'SELECT ''fk_qt_configurations_user not found, skip'' '
+);
+PREPARE stmt_drop_fk FROM @drop_fk_sql;
+EXECUTE stmt_drop_fk;
+DEALLOCATE PREPARE stmt_drop_fk;
+
+-- user_id becomes optional legacy column (can stay NULL)
+ALTER TABLE qt_configurations
+    MODIFY COLUMN user_id BIGINT UNSIGNED NULL;
+

migrations/008_add_app_version_to_configurations.sql

@@ -0,0 +1,4 @@
+-- Track application version used for configuration writes (create/update via sync)
+ALTER TABLE qt_configurations
+    ADD COLUMN app_version VARCHAR(64) NULL DEFAULT NULL AFTER owner_username;
+