Successfully Incorporated CurrentUser and BUILTIN\SYSTEM Remote Script Execution

This commit is contained in:
2025-09-04 05:41:00 -06:00
parent b9fe9b0965
commit f905a50501
4 changed files with 43 additions and 24 deletions

View File

@@ -1,4 +1,4 @@
1param(
param(
[Parameter(Mandatory=$true)] [string]$SupName,
[Parameter(Mandatory=$true)] [string]$PythonExe,
[Parameter(Mandatory=$true)] [string]$SupScript,
@@ -40,4 +40,3 @@ try {
Write-Error $_
exit 1
}

View File

@@ -108,14 +108,14 @@ def ensure_user_logon_task(paths):
pyw = paths.get("venv_pythonw") or paths["venv_python"]
cmd = f'"{pyw}" -W ignore::SyntaxWarning "{paths["agent_script"]}"'
# Try create non-elevated
q = run(["schtasks.exe", "/Query", "/TN", task_name])
q = run(["schtasks.exe", "/Query", "/TN", task_name], capture=True)
if q.returncode == 0:
d = run(["schtasks.exe", "/Delete", "/TN", task_name, "/F"])
d = run(["schtasks.exe", "/Delete", "/TN", task_name, "/F"], capture=True)
if d.returncode != 0:
pass
c = run(["schtasks.exe", "/Create", "/SC", "ONLOGON", "/TN", task_name, "/TR", cmd, "/F", "/RL", "LIMITED"])
c = run(["schtasks.exe", "/Create", "/SC", "ONLOGON", "/TN", task_name, "/TR", cmd, "/F", "/RL", "LIMITED"], capture=True)
if c.returncode == 0:
run(["schtasks.exe", "/Run", "/TN", task_name])
run(["schtasks.exe", "/Run", "/TN", task_name], capture=True)
return True
# Elevated fallback using ScheduledTasks cmdlets for better reliability
ps = f"""
@@ -160,4 +160,3 @@ def main(argv):
if __name__ == "__main__":
sys.exit(main(sys.argv))

View File

@@ -1278,10 +1278,22 @@ def on_agent_heartbeat(data):
hostname = data.get("hostname")
if hostname:
# Avoid duplicate entries per-hostname. Prefer non-script agents over script helpers.
try:
is_current_script = isinstance(agent_id, str) and agent_id.lower().endswith('-script')
except Exception:
is_current_script = False
for aid, info in list(registered_agents.items()):
if aid != agent_id and info.get("hostname") == hostname:
registered_agents.pop(aid, None)
agent_configurations.pop(aid, None)
if aid == agent_id:
continue
if info.get("hostname") == hostname:
if info.get('is_script_agent') and not is_current_script:
# Replace script helper with full agent record
registered_agents.pop(aid, None)
agent_configurations.pop(aid, None)
else:
# Keep existing non-script agent; do not evict it for script heartbeats
pass
rec = registered_agents.setdefault(agent_id, {})
rec["agent_id"] = agent_id