local-triage 0.0.0-stage → 0.10.0-dev.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -0
- package/README.md +90 -2
- package/THIRD-PARTY-NOTICES.md +48 -0
- package/app/__init__.py +3 -0
- package/app/affiliation.py +137 -0
- package/app/ask.py +300 -0
- package/app/build_info.py +98 -0
- package/app/capec.py +168 -0
- package/app/capec_view.py +27 -0
- package/app/codecmp.py +59 -0
- package/app/config.py +411 -0
- package/app/context.py +1451 -0
- package/app/cvss.py +357 -0
- package/app/db.py +6234 -0
- package/app/defect.py +670 -0
- package/app/defect_check.py +323 -0
- package/app/defect_drafts.py +612 -0
- package/app/defect_dto.py +149 -0
- package/app/defect_fields.py +248 -0
- package/app/defect_form.py +124 -0
- package/app/defect_links.py +107 -0
- package/app/defect_local_text.py +103 -0
- package/app/defect_references.py +164 -0
- package/app/defect_where.py +147 -0
- package/app/ecosystem.py +51 -0
- package/app/executors.py +660 -0
- package/app/feeds.py +1231 -0
- package/app/guard.py +164 -0
- package/app/hub_block_builder.py +200 -0
- package/app/hub_block_version.py +220 -0
- package/app/hub_defects.py +4469 -0
- package/app/hub_effects.py +421 -0
- package/app/hub_entity_versions.py +108 -0
- package/app/hub_import.py +2054 -0
- package/app/hub_onboarding.py +114 -0
- package/app/hub_ops.py +330 -0
- package/app/hub_pull.py +1195 -0
- package/app/hub_state.py +255 -0
- package/app/hub_status.py +237 -0
- package/app/hub_sync.py +619 -0
- package/app/hub_sync_api.py +241 -0
- package/app/hub_sync_compare.py +1054 -0
- package/app/hub_sync_contract.py +75 -0
- package/app/hub_template_model.py +74 -0
- package/app/hub_text_scale.py +159 -0
- package/app/journal.py +250 -0
- package/app/llm.py +850 -0
- package/app/llm_chat.py +596 -0
- package/app/llm_http.py +319 -0
- package/app/llm_messages.py +401 -0
- package/app/llm_net.py +764 -0
- package/app/llm_ollama.py +571 -0
- package/app/lockfile.py +505 -0
- package/app/logsafe.py +54 -0
- package/app/main.py +367 -0
- package/app/mask_display.py +132 -0
- package/app/masking.py +814 -0
- package/app/metrics.py +194 -0
- package/app/model_traffic.py +519 -0
- package/app/models.py +483 -0
- package/app/navigation.py +121 -0
- package/app/osv.py +279 -0
- package/app/package_identity.py +189 -0
- package/app/package_transition.py +824 -0
- package/app/profile_gate.py +71 -0
- package/app/prompts.py +1108 -0
- package/app/provider_keys.py +189 -0
- package/app/providers.py +511 -0
- package/app/routes/__init__.py +10 -0
- package/app/routes/api.py +153 -0
- package/app/routes/capec.py +186 -0
- package/app/routes/common.py +407 -0
- package/app/routes/components.py +1499 -0
- package/app/routes/cwe.py +168 -0
- package/app/routes/decision_selected.py +153 -0
- package/app/routes/defect_add.py +223 -0
- package/app/routes/defect_card_routes.py +363 -0
- package/app/routes/defect_selected.py +342 -0
- package/app/routes/feeds.py +155 -0
- package/app/routes/findings.py +2736 -0
- package/app/routes/hub.py +402 -0
- package/app/routes/hub_bulk.py +288 -0
- package/app/routes/hub_defect_routes.py +1945 -0
- package/app/routes/hub_status_routes.py +1132 -0
- package/app/routes/hub_sync_routes.py +463 -0
- package/app/routes/journal.py +132 -0
- package/app/routes/projects.py +1601 -0
- package/app/routes/providers.py +336 -0
- package/app/routes/references.py +26 -0
- package/app/routes/runs.py +219 -0
- package/app/routes/sca.py +2722 -0
- package/app/routes/settings.py +163 -0
- package/app/run_errors.py +151 -0
- package/app/sca.py +1662 -0
- package/app/sca_contract.py +1289 -0
- package/app/sca_research.py +1089 -0
- package/app/sca_research_net.py +1007 -0
- package/app/sca_text.py +965 -0
- package/app/serve.py +70 -0
- package/app/settings_store.py +262 -0
- package/app/static/app.css +2802 -0
- package/app/static/app.js +3772 -0
- package/app/static/capec-license.txt +9 -0
- package/app/static/favicon.svg +1 -0
- package/app/static/fonts/Golos-Text_DemiBold.woff2 +0 -0
- package/app/static/fonts/Golos-Text_Regular.woff2 +0 -0
- package/app/static/fonts/OFL.txt +90 -0
- package/app/static/navigation.js +234 -0
- package/app/static/observability.js +121 -0
- package/app/static/theme.js +49 -0
- package/app/storage/__init__.py +16 -0
- package/app/storage/local_state.py +246 -0
- package/app/storage/migrate.py +110 -0
- package/app/storage/migrations/postgresql/0001_baseline.sql +896 -0
- package/app/storage/migrations/postgresql/0002_feeds_and_secrets.sql +55 -0
- package/app/storage/migrations/postgresql/0003_project_mask_display.sql +5 -0
- package/app/storage/migrations/postgresql/0004_package_identity.sql +36 -0
- package/app/storage/postgresql.py +573 -0
- package/app/storage/schema.py +619 -0
- package/app/storage/sql.py +57 -0
- package/app/storage/tools.py +254 -0
- package/app/telemetry.py +307 -0
- package/app/templates/base.html +91 -0
- package/app/templates/capec/context.html +3 -0
- package/app/templates/capec/detail.html +27 -0
- package/app/templates/capec/index.html +128 -0
- package/app/templates/components/_archive.html +11 -0
- package/app/templates/components/archived.html +19 -0
- package/app/templates/components/batch.html +35 -0
- package/app/templates/components/detail.html +332 -0
- package/app/templates/components/index.html +338 -0
- package/app/templates/components/research_preview.html +80 -0
- package/app/templates/components/research_run.html +54 -0
- package/app/templates/cwe/bdu.html +56 -0
- package/app/templates/cwe/detail.html +233 -0
- package/app/templates/cwe/index.html +97 -0
- package/app/templates/error.html +8 -0
- package/app/templates/feeds/index.html +65 -0
- package/app/templates/findings/card.html +639 -0
- package/app/templates/findings/decision_selected.html +41 -0
- package/app/templates/findings/defect_add.html +46 -0
- package/app/templates/findings/defect_selected.html +47 -0
- package/app/templates/findings/list.html +153 -0
- package/app/templates/findings/send_selected.html +53 -0
- package/app/templates/findings/trace.html +72 -0
- package/app/templates/journal/detail.html +19 -0
- package/app/templates/journal/index.html +19 -0
- package/app/templates/macros.html +440 -0
- package/app/templates/navigation-fields.html +1 -0
- package/app/templates/navigation.html +11 -0
- package/app/templates/projects/_identity_summary.html +42 -0
- package/app/templates/projects/defect_card.html +153 -0
- package/app/templates/projects/defect_create_preview.html +17 -0
- package/app/templates/projects/defect_fields_diff.html +6 -0
- package/app/templates/projects/defect_fields_form.html +40 -0
- package/app/templates/projects/defect_references.html +17 -0
- package/app/templates/projects/defect_sync_preview.html +28 -0
- package/app/templates/projects/defect_update_actions.html +6 -0
- package/app/templates/projects/defect_update_preview.html +24 -0
- package/app/templates/projects/defects.html +126 -0
- package/app/templates/projects/delete.html +31 -0
- package/app/templates/projects/external.html +61 -0
- package/app/templates/projects/folders.html +64 -0
- package/app/templates/projects/hub_accepted.html +10 -0
- package/app/templates/projects/hub_assignment.html +50 -0
- package/app/templates/projects/hub_pending.html +20 -0
- package/app/templates/projects/hub_pending_list.html +17 -0
- package/app/templates/projects/hub_state_note.html +23 -0
- package/app/templates/projects/hub_step_note.html +5 -0
- package/app/templates/projects/hub_sync.html +105 -0
- package/app/templates/projects/hub_sync_confirm.html +32 -0
- package/app/templates/projects/hub_sync_worker.html +5 -0
- package/app/templates/projects/hub_text_rules.html +64 -0
- package/app/templates/projects/identity_report.html +74 -0
- package/app/templates/projects/list.html +90 -0
- package/app/templates/projects/project.html +433 -0
- package/app/templates/reference-missing.html +14 -0
- package/app/templates/runs/run.html +166 -0
- package/app/templates/sca/card.html +476 -0
- package/app/templates/sca/index.html +321 -0
- package/app/templates/settings/hub_url.html +31 -0
- package/app/templates/settings/index.html +216 -0
- package/app/templates/settings/provider.html +229 -0
- package/app/templates/settings/providers.html +37 -0
- package/app/templates/worklists.html +52 -0
- package/app/textsafe.py +117 -0
- package/app/timing.py +245 -0
- package/app/triage.py +1743 -0
- package/app/view.py +430 -0
- package/app/worklists.py +204 -0
- package/examples/demo/demo-hub-report-v2.xlsx +0 -0
- package/examples/demo/demo-hub-report.xlsx +0 -0
- package/examples/demo/repos/billing-core/pom.xml +30 -0
- package/examples/demo/repos/billing-core/src/main/java/org/example/billing/Invoice.java +9 -0
- package/examples/demo/repos/billing-core/src/main/java/org/example/billing/InvoiceRepository.java +51 -0
- package/examples/demo/repos/billing-core/src/main/java/org/example/billing/InvoiceStatus.java +11 -0
- package/examples/demo/repos/billing-core/src/main/java/org/example/billing/config/DatabaseSettings.java +18 -0
- package/examples/demo/repos/billing-core/src/main/java/org/example/billing/payment/PaymentTokenService.java +35 -0
- package/examples/demo/repos/billing-core/src/main/java/org/example/billing/web/InvoiceExportController.java +57 -0
- package/examples/demo/repos/catalog-api/catalog_api/__init__.py +1 -0
- package/examples/demo/repos/catalog-api/catalog_api/products.py +24 -0
- package/examples/demo/repos/catalog-api/catalog_api/tasks.py +24 -0
- package/examples/demo/repos/catalog-api/catalog_api/views.py +17 -0
- package/examples/demo/repos/catalog-api/requirements.txt +3 -0
- package/npm/build.json +5 -0
- package/npm/cli.js +346 -0
- package/npm/files.manifest +224 -0
- package/npm/lib/binding.js +64 -0
- package/npm/lib/cluster.js +330 -0
- package/npm/lib/env.js +88 -0
- package/npm/lib/fsx.js +125 -0
- package/npm/lib/http.js +53 -0
- package/npm/lib/metrics.js +73 -0
- package/npm/lib/paths.js +150 -0
- package/npm/lib/pg.js +351 -0
- package/npm/lib/proc.js +101 -0
- package/npm/lib/python.js +133 -0
- package/npm/lib/stand.js +46 -0
- package/npm/lib/supervisor.js +1141 -0
- package/npm/lib/version.js +21 -0
- package/npm/requirements.txt +476 -0
- package/npm-shrinkwrap.json +111 -0
- package/package.json +37 -4
|
@@ -0,0 +1,612 @@
|
|
|
1
|
+
"""Владелец, черновик и история логического дефекта (ADR-0126, dev1)."""
|
|
2
|
+
|
|
3
|
+
from __future__ import annotations
|
|
4
|
+
|
|
5
|
+
from app import package_identity
|
|
6
|
+
|
|
7
|
+
from typing import Any
|
|
8
|
+
|
|
9
|
+
from app import hub_entity_versions
|
|
10
|
+
from app.db import Database, dumps, loads, now_iso, text_hash
|
|
11
|
+
from app.defect import defect_key_sca
|
|
12
|
+
from app.sca_contract import input_ref
|
|
13
|
+
|
|
14
|
+
EDITABLE_FIELDS = (
|
|
15
|
+
"priority", "priorityId", "severity", "severityId", "source", "tool", "stage", "type",
|
|
16
|
+
"structureUnitId", "appStructureUnit", "dueDate", "releaseObject", "externalBugs", "isActive", "settings",
|
|
17
|
+
)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
def fields_of(obj: dict) -> dict:
|
|
21
|
+
"""Отсутствие поля сохраняется; null не заменяется пустым значением."""
|
|
22
|
+
return {key: obj[key] for key in EDITABLE_FIELDS if key in obj}
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
# цель «тип:номер», которой нет среди находок проекта с тем же типом связи (SAST:73001 рядом с SCA_S:73001 – не та же
|
|
26
|
+
# цель): единственный набор SCA по такому составу не доказан – одинаково во всех фазах принятия Hub, при подготовке,
|
|
27
|
+
# подтверждении и сверке дефекта (план dev17, остаток шага 4)
|
|
28
|
+
UNMATCHED_TARGETS = "цели дефекта {ids} нет среди находок SCA проекта или у неё другой тип: единственный набор не определить"
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
def unmatched_targets(c, project_id: int, targets, *, typeless: bool = False) -> list[str]:
|
|
32
|
+
"""Цели «тип:номер», которых нет среди находок проекта с тем же типом связи (порядок сохранён). Цель без типа
|
|
33
|
+
связи (записи до типизированных целей) несопоставленной считается только при typeless=True; иначе её проверяет вид
|
|
34
|
+
находки в sca_identity."""
|
|
35
|
+
from app.hub_status import HUB_ISSUE_TYPE
|
|
36
|
+
out: list[str] = []
|
|
37
|
+
for t in targets:
|
|
38
|
+
hub_id, typ = str(t.get("hub_id") or ""), str(t.get("issue_type") or "")
|
|
39
|
+
if not hub_id or not (typ or typeless):
|
|
40
|
+
continue
|
|
41
|
+
row = c.execute("SELECT kind FROM findings WHERE project_id = ? AND hub_id = ?", (project_id, hub_id)).fetchone()
|
|
42
|
+
if (row is None or HUB_ISSUE_TYPE.get(row["kind"]) != typ) and f"{typ}:{hub_id}" not in out:
|
|
43
|
+
out.append(f"{typ}:{hub_id}")
|
|
44
|
+
return out
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
def sca_identity(c, project_id: int, targets: list[dict]) -> tuple[str, list]:
|
|
48
|
+
"""Ключ единственного набора SCA по составу целей: цель с типом связи сопоставляется с находкой того же типа, у
|
|
49
|
+
цели без типа проверяется вид находки (план dev17, остаток шага 4: тот же расчёт во всех фазах принятия)."""
|
|
50
|
+
unmatched = unmatched_targets(c, project_id, targets)
|
|
51
|
+
if unmatched:
|
|
52
|
+
return "", [UNMATCHED_TARGETS.format(ids=", ".join(unmatched[:10]))]
|
|
53
|
+
keys = set()
|
|
54
|
+
for target in targets:
|
|
55
|
+
hub_id = str(target.get("hub_id") or "")
|
|
56
|
+
row = c.execute("SELECT kind, data_json, pkg_ecosystem, pkg_name, pkg_source, pkg_note, pkg_scope FROM findings WHERE project_id = ? AND hub_id = ?",
|
|
57
|
+
(project_id, hub_id)).fetchone()
|
|
58
|
+
if row is None or row["kind"] != "SCA":
|
|
59
|
+
return "", ["Нельзя определить единый набор SCA: находка отсутствует или другого вида."]
|
|
60
|
+
# эффективная тройка (план dev17, п. 4.3) – та же, что у ключей находок (defect_keys_of_findings_in)
|
|
61
|
+
eco, name, version = package_identity.of(package_identity.with_package(dict(row)))
|
|
62
|
+
place = c.execute("SELECT set_no FROM sca_set_members WHERE project_id = ? AND hub_id = ? AND input_ref = ?",
|
|
63
|
+
(project_id, hub_id, input_ref(eco, name, version))).fetchone()
|
|
64
|
+
if place is not None and place["set_no"] is None:
|
|
65
|
+
return "", ["Находка SCA находится в группе «без дефекта»."]
|
|
66
|
+
number = int(place["set_no"]) if place is not None else 0
|
|
67
|
+
key = defect_key_sca(name, version, eco)
|
|
68
|
+
keys.add(key if not number else f"{key}#{number}")
|
|
69
|
+
if len(keys) != 1:
|
|
70
|
+
return "", ["Цели не определяют единственный набор SCA."]
|
|
71
|
+
return keys.pop(), []
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
def history(c, owner: dict, event: str, *, row_id=None, op_id=None, details=None) -> None:
|
|
75
|
+
c.execute("INSERT INTO hub_defect_history(defect_id, row_id, revision, event, summary, command_text,"
|
|
76
|
+
" details_json, op_id, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
|
77
|
+
(owner["id"], row_id or owner["id"], owner["draft_revision"], event, owner["draft_summary"],
|
|
78
|
+
owner["draft_command_text"], dumps(details or {}), op_id, now_iso()))
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
def migrate(c) -> None:
|
|
82
|
+
"""Только новые поля; старые JSON, состояния, операции и последствия не изменяются."""
|
|
83
|
+
rows = [dict(r) for r in c.execute("SELECT * FROM hub_defects ORDER BY id")]
|
|
84
|
+
groups = {}
|
|
85
|
+
for row in rows:
|
|
86
|
+
live = row["state"] not in ("failed", "cancelled", "deleted") and row["hub_defect_id"]
|
|
87
|
+
key = (row["project_id"], row["hub_url"], row["app_id"], row["hub_defect_id"]) if live else (row["id"],)
|
|
88
|
+
groups.setdefault(key, []).append(row)
|
|
89
|
+
for family in groups.values():
|
|
90
|
+
confirmations = []
|
|
91
|
+
for row in family:
|
|
92
|
+
op = c.execute("SELECT id, closed_at FROM hub_ops WHERE id = ?", (row["confirm_op_id"],)).fetchone()
|
|
93
|
+
if op is not None:
|
|
94
|
+
confirmations.append((str(op["closed_at"] or ""), op["id"], row["id"], row))
|
|
95
|
+
owner = max(confirmations, key=lambda x: x[:3])[3] if confirmations else family[0]
|
|
96
|
+
summary, command = owner["summary"], owner["command_text"]
|
|
97
|
+
if owner["state"] in ("import_preview", "import_reading"):
|
|
98
|
+
seen = loads(owner["import_json"], {}) or {}
|
|
99
|
+
summary, command = seen.get("summary", ""), seen.get("command_text", "")
|
|
100
|
+
for row in family:
|
|
101
|
+
c.execute("UPDATE hub_defects SET draft_owner_id = ? WHERE id = ?", (owner["id"], row["id"]))
|
|
102
|
+
key, conflicts = ("", [])
|
|
103
|
+
if owner["kind"] == "SCA":
|
|
104
|
+
targets = [t for row in family for t in loads(row["targets_json"], [])]
|
|
105
|
+
key, conflicts = sca_identity(c, owner["project_id"], targets)
|
|
106
|
+
c.execute("UPDATE hub_defects SET draft_summary = ?, draft_command_text = ?, draft_revision = 1,"
|
|
107
|
+
" sca_set_key = ?, conflicts_json = ? WHERE id = ?",
|
|
108
|
+
(summary, command, key, dumps(conflicts), owner["id"]))
|
|
109
|
+
owner.update(draft_summary=summary, draft_command_text=command, draft_revision=1)
|
|
110
|
+
history(c, owner, "migration", details={"full_base_unknown": True, "conflicts": conflicts})
|
|
111
|
+
|
|
112
|
+
|
|
113
|
+
def owner_in(c, row: dict) -> dict:
|
|
114
|
+
owner_id = row.get("draft_owner_id") or row["id"]
|
|
115
|
+
found = c.execute("SELECT * FROM hub_defects WHERE id = ? AND project_id = ?",
|
|
116
|
+
(owner_id, row["project_id"])).fetchone()
|
|
117
|
+
if found is None:
|
|
118
|
+
raise ValueError("Владелец черновика не найден.")
|
|
119
|
+
return dict(found)
|
|
120
|
+
|
|
121
|
+
|
|
122
|
+
def family_in(c, row: dict) -> list[dict]:
|
|
123
|
+
owner = owner_in(c, row)
|
|
124
|
+
return [dict(r) for r in c.execute(
|
|
125
|
+
"SELECT * FROM hub_defects WHERE project_id = ? AND draft_owner_id = ?"
|
|
126
|
+
" AND state NOT IN ('failed', 'cancelled', 'deleted') ORDER BY id", (row["project_id"], owner["id"]))]
|
|
127
|
+
|
|
128
|
+
|
|
129
|
+
def collapsed(row: dict) -> bool:
|
|
130
|
+
"""Строка семьи – история: цели и ключи номера у владельца. `mismatch` остаётся после общей синхронизации, которая
|
|
131
|
+
чистит цели без смены состояния (ADR-0136). То же условие в SQL – Database.HUB_DEFECT_COLLAPSED."""
|
|
132
|
+
return (row["state"] in ("done", "mismatch") and not loads(row.get("targets_json"), [])
|
|
133
|
+
and not loads(row.get("number_keys_json"), []))
|
|
134
|
+
|
|
135
|
+
|
|
136
|
+
def family_single_in(c, row: dict) -> bool:
|
|
137
|
+
"""Весь состав дефекта у владельца: остальные строки семьи схлопнуты (ADR-0136)."""
|
|
138
|
+
owner_id = int(owner_in(c, row)["id"])
|
|
139
|
+
return all(int(r["id"]) == owner_id or collapsed(r) for r in family_in(c, row))
|
|
140
|
+
|
|
141
|
+
|
|
142
|
+
def local_edit(owner: dict) -> dict:
|
|
143
|
+
"""Есть ли у владельца неотправленная правка относительно принятого: заголовок точно; текст дефекта из приложения по
|
|
144
|
+
строкам (разбор описания Hub отличается от него формой), занесённого точно, как в apply_sync; поля – по основе, не
|
|
145
|
+
строками JSON. Рост редакции сам по себе правкой не считается. {edited, fields_unknown}: основа полей неизвестна –
|
|
146
|
+
сравнить их не с чем."""
|
|
147
|
+
from app import defect_fields
|
|
148
|
+
basis = defect_fields.basis_of(owner)
|
|
149
|
+
if basis["known"]:
|
|
150
|
+
return {"edited": defect_fields.unsent_edit(owner), "fields_unknown": False}
|
|
151
|
+
# основа полей неизвестна: сравнивается то, что можно, поля – по явным правкам
|
|
152
|
+
known = defect_fields.unsent_edit({**owner, "draft_fields_json": "{}", "draft_fields_basis_json": dumps({**basis, "known": True, "base": {}})})
|
|
153
|
+
return {"edited": known or bool(basis.get("pending")), "fields_unknown": True}
|
|
154
|
+
|
|
155
|
+
|
|
156
|
+
def members_in(c, row: dict) -> list[dict]:
|
|
157
|
+
"""Канонический снимок физических строк; редакция черновика не подменяет состав."""
|
|
158
|
+
return [{"id": r["id"], "targets": sorted([
|
|
159
|
+
[str(t.get("hub_id") or ""), str(t.get("issue_type") or ""), t.get("revision"), str(t.get("sig") or "")]
|
|
160
|
+
for t in loads(r["targets_json"], [])], key=lambda t: (t[0], t[1])),
|
|
161
|
+
"number_keys": sorted(loads(r["number_keys_json"], [])), "sca_set_key": r["sca_set_key"]}
|
|
162
|
+
for r in family_in(c, row)]
|
|
163
|
+
|
|
164
|
+
|
|
165
|
+
def initialize(c, row: dict, owner_id=None) -> None:
|
|
166
|
+
if owner_id is not None:
|
|
167
|
+
c.execute("UPDATE hub_defects SET draft_owner_id = ? WHERE id = ?", (owner_id, row["id"]))
|
|
168
|
+
return
|
|
169
|
+
key, conflicts = sca_identity(c, row["project_id"], loads(row["targets_json"], [])) if row["kind"] == "SCA" else ("", [])
|
|
170
|
+
c.execute("UPDATE hub_defects SET draft_owner_id = id, draft_summary = summary, draft_command_text = command_text,"
|
|
171
|
+
" draft_revision = 1, sca_set_key = ?, conflicts_json = ? WHERE id = ?",
|
|
172
|
+
(key, dumps(conflicts), row["id"]))
|
|
173
|
+
history(c, owner_in(c, row), "create", details={"conflicts": conflicts})
|
|
174
|
+
|
|
175
|
+
|
|
176
|
+
def edit_problem(c, row: dict) -> str:
|
|
177
|
+
from app import hub_defects
|
|
178
|
+
if row["state"] != "done":
|
|
179
|
+
return "Черновик доступен для правки после создания или занесения дефекта."
|
|
180
|
+
if not family_single_in(c, row):
|
|
181
|
+
return hub_defects.UPDATE_FAMILY_UNMERGED
|
|
182
|
+
if hub_defects.update_unconfirmed(row) or hub_defects.update_busy(row):
|
|
183
|
+
return "Сначала дождитесь или подтвердите результат обновления в Hub."
|
|
184
|
+
if hub_defects.update_state(row).get("phase") == "preview":
|
|
185
|
+
return "Сначала отмените или завершите предпросмотр обновления."
|
|
186
|
+
return hub_defects._update_idle_problem(c, row, local=True)
|
|
187
|
+
|
|
188
|
+
|
|
189
|
+
def save(db: Database, row: dict, revision: str, *, summary="", command="", generate=None,
|
|
190
|
+
operations=None, reference_load=None) -> dict:
|
|
191
|
+
"""Проверки, генератор, новый текст и событие одной транзакцией. Ошибка ничего не сохраняет."""
|
|
192
|
+
with db._tx() as c:
|
|
193
|
+
current = owner_in(c, row)
|
|
194
|
+
if str(current["draft_revision"]) != str(revision):
|
|
195
|
+
raise ValueError("Черновик изменился в другой вкладке: обновите страницу.")
|
|
196
|
+
problem = edit_problem(c, current)
|
|
197
|
+
if problem:
|
|
198
|
+
raise ValueError(problem)
|
|
199
|
+
if generate is not None:
|
|
200
|
+
prep = generate(current)
|
|
201
|
+
if prep.get("refusals"):
|
|
202
|
+
raise ValueError("; ".join(prep["refusals"]))
|
|
203
|
+
summary, command = prep["summary"], prep["command_text"]
|
|
204
|
+
if prep.get("tx_check"):
|
|
205
|
+
prep["tx_check"](c)
|
|
206
|
+
from app import defect_fields, defect_references
|
|
207
|
+
fields = loads(current["draft_fields_json"], {})
|
|
208
|
+
basis = defect_fields.basis_of(current)
|
|
209
|
+
fields_raw, basis_raw = current["draft_fields_json"], current["draft_fields_basis_json"]
|
|
210
|
+
if operations is not None and not isinstance(operations, list):
|
|
211
|
+
raise defect_fields.FieldError("changes: требуется массив изменений.")
|
|
212
|
+
if operations:
|
|
213
|
+
choices, reference = defect_references.choices_in(c, current, reference_load)
|
|
214
|
+
proposed = defect_fields.edit(fields, operations, choices)
|
|
215
|
+
delta = defect_fields.diff(fields, proposed)
|
|
216
|
+
if not basis["known"]:
|
|
217
|
+
# Последняя явная команда по пути, включая удаление отсутствующего поля.
|
|
218
|
+
pending = basis.get("pending", [])
|
|
219
|
+
for op in operations:
|
|
220
|
+
path = op["path"]
|
|
221
|
+
pending = [x for x in pending if not (x["path"] == path or x["path"].startswith(path + "/"))]
|
|
222
|
+
pending.append({"path": path, "after_present": op["op"] == "set", "after": op.get("value")})
|
|
223
|
+
basis["pending"] = pending
|
|
224
|
+
changed = set(defect_fields.changed_roots(delta))
|
|
225
|
+
for group in defect_fields.REFERENCE_GROUPS.values():
|
|
226
|
+
if changed.intersection(group):
|
|
227
|
+
changed.update(group)
|
|
228
|
+
for root in changed:
|
|
229
|
+
if root in ("priority", "structureUnitId", "appStructureUnit", "releaseObject") and reference:
|
|
230
|
+
basis["references"][root] = reference
|
|
231
|
+
fields = proposed
|
|
232
|
+
fields_raw, basis_raw = dumps(fields), dumps(basis)
|
|
233
|
+
c.execute("UPDATE hub_defects SET draft_summary = ?, draft_command_text = ?, draft_revision = draft_revision + 1,"
|
|
234
|
+
" draft_fields_json = ?, draft_fields_basis_json = ?, updated_at = ? WHERE id = ?",
|
|
235
|
+
(summary, command, fields_raw, basis_raw, now_iso(), current["id"]))
|
|
236
|
+
current = owner_in(c, current)
|
|
237
|
+
history(c, current, "edit", details={"from_decisions": generate is not None,
|
|
238
|
+
"fields": fields, "basis": basis})
|
|
239
|
+
return current
|
|
240
|
+
|
|
241
|
+
|
|
242
|
+
def clear_dropped(c, project_id: int, pairs) -> None:
|
|
243
|
+
"""Связь, прочитанная текущим чтением и принятая, снимает пометку «выбыла из дефекта»: находка снова в дефекте.
|
|
244
|
+
Пара (номер, тип) – только с типом самой находки (связь другого типа – другая находка Hub)."""
|
|
245
|
+
from app.hub_status import HUB_ISSUE_TYPE
|
|
246
|
+
for ident, typ in pairs:
|
|
247
|
+
finding = c.execute("SELECT kind FROM findings WHERE project_id = ? AND hub_id = ?", (project_id, str(ident))).fetchone()
|
|
248
|
+
if finding is not None and HUB_ISSUE_TYPE.get(finding["kind"]) == str(typ or ""):
|
|
249
|
+
c.execute("UPDATE reviews SET defect_dropped = '' WHERE project_id = ? AND hub_id = ?", (project_id, str(ident)))
|
|
250
|
+
|
|
251
|
+
|
|
252
|
+
HUB_DECISION = "hub" # решение «из Hub»: у SAST «Подтверждаю дефект», у SCA «Обновить» (итог true_positive)
|
|
253
|
+
# происхождение такого решения – состав дефекта в Hub, не статус находки: Pull статусов (hub_pull.accept_issue) снимает
|
|
254
|
+
# только решения происхождения hub_sync, когда в Hub нет решения по находке; решение по составу дефекта остаётся
|
|
255
|
+
HUB_DEFECT_ORIGIN = "hub_defect"
|
|
256
|
+
|
|
257
|
+
|
|
258
|
+
def hub_decisions(c, project_id: int, pairs, source: dict) -> list[str]:
|
|
259
|
+
"""Находкам из прочитанного в Hub состава дефекта без решения – решение «из Hub» (SAST –
|
|
260
|
+
«Подтверждаю дефект», SCA – «Обновить»; в базе decision 'hub', final_verdict 'true_positive', происхождение
|
|
261
|
+
hub_defect, без отметки «Проверено»). Решение оператора, отложенное, «Риск принят» и решение из статусов Hub не
|
|
262
|
+
трогаются; находки не из выгрузки и другого вида – тоже. pairs – (номер Hub, тип находки Hub). Возвращает номера
|
|
263
|
+
находок, которым решение поставлено: их редакция решения выросла, цели строки берут её заново."""
|
|
264
|
+
from app.db import review_signature
|
|
265
|
+
from app.hub_status import HUB_ISSUE_TYPE
|
|
266
|
+
given: list[str] = []
|
|
267
|
+
stamp = now_iso()
|
|
268
|
+
for ident, typ in pairs:
|
|
269
|
+
hub_id = str(ident or "")
|
|
270
|
+
f = c.execute("SELECT kind, data_json, pkg_ecosystem, pkg_name, pkg_source, pkg_note, pkg_scope FROM findings"
|
|
271
|
+
" WHERE project_id = ? AND hub_id = ?", (project_id, hub_id)).fetchone()
|
|
272
|
+
if f is None or HUB_ISSUE_TYPE.get(f["kind"]) != str(typ):
|
|
273
|
+
continue
|
|
274
|
+
sca = str(f["kind"] or "").startswith("SCA")
|
|
275
|
+
r = c.execute("SELECT decision, final_verdict FROM reviews WHERE project_id = ? AND hub_id = ?",
|
|
276
|
+
(project_id, hub_id)).fetchone()
|
|
277
|
+
if r is not None and (r["decision"] or (sca and r["final_verdict"])):
|
|
278
|
+
continue # решение есть (у SCA решением считается и один итог – как в sca.decision_state)
|
|
279
|
+
# у SCA решение сверяется с версией находки по отпечатку (decision_state «changed»): отпечаток – текущий
|
|
280
|
+
# подпись – по эффективной идентичности пакета (план dev17, п. 4.3), как у сохранённого решения
|
|
281
|
+
sig = review_signature(package_identity.with_package(dict(f))) if sca else ""
|
|
282
|
+
c.execute("INSERT INTO reviews(project_id, hub_id, updated_at) VALUES (?, ?, ?)"
|
|
283
|
+
" ON CONFLICT(project_id, hub_id) DO NOTHING", (project_id, hub_id, stamp))
|
|
284
|
+
c.execute("UPDATE reviews SET decision = ?, final_verdict = 'true_positive', decision_origin = ?,"
|
|
285
|
+
" decision_source_json = ?, finding_sig = CASE WHEN ? <> '' THEN ? ELSE finding_sig END,"
|
|
286
|
+
" revision = revision + 1, decided_at = ?, updated_at = ? WHERE project_id = ? AND hub_id = ?",
|
|
287
|
+
(HUB_DECISION, HUB_DEFECT_ORIGIN, dumps(source), sig, sig, stamp, stamp, project_id, hub_id))
|
|
288
|
+
given.append(hub_id)
|
|
289
|
+
return given
|
|
290
|
+
|
|
291
|
+
|
|
292
|
+
def refresh_revisions(c, project_id: int, targets: list[dict], only=None) -> list[dict]:
|
|
293
|
+
"""Цели с текущей редакцией решения находки (после решения «из Hub» редакция выросла); only – номера находок,
|
|
294
|
+
у которых редакция обновляется (None – у всех)."""
|
|
295
|
+
out = []
|
|
296
|
+
for t in targets:
|
|
297
|
+
hub_id = str(t.get("hub_id") or "")
|
|
298
|
+
if only is not None and hub_id not in only:
|
|
299
|
+
out.append(t)
|
|
300
|
+
continue
|
|
301
|
+
r = c.execute("SELECT revision FROM reviews WHERE project_id = ? AND hub_id = ?", (project_id, hub_id)).fetchone()
|
|
302
|
+
out.append({**t, "revision": int(r["revision"] or 0) if r is not None else int(t.get("revision") or 0)})
|
|
303
|
+
return out
|
|
304
|
+
|
|
305
|
+
|
|
306
|
+
def give_hub_decisions(c, row_id: int, project_id: int, pairs, source: dict) -> list[str]:
|
|
307
|
+
"""hub_decisions для строки дефекта: цели строки, получившие решение, берут его редакцию."""
|
|
308
|
+
given = hub_decisions(c, project_id, pairs, source)
|
|
309
|
+
if given:
|
|
310
|
+
current = c.execute("SELECT targets_json FROM hub_defects WHERE id = ?", (row_id,)).fetchone()
|
|
311
|
+
if current is not None:
|
|
312
|
+
targets = refresh_revisions(c, project_id, loads(current["targets_json"], []), only=set(given))
|
|
313
|
+
c.execute("UPDATE hub_defects SET targets_json = ? WHERE id = ?", (dumps(targets), row_id))
|
|
314
|
+
return given
|
|
315
|
+
|
|
316
|
+
|
|
317
|
+
def accept(c, row: dict, seen: dict, op_id: int) -> None:
|
|
318
|
+
"""Первичное занесение: черновик полного чтения, без отметок и номеров находкам; находкам состава без решения –
|
|
319
|
+
решение «из Hub» (hub_decisions)."""
|
|
320
|
+
hub_entity_versions.require_current(c, row, op_id)
|
|
321
|
+
clear_dropped(c, row["project_id"], [(t.get("hub_id"), t.get("issue_type")) for t in loads(row["targets_json"], [])])
|
|
322
|
+
given = give_hub_decisions(c, row["id"], row["project_id"],
|
|
323
|
+
[(t.get("hub_id"), t.get("issue_type")) for t in loads(row["targets_json"], [])],
|
|
324
|
+
{"defect": str(row.get("hub_defect_id") or ""), "op_id": op_id, "row_id": row["id"]})
|
|
325
|
+
key, conflicts = sca_identity(c, row["project_id"], loads(row["targets_json"], [])) if row["kind"] == "SCA" else ("", [])
|
|
326
|
+
c.execute("UPDATE hub_defects SET draft_summary = summary, draft_command_text = command_text,"
|
|
327
|
+
" draft_fields_json = ?, confirmed_object_json = ?, sca_set_key = ?, conflicts_json = ? WHERE id = ?",
|
|
328
|
+
(dumps(fields_of(seen.get("object") or {})), dumps(seen["object"]) if seen.get("object") else "",
|
|
329
|
+
key, dumps(conflicts), row["id"]))
|
|
330
|
+
hub_entity_versions.accept(c, row, dumps(seen.get("object")), {"op_id": op_id})
|
|
331
|
+
history(c, owner_in(c, row), "hub_sync", op_id=op_id,
|
|
332
|
+
details={"initial_import": True, "conflicts": conflicts, "hub_decisions": given})
|
|
333
|
+
if seen.get("object"):
|
|
334
|
+
from app.defect_fields import new_basis
|
|
335
|
+
c.execute("UPDATE hub_defects SET draft_fields_basis_json = ? WHERE id = ?",
|
|
336
|
+
(dumps(new_basis(seen["object"], "accepted", op_id=op_id)), row["id"]))
|
|
337
|
+
|
|
338
|
+
|
|
339
|
+
def apply_sync(c, previous: dict, seen: dict) -> None:
|
|
340
|
+
"""Применение прежней одиночной сверки: база и черновик согласуются в транзакции строки.
|
|
341
|
+
|
|
342
|
+
Независимые текстовые правки объединяются. Конфликт отклоняет всё применение, сохраняя
|
|
343
|
+
предпросмотр и обе версии; отмена предпросмотра позволяет явно выбрать текст в карточке.
|
|
344
|
+
"""
|
|
345
|
+
if seen.get("text_note"):
|
|
346
|
+
raise ValueError("Текст дефекта в Hub не выделен: исправьте описание в Hub и повторите сверку.")
|
|
347
|
+
if not isinstance(seen.get("object"), dict) or not seen["object"]:
|
|
348
|
+
raise ValueError("Полный объект сверки не сохранён: повторите «Pull из Hub».")
|
|
349
|
+
hub_entity_versions.require_current(c, previous, seen.get("op_id"))
|
|
350
|
+
owner = owner_in(c, previous)
|
|
351
|
+
from app.hub_defects import _norm_lines as _lines
|
|
352
|
+
# описание синхронизируется целиком (ADR-0132): блок изменён в Hub, а текст – в неотправленном черновике
|
|
353
|
+
if seen.get("block_changed") and _lines(owner["draft_command_text"]) != _lines(previous["command_text"]):
|
|
354
|
+
raise ValueError("Конфликт сверки: описание изменено с двух сторон – в Hub служебный блок, в приложении текст. Применение "
|
|
355
|
+
"отменено. Отмените предпросмотр и решите, что оставить: «Push в Hub» отправит ваш текст вместе с блоком из Hub.")
|
|
356
|
+
merged = {}
|
|
357
|
+
from app.hub_defects import _norm_lines
|
|
358
|
+
for field, label in (("summary", "заголовок"), ("command_text", "текст команды")):
|
|
359
|
+
base, local, remote = previous[field], owner[f"draft_{field}"], seen[field]
|
|
360
|
+
if field == "command_text" and previous.get("origin") != "import":
|
|
361
|
+
# у дефекта из приложения текст – исходный текст оператора, а разбор описания Hub отличается от него
|
|
362
|
+
# формой (края строк, пробелы): все три версии сравниваются по строкам с нормализацией (ревью dev34,
|
|
363
|
+
# круги 1 и 3). В Hub текст тот же по строкам – черновик остаётся как есть (принятый текст строки тоже
|
|
364
|
+
# прежний, apply_import_sync); без локальной правки – черновик берёт текст Hub
|
|
365
|
+
b, lo, re_ = _norm_lines(base), _norm_lines(local), _norm_lines(remote)
|
|
366
|
+
if re_ == b or lo == re_:
|
|
367
|
+
merged[field] = local
|
|
368
|
+
elif lo == b:
|
|
369
|
+
merged[field] = remote
|
|
370
|
+
else:
|
|
371
|
+
raise ValueError(f"Конфликт сверки: {label} изменён и локально, и в Hub. "
|
|
372
|
+
"Применение отменено. Отмените предпросмотр, выберите текст в карточке и повторите сверку.")
|
|
373
|
+
continue
|
|
374
|
+
if local != base and remote != base and local != remote:
|
|
375
|
+
raise ValueError(f"Конфликт сверки: {label} изменён и локально, и в Hub. "
|
|
376
|
+
"Применение отменено. Отмените предпросмотр, выберите текст в карточке и повторите сверку.")
|
|
377
|
+
merged[field] = remote if local == base else local
|
|
378
|
+
from app import defect_fields
|
|
379
|
+
basis = defect_fields.basis_of(owner)
|
|
380
|
+
remote = fields_of(seen["object"])
|
|
381
|
+
if not basis["known"] and basis.get("pending"):
|
|
382
|
+
raise ValueError("Сначала явно используйте показанные поля как основу черновика: локальные правки сохранены.")
|
|
383
|
+
fields = dumps(defect_fields.merge(basis["base"], loads(owner["draft_fields_json"], {}), remote)
|
|
384
|
+
if basis["known"] else remote)
|
|
385
|
+
new_basis = defect_fields.new_basis(seen["object"], "sync", references=basis["references"])
|
|
386
|
+
c.execute("UPDATE hub_defects SET draft_summary = ?, draft_command_text = ?, draft_fields_json = ?,"
|
|
387
|
+
" confirmed_object_json = ?, draft_fields_basis_json = ?, draft_revision = draft_revision + 1 WHERE id = ?",
|
|
388
|
+
(merged["summary"], merged["command_text"], fields, dumps(seen["object"]), dumps(new_basis), owner["id"]))
|
|
389
|
+
hub_entity_versions.accept(c, previous, dumps(seen["object"]), {"op_id": seen.get("op_id")})
|
|
390
|
+
from app.hub_defects import linked_pairs
|
|
391
|
+
clear_dropped(c, previous["project_id"], linked_pairs(seen["object"])) # прочитанный состав, не сохранённые цели
|
|
392
|
+
# локальная правка осталась поверх принятого: по тексту приложения сравнение – по строкам с нормализацией
|
|
393
|
+
if previous.get("origin") != "import":
|
|
394
|
+
kept_local = (merged["summary"] != seen["summary"]
|
|
395
|
+
or _norm_lines(merged["command_text"]) != _norm_lines(seen["command_text"]))
|
|
396
|
+
else:
|
|
397
|
+
kept_local = merged != {"summary": seen["summary"], "command_text": seen["command_text"]}
|
|
398
|
+
# сохранённая слиянием правка полей (приоритет, серьёзность, источник…) – тоже неотправленная правка (ревью dev34,
|
|
399
|
+
# круг 4): иначе синхронизация сочтёт её принятой и заменит полями Hub без восстановления
|
|
400
|
+
kept_local = kept_local or loads(fields, {}) != remote
|
|
401
|
+
history(c, owner_in(c, owner), "hub_sync", row_id=previous["id"],
|
|
402
|
+
details={"object": seen["object"], "previous_summary": previous["summary"],
|
|
403
|
+
"previous_command_text": previous["command_text"], "local_text_preserved": kept_local})
|
|
404
|
+
return kept_local
|
|
405
|
+
|
|
406
|
+
|
|
407
|
+
def mark_kept_local(c, previous: dict) -> None:
|
|
408
|
+
"""Локальная правка осталась поверх принятого состояния Hub: следующей редакцией – событие правки после всех
|
|
409
|
+
событий принятия, чтобы синхронизация видела её неотправленной и не перезаписала без восстановления (ревью dev34,
|
|
410
|
+
круги 2–3)."""
|
|
411
|
+
owner = owner_in(c, previous)
|
|
412
|
+
c.execute("UPDATE hub_defects SET draft_revision = draft_revision + 1 WHERE id = ?", (owner["id"],))
|
|
413
|
+
history(c, owner_in(c, owner), "edit", row_id=previous["id"], details={"kept_after_sync": True})
|
|
414
|
+
|
|
415
|
+
|
|
416
|
+
def confirm(c, row: dict, seen: dict, op_id: int, targets: list[dict]) -> None:
|
|
417
|
+
"""Подтверждение текста и метаданных целей до любых последствий, на соединении перехода строки."""
|
|
418
|
+
if seen.get("text_note"):
|
|
419
|
+
raise ValueError("Текст команды не выделен: подтверждение недоступно.")
|
|
420
|
+
hub_entity_versions.require_current(c, row, op_id)
|
|
421
|
+
owner = owner_in(c, row)
|
|
422
|
+
from app.defect_fields import new_basis
|
|
423
|
+
basis = dumps(new_basis(seen["object"], "confirmed", op_id=op_id))
|
|
424
|
+
summary = row["summary"] if row["origin"] == "app" else seen["summary"]
|
|
425
|
+
command = row["command_text"] if row["origin"] == "app" else seen["command_text"]
|
|
426
|
+
fields = dumps(fields_of(seen["object"]))
|
|
427
|
+
if row["id"] != owner["id"]: # привязка не отправляла текст и не заменяет правки владельца
|
|
428
|
+
summary, command = owner["draft_summary"], owner["draft_command_text"]
|
|
429
|
+
fields = owner["draft_fields_json"]
|
|
430
|
+
basis = owner["draft_fields_basis_json"]
|
|
431
|
+
changed = (summary != owner["draft_summary"] or command != owner["draft_command_text"]
|
|
432
|
+
or fields != owner["draft_fields_json"])
|
|
433
|
+
revision = owner["draft_revision"] + int(changed)
|
|
434
|
+
c.execute("UPDATE hub_defects SET draft_summary = ?, draft_command_text = ?, draft_fields_json = ?,"
|
|
435
|
+
" confirmed_object_json = ?, draft_fields_basis_json = ?, draft_revision = ? WHERE id = ?",
|
|
436
|
+
(summary, command, fields, dumps(seen["object"]), basis, revision, owner["id"]))
|
|
437
|
+
content_hash = text_hash(dumps({"summary": seen["summary"], "command_text": seen["command_text"]}))
|
|
438
|
+
# «Внесено в Hub» – только находкам, связь которых с дефектом прочитана в Hub; остальные и прежние отметки вне
|
|
439
|
+
# прочитанного состава – «выбыла из дефекта», решение за оператором
|
|
440
|
+
from app import hub_pull
|
|
441
|
+
from app.hub_defects import linked_pairs
|
|
442
|
+
pairs = {(str(i), t) for i, t in linked_pairs(seen["object"])}
|
|
443
|
+
linked = [t for t in targets if (str(t.get("hub_id")), t.get("issue_type")) in pairs]
|
|
444
|
+
revoked = hub_pull.reconcile_defect_marks(c, owner, owner, pairs)
|
|
445
|
+
dropped = hub_pull.mark_dropped(c, owner, {str(t.get("hub_id")) for t in targets if t not in linked}
|
|
446
|
+
| {r["hub_id"] for r in revoked}, "confirm")
|
|
447
|
+
if len(linked) != len(targets): # номер дефекта – только ключам находок, оставшихся в составе
|
|
448
|
+
narrow_number_keys(c, row, owner, [t["hub_id"] for t in linked],
|
|
449
|
+
typed_ids(c, row["project_id"], [t for t in targets if t not in linked]))
|
|
450
|
+
targets = linked
|
|
451
|
+
# связь прочитана текущим чтением (require_current выше) – находка в дефекте, пометка снимается
|
|
452
|
+
clear_dropped(c, row["project_id"], [(t["hub_id"], t.get("issue_type")) for t in linked])
|
|
453
|
+
# отметка «Внесено в Hub» – по подтверждённому составу: и цели с пустым отпечатком решения
|
|
454
|
+
# (Push текста как есть при неготовой заготовке набора, 0.9.26.dev15) получают отпечаток содержимого – карточка
|
|
455
|
+
# сверяет текст решения только при непустом decision_hash; цели прежнего формата без поля decision_hash – как раньше
|
|
456
|
+
confirmed_targets = [{**t, "decision_hash": t.get("decision_hash", t.get("entered_hash", "")),
|
|
457
|
+
"entered_hash": content_hash,
|
|
458
|
+
"entered_origin": "defect", "entered_defect_id": owner["id"],
|
|
459
|
+
"entered_op_id": op_id, "entered_defect_revision": revision} for t in targets]
|
|
460
|
+
c.execute("UPDATE hub_defects SET targets_json = ?, confirmed_object_json = ? WHERE id = ?",
|
|
461
|
+
(dumps(confirmed_targets), dumps(seen["object"]), row["id"]))
|
|
462
|
+
hub_entity_versions.accept(c, row, dumps(seen["object"]), {"op_id": op_id})
|
|
463
|
+
history(c, owner_in(c, owner), "hub_confirm", row_id=row["id"], op_id=op_id,
|
|
464
|
+
details={"object": seen["object"], "members_snapshot": members_in(c, row),
|
|
465
|
+
"revoked_confirmations": revoked, "dropped": dropped})
|
|
466
|
+
# привязка не отправляла текст, а основа записана заново: правка владельца – событием после принятия, иначе
|
|
467
|
+
# синхронизация сочла бы её принятой и заменила (ADR-0136)
|
|
468
|
+
if row["id"] != owner["id"] and local_edit(owner)["edited"]:
|
|
469
|
+
mark_kept_local(c, owner)
|
|
470
|
+
|
|
471
|
+
|
|
472
|
+
def narrow_number_keys(c, row: dict, owner: dict, hub_ids, gone_ids=()) -> None:
|
|
473
|
+
"""Ключи номера строки – только находок hub_ids; номер этого дефекта снимается только с ключей выбывших находок
|
|
474
|
+
gone_ids (с их нынешним набором SCA) – прежний ключ записи, за которым теперь другие находки (перенос между
|
|
475
|
+
наборами), не задевается (ревью 31.10); кроме ключей других записей done."""
|
|
476
|
+
keys = loads(row.get("number_keys_json"), [])
|
|
477
|
+
kept = set(Database.defect_keys_of_findings_in(c, row["project_id"], list(hub_ids)))
|
|
478
|
+
gone = set(Database.defect_keys_of_findings_in(c, row["project_id"], in_some_set(c, row["project_id"], gone_ids)))
|
|
479
|
+
others = {k for r in c.execute("SELECT number_keys_json FROM hub_defects WHERE project_id = ? AND draft_owner_id <> ?"
|
|
480
|
+
" AND state = 'done'", (row["project_id"], owner["id"]))
|
|
481
|
+
for k in loads(r["number_keys_json"], [])}
|
|
482
|
+
# снимается только номер этого дефекта: ключу могли потом выдать другой номер вручную (ревью 31.10); перенумерацию
|
|
483
|
+
# в Hub ключи записи догоняют при «Применить» (renumber_keys)
|
|
484
|
+
for key in (set(keys) & gone) - kept - others:
|
|
485
|
+
c.execute("DELETE FROM defects WHERE project_id = ? AND defect_key = ? AND number = ?",
|
|
486
|
+
(row["project_id"], key, row.get("number")))
|
|
487
|
+
c.execute("UPDATE hub_defects SET number_keys_json = ? WHERE id = ?", (dumps([k for k in keys if k in kept]), row["id"]))
|
|
488
|
+
|
|
489
|
+
|
|
490
|
+
def renumber_keys(c, row: dict, old: Any, new: Any, targets) -> None:
|
|
491
|
+
"""Hub перенумеровал дефект (ID<old> → ID<new>): ключи номера записи текущего состава (находки целей с их типом и
|
|
492
|
+
нынешним набором SCA), у которых номер этого дефекта, получают новый номер; ключ прежнего набора и ключи с другим
|
|
493
|
+
номером (выданным вручную) не трогаются."""
|
|
494
|
+
ints = all(isinstance(n, int) and not isinstance(n, bool) and n > 0 for n in (old, new))
|
|
495
|
+
if not ints or old == new:
|
|
496
|
+
return
|
|
497
|
+
stamp = now_iso()
|
|
498
|
+
current = set(Database.defect_keys_of_findings_in(c, row["project_id"], typed_ids(c, row["project_id"], targets)))
|
|
499
|
+
for key in [k for k in loads(row.get("number_keys_json"), []) if k in current]:
|
|
500
|
+
c.execute("UPDATE defects SET number = ?, updated_at = ?, assigned_at = ? WHERE project_id = ? AND defect_key = ?"
|
|
501
|
+
" AND number = ?", (new, stamp, stamp, row["project_id"], key, old))
|
|
502
|
+
|
|
503
|
+
|
|
504
|
+
def in_some_set(c, project_id: int, hub_ids) -> list[str]:
|
|
505
|
+
"""hub_id без находок SCA, явно отнесённых оператором к «без дефекта» (set_no NULL): их ключ – набор по умолчанию,
|
|
506
|
+
за которым могут быть другие находки, – номер с него автоматически не снимается (ревью 31.10). Пометка учитывается
|
|
507
|
+
только для текущих компонента, версии и экосистемы находки – как в вычислении ключа набора
|
|
508
|
+
(`defect_keys_of_findings_in`): пометка прежней версии после новой выгрузки не действует (ревью круг 7)."""
|
|
509
|
+
kept = []
|
|
510
|
+
for h in hub_ids:
|
|
511
|
+
finding = c.execute("SELECT kind, data_json, pkg_ecosystem, pkg_name, pkg_source, pkg_note, pkg_scope FROM findings WHERE project_id = ? AND hub_id = ?",
|
|
512
|
+
(project_id, str(h))).fetchone()
|
|
513
|
+
ref = None
|
|
514
|
+
if finding is not None and finding["kind"] == "SCA":
|
|
515
|
+
ref = input_ref(*package_identity.of(package_identity.with_package(dict(finding)))) # план dev17, п. 4.3
|
|
516
|
+
if ref is None or c.execute(
|
|
517
|
+
"SELECT 1 FROM sca_set_members WHERE project_id = ? AND hub_id = ? AND input_ref = ? AND set_no IS NULL",
|
|
518
|
+
(project_id, str(h), ref)).fetchone() is None:
|
|
519
|
+
kept.append(str(h))
|
|
520
|
+
return kept
|
|
521
|
+
|
|
522
|
+
|
|
523
|
+
def typed_ids(c, project_id: int, targets) -> list[str]:
|
|
524
|
+
"""hub_id целей, тип связи которых совпадает с видом самой находки."""
|
|
525
|
+
from app.hub_status import HUB_ISSUE_TYPE
|
|
526
|
+
targets = list(targets)
|
|
527
|
+
wanted = sorted({str(t.get("hub_id") or "") for t in targets})
|
|
528
|
+
kinds: dict[str, str] = {}
|
|
529
|
+
# один запрос на все цели, а не на каждую (бэклог 123: страница дефектов – тысячи обращений к базе)
|
|
530
|
+
for start in range(0, len(wanted), 500):
|
|
531
|
+
part = wanted[start:start + 500]
|
|
532
|
+
rows = c.execute(f"SELECT hub_id, kind FROM findings WHERE project_id = ? AND hub_id IN ({','.join('?' * len(part))})",
|
|
533
|
+
(project_id, *part)).fetchall()
|
|
534
|
+
kinds.update({str(r["hub_id"]): str(r["kind"]) for r in rows})
|
|
535
|
+
ids = []
|
|
536
|
+
for t in targets:
|
|
537
|
+
kind = kinds.get(str(t.get("hub_id") or ""))
|
|
538
|
+
if kind is not None and HUB_ISSUE_TYPE.get(kind) == str(t.get("issue_type") or ""):
|
|
539
|
+
ids.append(str(t["hub_id"]))
|
|
540
|
+
return ids
|
|
541
|
+
|
|
542
|
+
|
|
543
|
+
def drop_removed(c, row: dict, hub_pairs, removed, targets) -> None:
|
|
544
|
+
"""«Применить» одиночной сверки: цели, которых в Hub больше нет, ушли из состава строки – их отметки по
|
|
545
|
+
этому дефекту снимаются, им ставится пометка «выбыла из дефекта» (пара с типом самой находки), номер – только
|
|
546
|
+
ключам оставшихся; набор SCA и конфликт состава пересчитываются по новому составу. row – строка до применения:
|
|
547
|
+
прежний номер и ключи номера."""
|
|
548
|
+
from app import hub_pull
|
|
549
|
+
owner = owner_in(c, row)
|
|
550
|
+
revoked = hub_pull.reconcile_defect_marks(c, owner, owner, hub_pairs)
|
|
551
|
+
gone = hub_pull.dropped_ids(c, row["project_id"], set(removed), set(hub_pairs))
|
|
552
|
+
dropped = hub_pull.mark_dropped(c, owner, gone | {r["hub_id"] for r in revoked}, "sync")
|
|
553
|
+
if removed:
|
|
554
|
+
# сохраняются ключи только пар с типом самой находки: связь SCA_S:X не держит ключ локальной SAST-находки X
|
|
555
|
+
typed = typed_ids(c, row["project_id"], targets)
|
|
556
|
+
narrow_number_keys(c, row, owner, typed, gone)
|
|
557
|
+
# номер этого дефекта у находок, которые Hub сейчас из него убрал, – даже если он не записан в number_keys
|
|
558
|
+
from app.hub_defects import release_number_in
|
|
559
|
+
own = Database.defect_keys_of_findings_in(c, row["project_id"], typed)
|
|
560
|
+
release_number_in(c, row, row.get("number"),
|
|
561
|
+
Database.defect_keys_of_findings_in(c, row["project_id"], in_some_set(c, row["project_id"], gone)), own)
|
|
562
|
+
if row["kind"] == "SCA":
|
|
563
|
+
key, conflicts = sca_identity(c, row["project_id"], targets)
|
|
564
|
+
c.execute("UPDATE hub_defects SET sca_set_key = ?, conflicts_json = ? WHERE id = ?", (key, dumps(conflicts), row["id"]))
|
|
565
|
+
if removed or revoked:
|
|
566
|
+
history(c, owner_in(c, owner), "hub_sync", row_id=row["id"],
|
|
567
|
+
details={"removed": sorted(removed), "revoked_confirmations": revoked, "dropped": dropped})
|
|
568
|
+
|
|
569
|
+
|
|
570
|
+
def use_basis(db, row, revision, source, shown):
|
|
571
|
+
"""Локальное принятие показанного наблюдения в основу; подтверждённая версия не меняется."""
|
|
572
|
+
from app import defect_fields, defect_references, hub_defects
|
|
573
|
+
with db._tx() as c:
|
|
574
|
+
current = owner_in(c, row)
|
|
575
|
+
if str(current["draft_revision"]) != str(revision):
|
|
576
|
+
raise ValueError("Черновик изменился: обновите страницу.")
|
|
577
|
+
problem = edit_problem(c, {**current, "sync_json": ""})
|
|
578
|
+
if problem or hub_defects.update_busy(current):
|
|
579
|
+
raise ValueError(problem or "Дождитесь результата операции.")
|
|
580
|
+
basis = defect_fields.basis_of(current)
|
|
581
|
+
if basis["known"]:
|
|
582
|
+
raise ValueError("Основа уже определена: обновите страницу.")
|
|
583
|
+
seen = (loads(current["sync_json"], {}).get("read", {}) if source == "sync"
|
|
584
|
+
else loads(current["import_json"], {}) if source == "observation" else {})
|
|
585
|
+
if not seen.get("object") or defect_references.signature(seen) != shown:
|
|
586
|
+
raise ValueError("Показанное наблюдение изменилось: обновите страницу.")
|
|
587
|
+
obj = seen["object"]
|
|
588
|
+
if str(obj.get("id")) != str(current["hub_defect_id"]) or obj.get("appId") != current["app_id"]:
|
|
589
|
+
raise ValueError("Наблюдение относится к другому дефекту или приложению.")
|
|
590
|
+
new = defect_fields.new_basis(obj, "observation", source=source, observation_signature=shown,
|
|
591
|
+
read_at=seen.get("read_at"), references=basis["references"])
|
|
592
|
+
fields = defect_fields.apply_changes(new["base"], basis.get("pending", []))
|
|
593
|
+
c.execute("UPDATE hub_defects SET draft_fields_json = ?, draft_fields_basis_json = ?,"
|
|
594
|
+
" draft_revision = draft_revision + 1, updated_at = ? WHERE id = ?",
|
|
595
|
+
(dumps(fields), dumps(new), now_iso(), current["id"]))
|
|
596
|
+
fresh = owner_in(c, current)
|
|
597
|
+
history(c, fresh, "edit", details={"basis_initialized": new, "fields": fields})
|
|
598
|
+
return fresh
|
|
599
|
+
|
|
600
|
+
|
|
601
|
+
def current_effect(c, row: dict, target: dict | None = None) -> bool:
|
|
602
|
+
"""Позднее последствие не восстанавливает удалённую цель или прежнее поколение."""
|
|
603
|
+
current = c.execute("SELECT * FROM hub_defects WHERE id = ?", (row["id"],)).fetchone()
|
|
604
|
+
if current is None or current["state"] != "done" or current["confirm_op_id"] != row.get("confirm_op_id"):
|
|
605
|
+
return False
|
|
606
|
+
if current["draft_owner_id"] != row.get("draft_owner_id"):
|
|
607
|
+
return False
|
|
608
|
+
keys = ("hub_id", "issue_type", "revision", "sig", "decision_hash", "entered_hash", "entered_origin",
|
|
609
|
+
"entered_defect_id", "entered_op_id", "entered_defect_revision")
|
|
610
|
+
live = loads(current["targets_json"], [])
|
|
611
|
+
wanted = [target] if target is not None else loads(row["targets_json"], [])
|
|
612
|
+
return all(any(all(t.get(k) == candidate.get(k) for k in keys) for candidate in live) for t in wanted)
|