main was 16 days and 259 commits behind the line the product is actually built on, at contract 0.30.0 against 0.35.0, with no per-PC credential code at all. It was neither current nor curated - just stale. This brings it forward and, at the same time, makes it mean something: main is what a receiving site installs, and nothing else. WHAT IT CARRIES. Twelve plugins - backups, computers, endpoints, guides, knowledgebase, machines, network, notifications, printers, slides, tools, warranty - plus applications, which is manifest-less core and always ships. The only manifest dependency inside that set is endpoints on computers, and both are in it, so the closure is self-contained. WHAT IT DOES NOT. employees, geenforce, measuringtools, printedparts and usb stay on the site line. So do the Windows installer tree, the VM rehearsal helpers, the agent tooling config, one site's data loader, the internal audit and findings records, and the planner spreadsheet. 1,135 tracked files against 1,438. A REMOVAL THAT BREAKS THE APP IS NOT A REMOVAL, and two nearly shipped: deploy/site-profile-universal.json still named all seventeen plugins. It is the file docs/DEPLOY.md tells a site to provision from, so a fresh install would have failed at `flask plugin apply-profile` with PluginError - the first thing a receiving site does, broken by the branch meant to serve them. It now names the twelve that exist, and its comment says the two must agree. agent/ was never refreshed. Whoever populated this branch copied shopdb/, plugins/, frontend/ and tests/ from the site line and left the agent tree at its September state: 22 C# and PowerShell sources missing, including AgentCredentials, EnrollmentService, AgentHttpFactory and the fleet-alert client, plus one file the site line had deleted still present. The old tree is internally consistent, so it compiles, and nothing in CI builds it - every gate was green over a server that speaks enrollment and per-PC credentials to a bundled agent source that cannot. Resynced whole. DECISIONS THIS ENCODES, rather than defers: - The plugin-authoring lab builds printedparts, whose manifest depends on employees, so it could not stay. The lab remains on the site line and main ships no build-along tutorial. That is a real loss for an adopting developer and is recorded here rather than discovered later. - Recognition, Training and Recertification notifications are no longer seeded. Each splits one notification into a card per employee and renders a photo, which needs a plugin this branch does not bundle. Seeding them would offer an author a type that cannot resolve anybody. A site that installs employees gets them from that plugin's own seed. - Windows/IIS is documented as the legacy path throughout, and the README leads with Docker, because that is what a receiving site gets. The API description is regenerated for THIS branch - 347 paths and 483 operations, down from 415 and 573 - so the published contract describes what is here rather than what the site line serves. docs/CONFIG.md lost the two measuring-tool label keys the code no longer declares, which two lanes had decided opposite ways. Suite: 3124 passed, 6 skipped. Naming and style gates pass. The docs gates run rather than skip, and every index line count is derived from the file it names.
91 lines
3.6 KiB
Python
91 lines
3.6 KiB
Python
"""Agent binary upload version gating: PE-fallback and precedence.
|
|
|
|
The upload route no longer rejects the version at raw input. A typed value is
|
|
only a hint; the dotted-numeric FILE version in the binary's PE resource is the
|
|
authority. The route falls back to it when the typed value is missing or not
|
|
dotted-numeric, and only refuses when neither yields a usable version.
|
|
|
|
Building a real PE with a RT_VERSION resource inline is impractical (see the
|
|
agentstore unit tests), so these API tests monkeypatch read_pe_file_version to
|
|
stand in for the parser. PE-magic bytes keep looks_like_pe happy so the request
|
|
reaches the version gate.
|
|
"""
|
|
|
|
import io
|
|
|
|
from plugins.endpoints.api import agentstore
|
|
from plugins.endpoints.api import agentupload
|
|
from shopdb.config import Config
|
|
|
|
UPLOAD_URL = '/api/endpoints/siteagent/binaries/{}'
|
|
|
|
_PE_BYTES = b'MZ' + b'\x00' * 128
|
|
|
|
|
|
def _upload(client, headers, monkeypatch, detected, typed=None):
|
|
monkeypatch.setattr(agentstore, 'read_pe_file_version',
|
|
lambda data: detected)
|
|
form = {'file': (io.BytesIO(_PE_BYTES), 'shopdbagent.exe')}
|
|
if typed is not None:
|
|
form['version'] = typed
|
|
return client.post(
|
|
UPLOAD_URL.format('agent'),
|
|
data=form,
|
|
content_type='multipart/form-data',
|
|
headers=headers)
|
|
|
|
|
|
def test_upload_falls_back_to_pe_version_when_typed_is_missing(
|
|
client, db, app, auth_headers, monkeypatch):
|
|
response = _upload(client, auth_headers, monkeypatch, '1.5.0.0')
|
|
assert response.status_code == 200, response.get_json()
|
|
payload = response.get_json()['data']
|
|
assert payload['current'] == '1.5.0.0'
|
|
assert any(v['version'] == '1.5.0.0' for v in payload['versions'])
|
|
|
|
|
|
def test_upload_falls_back_when_typed_is_not_dotted_numeric(
|
|
client, db, app, auth_headers, monkeypatch):
|
|
response = _upload(client, auth_headers, monkeypatch, '1.5.0.0',
|
|
typed='1.5.0+1a1bf0640f956634dada1b34840')
|
|
assert response.status_code == 200, response.get_json()
|
|
assert response.get_json()['data']['current'] == '1.5.0.0'
|
|
|
|
|
|
def test_upload_prefers_valid_typed_version_over_pe(
|
|
client, db, app, auth_headers, monkeypatch):
|
|
response = _upload(client, auth_headers, monkeypatch, '9.9.9.9',
|
|
typed='1.6.3')
|
|
assert response.status_code == 200, response.get_json()
|
|
assert response.get_json()['data']['current'] == '1.6.3'
|
|
|
|
|
|
def test_upload_rejects_when_neither_typed_nor_pe_is_usable(
|
|
client, db, app, auth_headers, monkeypatch):
|
|
response = _upload(client, auth_headers, monkeypatch, None)
|
|
assert response.status_code == 400
|
|
assert 'dotted-numeric' in response.get_json()['data']['error']['message']
|
|
|
|
|
|
def test_upload_cap_admits_a_self_contained_single_file_publish():
|
|
"""The tray publishes ~69 MB; the cap must clear a real binary.
|
|
|
|
This is the bug that presented as "upload does not detect version": the
|
|
size check returns before the PE is parsed, so an oversized file looks
|
|
like a parser failure to the operator. Pinned at 100 MB rather than the
|
|
observed 69 MB so runtime growth does not silently re-break it.
|
|
"""
|
|
assert agentupload._MAX_UPLOAD_BYTES >= 100 * 1024 * 1024
|
|
|
|
|
|
def test_request_cap_stays_above_the_agent_upload_cap():
|
|
"""MAX_CONTENT_LENGTH bounds the whole multipart envelope, not the file.
|
|
|
|
Setting the two equal rejects a file sitting exactly at the agent cap,
|
|
because the boundaries and form fields push the request over. They must
|
|
move together, with real headroom between them.
|
|
"""
|
|
envelope = Config.MAX_CONTENT_LENGTH
|
|
assert envelope > agentupload._MAX_UPLOAD_BYTES
|
|
assert envelope - agentupload._MAX_UPLOAD_BYTES >= 1024 * 1024
|