Compare commits
25
Commits
v3.41
..
d6c498f0cf
No files matched your search
@@ -1,4 +1,4 @@
|
||||
.PHONY: build build-release clean test run version install-hooks
|
||||
.PHONY: build build-release clean test run version install-hooks migrate migrate-status migrate-baseline security-check
|
||||
|
||||
# Get version from git
|
||||
VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
|
||||
@@ -13,20 +13,20 @@ build:
|
||||
go build -o bin/$(BINARY) ./cmd/qfs
|
||||
|
||||
# Build for release (optimized, with version)
|
||||
build-release:
|
||||
build-release: security-check
|
||||
@echo "Building $(BINARY) version $(VERSION)..."
|
||||
CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -o bin/$(BINARY) ./cmd/qfs
|
||||
@echo "✓ Built: bin/$(BINARY)"
|
||||
@./bin/$(BINARY) -version
|
||||
|
||||
# Build release for Linux (cross-compile)
|
||||
build-linux:
|
||||
build-linux: security-check
|
||||
@echo "Building $(BINARY) for Linux..."
|
||||
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$(LDFLAGS)" -o bin/$(BINARY)-linux-amd64 ./cmd/qfs
|
||||
@echo "✓ Built: bin/$(BINARY)-linux-amd64"
|
||||
|
||||
# Build release for macOS (cross-compile)
|
||||
build-macos:
|
||||
build-macos: security-check
|
||||
@echo "Building $(BINARY) for macOS..."
|
||||
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="$(LDFLAGS)" -o bin/$(BINARY)-darwin-amd64 ./cmd/qfs
|
||||
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$(LDFLAGS)" -o bin/$(BINARY)-darwin-arm64 ./cmd/qfs
|
||||
@@ -34,7 +34,7 @@ build-macos:
|
||||
@echo "✓ Built: bin/$(BINARY)-darwin-arm64"
|
||||
|
||||
# Build release for Windows (cross-compile)
|
||||
build-windows:
|
||||
build-windows: security-check
|
||||
@echo "Building $(BINARY) for Windows..."
|
||||
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="$(LDFLAGS)" -o bin/$(BINARY)-windows-amd64.exe ./cmd/qfs
|
||||
@echo "✓ Built: bin/$(BINARY)-windows-amd64.exe"
|
||||
@@ -55,10 +55,32 @@ clean:
|
||||
rm -rf bin/
|
||||
rm -f $(BINARY)
|
||||
|
||||
# Server (MariaDB) migrations — migrations/*.sql tracked in qt_schema_migrations.
|
||||
# Always built from the current source (go run), never a possibly stale bin/ binary.
|
||||
# Uses the connection saved in the local app settings.
|
||||
|
||||
# List migrations with applied/pending state (read-only)
|
||||
migrate-status:
|
||||
go run ./cmd/qfs -migrate-status
|
||||
|
||||
# Apply pending migrations
|
||||
migrate:
|
||||
go run ./cmd/qfs -migrate
|
||||
|
||||
# Record migrations up to UPTO as applied WITHOUT running them (one-time, for a server
|
||||
# whose schema is already current): make migrate-baseline UPTO=033_add_price_quality_to_pricelist_items.sql
|
||||
migrate-baseline:
|
||||
@test -n "$(UPTO)" || (echo "usage: make migrate-baseline UPTO=<file.sql>"; exit 1)
|
||||
go run ./cmd/qfs -migrate-baseline "$(UPTO)"
|
||||
|
||||
# Run tests
|
||||
test:
|
||||
go test -v ./...
|
||||
|
||||
# Pin the scanner so releases do not depend on a locally installed executable.
|
||||
security-check:
|
||||
go run golang.org/x/vuln/cmd/govulncheck@v1.9.0 ./...
|
||||
|
||||
# Run development server
|
||||
run:
|
||||
go run ./cmd/qfs
|
||||
|
||||
@@ -24,7 +24,8 @@ go run ./cmd/qfs
|
||||
Useful commands:
|
||||
|
||||
```bash
|
||||
go run ./cmd/qfs -migrate
|
||||
make migrate-status
|
||||
make migrate
|
||||
go test ./...
|
||||
go vet ./...
|
||||
make build-release
|
||||
|
||||
@@ -19,3 +19,14 @@ var StaticFiles embed.FS
|
||||
func StaticFS() (fs.FS, error) {
|
||||
return fs.Sub(StaticFiles, "web/static")
|
||||
}
|
||||
|
||||
// MigrationFiles contains the MariaDB server migrations (migrations/*.sql), so
|
||||
// `qfs -migrate` works from any directory. Applied via models.RunSQLMigrations.
|
||||
//
|
||||
//go:embed migrations/*.sql
|
||||
var MigrationFiles embed.FS
|
||||
|
||||
// MigrationsFS returns a filesystem rooted at migrations/.
|
||||
func MigrationsFS() (fs.FS, error) {
|
||||
return fs.Sub(MigrationFiles, "migrations")
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package quoteforge
|
||||
|
||||
import (
|
||||
"io/fs"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestMigrationsEmbedded(t *testing.T) {
|
||||
migrations, err := MigrationsFS()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := fs.Stat(migrations, "034_add_feature_flags_to_configurations.sql"); err != nil {
|
||||
t.Fatalf("migration 034 not embedded: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -68,3 +68,14 @@ bible/ shared engineering rules
|
||||
bible-local/ project-specific architecture
|
||||
releases/ release artifacts and notes
|
||||
```
|
||||
|
||||
## Local HTTP trust boundary
|
||||
|
||||
Loopback binding does not make a browser client trusted. Both setup and normal
|
||||
routers reject non-loopback Host, Origin and Referer values, opaque origins and
|
||||
cross-site Fetch Metadata requests before any handler runs. CLI clients may omit
|
||||
browser headers. API requests carrying a body require application/json, except
|
||||
the project vendor-import endpoint, which also accepts multipart/form-data.
|
||||
Setup retains HTML forms; an empty password reuses the saved credential only
|
||||
when host, port and user are unchanged. Changing the destination requires an
|
||||
explicit password.
|
||||
@@ -30,6 +30,8 @@ Pull-only:
|
||||
- pricelists and pricelist items;
|
||||
- partnumber books and partnumber book items.
|
||||
|
||||
Configuration feature flags — see [Configuration feature flags](#configuration-feature-flags).
|
||||
|
||||
Readiness guard:
|
||||
- every sync push/pull runs a preflight check;
|
||||
- blocked sync returns `423 Locked` with a machine-readable reason;
|
||||
@@ -70,6 +72,11 @@ Buy table column order:
|
||||
PN вендора | Описание | LOT | Кол-во | Estimate | Склад | Конкуренты | Ручная цена
|
||||
```
|
||||
|
||||
Buy table money cells (Estimate / Склад / Конкуренты / Ручная цена) show the row's line
|
||||
total (unit × qty), the same as the Sale table's "Цена" — never a unit price; the footer
|
||||
"Итого" is the sum of those cells. A "Ручная цена" share shown in a row is that row's share
|
||||
of the manual total, not divided by qty.
|
||||
|
||||
Sale table column order:
|
||||
|
||||
```
|
||||
@@ -85,12 +92,16 @@ Sale per-row pricing (`_saleRowPrice`/`recomputeSalePrices` in `index.html`,
|
||||
- `Цена = base × (Аплифт к estimate + row's own Накидка% / 100)` — Накидка is a
|
||||
per-row percentage, additive to the table-wide uplift, entered directly in the
|
||||
row's own input; unset rows default to 0% (no change to older configs' totals);
|
||||
negative values are discounts, and the factor is floored at 0 so no price goes
|
||||
negative (`_saleRowPrice` / `applySaleRowPricing`);
|
||||
Склад/Конкуренты are not shown or exported for the Sale table;
|
||||
- per-row Накидка is keyed by `"<vendorPN>::<lot>"` (uppercased, "NONE" when there's
|
||||
no vendor PN) — plain `lot_name` isn't a safe key since the same LOT can appear
|
||||
under more than one vendor-PN group (see row expansion rules below) — and persisted
|
||||
as an additive key, `Notes.pricing_ui.sale_row_markups`, alongside the existing
|
||||
`sale_uplift`/`sale_custom_price` (see
|
||||
`sale_uplift`/`sale_custom_price`; unknown `Notes` / `pricing_ui` keys are carried
|
||||
through verbatim on save (`loadedNotesExtra` / `loadedPricingUIExtra`) so a client
|
||||
never erases fields added by a newer version (see
|
||||
[decisions/2026-09-15-sale-row-markup-and-minimal-csv.md](decisions/2026-09-15-sale-row-markup-and-minimal-csv.md));
|
||||
- the Sale table's own "Экспорт CSV" button additionally sends
|
||||
`minimal_sale_columns: true` + `sale_row_markups`, which collapses
|
||||
@@ -121,6 +132,44 @@ both tables gain a narrow leading price-quality meter column (per sub-row), the
|
||||
tint is removed, `world`-fallback cells show a `W` text marker instead of amber, and the footer
|
||||
total shows a `⚠` prefix instead of red. CSV output is unaffected.
|
||||
|
||||
## Configuration feature flags
|
||||
|
||||
A configuration records which data features it uses in `feature_flags`, so a client
|
||||
that does not know one of them refuses to write it instead of silently dropping data.
|
||||
Rationale: [decisions/2026-09-24-configuration-feature-flags.md](decisions/2026-09-24-configuration-feature-flags.md).
|
||||
|
||||
Storage:
|
||||
- `qt_configurations.feature_flags` / `local_configurations.feature_flags` — JSON array
|
||||
of strings, sorted, no duplicates; empty list is stored as `NULL`
|
||||
(e.g. `["sale_row_markups"]`);
|
||||
- carried in version snapshots; exposed on reads as `feature_flags`, plus
|
||||
`unsupported_features` when this build doesn't know some of them.
|
||||
|
||||
Flag name format:
|
||||
- `lower_snake_case`, ASCII `[a-z0-9_]`, starts with a letter, at most 64 chars;
|
||||
- names the **data** the configuration holds, not the UI or the release:
|
||||
`<area>_<data>` — e.g. `sale_row_markups`, not `new_pricing_tab` or `v3_42`;
|
||||
- a name is permanent: never renamed, never reused for different data, never removed
|
||||
from `configfeatures.known` while any configuration can still carry it;
|
||||
- a change in the *meaning* of existing data that old clients would mis-handle gets a
|
||||
new flag (e.g. `sale_row_markups_v2`), not a silent reinterpretation of the old one.
|
||||
|
||||
Lifecycle:
|
||||
- flags are derived from content on every local write (`configfeatures.Detect`), never
|
||||
sent by the UI; a flag disappears when its data does;
|
||||
- a client refuses any write (local save or sync push) to a configuration carrying a
|
||||
flag missing from its `configfeatures.known`, returns `409 unsupported_config_features`,
|
||||
and the configurator locks itself with a banner listing the raw flag names;
|
||||
- a new data feature that older clients would drop on save must add its flag — to
|
||||
`known`, to `Detect`, and to the registry below — in the same change. Data that old
|
||||
clients round-trip verbatim needs no flag.
|
||||
|
||||
Registry:
|
||||
|
||||
| Flag | Set when | Data | Since |
|
||||
| --- | --- | --- | --- |
|
||||
| `sale_row_markups` | `Notes.pricing_ui.sale_row_markups` has at least one non-zero value | per-row «Накидка, %» on the Sale table (negative = discount) | flag introduced 2026-09-24; data since v3.41 |
|
||||
|
||||
## Configuration versioning
|
||||
|
||||
Configuration revisions are append-only snapshots stored in `local_configuration_versions`.
|
||||
@@ -159,12 +208,17 @@ Configurations have a `config_type` field: `"server"` (default) or `"storage"`.
|
||||
|
||||
Rules:
|
||||
- `config_type` defaults to `"server"` for all existing and new configurations unless explicitly set;
|
||||
- `config_type` is a free-form code (no enum on client or server); every write path — update, clone,
|
||||
clone-from-version, rollback, sync push/pull — must carry it unchanged, including codes this client
|
||||
does not know;
|
||||
- the configurator page is shared for both types; the SW tab is always visible regardless of type;
|
||||
- storage configurations use the same vendor_spec + PN→LOT + pricing flow as server configurations;
|
||||
- storage component categories map to existing tabs: `ENC`/`DKC`/`CTL` → Base, `HIC` → PCI (HIC-карты СХД; `HBA`/`NIC` — серверные, не смешивать), `SSD`/`HDD` → Storage (используют существующие серверные LOT), `ACC` → Accessories (используют существующие серверные LOT), `SW` → SW.
|
||||
- `DKC` = контроллерная полка (модель СХД + тип дисков + кол-во слотов + кол-во контроллеров); `CTL` = контроллер (кэш + встроенные порты); `ENC` = дисковая полка без контроллера.
|
||||
- the available config types and their localized names flow from `qt_settings.config_types` on the server;
|
||||
QF falls back to hardcoded "server/Сервер" and "storage/СХД" when the setting is absent.
|
||||
QF falls back to hardcoded "server/Сервер" and "storage/СХД" when the setting is absent;
|
||||
- every "new configuration" type picker (`/configs` and the project page) renders its buttons from
|
||||
`config_types` — a new type added on the server appears without a client release.
|
||||
|
||||
## Server-driven configurator settings (`qt_settings`)
|
||||
|
||||
@@ -181,9 +235,12 @@ full contract and JSON schemas.
|
||||
| `support_pricing` | Price data for the Base tab's support-level picker (see below) |
|
||||
|
||||
Rules:
|
||||
- sync runs as part of the pricelist pull; failure is non-fatal (Warn log only);
|
||||
- sync runs in the background sync worker (after the pricelist pull) and in the manual full sync
|
||||
(`POST /api/sync/all`); failure is non-fatal (Warn log only);
|
||||
- `local_qt_settings` is a read-only cache — never written by user actions;
|
||||
- absent or unparseable settings: QF uses hardcoded fallbacks for that key only;
|
||||
- absent or unparseable settings: `GET /api/configurator-settings` serves the Go-side default for that
|
||||
key only (`internal/handlers/component.go`); this is the single fallback — the configurator page
|
||||
holds no copy of tabs/categories and builds its tab buttons from the served `tab_config`;
|
||||
- `config_types[].categories` is an allowlist: a category absent from all types is shown everywhere;
|
||||
- `qt_categories.name` and `qt_categories.name_ru` are not used by QF runtime; do not depend on them.
|
||||
|
||||
@@ -237,7 +294,7 @@ rental calc the same way any BOM line does, with no special-casing needed in tho
|
||||
a QuoteForge release — see `bible-local/server-contract-qt-settings.md` for the schema; the
|
||||
fixed list of offerable level×duration codes stays in the frontend, only the price is
|
||||
server-driven;
|
||||
- platform (x86 vs HGX-H100/H200 vs HGX-B200 vs HGX-B300) is auto-detected client-side from the
|
||||
- platform (x86 vs HGX-H100/H200 vs HGX-B200 vs HGX-B300) is auto-detected client-side from the (HGX only for SXM/HGX-named GPUs or H100/H200/B200/B300 non-PCIe; PCIe GPUs like A30 stay x86)
|
||||
cart's GPU components, the same chip-generation classification used by the rental
|
||||
depreciation calc (`internal/services/rental.go`), so the picker only offers combinations
|
||||
valid for the current configuration;
|
||||
@@ -285,3 +342,11 @@ Rules:
|
||||
- PN to LOT resolution uses the active local partnumber book;
|
||||
- canonical persisted mapping is `lot_mappings[]`;
|
||||
- QuoteForge does not use legacy BOM tables such as `qt_bom`, `qt_lot_bundles`, or `qt_lot_bundle_items`.
|
||||
|
||||
## Browser rendering
|
||||
|
||||
`web/static/html-escape.js` provides the shared `escapeHtml` for HTML text and
|
||||
quoted attributes. Never interpolate data into JavaScript event attributes.
|
||||
Cart and rental controls carry escaped LOT values in `data-lot` and dispatch
|
||||
through delegated listeners. Sync errors are escaped as text; toast messages use
|
||||
`textContent`. Run `node scripts/tests/html-security.cjs` for the regression check.
|
||||
@@ -57,7 +57,7 @@ Server-side only (not queried by client runtime):
|
||||
- `qt_lot_metadata` — component metadata / price settings; the Go server-side component/category management layer (`ComponentRepository`, `CategoryRepository`, `ComponentService`) was removed — no client code reads this table
|
||||
- `qt_component_usage_stats` — aggregated component popularity stats (written by server jobs)
|
||||
- `qt_pricing_alerts` — price anomaly alerts (models exist in Go; feature disabled in runtime)
|
||||
- `qt_schema_migrations` — server migration history (applied via `go run ./cmd/qfs -migrate`)
|
||||
- `qt_schema_migrations` — server migration history (applied via `make migrate`, see [Migrations](#migrations))
|
||||
- `qt_scheduler_runs` — server background job tracking (no Go code references it in this repo)
|
||||
|
||||
### Competitor subsystem (server-side only, not used by QuoteForge Go code)
|
||||
@@ -195,6 +195,7 @@ PK: lot_name
|
||||
| vendor_spec | longtext JSON | |
|
||||
| rental_items | JSON | per-lot New/БУ condition for the Аренда tab; see [02-architecture.md](02-architecture.md#rental--paid-testing-pricing-contract) |
|
||||
| rental_uplift_percent | decimal(8,2) DEFAULT 0 | uplift applied to Estimate buy price for rental "Цена" |
|
||||
| feature_flags | JSON NULL | added by migration 034. Data features the configuration uses (`["sale_row_markups"]`); derived on save, a client refuses to write a config with a flag it doesn't know. See [decisions/2026-09-24-configuration-feature-flags.md](decisions/2026-09-24-configuration-feature-flags.md) |
|
||||
|
||||
### qt_lot_metadata
|
||||
PK: lot_name
|
||||
@@ -426,5 +427,37 @@ SQLite:
|
||||
- local migration state is tracked in `local_schema_migrations`.
|
||||
|
||||
MariaDB:
|
||||
- SQL files live in `migrations/`;
|
||||
- they are applied by `go run ./cmd/qfs -migrate`.
|
||||
- SQL files live in `migrations/` (embedded into the binary), one file per change,
|
||||
`NNN_short_topic.sql`, with the recovery/verify header used by the existing files;
|
||||
filenames containing `local_` are SQLite-only and skipped;
|
||||
- applied state is tracked per filename in `qt_schema_migrations`;
|
||||
- commands (always from current source — never run a `bin/` binary of unknown age):
|
||||
- `make migrate-status` (`qfs -migrate-status`) — list applied/pending, read-only;
|
||||
- `make migrate` (`qfs -migrate`) — apply pending files in filename order, then exit;
|
||||
refuses when `qt_schema_migrations` has no applied rows at all (every file would re-run);
|
||||
- `make migrate-baseline UPTO=<file.sql>` (`qfs -migrate-baseline`) — record files up to
|
||||
`UPTO` as applied **without running them**, for a server whose schema is already current;
|
||||
- migrations use their own connection without read/write timeouts (`openMigrationDB`),
|
||||
not the app's 3s-timeout sync connection — a long backfill must not be cut mid-file;
|
||||
- each file, its `-- verify: <description> | <SQL>` queries and history insertion run
|
||||
on one database session, preserving session variables;
|
||||
- a file is recorded only after statements and all verify checks succeed. Verify
|
||||
queries return rows only for broken invariants; a row or SQL error stops the run
|
||||
without marking that file applied. Malformed verify headers fail before execution;
|
||||
- only duplicate column/key names and already-existing objects are tolerated.
|
||||
FK creation errors (including errno 150/121) remain fatal;
|
||||
- each file must be safe to re-run after a partial failure (`ADD COLUMN IF NOT EXISTS`,
|
||||
idempotent `UPDATE ... WHERE <not yet done>`). The current statement splitter assumes
|
||||
semicolons occur only between statements; do not add semicolons inside literals;
|
||||
- there is no GORM `AutoMigrate` against MariaDB: it retypes production columns to match the
|
||||
running binary's models. On 2026-09-24 a stale v1.18 binary run with the old AutoMigrate
|
||||
`-migrate` did exactly that, which is why it was removed.
|
||||
|
||||
## Connection transport
|
||||
|
||||
`connection_settings.tls_mode` defaults to `preferred`; `tls_ca_pem` stores an
|
||||
optional public CA certificate bundle. SQLite startup adds these columns for
|
||||
legacy settings. Every runtime/setup MariaDB DSN uses `internal/mariadb` to
|
||||
apply the policy documented in [05-config.md](05-config.md). Private keys are
|
||||
never part of the CA field. No mode silently falls back to plaintext except
|
||||
`preferred`.
|
||||
@@ -94,6 +94,11 @@ route sets. Consumed by `web/static/price-quality.js` and the pricing tab via a
|
||||
| `PUT` | `/api/configs/:uuid/rental` | persist Аренда tab state (per-lot New/БУ, weeks, uplift %, annual support) |
|
||||
| `POST` | `/api/configs/:uuid/rental/calculate` | compute rental/paid-testing pricing without persisting |
|
||||
|
||||
Configuration reads include `feature_flags` and, when this build doesn't know some of
|
||||
them, `unsupported_features`. Any write to such a configuration returns `409`
|
||||
`{"code":"unsupported_config_features","unsupported_features":[...],"error":"..."}`
|
||||
(see [decisions/2026-09-24-configuration-feature-flags.md](decisions/2026-09-24-configuration-feature-flags.md)).
|
||||
|
||||
## Projects
|
||||
|
||||
| Method | Path | Purpose |
|
||||
|
||||
@@ -62,8 +62,11 @@ They are stored in SQLite and encrypted with `local_encryption.key` unless `QUOT
|
||||
| --- | --- |
|
||||
| `-config <path>` | config file path |
|
||||
| `-localdb <path>` | SQLite path |
|
||||
| `-reset-localdb` | destructive local DB reset |
|
||||
| `-migrate` | apply server migrations and exit |
|
||||
| `-reset-localdb` | reset after mandatory verified backup; refuses unsynced work |
|
||||
| `-force-reset-localdb` | with `-reset-localdb`, allow clearing unsynced work; backup remains mandatory |
|
||||
| `-migrate` | apply pending server SQL migrations (`migrations/*.sql`) and exit |
|
||||
| `-migrate-status` | list server SQL migrations with applied/pending state and exit |
|
||||
| `-migrate-baseline <file>` | record server migrations up to `<file>` as applied without running them, and exit |
|
||||
| `-version` | print app version and exit |
|
||||
|
||||
## First run
|
||||
@@ -72,3 +75,21 @@ They are stored in SQLite and encrypted with `local_encryption.key` unless `QUOT
|
||||
2. runtime opens the local SQLite database;
|
||||
3. if no stored MariaDB credentials exist, `/setup` is served;
|
||||
4. after setup, runtime works locally and sync uses saved DB settings in the background.
|
||||
|
||||
`QFS_RESET_LOCAL_DB` is no longer supported. Reset requires an explicit CLI flag
|
||||
on each launch. A forced reset still stops if the safety backup cannot be created
|
||||
and verified. See [06-backup.md](06-backup.md).
|
||||
|
||||
## MariaDB TLS
|
||||
|
||||
`/setup` stores `tls_mode` and `tls_ca_pem` in SQLite `connection_settings`,
|
||||
alongside encrypted credentials. Existing and new connections default to
|
||||
`preferred`, which encrypts when advertised by MariaDB but can fall back to
|
||||
plaintext and does not authenticate the server. `required` mandates encryption
|
||||
without verifying the certificate. `verify-ca` requires a PEM CA and validates
|
||||
the server certificate chain without checking its hostname. `verify-full`
|
||||
validates both chain and hostname, using the supplied PEM or system roots.
|
||||
Only the verification modes accept CA input; invalid modes/PEM are rejected.
|
||||
Use `verify-full` for authenticated server connections. The setup form tests
|
||||
the selected policy before saving. Sync, setup checks and migration tooling
|
||||
share the same TLS configuration builder.
|
||||
@@ -53,3 +53,21 @@ Archive name:
|
||||
4. replace `config.yaml` if needed;
|
||||
5. restart the app;
|
||||
6. re-enter MariaDB credentials if the original encryption key is unavailable.
|
||||
|
||||
## Pre-reset safety backup
|
||||
|
||||
Before clearing any table, `-reset-localdb` creates a fresh ZIP under
|
||||
`<backup root>/pre-reset/qfs-pre-reset-v1-<UTC timestamp>-<unique>.zip`, outside
|
||||
normal retention and regardless of `QFS_BACKUP_DISABLE`. The archive contains
|
||||
a consistent SQLite snapshot and the selected config when present. Every ZIP
|
||||
entry is read back for CRC validation; the extracted database must pass SQLite
|
||||
`integrity_check`. A backup or verification failure prevents the reset. The
|
||||
backup directory must also resolve outside git after following symlinks.
|
||||
|
||||
Reset refuses queued changes and any project/configuration not marked `synced`,
|
||||
including NULL/legacy states. A missing sync-status column also blocks reset.
|
||||
Only `-reset-localdb -force-reset-localdb` bypasses this data check. Deletions run
|
||||
in one transaction and preserve connection settings. Missing legacy tables are
|
||||
skipped. Use the restore procedure above for the pre-reset archive; retain it
|
||||
until the reset has been verified. The environment reset switch was removed to
|
||||
prevent repeated destructive startup.
|
||||
+17
-1
@@ -4,10 +4,12 @@
|
||||
|
||||
```bash
|
||||
go run ./cmd/qfs
|
||||
go run ./cmd/qfs -migrate
|
||||
make migrate-status # server SQL migrations: applied/pending
|
||||
make migrate # apply pending server SQL migrations
|
||||
go run ./cmd/migrate_project_updated_at
|
||||
go test ./...
|
||||
go vet ./...
|
||||
make security-check # pinned govulncheck, blocks reachable vulnerabilities
|
||||
make build-release
|
||||
make install-hooks
|
||||
```
|
||||
@@ -33,3 +35,17 @@ make install-hooks
|
||||
|
||||
Release history belongs under `releases/<version>/RELEASE_NOTES.md`.
|
||||
Do not keep temporary change summaries in the repository root.
|
||||
|
||||
## Toolchain and release security
|
||||
|
||||
`go.mod` requires Go 1.27.3 or newer, including security fixes in the standard
|
||||
library. This minimum also rejects older compilers with `GOTOOLCHAIN=local`;
|
||||
normal Go toolchain selection downloads a suitable compiler when necessary.
|
||||
`make security-check` runs `golang.org/x/vuln/cmd/govulncheck@v1.9.0 ./...`.
|
||||
The scanner version is pinned in the Makefile. All release build targets and
|
||||
`scripts/release.sh` require this check to succeed before producing artifacts.
|
||||
A scanner/database/download failure also stops release.
|
||||
|
||||
When updating dependencies: run `go mod tidy`, `go test ./...`, `go vet ./...`,
|
||||
`make security-check` and the JavaScript regression check documented in
|
||||
[02-architecture.md](02-architecture.md).
|
||||
@@ -16,6 +16,7 @@ Project-specific architecture and operational contracts.
|
||||
| [09-vendor-spec.md](09-vendor-spec.md) | Vendor BOM and CFXML import contract |
|
||||
| [10-agent-api-guide.md](10-agent-api-guide.md) | End-to-end API guide for agents pricing servers from a TZ |
|
||||
| [11-lot-suggestions.md](11-lot-suggestions.md) | lot_suggestion column in qt_vendor_partnumber_seen — write/read contract for manual UI mappings |
|
||||
| [issue-plan-2026-10-26.md](issue-plan-2026-10-26.md) | Open issue plan, implementation status and validation |
|
||||
| [decisions/](decisions/README.md) | Architectural decision log, one file per decision |
|
||||
|
||||
## Rules
|
||||
|
||||
@@ -47,11 +47,22 @@ and a final price.
|
||||
|
||||
## Consequences
|
||||
|
||||
- Old clients / already-saved configurations are unaffected: `sale_row_markups` absent
|
||||
from `Notes` means every row's markup defaults to 0%, reproducing the exact totals
|
||||
the table produced before this change (uplift-only). Old clients that don't know the
|
||||
new `Notes` key simply ignore it, exactly like `sale_uplift` is ignored by even older
|
||||
code.
|
||||
- Already-saved configurations are unaffected: `sale_row_markups` absent from `Notes`
|
||||
means every row's markup defaults to 0%, reproducing the exact totals the table
|
||||
produced before this change (uplift-only).
|
||||
- **Correction (2026-09-24):** the original claim that old clients "simply ignore" the
|
||||
new key was wrong. A pre-v3.41 client rebuilds `Notes` from scratch on save
|
||||
(only `buy_custom_price`/`sale_uplift`/`sale_custom_price`), so opening and saving a
|
||||
config in an old client — including the best-effort save on page exit — erases
|
||||
`sale_row_markups` on the server, and the next pull overwrites every other client's
|
||||
local copy. Observed in the field: a markup saved and pushed on 09-22 came back as
|
||||
`null` on the 09-23 pull. From this fix on the client carries unknown `Notes` /
|
||||
`pricing_ui` keys through verbatim, so future additive keys survive a save by the
|
||||
current version; nothing can protect against clients older than this fix — all users
|
||||
must upgrade.
|
||||
- Negative Накидка is allowed (a per-row discount). The factor
|
||||
`uplift + pct/100` is floored at 0 on both client and CSV export, so a large discount
|
||||
gives a zero price instead of a negative one.
|
||||
- If a future caller needs the full-column DDP CSV format with per-row markup applied,
|
||||
it must do so explicitly — `MinimalSaleColumns` intentionally couples "reduced
|
||||
columns" and "per-row markup applied" as one request-level switch rather than two
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
# Decision: per-configuration feature flags — clients refuse to write what they don't understand
|
||||
|
||||
**Date:** 2026-09-24
|
||||
**Status:** active
|
||||
|
||||
## Context
|
||||
|
||||
Configurations are synced last-write-wins, and every client rebuilds a configuration's
|
||||
content from what *it* knows before saving. When a newer client adds data (e.g. the
|
||||
per-row "Накидка" in `Notes.pricing_ui.sale_row_markups`, see
|
||||
[2026-09-15-sale-row-markup-and-minimal-csv.md](2026-09-15-sale-row-markup-and-minimal-csv.md)),
|
||||
an older client that opens and saves the same configuration silently drops it; the drop
|
||||
is pushed to the server and the next pull spreads it to every other client. This
|
||||
happened in the field (a markup pushed on 2026-09-22 came back `null` on the 09-23 pull).
|
||||
A global minimum-app-version gate was considered and rejected: it would block all sync
|
||||
for an outdated client, even for configurations that use no new feature.
|
||||
|
||||
## Decision
|
||||
|
||||
- `qt_configurations.feature_flags` (JSON array of strings, NULL = none; server
|
||||
migration `034`) and `local_configurations.feature_flags` (AutoMigrate) record which
|
||||
data features a configuration uses. Synced like any other column; carried in version
|
||||
snapshots.
|
||||
- `internal/configfeatures` is the single source of truth: `known` (flags this build
|
||||
understands), `Detect(notes)` (derive flags from content), `Unknown`, `Check`,
|
||||
`UnsupportedError`. Current flags: `sale_row_markups` (at least one non-zero row markup).
|
||||
- Flags are **derived** on every local write, never sent by the UI: `saveWithVersionAndPending`,
|
||||
`createWithVersionTx`, `rollbackToVersion`, `UpdateServerCount` first `Check` the flags
|
||||
*as stored* and refuse with `*configfeatures.UnsupportedError` if any is unknown, then set
|
||||
`FeatureFlags = Detect(notes)`. This covers update, rename, move, refresh prices,
|
||||
vendor-spec, rental, server count, deactivate/reactivate, rollback (current and target
|
||||
snapshot) and clone (the clone inherits the original's flags). Project line reorder is
|
||||
exempt: it only touches `line_no` and writes the row back with its flags and notes intact.
|
||||
- Every HTTP handler reports errors via `handlers.RespondError`, which turns an
|
||||
`UnsupportedError` into `409` `{"code":"unsupported_config_features","unsupported_features":[...],"error":"..."}`
|
||||
regardless of the status the caller picked.
|
||||
- Reads expose `unsupported_features` (computed in `LocalToConfiguration`). The
|
||||
configurator shows a red banner listing them, disables "Сохранить", skips the
|
||||
exit-save, and also locks itself when a save comes back with the 409.
|
||||
- Sync push (`pushConfigurationUpdate`) reads the server row first and refuses if its
|
||||
flags are unknown — a newer client may have written it after our last pull. Such a
|
||||
refused change is kept in the queue (it is exempt from the max-attempts abandon) so the
|
||||
local edit is pushed once the app is updated.
|
||||
- Until migration `034` runs, the server write retries without `feature_flags`
|
||||
(`withOptionalColumns` in `internal/repository/configuration.go`, same fallback as
|
||||
`line_no`) and logs a warning — sync keeps working, but flags are not stored on the server.
|
||||
|
||||
## Consequences
|
||||
|
||||
- **Rule:** any new data feature that an older client would lose on save must add a
|
||||
flag to `configfeatures.known` and to `Detect` in the same change. Features that old
|
||||
clients round-trip safely (e.g. data they carry verbatim) need no flag.
|
||||
- Flags only protect against clients that already contain this check. Clients older
|
||||
than this change ignore `feature_flags` and can still erase newer data — rollout must
|
||||
get every user onto a version with this check.
|
||||
- Order of rollout: apply server migration `034` before (or together with) releasing
|
||||
the client; otherwise flags silently stay local.
|
||||
- The UI shows raw flag ids (an old client, by definition, has no human names for them).
|
||||
@@ -0,0 +1,46 @@
|
||||
# Issue implementation plan - 2026-10-26
|
||||
|
||||
Repository: https://git.mchus.pro/mchus/QuoteForge
|
||||
|
||||
All issue pages were retrieved, including closed issues: seven total, six open.
|
||||
Issue [#1](https://git.mchus.pro/mchus/QuoteForge/issues/1) was already closed and
|
||||
is excluded from implementation. Work is sequential on
|
||||
`fix/open-issues-security-recovery`, with one implementation commit per open issue.
|
||||
|
||||
| Order | Issue | Implementation and acceptance | Status |
|
||||
| --- | --- | --- | --- |
|
||||
| 1 | [#2](https://git.mchus.pro/mchus/QuoteForge/issues/2) | Block foreign Host/Origin/Referer and cross-site browser requests in both routers; validate API body types; refuse saved-password reuse for a changed host/port/user. Middleware attack cases and setup credential tests must pass. | Implemented |
|
||||
| 2 | [#4](https://git.mchus.pro/mchus/QuoteForge/issues/4) | Move LOT-bearing cart/rental events to delegated listeners and escaped data attributes; escape BOM and sync output; share HTML escaping; render toast as text. Malicious LOT regression checks and template tests must pass. | Implemented |
|
||||
| 3 | [#7](https://git.mchus.pro/mchus/QuoteForge/issues/7) | Require a fresh verified archive outside rotation before reset, refuse unsynced/legacy states without explicit force, use transactional deletion, remove environment-triggered reset. Verify refusal, ZIP restore, backup failure and rollback. | Implemented |
|
||||
| 4 | [#5](https://git.mchus.pro/mchus/QuoteForge/issues/5) | Persist TLS mode/CA in SQLite, expose setup controls, share policy across setup/sync/migration DSNs. Verify certificate trust, hostname checks, plaintext fallback policy and settings round-trip. | Implemented |
|
||||
| 5 | [#3](https://git.mchus.pro/mchus/QuoteForge/issues/3) | Keep each migration file in one session, execute verify headers before history insertion, propagate FK failures. Verify failed queries/checks never enter history. | Implemented |
|
||||
| 6 | [#6](https://git.mchus.pro/mchus/QuoteForge/issues/6) | Require Go 1.27.3, update vulnerable dependencies, block release on pinned govulncheck. Full tests, vet, security scan and macOS/Windows builds must pass. | Implemented |
|
||||
|
||||
## Decisions
|
||||
|
||||
- HTTP forms remain supported on setup and multipart vendor import; JSON APIs
|
||||
reject non-JSON bodies. CLI clients may omit browser origin headers.
|
||||
- CSP without inline scripts remains outside this patch; the issue lists it as optional.
|
||||
- Forced reset still requires a verified backup. `QFS_RESET_LOCAL_DB` is ignored,
|
||||
with a startup warning; only explicit CLI flags can initiate reset.
|
||||
- TLS defaults to `preferred` for existing-server compatibility, as requested in
|
||||
the issue. It permits plaintext fallback; use `verify-full` for authenticated
|
||||
encryption. The setup form explains this distinction.
|
||||
- `go 1.27.3` enforces the minimum compiler, including with `GOTOOLCHAIN=local`.
|
||||
A redundant `toolchain go1.27.3` is removed by Go tooling and is unnecessary.
|
||||
- The local ignored `.claude/skills/release/SKILL.md` was updated with the security
|
||||
prerequisite; the shared Makefile and release script enforce it in git.
|
||||
|
||||
## Validation and handoff
|
||||
|
||||
Passed: `go test ./...`, `go vet ./...`, `node scripts/tests/html-security.cjs`,
|
||||
`make security-check`, shell syntax and diff checks, and CGO-free builds for
|
||||
macOS arm64 and Windows amd64.
|
||||
|
||||
Govulncheck reports zero reachable vulnerabilities and one module-level advisory
|
||||
whose affected code is not called. Gin's transitive quic-go was explicitly raised
|
||||
to v0.59.1 after the first scan identified a reachable advisory in v0.59.0.
|
||||
|
||||
The checks use temporary SQLite databases and synthetic certificates. They do
|
||||
not exercise a live MariaDB server or browser automation. Review the draft PR
|
||||
before merge; issue state changes and a production release remain separate steps.
|
||||
@@ -75,6 +75,8 @@ Update this file in the same commit as any change to the flows below.
|
||||
- `POST /api/sync/push` drains the queue by writing to MariaDB.
|
||||
- If a push fails, `increment_attempts` and `last_error` are updated; row stays in queue.
|
||||
- `RepairPendingChanges` reconciles orphaned changes (configuration/project deleted locally).
|
||||
- Background cycle (`sync.Worker.runSync`) runs independent streams: push (gated by readiness guard), then pricelists, partnumber books, qt_settings. A failure in one stream is logged and never stops the others.
|
||||
- Configurations left `sync_status=pending` with no `pending_changes` row (queue row dropped, e.g. a stale event skipped without marking synced) are re-enqueued as an `update` with the current snapshot at the start of each push (`requeueOrphanedPendingConfigurations`).
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ category codes that are allowed for each type. QF uses this for:
|
||||
"MB","CPU","MEM","RAID",
|
||||
"SSD","HDD","M2","EDSFF","HHHL",
|
||||
"GPU","NIC","HCA","DPU","HBA",
|
||||
"PSU","PS","ACC","RISERS","CARD","BB"
|
||||
"PSU","PS","ACC","RISERS","CARD","BB","SFP"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -53,7 +53,7 @@ category codes that are allowed for each type. QF uses this for:
|
||||
"categories": [
|
||||
"DKC","CPU","MEM","PS",
|
||||
"SSD","HDD","M2","EDSFF","HHHL",
|
||||
"NIC","HBA","HCA","ACC","CARD"
|
||||
"NIC","HBA","HCA","ACC","CARD","SFP"
|
||||
]
|
||||
}
|
||||
]
|
||||
@@ -109,7 +109,16 @@ single-select mode.
|
||||
]
|
||||
},
|
||||
{ "key": "power", "label": "Power", "single_select": false, "categories": ["PS","PSU"] },
|
||||
{ "key": "accessories", "label": "Accessories", "single_select": false, "categories": ["ACC","CARD"] },
|
||||
{
|
||||
"key": "accessories",
|
||||
"label": "Accessories",
|
||||
"single_select": false,
|
||||
"categories": ["ACC","CARD","SFP"],
|
||||
"sections": [
|
||||
{ "title": "Аксессуары", "categories": ["ACC","CARD"] },
|
||||
{ "title": "Трансиверы", "categories": ["SFP"] }
|
||||
]
|
||||
},
|
||||
{ "key": "sw", "label": "SW", "single_select": false, "categories": ["SW"] }
|
||||
]
|
||||
```
|
||||
@@ -126,9 +135,15 @@ contain any items. Other tabs are hidden when empty.
|
||||
**Value format:** JSON string array.
|
||||
|
||||
```json
|
||||
["base", "storage", "pci"]
|
||||
["base"]
|
||||
```
|
||||
|
||||
"Empty" is evaluated after the per-`config_type` category filter, so with only
|
||||
`base` listed a tab such as Storage/PCI shows for a server configuration (its
|
||||
categories have components) and hides for a type whose allowlist excludes all of
|
||||
its categories (e.g. networking). Listing a tab here forces it visible for every
|
||||
config type.
|
||||
|
||||
---
|
||||
|
||||
### `required_categories`
|
||||
@@ -173,19 +188,19 @@ the regulation and the picker won't show it.
|
||||
},
|
||||
"hgx_price": {
|
||||
"HGX-H200": {
|
||||
"B": {"1": 20000, "3": 55000, "5": 80000},
|
||||
"S": {"1": 28000, "3": 70000, "5": 100000},
|
||||
"P": {"1": 63000, "3": 105000}
|
||||
"B": {"1": 28000, "3": 77000, "5": 112000},
|
||||
"S": {"1": 39500, "3": 98000, "5": 140000},
|
||||
"P": {"1": 88500, "3": 147000}
|
||||
},
|
||||
"HGX-B200": {
|
||||
"B": {"1": 40000, "3": 100000, "5": 145000},
|
||||
"S": {"1": 55000, "3": 130000, "5": 185000},
|
||||
"P": {"1": 101000, "3": 176000}
|
||||
"B": {"1": 158500, "3": 230500, "5": 284500},
|
||||
"S": {"1": 176500, "3": 266500, "5": 332500},
|
||||
"P": {"1": 232000, "3": 322000}
|
||||
},
|
||||
"HGX-B300": {
|
||||
"B": {"1": 40000, "3": 100000, "5": 145000},
|
||||
"S": {"1": 55000, "3": 130000, "5": 185000},
|
||||
"P": {"1": 112000, "3": 187000}
|
||||
"B": {"1": 192000, "3": 270000, "5": 328500},
|
||||
"S": {"1": 211500, "3": 309000, "5": 380500},
|
||||
"P": {"1": 286000, "3": 383500}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -200,10 +215,15 @@ current as the regulation evolves.
|
||||
## Backward compatibility
|
||||
|
||||
- If `qt_settings` does not exist (old server): QF logs `Warn` during sync and
|
||||
leaves `local_qt_settings` empty. The frontend falls back to hardcoded defaults
|
||||
for all four settings. No crash, no data loss.
|
||||
- If a specific key is absent from `qt_settings`: QF falls back to the hardcoded
|
||||
default for that key only.
|
||||
leaves `local_qt_settings` empty. `GET /api/configurator-settings` then serves
|
||||
the Go-side defaults (`internal/handlers/component.go`, `default*()`) for every
|
||||
setting. No crash, no data loss.
|
||||
- If a specific key is absent from `qt_settings`: the same Go-side default is served
|
||||
for that key only.
|
||||
- The Go-side defaults are the **only** fallback and are not kept in step with the
|
||||
server — change tabs/categories in `qt_settings`, not in code. The configurator page
|
||||
has no JS copy: `TAB_CONFIG` (except "Other") and the tab buttons are built from the
|
||||
served `tab_config`; a config type with no `config_types` allowlist sees all categories.
|
||||
- Old QF clients that do not know about `local_qt_settings` continue to use their
|
||||
hardcoded JS constants unchanged.
|
||||
|
||||
|
||||
+24
-34
@@ -59,8 +59,11 @@ func main() {
|
||||
|
||||
configPath := flag.String("config", "", "path to config file (default: user state dir or QFS_CONFIG_PATH)")
|
||||
localDBPath := flag.String("localdb", "", "path to local SQLite database (default: user state dir or QFS_DB_PATH)")
|
||||
resetLocalDB := flag.Bool("reset-localdb", false, "reset local SQLite data on startup (keeps connection settings)")
|
||||
migrate := flag.Bool("migrate", false, "run database migrations")
|
||||
resetLocalDB := flag.Bool("reset-localdb", false, "reset local SQLite data after a verified safety backup (keeps connection settings)")
|
||||
forceResetLocalDB := flag.Bool("force-reset-localdb", false, "allow -reset-localdb to clear unsynced work after a verified backup")
|
||||
migrate := flag.Bool("migrate", false, "apply pending server (MariaDB) SQL migrations and exit")
|
||||
migrateStatus := flag.Bool("migrate-status", false, "list server SQL migrations with applied/pending state and exit")
|
||||
migrateBaseline := flag.String("migrate-baseline", "", "record server SQL migrations up to and including this file as applied, without running them, and exit")
|
||||
version := flag.Bool("version", false, "show version information")
|
||||
flag.Parse()
|
||||
|
||||
@@ -110,8 +113,11 @@ func main() {
|
||||
}
|
||||
}
|
||||
|
||||
if shouldResetLocalDB(*resetLocalDB) {
|
||||
if err := localdb.ResetData(resolvedLocalDBPath); err != nil {
|
||||
if os.Getenv("QFS_RESET_LOCAL_DB") != "" {
|
||||
slog.Warn("QFS_RESET_LOCAL_DB is ignored; use -reset-localdb explicitly")
|
||||
}
|
||||
if *resetLocalDB {
|
||||
if err := localdb.ResetDataWithOptions(resolvedLocalDBPath, resolvedConfigPath, *forceResetLocalDB); err != nil {
|
||||
slog.Error("failed to reset local database", "error", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
@@ -185,26 +191,25 @@ func main() {
|
||||
"online", false,
|
||||
)
|
||||
|
||||
if *migrate {
|
||||
mariaDB, err := connMgr.GetDB()
|
||||
if *migrate || *migrateStatus || *migrateBaseline != "" {
|
||||
mariaDB, err := openMigrationDB(local)
|
||||
if err != nil {
|
||||
slog.Error("cannot run migrations: database not available", "error", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
if mariaDB == nil {
|
||||
slog.Error("cannot run migrations: database not available")
|
||||
switch {
|
||||
case *migrateStatus:
|
||||
err = runMigrateStatus(mariaDB)
|
||||
case *migrateBaseline != "":
|
||||
err = runMigrateBaseline(mariaDB, *migrateBaseline)
|
||||
default:
|
||||
err = runMigrateApply(mariaDB)
|
||||
}
|
||||
if err != nil {
|
||||
slog.Error("migration command failed", "error", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
slog.Info("running database migrations...")
|
||||
if err := models.Migrate(mariaDB); err != nil {
|
||||
slog.Error("migration failed", "error", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
if err := models.SeedCategories(mariaDB); err != nil {
|
||||
slog.Error("seeding categories failed", "error", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
slog.Info("migrations completed")
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
gin.SetMode(cfg.Server.Mode)
|
||||
@@ -303,22 +308,6 @@ func showStartupConsoleWarning() {
|
||||
fmt.Printf("\033]0;%s\007", startupConsoleWarning)
|
||||
}
|
||||
|
||||
func shouldResetLocalDB(flagValue bool) bool {
|
||||
if flagValue {
|
||||
return true
|
||||
}
|
||||
value := strings.TrimSpace(os.Getenv("QFS_RESET_LOCAL_DB"))
|
||||
if value == "" {
|
||||
return false
|
||||
}
|
||||
switch strings.ToLower(value) {
|
||||
case "1", "true", "yes", "y":
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func derefString(value *string) string {
|
||||
if value == nil {
|
||||
return ""
|
||||
@@ -564,6 +553,7 @@ func runSetupMode(local *localdb.LocalDB) {
|
||||
gin.SetMode(gin.ReleaseMode)
|
||||
router := gin.New()
|
||||
router.Use(gin.Recovery())
|
||||
router.Use(middleware.CORS())
|
||||
|
||||
if staticFS, err := qfassets.StaticFS(); err == nil {
|
||||
router.StaticFS("/static", http.FS(staticFS))
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"time"
|
||||
|
||||
qfassets "git.mchus.pro/mchus/quoteforge"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
||||
mysqlDriver "github.com/go-sql-driver/mysql"
|
||||
"gorm.io/driver/mysql"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
)
|
||||
|
||||
// Server (MariaDB) migration commands. Each runs only the embedded migrations/*.sql
|
||||
// files tracked in qt_schema_migrations — never GORM AutoMigrate, which can silently
|
||||
// retype production columns to match whatever models the running binary was built with.
|
||||
// See bible-local/03-database.md "Migrations".
|
||||
|
||||
// openMigrationDB opens a dedicated MariaDB connection for migrations. The app's shared
|
||||
// connection (localdb.GetDSN) has 3s read/write timeouts for offline-first sync; a
|
||||
// backfill UPDATE over qt_pricelist_items needs minutes, and a client-side timeout
|
||||
// mid-statement leaves the file half-applied and unrecorded.
|
||||
func openMigrationDB(local *localdb.LocalDB) (*gorm.DB, error) {
|
||||
dsn, err := local.GetDSN()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("server connection settings: %w", err)
|
||||
}
|
||||
cfg, err := mysqlDriver.ParseDSN(dsn)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("parse DSN: %w", err)
|
||||
}
|
||||
cfg.Timeout = 10 * time.Second
|
||||
cfg.ReadTimeout = 0
|
||||
cfg.WriteTimeout = 0
|
||||
db, err := gorm.Open(mysql.Open(cfg.FormatDSN()), &gorm.Config{Logger: logger.Default.LogMode(logger.Silent)})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("connect to server: %w", err)
|
||||
}
|
||||
return db, nil
|
||||
}
|
||||
|
||||
// runMigrateStatus prints every server migration and whether it is applied.
|
||||
func runMigrateStatus(db *gorm.DB) error {
|
||||
migrations, err := qfassets.MigrationsFS()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
states, err := models.SQLMigrationStatus(db, migrations)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
pending := 0
|
||||
for _, st := range states {
|
||||
if st.AppliedAt != nil {
|
||||
fmt.Printf(" applied %s (%s)\n", st.Filename, st.AppliedAt.Format("2006-01-02 15:04"))
|
||||
} else {
|
||||
fmt.Printf(" PENDING %s\n", st.Filename)
|
||||
pending++
|
||||
}
|
||||
}
|
||||
fmt.Printf("%d migrations, %d pending\n", len(states), pending)
|
||||
return nil
|
||||
}
|
||||
|
||||
// runMigrateApply applies pending server migrations. Refuses on a server with no
|
||||
// migration history at all: its schema was built by other means, so every file would be
|
||||
// re-run — record a baseline with -migrate-baseline first.
|
||||
func runMigrateApply(db *gorm.DB) error {
|
||||
migrations, err := qfassets.MigrationsFS()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := requireMigrationHistory(db, migrations); err != nil {
|
||||
return err
|
||||
}
|
||||
applied, err := models.RunSQLMigrations(db, migrations, func(filename string) {
|
||||
fmt.Printf(" applying %s ...\n", filename)
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if len(applied) == 0 {
|
||||
fmt.Println("server schema is up to date — nothing to apply")
|
||||
return nil
|
||||
}
|
||||
fmt.Printf("applied %d migration(s)\n", len(applied))
|
||||
return nil
|
||||
}
|
||||
|
||||
// runMigrateBaseline records migrations up to and including upto as applied without
|
||||
// running them.
|
||||
func runMigrateBaseline(db *gorm.DB, upto string) error {
|
||||
migrations, err := qfassets.MigrationsFS()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
recorded, err := models.BaselineSQLMigrations(db, migrations, upto)
|
||||
for _, f := range recorded {
|
||||
fmt.Printf(" recorded %s (not executed)\n", f)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Printf("baseline: %d migration(s) recorded as applied, up to %s\n", len(recorded), upto)
|
||||
return nil
|
||||
}
|
||||
|
||||
func requireMigrationHistory(db *gorm.DB, migrations fs.FS) error {
|
||||
states, err := models.SQLMigrationStatus(db, migrations)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, st := range states {
|
||||
if st.AppliedAt != nil {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
return fmt.Errorf("qt_schema_migrations has no applied migrations, so all %d files would run against this server. "+
|
||||
"Record what the server already has first: qfs -migrate-baseline <last-applied-file.sql> (make migrate-baseline UPTO=...)", len(states))
|
||||
}
|
||||
@@ -45,7 +45,7 @@ func TestConfigurationVersioningAPI(t *testing.T) {
|
||||
}
|
||||
|
||||
// list versions happy path
|
||||
listReq := httptest.NewRequest(http.MethodGet, "/api/configs/"+created.UUID+"/versions?limit=10&offset=0", nil)
|
||||
listReq := httptest.NewRequest(http.MethodGet, "http://127.0.0.1:8080/api/configs/"+created.UUID+"/versions?limit=10&offset=0", nil)
|
||||
listRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(listRec, listReq)
|
||||
if listRec.Code != http.StatusOK {
|
||||
@@ -53,7 +53,7 @@ func TestConfigurationVersioningAPI(t *testing.T) {
|
||||
}
|
||||
|
||||
// get version happy path
|
||||
getReq := httptest.NewRequest(http.MethodGet, "/api/configs/"+created.UUID+"/versions/1", nil)
|
||||
getReq := httptest.NewRequest(http.MethodGet, "http://127.0.0.1:8080/api/configs/"+created.UUID+"/versions/1", nil)
|
||||
getRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(getRec, getReq)
|
||||
if getRec.Code != http.StatusOK {
|
||||
@@ -62,7 +62,7 @@ func TestConfigurationVersioningAPI(t *testing.T) {
|
||||
|
||||
// rollback happy path
|
||||
body := []byte(`{"target_version":1,"note":"api rollback"}`)
|
||||
rbReq := httptest.NewRequest(http.MethodPost, "/api/configs/"+created.UUID+"/rollback", bytes.NewReader(body))
|
||||
rbReq := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/configs/"+created.UUID+"/rollback", bytes.NewReader(body))
|
||||
rbReq.Header.Set("Content-Type", "application/json")
|
||||
rbRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(rbRec, rbReq)
|
||||
@@ -84,7 +84,7 @@ func TestConfigurationVersioningAPI(t *testing.T) {
|
||||
}
|
||||
|
||||
// 404: version missing
|
||||
notFoundReq := httptest.NewRequest(http.MethodGet, "/api/configs/"+created.UUID+"/versions/999", nil)
|
||||
notFoundReq := httptest.NewRequest(http.MethodGet, "http://127.0.0.1:8080/api/configs/"+created.UUID+"/versions/999", nil)
|
||||
notFoundRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(notFoundRec, notFoundReq)
|
||||
if notFoundRec.Code != http.StatusNotFound {
|
||||
@@ -92,7 +92,7 @@ func TestConfigurationVersioningAPI(t *testing.T) {
|
||||
}
|
||||
|
||||
// 400: invalid version number
|
||||
invalidReq := httptest.NewRequest(http.MethodGet, "/api/configs/"+created.UUID+"/versions/abc", nil)
|
||||
invalidReq := httptest.NewRequest(http.MethodGet, "http://127.0.0.1:8080/api/configs/"+created.UUID+"/versions/abc", nil)
|
||||
invalidRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(invalidRec, invalidReq)
|
||||
if invalidRec.Code != http.StatusBadRequest {
|
||||
@@ -100,7 +100,7 @@ func TestConfigurationVersioningAPI(t *testing.T) {
|
||||
}
|
||||
|
||||
// 400: rollback invalid target_version
|
||||
badRollbackReq := httptest.NewRequest(http.MethodPost, "/api/configs/"+created.UUID+"/rollback", bytes.NewReader([]byte(`{"target_version":0}`)))
|
||||
badRollbackReq := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/configs/"+created.UUID+"/rollback", bytes.NewReader([]byte(`{"target_version":0}`)))
|
||||
badRollbackReq.Header.Set("Content-Type", "application/json")
|
||||
badRollbackRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(badRollbackRec, badRollbackReq)
|
||||
@@ -109,28 +109,28 @@ func TestConfigurationVersioningAPI(t *testing.T) {
|
||||
}
|
||||
|
||||
// archive + reactivate flow
|
||||
delReq := httptest.NewRequest(http.MethodDelete, "/api/configs/"+created.UUID, nil)
|
||||
delReq := httptest.NewRequest(http.MethodDelete, "http://127.0.0.1:8080/api/configs/"+created.UUID, nil)
|
||||
delRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(delRec, delReq)
|
||||
if delRec.Code != http.StatusOK {
|
||||
t.Fatalf("archive status=%d body=%s", delRec.Code, delRec.Body.String())
|
||||
}
|
||||
|
||||
archivedListReq := httptest.NewRequest(http.MethodGet, "/api/configs?status=archived&page=1&per_page=20", nil)
|
||||
archivedListReq := httptest.NewRequest(http.MethodGet, "http://127.0.0.1:8080/api/configs?status=archived&page=1&per_page=20", nil)
|
||||
archivedListRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(archivedListRec, archivedListReq)
|
||||
if archivedListRec.Code != http.StatusOK {
|
||||
t.Fatalf("archived list status=%d body=%s", archivedListRec.Code, archivedListRec.Body.String())
|
||||
}
|
||||
|
||||
reactivateReq := httptest.NewRequest(http.MethodPost, "/api/configs/"+created.UUID+"/reactivate", nil)
|
||||
reactivateReq := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/configs/"+created.UUID+"/reactivate", nil)
|
||||
reactivateRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(reactivateRec, reactivateReq)
|
||||
if reactivateRec.Code != http.StatusOK {
|
||||
t.Fatalf("reactivate status=%d body=%s", reactivateRec.Code, reactivateRec.Body.String())
|
||||
}
|
||||
|
||||
activeListReq := httptest.NewRequest(http.MethodGet, "/api/configs?status=active&page=1&per_page=20", nil)
|
||||
activeListReq := httptest.NewRequest(http.MethodGet, "http://127.0.0.1:8080/api/configs?status=active&page=1&per_page=20", nil)
|
||||
activeListRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(activeListRec, activeListReq)
|
||||
if activeListRec.Code != http.StatusOK {
|
||||
@@ -151,7 +151,7 @@ func TestProjectArchiveHidesConfigsAndCloneIntoProject(t *testing.T) {
|
||||
t.Fatalf("setup router: %v", err)
|
||||
}
|
||||
|
||||
createProjectReq := httptest.NewRequest(http.MethodPost, "/api/projects", bytes.NewReader([]byte(`{"name":"P1","code":"P1"}`)))
|
||||
createProjectReq := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/projects", bytes.NewReader([]byte(`{"name":"P1","code":"P1"}`)))
|
||||
createProjectReq.Header.Set("Content-Type", "application/json")
|
||||
createProjectRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(createProjectRec, createProjectReq)
|
||||
@@ -164,7 +164,7 @@ func TestProjectArchiveHidesConfigsAndCloneIntoProject(t *testing.T) {
|
||||
}
|
||||
|
||||
createCfgBody := []byte(`{"name":"Cfg A","items":[{"lot_name":"CPU","quantity":1,"unit_price":100}],"server_count":1}`)
|
||||
createCfgReq := httptest.NewRequest(http.MethodPost, "/api/projects/"+project.UUID+"/configs", bytes.NewReader(createCfgBody))
|
||||
createCfgReq := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/projects/"+project.UUID+"/configs", bytes.NewReader(createCfgBody))
|
||||
createCfgReq.Header.Set("Content-Type", "application/json")
|
||||
createCfgRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(createCfgRec, createCfgReq)
|
||||
@@ -179,7 +179,7 @@ func TestProjectArchiveHidesConfigsAndCloneIntoProject(t *testing.T) {
|
||||
t.Fatalf("expected config project_uuid=%s got=%v", project.UUID, createdCfg.ProjectUUID)
|
||||
}
|
||||
|
||||
cloneReq := httptest.NewRequest(http.MethodPost, "/api/projects/"+project.UUID+"/configs/"+createdCfg.UUID+"/clone", bytes.NewReader([]byte(`{"name":"Cfg A Clone"}`)))
|
||||
cloneReq := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/projects/"+project.UUID+"/configs/"+createdCfg.UUID+"/clone", bytes.NewReader([]byte(`{"name":"Cfg A Clone"}`)))
|
||||
cloneReq.Header.Set("Content-Type", "application/json")
|
||||
cloneRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(cloneRec, cloneReq)
|
||||
@@ -194,7 +194,7 @@ func TestProjectArchiveHidesConfigsAndCloneIntoProject(t *testing.T) {
|
||||
t.Fatalf("expected clone project_uuid=%s got=%v", project.UUID, cloneCfg.ProjectUUID)
|
||||
}
|
||||
|
||||
projectConfigsReq := httptest.NewRequest(http.MethodGet, "/api/projects/"+project.UUID+"/configs", nil)
|
||||
projectConfigsReq := httptest.NewRequest(http.MethodGet, "http://127.0.0.1:8080/api/projects/"+project.UUID+"/configs", nil)
|
||||
projectConfigsRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(projectConfigsRec, projectConfigsReq)
|
||||
if projectConfigsRec.Code != http.StatusOK {
|
||||
@@ -210,14 +210,14 @@ func TestProjectArchiveHidesConfigsAndCloneIntoProject(t *testing.T) {
|
||||
t.Fatalf("expected 2 project configs after clone, got %d", len(projectConfigsResp.Configurations))
|
||||
}
|
||||
|
||||
archiveReq := httptest.NewRequest(http.MethodPost, "/api/projects/"+project.UUID+"/archive", nil)
|
||||
archiveReq := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/projects/"+project.UUID+"/archive", nil)
|
||||
archiveRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(archiveRec, archiveReq)
|
||||
if archiveRec.Code != http.StatusOK {
|
||||
t.Fatalf("archive project status=%d body=%s", archiveRec.Code, archiveRec.Body.String())
|
||||
}
|
||||
|
||||
activeReq := httptest.NewRequest(http.MethodGet, "/api/configs?status=active&page=1&per_page=20", nil)
|
||||
activeReq := httptest.NewRequest(http.MethodGet, "http://127.0.0.1:8080/api/configs?status=active&page=1&per_page=20", nil)
|
||||
activeRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(activeRec, activeReq)
|
||||
if activeRec.Code != http.StatusOK {
|
||||
@@ -245,7 +245,7 @@ func TestConfigMoveToProjectEndpoint(t *testing.T) {
|
||||
t.Fatalf("setup router: %v", err)
|
||||
}
|
||||
|
||||
createProjectReq := httptest.NewRequest(http.MethodPost, "/api/projects", bytes.NewReader([]byte(`{"name":"Move Project","code":"MOVE"}`)))
|
||||
createProjectReq := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/projects", bytes.NewReader([]byte(`{"name":"Move Project","code":"MOVE"}`)))
|
||||
createProjectReq.Header.Set("Content-Type", "application/json")
|
||||
createProjectRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(createProjectRec, createProjectReq)
|
||||
@@ -257,7 +257,7 @@ func TestConfigMoveToProjectEndpoint(t *testing.T) {
|
||||
t.Fatalf("unmarshal project: %v", err)
|
||||
}
|
||||
|
||||
createConfigReq := httptest.NewRequest(http.MethodPost, "/api/configs", bytes.NewReader([]byte(`{"name":"Move Me","items":[],"notes":"","server_count":1}`)))
|
||||
createConfigReq := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/configs", bytes.NewReader([]byte(`{"name":"Move Me","items":[],"notes":"","server_count":1}`)))
|
||||
createConfigReq.Header.Set("Content-Type", "application/json")
|
||||
createConfigRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(createConfigRec, createConfigReq)
|
||||
@@ -269,7 +269,7 @@ func TestConfigMoveToProjectEndpoint(t *testing.T) {
|
||||
t.Fatalf("unmarshal config: %v", err)
|
||||
}
|
||||
|
||||
moveReq := httptest.NewRequest(http.MethodPatch, "/api/configs/"+created.UUID+"/project", bytes.NewReader([]byte(`{"project_uuid":"`+project.UUID+`"}`)))
|
||||
moveReq := httptest.NewRequest(http.MethodPatch, "http://127.0.0.1:8080/api/configs/"+created.UUID+"/project", bytes.NewReader([]byte(`{"project_uuid":"`+project.UUID+`"}`)))
|
||||
moveReq.Header.Set("Content-Type", "application/json")
|
||||
moveRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(moveRec, moveReq)
|
||||
@@ -277,7 +277,7 @@ func TestConfigMoveToProjectEndpoint(t *testing.T) {
|
||||
t.Fatalf("move config status=%d body=%s", moveRec.Code, moveRec.Body.String())
|
||||
}
|
||||
|
||||
getReq := httptest.NewRequest(http.MethodGet, "/api/configs/"+created.UUID, nil)
|
||||
getReq := httptest.NewRequest(http.MethodGet, "http://127.0.0.1:8080/api/configs/"+created.UUID, nil)
|
||||
getRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(getRec, getReq)
|
||||
if getRec.Code != http.StatusOK {
|
||||
@@ -307,7 +307,7 @@ func TestVendorImportRejectsOversizedUpload(t *testing.T) {
|
||||
t.Fatalf("setup router: %v", err)
|
||||
}
|
||||
|
||||
createProjectReq := httptest.NewRequest(http.MethodPost, "/api/projects", bytes.NewReader([]byte(`{"name":"Import Project","code":"IMP"}`)))
|
||||
createProjectReq := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/projects", bytes.NewReader([]byte(`{"name":"Import Project","code":"IMP"}`)))
|
||||
createProjectReq.Header.Set("Content-Type", "application/json")
|
||||
createProjectRec := httptest.NewRecorder()
|
||||
router.ServeHTTP(createProjectRec, createProjectReq)
|
||||
@@ -334,7 +334,7 @@ func TestVendorImportRejectsOversizedUpload(t *testing.T) {
|
||||
t.Fatalf("close multipart writer: %v", err)
|
||||
}
|
||||
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/projects/"+project.UUID+"/vendor-import", &body)
|
||||
req := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/projects/"+project.UUID+"/vendor-import", &body)
|
||||
req.Header.Set("Content-Type", writer.FormDataContentType())
|
||||
rec := httptest.NewRecorder()
|
||||
router.ServeHTTP(rec, req)
|
||||
@@ -358,7 +358,7 @@ func TestCreateConfigMalformedJSONReturnsGenericError(t *testing.T) {
|
||||
t.Fatalf("setup router: %v", err)
|
||||
}
|
||||
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/configs", bytes.NewReader([]byte(`{"name":`)))
|
||||
req := httptest.NewRequest(http.MethodPost, "http://127.0.0.1:8080/api/configs", bytes.NewReader([]byte(`{"name":`)))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
rec := httptest.NewRecorder()
|
||||
router.ServeHTTP(rec, req)
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
module git.mchus.pro/mchus/quoteforge
|
||||
|
||||
go 1.24.0
|
||||
go 1.27.3
|
||||
|
||||
require (
|
||||
github.com/gin-gonic/gin v1.9.1
|
||||
github.com/gin-gonic/gin v1.12.0
|
||||
github.com/glebarez/sqlite v1.11.0
|
||||
github.com/go-sql-driver/mysql v1.7.1
|
||||
github.com/go-sql-driver/mysql v1.10.1
|
||||
github.com/google/uuid v1.6.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
gorm.io/driver/mysql v1.5.2
|
||||
@@ -13,35 +13,41 @@ require (
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/bytedance/sonic v1.9.1 // indirect
|
||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
|
||||
filippo.io/edwards25519 v1.2.0 // indirect
|
||||
github.com/bytedance/gopkg v0.1.3 // indirect
|
||||
github.com/bytedance/sonic v1.15.0 // indirect
|
||||
github.com/bytedance/sonic/loader v0.5.0 // indirect
|
||||
github.com/cloudwego/base64x v0.1.6 // indirect
|
||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
|
||||
github.com/gin-contrib/sse v0.1.0 // indirect
|
||||
github.com/gabriel-vasile/mimetype v1.4.12 // indirect
|
||||
github.com/gin-contrib/sse v1.1.0 // indirect
|
||||
github.com/glebarez/go-sqlite v1.21.2 // indirect
|
||||
github.com/go-playground/locales v0.14.1 // indirect
|
||||
github.com/go-playground/universal-translator v0.18.1 // indirect
|
||||
github.com/go-playground/validator/v10 v10.14.0 // indirect
|
||||
github.com/goccy/go-json v0.10.2 // indirect
|
||||
github.com/go-playground/validator/v10 v10.30.1 // indirect
|
||||
github.com/goccy/go-json v0.10.5 // indirect
|
||||
github.com/goccy/go-yaml v1.19.2 // indirect
|
||||
github.com/jinzhu/inflection v1.0.0 // indirect
|
||||
github.com/jinzhu/now v1.1.5 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
|
||||
github.com/leodido/go-urn v1.2.4 // indirect
|
||||
github.com/mattn/go-isatty v0.0.19 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
|
||||
github.com/leodido/go-urn v1.4.0 // indirect
|
||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
|
||||
github.com/quic-go/qpack v0.6.0 // indirect
|
||||
github.com/quic-go/quic-go v0.59.1 // indirect
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||
github.com/stretchr/testify v1.11.1 // indirect
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
||||
github.com/ugorji/go/codec v1.2.11 // indirect
|
||||
golang.org/x/arch v0.3.0 // indirect
|
||||
golang.org/x/crypto v0.43.0 // indirect
|
||||
golang.org/x/net v0.46.0 // indirect
|
||||
golang.org/x/sys v0.37.0 // indirect
|
||||
golang.org/x/text v0.30.0 // indirect
|
||||
google.golang.org/protobuf v1.30.0 // indirect
|
||||
github.com/ugorji/go/codec v1.3.1 // indirect
|
||||
go.mongodb.org/mongo-driver/v2 v2.5.0 // indirect
|
||||
golang.org/x/arch v0.22.0 // indirect
|
||||
golang.org/x/crypto v0.58.0 // indirect
|
||||
golang.org/x/net v0.61.0 // indirect
|
||||
golang.org/x/sys v0.49.0 // indirect
|
||||
golang.org/x/text v0.43.0 // indirect
|
||||
google.golang.org/protobuf v1.36.10 // indirect
|
||||
modernc.org/libc v1.22.5 // indirect
|
||||
modernc.org/mathutil v1.5.0 // indirect
|
||||
modernc.org/memory v1.5.0 // indirect
|
||||
|
||||
@@ -1,20 +1,24 @@
|
||||
github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
|
||||
github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
|
||||
github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
|
||||
github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
|
||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
|
||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
|
||||
filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
|
||||
filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
|
||||
github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=
|
||||
github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
|
||||
github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE=
|
||||
github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k=
|
||||
github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE=
|
||||
github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo=
|
||||
github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
|
||||
github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||
github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
|
||||
github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
|
||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
|
||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
|
||||
github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
|
||||
github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
|
||||
github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
|
||||
github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
|
||||
github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
|
||||
github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
|
||||
github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8=
|
||||
github.com/gin-gonic/gin v1.12.0/go.mod h1:VxccKfsSllpKshkBWgVgRniFFAzFb9csfngsqANjnLc=
|
||||
github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
|
||||
github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
|
||||
github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
|
||||
@@ -25,16 +29,17 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
|
||||
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
|
||||
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
|
||||
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
||||
github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
|
||||
github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
|
||||
github.com/go-playground/validator/v10 v10.30.1 h1:f3zDSN/zOma+w6+1Wswgd9fLkdwy06ntQJp0BBvFG0w=
|
||||
github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM=
|
||||
github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
|
||||
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
|
||||
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
|
||||
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
||||
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
|
||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/go-sql-driver/mysql v1.10.1 h1:arlSnNLq6a5yxGxV7qg9lF4j0C+KwD6NbQyKr9QL6ME=
|
||||
github.com/go-sql-driver/mysql v1.10.1/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk=
|
||||
github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
|
||||
github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
||||
github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
|
||||
github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
|
||||
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
|
||||
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
|
||||
@@ -46,62 +51,69 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
|
||||
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
|
||||
github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
|
||||
github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
|
||||
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
|
||||
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
|
||||
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
||||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
|
||||
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
|
||||
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
|
||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
||||
github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
|
||||
github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
|
||||
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
|
||||
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
|
||||
github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
|
||||
github.com/quic-go/quic-go v0.59.1 h1:0Gmua0HW1Tv7ANR7hUYwRyD0MG5OJfgvYSZasGZzBic=
|
||||
github.com/quic-go/quic-go v0.59.1/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
|
||||
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
|
||||
github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
|
||||
github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
|
||||
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
||||
golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
|
||||
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
||||
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
|
||||
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
|
||||
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
|
||||
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
|
||||
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY=
|
||||
github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
|
||||
go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE=
|
||||
go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0=
|
||||
go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
|
||||
go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
|
||||
golang.org/x/arch v0.22.0 h1:c/Zle32i5ttqRXjdLyyHZESLD/bB90DCU1g9l/0YBDI=
|
||||
golang.org/x/arch v0.22.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A=
|
||||
golang.org/x/crypto v0.58.0 h1:COkYLr4k7nDI4r6QtMML2AfzeIswWHAJthLS6K/M/54=
|
||||
golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w=
|
||||
golang.org/x/net v0.61.0 h1:RR+6j/BTBCrggOLugxa+66R8FvoN6MHlzDlZIbN9YFw=
|
||||
golang.org/x/net v0.61.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
|
||||
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
|
||||
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
|
||||
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA=
|
||||
golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
|
||||
golang.org/x/text v0.43.0 h1:1QivrlhwAsnMOcqgOdl9my7s9OyZl8O5/UGUTJVXoWc=
|
||||
golang.org/x/text v0.43.0/go.mod h1:hbSIYA/amXcRXTFSZqh8tWHEoqRvvbKPJ2uz/KU+a+s=
|
||||
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
|
||||
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
@@ -118,4 +130,3 @@ modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
|
||||
modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
|
||||
modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
|
||||
modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
|
||||
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
|
||||
@@ -273,7 +273,10 @@ func createBackupArchive(destPath, dbPath, configPath string) error {
|
||||
}
|
||||
|
||||
if strings.TrimSpace(configPath) != "" {
|
||||
_ = addZipOptionalFile(zipWriter, configPath)
|
||||
if err := addZipOptionalFile(zipWriter, configPath); err != nil {
|
||||
_ = zipWriter.Close()
|
||||
return fmt.Errorf("archive config: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
if err := zipWriter.Close(); err != nil {
|
||||
@@ -355,7 +358,10 @@ func isSQLiteBusyError(err error) bool {
|
||||
|
||||
func addZipOptionalFile(writer *zip.Writer, path string) error {
|
||||
if _, err := os.Stat(path); err != nil {
|
||||
return nil
|
||||
if os.IsNotExist(err) {
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("stat optional backup file: %w", err)
|
||||
}
|
||||
return addZipFile(writer, path)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
package appstate
|
||||
|
||||
import (
|
||||
"archive/zip"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"time"
|
||||
|
||||
"github.com/glebarez/sqlite"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
)
|
||||
|
||||
// CreatePreResetBackup is mandatory and independent of recurring backup settings.
|
||||
func CreatePreResetBackup(dbPath, configPath string) (string, error) {
|
||||
root := filepath.Join(resolveBackupRoot(dbPath), "pre-reset")
|
||||
if err := validateBackupRoot(root); err != nil {
|
||||
return "", err
|
||||
}
|
||||
if err := os.MkdirAll(root, 0700); err != nil {
|
||||
return "", fmt.Errorf("create pre-reset backup directory: %w", err)
|
||||
}
|
||||
resolved, err := filepath.EvalSymlinks(root)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("resolve pre-reset backup directory: %w", err)
|
||||
}
|
||||
if err := validateBackupRoot(resolved); err != nil {
|
||||
return "", err
|
||||
}
|
||||
file, err := os.CreateTemp(resolved, "qfs-pre-reset-v1-"+time.Now().UTC().Format("20060102T150405Z")+"-*.zip")
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("reserve pre-reset backup: %w", err)
|
||||
}
|
||||
path := file.Name()
|
||||
if err := file.Close(); err != nil {
|
||||
return "", fmt.Errorf("close pre-reset backup: %w", err)
|
||||
}
|
||||
if err := createBackupArchive(path, dbPath, configPath); err != nil {
|
||||
return "", fmt.Errorf("write pre-reset archive: %w", err)
|
||||
}
|
||||
if err := verifyResetArchive(path, filepath.Base(dbPath)); err != nil {
|
||||
return "", fmt.Errorf("verify pre-reset archive: %w", err)
|
||||
}
|
||||
return path, nil
|
||||
}
|
||||
|
||||
func verifyResetArchive(path, dbName string) error {
|
||||
archive, err := zip.OpenReader(path)
|
||||
if err != nil {
|
||||
return fmt.Errorf("open archive: %w", err)
|
||||
}
|
||||
defer archive.Close()
|
||||
dir, err := os.MkdirTemp("", "qfs-verify-reset-*")
|
||||
if err != nil {
|
||||
return fmt.Errorf("create verification directory: %w", err)
|
||||
}
|
||||
defer os.RemoveAll(dir)
|
||||
found := false
|
||||
for _, entry := range archive.File {
|
||||
in, err := entry.Open()
|
||||
if err != nil {
|
||||
return fmt.Errorf("open archive entry: %w", err)
|
||||
}
|
||||
var out io.Writer = io.Discard
|
||||
var restored *os.File
|
||||
if entry.Name == dbName {
|
||||
restored, err = os.OpenFile(filepath.Join(dir, "verify.db"), os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0600)
|
||||
if err != nil {
|
||||
in.Close()
|
||||
return fmt.Errorf("create verification database: %w", err)
|
||||
}
|
||||
out = restored
|
||||
found = true
|
||||
}
|
||||
_, copyErr := io.Copy(out, in)
|
||||
closeErr := in.Close()
|
||||
if restored != nil {
|
||||
if err := restored.Close(); err != nil {
|
||||
return fmt.Errorf("close verification database: %w", err)
|
||||
}
|
||||
}
|
||||
if copyErr != nil {
|
||||
return fmt.Errorf("read archive entry: %w", copyErr)
|
||||
}
|
||||
if closeErr != nil {
|
||||
return fmt.Errorf("close archive entry: %w", closeErr)
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
return fmt.Errorf("archive has no database snapshot")
|
||||
}
|
||||
db, err := gorm.Open(sqlite.Open(filepath.Join(dir, "verify.db")), &gorm.Config{Logger: logger.Default.LogMode(logger.Silent)})
|
||||
if err != nil {
|
||||
return fmt.Errorf("open restored snapshot: %w", err)
|
||||
}
|
||||
sqlDB, err := db.DB()
|
||||
if err != nil {
|
||||
return fmt.Errorf("get restored database: %w", err)
|
||||
}
|
||||
defer sqlDB.Close()
|
||||
var result string
|
||||
if err := db.Raw("PRAGMA integrity_check").Scan(&result).Error; err != nil {
|
||||
return fmt.Errorf("check restored snapshot: %w", err)
|
||||
}
|
||||
if result != "ok" {
|
||||
return fmt.Errorf("snapshot integrity check failed: %s", result)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
// Package configfeatures holds the per-configuration feature flags: markers recording
|
||||
// which data features a configuration uses, so a client that does not know one of them
|
||||
// refuses to rewrite the configuration instead of silently dropping data it cannot see.
|
||||
//
|
||||
// Flags are derived from content on every save (Detect) and synced as
|
||||
// qt_configurations.feature_flags. A client checks a config's stored flags against the
|
||||
// set it knows (Known) before any write. See
|
||||
// bible-local/decisions/2026-09-24-configuration-feature-flags.md.
|
||||
package configfeatures
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"sort"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// SaleRowMarkups: Notes.pricing_ui.sale_row_markups has at least one row markup.
|
||||
const SaleRowMarkups = "sale_row_markups"
|
||||
|
||||
// known lists every flag this build understands. Adding a flag here is the contract for
|
||||
// "this client can round-trip the data behind it"; a new data feature that an older
|
||||
// client would lose on save must add a flag here and to Detect in the same change.
|
||||
var known = map[string]struct{}{
|
||||
SaleRowMarkups: {},
|
||||
}
|
||||
|
||||
// Known reports whether this build understands flag.
|
||||
func Known(flag string) bool {
|
||||
_, ok := known[flag]
|
||||
return ok
|
||||
}
|
||||
|
||||
// Unknown returns the flags this build does not understand, sorted and de-duplicated.
|
||||
func Unknown(flags []string) []string {
|
||||
seen := make(map[string]struct{}, len(flags))
|
||||
var out []string
|
||||
for _, f := range flags {
|
||||
f = strings.TrimSpace(f)
|
||||
if f == "" || Known(f) {
|
||||
continue
|
||||
}
|
||||
if _, dup := seen[f]; dup {
|
||||
continue
|
||||
}
|
||||
seen[f] = struct{}{}
|
||||
out = append(out, f)
|
||||
}
|
||||
sort.Strings(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// Detect derives the flags a configuration's content requires. Sorted; nil when none.
|
||||
func Detect(notes string) []string {
|
||||
var flags []string
|
||||
if notesHaveSaleRowMarkups(notes) {
|
||||
flags = append(flags, SaleRowMarkups)
|
||||
}
|
||||
sort.Strings(flags)
|
||||
return flags
|
||||
}
|
||||
|
||||
func notesHaveSaleRowMarkups(notes string) bool {
|
||||
if strings.TrimSpace(notes) == "" {
|
||||
return false
|
||||
}
|
||||
var parsed struct {
|
||||
PricingUI struct {
|
||||
SaleRowMarkups map[string]float64 `json:"sale_row_markups"`
|
||||
} `json:"pricing_ui"`
|
||||
}
|
||||
if err := json.Unmarshal([]byte(notes), &parsed); err != nil {
|
||||
return false
|
||||
}
|
||||
for _, pct := range parsed.PricingUI.SaleRowMarkups {
|
||||
if pct != 0 {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// UnsupportedError is returned when a write is refused because the configuration
|
||||
// carries flags this build does not know.
|
||||
type UnsupportedError struct {
|
||||
Flags []string
|
||||
}
|
||||
|
||||
func (e *UnsupportedError) Error() string {
|
||||
return fmt.Sprintf(
|
||||
"конфигурация использует функции, неизвестные этой версии QuoteForge (%s) — обновите приложение, чтобы её изменять",
|
||||
strings.Join(e.Flags, ", "))
|
||||
}
|
||||
|
||||
// Check returns an *UnsupportedError when any of flags is unknown to this build.
|
||||
func Check(flags []string) error {
|
||||
if unknown := Unknown(flags); len(unknown) > 0 {
|
||||
return &UnsupportedError{Flags: unknown}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// AsUnsupported unwraps err to an *UnsupportedError, if it is one.
|
||||
func AsUnsupported(err error) (*UnsupportedError, bool) {
|
||||
var ue *UnsupportedError
|
||||
if errors.As(err, &ue) {
|
||||
return ue, true
|
||||
}
|
||||
return nil, false
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package configfeatures
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
"regexp"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestDetectSaleRowMarkups(t *testing.T) {
|
||||
cases := []struct {
|
||||
notes string
|
||||
want []string
|
||||
}{
|
||||
{"", nil},
|
||||
{"not json", nil},
|
||||
{`{"pricing_ui":{"sale_uplift":1.5,"sale_row_markups":null}}`, nil},
|
||||
{`{"pricing_ui":{"sale_row_markups":{"NONE::A":0}}}`, nil},
|
||||
{`{"pricing_ui":{"sale_row_markups":{"NONE::A":-50}}}`, []string{SaleRowMarkups}},
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := Detect(c.notes); !reflect.DeepEqual(got, c.want) {
|
||||
t.Errorf("Detect(%q) = %v, want %v", c.notes, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestUnknownAndCheck(t *testing.T) {
|
||||
got := Unknown([]string{"zeta", SaleRowMarkups, "alpha", "zeta", " "})
|
||||
if want := []string{"alpha", "zeta"}; !reflect.DeepEqual(got, want) {
|
||||
t.Fatalf("Unknown = %v, want %v", got, want)
|
||||
}
|
||||
if err := Check([]string{SaleRowMarkups}); err != nil {
|
||||
t.Fatalf("Check(known) = %v", err)
|
||||
}
|
||||
ue, ok := AsUnsupported(Check([]string{"future_x"}))
|
||||
if !ok || !reflect.DeepEqual(ue.Flags, []string{"future_x"}) {
|
||||
t.Fatalf("Check(unknown) = %v, %v", ue, ok)
|
||||
}
|
||||
}
|
||||
|
||||
// Flag names are permanent and follow bible-local/02-architecture.md
|
||||
// "Configuration feature flags": lower_snake_case, starts with a letter, ≤ 64 chars.
|
||||
func TestKnownFlagNamesFormat(t *testing.T) {
|
||||
valid := regexp.MustCompile(`^[a-z][a-z0-9_]{0,63}$`)
|
||||
for flag := range known {
|
||||
if !valid.MatchString(flag) {
|
||||
t.Errorf("flag %q violates the naming format", flag)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -118,6 +118,11 @@ func (h *ComponentHandler) GetCategories(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, models.DefaultCategories)
|
||||
}
|
||||
|
||||
// GetConfiguratorSettings serves the synced qt_settings. The default*() values
|
||||
// below are the only client-side fallback, used per key when the local cache has
|
||||
// no such setting (e.g. before the first sync); they are not kept in step with
|
||||
// the server — edit qt_settings in MariaDB, not these. The configurator page has
|
||||
// no fallback of its own.
|
||||
func (h *ComponentHandler) GetConfiguratorSettings(c *gin.Context) {
|
||||
s, _ := h.localDB.GetConfiguratorSettings()
|
||||
if s == nil {
|
||||
@@ -131,7 +136,7 @@ func (h *ComponentHandler) GetConfiguratorSettings(c *gin.Context) {
|
||||
s.TabConfig = defaultTabConfig()
|
||||
}
|
||||
if len(s.AlwaysVisibleTabs) == 0 {
|
||||
s.AlwaysVisibleTabs = []string{"base", "storage", "pci"}
|
||||
s.AlwaysVisibleTabs = []string{"base"}
|
||||
}
|
||||
if len(s.RequiredCategories) == 0 {
|
||||
s.RequiredCategories = map[string][]string{"server": {"CPU", "MEM", "BB"}}
|
||||
@@ -158,19 +163,19 @@ func defaultSupportPricing() *localdb.SupportPricingTable {
|
||||
},
|
||||
HGXPrice: map[string]map[string]map[string]float64{
|
||||
"HGX-H200": {
|
||||
"B": {"1": 20000, "3": 55000, "5": 80000},
|
||||
"S": {"1": 28000, "3": 70000, "5": 100000},
|
||||
"P": {"1": 63000, "3": 105000},
|
||||
"B": {"1": 28000, "3": 77000, "5": 112000},
|
||||
"S": {"1": 39500, "3": 98000, "5": 140000},
|
||||
"P": {"1": 88500, "3": 147000},
|
||||
},
|
||||
"HGX-B200": {
|
||||
"B": {"1": 40000, "3": 100000, "5": 145000},
|
||||
"S": {"1": 55000, "3": 130000, "5": 185000},
|
||||
"P": {"1": 101000, "3": 176000},
|
||||
"B": {"1": 158500, "3": 230500, "5": 284500},
|
||||
"S": {"1": 176500, "3": 266500, "5": 332500},
|
||||
"P": {"1": 232000, "3": 322000},
|
||||
},
|
||||
"HGX-B300": {
|
||||
"B": {"1": 40000, "3": 100000, "5": 145000},
|
||||
"S": {"1": 55000, "3": 130000, "5": 185000},
|
||||
"P": {"1": 112000, "3": 187000},
|
||||
"B": {"1": 192000, "3": 270000, "5": 328500},
|
||||
"S": {"1": 211500, "3": 309000, "5": 380500},
|
||||
"P": {"1": 286000, "3": 383500},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/configfeatures"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
@@ -14,6 +15,16 @@ func RespondError(c *gin.Context, status int, fallback string, err error) {
|
||||
if err != nil {
|
||||
_ = c.Error(err)
|
||||
}
|
||||
// A write refused over unknown configuration feature flags is a 409 with the flag list,
|
||||
// whatever status the caller picked — every config write path funnels through here.
|
||||
if ue, ok := configfeatures.AsUnsupported(err); ok {
|
||||
c.JSON(http.StatusConflict, gin.H{
|
||||
"error": ue.Error(),
|
||||
"code": "unsupported_config_features",
|
||||
"unsupported_features": ue.Flags,
|
||||
})
|
||||
return
|
||||
}
|
||||
c.JSON(status, gin.H{"error": clientFacingErrorMessage(status, fallback, err)})
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,13 @@ package handlers
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/configfeatures"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func TestClientFacingErrorMessageKeepsDomain4xx(t *testing.T) {
|
||||
@@ -39,3 +45,26 @@ type errString string
|
||||
func (e errString) Error() string {
|
||||
return string(e)
|
||||
}
|
||||
|
||||
func TestRespondErrorUnsupportedFeaturesIs409(t *testing.T) {
|
||||
gin.SetMode(gin.TestMode)
|
||||
w := httptest.NewRecorder()
|
||||
c, _ := gin.CreateTestContext(w)
|
||||
|
||||
err := fmt.Errorf("wrapped: %w", configfeatures.Check([]string{"future_x"}))
|
||||
RespondError(c, http.StatusInternalServerError, "internal server error", err)
|
||||
|
||||
if w.Code != http.StatusConflict {
|
||||
t.Fatalf("status = %d, want 409", w.Code)
|
||||
}
|
||||
var body struct {
|
||||
Code string `json:"code"`
|
||||
Features []string `json:"unsupported_features"`
|
||||
}
|
||||
if err := json.Unmarshal(w.Body.Bytes(), &body); err != nil {
|
||||
t.Fatalf("decode body: %v", err)
|
||||
}
|
||||
if body.Code != "unsupported_config_features" || len(body.Features) != 1 || body.Features[0] != "future_x" {
|
||||
t.Fatalf("unexpected body %s", w.Body.String())
|
||||
}
|
||||
}
|
||||
+54
-17
@@ -1,6 +1,7 @@
|
||||
package handlers
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"html/template"
|
||||
"log/slog"
|
||||
@@ -13,8 +14,10 @@ import (
|
||||
"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/mariadb"
|
||||
"github.com/gin-gonic/gin"
|
||||
mysqlDriver "github.com/go-sql-driver/mysql"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type SetupHandler struct {
|
||||
@@ -82,14 +85,24 @@ func (h *SetupHandler) TestConnection(c *gin.Context) {
|
||||
port = p
|
||||
}
|
||||
|
||||
// If password is empty, try to use saved password
|
||||
if password == "" {
|
||||
if settings, err := h.localDB.GetSettings(); err == nil && settings != nil {
|
||||
password = settings.PasswordEncrypted // GetSettings returns decrypted password in this field
|
||||
}
|
||||
settings, err := h.localDB.GetSettings()
|
||||
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
_ = c.Error(err)
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to read settings"})
|
||||
return
|
||||
}
|
||||
password, err = setupPassword(settings, host, port, user, password)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusUnprocessableEntity, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
dsn := buildMySQLDSN(host, port, database, user, password, 5*time.Second)
|
||||
tlsMode, caPEM := c.DefaultPostForm("tls_mode", "preferred"), c.PostForm("tls_ca_pem")
|
||||
dsn, err := buildMySQLDSNWithTLS(host, port, database, user, password, 5*time.Second, tlsMode, caPEM)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusUnprocessableEntity, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
lotCount, canWrite, err := db.ValidateMariaDBConnection(dsn)
|
||||
if err != nil {
|
||||
_ = c.Error(err)
|
||||
@@ -110,7 +123,12 @@ 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()
|
||||
existingSettings, settingsErr := h.localDB.GetSettings()
|
||||
if settingsErr != nil && !errors.Is(settingsErr, gorm.ErrRecordNotFound) {
|
||||
_ = c.Error(settingsErr)
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to read settings"})
|
||||
return
|
||||
}
|
||||
|
||||
host := c.PostForm("host")
|
||||
portStr := c.PostForm("port")
|
||||
@@ -123,15 +141,19 @@ func (h *SetupHandler) SaveConnection(c *gin.Context) {
|
||||
port = p
|
||||
}
|
||||
|
||||
// If password is empty, use saved password
|
||||
if password == "" {
|
||||
if settings, err := h.localDB.GetSettings(); err == nil && settings != nil {
|
||||
password = settings.PasswordEncrypted // GetSettings returns decrypted password in this field
|
||||
}
|
||||
password, err := setupPassword(existingSettings, host, port, user, password)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusUnprocessableEntity, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
// Test connection first
|
||||
dsn := buildMySQLDSN(host, port, database, user, password, 5*time.Second)
|
||||
tlsMode, caPEM := c.DefaultPostForm("tls_mode", "preferred"), c.PostForm("tls_ca_pem")
|
||||
dsn, err := buildMySQLDSNWithTLS(host, port, database, user, password, 5*time.Second, tlsMode, caPEM)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusUnprocessableEntity, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
if _, _, err := db.ValidateMariaDBConnection(dsn); err != nil {
|
||||
_ = c.Error(err)
|
||||
c.JSON(http.StatusBadRequest, gin.H{
|
||||
@@ -142,7 +164,7 @@ func (h *SetupHandler) SaveConnection(c *gin.Context) {
|
||||
}
|
||||
|
||||
// Save settings
|
||||
if err := h.localDB.SaveSettings(host, port, database, user, password); err != nil {
|
||||
if err := h.localDB.SaveSettingsWithTLS(host, port, database, user, password, tlsMode, caPEM); err != nil {
|
||||
_ = c.Error(err)
|
||||
c.JSON(http.StatusInternalServerError, gin.H{
|
||||
"success": false,
|
||||
@@ -165,7 +187,8 @@ func (h *SetupHandler) SaveConnection(c *gin.Context) {
|
||||
existingSettings.Port != port ||
|
||||
existingSettings.Database != database ||
|
||||
existingSettings.User != user ||
|
||||
existingSettings.PasswordEncrypted != password
|
||||
existingSettings.PasswordEncrypted != password ||
|
||||
existingSettings.TLSMode != tlsMode || existingSettings.TLSCAPEM != caPEM
|
||||
|
||||
restartQueued := settingsChanged && h.restartSig != nil
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
@@ -195,7 +218,7 @@ func (h *SetupHandler) GetStatus(c *gin.Context) {
|
||||
})
|
||||
}
|
||||
|
||||
func buildMySQLDSN(host string, port int, database, user, password string, timeout time.Duration) string {
|
||||
func buildMySQLDSNWithTLS(host string, port int, database, user, password string, timeout time.Duration, tlsMode, caPEM string) (string, error) {
|
||||
cfg := mysqlDriver.NewConfig()
|
||||
cfg.User = user
|
||||
cfg.Passwd = password
|
||||
@@ -208,5 +231,19 @@ func buildMySQLDSN(host string, port int, database, user, password string, timeo
|
||||
cfg.Params = map[string]string{
|
||||
"charset": "utf8mb4",
|
||||
}
|
||||
return cfg.FormatDSN()
|
||||
if err := mariadb.ConfigureTLS(cfg, tlsMode, caPEM); err != nil {
|
||||
return "", fmt.Errorf("configure TLS: %w", err)
|
||||
}
|
||||
return cfg.FormatDSN(), nil
|
||||
}
|
||||
|
||||
// setupPassword reuses a credential only for its saved destination and account.
|
||||
func setupPassword(saved *localdb.ConnectionSettings, host string, port int, user, password string) (string, error) {
|
||||
if password != "" || saved == nil {
|
||||
return password, nil
|
||||
}
|
||||
if saved.Host != host || saved.Port != port || saved.User != user {
|
||||
return "", fmt.Errorf("Password is required when changing host, port or user")
|
||||
}
|
||||
return saved.PasswordEncrypted, nil
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package handlers
|
||||
|
||||
import (
|
||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestSetupPassword(t *testing.T) {
|
||||
saved := &localdb.ConnectionSettings{Host: "db.example", Port: 3306, User: "example", PasswordEncrypted: "example"}
|
||||
for _, tt := range []struct {
|
||||
name, host, user, password string
|
||||
port int
|
||||
wantError bool
|
||||
}{
|
||||
{"same destination", "db.example", "example", "", 3306, false},
|
||||
{"changed host", "other.example", "example", "", 3306, true},
|
||||
{"changed port", "db.example", "example", "", 3307, true},
|
||||
{"changed user", "db.example", "other", "", 3306, true},
|
||||
{"explicit password", "other.example", "other", "example", 3307, false},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got, err := setupPassword(saved, tt.host, tt.port, tt.user, tt.password)
|
||||
if (err != nil) != tt.wantError {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if !tt.wantError && got != "example" {
|
||||
t.Fatal("credential not preserved")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package handlers
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"net/url"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func TestSetupFreshSettingsValidateTLS(t *testing.T) {
|
||||
local, err := localdb.New(filepath.Join(t.TempDir(), "qfs.db"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer local.Close()
|
||||
handler := &SetupHandler{localDB: local}
|
||||
for _, test := range []struct {
|
||||
path string
|
||||
handler gin.HandlerFunc
|
||||
}{{"/setup/test", handler.TestConnection}, {"/setup", handler.SaveConnection}} {
|
||||
router := gin.New()
|
||||
router.POST(test.path, test.handler)
|
||||
body := url.Values{"host": {"db.example"}, "user": {"example"}, "tls_mode": {"invalid"}}.Encode()
|
||||
req := httptest.NewRequest(http.MethodPost, test.path, strings.NewReader(body))
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
w := httptest.NewRecorder()
|
||||
router.ServeHTTP(w, req)
|
||||
if w.Code != http.StatusUnprocessableEntity {
|
||||
t.Fatalf("%s: status=%d body=%s", test.path, w.Code, w.Body.String())
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -240,7 +240,7 @@ type SyncAllResponse struct {
|
||||
|
||||
// SyncAll performs full bidirectional sync:
|
||||
// - push pending local changes (projects/configurations) to server
|
||||
// - pull components, pricelists, projects, and configurations from server
|
||||
// - pull components, pricelists, qt_settings, projects, and configurations from server
|
||||
// POST /api/sync/all
|
||||
func (h *SyncHandler) SyncAll(c *gin.Context) {
|
||||
if !h.ensureSyncReadiness(c) {
|
||||
@@ -282,6 +282,12 @@ func (h *SyncHandler) SyncAll(c *gin.Context) {
|
||||
slog.Warn("partnumber books pull failed during full sync", "error", err)
|
||||
}
|
||||
|
||||
// Configurator settings (config_types, tab_config, ...): non-fatal, the
|
||||
// local cache is kept on failure.
|
||||
if err := h.syncService.SyncQtSettings(); err != nil {
|
||||
slog.Warn("qt_settings sync failed during full sync", "error", err)
|
||||
}
|
||||
|
||||
projectsResult, err := h.syncService.ImportProjectsToLocal()
|
||||
if err != nil {
|
||||
slog.Error("project import failed during full sync", "error", err)
|
||||
|
||||
@@ -3,6 +3,7 @@ package localdb
|
||||
import (
|
||||
"time"
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/configfeatures"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
||||
)
|
||||
|
||||
@@ -62,6 +63,7 @@ func ConfigurationToLocal(cfg *models.Configuration) *LocalConfiguration {
|
||||
TotalPrice: cfg.TotalPrice,
|
||||
CustomPrice: cfg.CustomPrice,
|
||||
Notes: cfg.Notes,
|
||||
FeatureFlags: cfg.FeatureFlags,
|
||||
IsTemplate: cfg.IsTemplate,
|
||||
ServerCount: cfg.ServerCount,
|
||||
ServerModel: cfg.ServerModel,
|
||||
@@ -112,6 +114,8 @@ func LocalToConfiguration(local *LocalConfiguration) *models.Configuration {
|
||||
TotalPrice: local.TotalPrice,
|
||||
CustomPrice: local.CustomPrice,
|
||||
Notes: local.Notes,
|
||||
FeatureFlags: local.FeatureFlags,
|
||||
UnsupportedFeatures: configfeatures.Unknown(local.FeatureFlags),
|
||||
IsTemplate: local.IsTemplate,
|
||||
ServerCount: local.ServerCount,
|
||||
ServerModel: local.ServerModel,
|
||||
|
||||
+27
-44
@@ -14,6 +14,7 @@ import (
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/appmeta"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/appstate"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/mariadb"
|
||||
"github.com/glebarez/sqlite"
|
||||
mysqlDriver "github.com/go-sql-driver/mysql"
|
||||
uuidpkg "github.com/google/uuid"
|
||||
@@ -24,6 +25,8 @@ import (
|
||||
|
||||
// ConnectionSettings stores MariaDB connection credentials
|
||||
type ConnectionSettings struct {
|
||||
TLSMode string `gorm:"default:preferred"`
|
||||
TLSCAPEM string
|
||||
ID uint `gorm:"primaryKey"`
|
||||
Host string `gorm:"not null"`
|
||||
Port int `gorm:"not null;default:3306"`
|
||||
@@ -50,47 +53,6 @@ var localReadOnlyCacheTables = []string{
|
||||
"local_partnumber_books",
|
||||
}
|
||||
|
||||
// ResetData clears local data tables while keeping connection settings.
|
||||
// It does not drop schema or connection_settings.
|
||||
func ResetData(dbPath string) error {
|
||||
if strings.TrimSpace(dbPath) == "" {
|
||||
return nil
|
||||
}
|
||||
if _, err := os.Stat(dbPath); err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("stat local db: %w", err)
|
||||
}
|
||||
|
||||
db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{
|
||||
Logger: logger.Default.LogMode(logger.Silent),
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("opening sqlite database: %w", err)
|
||||
}
|
||||
|
||||
// Order does not matter because we use DELETEs without FK constraints in SQLite.
|
||||
tables := []string{
|
||||
"local_projects",
|
||||
"local_configurations",
|
||||
"local_configuration_versions",
|
||||
"local_pricelists",
|
||||
"local_pricelist_items",
|
||||
"local_sync_guard_state",
|
||||
"pending_changes",
|
||||
"app_settings",
|
||||
}
|
||||
for _, table := range tables {
|
||||
if err := db.Exec("DELETE FROM " + table).Error; err != nil {
|
||||
return fmt.Errorf("clear %s: %w", table, err)
|
||||
}
|
||||
}
|
||||
|
||||
slog.Info("local database data reset", "path", dbPath)
|
||||
return nil
|
||||
}
|
||||
|
||||
// New creates a new LocalDB instance
|
||||
func New(dbPath string) (*LocalDB, error) {
|
||||
// Ensure directory exists
|
||||
@@ -548,6 +510,14 @@ func (l *LocalDB) GetSettings() (*ConnectionSettings, error) {
|
||||
|
||||
// SaveSettings saves connection settings with encrypted password
|
||||
func (l *LocalDB) SaveSettings(host string, port int, database, user, password string) error {
|
||||
return l.SaveSettingsWithTLS(host, port, database, user, password, "preferred", "")
|
||||
}
|
||||
|
||||
func (l *LocalDB) SaveSettingsWithTLS(host string, port int, database, user, password, tlsMode, caPEM string) error {
|
||||
if err := mariadb.ConfigureTLS(mysqlDriver.NewConfig(), tlsMode, caPEM); err != nil {
|
||||
return fmt.Errorf("validate connection TLS: %w", err)
|
||||
}
|
||||
|
||||
// Encrypt password
|
||||
encrypted, err := Encrypt(password)
|
||||
if err != nil {
|
||||
@@ -556,6 +526,8 @@ func (l *LocalDB) SaveSettings(host string, port int, database, user, password s
|
||||
|
||||
settings := ConnectionSettings{
|
||||
ID: 1, // Always use ID=1 for single settings row
|
||||
TLSMode: tlsMode,
|
||||
TLSCAPEM: caPEM,
|
||||
Host: host,
|
||||
Port: port,
|
||||
Database: database,
|
||||
@@ -601,6 +573,9 @@ func (l *LocalDB) GetDSN() (string, error) {
|
||||
"charset": "utf8mb4",
|
||||
}
|
||||
|
||||
if err := mariadb.ConfigureTLS(cfg, settings.TLSMode, settings.TLSCAPEM); err != nil {
|
||||
return "", fmt.Errorf("configure connection TLS: %w", err)
|
||||
}
|
||||
return cfg.FormatDSN(), nil
|
||||
}
|
||||
|
||||
@@ -1285,7 +1260,6 @@ func (l *LocalDB) GetLastComponentSyncError() string {
|
||||
return strings.TrimSpace(value)
|
||||
}
|
||||
|
||||
|
||||
const openConfigUUIDsKey = "open_config_uuids"
|
||||
|
||||
// GetOpenConfigUUIDs returns UUIDs of all configurations currently open in the configurator.
|
||||
@@ -1361,7 +1335,6 @@ func (l *LocalDB) CountAllPricelistItems() int64 {
|
||||
return count
|
||||
}
|
||||
|
||||
|
||||
// DBFilePath returns the path to the SQLite database file.
|
||||
func (l *LocalDB) DBFilePath() string {
|
||||
return l.path
|
||||
@@ -1862,6 +1835,17 @@ func (l *LocalDB) MarkChangesSynced(ids []int64) error {
|
||||
return l.db.Where("id IN ?", ids).Delete(&PendingChange{}).Error
|
||||
}
|
||||
|
||||
// ListConfigurationsPendingWithoutQueue returns configurations still marked pending
|
||||
// whose pending_changes rows are gone, so nothing will ever push them.
|
||||
func (l *LocalDB) ListConfigurationsPendingWithoutQueue() ([]LocalConfiguration, error) {
|
||||
var configs []LocalConfiguration
|
||||
err := l.db.Where(
|
||||
"sync_status = ? AND uuid NOT IN (SELECT entity_uuid FROM pending_changes WHERE entity_type = ?)",
|
||||
"pending", "configuration",
|
||||
).Find(&configs).Error
|
||||
return configs, err
|
||||
}
|
||||
|
||||
// PurgeOrphanConfigurationPendingChanges removes configuration pending changes
|
||||
// whose entity_uuid no longer exists in local_configurations.
|
||||
func (l *LocalDB) PurgeOrphanConfigurationPendingChanges() (int64, error) {
|
||||
@@ -2084,7 +2068,6 @@ func (l *LocalDB) GetLocalPricelistItemsPage(pricelistID uint, search string, pa
|
||||
return items, total, nil
|
||||
}
|
||||
|
||||
|
||||
// GetSchemaMigrations returns all applied local schema migrations ordered by applied_at.
|
||||
func (l *LocalDB) GetSchemaMigrations() ([]LocalSchemaMigration, error) {
|
||||
var migrations []LocalSchemaMigration
|
||||
|
||||
@@ -102,6 +102,7 @@ type LocalConfiguration struct {
|
||||
TotalPrice *float64 `json:"total_price"`
|
||||
CustomPrice *float64 `json:"custom_price"`
|
||||
Notes string `json:"notes"`
|
||||
FeatureFlags models.FeatureFlags `gorm:"type:text" json:"feature_flags,omitempty"`
|
||||
IsTemplate bool `gorm:"default:false" json:"is_template"`
|
||||
ServerCount int `gorm:"default:1" json:"server_count"`
|
||||
ServerModel string `gorm:"size:100" json:"server_model,omitempty"`
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
package localdb
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/appstate"
|
||||
"github.com/glebarez/sqlite"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
)
|
||||
|
||||
func ResetData(dbPath string) error {
|
||||
configPath, err := appstate.ResolveConfigPathNearDB("", dbPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("resolve reset config: %w", err)
|
||||
}
|
||||
return ResetDataWithOptions(dbPath, configPath, false)
|
||||
}
|
||||
|
||||
// ResetDataWithOptions requires a fresh verified backup even for forced resets.
|
||||
func ResetDataWithOptions(dbPath, configPath string, force bool) error {
|
||||
if strings.TrimSpace(dbPath) == "" {
|
||||
return nil
|
||||
}
|
||||
if _, err := os.Stat(dbPath); err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("stat reset database: %w", err)
|
||||
}
|
||||
db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{Logger: logger.Default.LogMode(logger.Silent)})
|
||||
if err != nil {
|
||||
return fmt.Errorf("open reset database: %w", err)
|
||||
}
|
||||
sqlDB, err := db.DB()
|
||||
if err != nil {
|
||||
return fmt.Errorf("get reset database: %w", err)
|
||||
}
|
||||
defer sqlDB.Close()
|
||||
return db.Transaction(func(tx *gorm.DB) error {
|
||||
for _, table := range []string{"pending_changes", "local_projects", "local_configurations"} {
|
||||
if !tx.Migrator().HasTable(table) {
|
||||
continue
|
||||
}
|
||||
query := tx.Table(table)
|
||||
if table != "pending_changes" {
|
||||
if !tx.Migrator().HasColumn(table, "sync_status") {
|
||||
if !force {
|
||||
return fmt.Errorf("reset refused: %s has no sync_status; use -reset-localdb -force-reset-localdb after reviewing local work", table)
|
||||
}
|
||||
continue
|
||||
}
|
||||
query = query.Where("sync_status IS NULL OR sync_status <> ?", "synced")
|
||||
}
|
||||
var count int64
|
||||
if err := query.Count(&count).Error; err != nil {
|
||||
return fmt.Errorf("check reset data in %s: %w", table, err)
|
||||
}
|
||||
if count > 0 && !force {
|
||||
return fmt.Errorf("reset refused: %s contains %d unsynced rows; sync first or use -reset-localdb -force-reset-localdb", table, count)
|
||||
}
|
||||
}
|
||||
archivePath, err := appstate.CreatePreResetBackup(dbPath, configPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("reset safety backup: %w", err)
|
||||
}
|
||||
slog.Info("verified pre-reset backup", "path", archivePath)
|
||||
for _, table := range []string{
|
||||
"local_projects", "local_configurations", "local_configuration_versions",
|
||||
"local_pricelists", "local_pricelist_items", "local_sync_guard_state", "pending_changes", "app_settings",
|
||||
} {
|
||||
if !tx.Migrator().HasTable(table) {
|
||||
continue
|
||||
}
|
||||
if err := tx.Exec("DELETE FROM " + table).Error; err != nil {
|
||||
return fmt.Errorf("clear %s: %w", table, err)
|
||||
}
|
||||
}
|
||||
slog.Info("local database data reset", "path", dbPath, "forced", force)
|
||||
return nil
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,154 @@
|
||||
package localdb
|
||||
|
||||
import (
|
||||
"archive/zip"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/glebarez/sqlite"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
func TestResetProtectsUnsyncedData(t *testing.T) {
|
||||
for _, table := range []string{"pending_changes", "local_projects", "local_configurations"} {
|
||||
t.Run(table, func(t *testing.T) {
|
||||
path, db := resetFixture(t)
|
||||
if err := db.Exec("INSERT INTO " + table + " (sync_status) VALUES ('pending')").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
err := ResetDataWithOptions(path, "", false)
|
||||
if err == nil || !strings.Contains(err.Error(), table) {
|
||||
t.Fatalf("expected refusal naming %s, got %v", table, err)
|
||||
}
|
||||
assertResetRows(t, db, table, 1)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestResetBackupAndRollback(t *testing.T) {
|
||||
for _, failDelete := range []bool{false, true} {
|
||||
t.Run(map[bool]string{false: "reset", true: "rollback"}[failDelete], func(t *testing.T) {
|
||||
path, db := resetFixture(t)
|
||||
t.Setenv("QFS_BACKUP_DISABLE", "1")
|
||||
if err := db.Exec("INSERT INTO local_projects (sync_status) VALUES ('pending')").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if failDelete {
|
||||
if err := db.Exec("CREATE TRIGGER block_reset BEFORE DELETE ON local_configurations BEGIN SELECT RAISE(ABORT, 'blocked'); END").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Exec("INSERT INTO local_configurations (sync_status) VALUES ('pending')").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
cfg := filepath.Join(filepath.Dir(path), "config.yaml")
|
||||
if err := os.WriteFile(cfg, []byte("server: {}"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
err := ResetDataWithOptions(path, cfg, true)
|
||||
if (err != nil) != failDelete {
|
||||
t.Fatalf("reset: %v", err)
|
||||
}
|
||||
want := int64(0)
|
||||
if failDelete {
|
||||
want = 1
|
||||
}
|
||||
assertResetRows(t, db, "local_projects", want)
|
||||
archives, err := filepath.Glob(filepath.Join(filepath.Dir(path), "backups", "pre-reset", "*.zip"))
|
||||
if err != nil || len(archives) != 1 {
|
||||
t.Fatalf("archives=%v err=%v", archives, err)
|
||||
}
|
||||
archive, err := zip.OpenReader(archives[0])
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer archive.Close()
|
||||
for _, entry := range archive.File {
|
||||
if entry.Name != filepath.Base(path) {
|
||||
continue
|
||||
}
|
||||
in, err := entry.Open()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
data, err := io.ReadAll(in)
|
||||
in.Close()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
restoredPath := filepath.Join(t.TempDir(), "restored.db")
|
||||
if err := os.WriteFile(restoredPath, data, 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
restored, err := gorm.Open(sqlite.Open(restoredPath), &gorm.Config{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sqlDB, _ := restored.DB()
|
||||
defer sqlDB.Close()
|
||||
assertResetRows(t, restored, "local_projects", 1)
|
||||
}
|
||||
assertResetRows(t, db, "connection_settings", 1)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestResetRefusesFailedBackup(t *testing.T) {
|
||||
path, db := resetFixture(t)
|
||||
if err := db.Exec("INSERT INTO local_projects (sync_status) VALUES ('synced')").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Setenv("QFS_BACKUP_DIR", path) // A database file cannot be a backup directory.
|
||||
if err := ResetDataWithOptions(path, "", true); err == nil {
|
||||
t.Fatal("expected backup refusal")
|
||||
}
|
||||
assertResetRows(t, db, "local_projects", 1)
|
||||
}
|
||||
|
||||
func TestResetLegacySchema(t *testing.T) {
|
||||
path, db := resetFixture(t)
|
||||
if err := db.Exec("ALTER TABLE local_projects DROP COLUMN sync_status").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := ResetDataWithOptions(path, "", false); err == nil {
|
||||
t.Fatal("expected legacy-state refusal")
|
||||
}
|
||||
if err := ResetDataWithOptions(path, "", true); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func resetFixture(t *testing.T) (string, *gorm.DB) {
|
||||
t.Helper()
|
||||
t.Setenv("QFS_BACKUP_DIR", "")
|
||||
path := filepath.Join(t.TempDir(), "qfs.db")
|
||||
db, err := gorm.Open(sqlite.Open(path), &gorm.Config{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sqlDB, _ := db.DB()
|
||||
t.Cleanup(func() { sqlDB.Close() })
|
||||
for _, table := range []string{"pending_changes", "local_projects", "local_configurations", "connection_settings"} {
|
||||
if err := db.Exec("CREATE TABLE " + table + " (id INTEGER PRIMARY KEY, sync_status TEXT)").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
if err := db.Exec("INSERT INTO connection_settings (sync_status) VALUES ('synced')").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return path, db
|
||||
}
|
||||
|
||||
func assertResetRows(t *testing.T, db *gorm.DB, table string, want int64) {
|
||||
t.Helper()
|
||||
var count int64
|
||||
if err := db.Table(table).Count(&count).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if count != want {
|
||||
t.Fatalf("%s has %d rows, want %d", table, count, want)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package localdb
|
||||
|
||||
import (
|
||||
mysql "github.com/go-sql-driver/mysql"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestSettingsTLSRoundTrip(t *testing.T) {
|
||||
t.Setenv("QFS_STATE_DIR", t.TempDir())
|
||||
local := newModeDB(t)
|
||||
for _, mode := range []string{"preferred", "required", "verify-full"} {
|
||||
if err := local.SaveSettingsWithTLS("db.example", 3306, "example", "example", "example", mode, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
settings, err := local.GetSettings()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if settings.TLSMode != mode {
|
||||
t.Fatalf("mode=%s, want %s", settings.TLSMode, mode)
|
||||
}
|
||||
dsn, err := local.GetDSN()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cfg, err := mysql.ParseDSN(dsn)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if cfg.TLS == nil || cfg.AllowFallbackToPlaintext != (mode == "preferred") {
|
||||
t.Fatalf("wrong TLS policy for %s", mode)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,8 @@ import (
|
||||
"fmt"
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
||||
)
|
||||
|
||||
// BuildConfigurationSnapshot serializes the full local configuration state.
|
||||
@@ -21,6 +23,7 @@ func BuildConfigurationSnapshot(localCfg *LocalConfiguration) (string, error) {
|
||||
"total_price": localCfg.TotalPrice,
|
||||
"custom_price": localCfg.CustomPrice,
|
||||
"notes": localCfg.Notes,
|
||||
"feature_flags": localCfg.FeatureFlags,
|
||||
"is_template": localCfg.IsTemplate,
|
||||
"server_count": localCfg.ServerCount,
|
||||
"server_model": localCfg.ServerModel,
|
||||
@@ -60,6 +63,7 @@ func DecodeConfigurationSnapshot(data string) (*LocalConfiguration, error) {
|
||||
TotalPrice *float64 `json:"total_price"`
|
||||
CustomPrice *float64 `json:"custom_price"`
|
||||
Notes string `json:"notes"`
|
||||
FeatureFlags models.FeatureFlags `json:"feature_flags"`
|
||||
IsTemplate bool `json:"is_template"`
|
||||
ServerCount int `json:"server_count"`
|
||||
ServerModel string `json:"server_model"`
|
||||
@@ -95,6 +99,7 @@ func DecodeConfigurationSnapshot(data string) (*LocalConfiguration, error) {
|
||||
TotalPrice: snapshot.TotalPrice,
|
||||
CustomPrice: snapshot.CustomPrice,
|
||||
Notes: snapshot.Notes,
|
||||
FeatureFlags: snapshot.FeatureFlags,
|
||||
IsTemplate: snapshot.IsTemplate,
|
||||
ServerCount: snapshot.ServerCount,
|
||||
ServerModel: snapshot.ServerModel,
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
package mariadb
|
||||
|
||||
import (
|
||||
"crypto/sha256"
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
mysql "github.com/go-sql-driver/mysql"
|
||||
)
|
||||
|
||||
// ConfigureTLS configures the DSN so setup and runtime use the same TLS policy.
|
||||
func ConfigureTLS(cfg *mysql.Config, mode, caPEM string) error {
|
||||
mode = strings.TrimSpace(mode)
|
||||
if mode == "" {
|
||||
mode = "preferred"
|
||||
}
|
||||
caPEM = strings.TrimSpace(caPEM)
|
||||
if caPEM != "" && mode != "verify-ca" && mode != "verify-full" {
|
||||
return fmt.Errorf("CA certificate requires verify-ca or verify-full")
|
||||
}
|
||||
switch mode {
|
||||
case "preferred":
|
||||
cfg.TLSConfig = "preferred"
|
||||
return nil
|
||||
case "required":
|
||||
cfg.TLSConfig = "skip-verify"
|
||||
return nil
|
||||
case "verify-full":
|
||||
if caPEM == "" {
|
||||
cfg.TLSConfig = "true"
|
||||
return nil
|
||||
}
|
||||
case "verify-ca":
|
||||
if caPEM == "" {
|
||||
return fmt.Errorf("verify-ca requires a CA certificate")
|
||||
}
|
||||
default:
|
||||
return fmt.Errorf("unsupported MariaDB TLS mode")
|
||||
}
|
||||
roots := x509.NewCertPool()
|
||||
if !roots.AppendCertsFromPEM([]byte(caPEM)) {
|
||||
return fmt.Errorf("invalid CA certificate PEM")
|
||||
}
|
||||
tlsConfig := &tls.Config{MinVersion: tls.VersionTLS12, RootCAs: roots}
|
||||
if mode == "verify-ca" {
|
||||
// Verify the certificate chain explicitly; this mode omits hostname checks.
|
||||
tlsConfig.InsecureSkipVerify = true
|
||||
tlsConfig.VerifyConnection = func(state tls.ConnectionState) error {
|
||||
if len(state.PeerCertificates) == 0 {
|
||||
return fmt.Errorf("MariaDB did not provide a certificate")
|
||||
}
|
||||
intermediates := x509.NewCertPool()
|
||||
for _, cert := range state.PeerCertificates[1:] {
|
||||
intermediates.AddCert(cert)
|
||||
}
|
||||
_, err := state.PeerCertificates[0].Verify(x509.VerifyOptions{Roots: roots, Intermediates: intermediates, KeyUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}})
|
||||
if err != nil {
|
||||
return fmt.Errorf("verify MariaDB certificate: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
name := fmt.Sprintf("qfs-%x", sha256.Sum256([]byte(mode+"\n"+caPEM)))
|
||||
if err := mysql.RegisterTLSConfig(name, tlsConfig); err != nil {
|
||||
return fmt.Errorf("register MariaDB TLS: %w", err)
|
||||
}
|
||||
cfg.TLSConfig = name
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
package mariadb
|
||||
|
||||
import (
|
||||
"crypto/ecdsa"
|
||||
"crypto/elliptic"
|
||||
"crypto/rand"
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"crypto/x509/pkix"
|
||||
"encoding/pem"
|
||||
"math/big"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
mysql "github.com/go-sql-driver/mysql"
|
||||
)
|
||||
|
||||
func TestTLSPolicy(t *testing.T) {
|
||||
ca, cert := testCertificate(t)
|
||||
_, other := testCertificate(t)
|
||||
for _, tt := range []struct {
|
||||
mode, ca string
|
||||
wantError, fallback, insecure bool
|
||||
}{
|
||||
{"", "", false, true, true},
|
||||
{"preferred", "", false, true, true},
|
||||
{"required", "", false, false, true},
|
||||
{"verify-full", "", false, false, false},
|
||||
{"verify-full", ca, false, false, false},
|
||||
{"verify-ca", ca, false, false, true},
|
||||
{"verify-ca", "", true, false, false},
|
||||
{"verify-full", "invalid", true, false, false},
|
||||
{"preferred", ca, true, false, false},
|
||||
{"false", "", true, false, false},
|
||||
} {
|
||||
t.Run(tt.mode+tt.ca[:min(len(tt.ca), 5)], func(t *testing.T) {
|
||||
cfg := mysql.NewConfig()
|
||||
cfg.Net, cfg.Addr = "tcp", "db.example:3306"
|
||||
err := ConfigureTLS(cfg, tt.mode, tt.ca)
|
||||
if (err != nil) != tt.wantError {
|
||||
t.Fatalf("configure: %v", err)
|
||||
}
|
||||
if tt.wantError {
|
||||
return
|
||||
}
|
||||
parsed, err := mysql.ParseDSN(cfg.FormatDSN())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if parsed.TLS == nil || parsed.AllowFallbackToPlaintext != tt.fallback || parsed.TLS.InsecureSkipVerify != tt.insecure {
|
||||
t.Fatalf("unexpected TLS policy for %s", tt.mode)
|
||||
}
|
||||
if tt.mode == "verify-ca" {
|
||||
if err := parsed.TLS.VerifyConnection(tls.ConnectionState{PeerCertificates: []*x509.Certificate{cert}}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, chain := range [][]*x509.Certificate{nil, {other}} {
|
||||
if err := parsed.TLS.VerifyConnection(tls.ConnectionState{PeerCertificates: chain}); err == nil {
|
||||
t.Fatal("untrusted certificate accepted")
|
||||
}
|
||||
}
|
||||
}
|
||||
if tt.mode == "verify-full" && tt.ca != "" {
|
||||
if parsed.TLS.ServerName != "db.example" {
|
||||
t.Fatalf("missing hostname verification: %s", parsed.TLS.ServerName)
|
||||
}
|
||||
if _, err := cert.Verify(x509.VerifyOptions{Roots: parsed.TLS.RootCAs, DNSName: parsed.TLS.ServerName}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := other.Verify(x509.VerifyOptions{Roots: parsed.TLS.RootCAs, DNSName: parsed.TLS.ServerName}); err == nil {
|
||||
t.Fatal("untrusted certificate accepted")
|
||||
}
|
||||
if _, err := cert.Verify(x509.VerifyOptions{Roots: parsed.TLS.RootCAs, DNSName: "other.example"}); err == nil {
|
||||
t.Fatal("wrong hostname accepted")
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func testCertificate(t *testing.T) (string, *x509.Certificate) {
|
||||
t.Helper()
|
||||
key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
template := &x509.Certificate{SerialNumber: big.NewInt(1), Subject: pkix.Name{CommonName: "example"}, DNSNames: []string{"db.example"}, NotBefore: time.Now().Add(-time.Hour), NotAfter: time.Now().Add(time.Hour), IsCA: true, BasicConstraintsValid: true, KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageDigitalSignature, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}}
|
||||
der, err := x509.CreateCertificate(rand.Reader, template, template, &key.PublicKey, key)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cert, err := x509.ParseCertificate(der)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return string(pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})), cert
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"mime"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/url"
|
||||
@@ -11,6 +12,19 @@ import (
|
||||
|
||||
func CORS() gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
hostURL, hostErr := url.Parse("http://" + c.Request.Host)
|
||||
if hostErr != nil || hostURL.Host != c.Request.Host || hostURL.Path != "" || hostURL.RawQuery != "" || !isLoopbackOrigin("http://"+c.Request.Host) {
|
||||
c.AbortWithStatusJSON(http.StatusForbidden, gin.H{"error": "Invalid request host"})
|
||||
return
|
||||
}
|
||||
if c.GetHeader("Sec-Fetch-Site") == "cross-site" {
|
||||
c.AbortWithStatus(http.StatusForbidden)
|
||||
return
|
||||
}
|
||||
if referer := c.GetHeader("Referer"); referer != "" && !isLoopbackOrigin(referer) {
|
||||
c.AbortWithStatus(http.StatusForbidden)
|
||||
return
|
||||
}
|
||||
origin := strings.TrimSpace(c.GetHeader("Origin"))
|
||||
if origin != "" {
|
||||
if isLoopbackOrigin(origin) {
|
||||
@@ -20,7 +34,7 @@ func CORS() gin.HandlerFunc {
|
||||
c.Header("Access-Control-Allow-Headers", "Origin, Content-Type, Accept, Authorization")
|
||||
c.Header("Access-Control-Expose-Headers", "Content-Length, Content-Disposition")
|
||||
c.Header("Access-Control-Max-Age", "86400")
|
||||
} else if c.Request.Method == http.MethodOptions {
|
||||
} else {
|
||||
c.AbortWithStatus(http.StatusForbidden)
|
||||
return
|
||||
}
|
||||
@@ -30,6 +44,15 @@ func CORS() gin.HandlerFunc {
|
||||
c.AbortWithStatus(http.StatusNoContent)
|
||||
return
|
||||
}
|
||||
if c.Request.Method != http.MethodGet && c.Request.Method != http.MethodHead &&
|
||||
strings.HasPrefix(c.Request.URL.Path, "/api/") && c.Request.ContentLength != 0 {
|
||||
mediaType, _, err := mime.ParseMediaType(c.GetHeader("Content-Type"))
|
||||
isUpload := strings.HasPrefix(c.FullPath(), "/api/projects/") && strings.HasSuffix(c.FullPath(), "/vendor-import")
|
||||
if err != nil || (mediaType != "application/json" && !(isUpload && mediaType == "multipart/form-data")) {
|
||||
c.AbortWithStatusJSON(http.StatusUnsupportedMediaType, gin.H{"error": "Unsupported content type"})
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
c.Next()
|
||||
}
|
||||
@@ -43,6 +66,9 @@ func isLoopbackOrigin(origin string) bool {
|
||||
if u.Scheme != "http" && u.Scheme != "https" {
|
||||
return false
|
||||
}
|
||||
if u.User != nil || u.Opaque != "" {
|
||||
return false
|
||||
}
|
||||
host := strings.TrimSpace(u.Hostname())
|
||||
if host == "" {
|
||||
return false
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func TestLocalRequestBoundary(t *testing.T) {
|
||||
gin.SetMode(gin.TestMode)
|
||||
tests := []struct {
|
||||
name, method, path, host, origin, referer, fetchSite, contentType, body string
|
||||
want int
|
||||
}{
|
||||
{name: "CLI JSON", method: "POST", contentType: "application/json", body: "{}", want: 200},
|
||||
{name: "local browser", method: "POST", origin: "http://localhost:8080", contentType: "application/json; charset=utf-8", body: "{}", want: 200},
|
||||
{name: "foreign form", method: "POST", path: "/setup", origin: "https://attacker.example", contentType: "application/x-www-form-urlencoded", body: "host=example", want: 403},
|
||||
{name: "foreign JSON", method: "POST", origin: "https://attacker.example", contentType: "text/plain", body: "{}", want: 403},
|
||||
{name: "rebind read", method: "GET", host: "attacker.example:8080", want: 403},
|
||||
{name: "null origin", method: "POST", origin: "null", want: 403},
|
||||
{name: "foreign referer", method: "POST", referer: "https://attacker.example/page", want: 403},
|
||||
{name: "cross site", method: "POST", fetchSite: "cross-site", want: 403},
|
||||
{name: "plain JSON", method: "POST", contentType: "text/plain", body: "{}", want: 415},
|
||||
{name: "API form", method: "POST", contentType: "application/x-www-form-urlencoded", body: "x=y", want: 415},
|
||||
{name: "setup form", method: "POST", path: "/setup", origin: "http://127.0.0.1:8080", contentType: "application/x-www-form-urlencoded", body: "host=example", want: 200},
|
||||
{name: "upload", method: "POST", path: "/api/projects/id/vendor-import", contentType: "multipart/form-data; boundary=example", body: "example", want: 200},
|
||||
{name: "multipart JSON route", method: "POST", contentType: "multipart/form-data; boundary=example", body: "example", want: 415},
|
||||
{name: "bodyless action", method: "POST", want: 200},
|
||||
{name: "local preflight", method: "OPTIONS", origin: "http://localhost:8080", want: 204},
|
||||
{name: "foreign preflight", method: "OPTIONS", origin: "https://attacker.example", want: 403},
|
||||
{name: "IPv6", method: "GET", host: "[::1]:8080", want: 200},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
router := gin.New()
|
||||
router.Use(CORS())
|
||||
called := false
|
||||
handler := func(c *gin.Context) { called = true; c.Status(200) }
|
||||
router.Any("/api/configs", handler)
|
||||
router.Any("/setup", handler)
|
||||
router.POST("/api/projects/:uuid/vendor-import", handler)
|
||||
path := tt.path
|
||||
if path == "" {
|
||||
path = "/api/configs"
|
||||
}
|
||||
req := httptest.NewRequest(tt.method, path, strings.NewReader(tt.body))
|
||||
req.Host = tt.host
|
||||
if req.Host == "" {
|
||||
req.Host = "127.0.0.1:8080"
|
||||
}
|
||||
for key, value := range map[string]string{"Origin": tt.origin, "Referer": tt.referer, "Sec-Fetch-Site": tt.fetchSite, "Content-Type": tt.contentType} {
|
||||
if value != "" {
|
||||
req.Header.Set(key, value)
|
||||
}
|
||||
}
|
||||
w := httptest.NewRecorder()
|
||||
router.ServeHTTP(w, req)
|
||||
if w.Code != tt.want || called != (tt.want == http.StatusOK) {
|
||||
t.Fatalf("status=%d called=%v, want %d", w.Code, called, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -31,6 +31,40 @@ func (c *ConfigItems) Scan(value interface{}) error {
|
||||
return json.Unmarshal(bytes, c)
|
||||
}
|
||||
|
||||
// FeatureFlags lists the data features a configuration uses (see internal/configfeatures).
|
||||
// Stored as a JSON array; an empty list is stored as NULL.
|
||||
type FeatureFlags []string
|
||||
|
||||
func (f FeatureFlags) Value() (driver.Value, error) {
|
||||
if len(f) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
data, err := json.Marshal([]string(f))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return string(data), nil
|
||||
}
|
||||
|
||||
func (f *FeatureFlags) Scan(value interface{}) error {
|
||||
*f = nil
|
||||
var data []byte
|
||||
switch v := value.(type) {
|
||||
case nil:
|
||||
return nil
|
||||
case []byte:
|
||||
data = v
|
||||
case string:
|
||||
data = []byte(v)
|
||||
default:
|
||||
return errors.New("type assertion failed for FeatureFlags")
|
||||
}
|
||||
if len(data) == 0 {
|
||||
return nil
|
||||
}
|
||||
return json.Unmarshal(data, f)
|
||||
}
|
||||
|
||||
func (c ConfigItems) Total() float64 {
|
||||
var total float64
|
||||
for _, item := range c {
|
||||
@@ -137,6 +171,8 @@ type Configuration struct {
|
||||
TotalPrice *float64 `gorm:"type:decimal(12,2)" json:"total_price"`
|
||||
CustomPrice *float64 `gorm:"type:decimal(12,2)" json:"custom_price"`
|
||||
Notes string `gorm:"type:text" json:"notes"`
|
||||
FeatureFlags FeatureFlags `gorm:"type:json" json:"feature_flags,omitempty"`
|
||||
UnsupportedFeatures []string `gorm:"-" json:"unsupported_features,omitempty"` // flags this build doesn't know; computed on read
|
||||
IsTemplate bool `gorm:"default:false" json:"is_template"`
|
||||
ServerCount int `gorm:"default:1" json:"server_count"`
|
||||
ServerModel string `gorm:"size:100" json:"server_model,omitempty"`
|
||||
|
||||
@@ -1,57 +1,6 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"log/slog"
|
||||
"strings"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// AllModels returns all models for auto-migration
|
||||
func AllModels() []interface{} {
|
||||
return []interface{}{
|
||||
&Category{},
|
||||
&Project{},
|
||||
&Configuration{},
|
||||
&Pricelist{},
|
||||
&PricelistItem{},
|
||||
}
|
||||
}
|
||||
|
||||
// Migrate runs auto-migration for all QuoteForge tables
|
||||
// Handles MySQL constraint errors gracefully for existing tables
|
||||
func Migrate(db *gorm.DB) error {
|
||||
for _, model := range AllModels() {
|
||||
if err := db.AutoMigrate(model); err != nil {
|
||||
// Skip known MySQL constraint errors for existing tables
|
||||
errStr := err.Error()
|
||||
if strings.Contains(errStr, "Can't DROP") ||
|
||||
strings.Contains(errStr, "Duplicate key name") ||
|
||||
strings.Contains(errStr, "check that it exists") ||
|
||||
strings.Contains(errStr, "Cannot change column") ||
|
||||
strings.Contains(errStr, "used in a foreign key constraint") {
|
||||
slog.Warn("migration warning (skipped)", "model", model, "error", errStr)
|
||||
continue
|
||||
}
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// SeedCategories upserts default categories, updating display_order on existing rows.
|
||||
func SeedCategories(db *gorm.DB) error {
|
||||
for _, cat := range DefaultCategories {
|
||||
var existing Category
|
||||
if err := db.Where("code = ?", cat.Code).First(&existing).Error; err != nil {
|
||||
if err := db.Create(&cat).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
if err := db.Model(&existing).Update("display_order", cat.DisplayOrder).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
// Server schema changes are SQL files in migrations/, applied by `qfs -migrate`
|
||||
// (models.RunSQLMigrations). There is deliberately no GORM AutoMigrate against
|
||||
// MariaDB: it retypes production columns to match whatever models the running binary
|
||||
// was built with — an old binary run with -migrate once did exactly that.
|
||||
@@ -0,0 +1,64 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type migrationVerification struct {
|
||||
description string
|
||||
query string
|
||||
}
|
||||
|
||||
func parseMigrationVerifications(script string) ([]migrationVerification, error) {
|
||||
var checks []migrationVerification
|
||||
for _, line := range strings.Split(script, "\n") {
|
||||
line = strings.TrimSpace(line)
|
||||
if !strings.HasPrefix(line, "-- verify:") {
|
||||
continue
|
||||
}
|
||||
description, query, ok := strings.Cut(strings.TrimPrefix(line, "-- verify:"), "|")
|
||||
description, query = strings.TrimSpace(description), strings.TrimSpace(query)
|
||||
if !ok || description == "" || query == "" {
|
||||
return nil, fmt.Errorf("invalid migration verify header")
|
||||
}
|
||||
checks = append(checks, migrationVerification{description: description, query: query})
|
||||
}
|
||||
return checks, nil
|
||||
}
|
||||
|
||||
func applySQLMigrationFile(db *gorm.DB, filename, content string) error {
|
||||
checks, err := parseMigrationVerifications(content)
|
||||
if err != nil {
|
||||
return fmt.Errorf("parse migration %s: %w", filename, err)
|
||||
}
|
||||
return db.Connection(func(conn *gorm.DB) error {
|
||||
if err := executeMigrationStatements(conn, filename, splitSQLStatements(content)); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, check := range checks {
|
||||
rows, err := conn.Raw(check.query).Rows()
|
||||
if err != nil {
|
||||
return fmt.Errorf("verify migration %s (%s): %w", filename, check.description, err)
|
||||
}
|
||||
failed := rows.Next()
|
||||
rowErr := rows.Err()
|
||||
closeErr := rows.Close()
|
||||
if rowErr != nil {
|
||||
return fmt.Errorf("read migration verification %s (%s): %w", filename, check.description, rowErr)
|
||||
}
|
||||
if closeErr != nil {
|
||||
return fmt.Errorf("close migration verification %s (%s): %w", filename, check.description, closeErr)
|
||||
}
|
||||
if failed {
|
||||
return fmt.Errorf("verify migration %s failed: %s", filename, check.description)
|
||||
}
|
||||
}
|
||||
if err := conn.Create(&SQLSchemaMigration{Filename: filename}).Error; err != nil {
|
||||
return fmt.Errorf("record migration %s: %w", filename, err)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/glebarez/sqlite"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
func TestMigrationVerification(t *testing.T) {
|
||||
for _, tt := range []struct{ name, content, wantError string }{
|
||||
{"valid", "-- verify: bad value | SELECT 1 FROM example WHERE value <> 1\nCREATE TEMP TABLE example (value INT); INSERT INTO example VALUES (1);", ""},
|
||||
{"failed", "-- verify: bad value | SELECT 1 FROM example WHERE value <> 1\nCREATE TEMP TABLE example (value INT); INSERT INTO example VALUES (2);", "bad value"},
|
||||
{"query error", "-- verify: missing table | SELECT 1 FROM missing\nCREATE TEMP TABLE example (value INT);", "missing table"},
|
||||
{"malformed", "-- verify: no query\nCREATE TABLE example (value INT);", "invalid migration verify header"},
|
||||
{"second check fails", "-- verify: first | SELECT 1 WHERE 0\n-- verify: second | SELECT 1\nCREATE TEMP TABLE example (value INT);", "second"},
|
||||
{"execution failure", "-- verify: none | SELECT 1 WHERE 0\nINVALID SQL;", "exec migration"},
|
||||
} {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
db, err := gorm.Open(sqlite.Open(filepath.Join(t.TempDir(), "migration.db")), &gorm.Config{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sqlDB, _ := db.DB()
|
||||
defer sqlDB.Close()
|
||||
if err := db.AutoMigrate(&SQLSchemaMigration{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
err = applySQLMigrationFile(db, "001_example.sql", tt.content)
|
||||
if tt.wantError != "" && (err == nil || !strings.Contains(err.Error(), tt.wantError)) {
|
||||
t.Fatalf("want %q, got %v", tt.wantError, err)
|
||||
}
|
||||
if tt.wantError == "" && err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var count int64
|
||||
if err := db.Model(&SQLSchemaMigration{}).Count(&count).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if (count == 1) != (tt.wantError == "") {
|
||||
t.Fatalf("incorrect history count=%d", count)
|
||||
}
|
||||
if tt.name == "malformed" && db.Migrator().HasTable("example") {
|
||||
t.Fatal("malformed header mutated database")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestMigrationErrorAllowlist(t *testing.T) {
|
||||
for _, tt := range []struct {
|
||||
message string
|
||||
want bool
|
||||
}{
|
||||
{"Duplicate column name 'example'", true},
|
||||
{"Duplicate key name 'example'", true},
|
||||
{"Table 'example' already exists", true},
|
||||
{"Can't create table example (errno: 150 Foreign key constraint is incorrectly formed)", false},
|
||||
{"Can't create table example (errno: 121 Duplicate key)", false},
|
||||
{"Duplicate foreign key constraint name 'example'", false},
|
||||
{"Access denied", false},
|
||||
} {
|
||||
if got := isIgnorableMigrationError(tt.message); got != tt.want {
|
||||
t.Errorf("%s: got %v", tt.message, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,8 +4,7 @@ import (
|
||||
"bufio"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"io/fs"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -24,10 +23,87 @@ func (SQLSchemaMigration) TableName() string {
|
||||
return "qt_schema_migrations"
|
||||
}
|
||||
|
||||
// NeedsSQLMigrations reports whether at least one SQL migration from migrationsDir
|
||||
// SQLMigrationState is one server migration file and when it was recorded as applied
|
||||
// (nil = pending).
|
||||
type SQLMigrationState struct {
|
||||
Filename string
|
||||
AppliedAt *time.Time
|
||||
}
|
||||
|
||||
// SQLMigrationStatus lists every server migration in migrations with its applied state.
|
||||
// Read-only: does not create qt_schema_migrations.
|
||||
func SQLMigrationStatus(db *gorm.DB, migrations fs.FS) ([]SQLMigrationState, error) {
|
||||
files, err := listSQLMigrationFiles(migrations)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
applied := map[string]time.Time{}
|
||||
if db.Migrator().HasTable(&SQLSchemaMigration{}) {
|
||||
var rows []SQLSchemaMigration
|
||||
if err := db.Find(&rows).Error; err != nil {
|
||||
return nil, fmt.Errorf("read qt_schema_migrations: %w", err)
|
||||
}
|
||||
for _, r := range rows {
|
||||
applied[r.Filename] = r.AppliedAt
|
||||
}
|
||||
}
|
||||
states := make([]SQLMigrationState, 0, len(files))
|
||||
for _, f := range files {
|
||||
st := SQLMigrationState{Filename: f}
|
||||
if at, ok := applied[f]; ok {
|
||||
at := at
|
||||
st.AppliedAt = &at
|
||||
}
|
||||
states = append(states, st)
|
||||
}
|
||||
return states, nil
|
||||
}
|
||||
|
||||
// BaselineSQLMigrations records every migration up to and including upto as applied
|
||||
// WITHOUT executing it — for a server whose schema was brought up to date by other
|
||||
// means before qt_schema_migrations was used. Returns the filenames newly recorded.
|
||||
func BaselineSQLMigrations(db *gorm.DB, migrations fs.FS, upto string) ([]string, error) {
|
||||
files, err := listSQLMigrationFiles(migrations)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
found := false
|
||||
for _, f := range files {
|
||||
if f == upto {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
return nil, fmt.Errorf("baseline migration %q not found", upto)
|
||||
}
|
||||
if err := ensureSQLMigrationsTable(db); err != nil {
|
||||
return nil, fmt.Errorf("migrate qt_schema_migrations table: %w", err)
|
||||
}
|
||||
var recorded []string
|
||||
for _, f := range files {
|
||||
if f > upto {
|
||||
break
|
||||
}
|
||||
var count int64
|
||||
if err := db.Model(&SQLSchemaMigration{}).Where("filename = ?", f).Count(&count).Error; err != nil {
|
||||
return recorded, fmt.Errorf("check migration %s: %w", f, err)
|
||||
}
|
||||
if count > 0 {
|
||||
continue
|
||||
}
|
||||
if err := db.Create(&SQLSchemaMigration{Filename: f}).Error; err != nil {
|
||||
return recorded, fmt.Errorf("record baseline migration %s: %w", f, err)
|
||||
}
|
||||
recorded = append(recorded, f)
|
||||
}
|
||||
return recorded, nil
|
||||
}
|
||||
|
||||
// NeedsSQLMigrations reports whether at least one SQL migration from migrations
|
||||
// is not yet recorded in qt_schema_migrations.
|
||||
func NeedsSQLMigrations(db *gorm.DB, migrationsDir string) (bool, error) {
|
||||
files, err := listSQLMigrationFiles(migrationsDir)
|
||||
func NeedsSQLMigrations(db *gorm.DB, migrations fs.FS) (bool, error) {
|
||||
files, err := listSQLMigrationFiles(migrations)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
@@ -48,50 +124,46 @@ func NeedsSQLMigrations(db *gorm.DB, migrationsDir string) (bool, error) {
|
||||
return count < int64(len(files)), nil
|
||||
}
|
||||
|
||||
// RunSQLMigrations applies SQL files from migrationsDir once and records them in qt_schema_migrations.
|
||||
// Local SQLite-only scripts are skipped automatically.
|
||||
func RunSQLMigrations(db *gorm.DB, migrationsDir string) error {
|
||||
// RunSQLMigrations applies pending SQL files from migrations once each, in filename
|
||||
// order, and records them in qt_schema_migrations. onApply (optional) is called with
|
||||
// each filename before it runs. Local SQLite-only scripts are skipped automatically.
|
||||
// Returns the filenames applied.
|
||||
func RunSQLMigrations(db *gorm.DB, migrations fs.FS, onApply func(filename string)) ([]string, error) {
|
||||
if err := ensureSQLMigrationsTable(db); err != nil {
|
||||
return fmt.Errorf("migrate qt_schema_migrations table: %w", err)
|
||||
return nil, fmt.Errorf("migrate qt_schema_migrations table: %w", err)
|
||||
}
|
||||
|
||||
files, err := listSQLMigrationFiles(migrationsDir)
|
||||
files, err := listSQLMigrationFiles(migrations)
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var applied []string
|
||||
|
||||
for _, filename := range files {
|
||||
var count int64
|
||||
if err := db.Model(&SQLSchemaMigration{}).Where("filename = ?", filename).Count(&count).Error; err != nil {
|
||||
return fmt.Errorf("check migration %s: %w", filename, err)
|
||||
return applied, fmt.Errorf("check migration %s: %w", filename, err)
|
||||
}
|
||||
if count > 0 {
|
||||
continue
|
||||
}
|
||||
if onApply != nil {
|
||||
onApply(filename)
|
||||
}
|
||||
|
||||
path := filepath.Join(migrationsDir, filename)
|
||||
content, err := os.ReadFile(path)
|
||||
content, err := fs.ReadFile(migrations, filename)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read migration %s: %w", filename, err)
|
||||
return applied, fmt.Errorf("read migration %s: %w", filename, err)
|
||||
}
|
||||
|
||||
statements := splitSQLStatements(string(content))
|
||||
if len(statements) == 0 {
|
||||
if err := db.Create(&SQLSchemaMigration{Filename: filename}).Error; err != nil {
|
||||
return fmt.Errorf("record empty migration %s: %w", filename, err)
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
if err := executeMigrationStatements(db, filename, statements); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := db.Create(&SQLSchemaMigration{Filename: filename}).Error; err != nil {
|
||||
return fmt.Errorf("record migration %s: %w", filename, err)
|
||||
if err := applySQLMigrationFile(db, filename, string(content)); err != nil {
|
||||
return applied, err
|
||||
}
|
||||
applied = append(applied, filename)
|
||||
}
|
||||
|
||||
return nil
|
||||
return applied, nil
|
||||
}
|
||||
|
||||
// IsMigrationPermissionError returns true if err indicates insufficient privileges
|
||||
@@ -158,9 +230,6 @@ func isIgnorableMigrationError(message string) bool {
|
||||
"duplicate column name",
|
||||
"duplicate key name",
|
||||
"already exists",
|
||||
"can't create table",
|
||||
"duplicate foreign key constraint name",
|
||||
"errno 121",
|
||||
}
|
||||
for _, pattern := range ignorable {
|
||||
if strings.Contains(lower, pattern) {
|
||||
@@ -199,13 +268,13 @@ func splitSQLStatements(script string) []string {
|
||||
return stmts
|
||||
}
|
||||
|
||||
func listSQLMigrationFiles(migrationsDir string) ([]string, error) {
|
||||
entries, err := os.ReadDir(migrationsDir)
|
||||
func listSQLMigrationFiles(migrations fs.FS) ([]string, error) {
|
||||
entries, err := fs.ReadDir(migrations, ".")
|
||||
if err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
if errors.Is(err, fs.ErrNotExist) {
|
||||
return nil, nil
|
||||
}
|
||||
return nil, fmt.Errorf("read migrations dir %s: %w", migrationsDir, err)
|
||||
return nil, fmt.Errorf("read migrations dir: %w", err)
|
||||
}
|
||||
|
||||
files := make([]string, 0, len(entries))
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"testing/fstest"
|
||||
|
||||
"github.com/glebarez/sqlite"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
func TestSQLMigrationStatusAndListing(t *testing.T) {
|
||||
migrations := fstest.MapFS{
|
||||
"002_b.sql": {Data: []byte("ALTER TABLE x ADD COLUMN b INT;")},
|
||||
"001_a.sql": {Data: []byte("ALTER TABLE x ADD COLUMN a INT;")},
|
||||
"006_local_only_versions.sql": {Data: []byte("-- sqlite only")},
|
||||
"README.md": {Data: []byte("not a migration")},
|
||||
}
|
||||
db, err := gorm.Open(sqlite.Open(filepath.Join(t.TempDir(), "m.db")), &gorm.Config{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// No history table yet: everything pending, nothing created.
|
||||
states, err := SQLMigrationStatus(db, migrations)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(states) != 2 || states[0].Filename != "001_a.sql" || states[1].Filename != "002_b.sql" {
|
||||
t.Fatalf("unexpected listing %+v", states)
|
||||
}
|
||||
if states[0].AppliedAt != nil || db.Migrator().HasTable(&SQLSchemaMigration{}) {
|
||||
t.Fatal("status must be read-only and report pending")
|
||||
}
|
||||
|
||||
if err := db.AutoMigrate(&SQLSchemaMigration{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Create(&SQLSchemaMigration{Filename: "001_a.sql"}).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
states, _ = SQLMigrationStatus(db, migrations)
|
||||
if states[0].AppliedAt == nil || states[1].AppliedAt != nil {
|
||||
t.Fatalf("want 001 applied, 002 pending: %+v", states)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSplitSQLStatementsSkipsComments(t *testing.T) {
|
||||
got := splitSQLStatements("-- header; with semicolon\nALTER TABLE a ADD COLUMN x INT;\n\nALTER TABLE b\n ADD COLUMN y INT;\n")
|
||||
if len(got) != 2 || got[1] != "ALTER TABLE b\n ADD COLUMN y INT" {
|
||||
t.Fatalf("unexpected statements %q", got)
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"log/slog"
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
||||
@@ -16,13 +18,9 @@ func NewConfigurationRepository(db *gorm.DB) *ConfigurationRepository {
|
||||
}
|
||||
|
||||
func (r *ConfigurationRepository) Create(config *models.Configuration) error {
|
||||
if err := r.db.Create(config).Error; err != nil {
|
||||
if isUnknownLineNoColumnError(err) {
|
||||
return r.db.Omit("line_no").Create(config).Error
|
||||
}
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
return withOptionalColumns(func(omit []string) error {
|
||||
return r.db.Omit(omit...).Create(config).Error
|
||||
})
|
||||
}
|
||||
|
||||
func (r *ConfigurationRepository) GetByID(id uint) (*models.Configuration, error) {
|
||||
@@ -44,21 +42,40 @@ func (r *ConfigurationRepository) GetByUUID(uuid string) (*models.Configuration,
|
||||
}
|
||||
|
||||
func (r *ConfigurationRepository) Update(config *models.Configuration) error {
|
||||
if err := r.db.Save(config).Error; err != nil {
|
||||
if isUnknownLineNoColumnError(err) {
|
||||
return r.db.Omit("line_no").Save(config).Error
|
||||
}
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
return withOptionalColumns(func(omit []string) error {
|
||||
return r.db.Omit(omit...).Save(config).Error
|
||||
})
|
||||
}
|
||||
|
||||
func isUnknownLineNoColumnError(err error) bool {
|
||||
// optionalConfigColumns are qt_configurations columns added by server migrations that a
|
||||
// not-yet-migrated server may lack (line_no: 028, feature_flags: 034). A write that fails
|
||||
// on one of them is retried without it, so clients keep syncing until the migration runs.
|
||||
var optionalConfigColumns = []string{"line_no", "feature_flags"}
|
||||
|
||||
func withOptionalColumns(write func(omit []string) error) error {
|
||||
var omit []string
|
||||
for {
|
||||
err := write(omit)
|
||||
col := unknownOptionalColumn(err)
|
||||
if col == "" || slices.Contains(omit, col) {
|
||||
return err
|
||||
}
|
||||
slog.Warn("qt_configurations column missing on server — writing without it; run server migrations", "column", col)
|
||||
omit = append(omit, col)
|
||||
}
|
||||
}
|
||||
|
||||
func unknownOptionalColumn(err error) string {
|
||||
if err == nil {
|
||||
return false
|
||||
return ""
|
||||
}
|
||||
msg := strings.ToLower(err.Error())
|
||||
return strings.Contains(msg, "unknown column 'line_no'") || strings.Contains(msg, "no column named line_no")
|
||||
for _, col := range optionalConfigColumns {
|
||||
if strings.Contains(msg, "unknown column '"+col+"'") || strings.Contains(msg, "no column named "+col) {
|
||||
return col
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (r *ConfigurationRepository) Delete(id uint) error {
|
||||
|
||||
@@ -626,7 +626,8 @@ func applySaleRowPricing(rows []ProjectPricingExportRow, saleUplift float64, man
|
||||
}
|
||||
}
|
||||
key := saleRowKey(rows[i].VendorPN, rows[i].LotDisplay)
|
||||
factor := saleUplift + (rowMarkups[key] / 100)
|
||||
// Negative markup is a discount; floored at 0 like _saleRowPrice so a price never goes negative.
|
||||
factor := math.Max(0, saleUplift+(rowMarkups[key]/100))
|
||||
price := math.Round(base*factor*100) / 100
|
||||
rows[i].Estimate = floatPtr(price)
|
||||
}
|
||||
|
||||
@@ -561,3 +561,22 @@ type failingWriter struct{}
|
||||
func (fw *failingWriter) Write(p []byte) (int, error) {
|
||||
return 0, io.EOF
|
||||
}
|
||||
|
||||
func TestApplySaleRowPricingNegativeMarkup(t *testing.T) {
|
||||
rows := []ProjectPricingExportRow{
|
||||
{LotDisplay: "GPU_A", Estimate: floatPtr(1000)},
|
||||
{LotDisplay: "GPU_B", Estimate: floatPtr(1000)},
|
||||
{LotDisplay: "GPU_C", Estimate: floatPtr(1000)},
|
||||
}
|
||||
applySaleRowPricing(rows, 1.5, nil, map[string]float64{
|
||||
"NONE::GPU_A": -50, // discount: 1.5 - 0.5 = 1.0
|
||||
"NONE::GPU_B": 25, // 1.5 + 0.25 = 1.75
|
||||
"NONE::GPU_C": -300, // would be -1.5 — floored at 0
|
||||
})
|
||||
want := []float64{1000, 1750, 0}
|
||||
for i, w := range want {
|
||||
if rows[i].Estimate == nil || *rows[i].Estimate != w {
|
||||
t.Fatalf("row %d: got %v, want %v", i, rows[i].Estimate, w)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/appmeta"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/article"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/configfeatures"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/services/sync"
|
||||
@@ -324,6 +325,7 @@ func (s *LocalConfigurationService) CloneToProject(configUUID string, ownerUsern
|
||||
TotalPrice: &total,
|
||||
CustomPrice: original.CustomPrice,
|
||||
Notes: original.Notes,
|
||||
FeatureFlags: original.FeatureFlags,
|
||||
IsTemplate: false,
|
||||
ServerCount: original.ServerCount,
|
||||
ServerModel: original.ServerModel,
|
||||
@@ -332,6 +334,7 @@ func (s *LocalConfigurationService) CloneToProject(configUUID string, ownerUsern
|
||||
PricelistID: original.PricelistID,
|
||||
WarehousePricelistID: original.WarehousePricelistID,
|
||||
CompetitorPricelistID: original.CompetitorPricelistID,
|
||||
ConfigType: original.ConfigType,
|
||||
DisablePriceRefresh: original.DisablePriceRefresh,
|
||||
CreatedAt: time.Now(),
|
||||
}
|
||||
@@ -658,6 +661,7 @@ func (s *LocalConfigurationService) CloneNoAuthToProjectFromVersion(configUUID s
|
||||
return nil, fmt.Errorf("decode version snapshot for clone: %w", decErr)
|
||||
}
|
||||
snapshotCfg := localdb.LocalToConfiguration(snapshot)
|
||||
snapshotCfg.ConfigType = original.ConfigType // not part of version snapshots
|
||||
original = snapshotCfg
|
||||
original.UUID = configUUID // preserve original UUID for project resolution
|
||||
}
|
||||
@@ -684,6 +688,7 @@ func (s *LocalConfigurationService) CloneNoAuthToProjectFromVersion(configUUID s
|
||||
TotalPrice: &total,
|
||||
CustomPrice: original.CustomPrice,
|
||||
Notes: original.Notes,
|
||||
FeatureFlags: original.FeatureFlags,
|
||||
IsTemplate: false,
|
||||
ServerCount: original.ServerCount,
|
||||
ServerModel: original.ServerModel,
|
||||
@@ -692,6 +697,7 @@ func (s *LocalConfigurationService) CloneNoAuthToProjectFromVersion(configUUID s
|
||||
PricelistID: original.PricelistID,
|
||||
WarehousePricelistID: original.WarehousePricelistID,
|
||||
CompetitorPricelistID: original.CompetitorPricelistID,
|
||||
ConfigType: original.ConfigType,
|
||||
DisablePriceRefresh: original.DisablePriceRefresh,
|
||||
CreatedAt: time.Now(),
|
||||
}
|
||||
@@ -928,6 +934,9 @@ func (s *LocalConfigurationService) UpdateServerCount(configUUID string, serverC
|
||||
return nil, ErrConfigNotFound
|
||||
}
|
||||
|
||||
if err := applyFeatureFlags(localCfg.FeatureFlags, localCfg); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
localCfg.ServerCount = serverCount
|
||||
total := localCfg.Items.Total()
|
||||
if serverCount > 1 {
|
||||
@@ -1172,6 +1181,9 @@ func (s *LocalConfigurationService) createWithVersion(localCfg *localdb.LocalCon
|
||||
}
|
||||
|
||||
func (s *LocalConfigurationService) createWithVersionTx(tx *gorm.DB, localCfg *localdb.LocalConfiguration, createdBy string) error {
|
||||
if err := applyFeatureFlags(localCfg.FeatureFlags, localCfg); err != nil {
|
||||
return err
|
||||
}
|
||||
if localCfg.IsActive {
|
||||
if err := s.ensureConfigurationLineTx(tx, localCfg); err != nil {
|
||||
return err
|
||||
@@ -1217,6 +1229,9 @@ func (s *LocalConfigurationService) saveWithVersionAndPending(localCfg *localdb.
|
||||
}
|
||||
return fmt.Errorf("lock configuration row: %w", err)
|
||||
}
|
||||
if err := applyFeatureFlags(locked.FeatureFlags, localCfg); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if operation == "update" {
|
||||
currentVersion, err := s.loadCurrentVersionTx(tx, &locked)
|
||||
@@ -1297,6 +1312,7 @@ func hasNonRevisionConfigurationChanges(current *localdb.LocalConfiguration, nex
|
||||
}
|
||||
if current.Name != next.Name ||
|
||||
current.Notes != next.Notes ||
|
||||
strings.Join(current.FeatureFlags, ",") != strings.Join(next.FeatureFlags, ",") ||
|
||||
current.IsTemplate != next.IsTemplate ||
|
||||
current.ServerModel != next.ServerModel ||
|
||||
current.SupportCode != next.SupportCode ||
|
||||
@@ -1640,12 +1656,17 @@ func (s *LocalConfigurationService) rollbackToVersion(configurationUUID string,
|
||||
return fmt.Errorf("decode target rollback snapshot: %w", err)
|
||||
}
|
||||
|
||||
if err := configfeatures.Check(append(append([]string{}, current.FeatureFlags...), rollbackData.FeatureFlags...)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Keep stable identity/sync linkage; restore editable config content from target snapshot.
|
||||
current.Name = rollbackData.Name
|
||||
current.Items = rollbackData.Items
|
||||
current.TotalPrice = rollbackData.TotalPrice
|
||||
current.CustomPrice = rollbackData.CustomPrice
|
||||
current.Notes = rollbackData.Notes
|
||||
current.FeatureFlags = configfeatures.Detect(rollbackData.Notes)
|
||||
current.IsTemplate = rollbackData.IsTemplate
|
||||
current.ServerCount = rollbackData.ServerCount
|
||||
current.ServerModel = rollbackData.ServerModel
|
||||
@@ -1859,3 +1880,14 @@ func (s *LocalConfigurationService) resolvePricelistID(pricelistID *uint) (*uint
|
||||
}
|
||||
return &latest.ServerID, nil
|
||||
}
|
||||
|
||||
// applyFeatureFlags refuses a write when the configuration as stored carries feature
|
||||
// flags this build doesn't know (it could not round-trip the data behind them), and
|
||||
// otherwise re-derives next's flags from its content.
|
||||
func applyFeatureFlags(stored models.FeatureFlags, next *localdb.LocalConfiguration) error {
|
||||
if err := configfeatures.Check(stored); err != nil {
|
||||
return err
|
||||
}
|
||||
next.FeatureFlags = configfeatures.Detect(next.Notes)
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
||||
)
|
||||
|
||||
// config_type is free-form (codes come from qt_settings.config_types), so an
|
||||
// unknown code like "networking" must survive every write path unchanged.
|
||||
func TestConfigTypeSurvivesUpdateAndClone(t *testing.T) {
|
||||
service, local := newLocalConfigServiceForTest(t)
|
||||
|
||||
created, err := service.Create("tester", &CreateConfigRequest{
|
||||
Name: "net",
|
||||
Items: models.ConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 1000}},
|
||||
ConfigType: "networking",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("create: %v", err)
|
||||
}
|
||||
|
||||
// The configurator's save payload carries no config_type.
|
||||
if _, err := service.UpdateNoAuth(created.UUID, &CreateConfigRequest{
|
||||
Name: "net",
|
||||
Items: models.ConfigItems{{LotName: "CPU_A", Quantity: 2, UnitPrice: 1000}},
|
||||
}); err != nil {
|
||||
t.Fatalf("update: %v", err)
|
||||
}
|
||||
if stored, _ := local.GetConfigurationByUUID(created.UUID); stored.ConfigType != "networking" {
|
||||
t.Fatalf("config_type after update = %q, want networking", stored.ConfigType)
|
||||
}
|
||||
|
||||
for _, fromVersion := range []int{0, 1} {
|
||||
clone, err := service.CloneNoAuthToProjectFromVersion(created.UUID, "copy", "tester", nil, fromVersion)
|
||||
if err != nil {
|
||||
t.Fatalf("clone from version %d: %v", fromVersion, err)
|
||||
}
|
||||
if stored, _ := local.GetConfigurationByUUID(clone.UUID); stored.ConfigType != "networking" {
|
||||
t.Fatalf("clone from version %d: config_type = %q, want networking", fromVersion, stored.ConfigType)
|
||||
}
|
||||
}
|
||||
|
||||
clone, err := service.CloneToProject(created.UUID, "tester", "copy2", nil)
|
||||
if err != nil {
|
||||
t.Fatalf("clone to project: %v", err)
|
||||
}
|
||||
if stored, _ := local.GetConfigurationByUUID(clone.UUID); stored.ConfigType != "networking" {
|
||||
t.Fatalf("CloneToProject: config_type = %q, want networking", stored.ConfigType)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/configfeatures"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
||||
)
|
||||
|
||||
const notesWithRowMarkup = `{"pricing_ui":{"sale_uplift":1.5,"sale_row_markups":{"NONE::CPU_A":-50}}}`
|
||||
|
||||
func TestSaveDerivesFeatureFlagsFromContent(t *testing.T) {
|
||||
service, local := newLocalConfigServiceForTest(t)
|
||||
|
||||
created, err := service.Create("tester", &CreateConfigRequest{
|
||||
Name: "cfg",
|
||||
Items: models.ConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 1000}},
|
||||
Notes: notesWithRowMarkup,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("create: %v", err)
|
||||
}
|
||||
stored, _ := local.GetConfigurationByUUID(created.UUID)
|
||||
if want := (models.FeatureFlags{configfeatures.SaleRowMarkups}); !reflect.DeepEqual(stored.FeatureFlags, want) {
|
||||
t.Fatalf("flags after create = %v, want %v", stored.FeatureFlags, want)
|
||||
}
|
||||
|
||||
// Removing the markups clears the flag.
|
||||
if _, err := service.UpdateNoAuth(created.UUID, &CreateConfigRequest{
|
||||
Name: "cfg",
|
||||
Items: models.ConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 1000}},
|
||||
Notes: `{"pricing_ui":{"sale_uplift":1.5}}`,
|
||||
}); err != nil {
|
||||
t.Fatalf("update: %v", err)
|
||||
}
|
||||
stored, _ = local.GetConfigurationByUUID(created.UUID)
|
||||
if len(stored.FeatureFlags) != 0 {
|
||||
t.Fatalf("flags after clearing markups = %v, want none", stored.FeatureFlags)
|
||||
}
|
||||
}
|
||||
|
||||
func TestWritesRefusedForUnknownFeatureFlags(t *testing.T) {
|
||||
service, local := newLocalConfigServiceForTest(t)
|
||||
|
||||
created, err := service.Create("tester", &CreateConfigRequest{
|
||||
Name: "cfg",
|
||||
Items: models.ConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 1000}},
|
||||
Notes: `{"pricing_ui":{},"future":{"x":1}}`,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("create: %v", err)
|
||||
}
|
||||
// Simulate a pull of a config last written by a newer client.
|
||||
if err := local.DB().Model(&localdb.LocalConfiguration{}).
|
||||
Where("uuid = ?", created.UUID).
|
||||
Update("feature_flags", models.FeatureFlags{"future_x", configfeatures.SaleRowMarkups}).Error; err != nil {
|
||||
t.Fatalf("set flags: %v", err)
|
||||
}
|
||||
|
||||
got, err := service.GetByUUIDNoAuth(created.UUID)
|
||||
if err != nil {
|
||||
t.Fatalf("get: %v", err)
|
||||
}
|
||||
if want := []string{"future_x"}; !reflect.DeepEqual(got.UnsupportedFeatures, want) {
|
||||
t.Fatalf("UnsupportedFeatures = %v, want %v", got.UnsupportedFeatures, want)
|
||||
}
|
||||
|
||||
assertRefused := func(name string, err error) {
|
||||
t.Helper()
|
||||
ue, ok := configfeatures.AsUnsupported(err)
|
||||
if !ok || !reflect.DeepEqual(ue.Flags, []string{"future_x"}) {
|
||||
t.Fatalf("%s: want UnsupportedError{future_x}, got %v", name, err)
|
||||
}
|
||||
}
|
||||
_, err = service.UpdateNoAuth(created.UUID, &CreateConfigRequest{
|
||||
Name: "cfg",
|
||||
Items: models.ConfigItems{{LotName: "CPU_A", Quantity: 2, UnitPrice: 1000}},
|
||||
})
|
||||
assertRefused("update", err)
|
||||
_, err = service.RenameNoAuth(created.UUID, "renamed")
|
||||
assertRefused("rename", err)
|
||||
_, err = service.UpdateServerCount(created.UUID, 3)
|
||||
assertRefused("server count", err)
|
||||
_, err = service.CloneNoAuthToProjectFromVersion(created.UUID, "copy", "tester", nil, 0)
|
||||
assertRefused("clone", err)
|
||||
_, err = service.RollbackToVersion(created.UUID, 1, "tester")
|
||||
assertRefused("rollback", err)
|
||||
|
||||
stored, _ := local.GetConfigurationByUUID(created.UUID)
|
||||
if stored.Name != "cfg" || stored.Items[0].Quantity != 1 || stored.ServerCount != 1 {
|
||||
t.Fatalf("refused writes must leave the row untouched, got %+v", stored)
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/configfeatures"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/appmeta"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/db"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
||||
@@ -956,6 +957,8 @@ func (s *Service) PushPendingChanges() (int, error) {
|
||||
slog.Info("auto-repaired errored pending changes", "repaired", repaired)
|
||||
}
|
||||
|
||||
s.requeueOrphanedPendingConfigurations()
|
||||
|
||||
changes, err := s.localDB.GetPendingChanges()
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("getting pending changes: %w", err)
|
||||
@@ -985,7 +988,10 @@ func (s *Service) PushPendingChanges() (int, error) {
|
||||
firstErr = err.Error()
|
||||
}
|
||||
failed++
|
||||
if newAttempts >= maxPendingChangeAttempts {
|
||||
// Refused over unknown feature flags: not a transient failure, and dropping it would
|
||||
// lose the local edit — keep it queued until the app is updated.
|
||||
_, unsupported := configfeatures.AsUnsupported(err)
|
||||
if newAttempts >= maxPendingChangeAttempts && !unsupported {
|
||||
slog.Error("abandoning pending change after max attempts",
|
||||
"id", change.ID, "type", change.EntityType, "op", change.Operation,
|
||||
"attempts", newAttempts, "last_error", err.Error())
|
||||
@@ -1015,6 +1021,63 @@ func (s *Service) PushPendingChanges() (int, error) {
|
||||
return pushed, nil
|
||||
}
|
||||
|
||||
// requeueOrphanedPendingConfigurations re-enqueues an update for configurations that are
|
||||
// still sync_status=pending but have no queue row left (the row was dropped, e.g. a stale
|
||||
// event was skipped without marking the config synced). The update carries the current
|
||||
// local snapshot and version, so the server receives the latest state.
|
||||
func (s *Service) requeueOrphanedPendingConfigurations() int {
|
||||
orphans, err := s.localDB.ListConfigurationsPendingWithoutQueue()
|
||||
if err != nil {
|
||||
slog.Warn("failed to list orphaned pending configurations", "error", err)
|
||||
return 0
|
||||
}
|
||||
|
||||
requeued := 0
|
||||
for _, orphan := range orphans {
|
||||
cfg, versionID, versionNo, err := s.loadCurrentConfigurationState(orphan.UUID)
|
||||
if err != nil {
|
||||
slog.Warn("cannot requeue orphaned pending configuration", "uuid", orphan.UUID, "error", err)
|
||||
continue
|
||||
}
|
||||
|
||||
now := time.Now().UTC()
|
||||
payload := ConfigurationChangePayload{
|
||||
EventID: uuid.New().String(),
|
||||
IdempotencyKey: fmt.Sprintf("%s:v%d:requeue", orphan.UUID, versionNo),
|
||||
ConfigurationUUID: orphan.UUID,
|
||||
ProjectUUID: cfg.ProjectUUID,
|
||||
PricelistID: cfg.PricelistID,
|
||||
Operation: "update",
|
||||
CurrentVersionID: versionID,
|
||||
CurrentVersionNo: versionNo,
|
||||
ConflictPolicy: "last_write_wins",
|
||||
Snapshot: cfg,
|
||||
CreatedAt: now,
|
||||
}
|
||||
raw, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
slog.Warn("cannot marshal requeued configuration payload", "uuid", orphan.UUID, "error", err)
|
||||
continue
|
||||
}
|
||||
if err := s.localDB.DB().Create(&localdb.PendingChange{
|
||||
EntityType: "configuration",
|
||||
EntityUUID: orphan.UUID,
|
||||
Operation: "update",
|
||||
Payload: string(raw),
|
||||
CreatedAt: now,
|
||||
}).Error; err != nil {
|
||||
slog.Warn("cannot enqueue requeued configuration", "uuid", orphan.UUID, "error", err)
|
||||
continue
|
||||
}
|
||||
requeued++
|
||||
}
|
||||
|
||||
if requeued > 0 {
|
||||
slog.Info("requeued orphaned pending configurations", "requeued", requeued)
|
||||
}
|
||||
return requeued
|
||||
}
|
||||
|
||||
// pushSingleChange pushes a single pending change to the server
|
||||
func (s *Service) pushSingleChange(change *localdb.PendingChange) error {
|
||||
switch change.EntityType {
|
||||
@@ -1301,6 +1364,15 @@ func (s *Service) pushConfigurationUpdate(change *localdb.PendingChange) error {
|
||||
}
|
||||
}
|
||||
|
||||
// A newer client may have written this config since our last pull, adding data this
|
||||
// build can't see (marked by a feature flag we don't know). Pushing our snapshot over
|
||||
// it would erase that data, so refuse; the change stays queued until the app is updated.
|
||||
if serverCfg, getErr := configRepo.GetByUUID(cfg.UUID); getErr == nil {
|
||||
if err := configfeatures.Check(serverCfg.FeatureFlags); err != nil {
|
||||
return fmt.Errorf("push of configuration %s refused: %w", cfg.UUID, err)
|
||||
}
|
||||
}
|
||||
|
||||
// Update on server
|
||||
if err := configRepo.Update(&cfg); err != nil {
|
||||
return fmt.Errorf("updating configuration on server: %w", err)
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
package sync_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
||||
"git.mchus.pro/mchus/quoteforge/internal/services"
|
||||
syncsvc "git.mchus.pro/mchus/quoteforge/internal/services/sync"
|
||||
)
|
||||
|
||||
// Reproduces the state seen in the field bundle: configuration stays sync_status=pending
|
||||
// while its pending_changes rows are gone. Push must not leave it pending forever.
|
||||
func TestPushPendingChangesRequeuesOrphanedPendingConfiguration(t *testing.T) {
|
||||
local := newLocalDBForSyncTest(t)
|
||||
serverDB := newServerDBForSyncTest(t)
|
||||
|
||||
localSync := syncsvc.NewService(nil, local)
|
||||
configService := services.NewLocalConfigurationService(local, localSync, &services.QuoteService{}, func() bool { return false })
|
||||
pushService := syncsvc.NewServiceWithDB(serverDB, local)
|
||||
|
||||
created, err := configService.Create("tester", &services.CreateConfigRequest{
|
||||
Name: "Orphan v1",
|
||||
Items: models.ConfigItems{{LotName: "CPU_O", Quantity: 1, UnitPrice: 500}},
|
||||
ServerCount: 1,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("create config: %v", err)
|
||||
}
|
||||
if _, err := configService.UpdateNoAuth(created.UUID, &services.CreateConfigRequest{
|
||||
Name: "Orphan v2",
|
||||
Items: models.ConfigItems{{LotName: "CPU_O", Quantity: 2, UnitPrice: 500}},
|
||||
ServerCount: 1,
|
||||
ProjectUUID: created.ProjectUUID,
|
||||
}); err != nil {
|
||||
t.Fatalf("update config: %v", err)
|
||||
}
|
||||
|
||||
// Simulate the dropped queue: rows are gone, local config still marked pending.
|
||||
if err := local.DB().Where("1 = 1").Delete(&localdb.PendingChange{}).Error; err != nil {
|
||||
t.Fatalf("clear pending changes: %v", err)
|
||||
}
|
||||
|
||||
if _, err := pushService.PushPendingChanges(); err != nil {
|
||||
t.Fatalf("push: %v", err)
|
||||
}
|
||||
|
||||
var serverCfg models.Configuration
|
||||
if err := serverDB.Where("uuid = ?", created.UUID).First(&serverCfg).Error; err != nil {
|
||||
t.Fatalf("configuration not on server: %v", err)
|
||||
}
|
||||
if serverCfg.Name != "Orphan v2" {
|
||||
t.Fatalf("expected latest version on server, got %q", serverCfg.Name)
|
||||
}
|
||||
|
||||
localCfg, err := local.GetConfigurationByUUID(created.UUID)
|
||||
if err != nil {
|
||||
t.Fatalf("get local config: %v", err)
|
||||
}
|
||||
if localCfg.SyncStatus != "synced" {
|
||||
t.Fatalf("expected sync_status synced, got %q", localCfg.SyncStatus)
|
||||
}
|
||||
if got := local.CountPendingChanges(); got != 0 {
|
||||
t.Fatalf("expected empty pending queue, got %d", got)
|
||||
}
|
||||
}
|
||||
@@ -71,28 +71,22 @@ func (w *Worker) runSync() {
|
||||
return
|
||||
}
|
||||
|
||||
// Each stream is independent: a failure in one must not stop the others.
|
||||
// Readiness only gates pushing local changes to the server.
|
||||
if readiness, err := w.service.EnsureReadinessForSync(); err != nil {
|
||||
w.logger.Warn("background sync: blocked by readiness guard",
|
||||
w.logger.Warn("background sync: push blocked by readiness guard",
|
||||
"error", err,
|
||||
"reason_code", readiness.ReasonCode,
|
||||
"reason_text", readiness.ReasonText,
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
// Push pending changes first
|
||||
pushed, err := w.service.PushPendingChanges()
|
||||
if err != nil {
|
||||
} else if pushed, err := w.service.PushPendingChanges(); err != nil {
|
||||
w.logger.Warn("background sync: failed to push pending changes", "error", err)
|
||||
} else if pushed > 0 {
|
||||
w.logger.Info("background sync: pushed pending changes", "count", pushed)
|
||||
}
|
||||
|
||||
// Then check for new pricelists
|
||||
err = w.service.SyncPricelistsIfNeeded()
|
||||
if err != nil {
|
||||
if err := w.service.SyncPricelistsIfNeeded(); err != nil {
|
||||
w.logger.Warn("background sync: failed to sync pricelists", "error", err)
|
||||
return
|
||||
}
|
||||
|
||||
// Pull partnumber books together with pricelists
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
-- Tables affected: qt_configurations
|
||||
-- recovery.not-started: safe to re-run; ADD COLUMN IF NOT EXISTS
|
||||
-- recovery.partial: ALTER TABLE qt_configurations DROP COLUMN feature_flags;
|
||||
-- recovery.completed: no action needed
|
||||
-- verify: feature_flags column missing | SELECT 1 FROM information_schema.COLUMNS WHERE table_schema=DATABASE() AND table_name='qt_configurations' AND column_name='feature_flags' HAVING COUNT(*)=0
|
||||
|
||||
-- Per-configuration feature flags (JSON array of strings, NULL = none). A client refuses
|
||||
-- to write a configuration carrying a flag it doesn't know. See
|
||||
-- bible-local/decisions/2026-09-24-configuration-feature-flags.md.
|
||||
ALTER TABLE qt_configurations
|
||||
ADD COLUMN IF NOT EXISTS feature_flags JSON NULL;
|
||||
@@ -0,0 +1,20 @@
|
||||
# QuoteForge v3.41
|
||||
|
||||
Дата релиза: 2026-09-17
|
||||
Тег: `v3.41`
|
||||
|
||||
Предыдущий релиз: `v3.40`
|
||||
|
||||
## Ключевые изменения
|
||||
|
||||
- накидка по строке в таблице «Цена продажи» + минимальный CSV-экспорт;
|
||||
- фикс: накидка по строке в «Цена продажи» не пересчитывала цену;
|
||||
- минимальная высота строк в таблицах вкладки «Ценообразование»;
|
||||
- артикул: распознавание DPU/BlueField-профиля (`DPU_BF3_...`, `DPU_BF2_...`) — больше не падает в заглушку категории NET;
|
||||
- имя варианта проекта с недопустимыми символами или зарезервированным словом `main` больше не блокирует создание/переименование — автоматически конвертируется в валидное, с предупреждением вместо ошибки;
|
||||
- длинное имя варианта больше не корёжит кнопки в хедере конфигуратора (усечение в хлебных крошках + защита вёрстки).
|
||||
|
||||
## Запуск на macOS
|
||||
|
||||
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||
@@ -0,0 +1,18 @@
|
||||
# QuoteForge v3.42
|
||||
|
||||
Дата релиза: 2026-09-24
|
||||
Тег: `v3.42`
|
||||
|
||||
Предыдущий релиз: `v3.41`
|
||||
|
||||
## Ключевые изменения
|
||||
|
||||
- отрицательная накидка по строке в «Цена продажи» теперь работает (скидка); итоговая цена строки не уходит ниже нуля — ни в таблице, ни в CSV;
|
||||
- накидки больше не теряются при сохранении: клиент переносит незнакомые ему поля `notes` как есть. Клиенты до v3.41 по-прежнему стирают построчные накидки при сохранении, а v3.41 — отрицательные: всем нужно обновиться;
|
||||
- фича-флаги конфигурации (`feature_flags`): если конфигурация использует функцию, неизвестную этой версии, клиент отказывается её сохранять и синхронизировать, показывает баннер со списком неизвестных флагов и просит обновиться. Первый флаг — `sale_row_markups`;
|
||||
- **требуется серверная миграция `034_add_feature_flags_to_configurations.sql`** (`qfs -migrate`); без неё синхронизация работает, но флаги на сервере не сохраняются.
|
||||
|
||||
## Запуск на macOS
|
||||
|
||||
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||
@@ -0,0 +1,19 @@
|
||||
# QuoteForge v3.43
|
||||
|
||||
Дата релиза: 2026-09-24
|
||||
Тег: `v3.43`
|
||||
|
||||
Предыдущий релиз: `v3.42`
|
||||
|
||||
## Ключевые изменения
|
||||
|
||||
- серверные миграции: `qfs -migrate` (`make migrate`) применяет только SQL-файлы `migrations/*.sql`, встроенные в бинарник, с учётом в `qt_schema_migrations`, и завершается без запуска приложения;
|
||||
- новые команды `make migrate-status` (список применённых/ожидающих миграций, только чтение) и `make migrate-baseline UPTO=<file.sql>` (пометить миграции применёнными без выполнения);
|
||||
- `-migrate` отказывается работать, если в истории нет ни одной применённой миграции, — иначе все файлы выполнились бы заново;
|
||||
- удалён GORM AutoMigrate против MariaDB: он менял типы колонок боевой базы под модели запущенного бинарника;
|
||||
- миграции идут через отдельное соединение без 3-секундного таймаута — длинный backfill (032) больше не обрывается.
|
||||
|
||||
## Запуск на macOS
|
||||
|
||||
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||
@@ -0,0 +1,17 @@
|
||||
# QuoteForge v3.44
|
||||
|
||||
Дата релиза: 2026-09-24
|
||||
Тег: `v3.44`
|
||||
|
||||
Предыдущий релиз: `v3.43`
|
||||
|
||||
## Ключевые изменения
|
||||
|
||||
- модалка «Новая конфигурация в проекте» строит кнопки типа оборудования из серверной настройки `qt_settings.config_types` — новые типы (например, «Сеть») появляются без релиза клиента;
|
||||
- кнопка полной синхронизации теперь сразу подтягивает серверные настройки конфигуратора (`qt_settings`), а не только фоновый воркер раз в 5 минут;
|
||||
- копирование конфигурации (в т.ч. из версии) сохраняет тип оборудования — раньше копия СХД/сети становилась «сервером».
|
||||
|
||||
## Запуск на macOS
|
||||
|
||||
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||
@@ -0,0 +1,18 @@
|
||||
# QuoteForge v3.45
|
||||
|
||||
Дата релиза: 2026-09-24
|
||||
Тег: `v3.45`
|
||||
|
||||
Предыдущий релиз: `v3.44`
|
||||
|
||||
## Ключевые изменения
|
||||
|
||||
- вкладки конфигуратора (набор, порядок, названия) строятся из серверной настройки `qt_settings.tab_config` — вкладка, убранная на сервере (например, SW), больше не остаётся пустой кнопкой, новые вкладки появляются без релиза клиента;
|
||||
- из страницы конфигуратора убраны захардкоженные вкладки и фильтры категорий по типу конфигурации; единственный запасной вариант — встроенные дефолты сервера приложения, используются только если настройки ещё ни разу не синхронизировались;
|
||||
- по умолчанию всегда видна только вкладка Base, остальные скрываются, если для типа конфигурации в них нечего выбрать;
|
||||
- настройки конфигуратора загружаются до списка категорий — вкладка «Other» больше не захватывает категории, которые относятся к серверным вкладкам.
|
||||
|
||||
## Запуск на macOS
|
||||
|
||||
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||
@@ -0,0 +1,15 @@
|
||||
# QuoteForge v3.46
|
||||
|
||||
Дата релиза: 2026-10-02
|
||||
Тег: `v3.46`
|
||||
|
||||
Предыдущий релиз: `v3.45`
|
||||
|
||||
## Ключевые изменения
|
||||
|
||||
- в конфигураторе поверх выпадашки выбора LOT больше не появляется второй список — история автозаполнения браузера; она отключена на всех полях с собственной выпадашкой (вкладка Base, остальные вкладки, редактирование позиции, сопоставление BOM).
|
||||
|
||||
## Запуск на macOS
|
||||
|
||||
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||
@@ -0,0 +1,16 @@
|
||||
# QuoteForge v3.47
|
||||
|
||||
Дата релиза: 2026-10-05
|
||||
Тег: `v3.47`
|
||||
|
||||
Предыдущий релиз: `v3.46`
|
||||
|
||||
## Ключевые изменения
|
||||
|
||||
- конфигурации, застрявшие в статусе «pending» без записи в очереди синка, теперь автоматически ставятся в очередь заново и уходят на сервер при следующем цикле синка;
|
||||
- фоновый синк разделён на независимые потоки: ошибка push, готовности или синка прайслистов больше не останавливает синк партбуков и настроек конфигуратора.
|
||||
|
||||
## Запуск на macOS
|
||||
|
||||
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||
@@ -0,0 +1,16 @@
|
||||
# QuoteForge v3.48
|
||||
|
||||
Дата релиза: 2026-10-14
|
||||
Тег: `v3.48`
|
||||
|
||||
Предыдущий релиз: `v3.47`
|
||||
|
||||
## Ключевые изменения
|
||||
|
||||
- режим расчёта поддержки HGX теперь выбирается только для GPU с SXM/HGX в названии или H100/H200/B200/B300 не в PCIe-исполнении; серверы с PCIe GPU (например, A30) считаются как x86 — процент от цены;
|
||||
- значения по умолчанию цен поддержки HGX обновлены по регламенту от 2026-10-07 (основной источник цен — `qt_settings["support_pricing"]` в MariaDB, его нужно обновить отдельно).
|
||||
|
||||
## Запуск на macOS
|
||||
|
||||
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||
@@ -0,0 +1,17 @@
|
||||
# QuoteForge v3.49
|
||||
|
||||
Дата релиза: 2026-10-16
|
||||
Тег: `v3.49`
|
||||
|
||||
Предыдущий релиз: `v3.48`
|
||||
|
||||
## Ключевые изменения
|
||||
|
||||
- вкладка «Ценообразование», таблица «Цена покупки»: колонки Estimate / Склад / Конкуренты / Ручная цена показывают сумму по строке (цена × кол-во), как «Цена продажи» — строки теперь складываются в «Итого»;
|
||||
- доля «Ручной цены» и кнопка «BOM Цена» также показывают суммы по строке, а не цену за штуку;
|
||||
- подпись над таблицами исправлена: «Суммы за всё количество» вместо «Цены указаны за 1 шт.».
|
||||
|
||||
## Запуск на macOS
|
||||
|
||||
Снимите карантинный атрибут через терминал: `xattr -d com.apple.quarantine /path/to/qfs-darwin-arm64`
|
||||
После этого бинарник запустится без предупреждения Gatekeeper.
|
||||
@@ -21,6 +21,9 @@ fi
|
||||
echo -e "${GREEN}Building QuoteForge version: ${VERSION}${NC}"
|
||||
echo ""
|
||||
|
||||
# Stop before creating release artifacts if reachable vulnerabilities are found.
|
||||
make security-check
|
||||
|
||||
ensure_release_notes() {
|
||||
local notes_path="$1"
|
||||
if [ -f "${notes_path}" ]; then
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
const assert = require('node:assert/strict');
|
||||
const fs = require('node:fs');
|
||||
const vm = require('node:vm');
|
||||
const source = fs.readFileSync('web/templates/index.html', 'utf8');
|
||||
const base = fs.readFileSync('web/templates/base.html', 'utf8');
|
||||
const nodes = {};
|
||||
const listeners = {};
|
||||
const calls = [];
|
||||
const context = vm.createContext({
|
||||
document: {
|
||||
getElementById: id => nodes[id] ??= {},
|
||||
createElement: () => ({}),
|
||||
addEventListener: (name, handler) => listeners[name] = handler,
|
||||
},
|
||||
setTimeout: () => {},
|
||||
cart: [], allComponents: [], currentTab: 'cpu',
|
||||
getTabForCategory: () => 'cpu', getDisplayPrice: () => 1,
|
||||
qualityDotHtml: () => '', formatMoney: String, formatPriceOrNA: String,
|
||||
removeFromCart: lot => calls.push(['remove', lot]),
|
||||
updateMultiQuantity: (lot, value) => calls.push(['quantity', lot, value]),
|
||||
onRentalConditionChange: (lot, value) => calls.push(['condition', lot, value]),
|
||||
showAutocompleteEditItem: lot => calls.push(['edit', lot]),
|
||||
});
|
||||
function loadFunction(text, name) {
|
||||
const start = text.indexOf(`function ${name}(`);
|
||||
assert(start >= 0);
|
||||
const end = text.indexOf('\n}', start);
|
||||
// Functions in base.html have eight spaces of indentation.
|
||||
const baseEnd = text.indexOf('\n }', start);
|
||||
vm.runInContext(text.slice(start, (end < 0 ? baseEnd + 10 : end + 2)), context);
|
||||
}
|
||||
vm.runInContext(fs.readFileSync('web/static/html-escape.js', 'utf8'), context);
|
||||
loadFunction(source, 'renderMultiSelectTab');
|
||||
vm.runInContext(source.split('<script>')[1].split('// Tab configuration')[0], context);
|
||||
loadFunction(base, 'showToast');
|
||||
nodes.toast = {replaceChildren: child => nodes.toast.child = child};
|
||||
for (const lot of [`LOT'\"<img src=x onerror=alert(1)>`, 'LOTa');alert(1)//', 'LOT\\\'()&<>']) {
|
||||
context.cart = [{lot_name: lot, quantity: 1, category: 'cpu'}];
|
||||
context.renderMultiSelectTab([]);
|
||||
const html = nodes['tab-content'].innerHTML;
|
||||
assert(html.includes(`data-lot="${context.escapeHtml(lot)}"`));
|
||||
assert(!html.includes(lot));
|
||||
assert(!html.includes('onclick="removeFromCart('));
|
||||
listeners.click({target: {closest: () => ({dataset: {lot}})}});
|
||||
listeners.change({target: {dataset: {lot, cartAction: 'quantity'}, value: '2'}});
|
||||
listeners.change({target: {dataset: {lot, cartAction: 'condition'}, checked: true}});
|
||||
listeners.focusin({target: {dataset: {lot, cartAction: 'edit'}}});
|
||||
assert(calls.splice(0).every(call => call[1] === lot));
|
||||
context.showToast(lot, 'error');
|
||||
assert.equal(nodes.toast.child.textContent, lot);
|
||||
assert.equal(nodes.toast.child.innerHTML, undefined);
|
||||
}
|
||||
assert.equal(context.escapeHtml(0), '0');
|
||||
assert.equal(context.escapeHtml(null), '');
|
||||
console.log('HTML security regressions passed');
|
||||
@@ -0,0 +1,9 @@
|
||||
// Escape text for HTML text nodes and quoted attributes, never JavaScript code.
|
||||
function escapeHtml(value) {
|
||||
return String(value ?? '')
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''');
|
||||
}
|
||||
+11
-7
@@ -10,6 +10,7 @@
|
||||
<script src="/static/vendor/htmx-1.9.10.min.js"></script>
|
||||
<script>window.QF_INDICATOR_MODE = "{{ .IndicatorMode }}";</script>
|
||||
<script src="/static/price-quality.js"></script>
|
||||
<script src="/static/html-escape.js"></script>
|
||||
<style>
|
||||
.htmx-request { opacity: 0.5; }
|
||||
.line-clamp-2 { display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; }
|
||||
@@ -222,7 +223,10 @@
|
||||
function showToast(msg, type) {
|
||||
const colors = { success: 'bg-green-500', error: 'bg-red-500', info: 'bg-blue-500' };
|
||||
const el = document.getElementById('toast');
|
||||
el.innerHTML = '<div class="' + (colors[type] || colors.info) + ' text-white px-4 py-2 rounded shadow">' + msg + '</div>';
|
||||
const message = document.createElement('div');
|
||||
message.className = (colors[type] || colors.info) + ' text-white px-4 py-2 rounded shadow';
|
||||
message.textContent = msg;
|
||||
el.replaceChildren(message);
|
||||
setTimeout(() => el.innerHTML = '', 3000);
|
||||
}
|
||||
|
||||
@@ -340,11 +344,11 @@
|
||||
const shortUUID = ch.entity_uuid.substring(0, 8);
|
||||
const time = new Date(ch.created_at).toLocaleString('ru-RU');
|
||||
const hasError = ch.last_error ? ' border-l-2 border-red-400 pl-2' : '';
|
||||
const errorLine = ch.last_error ? `<div class="text-red-500 text-xs mt-0.5">${ch.last_error}</div>` : '';
|
||||
const errorLine = ch.last_error ? `<div class="text-red-500 text-xs mt-0.5">${escapeHtml(ch.last_error)}</div>` : '';
|
||||
return `<div class="bg-gray-50 rounded px-3 py-1.5${hasError}">
|
||||
<span class="font-medium">${ch.operation}</span>
|
||||
<span class="text-gray-500">${ch.entity_type}</span>
|
||||
<span class="font-mono text-xs text-gray-400">${shortUUID}</span>
|
||||
<span class="font-medium">${escapeHtml(ch.operation)}</span>
|
||||
<span class="text-gray-500">${escapeHtml(ch.entity_type)}</span>
|
||||
<span class="font-mono text-xs text-gray-400">${escapeHtml(shortUUID)}</span>
|
||||
<span class="text-gray-400 text-xs ml-1">${time}</span>
|
||||
${errorLine}
|
||||
</div>`;
|
||||
@@ -362,7 +366,7 @@
|
||||
errorsList.innerHTML = data.errors.map(error => {
|
||||
const time = new Date(error.timestamp).toLocaleString('ru-RU');
|
||||
return `<div class="bg-red-50 text-red-700 rounded px-3 py-1.5">
|
||||
<span class="text-xs text-red-400">${time}</span>: ${error.message}
|
||||
<span class="text-xs text-red-400">${time}</span>: ${escapeHtml(error.message)}
|
||||
</div>`;
|
||||
}).join('');
|
||||
} else {
|
||||
@@ -409,7 +413,7 @@
|
||||
resultDiv.className = 'mt-2 text-sm text-yellow-700 bg-yellow-50 rounded px-3 py-2';
|
||||
resultDiv.textContent = 'Нечего исправлять или проблемы остались';
|
||||
if (data.remaining_errors && data.remaining_errors.length > 0) {
|
||||
resultDiv.innerHTML += '<div class="mt-1 text-xs">' + data.remaining_errors.join('<br>') + '</div>';
|
||||
resultDiv.innerHTML += '<div class="mt-1 text-xs">' + data.remaining_errors.map(escapeHtml).join('<br>') + '</div>';
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -36,11 +36,6 @@ const configUUID = '{{.ConfigUUID}}';
|
||||
let configData = null;
|
||||
let projectData = null;
|
||||
|
||||
function escapeHtml(text) {
|
||||
const div = document.createElement('div');
|
||||
div.textContent = text || '';
|
||||
return div.innerHTML;
|
||||
}
|
||||
|
||||
function formatMoney(value) {
|
||||
const num = Number(value);
|
||||
|
||||
@@ -408,11 +408,6 @@ async function resolveUniqueConfigName(baseName, projectUUID, excludeUUID) {
|
||||
return {name: candidate, changed: true};
|
||||
}
|
||||
|
||||
function escapeHtml(text) {
|
||||
const div = document.createElement('div');
|
||||
div.textContent = text;
|
||||
return div.innerHTML;
|
||||
}
|
||||
|
||||
async function deleteConfig(uuid) {
|
||||
if (!confirm('Переместить конфигурацию в архив?')) return;
|
||||
|
||||
+157
-150
@@ -37,13 +37,24 @@
|
||||
title="Настройки цен">
|
||||
Цены
|
||||
</button>
|
||||
<button onclick="saveConfig()" class="px-4 py-2 bg-green-600 text-white rounded hover:bg-green-700">
|
||||
<button id="save-config-btn" onclick="saveConfig()" class="px-4 py-2 bg-green-600 text-white rounded hover:bg-green-700 disabled:opacity-50 disabled:cursor-not-allowed">
|
||||
Сохранить
|
||||
</button>
|
||||
<span id="price-update-date" class="text-sm text-gray-500"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Shown when the config carries feature flags this build doesn't know: saving is refused
|
||||
(see setConfigUnsupportedFeatures / internal/configfeatures). -->
|
||||
<div id="config-unsupported-banner" class="hidden bg-red-50 border border-red-200 text-red-800 rounded-lg px-4 py-3 text-sm" role="alert">
|
||||
<div class="font-semibold">Эта конфигурация создана в более новой версии QuoteForge</div>
|
||||
<div class="mt-1">
|
||||
Она использует функции, которых нет в вашей версии:
|
||||
<span id="config-unsupported-list" class="font-mono"></span>.
|
||||
Сохранение отключено, чтобы не потерять эти данные. Обновите приложение, чтобы редактировать конфигурацию.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Server count input -->
|
||||
<div class="bg-white rounded-lg shadow p-4 mb-4">
|
||||
<div class="flex items-center space-x-4">
|
||||
@@ -92,34 +103,7 @@
|
||||
<div class="bg-white rounded-lg shadow">
|
||||
<div class="border-b">
|
||||
<nav class="flex overflow-x-auto" id="category-tabs">
|
||||
<button onclick="switchTab('base')" data-tab="base"
|
||||
class="tab-btn px-4 py-3 text-sm font-medium border-b-2 border-blue-600 text-blue-600 whitespace-nowrap">
|
||||
Base
|
||||
</button>
|
||||
<button onclick="switchTab('storage')" data-tab="storage"
|
||||
class="tab-btn px-4 py-3 text-sm font-medium border-b-2 border-transparent text-gray-500 hover:text-gray-700 whitespace-nowrap">
|
||||
Storage
|
||||
</button>
|
||||
<button onclick="switchTab('pci')" data-tab="pci"
|
||||
class="tab-btn px-4 py-3 text-sm font-medium border-b-2 border-transparent text-gray-500 hover:text-gray-700 whitespace-nowrap">
|
||||
PCI
|
||||
</button>
|
||||
<button onclick="switchTab('power')" data-tab="power"
|
||||
class="tab-btn px-4 py-3 text-sm font-medium border-b-2 border-transparent text-gray-500 hover:text-gray-700 whitespace-nowrap">
|
||||
Power
|
||||
</button>
|
||||
<button onclick="switchTab('accessories')" data-tab="accessories"
|
||||
class="tab-btn px-4 py-3 text-sm font-medium border-b-2 border-transparent text-gray-500 hover:text-gray-700 whitespace-nowrap">
|
||||
Accessories
|
||||
</button>
|
||||
<button onclick="switchTab('sw')" data-tab="sw"
|
||||
class="tab-btn px-4 py-3 text-sm font-medium border-b-2 border-transparent text-gray-500 hover:text-gray-700 whitespace-nowrap">
|
||||
SW
|
||||
</button>
|
||||
<button onclick="switchTab('other')" data-tab="other"
|
||||
class="tab-btn px-4 py-3 text-sm font-medium border-b-2 border-transparent text-gray-500 hover:text-gray-700 whitespace-nowrap">
|
||||
Other
|
||||
</button>
|
||||
<!-- Buttons are rendered from TAB_CONFIG (qt_settings.tab_config) by renderTabButtons() -->
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
@@ -216,7 +200,7 @@
|
||||
<div class="bg-white rounded-lg shadow p-4">
|
||||
<div class="flex items-baseline gap-3 mb-3">
|
||||
<h3 class="text-base font-semibold text-gray-800">Цена покупки</h3>
|
||||
<span class="text-xs text-gray-400">Цены указаны за 1 шт.</span>
|
||||
<span class="text-xs text-gray-400">Суммы за всё количество</span>
|
||||
</div>
|
||||
<div class="overflow-x-auto">
|
||||
<table class="w-full text-sm border-collapse">
|
||||
@@ -265,7 +249,7 @@
|
||||
<div class="bg-white rounded-lg shadow p-4">
|
||||
<div class="flex items-baseline gap-3 mb-1">
|
||||
<h3 class="text-base font-semibold text-gray-800">Цена продажи</h3>
|
||||
<span class="text-xs text-gray-400">Цены указаны за 1 шт.</span>
|
||||
<span class="text-xs text-gray-400">Суммы за всё количество</span>
|
||||
</div>
|
||||
<div class="overflow-x-auto">
|
||||
<table class="w-full text-sm border-collapse">
|
||||
@@ -420,48 +404,22 @@
|
||||
</style>
|
||||
|
||||
<script>
|
||||
// Tab configuration - will be populated dynamically
|
||||
document.addEventListener('click', event => {
|
||||
const button = event.target.closest('[data-cart-action="remove"]');
|
||||
if (button) removeFromCart(button.dataset.lot);
|
||||
});
|
||||
document.addEventListener('change', event => {
|
||||
const input = event.target;
|
||||
if (input.dataset.cartAction === 'quantity') updateMultiQuantity(input.dataset.lot, input.value);
|
||||
if (input.dataset.cartAction === 'condition') onRentalConditionChange(input.dataset.lot, input.checked);
|
||||
});
|
||||
document.addEventListener('focusin', event => {
|
||||
if (event.target.dataset.cartAction === 'edit') showAutocompleteEditItem(event.target.dataset.lot, event.target);
|
||||
});
|
||||
// Tab configuration comes from /api/configurator-settings (qt_settings.tab_config,
|
||||
// or the Go-side fallback when the key is absent) — see applyServerSettings().
|
||||
// Only "other" is client-owned: it collects categories not listed in any tab.
|
||||
let TAB_CONFIG = {
|
||||
base: {
|
||||
categories: ['MB', 'CPU', 'MEM', 'ENC', 'DKC', 'CTL'],
|
||||
singleSelect: true,
|
||||
label: 'Base'
|
||||
},
|
||||
storage: {
|
||||
categories: ['RAID', 'M2', 'SSD', 'HDD', 'EDSFF', 'HHHL'],
|
||||
singleSelect: false,
|
||||
label: 'Storage',
|
||||
sections: [
|
||||
{ title: 'RAID Контроллеры', categories: ['RAID'] },
|
||||
{ title: 'Диски', categories: ['M2', 'SSD', 'HDD', 'EDSFF', 'HHHL'] }
|
||||
]
|
||||
},
|
||||
pci: {
|
||||
categories: ['GPU', 'DPU', 'NIC', 'HCA', 'HBA', 'HIC'],
|
||||
singleSelect: false,
|
||||
label: 'PCI',
|
||||
sections: [
|
||||
{ title: 'GPU / DPU', categories: ['GPU', 'DPU'] },
|
||||
{ title: 'NIC / HCA', categories: ['NIC', 'HCA'] },
|
||||
{ title: 'HBA', categories: ['HBA'] },
|
||||
{ title: 'HIC', categories: ['HIC'] }
|
||||
]
|
||||
},
|
||||
power: {
|
||||
categories: ['PS', 'PSU'],
|
||||
singleSelect: false,
|
||||
label: 'Power'
|
||||
},
|
||||
accessories: {
|
||||
categories: ['ACC', 'CARD'],
|
||||
singleSelect: false,
|
||||
label: 'Accessories'
|
||||
},
|
||||
sw: {
|
||||
categories: ['SW'],
|
||||
singleSelect: false,
|
||||
label: 'SW'
|
||||
},
|
||||
other: {
|
||||
categories: [],
|
||||
singleSelect: false,
|
||||
@@ -568,7 +526,7 @@ let allComponents = [];
|
||||
let cart = [];
|
||||
let categoryOrderMap = {}; // Category code -> display_order mapping
|
||||
let configTypeCategoryMap = {}; // configTypeCode → Set<UPPER_CODE> of allowed categories (from server)
|
||||
let alwaysVisibleTabsSet = null; // Set<tabKey> — null means use hardcoded fallback
|
||||
let alwaysVisibleTabsSet = new Set(); // Set<tabKey> from qt_settings.always_visible_tabs
|
||||
let requiredCategoriesMap = {}; // configTypeCode → Set<UPPER_CODE> of required categories
|
||||
let autoSaveTimeout = null; // Timeout for debounced autosave
|
||||
let hasUnsavedChanges = false;
|
||||
@@ -623,6 +581,31 @@ const PricingMarkup = {
|
||||
// reads it live rather than relying on per-render input state.
|
||||
let saleRowMarkups = {};
|
||||
|
||||
// Feature flags of this configuration unknown to this build (server-computed
|
||||
// unsupported_features). Non-empty → saving is refused both here and by the backend.
|
||||
let configUnsupportedFeatures = [];
|
||||
|
||||
function setConfigUnsupportedFeatures(flags) {
|
||||
configUnsupportedFeatures = Array.isArray(flags) ? flags.filter(Boolean) : [];
|
||||
const blocked = configUnsupportedFeatures.length > 0;
|
||||
document.getElementById('config-unsupported-banner')?.classList.toggle('hidden', !blocked);
|
||||
const list = document.getElementById('config-unsupported-list');
|
||||
if (list) list.textContent = configUnsupportedFeatures.join(', ');
|
||||
const btn = document.getElementById('save-config-btn');
|
||||
if (btn) btn.disabled = blocked;
|
||||
}
|
||||
|
||||
function unsupportedFeaturesMessage() {
|
||||
return 'Сохранение невозможно: конфигурация использует функции, неизвестные этой версии ('
|
||||
+ configUnsupportedFeatures.join(', ') + '). Обновите приложение.';
|
||||
}
|
||||
|
||||
// Notes keys this client doesn't understand (top-level and inside pricing_ui), kept from
|
||||
// the last restorePricingStateFromNotes() and written back verbatim on save — otherwise
|
||||
// an older client re-saving a config silently drops fields added by a newer one.
|
||||
let loadedNotesExtra = {};
|
||||
let loadedPricingUIExtra = {};
|
||||
|
||||
// Amber marker for world-fallback cells — must stay outside gray/green/red/blue
|
||||
// families since applyCustomPrice() strips those on vendor-price cells via regex.
|
||||
// Shared by renderPricingTab() (initial paint) and recomputeSalePrices() (re-paint on
|
||||
@@ -939,6 +922,7 @@ function applyServerSettings(settings) {
|
||||
supportPricingTable = settings.support_pricing;
|
||||
}
|
||||
|
||||
renderTabButtons();
|
||||
applyConfigTypeToTabs();
|
||||
updateTabVisibility();
|
||||
updateRequiredCategoryBadges();
|
||||
@@ -981,9 +965,10 @@ document.addEventListener('DOMContentLoaded', async function() {
|
||||
return;
|
||||
}
|
||||
|
||||
// Load categories and configurator settings in background (defaults are usable immediately).
|
||||
const categoriesPromise = loadCategoriesFromAPI().catch(() => {});
|
||||
loadCfgSettings().then(s => applyServerSettings(s)).catch(() => {});
|
||||
// Tabs come from configurator settings; "other" is derived from them, so
|
||||
// categories load after settings.
|
||||
const settingsPromise = loadCfgSettings().then(s => applyServerSettings(s)).catch(() => {});
|
||||
const categoriesPromise = settingsPromise.then(() => loadCategoriesFromAPI()).catch(() => {});
|
||||
|
||||
try {
|
||||
const resp = await fetch('/api/configs/' + configUUID);
|
||||
@@ -997,6 +982,7 @@ document.addEventListener('DOMContentLoaded', async function() {
|
||||
const config = await resp.json();
|
||||
configName = config.name;
|
||||
configType = config.config_type || 'server';
|
||||
await settingsPromise;
|
||||
applyConfigTypeToTabs();
|
||||
currentVersionNo = config.current_version_no || 1;
|
||||
projectUUID = config.project_uuid || '';
|
||||
@@ -1037,6 +1023,7 @@ document.addEventListener('DOMContentLoaded', async function() {
|
||||
supportCode = parseSupportCodeFromLotName((cart.find(i => (i.lot_name || '').toUpperCase().startsWith('SVC_')) || {}).lot_name);
|
||||
currentArticle = config.article || '';
|
||||
restorePricingStateFromNotes(config.notes || '');
|
||||
setConfigUnsupportedFeatures(config.unsupported_features);
|
||||
|
||||
// Restore custom price if saved
|
||||
if (config.custom_price) {
|
||||
@@ -1351,6 +1338,26 @@ function getTabForCategory(category) {
|
||||
return 'other';
|
||||
}
|
||||
|
||||
// Tab buttons mirror TAB_CONFIG (qt_settings.tab_config order, "other" last), so
|
||||
// tabs added, removed or relabelled on the server need no client release.
|
||||
function renderTabButtons() {
|
||||
const nav = document.getElementById('category-tabs');
|
||||
if (!nav) return;
|
||||
const keys = Object.keys(TAB_CONFIG).filter(k => k !== 'other');
|
||||
keys.push('other');
|
||||
if (!TAB_CONFIG[currentTab]) currentTab = firstTabKey();
|
||||
nav.replaceChildren(...keys.map(key => {
|
||||
const btn = document.createElement('button');
|
||||
btn.type = 'button';
|
||||
btn.dataset.tab = key;
|
||||
btn.className = 'tab-btn px-4 py-3 text-sm font-medium border-b-2 whitespace-nowrap hover:text-gray-700 ' +
|
||||
(key === currentTab ? 'border-blue-600 text-blue-600' : 'border-transparent text-gray-500');
|
||||
btn.textContent = TAB_CONFIG[key]?.label || key;
|
||||
btn.addEventListener('click', () => switchTab(key));
|
||||
return btn;
|
||||
}));
|
||||
}
|
||||
|
||||
function switchTab(tab) {
|
||||
currentTab = tab;
|
||||
document.querySelectorAll('.tab-btn').forEach(btn => {
|
||||
@@ -1366,35 +1373,15 @@ function switchTab(tab) {
|
||||
renderTab();
|
||||
}
|
||||
|
||||
// Hardcoded fallback constants — used only when server has not provided config_types data
|
||||
const ALWAYS_VISIBLE_TABS = new Set(['base', 'storage', 'pci']);
|
||||
const STORAGE_ONLY_BASE_CATEGORIES = ['DKC', 'CTL', 'ENC'];
|
||||
const SERVER_ONLY_BASE_CATEGORIES = ['MB', 'CPU', 'MEM'];
|
||||
const STORAGE_HIDDEN_STORAGE_CATEGORIES = ['RAID'];
|
||||
const STORAGE_HIDDEN_PCI_CATEGORIES = ['GPU', 'DPU'];
|
||||
const STORAGE_HIDDEN_POWER_CATEGORIES = ['PS', 'PSU'];
|
||||
|
||||
// A config type without an allowlist in config_types sees every category.
|
||||
function isCategoryVisibleForConfigType(code, cfgType) {
|
||||
const allowed = configTypeCategoryMap[cfgType];
|
||||
if (!allowed || allowed.size === 0) return _hardcodedCategoryVisible(code, cfgType);
|
||||
if (!allowed || allowed.size === 0) return true;
|
||||
return allowed.has(code.toUpperCase());
|
||||
}
|
||||
|
||||
function _hardcodedCategoryVisible(code, cfgType) {
|
||||
if (cfgType === 'storage') {
|
||||
if (STORAGE_ONLY_BASE_CATEGORIES.includes(code)) return true;
|
||||
if (SERVER_ONLY_BASE_CATEGORIES.includes(code)) return false;
|
||||
if (STORAGE_HIDDEN_STORAGE_CATEGORIES.includes(code)) return false;
|
||||
if (STORAGE_HIDDEN_PCI_CATEGORIES.includes(code)) return false;
|
||||
if (STORAGE_HIDDEN_POWER_CATEGORIES.includes(code)) return false;
|
||||
} else {
|
||||
if (STORAGE_ONLY_BASE_CATEGORIES.includes(code)) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function _effectiveAlwaysVisibleTabs() {
|
||||
return alwaysVisibleTabsSet || ALWAYS_VISIBLE_TABS;
|
||||
function firstTabKey() {
|
||||
return Object.keys(TAB_CONFIG).find(k => k !== 'other') || 'other';
|
||||
}
|
||||
|
||||
function applyConfigTypeToTabs() {
|
||||
@@ -1429,7 +1416,7 @@ function applyConfigTypeToTabs() {
|
||||
}
|
||||
|
||||
function updateTabVisibility() {
|
||||
const visibleTabs = _effectiveAlwaysVisibleTabs();
|
||||
const visibleTabs = alwaysVisibleTabsSet;
|
||||
for (const tabId of Object.keys(TAB_CONFIG)) {
|
||||
if (visibleTabs.has(tabId)) continue;
|
||||
const btn = document.querySelector(`[data-tab="${tabId}"]`);
|
||||
@@ -1440,15 +1427,16 @@ function updateTabVisibility() {
|
||||
});
|
||||
const visible = hasComponents || hasCartItems;
|
||||
btn.classList.toggle('hidden', !visible);
|
||||
// If the current tab just got hidden, fall back to base
|
||||
// If the current tab just got hidden, fall back to the first tab
|
||||
if (!visible && currentTab === tabId) {
|
||||
switchTab('base');
|
||||
switchTab(firstTabKey());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getComponentsForTab(tab) {
|
||||
const config = TAB_CONFIG[tab];
|
||||
if (!config) return [];
|
||||
return allComponents.filter(comp => {
|
||||
const category = getComponentCategory(comp);
|
||||
if (tab === 'other') {
|
||||
@@ -1466,6 +1454,7 @@ function getComponentsForCategory(category) {
|
||||
|
||||
function renderTab() {
|
||||
const config = TAB_CONFIG[currentTab];
|
||||
if (!config) return; // tab_config not loaded yet
|
||||
const components = getComponentsForTab(currentTab);
|
||||
|
||||
if (config.singleSelect) {
|
||||
@@ -1546,10 +1535,10 @@ function renderSingleSelectTab(categories) {
|
||||
<div class="autocomplete-wrapper relative">
|
||||
<input type="text"
|
||||
id="input-${cat}"
|
||||
value="${selectedItem?.lot_name || ''}"
|
||||
value="${escapeHtml(selectedItem?.lot_name || '')}"
|
||||
placeholder="Введите артикул..."
|
||||
class="w-full px-2 py-1 border rounded text-sm font-mono"
|
||||
onfocus="showAutocomplete('${cat}', this)"
|
||||
autocomplete="off" onfocus="showAutocomplete('${cat}', this)"
|
||||
oninput="filterAutocomplete('${cat}', this.value)"
|
||||
onkeydown="handleAutocompleteKey(event, '${cat}')">
|
||||
</div>
|
||||
@@ -1615,7 +1604,7 @@ function renderMultiSelectTab(components) {
|
||||
<input type="text"
|
||||
value="${escapeHtml(item.lot_name)}"
|
||||
class="w-full px-2 py-1 border rounded text-sm font-mono"
|
||||
onfocus="showAutocompleteEditItem('${item.lot_name}', this)"
|
||||
autocomplete="off" data-lot="${escapeHtml(item.lot_name)}" data-cart-action="edit"
|
||||
oninput="filterAutocompleteEditItem(this.value)"
|
||||
onkeydown="handleAutocompleteKeyEditItem(event)">
|
||||
</div>
|
||||
@@ -1624,12 +1613,12 @@ function renderMultiSelectTab(components) {
|
||||
<td class="px-3 py-2 text-sm text-right">${formatPriceOrNA(item.estimate_price ?? item.unit_price)}</td>
|
||||
<td class="px-3 py-2 text-center">
|
||||
<input type="number" min="1" value="${item.quantity}"
|
||||
onchange="updateMultiQuantity('${item.lot_name}', this.value)"
|
||||
data-lot="${escapeHtml(item.lot_name)}" data-cart-action="quantity"
|
||||
class="w-16 px-2 py-1 border rounded text-center text-sm">
|
||||
</td>
|
||||
<td class="px-3 py-2 text-sm text-right font-medium">${formatMoney(total)}</td>
|
||||
<td class="px-3 py-2 text-center">
|
||||
<button onclick="removeFromCart('${item.lot_name}')" class="text-red-500 hover:text-red-700">
|
||||
<button data-lot="${escapeHtml(item.lot_name)}" data-cart-action="remove" class="text-red-500 hover:text-red-700">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
|
||||
</svg>
|
||||
@@ -1648,7 +1637,7 @@ function renderMultiSelectTab(components) {
|
||||
id="input-new-item"
|
||||
placeholder="Добавить компонент..."
|
||||
class="w-full px-2 py-1 border rounded text-sm"
|
||||
onfocus="showAutocompleteMulti(this)"
|
||||
autocomplete="off" onfocus="showAutocompleteMulti(this)"
|
||||
oninput="filterAutocompleteMulti(this.value)"
|
||||
onkeydown="handleAutocompleteKeyMulti(event)">
|
||||
</div>
|
||||
@@ -1727,7 +1716,7 @@ function renderMultiSelectTabWithSections(sections) {
|
||||
value="${escapeHtml(item.lot_name)}"
|
||||
data-categories="${categoriesStr}"
|
||||
class="w-full px-2 py-1 border rounded text-sm font-mono"
|
||||
onfocus="showAutocompleteEditItem('${item.lot_name}', this)"
|
||||
autocomplete="off" data-lot="${escapeHtml(item.lot_name)}" data-cart-action="edit"
|
||||
oninput="filterAutocompleteEditItem(this.value)"
|
||||
onkeydown="handleAutocompleteKeyEditItem(event)">
|
||||
</div>
|
||||
@@ -1736,12 +1725,12 @@ function renderMultiSelectTabWithSections(sections) {
|
||||
<td class="px-3 py-2 text-sm text-right">${formatPriceOrNA(item.estimate_price ?? item.unit_price)}</td>
|
||||
<td class="px-3 py-2 text-center">
|
||||
<input type="number" min="1" value="${item.quantity}"
|
||||
onchange="updateMultiQuantity('${item.lot_name}', this.value)"
|
||||
data-lot="${escapeHtml(item.lot_name)}" data-cart-action="quantity"
|
||||
class="w-16 px-2 py-1 border rounded text-center text-sm">
|
||||
</td>
|
||||
<td class="px-3 py-2 text-sm text-right font-medium">${formatMoney(total)}</td>
|
||||
<td class="px-3 py-2 text-center">
|
||||
<button onclick="removeFromCart('${item.lot_name}')" class="text-red-500 hover:text-red-700">
|
||||
<button data-lot="${escapeHtml(item.lot_name)}" data-cart-action="remove" class="text-red-500 hover:text-red-700">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
|
||||
</svg>
|
||||
@@ -1761,7 +1750,7 @@ function renderMultiSelectTabWithSections(sections) {
|
||||
data-categories="${categoriesStr}"
|
||||
placeholder="Добавить ${section.title.toLowerCase()}..."
|
||||
class="w-full px-2 py-1 border rounded text-sm"
|
||||
onfocus="showAutocompleteSection('${sectionId}', this)"
|
||||
autocomplete="off" onfocus="showAutocompleteSection('${sectionId}', this)"
|
||||
oninput="filterAutocompleteSection('${sectionId}', this.value, this)"
|
||||
onkeydown="handleAutocompleteKeySection(event, '${sectionId}')">
|
||||
</div>
|
||||
@@ -2323,7 +2312,7 @@ function updateCartUI() {
|
||||
</div>
|
||||
<div class="flex items-center space-x-2">
|
||||
<span>${formatMoney(itemTotal)}</span>
|
||||
<button onclick="removeFromCart('${item.lot_name}')" class="text-red-500 hover:text-red-700">
|
||||
<button data-lot="${escapeHtml(item.lot_name)}" data-cart-action="remove" class="text-red-500 hover:text-red-700">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
|
||||
</svg>
|
||||
@@ -2388,19 +2377,22 @@ function findSupportCartIndex() {
|
||||
return cart.findIndex(i => (i.lot_name || '').toUpperCase().startsWith('SVC_'));
|
||||
}
|
||||
|
||||
// Mirrors the GPU chip-generation classification used by internal/services/rental.go,
|
||||
// so the support picker and the rental calc agree on which platform a config is.
|
||||
// HGX = SXM baseboard servers. Plain PCIe GPUs (A30, L40, H200 NVL PCIe, ...) in a regular
|
||||
// server keep the x86 percent-of-price support model.
|
||||
function detectSupportPlatform() {
|
||||
const actualGenSubstrings = ['H200', 'B200', 'B300', 'BLACKWELL SE'];
|
||||
let sawGPU = false;
|
||||
let platform = 'x86';
|
||||
for (const item of cart) {
|
||||
if ((item.category || '').toUpperCase() !== 'GPU') continue;
|
||||
sawGPU = true;
|
||||
const upperLot = (item.lot_name || '').toUpperCase();
|
||||
const isPCIe = upperLot.includes('PCIE');
|
||||
const isHGX = upperLot.includes('HGX') || upperLot.includes('SXM') ||
|
||||
(!isPCIe && /(H100|H200|B200|B300)/.test(upperLot));
|
||||
if (!isHGX) continue;
|
||||
if (upperLot.includes('B300')) return 'HGX-B300';
|
||||
if (upperLot.includes('B200')) return 'HGX-B200';
|
||||
if (upperLot.includes('B200')) platform = 'HGX-B200';
|
||||
else if (platform === 'x86') platform = 'HGX-H200';
|
||||
}
|
||||
return sawGPU ? 'HGX-H200' : 'x86';
|
||||
return platform;
|
||||
}
|
||||
|
||||
// cartTotal excludes any existing support line so the x86 percent is based on hardware only.
|
||||
@@ -2589,14 +2581,17 @@ function buildPricingState() {
|
||||
const saleUplift = parseDecimalInput(document.getElementById('pricing-uplift-sale')?.value || '');
|
||||
const saleCustom = parseDecimalInput(document.getElementById('pricing-custom-price-sale')?.value || '');
|
||||
|
||||
// Only non-zero entries are kept, so an untouched config serializes exactly like
|
||||
// before this feature (additive key — old clients simply ignore it).
|
||||
// Only non-zero entries are kept (negative = discount), so an untouched config
|
||||
// serializes exactly like before this feature.
|
||||
const rowMarkups = {};
|
||||
Object.entries(saleRowMarkups).forEach(([key, pct]) => {
|
||||
if (pct > 0) rowMarkups[key] = pct;
|
||||
if (Number.isFinite(pct) && pct !== 0) rowMarkups[key] = pct;
|
||||
});
|
||||
|
||||
return {
|
||||
// Keys this client doesn't know (added by a newer version) are carried through
|
||||
// untouched, so saving here never wipes them — see restorePricingStateFromNotes.
|
||||
...loadedPricingUIExtra,
|
||||
buy_custom_price: buyCustom > 0 ? buyCustom : null,
|
||||
sale_uplift: saleUplift > 0 ? saleUplift : null,
|
||||
sale_custom_price: saleCustom > 0 ? saleCustom : null,
|
||||
@@ -2606,6 +2601,7 @@ function buildPricingState() {
|
||||
|
||||
function serializeConfigNotes() {
|
||||
return JSON.stringify({
|
||||
...loadedNotesExtra,
|
||||
pricing_ui: buildPricingState()
|
||||
});
|
||||
}
|
||||
@@ -2619,8 +2615,12 @@ function restorePricingStateFromNotes(notesRaw) {
|
||||
return;
|
||||
}
|
||||
|
||||
const pricing = parsed?.pricing_ui;
|
||||
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return;
|
||||
const { pricing_ui: pricing, ...notesExtra } = parsed;
|
||||
loadedNotesExtra = notesExtra;
|
||||
if (!pricing || typeof pricing !== 'object') return;
|
||||
const { buy_custom_price, sale_uplift, sale_custom_price, sale_row_markups, ...pricingExtra } = pricing;
|
||||
loadedPricingUIExtra = pricingExtra;
|
||||
|
||||
const buyInput = document.getElementById('pricing-custom-price-buy');
|
||||
if (buyInput) {
|
||||
@@ -2648,7 +2648,7 @@ function restorePricingStateFromNotes(notesRaw) {
|
||||
saleRowMarkups = {};
|
||||
if (pricing.sale_row_markups && typeof pricing.sale_row_markups === 'object') {
|
||||
Object.entries(pricing.sale_row_markups).forEach(([key, pct]) => {
|
||||
if (typeof pct === 'number' && Number.isFinite(pct) && pct > 0) {
|
||||
if (typeof pct === 'number' && Number.isFinite(pct) && pct !== 0) {
|
||||
saleRowMarkups[key] = pct;
|
||||
}
|
||||
});
|
||||
@@ -2756,7 +2756,7 @@ function restoreAutosaveDraftIfAny() {
|
||||
}
|
||||
|
||||
function saveConfigOnExit() {
|
||||
if (!configUUID || !hasUnsavedChanges || exitSaveStarted) return;
|
||||
if (!configUUID || !hasUnsavedChanges || exitSaveStarted || configUnsupportedFeatures.length) return;
|
||||
exitSaveStarted = true;
|
||||
try {
|
||||
fetch('/api/configs/' + configUUID, {
|
||||
@@ -2786,6 +2786,10 @@ function triggerAutoSave() {
|
||||
async function saveConfig(showNotification = true) {
|
||||
// RBAC disabled - no token check required
|
||||
if (!configUUID) return;
|
||||
if (configUnsupportedFeatures.length) {
|
||||
if (showNotification) showToast(unsupportedFeaturesMessage(), 'error');
|
||||
return;
|
||||
}
|
||||
if (priceLevelsRefreshTimer) {
|
||||
clearTimeout(priceLevelsRefreshTimer);
|
||||
priceLevelsRefreshTimer = null;
|
||||
@@ -2803,6 +2807,14 @@ async function saveConfig(showNotification = true) {
|
||||
});
|
||||
|
||||
if (!resp.ok) {
|
||||
// 409 unsupported_config_features: a newer client added data this build can't
|
||||
// round-trip (possibly since this page was opened) — lock the page.
|
||||
const errBody = await resp.json().catch(() => null);
|
||||
if (errBody && errBody.code === 'unsupported_config_features') {
|
||||
setConfigUnsupportedFeatures(errBody.unsupported_features);
|
||||
if (showNotification) showToast(unsupportedFeaturesMessage(), 'error');
|
||||
return;
|
||||
}
|
||||
if (showNotification) {
|
||||
showToast('Ошибка сохранения', 'error');
|
||||
}
|
||||
@@ -3410,7 +3422,7 @@ async function renderRentalTab() {
|
||||
return `<tr class="pricing-row-buy">
|
||||
<td class="px-3 py-1.5 text-center text-xs border-t border-gray-200">
|
||||
<input type="checkbox" ${isUsed ? 'checked' : ''}
|
||||
onchange="onRentalConditionChange('${escapeHtml(item.lot_name).replace(/'/g, "\\'")}', this.checked)"
|
||||
data-lot="${escapeHtml(item.lot_name)}" data-cart-action="condition"
|
||||
class="rounded border-gray-300">
|
||||
</td>
|
||||
<td class="px-3 py-1.5 text-xs border-t border-gray-200">${escapeHtml(item.lot_name)}</td>
|
||||
@@ -3747,7 +3759,7 @@ function _bomRawLotCell(rowIdx) {
|
||||
return `<div class="autocomplete-wrapper relative"><input type="text" placeholder="Введите артикул..."
|
||||
value="${escapeHtml(val)}"
|
||||
class="w-full min-w-28 px-2 py-1 border rounded text-xs font-mono"
|
||||
onfocus="showAutocompleteBOM(${rowIdx}, this)"
|
||||
autocomplete="off" onfocus="showAutocompleteBOM(${rowIdx}, this)"
|
||||
oninput="filterAutocompleteBOM(${rowIdx}, this.value); setBOMManualLotDraft(${rowIdx}, this.value, this)"
|
||||
onkeydown="handleAutocompleteKeyBOM(event, ${rowIdx})"></div>
|
||||
${renderBOMLotAllocationsEditor(rowIdx)}`;
|
||||
@@ -4147,14 +4159,14 @@ function _renderBOMParsedTable() {
|
||||
lotCell = `<div class="autocomplete-wrapper relative"><input type="text" placeholder="Введите артикул..."
|
||||
value="${escapeHtml(row.manual_lot || '')}"
|
||||
class="w-full px-2 py-1 border rounded text-sm font-mono focus:ring-1 focus:ring-blue-400"
|
||||
onfocus="showAutocompleteBOM(${row.source_row_index}, this)"
|
||||
autocomplete="off" onfocus="showAutocompleteBOM(${row.source_row_index}, this)"
|
||||
oninput="filterAutocompleteBOM(${row.source_row_index}, this.value); bomRows.find(r=>r.source_row_index===${row.source_row_index}).manual_lot=this.value;"
|
||||
onkeydown="handleAutocompleteKeyBOM(event, ${row.source_row_index})"></div>${renderBOMLotAllocationsEditor(idx)}`;
|
||||
} else {
|
||||
let suffix = '';
|
||||
if (qtyMismatch) suffix = ` <span class="text-yellow-600 text-xs">≠est(${cartQty})</span>`;
|
||||
else if (notInCart) suffix = ` <span class="text-orange-500 text-xs">новый</span>`;
|
||||
lotCell = `<div><span class="font-mono text-xs">${row.resolved_lot}</span>${suffix}</div>${renderBOMLotAllocationsEditor(idx)}`;
|
||||
lotCell = `<div><span class="font-mono text-xs">${escapeHtml(row.resolved_lot)}</span>${suffix}</div>${renderBOMLotAllocationsEditor(idx)}`;
|
||||
}
|
||||
|
||||
tr.innerHTML = `
|
||||
@@ -4731,10 +4743,10 @@ async function renderPricingTab() {
|
||||
${pnDescHtml}
|
||||
<td class="px-2 py-0.5 text-xs ${borderTop}">${r.lotCell}</td>
|
||||
<td class="px-2 py-0.5 text-right text-xs ${borderTop}">${r.qty}</td>
|
||||
<td class="px-2 py-0.5 text-right text-xs ${borderTop} ${worldCls(r.estWorld)}">${r.estUnit > 0 ? formatCurrency(r.estUnit) : '—'}${worldMark(r.estWorld)}</td>
|
||||
<td class="px-2 py-0.5 text-right text-xs stock-price-col ${borderTop} ${worldCls(r.whWorld)}">${r.warehouseUnit != null ? formatCurrency(r.warehouseUnit) : '—'}${worldMark(r.whWorld)}</td>
|
||||
<td class="px-2 py-0.5 text-right text-xs ${borderTop} ${worldCls(r.compWorld)}">${r.competitorUnit != null ? formatCurrency(r.competitorUnit) : '—'}${worldMark(r.compWorld)}</td>
|
||||
<td class="px-2 py-0.5 text-right text-xs pricing-vendor-price-buy ${borderTop} ${r.vendorOrigUnit == null ? 'text-gray-400' : ''}">${r.vendorOrigUnit != null ? formatCurrency(r.vendorOrigUnit) : '—'}</td>
|
||||
<td class="px-2 py-0.5 text-right text-xs ${borderTop} ${worldCls(r.estWorld)}">${r.est > 0 ? formatCurrency(r.est) : '—'}${worldMark(r.estWorld)}</td>
|
||||
<td class="px-2 py-0.5 text-right text-xs stock-price-col ${borderTop} ${worldCls(r.whWorld)}">${r.warehouse != null ? formatCurrency(r.warehouse) : '—'}${worldMark(r.whWorld)}</td>
|
||||
<td class="px-2 py-0.5 text-right text-xs ${borderTop} ${worldCls(r.compWorld)}">${r.competitor != null ? formatCurrency(r.competitor) : '—'}${worldMark(r.compWorld)}</td>
|
||||
<td class="px-2 py-0.5 text-right text-xs pricing-vendor-price-buy ${borderTop} ${r.vendorOrig == null ? 'text-gray-400' : ''}">${r.vendorOrig != null ? formatCurrency(r.vendorOrig) : '—'}</td>
|
||||
`;
|
||||
tbodyBuy.appendChild(tr);
|
||||
});
|
||||
@@ -4813,7 +4825,8 @@ function _saleRowKey(vendorPN, lot) {
|
||||
// proportional share of the global "Ручная цена" when set) times (global uplift + this
|
||||
// row's own Накидка%).
|
||||
function _saleRowPrice(base, markupPct, saleUplift) {
|
||||
const factor = saleUplift + ((markupPct || 0) / 100);
|
||||
// Negative Накидка is a discount; floored at 0 so a large one can't make a price negative.
|
||||
const factor = Math.max(0, saleUplift + ((markupPct || 0) / 100));
|
||||
return base * factor;
|
||||
}
|
||||
|
||||
@@ -4871,7 +4884,7 @@ function recomputeSalePrices() {
|
||||
function onSaleRowMarkupInput(inputEl) {
|
||||
const key = inputEl.dataset.rowKey;
|
||||
const value = parseDecimalInput(inputEl.value || '');
|
||||
if (value > 0) {
|
||||
if (value !== 0) {
|
||||
saleRowMarkups[key] = value;
|
||||
} else {
|
||||
delete saleRowMarkups[key];
|
||||
@@ -4928,7 +4941,7 @@ function formatPercent(v) {
|
||||
|
||||
function parseDecimalInput(raw) {
|
||||
if (raw == null) return 0;
|
||||
const cleaned = String(raw).trim().replace(/\s/g, '').replace(',', '.');
|
||||
const cleaned = String(raw).trim().replace(/\s/g, '').replace(',', '.').replace(/\u2212/g, '-');
|
||||
const n = parseFloat(cleaned);
|
||||
return Number.isFinite(n) ? n : 0;
|
||||
}
|
||||
@@ -4940,7 +4953,7 @@ function formatUpliftInput(value) {
|
||||
|
||||
// One or two decimals, comma separator, no trailing zeros — for the per-row Накидка input.
|
||||
function formatMarkupInput(value) {
|
||||
if (!Number.isFinite(value) || value <= 0) return '';
|
||||
if (!Number.isFinite(value) || value === 0) return '';
|
||||
return String(Math.round(value * 100) / 100).replace('.', ',');
|
||||
}
|
||||
|
||||
@@ -4978,7 +4991,6 @@ function applyCustomPrice(table) {
|
||||
let assigned = 0;
|
||||
rows.forEach((tr, i) => {
|
||||
const rowEst = parseFloat(tr.dataset.est) || 0;
|
||||
const qty = Math.max(1, parseFloat(tr.dataset.qty) || 1);
|
||||
const cell = vendorCells[i];
|
||||
if (!cell) return;
|
||||
let share;
|
||||
@@ -4988,7 +5000,7 @@ function applyCustomPrice(table) {
|
||||
share = Math.round((rowEst / estimateTotal) * customPrice * 100) / 100;
|
||||
assigned += share;
|
||||
}
|
||||
cell.textContent = formatCurrency(share / qty);
|
||||
cell.textContent = formatCurrency(share);
|
||||
cell.className = cell.className.replace(/\btext-(?:gray|green|red|blue)-\d+\b/g, '').trim();
|
||||
cell.classList.add(rowEst > 0 ? _pctClass(share, rowEst) : 'text-blue-700');
|
||||
});
|
||||
@@ -5002,8 +5014,8 @@ function applyCustomPrice(table) {
|
||||
const cell = vendorCells[i];
|
||||
if (!cell) return;
|
||||
cell.className = cell.className.replace(/\btext-(?:gray|green|red|blue)-\d+\b/g, '').trim();
|
||||
if (tr.dataset.vendorOrigUnit !== '') {
|
||||
cell.textContent = formatCurrency(parseFloat(tr.dataset.vendorOrigUnit));
|
||||
if (tr.dataset.vendorOrig !== '') {
|
||||
cell.textContent = formatCurrency(parseFloat(tr.dataset.vendorOrig));
|
||||
} else {
|
||||
cell.textContent = '—';
|
||||
cell.classList.add('text-gray-400');
|
||||
@@ -5041,10 +5053,9 @@ function setPricingCustomPriceFromVendor() {
|
||||
rows.forEach((tr, i) => {
|
||||
const cell = vendorCells[i];
|
||||
if (!cell) return;
|
||||
const origUnit = tr.dataset.vendorOrigUnit;
|
||||
const origTotal = tr.dataset.vendorOrig;
|
||||
if (origUnit !== '') {
|
||||
cell.textContent = formatCurrency(parseFloat(origUnit));
|
||||
if (origTotal !== '') {
|
||||
cell.textContent = formatCurrency(parseFloat(origTotal));
|
||||
cell.className = cell.className.replace(/\btext-(?:gray|green|red|blue)-\d+\b/g, '').trim();
|
||||
total += parseFloat(origTotal) || 0;
|
||||
hasAny = true;
|
||||
@@ -5115,10 +5126,6 @@ async function exportPricingCSV(table) {
|
||||
}
|
||||
}
|
||||
|
||||
function escapeHtml(str) {
|
||||
if (!str) return '';
|
||||
return str.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"');
|
||||
}
|
||||
|
||||
function formatCurrency(val) {
|
||||
if (val == null) return '—';
|
||||
|
||||
@@ -159,15 +159,6 @@
|
||||
return 5;
|
||||
}
|
||||
|
||||
function escapeHtml(text) {
|
||||
if (text === null || text === undefined) return '';
|
||||
return String(text)
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''');
|
||||
}
|
||||
|
||||
function renderItems(items) {
|
||||
if (items.length === 0) {
|
||||
|
||||
@@ -82,12 +82,12 @@
|
||||
<div class="space-y-4">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Тип оборудования</label>
|
||||
<div class="inline-flex rounded-lg border border-gray-200 overflow-hidden w-full">
|
||||
<button type="button" id="pd-type-server-btn" onclick="pdSetCreateType('server')"
|
||||
<div id="pd-config-type-buttons" class="inline-flex rounded-lg border border-gray-200 overflow-hidden w-full">
|
||||
<button type="button" data-type="server" onclick="pdSetCreateType('server')"
|
||||
class="flex-1 py-2 text-sm font-medium bg-blue-600 text-white">
|
||||
Сервер
|
||||
</button>
|
||||
<button type="button" id="pd-type-storage-btn" onclick="pdSetCreateType('storage')"
|
||||
<button type="button" data-type="storage" onclick="pdSetCreateType('storage')"
|
||||
class="flex-1 py-2 text-sm font-medium bg-white text-gray-700 hover:bg-gray-50 border-l border-gray-200">
|
||||
СХД
|
||||
</button>
|
||||
@@ -354,11 +354,6 @@ let projectVariants = [];
|
||||
let projectsCatalog = [];
|
||||
let variantMenuInitialized = false;
|
||||
|
||||
function escapeHtml(text) {
|
||||
const div = document.createElement('div');
|
||||
div.textContent = text || '';
|
||||
return div.innerHTML;
|
||||
}
|
||||
|
||||
function formatMoneyNoDecimals(value) {
|
||||
const safe = Number.isFinite(Number(value)) ? Number(value) : 0;
|
||||
@@ -626,17 +621,50 @@ async function loadConfigs() {
|
||||
|
||||
let pdCreateConfigType = 'server';
|
||||
|
||||
let pdConfigTypesLoaded = false;
|
||||
|
||||
// Config types come from qt_settings.config_types (server-driven, see
|
||||
// bible-local/server-contract-qt-settings.md); the two static buttons in the
|
||||
// markup are only a fallback until/unless the settings load.
|
||||
async function pdLoadConfigTypeButtons() {
|
||||
if (pdConfigTypesLoaded) return;
|
||||
let types = null;
|
||||
try {
|
||||
const r = await fetch('/api/configurator-settings');
|
||||
if (r.ok) types = (await r.json()).config_types;
|
||||
} catch (e) { /* keep static fallback buttons */ }
|
||||
if (!Array.isArray(types) || !types.length) return;
|
||||
const el = document.getElementById('pd-config-type-buttons');
|
||||
if (!el) return;
|
||||
el.replaceChildren(...[...types]
|
||||
.sort((a, b) => (a.display_order || 0) - (b.display_order || 0))
|
||||
.map(t => {
|
||||
const btn = document.createElement('button');
|
||||
btn.type = 'button';
|
||||
btn.dataset.type = t.code;
|
||||
btn.textContent = t.name_ru || t.code;
|
||||
btn.addEventListener('click', () => pdSetCreateType(t.code));
|
||||
return btn;
|
||||
}));
|
||||
pdConfigTypesLoaded = true;
|
||||
const codes = types.map(t => t.code);
|
||||
pdSetCreateType(codes.includes(pdCreateConfigType) ? pdCreateConfigType : codes[0]);
|
||||
}
|
||||
|
||||
function pdSetCreateType(type) {
|
||||
pdCreateConfigType = type;
|
||||
document.getElementById('pd-type-server-btn').className = 'flex-1 py-2 text-sm font-medium ' +
|
||||
(type === 'server' ? 'bg-blue-600 text-white' : 'bg-white text-gray-700 hover:bg-gray-50');
|
||||
document.getElementById('pd-type-storage-btn').className = 'flex-1 py-2 text-sm font-medium border-l border-gray-200 ' +
|
||||
(type === 'storage' ? 'bg-blue-600 text-white' : 'bg-white text-gray-700 hover:bg-gray-50');
|
||||
document.querySelectorAll('#pd-config-type-buttons button').forEach((btn, i) => {
|
||||
const active = btn.dataset.type === type;
|
||||
btn.className = 'flex-1 py-2 text-sm font-medium ' +
|
||||
(i > 0 ? 'border-l border-gray-200 ' : '') +
|
||||
(active ? 'bg-blue-600 text-white' : 'bg-white text-gray-700 hover:bg-gray-50');
|
||||
});
|
||||
}
|
||||
|
||||
function openCreateModal() {
|
||||
pdCreateConfigType = 'server';
|
||||
pdSetCreateType('server');
|
||||
pdLoadConfigTypeButtons();
|
||||
document.getElementById('create-name').value = '';
|
||||
document.getElementById('create-modal').classList.remove('hidden');
|
||||
document.getElementById('create-modal').classList.add('flex');
|
||||
|
||||
@@ -80,11 +80,6 @@ let variantsLoaded = false;
|
||||
|
||||
const trackerBaseURL = 'https://tracker.yandex.ru/';
|
||||
|
||||
function escapeHtml(text) {
|
||||
const div = document.createElement('div');
|
||||
div.textContent = text || '';
|
||||
return div.innerHTML;
|
||||
}
|
||||
|
||||
function formatMoney(v) {
|
||||
return '$' + (v || 0).toLocaleString('ru-RU', {minimumFractionDigits: 2});
|
||||
|
||||
@@ -75,10 +75,26 @@
|
||||
class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
|
||||
placeholder="{{if .Settings}}********{{else}}password{{end}}">
|
||||
{{if .Settings}}
|
||||
<p class="text-xs text-gray-500 mt-1">Оставьте пустым, чтобы сохранить текущий пароль</p>
|
||||
<p class="text-xs text-gray-500 mt-1">Оставьте пустым, чтобы сохранить пароль для того же хоста, порта и пользователя</p>
|
||||
{{end}}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1" for="tls_mode">TLS</label>
|
||||
<select name="tls_mode" id="tls_mode" class="w-full px-3 py-2 border rounded-md">
|
||||
<option value="preferred" {{if .Settings}}{{if eq .Settings.TLSMode "preferred"}}selected{{end}}{{end}}>Preferred: шифрование, если сервер поддерживает</option>
|
||||
<option value="required" {{if .Settings}}{{if eq .Settings.TLSMode "required"}}selected{{end}}{{end}}>Required: обязательное шифрование</option>
|
||||
<option value="verify-ca" {{if .Settings}}{{if eq .Settings.TLSMode "verify-ca"}}selected{{end}}{{end}}>Verify CA: проверка сертификата</option>
|
||||
<option value="verify-full" {{if .Settings}}{{if eq .Settings.TLSMode "verify-full"}}selected{{end}}{{end}}>Verify full: проверка сертификата и имени сервера</option>
|
||||
</select>
|
||||
<p class="text-xs text-gray-500 mt-1">Preferred допускает соединение без TLS. Для проверки подлинности сервера выберите Verify full.</p>
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1" for="tls_ca_pem">CA-сертификат (PEM)</label>
|
||||
<textarea name="tls_ca_pem" id="tls_ca_pem" rows="3" class="w-full px-3 py-2 border rounded-md font-mono text-xs">{{if .Settings}}{{.Settings.TLSCAPEM}}{{end}}</textarea>
|
||||
<p class="text-xs text-gray-500 mt-1">Для Verify CA обязателен; Verify full без PEM использует системные сертификаты.</p>
|
||||
</div>
|
||||
|
||||
<div id="status" class="hidden p-3 rounded-md text-sm"></div>
|
||||
|
||||
<div class="flex space-x-3 pt-4 mt-auto">
|
||||
|
||||
Reference in new issue
Block a user