test: verify cloud APT acquisition without package changes
Rust development slice / linux (push) Failing after 7s

This commit is contained in:
2026-11-13 14:22:39 +01:00
parent 548739ea45
commit a707d80e40
4 changed files with 94 additions and 12 deletions
+3 -2
View File
@@ -13,8 +13,9 @@ function readPrivate(file) {
}
(async () => {
const file = path.resolve(process.argv[2]); const expected = readPrivate(file);
assert(expected.profile === 'dev/test' && expected.case === 'apt_diagnostic_v1' && expected.expected_principal === 'simulated-testprincipal-a');
const source = fs.readFileSync(path.join(root, 'deploy/linux/apt-diagnostic.py'), 'utf8');
assert(expected.profile === 'dev/test' && ['apt_diagnostic_v1', 'apt_acquisition_v1'].includes(expected.case) && expected.expected_principal === 'simulated-testprincipal-a');
const sourceFile = expected.case === 'apt_diagnostic_v1' ? 'apt-diagnostic.py' : 'apt-acquisition-diagnostic.py';
const source = fs.readFileSync(path.join(root, 'deploy/linux', sourceFile), 'utf8');
const script = "exec /usr/bin/python3 -I - <<'RMM_APT_DIAGNOSTIC'\n" + source + '\nRMM_APT_DIAGNOSTIC\n';
const login = readPrivate(path.join(root, 'credentials/server-browser-login.json'));
const browsers = path.join(root, 'web/node_modules/.cache/playwright-browsers');
+14 -10
View File
@@ -60,19 +60,21 @@ def activate():
print('Diagnostic scope active; no APT/service/reboot permission or job approval')
def diagnose():
def diagnose(case='apt_diagnostic_v1'):
m=cloud.contract;settings=identity();require(evidence('gate')['unresolved']==0,'unresolved central job')
backend=cloud.Backend();device=backend.call('inventory.get_device',{k:settings[k] for k in ('tenant_id','asset_id')})
require(device['presence']=='online' and {'root:run_script','rmm.sync.v1','helper.root.v1'}<=set(device['capabilities']),'online root helper required')
source=(ROOT/'deploy/linux/apt-diagnostic.py').read_text()
require(case in ('apt_diagnostic_v1','apt_acquisition_v1'),'fixed diagnostic case')
source=(ROOT/'deploy/linux'/('apt-diagnostic.py' if case=='apt_diagnostic_v1' else 'apt-acquisition-diagnostic.py')).read_text()
script="exec /usr/bin/python3 -I - <<'RMM_APT_DIAGNOSTIC'\n"+source+'\nRMM_APT_DIAGNOSTIC\n'
request=m.case_input('service_setup',settings)
request['parameters'].update(variants=[dict(os_family='linux',interpreter='posix_sh',encoding='utf-8',script_utf8=script)],
timeout_seconds=90,max_output_bytes=16384,expected_stdout=None)
request['reason']='APT Exit 100 diagnosis: two dry-run solver checks; no package transaction; preserve failed attempt'
folder=STATE/'diagnosis';folder.mkdir(mode=0o700,exist_ok=False)
request['reason']=('APT Exit 100 diagnosis: two dry-run solver checks; no package transaction; preserve failed attempt' if case=='apt_diagnostic_v1'
else 'APT Exit 100 acquisition diagnosis: download-only, copied dpkg DB, private scratch; no package transaction; preserve failed attempt')
folder=STATE/('diagnosis' if case=='apt_diagnostic_v1' else 'diagnosis-acquisition');folder.mkdir(mode=0o700,exist_ok=False)
prepare=folder/'prepare.json';output=folder/'prepared.json'
common=dict(profile='dev/test',case='apt_diagnostic_v1',expected_principal='simulated-testprincipal-a',**settings)
common=dict(profile='dev/test',case=case,expected_principal='simulated-testprincipal-a',**settings)
m.write_private(prepare,dict(common,phase='prepare',request=request,output_file=str(output)))
cloud.prepare_browser()
def browser(file):
@@ -91,12 +93,13 @@ def diagnose():
save();approve=folder/'approve.json'
m.write_private(approve,dict(checkpoint,phase='approve'))
print('Diagnostic: pending 0/0/0 verified; separate actual UI approval',flush=True);browser(approve)
finish_diagnosis()
finish_diagnosis(case)
def finish_diagnosis():
def finish_diagnosis(case='apt_diagnostic_v1'):
"""Read/audit the existing fixed job only; never prepare or approve again."""
m=cloud.contract;settings=identity();folder=STATE/'diagnosis';path=folder/'checkpoint.json'
require(case in ('apt_diagnostic_v1','apt_acquisition_v1'),'fixed existing diagnostic case')
m=cloud.contract;settings=identity();folder=STATE/('diagnosis' if case=='apt_diagnostic_v1' else 'diagnosis-acquisition');path=folder/'checkpoint.json'
checkpoint=m.protected_json(path);plan=checkpoint['plan'];job=plan['jobs'][0]
require(all(checkpoint[k]==settings[k] for k in settings),'diagnostic target changed')
operation=dict(operation_id=checkpoint['operation_id']);common=checkpoint;backend=cloud.Backend()
@@ -124,9 +127,10 @@ def close():
if __name__=='__main__':
parser=argparse.ArgumentParser(description=__doc__);parser.add_argument('action',choices=('activate','diagnose','finish','close'));args=parser.parse_args()
parser=argparse.ArgumentParser(description=__doc__);parser.add_argument('action',choices=('activate','diagnose','finish','diagnose-acquisition','finish-acquisition','close'));args=parser.parse_args()
try:
os.umask(0o077);STATE.mkdir(mode=0o700,exist_ok=True)
dict(activate=activate,diagnose=diagnose,finish=finish_diagnosis,close=close)[args.action]()
dict(activate=activate,diagnose=diagnose,finish=finish_diagnosis,close=close,
**{'diagnose-acquisition':lambda:diagnose('apt_acquisition_v1'),'finish-acquisition':lambda:finish_diagnosis('apt_acquisition_v1')})[args.action]()
except Exception as error:
print('APT_FOLLOWUP_INCOMPLETE:'+type(error).__name__);raise SystemExit(2) from None
@@ -0,0 +1,61 @@
"""Fixed dev/test diagnostic: APT download-only, copied DB, private scratch only."""
import hashlib
import json
import os
from pathlib import Path
import re
import subprocess
import tempfile
def digest(data):return hashlib.sha256(data).hexdigest()
def preserved():
base=Path('/var/lib/rmm-apt-transaction')
paths=[Path('/var/lib/dpkg/status'),base/'bootstrap-attempt-rmm-apt-fixture-install-1.0.json']
paths.extend(p for p in (base/'active').rglob('*') if p.is_file())
return {str(p):digest(p.read_bytes()) for p in paths}
def main():
os.umask(0o077)
base=Path('/var/lib/rmm-apt-transaction')
archive=base/'archives/74036ae81223deab3aae994fd2a2a695af408741777e1ce17dcb4e32f1235867.deb'
raw=archive.read_bytes();assert len(raw)==20672 and digest(raw)==archive.stem
assert not Path('/usr/share/rmm-mvp-test/version').exists()
before=preserved();original=(base/'active/apt.conf').read_bytes();results=[]
for name,seeded in (('empty_cache',False),('seeded_cache',True)):
with tempfile.TemporaryDirectory(prefix='rmm-apt-acquisition-') as temp:
work=Path(temp)
for directory in ('empty','lists','cache','log','state','dpkg'):(work/directory).mkdir(mode=0o700)
(work/'dpkg/status').write_bytes(Path('/var/lib/dpkg/status').read_bytes())
config=original.replace(str(base/'active').encode(),str(work).encode())
for directory in ('log','state'):
config=config.replace(str(base/directory).encode(),str(work/directory).encode())
config=config.replace(b'/var/lib/dpkg/status',str(work/'dpkg/status').encode())
(work/'apt.conf').write_bytes(config)
if seeded:(work/'cache/rmm-mvp-test_1.0_all.deb').write_bytes(raw)
env=dict(PATH='/usr/sbin:/usr/bin:/sbin:/bin',LC_ALL='C',HOME='/root',DEBIAN_FRONTEND='noninteractive',APT_CONFIG=str(work/'apt.conf'))
# Mandatory --download-only prevents every dpkg/install/hook action.
# --no-download is retained in both cases. Only scratch cache varies.
command=['/usr/bin/apt-get','--download-only','--yes','--no-remove','--no-install-recommends',
'--no-download','install','--',str(archive)]
with tempfile.TemporaryFile() as out,tempfile.TemporaryFile() as err:
process=subprocess.run(command,env=env,stdin=subprocess.DEVNULL,stdout=out,stderr=err,timeout=20)
sizes=(out.tell(),err.tell());out.seek(0);err.seek(0);stdout=out.read(16384);stderr=err.read(16384)
messages=[]
for line in stderr.decode('utf-8',errors='replace').splitlines():
if line.startswith(('E:','W:')):
line=re.sub(r'[A-Za-z][A-Za-z0-9+.-]*://\S+','<uri>',line)
line=re.sub(r'/[^\s\x27\x22,;()]+','<path>',line)
line=re.sub(r'\b(?:\d{1,3}\.){3}\d{1,3}\b','<address>',line)
messages.append(line[:512])
results.append(dict(case=name,exit_code=process.returncode,messages=messages[:12],truncated=any(n>16384 for n in sizes),
stdout_sha256=digest(stdout),stderr_sha256=digest(stderr),cached_files=sorted(p.name for p in (work/'cache').glob('*.deb'))))
assert preserved()==before and not Path('/usr/share/rmm-mvp-test/version').exists()
print(json.dumps(dict(schema_version=1,diagnostic_only=True,download_only=True,dpkg_status_copied=True,
transaction_executed=False,preserved_state=True,original_config_sha256=digest(original),results=results)))
if __name__=='__main__':main()
+16
View File
@@ -1,5 +1,21 @@
# Tatsächlicher Implementierungsstand
## APT-Acquisition-Diagnose ohne Pakettransaktion bestanden — 2026-11-13
Weiterer separat beantragter und über echte simulierte WebUI genehmigter
Root-Diagnosejob auf bestehender Cloud-VM. Vor Genehmigung 0/0/0, danach 1/1/1,
Audit gebunden. Ausschließlich `apt-get --download-only --no-download` gegen
kopierte dpkg-Statusdatei und private Scratchpfade: leerer Cache und vorbefüllter
Cache jeweils **Exit 0**, identische Ausgabehashes, keine Fehlerausgabe.
Damit ist fehlender Cacheinhalt bei `--no-download` ebenfalls nicht als Ursache
belegt; weder Downloadschutz noch Sandbox wurden gelockert. Originaler
dpkg-Status, `active/`, Fehlversuchsmarker bytegleich; Fixture weiter nicht installiert.
Gesamtsnapshot nun **8 succeeded / 1 failed / 1 cancelled; 10/10/9**, sechs
abgeschlossene Rootversuche. Keine neue native Paket-Acceptance; ursprünglicher
Exit 100 muss im verbleibenden Pre-dpkg-/Hookpfad weiter eingegrenzt werden.
Geschützte Daten: `devstate/cloud-apt-followup/diagnosis-acquisition/`.
## Windows-Bootstrap zum HTTPS-Download bereitgestellt — 2026-11-13
Auf ausdrücklichen Userwunsch Public-only ZIP auf dem Cloudserver über einen