Run approved FreeBSD root jobs through independently pinned and synchronized local helper
Rust development slice / linux (push) Failing after 11s
Rust development slice / linux (push) Failing after 11s
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
"""Unprivileged OPNsense telemetry channel. Input never selects a local command."""
|
||||
"""Unprivileged OPNsense telemetry and signed job transport."""
|
||||
import hashlib
|
||||
import contextlib
|
||||
import fcntl
|
||||
@@ -20,7 +20,7 @@ STATE = Path('/var/db/discovery-agent')
|
||||
CA = '/usr/local/etc/discovery-agent/ca.pem'
|
||||
HOST = 'discovery.ease-technologies.de'
|
||||
MEDIA = 'application/x-protobuf'
|
||||
VERSION = '0.1.0-opnsense.5'
|
||||
VERSION = '0.1.0-opnsense.6'
|
||||
WORKER = Path('/usr/local/libexec/discovery-agent/rmm-opnsense-jobs')
|
||||
BINDING = Path('/usr/local/etc/discovery-agent/job-binding.json')
|
||||
|
||||
@@ -225,11 +225,19 @@ def run_channel(db, identity, boot, instance, stack):
|
||||
ctx = context()
|
||||
ctx.load_cert_chain(STATE/'device.pem', STATE/'device.key')
|
||||
caps = ['heartbeat/1','opnsense.base/1']
|
||||
root_caps=[]
|
||||
if enabled:
|
||||
caps.extend(['rmm.sync.v1','run_script','opnsense.uname/1'])
|
||||
caps.extend(['rmm.sync.v1','run_script','opnsense.uname/1','opnsense.posix/1'])
|
||||
if Path('/usr/local/etc/discovery-agent/root-policy.json').is_file():
|
||||
probe=subprocess.run([WORKER,'--root-capabilities'],capture_output=True,timeout=15)
|
||||
if probe.returncode==0:
|
||||
root_caps=json.loads(probe.stdout)
|
||||
caps.extend(root_caps)
|
||||
generation = send('client_hello',pb.ClientHello(agent_version=VERSION, capabilities=caps))
|
||||
if enabled:
|
||||
p = subprocess.Popen([WORKER,identity['agent_id'],identity['asset_id'],boot,str(generation)],
|
||||
env=os.environ.copy();env.pop('DISCOVERY_ROOT_SESSION',None)
|
||||
if root_caps:env['DISCOVERY_ROOT_SESSION']='1'
|
||||
p = subprocess.Popen([WORKER,identity['agent_id'],identity['asset_id'],boot,str(generation)],env=env,
|
||||
stdin=subprocess.PIPE,stdout=subprocess.PIPE,close_fds=True)
|
||||
def close():
|
||||
p.stdin.close()
|
||||
@@ -271,8 +279,13 @@ def run_channel(db, identity, boot, instance, stack):
|
||||
scope='opnsense.base',schema_version=1,chunk_count=1,data=raw,
|
||||
sha256=hashlib.sha256(raw).digest(),completeness='partial'),stamp//1_000_000)
|
||||
last = stamp
|
||||
if jobs:
|
||||
if jobs and (root_caps or not Path('/usr/local/etc/discovery-agent/root-policy.json').is_file()):
|
||||
jobs.pump(ctx,identity['agent_id'],boot,generation)
|
||||
elif jobs:
|
||||
# Preserve the established helper journal chain across a helper
|
||||
# restart. Keep telemetry flowing, then renegotiate capabilities.
|
||||
if subprocess.run([WORKER,'--root-capabilities'],capture_output=True,timeout=15).returncode==0:
|
||||
return
|
||||
time.sleep(20)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user