Remediate the 2026-09-03 feature-test findings

plugins/printers/api/asset_routes.py

@@ -6,7 +6,7 @@ import re
 from flask import Blueprint, request, Response, current_app
 from flask_jwt_extended import jwt_required
 
-from shopdb.api import db, cache, Setting, Asset, AssetType, Vendor, Model, Communication, CommunicationType, AssetRelationship, RelationshipType, success_response, error_response, paginated_response, ErrorCodes, get_pagination_params, paginate_query
+from shopdb.api import db, cache, Setting, Asset, AssetType, Vendor, Model, Communication, CommunicationType, AssetRelationship, RelationshipType, success_response, error_response, paginated_response, ErrorCodes, get_pagination_params, paginate_query, intarg
 
 from ..models import Printer, PrinterType, ModelSupply, PrinterDriver, PrinterObservedQueue
 from ..models.model_supply import SUPPLY_TYPES, SUPPLY_COLORS, CAPACITY_TIERS
@@ -163,10 +163,20 @@ def create_driver():
     data = request.get_json() or {}
     if not (data.get('name') and data.get('location')):
         return error_response(ErrorCodes.VALIDATION_ERROR, 'name and location are required')
+    # drivername and vendorid are accepted here because they are the two
+    # fields the converger actually uses. drivername is the exact string from
+    # the INF that Add-PrinterDriver matches on - `name` is ours to choose and
+    # means nothing to Windows - and vendorid attaches a universal driver to a
+    # whole make. Neither was read from the payload, so both came back null on
+    # a 201 and there was no way to set them through any interface: the
+    # converger had nothing to match and installed nothing, and driver-name
+    # drift could never be detected because the expected value was never there.
     d = PrinterDriver(
         name=data['name'],
         location=data['location'],
         description=data.get('description'),
+        drivername=(data.get('drivername') or '').strip() or None,
+        vendorid=data.get('vendorid') or None,
         modelnumberid=data.get('modelnumberid') or None,
         isactive=data.get('isactive', True),
     )
@@ -185,8 +195,11 @@ def update_driver(driver_id):
     for key in ('name', 'location', 'description', 'isactive'):
         if key in data:
             setattr(d, key, data[key])
-    if 'modelnumberid' in data:
-        d.modelnumberid = data['modelnumberid'] or None
+    if 'drivername' in data:
+        d.drivername = (data['drivername'] or '').strip() or None
+    for key in ('vendorid', 'modelnumberid'):
+        if key in data:
+            setattr(d, key, data[key] or None)
     db.session.commit()
     return success_response(d.to_dict(), message='Driver updated')
 
@@ -261,20 +274,20 @@ def list_printers():
         )
 
     # Type filter
-    if typeid := request.args.get('typeid', request.args.get('type_id')):
-        query = query.filter(Printer.printertypeid == int(typeid))
+    if (typeid := intarg('typeid', intarg('type_id'))) is not None:
+        query = query.filter(Printer.printertypeid == typeid)
 
     # Vendor filter
-    if vendor_id := request.args.get('vendorid', request.args.get('vendor_id')):
-        query = query.filter(Printer.vendorid == int(vendor_id))
+    if (vendor_id := intarg('vendorid', intarg('vendor_id'))) is not None:
+        query = query.filter(Printer.vendorid == vendor_id)
 
     # Location filter
-    if location_id := request.args.get('locationid', request.args.get('location_id')):
-        query = query.filter(Asset.locationid == int(location_id))
+    if (location_id := intarg('locationid', intarg('location_id'))) is not None:
+        query = query.filter(Asset.locationid == location_id)
 
     # Business unit filter
-    if bu_id := request.args.get('businessunitid', request.args.get('businessunit_id')):
-        query = query.filter(Asset.businessunitid == int(bu_id))
+    if (bu_id := intarg('businessunitid', intarg('businessunit_id'))) is not None:
+        query = query.filter(Asset.businessunitid == bu_id)
 
     # Sorting
     sort_by = request.args.get('sort', 'hostname')
@@ -2316,15 +2329,28 @@ def printer_lookup():
             'Provide ip or fqdn'
         )
 
-    # match the IP against any active printer communication
-    row = (
+    # An IP matches a communication row; an FQDN matches the printer's
+    # hostname. Both were compared against Communication.ipaddress, so
+    # ?fqdn=<hostname> never found anything - it 404d on printers whose
+    # hostname was right there on the record. Zabbix uses this to jump to a
+    # printer, and it knows names as often as addresses.
+    query = (
         db.session.query(Printer, Asset)
         .join(Asset, Asset.assetid == Printer.assetid)
-        .join(Communication, Communication.assetid == Asset.assetid)
         .filter(Asset.isactive == True)
-        .filter(Communication.ipaddress == lookup_value)
-        .first()
     )
+    if ip:
+        row = (query
+               .join(Communication, Communication.assetid == Asset.assetid)
+               .filter(Communication.ipaddress == ip)
+               .first())
+    else:
+        row = query.filter(Printer.hostname == fqdn).first()
+        if row is None:
+            # A caller holding a fully-qualified name against a site that
+            # stores the short one, or the reverse.
+            shortname = fqdn.split('.', 1)[0]
+            row = query.filter(Printer.hostname == shortname).first()
 
     if not row:
         return error_response(
@@ -2481,8 +2507,8 @@ def list_supply_models():
 
     if search := request.args.get('search'):
         query = query.filter(Model.modelnumber.ilike(f'%{search}%'))
-    if vendor_id := request.args.get('vendorid', request.args.get('vendor_id')):
-        query = query.filter(Model.vendorid == int(vendor_id))
+    if (vendor_id := intarg('vendorid', intarg('vendor_id'))) is not None:
+        query = query.filter(Model.vendorid == vendor_id)
     if request.args.get('withsupplies', '').lower() == 'true':
         query = query.having(supplycount > 0)
 
@@ -2755,7 +2781,7 @@ def supplies_forecast():
     )
 
     try:
-        days = max(1, min(365, int(request.args.get('days', 90))))
+        days = max(1, min(365, intarg('days', 90)))
     except (TypeError, ValueError):
         days = 90