dv/utp_service
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

фикс камеры 6

Browse source
This commit is contained in:
dv 2026-04-14 15:47:28 +03:00
parent dacaab2556
commit d84e9de33c
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backend/app/services/camera.py
View file

@ -52,15 +52,13 @@ def _resolve_camera_credentials(device: Device, obj: Object) -> tuple[str, str,
user = (cp.get("username") or device.ssh_user_override or obj.ssh_user or "admin") user = (cp.get("username") or device.ssh_user_override or obj.ssh_user or "admin")
if cp.get("password"): if cp.get("password"):
password = str(cp["password"]) # plaintext from connection_params password = str(cp["password"]) # plaintext from connection_params (DeviceEditModal)
pwd_source = "connection_params.password" pwd_source = "connection_params.password"
elif device.ssh_pass_override_enc: elif device.ssh_pass_override_enc:
password = decrypt(device.ssh_pass_override_enc) password = decrypt(device.ssh_pass_override_enc)
pwd_source = "ssh_pass_override_enc" pwd_source = "ssh_pass_override_enc"
elif obj.ssh_pass_enc:
password = decrypt(obj.ssh_pass_enc)
pwd_source = "obj.ssh_pass_enc"
else: else:
# Do NOT fall back to obj.ssh_pass_enc — object SSH password is for servers, not cameras
password = "" password = ""
pwd_source = "empty" pwd_source = "empty"

13
backend/app/services/discovery/orchestrator.py
View file

@ -22,7 +22,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from app.models.device import Device from app.models.device import Device
from app.models.object import Object from app.models.object import Object
from app.models.rack import Rack from app.models.rack import Rack
from app.services.crypto import decrypt, encrypt from app.services.crypto import decrypt
from .config_parser import parse_config, parse_slave_check from .config_parser import parse_config, parse_slave_check
from .db_resolver import autodetect_db_from_server, get_rack_hosts from .db_resolver import autodetect_db_from_server, get_rack_hosts
@ -603,6 +603,15 @@ async def _upsert_plugin_device(
existing.rack_id = rack_id existing.rack_id = rack_id
changes.append(f"rack_id: None→{rack_id}") changes.append(f"rack_id: None→{rack_id}")
# Always sync credentials from config — they may have changed
if found.http_username:
cp = dict(existing.connection_params or {})
if cp.get("username") != found.http_username or cp.get("password") != found.http_password:
cp["username"] = found.http_username
cp["password"] = found.http_password # plaintext — camera web auth
existing.connection_params = cp
changes.append(f"connection_params.credentials updated")
if changes: if changes:
logger.info("[discovery] %s (%s) - UPDATED: %s", found.ip, found.plugin_name, ", ".join(changes)) logger.info("[discovery] %s (%s) - UPDATED: %s", found.ip, found.plugin_name, ", ".join(changes))
result.updated += 1 result.updated += 1
@ -625,7 +634,7 @@ async def _upsert_plugin_device(
conn_params: dict = {} conn_params: dict = {}
if found.http_username: if found.http_username:
conn_params["username"] = found.http_username conn_params["username"] = found.http_username
conn_params["password_enc"] = encrypt(found.http_password) if found.http_password else "" conn_params["password"] = found.http_password # plaintext — camera web auth, not SSH
db.add(Device( db.add(Device(
object_id=obj.id, ip=found.ip, hostname=hostname, object_id=obj.id, ip=found.ip, hostname=hostname,
category=found.category, role=found.role, source="auto_ssh", category=found.category, role=found.role, source="auto_ssh",