From 27074e26fb7e5b9d9fbf2c865ebb40be445768a0 Mon Sep 17 00:00:00 2001 From: Kevin Janssen Date: Sun, 15 Nov 2026 13:51:05 +0100 Subject: [PATCH] Verify the Windows device mTLS time route with preserved passive state --- deploy/windows/time_route_acceptance.py | 95 ++++++++++++++++++++++++- deploy/windows/time_route_context.py | 5 +- docs/windows-time-route-fixture.md | 12 ++++ docs/windows-time-route-operator.md | 60 ++++++++++++++++ 4 files changed, 168 insertions(+), 4 deletions(-) diff --git a/deploy/windows/time_route_acceptance.py b/deploy/windows/time_route_acceptance.py index bfe7eed..4fc961e 100644 --- a/deploy/windows/time_route_acceptance.py +++ b/deploy/windows/time_route_acceptance.py @@ -19,7 +19,7 @@ EXE_BYTES=19172660 PIN=ROOT/'devstate/server-time-source-bootstrap/qualified-time-public-key.json' PIN_SHA='c31d31d2d61f881d04f55f704abbbf98f4822650c016f39e39d4d2318bc3f6e2' # Root pins {id, receipt_sha256} only after the actual post-deploy collector read. -CONTEXT_GATE=None +CONTEXT_GATE={'id':'68b841a5-784f-4a34-a8a4-060b267713f0','receipt_sha256':'658fa5ffa63c6e412237f5feb718b745bb560230f17c54e437ad8bd98e9ad65b'} require,save,load,sha=original.require,original.save,original.load,original.sha SCRIPT=r'''$ErrorActionPreference='Stop';$p=([Console]::In.ReadLine()|ConvertFrom-Json) @@ -187,3 +187,96 @@ if __name__=='__main__': if a.action=='guards':guards();print('PASS source guards; no target call') elif a.action=='prepare':require(a.case is None,'actual sealed context determines own case');prepare() else:require(a.case is not None,'original case required');run(a.action,a.case) + +# Direct, read-only recovery of this original staged case after the historical +# upgrade finish reader timed out. No historical manifest or reply is rewritten. +DIRECT_CASE='68b841a5-784f-4a34-a8a4-060b267713f0' +DIRECT_MANIFEST='22f3bc7c143a893729f193133858696f377a84296c5843bde8b1354c1493389b' +DIRECT_OPERATOR='a817f45b43fa15feaa24a8ec8d4eea404f0e2bcf75ff252da166aebfa63b5c55' + + +def direct_source(): + prior=original.pipe + checks=prior.PREFIX.split('function Check(',1)[1].split('function PrivateBackupAcl',1)[0] + service=prior.PREFIX.split('function Service($role){',1)[1].split('function Probe(',1)[0] + native=prior.NATIVE.split('function FileIdentity(',1)[0] + identity=prior.NATIVE.split('function FileIdentity(',1)[1].split('function Kernel(',1)[0] + kernel=prior.NATIVE.split('function Kernel(',1)[1].split('function ActualState',1)[0] + metadata=prior.NATIVE.split('function FileIdentityMetadata(',1)[1].split('function SameOriginal',1)[0] + return r'''$ErrorActionPreference='Stop';$p=$global:RmmRouteDirectPreservationPayload +if((($p.PSObject.Properties.Name|Sort-Object)-join',')-cne'kind'-or$p.kind-cne'fixed-time-route-direct-preservation'){throw 'Fixed readonly observation'} +$agentName='RmmDiscoveryWindows';$helperName='RmmDiscoverySystemHelper';$sys='S-1-5-18';$admin='S-1-5-32-544' +$agentRoot='C:\ProgramData\RustDiscovery';$agentState=Join-Path $agentRoot 'state';$helperRoot='C:\ProgramData\RustDiscoverySystem';$helperState=Join-Path $helperRoot 'state' +$agentBinary='C:\Program Files\RustDiscovery\rmm-agent-windows.exe';$helperBinary='C:\Program Files\RustDiscovery\rmm-helper-windows.exe' +$agentSid=(New-Object Security.Principal.NTAccount('NT SERVICE',$agentName)).Translate([Security.Principal.SecurityIdentifier]).Value +$helperSid=(New-Object Security.Principal.NTAccount('NT SERVICE',$helperName)).Translate([Security.Principal.SecurityIdentifier]).Value +'''+'function JsonEqual($a,$b){return(($a|ConvertTo-Json -Depth 40 -Compress)-ceq($b|ConvertTo-Json -Depth 40 -Compress))}\n'+'function Check('+checks+'function Service($role){'+service+'\n'+native+'function FileIdentity('+identity+'function Kernel('+kernel+'function FileIdentityMetadata('+metadata+r''' +$services=[ordered]@{};$kernels=[ordered]@{};foreach($role in @('agent','helper')){$s=Service $role;if($s.state-cne'Running'){throw 'Both original services running'};$h=[RmmPipeNative]::Open([int]$s.pid);try{$kernels[$role]=Kernel $role $s $h;if(!(JsonEqual $s (Service $role))){throw 'Actual service race'}}finally{$h.Dispose()};$services[$role]=$s} +$files=[ordered]@{};foreach($entry in @(@('agent',$agentBinary),@('helper',$helperBinary),@('settings',(Join-Path $helperRoot 'helper.json')),@('pin',(Join-Path $helperRoot 'agent-pin.json')),@('config',(Join-Path $agentRoot 'config.json')),@('ca',(Join-Path $agentRoot 'server-ca.pem')),@('identity',(Join-Path $agentState 'identity.json')),@('certificate',(Join-Path $agentState 'device.pem')))){$files[$entry[0]]=FileIdentity $entry[1] ($entry[0]-in@('ca','identity','certificate'))} +$files.private_key=FileIdentityMetadata (Join-Path $agentState 'device.key') +$db=[ordered]@{};foreach($entry in @(@('telemetry',(Join-Path $agentState 'telemetry.sqlite')),@('helper',(Join-Path $helperState 'ledger.sqlite')),@('lock',(Join-Path $helperState 'executor.lock')))){$m=FileIdentityMetadata $entry[1];$i=Get-Item -LiteralPath $entry[1];$db[$entry[0]]=@{volume_serial=$m.volume_serial;file_id=$m.file_id;creation_filetime=$i.CreationTimeUtc.ToFileTimeUtc().ToString();acl_sha256=$m.acl_sha256}} +@{files=$files;services=$services;kernels=$kernels;database_identities=$db;read_only=$true;private_key_read=$false;database_content_read=$false;services_changed=$false}|ConvertTo-Json -Depth 25 -Compress +''' + + +def direct_witness(access,baseline): + source=direct_source();require(all(v not in source for v in ('Start-Service','Stop-Service','WriteNew','PrivateBackupAcl','function Probe','function State')),'direct observation has no old probe or mutation') + digest=hashlib.sha256(source.encode()).hexdigest() + launcher=r'''$ErrorActionPreference='Stop';$q=([Console]::In.ReadLine()|ConvertFrom-Json) +$raw=[Convert]::FromBase64String($q.source_base64);$h=[Security.Cryptography.SHA256]::Create();try{$sha=([BitConverter]::ToString($h.ComputeHash($raw))).Replace('-','').ToLowerInvariant()}finally{$h.Dispose()} +if($sha-cne'FIXED_SOURCE_SHA'){throw 'Exact direct reader source'} +$global:RmmRouteDirectPreservationPayload=$q.payload +& ([scriptblock]::Create([Text.Encoding]::UTF8.GetString($raw))) +'''.replace('FIXED_SOURCE_SHA',digest) + value=access.powershell(launcher,dict(source_base64=base64.b64encode(source.encode()).decode(),payload=dict(kind='fixed-time-route-direct-preservation')),timeout=45) + save(STATE/DIRECT_CASE/('direct-observed-'+str(uuid.uuid4())+'.json'),value) + old=baseline['native'];stable=old['stable'] + require(value['read_only'] is True and value['private_key_read'] is False and value['database_content_read'] is False + and value['files']==stable['files'],'actual original public file bytes/FileIDs/ACLs and private-key metadata') + for role,name in [('agent','service'),('helper','helper_service')]: + require(value['services'][role]==stable[name] and value['kernels'][role]==stable[role+'_kernel'],'same running original service/kernel PID/birth/image/account') + telemetry=value['database_identities']['telemetry'];old_id=old['journal']['database_file_id'];old_birth=old['journal']['database_creation'] + require(int(telemetry['volume_serial'])&0xffffffff==old_id['volume'] + and int.from_bytes(bytes.fromhex(telemetry['file_id'])[:8],'little')==((old_id['high']<<32)|old_id['low']) + and int(telemetry['creation_filetime'])==((old_birth['high']<<32)|old_birth['low']),'original telemetry native identity/creation') + value['historical_helper_metadata_comparison']={} + for name,previous in [('helper',stable['helper_witness']['helper_ledger']['file']),('lock',stable['helper_witness']['executor_lock'])]: + current=value['database_identities'][name] + value['historical_helper_metadata_comparison'][name]=dict(volume_equal=current['volume_serial']==previous['file_id']['volume_serial'],file_id_equal=current['file_id']==previous['file_id']['id_hex'],creation_equal=current['creation_filetime']==previous['creation_filetime'],acl_digest_equal=current['acl_sha256']==previous['acl_sha256'],historical_probe_not_repeated=True) + return value + + +def direct(action): + require(action in ('run-direct','read-direct'),'fixed passive recovery phase');guards() + folder=STATE/DIRECT_CASE;manifest=load(folder/'manifest.json');baseline=load(folder/'baseline.json') + require(sha(folder/'manifest.json')==DIRECT_MANIFEST and manifest['operator_sha256']==DIRECT_OPERATOR + and manifest['context_gate']==CONTEXT_GATE and manifest['dependencies']==original.dependencies() + and sha(folder/'TimeRouteProbe.exe')==EXE_SHA and sha(folder/'time-public-key.json')==PIN_SHA + and sha(folder/'context.json')==manifest['context_sha256'] and sha(folder/'TimeRouteAcceptance.ps1')==hashlib.sha256(SCRIPT.encode()).hexdigest(),'fixed original staged case only') + stage=load(folder/'stage-reply.json');require(stage==dict(id=DIRECT_CASE,manifest_sha256=DIRECT_MANIFEST,staged=True),'actual original stage response') + original.original_main();access=original.CaptureAccess(original.ACCESS_ROOT) + operation='run-direct' if action=='run-direct' else 'read-direct-'+str(uuid.uuid4()) + if action=='run-direct': + require(not (folder/'run-attempt.json').exists(),'original automatic run was never attempted') + gate_id,context,receipt=gate();require(gate_id==DIRECT_CASE,'same actual context gate') + require(collector.rpc(access,dict(id=DIRECT_CASE,deployment_result_sha256=receipt['deployment_result_sha256'],image=collector.IMAGE),folder)==load(context/'response.json'),'actual context still exact') + intent_name=operation+'-intent.json' + if (folder/intent_name).exists():intent_name=operation+'-preflight-'+str(uuid.uuid4())+'.json' + save(folder/intent_name,dict(action=action,operator_sha256=sha(__file__),original_manifest_sha256=DIRECT_MANIFEST, + direct_source_sha256=hashlib.sha256(direct_source().encode()).hexdigest(),read_only=action=='read-direct',historical_stage_witness_timeout_retained=True)) + before_server=original.server_closed(access);require(before_server==baseline['server'],'same closed server original counts and flags') + before=direct_witness(access,baseline);save(folder/(operation+'-before.json'),before) + payload=dict(action='run' if action=='run-direct' else 'read',id=DIRECT_CASE,manifest_sha256=DIRECT_MANIFEST,context_sha256=manifest['context_sha256'],context_base64=base64.b64encode((folder/'context.json').read_bytes()).decode(),pin_base64=base64.b64encode((folder/'time-public-key.json').read_bytes()).decode()) + if action=='run-direct':save(folder/'run-direct-start-intent.json',dict(action='run',once=True,no_retry=True,operator_sha256=sha(__file__),direct_before_sha256=sha(folder/(operation+'-before.json')))) + try:response=access.powershell(SCRIPT,payload,timeout=45) + except subprocess.TimeoutExpired: + save(folder/(operation+'-timeout.json'),dict(error='SSH_TIMEOUT_45_SECONDS',result_unknown=True,repeat_run=False));raise RuntimeError('passive response missing; original read only') from None + save(folder/(operation+'-reply.json'),response) + after_server=original.server_closed(access);after=direct_witness(access,baseline) + save(folder/(operation+'-after.json'),after);require(before==after and before_server==after_server,'actual service/PKI/config/native DB identities and closed server counts preserved') + save(folder/(operation+'-preservation.json'),dict(id=DIRECT_CASE,operation=operation,operator_sha256=sha(__file__),original_manifest_sha256=DIRECT_MANIFEST, + raw_reply_sha256=sha(folder/(operation+'-reply.json')),before_sha256=sha(folder/(operation+'-before.json')),after_sha256=sha(folder/(operation+'-after.json')), + server_before=before_server,server_after=after_server,direct_native_preserved=True,old_finish_timeout_remains=True,no_jobs_created=True,no_service_action=True)) + require(response['id']==DIRECT_CASE and response['manifest_sha256']==DIRECT_MANIFEST,'actual own original reply') + if action=='run-direct' or 'report.json' in response.get('records',{}):validate(response,manifest) + print(json.dumps(dict(id=DIRECT_CASE,operation=operation,verified='report.json' in response.get('records',{}),preserved=True))) diff --git a/deploy/windows/time_route_context.py b/deploy/windows/time_route_context.py index 05e6e45..7a969fd 100644 --- a/deploy/windows/time_route_context.py +++ b/deploy/windows/time_route_context.py @@ -14,8 +14,7 @@ import signed_clock_capture_acceptance as original ROOT=original.ROOT STATE=ROOT/'devstate/windows-time-route-context' # Root binds the actual successful deployment result SHA after its separate read. -DEPLOYMENT_RESULT_SHA=None -DEPLOYMENT_PATH='/opt/rust-discovery/devstate/time-gateway-deploy-fb87aa88-2b67-4cff-9c90-4cd713380889/result.json' +DEPLOYMENT_RESULT_SHA='3017634f101ee8aff62988f195ccb3a7a8b9e03eaa48b8fb339af9ceb3ad2b4b' IMAGE='sha256:422c2c28a91ac512e9317908f4d1fb22247eef857ca95d45e1b1880598b0d611' BINDING_SHA='05c5678fed81e0a2a7cdaaeaf18c64f9837cfbe76c140699a47306c9b4598a18' require,save,load,sha=original.require,original.save,original.load,original.sha @@ -30,7 +29,7 @@ def server_read(p): need(str(uuid.UUID(p['id']))==p['id'] and isinstance(p['deployment_result_sha256'],str) and len(p['deployment_result_sha256'])==64 and all(v in '0123456789abcdef' for v in p['deployment_result_sha256']) and p['image']=='sha256:422c2c28a91ac512e9317908f4d1fb22247eef857ca95d45e1b1880598b0d611') - path=Path('/opt/rust-discovery/devstate/time-gateway-deploy-fb87aa88-2b67-4cff-9c90-4cd713380889/result.json') + path=Path('/opt/rust-discovery/devstate/time-gateway-deploy-fb87aa88-2b67-4cff-9c90-4cd713380889/continue-backend-v1/result.json') metadata=path.lstat();need(stat.S_ISREG(metadata.st_mode) and metadata.st_uid==0 and metadata.st_nlink==1 and stat.S_IMODE(metadata.st_mode)==0o600 and metadata.st_size<=65536) def identity(m):return(m.st_dev,m.st_ino,m.st_mode,m.st_uid,m.st_gid,m.st_nlink,m.st_size,m.st_mtime_ns,m.st_ctime_ns) diff --git a/docs/windows-time-route-fixture.md b/docs/windows-time-route-fixture.md index 0077322..554da9e 100644 --- a/docs/windows-time-route-fixture.md +++ b/docs/windows-time-route-fixture.md @@ -41,3 +41,15 @@ Rustfmt nur dieses Example (`skip_children`), Windows-Examplecheck, Clippy mit ` `TimeRouteProbe.exe`:19172660Bytes, AMD64-PE, SHA256 `4ef3fc85f5d140f2ad0ff14745dc5d5453a058203d785235d7dabafdf522b088`, Modus0500/ein Hardlink. Enger Readonly-Capabilitymanifest-SHA256 `22ca87604e942b91e68981f694934bc8c933c5fb5ab5858f27a2d3884d64df42`. Der neue Produktpaarbeleg26dc/5967 und dessen Modulquelle d859 bleiben unverändert; dieses Example installiert oder startet keinen Agenten. Offen: unabhängiger Fixture-Review, echtes Gateway-/Brokerdeployment und dessen frische Kontextprovenienz, einmalige native Ausführung mit200/403/409, separater lesender Originalfallnachweis und tatsächliche Erhaltungs-/Nulljobwitnesses. Erst danach ist dieser Endpunktgate für die nächste getrennte passive Paarwartung verfügbar. Windows-MVP-Wirkungsabnahmen bleiben offen. + +## Native passive Protokollabnahme + +Tatsächlich anschließend auf der Windows-VM bestanden: genau ein fester +HTTP200/403/409-Lauf mit echter Signatur-/vollständiger Kontextprüfung und Exit0, +sowie separater Originalfallread mit bytegleicher Antwort. Fall68b841a5-784f-4a34-a8a4-060b267713f0; +Runreplyc556747f75987f8d6ced477086cfd77edfb00f2ac74a99b6e721f3c278ecc28a, +Runpreservation04bb81f781656f9e695225885b5088d498d1ebe5708a95db563dd6321525617a, +Readpreservatione9ef65dc101505919bcba00e1a214d752f44154d6b3f5789c27234551e01e9b9. +Details und die ehrlichen Grenzen des ersetzten alten Abschlusslesers stehen in +`windows-time-route-operator.md`. Keine Dienstrolle/Clockfrische/SyncReady oder +Jobwirkung durch diese Fixture bewiesen. diff --git a/docs/windows-time-route-operator.md b/docs/windows-time-route-operator.md index 414cf7d..63a1054 100644 --- a/docs/windows-time-route-operator.md +++ b/docs/windows-time-route-operator.md @@ -59,3 +59,63 @@ Eigener unveränderlicher Fall ReceiptSHA `44504007fa7d0379e608375181b926ff2a20ae248cfeb2fb51d127b858b3536d`. ScriptSHA bleibt `4c88fdf36f22b0273baaa08bf522bfefbf8482b45317ef852c0e0a331a1fbef2`. Deployment-/Kontextgates bleiben geschlossen, Stage und Route weiterhin offen. + +## Tatsächliche passive Route und separater Read bestanden + +Root hat den tatsächlichen erfolgreichen Unterfall +`continue-backend-v1/result.json` mit SHA +`3017634f101ee8aff62988f195ccb3a7a8b9e03eaa48b8fb339af9ceb3ad2b4b` +und separater Nachlese gebunden. Der alte fehlgeschlagene Deploymentfall bleibt +unverändert fehlgeschlagen. Collectorfall68b841a5-784f-4a34-a8a4-060b267713f0, +Receipt658fa5ffa63c6e412237f5feb718b745bb560230f17c54e437ad8bd98e9ad65b, +Kontext3c0e4ff3b16b86fb4e98d2ff163686305ea533570c40ae3bef1270ab89648ed3: +tatsächliche aktuelle Geräte-/Tenant-/Generation-/Bootbindung und Gatewayimage. +Die ungenutzte doppelte Deploymentpfadkonstante wurde entfernt. + +Stage meldete tatsächlich Erfolg, bevor der nachgelagerte alte14fb-finish- +Leser nach180s ohne Antwort abbrach. Das ist kein erfolgreicher Originalwitness. +Eine direkte lesende Diagnose antwortete sofort, keine laufenden Probeprozesse. +Der erste Agentname dieser Diagnose war falsch; `present=false` für +`RustDiscoveryAgent` ist kein Ausfall des tatsächlichen `RmmDiscoveryWindows`. +Keine Stage wurde wiederholt und bis dahin kein HTTP-Probelauf gestartet. + +Auf ausdrückliche Rootanweisung ersetzte die Fortsetzung den hängenden früheren +Upgradeabschlussleser durch dessen vorhandene reine FileID-/SCM-/Kernelprimitive, +ohne Journal-/Clock-/Snapshotaufruf. Die ersten umfangreichen Readerbytes +überschritten als EncodedCommand die Windows-Kommandozeilengrenze; der Reader +wurde danach als feste hashgebundene Nutzlast über stdin übermittelt. Auch dieser +Fehler lag vor jedem Probestart. Originalbelege wurden nicht überschrieben. +Die Fortsetzung liegt als enge `direct()`-Funktion im bestehenden Operator; +keine weitere Operator-Datei entstand. Tatsächlich ausgeführte Quelle ist im +Originalfall als `executed-direct-operator.py` unverändert gesichert. + +Der einzige tatsächliche TimeRouteProbe-Lauf ergab: + +- HTTP200, echte Ed25519-Signatur, kompletter eigener Nonce-/Request-/Kontextbezug. +- HTTP403 für den fest abweichenden Tenant. +- HTTP409 für die vorherige Verbindungsgeneration. +- Tatsächliches Kernelprozessende mit Exit0, kein Timeout, stderr leer. + +Runreply `c556747f75987f8d6ced477086cfd77edfb00f2ac74a99b6e721f3c278ecc28a`, +Erhaltungsbeleg `04bb81f781656f9e695225885b5088d498d1ebe5708a95db563dd6321525617a`. +Separater Read `read-direct-6f2e1bc2-e26c-4dfb-a642-06a6a154ef5c` bestätigt +bytegleichen gespeicherten Runreply und neuen Erhaltungsbeleg +`e9ef65dc101505919bcba00e1a214d752f44154d6b3f5789c27234551e01e9b9`. +Tatsächlicher ReportSHA9f1635c19c801f95c9828e9e31071a487b430f105a61977ee2d60f076f3d3623, +ExitfileSHA6d131d2796936913f53286573e56f7fb3e515d04ebbd55ae9d6794440e6053b5. + +Direkt vor/nach Run und Read unverändert: laufende ursprüngliche Dienste mit +Kernel-PID/Geburt/Image/Konto, ursprüngliche config/PKI/Publicpin-Bytes, +DateiIDs/ACLs und Privatekeymetadaten ohne Keyread, native Telemetriedateiidentität +sowie aktuelle Helper-DB-/Lockdateiidentitäten. Deren alte FileID/Geburt stimmen +ebenfalls; die historischen ACL-Digests aus dem anderen Probe sind abweichend +und werden ausdrücklich nicht als erfolgreicher Altvergleich ausgegeben. +Aktuelle direkte ACL-Metadaten sind vor/nach identisch. Geschlossene Windows- +Job-/Outbox-/Permitzähler bleiben0; Linux31/31/27 und Rootpolicy unverändert. +Der alte umfassende Journalabschlussleser bleibt als Timeout offen; es wurde +keine erneute Journalintegritätsprüfung behauptet. + +Dies ist ausschließlich eine tatsächliche passive mTLS-/Signatur-/Kontextabnahme. +Dienstrollen-Zeitauthorität, Clockfrische, SyncReady und Jobwirkungen bleiben +weiterhin unbewiesen und geschlossen. Kein Agentpaarwechsel oder VM-Neustart +war Bestandteil dieses Schrittes.