Compare commits
36
Commits
v1.0.0
..
08aa4edfb1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
08aa4edfb1 | ||
|
|
e4f6a9295b | ||
|
|
7f6bf4442f | ||
|
|
db80e7f5a2 | ||
|
|
1562285034 | ||
|
|
74942d4c00 | ||
|
|
874d693dac | ||
|
|
15bfb4940b | ||
|
|
364fefea47 | ||
|
|
9624935a81 | ||
|
|
867271e8b7 | ||
|
|
205d0cfbad | ||
|
|
d37191e302 | ||
|
|
35a736dacb | ||
|
|
f871344da4 | ||
|
|
e1dbe32063 | ||
|
|
98a227a234 | ||
|
|
355c6e1bc0 | ||
|
|
907616511b | ||
|
|
939fa4270a | ||
|
|
1f4bf3219b | ||
|
|
df03c52a05 | ||
|
|
d63a623763 | ||
|
|
7ed264db5a | ||
|
|
6fec838344 | ||
|
|
4c160924f7 | ||
|
|
99be50ebc6 | ||
|
|
85f0d94805 | ||
|
|
1a18c4c079 | ||
|
|
a770e24f26 | ||
|
|
f7ebc6c0a1 | ||
|
|
86649f796d | ||
|
|
78fc2ac8c5 | ||
|
|
082b839965 | ||
|
|
e7bf277fb9 | ||
|
|
7052e68589 |
@@ -0,0 +1,73 @@
|
|||||||
|
name: CI Test Suite
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- '**'
|
||||||
|
tags-ignore:
|
||||||
|
- '*'
|
||||||
|
pull_request:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
name: Run Component Tests & Pipeline Verification
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout Code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Install System Dependencies & Python
|
||||||
|
run: |
|
||||||
|
if command -v apt-get >/dev/null 2>&1; then
|
||||||
|
apt-get update -y
|
||||||
|
apt-get install -y python3 python3-pip python3-venv curl
|
||||||
|
fi
|
||||||
|
python3 -m pip install --upgrade pip --break-system-packages || python3 -m pip install --upgrade pip || true
|
||||||
|
pip3 install -r compilation/requirements.txt --break-system-packages || pip3 install -r compilation/requirements.txt
|
||||||
|
|
||||||
|
- name: Verify Python Syntax
|
||||||
|
run: |
|
||||||
|
python3 -m py_compile src/Server.py src/Win_Client.py src/Linux_Client.py compilation/package_dist.py compilation/upload_release.py tests/test_pipeline.py tests/*.py
|
||||||
|
|
||||||
|
- name: Run Component Unit Tests
|
||||||
|
run: |
|
||||||
|
python3 -m unittest discover -s tests -v
|
||||||
|
|
||||||
|
- name: Run End-to-End Pipeline Integration Test
|
||||||
|
run: |
|
||||||
|
# Clean up any leftover test configs or database
|
||||||
|
rm -f server_config.json client_config.json logar_state.db client_state.json
|
||||||
|
|
||||||
|
# 1. Initialize server config and export client configuration
|
||||||
|
python3 src/Server.py --create-client-config --server-host 127.0.0.1 --server-port 9443 --client-out client_config.json
|
||||||
|
|
||||||
|
# 2. Launch LOGAR server in the background
|
||||||
|
python3 src/Server.py &
|
||||||
|
SERVER_PID=$!
|
||||||
|
echo "[*] Server launched in background with PID $SERVER_PID"
|
||||||
|
|
||||||
|
# 3. Poll Hermes health / report endpoint until server is listening
|
||||||
|
READY=0
|
||||||
|
for i in $(seq 1 20); do
|
||||||
|
if curl -s http://127.0.0.1:8443/api/hermes/report >/dev/null 2>&1; then
|
||||||
|
echo "[+] LOGAR Server is ready after ${i}s."
|
||||||
|
READY=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ $READY -ne 1 ]; then
|
||||||
|
echo "[!] Server failed to start within 20 seconds."
|
||||||
|
kill $SERVER_PID || true
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 4. Execute end-to-end integration test
|
||||||
|
python3 tests/test_pipeline.py
|
||||||
|
|
||||||
|
# 5. Cleanly terminate background server
|
||||||
|
kill $SERVER_PID || true
|
||||||
|
wait $SERVER_PID 2>/dev/null || true
|
||||||
|
echo "[+] Server stopped successfully."
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
name: Release Linux Binaries
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [published, created]
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- '*'
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
tag:
|
||||||
|
description: 'Release tag (optional)'
|
||||||
|
required: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release-linux:
|
||||||
|
name: Build & Release Linux Binaries
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout Code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Install Python and Build Dependencies
|
||||||
|
run: |
|
||||||
|
if command -v apt-get >/dev/null 2>&1; then
|
||||||
|
apt-get update -y
|
||||||
|
apt-get install -y python3 python3-pip python3-venv binutils zip
|
||||||
|
fi
|
||||||
|
python3 -m pip install --upgrade pip --break-system-packages || python3 -m pip install --upgrade pip || true
|
||||||
|
pip3 install pyinstaller -r compilation/requirements.txt --break-system-packages || pip3 install pyinstaller -r compilation/requirements.txt
|
||||||
|
|
||||||
|
- name: Compile Standalone Linux Binaries
|
||||||
|
run: |
|
||||||
|
python3 compilation/package_dist.py --target linux
|
||||||
|
|
||||||
|
- name: Publish Linux Release Assets
|
||||||
|
env:
|
||||||
|
GITEA_TOKEN: ${{ secrets.TAG_TOKEN || github.token }}
|
||||||
|
GITEA_SERVER_URL: ${{ github.server_url }}
|
||||||
|
GITEA_REPOSITORY: ${{ github.repository }}
|
||||||
|
GITEA_REF_NAME: ${{ github.event.release.tag_name || inputs.tag || github.ref_name }}
|
||||||
|
run: |
|
||||||
|
python3 compilation/upload_release.py --skip-build
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
name: Release Windows Binaries
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [published, created]
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- '*'
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
tag:
|
||||||
|
description: 'Release tag (optional)'
|
||||||
|
required: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release-windows:
|
||||||
|
name: Build & Release Windows Binaries
|
||||||
|
runs-on: windows-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout Code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Python
|
||||||
|
uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: '3.12'
|
||||||
|
continue-on-error: true
|
||||||
|
|
||||||
|
- name: Install Dependencies
|
||||||
|
shell: powershell
|
||||||
|
run: |
|
||||||
|
$py = "python"
|
||||||
|
if (-not (Get-Command "python" -ErrorAction SilentlyContinue)) {
|
||||||
|
if (Get-Command "py" -ErrorAction SilentlyContinue) {
|
||||||
|
$py = "py -3.12"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
& $py -m pip install --upgrade pip
|
||||||
|
& $py -m pip install pyinstaller -r compilation/requirements.txt
|
||||||
|
|
||||||
|
- name: Compile Standalone Windows Binaries
|
||||||
|
shell: powershell
|
||||||
|
run: |
|
||||||
|
$py = "python"
|
||||||
|
if (-not (Get-Command "python" -ErrorAction SilentlyContinue)) {
|
||||||
|
if (Get-Command "py" -ErrorAction SilentlyContinue) {
|
||||||
|
$py = "py -3.12"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
& $py compilation/package_dist.py --target windows
|
||||||
|
|
||||||
|
- name: Publish Windows Release Assets
|
||||||
|
shell: powershell
|
||||||
|
env:
|
||||||
|
GITEA_TOKEN: ${{ secrets.TAG_TOKEN || github.token }}
|
||||||
|
GITEA_SERVER_URL: ${{ github.server_url }}
|
||||||
|
GITEA_REPOSITORY: ${{ github.repository }}
|
||||||
|
GITEA_REF_NAME: ${{ github.event.release.tag_name || inputs.tag || github.ref_name }}
|
||||||
|
run: |
|
||||||
|
$py = "python"
|
||||||
|
if (-not (Get-Command "python" -ErrorAction SilentlyContinue)) {
|
||||||
|
if (Get-Command "py" -ErrorAction SilentlyContinue) {
|
||||||
|
$py = "py -3.12"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
& $py compilation/upload_release.py --skip-build
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
name: Release Binaries
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- 'v*'
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout Code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Install Python and Dependencies
|
|
||||||
run: |
|
|
||||||
if command -v apt-get >/dev/null 2>&1; then
|
|
||||||
apt-get update -y
|
|
||||||
apt-get install -y python3 python3-pip python3-venv binutils zip
|
|
||||||
fi
|
|
||||||
python3 -m pip install --upgrade pip --break-system-packages || python3 -m pip install --upgrade pip || true
|
|
||||||
pip3 install pyinstaller -r requirements.txt --break-system-packages || pip3 install pyinstaller -r requirements.txt
|
|
||||||
|
|
||||||
- name: Compile Standalone Binaries
|
|
||||||
run: |
|
|
||||||
python3 package_dist.py
|
|
||||||
|
|
||||||
- name: Publish Release
|
|
||||||
env:
|
|
||||||
GITEA_TOKEN: ${{ secrets.TAG_TOKEN || github.token }}
|
|
||||||
GITEA_SERVER_URL: ${{ github.server_url }}
|
|
||||||
GITEA_REPOSITORY: ${{ github.repository }}
|
|
||||||
GITEA_REF_NAME: ${{ github.ref_name }}
|
|
||||||
run: |
|
|
||||||
python3 upload_release.py --skip-build
|
|
||||||
@@ -20,6 +20,8 @@ dist/
|
|||||||
*.db
|
*.db
|
||||||
*.sqlite
|
*.sqlite
|
||||||
*.sqlite3
|
*.sqlite3
|
||||||
|
client_state.json
|
||||||
|
*.tmp
|
||||||
|
|
||||||
# Live configuration with generated private keys & tokens (samples are tracked)
|
# Live configuration with generated private keys & tokens (samples are tracked)
|
||||||
server_config.json
|
server_config.json
|
||||||
|
|||||||
-206
@@ -1,206 +0,0 @@
|
|||||||
import os
|
|
||||||
import sys
|
|
||||||
import json
|
|
||||||
import socket
|
|
||||||
import struct
|
|
||||||
import argparse
|
|
||||||
import subprocess
|
|
||||||
import warnings
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
|
|
||||||
# Suppress cryptography / pgpy deprecation notices
|
|
||||||
warnings.filterwarnings("ignore")
|
|
||||||
|
|
||||||
import pgpy
|
|
||||||
|
|
||||||
CONFIG_FILE_NAME = "client_config.json"
|
|
||||||
|
|
||||||
|
|
||||||
def load_config(config_path: str = CONFIG_FILE_NAME):
|
|
||||||
if not os.path.exists(config_path):
|
|
||||||
raise FileNotFoundError(
|
|
||||||
f"Client configuration file not found at: {config_path}\n"
|
|
||||||
f"Generate one from the server using: python Server.py --create-client-config --client-out {config_path}"
|
|
||||||
)
|
|
||||||
with open(config_path, "r", encoding="utf-8") as f:
|
|
||||||
return json.load(f)
|
|
||||||
|
|
||||||
|
|
||||||
def get_machine_identifier() -> str:
|
|
||||||
"""
|
|
||||||
Returns the hostname of the machine sending the logs,
|
|
||||||
and appends the network/DNS domain if available.
|
|
||||||
"""
|
|
||||||
# 1. Try fully-qualified domain name (FQDN)
|
|
||||||
fqdn = socket.getfqdn()
|
|
||||||
if fqdn and "." in fqdn and not fqdn.startswith("localhost"):
|
|
||||||
return fqdn
|
|
||||||
|
|
||||||
hostname = socket.gethostname()
|
|
||||||
|
|
||||||
# 2. Check /etc/resolv.conf domain or search directive
|
|
||||||
try:
|
|
||||||
if os.path.exists("/etc/resolv.conf"):
|
|
||||||
with open("/etc/resolv.conf", "r", encoding="utf-8") as f:
|
|
||||||
for line in f:
|
|
||||||
parts = line.strip().split()
|
|
||||||
if parts and parts[0] in ["domain", "search"] and len(parts) > 1:
|
|
||||||
domain = parts[1]
|
|
||||||
if domain and not domain.startswith("."):
|
|
||||||
return f"{hostname}.{domain}"
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# 3. Try reverse DNS lookup
|
|
||||||
try:
|
|
||||||
host_ip = socket.gethostbyname(hostname)
|
|
||||||
canonical_name = socket.gethostbyaddr(host_ip)[0]
|
|
||||||
if canonical_name and "." in canonical_name and not canonical_name.startswith("localhost"):
|
|
||||||
return canonical_name
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return hostname
|
|
||||||
|
|
||||||
|
|
||||||
def get_recent_linux_logs(hours: int = 6):
|
|
||||||
"""
|
|
||||||
Collects warnings and errors from systemd journalctl over the lookback window.
|
|
||||||
Edge Thinness: Drops INFO and DEBUG entries at the source.
|
|
||||||
"""
|
|
||||||
cmd = ["journalctl", "--since", f"{hours} hours ago", "-p", "warning", "--output=json"]
|
|
||||||
try:
|
|
||||||
result = subprocess.run(cmd, capture_output=True, text=True, check=False)
|
|
||||||
except FileNotFoundError:
|
|
||||||
print("[!] journalctl command not found. Ensure this script runs on a systemd-enabled Linux system.")
|
|
||||||
return []
|
|
||||||
except Exception as e:
|
|
||||||
print(f"[!] Error running journalctl: {e}")
|
|
||||||
return []
|
|
||||||
|
|
||||||
logs = []
|
|
||||||
machine_id = get_machine_identifier()
|
|
||||||
|
|
||||||
for line in result.stdout.splitlines():
|
|
||||||
line_str = line.strip()
|
|
||||||
if not line_str:
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
entry = json.loads(line_str)
|
|
||||||
priority = str(entry.get("PRIORITY", "4"))
|
|
||||||
# Priority 0: Emerg, 1: Alert, 2: Crit, 3: Err, 4: Warning.
|
|
||||||
# Strip anything above 4 (5: Notice, 6: Info, 7: Debug)
|
|
||||||
if int(priority) > 4:
|
|
||||||
continue
|
|
||||||
|
|
||||||
sev = "WARNING" if priority == "4" else "ERROR"
|
|
||||||
logs.append({
|
|
||||||
"server": machine_id,
|
|
||||||
"os_type": "linux",
|
|
||||||
"signature": entry.get("SYSLOG_IDENTIFIER", "unknown"),
|
|
||||||
"severity": sev,
|
|
||||||
"message": entry.get("MESSAGE", "")[:2048]
|
|
||||||
})
|
|
||||||
except (json.JSONDecodeError, ValueError):
|
|
||||||
continue
|
|
||||||
|
|
||||||
return logs
|
|
||||||
|
|
||||||
|
|
||||||
def send_encrypted_logs_over_socket(config: dict, logs: list):
|
|
||||||
"""
|
|
||||||
Encrypts the payload using the server's OpenPGP public key and streams
|
|
||||||
over an authenticated TCP socket. Zero local state is maintained on the client.
|
|
||||||
"""
|
|
||||||
server_host = config["server_host"]
|
|
||||||
server_port = int(config["server_port"])
|
|
||||||
auth_token = config["auth_token"]
|
|
||||||
pub_key_armored = config["server_public_key"]
|
|
||||||
expected_fp = config.get("server_fingerprint", "").replace(" ", "").upper()
|
|
||||||
|
|
||||||
# Load and verify server public key
|
|
||||||
pub_key, _ = pgpy.PGPKey.from_blob(pub_key_armored)
|
|
||||||
actual_fp = str(pub_key.fingerprint).replace(" ", "").upper()
|
|
||||||
if expected_fp and actual_fp != expected_fp:
|
|
||||||
raise ValueError(
|
|
||||||
f"Server fingerprint mismatch! Expected {expected_fp}, but key has {actual_fp}."
|
|
||||||
)
|
|
||||||
|
|
||||||
machine_id = get_machine_identifier()
|
|
||||||
|
|
||||||
# Prepare zero-state candidate batch
|
|
||||||
payload = {
|
|
||||||
"server": machine_id,
|
|
||||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
|
||||||
"logs": logs
|
|
||||||
}
|
|
||||||
payload_json = json.dumps(payload)
|
|
||||||
|
|
||||||
# Encrypt payload with server's encryption-only key
|
|
||||||
pgp_msg = pgpy.PGPMessage.new(payload_json)
|
|
||||||
encrypted_msg = pub_key.encrypt(pgp_msg)
|
|
||||||
encrypted_armored = str(encrypted_msg)
|
|
||||||
|
|
||||||
# Envelope with socket authentication header
|
|
||||||
envelope = {
|
|
||||||
"auth_token": auth_token,
|
|
||||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
|
||||||
"encrypted_payload": encrypted_armored
|
|
||||||
}
|
|
||||||
envelope_bytes = json.dumps(envelope).encode("utf-8")
|
|
||||||
|
|
||||||
# Connect over TCP socket and transmit with 4-byte length prefix framing
|
|
||||||
print(f"[*] Connecting to LOGAR server at {server_host}:{server_port} over secure TCP socket...")
|
|
||||||
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
|
|
||||||
sock.settimeout(15.0)
|
|
||||||
sock.connect((server_host, server_port))
|
|
||||||
|
|
||||||
# Send frame: length (4 bytes big-endian) + envelope
|
|
||||||
frame = struct.pack(">I", len(envelope_bytes)) + envelope_bytes
|
|
||||||
sock.sendall(frame)
|
|
||||||
|
|
||||||
# Receive response length
|
|
||||||
resp_len_bytes = sock.recv(4)
|
|
||||||
if not resp_len_bytes:
|
|
||||||
raise ConnectionError("Server closed connection without response.")
|
|
||||||
|
|
||||||
resp_len = struct.unpack(">I", resp_len_bytes)[0]
|
|
||||||
resp_bytes = bytearray()
|
|
||||||
while len(resp_bytes) < resp_len:
|
|
||||||
chunk = sock.recv(min(4096, resp_len - len(resp_bytes)))
|
|
||||||
if not chunk:
|
|
||||||
break
|
|
||||||
resp_bytes.extend(chunk)
|
|
||||||
|
|
||||||
response = json.loads(resp_bytes.decode("utf-8"))
|
|
||||||
print(f"[+] Server response: {response}")
|
|
||||||
return response
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
parser = argparse.ArgumentParser(description="LOGAR Linux Edge Log Forwarder (Zero State)")
|
|
||||||
parser.add_argument("--config", default=CONFIG_FILE_NAME, help="Path to client_config.json")
|
|
||||||
parser.add_argument("--hours", type=int, default=6, help="Lookback window in hours for journalctl logs")
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
try:
|
|
||||||
config = load_config(args.config)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"[!] Configuration error: {e}")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
machine_id = get_machine_identifier()
|
|
||||||
print(f"[*] Edge Forwarder Node: {machine_id}")
|
|
||||||
print(f"[*] Scanning Linux journalctl for candidate anomalies (last {args.hours} hours)...")
|
|
||||||
candidate_logs = get_recent_linux_logs(hours=args.hours)
|
|
||||||
print(f"[*] Found {len(candidate_logs)} candidate anomalies (noise stripped at source).")
|
|
||||||
|
|
||||||
try:
|
|
||||||
send_encrypted_logs_over_socket(config, candidate_logs)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"[!] Failed to stream logs to server: {e}")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
# LOGAR: Edge-Thin Log Analysis & Temporal Verification System
|
# LOGAR: Edge-Thin Log Analysis & Temporal Verification System
|
||||||
|
|
||||||
**LOGAR** is an enterprise log aggregation, verification, and anomaly detection architecture designed for heterogeneous server fleets (Windows & Linux). It combines lightweight zero-state edge forwarders with a centralized cloud hub that applies OpenPGP encryption, authenticated TCP streaming, temporal persistence tracking across 12-hour evaluation windows, and an automated 4-run rule to filter out transient infrastructure blips before reporting verified anomalies to **Hermes**.
|
**LOGAR** is an enterprise log aggregation, verification, and anomaly detection architecture designed for heterogeneous server fleets (Windows & Linux). It combines lightweight zero-state edge forwarders with a centralized cloud hub that applies OpenPGP encryption, authenticated TCP streaming, temporal persistence tracking across 12-hour evaluation windows, an automated 4-run rule to filter transient warnings, and immediate pass-through for critical errors before reporting verified anomalies to **Hermes**.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -14,6 +14,7 @@
|
|||||||
7. [Repository & Shippables Structure](#repository--shippables-structure)
|
7. [Repository & Shippables Structure](#repository--shippables-structure)
|
||||||
8. [Getting Started & Installation](#getting-started--installation)
|
8. [Getting Started & Installation](#getting-started--installation)
|
||||||
9. [Running Tests](#running-tests)
|
9. [Running Tests](#running-tests)
|
||||||
|
10. [Automated Releases via Gitea Actions](#automated-releases-via-gitea-actions)
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -22,18 +23,19 @@
|
|||||||
### 1. Edge Thinness & Zero State
|
### 1. Edge Thinness & Zero State
|
||||||
Site agents running on Windows and Linux act strictly as lightweight forwarders:
|
Site agents running on Windows and Linux act strictly as lightweight forwarders:
|
||||||
- **No Local Database**: Clients maintain zero state and no local SQLite or cache files.
|
- **No Local Database**: Clients maintain zero state and no local SQLite or cache files.
|
||||||
- **Source-Level Noise Stripping**: Conversational, informational, and debugging log noise (`INFO`, `DEBUG`, audit entries) is dropped directly at the source.
|
- **Source-Level Filtering**: Agents upload candidate entries spanning from informational events up to errors (`INFO`, `WARNING`, `ERROR`, `CRITICAL`), while stripping verbose debugging noise (`DEBUG`, audit entries) and skipping any entries older than 24 hours.
|
||||||
- **End-to-End Encryption**: Logs are encrypted using the server's OpenPGP public key before leaving the edge node.
|
- **End-to-End Encryption**: Logs are encrypted using the server's OpenPGP public key before leaving the edge node.
|
||||||
- **Secure TCP Sockets**: Ingestion occurs over low-overhead authenticated TCP sockets rather than bulky HTTP/HTTPS endpoints.
|
- **Secure TCP Sockets**: Ingestion occurs over low-overhead authenticated TCP sockets rather than bulky HTTP/HTTPS endpoints.
|
||||||
|
|
||||||
### 2. Cloud-Side Temporal Persistence
|
### 2. Cloud-Side Temporal Persistence & Severity Routing
|
||||||
The central Python/TCP hub handles the heavy lifting:
|
The central Python/TCP hub handles the heavy lifting:
|
||||||
- State tracking is managed centrally in SQLite (`logar_state.db`).
|
- State tracking is managed centrally in SQLite (`logar_state.db`).
|
||||||
- Candidate issues are evaluated over a **12-hour temporal evaluation window**.
|
- Candidate issues are evaluated over a **12-hour temporal evaluation window**.
|
||||||
- An issue must persist across **at least 4 consecutive runs / cycles** to be confirmed as a genuine system anomaly. Transient blips and sporadic spikes are filtered out automatically.
|
- **Warning Persistence (4-Run Rule)**: `WARNING` level issues must persist across **at least 4 consecutive runs / cycles** within the 12-hour window to be confirmed as genuine anomalies, automatically filtering out transient blips.
|
||||||
|
- **Immediate Error Pass**: Critical errors (`ERROR`, `CRITICAL`, `FATAL`) bypass the 4-run threshold and are promoted immediately to `VERIFIED` on their first occurrence.
|
||||||
|
|
||||||
### 3. Agentic Integration with Hermes
|
### 3. Agentic Integration with Hermes
|
||||||
Instead of human engineers manually diving through noisy logs, **Hermes** ingests pre-filtered, 4-run validated anomalies directly from the cloud hub (`GET /api/hermes/report`), treating them as verified system artifacts to trigger precise team notifications.
|
Instead of human engineers manually diving through noisy logs, **Hermes** ingests pre-filtered anomalies directly from the cloud hub (`GET /api/hermes/report`), treating verified errors and 4-run validated warnings as actionable system artifacts to trigger precise team notifications.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -41,9 +43,9 @@ Instead of human engineers manually diving through noisy logs, **Hermes** ingest
|
|||||||
|
|
||||||
```mermaid
|
```mermaid
|
||||||
graph TB
|
graph TB
|
||||||
subgraph Edge Nodes [Zero-State Edge Forwarders]
|
subgraph Edge Nodes [State-Tracking Edge Forwarders]
|
||||||
W[Win_Client.py / Win_Client.exe<br/>Windows Event Log Application]
|
W[Win_Client.py / Win_Client.exe / Win_Client.pyz<br/>Windows Event Log Application]
|
||||||
L[Linux_Client.py / Linux_Client.bin<br/>systemd journalctl -p warning]
|
L[Linux_Client.py / Linux_Client.bin<br/>systemd journalctl -p info]
|
||||||
end
|
end
|
||||||
|
|
||||||
subgraph Security Layer [Security & Framing]
|
subgraph Security Layer [Security & Framing]
|
||||||
@@ -87,7 +89,7 @@ graph TB
|
|||||||
- A cryptographically random authentication secret token (`auth_token`).
|
- A cryptographically random authentication secret token (`auth_token`).
|
||||||
- **Client Configuration Exporter**:
|
- **Client Configuration Exporter**:
|
||||||
```bash
|
```bash
|
||||||
python Server.py --create-client-config --server-host 127.0.0.1 --server-port 9443 --client-out client_config.json
|
python src/Server.py --create-client-config --server-host 127.0.0.1 --server-port 9443 --client-out client_config.json
|
||||||
```
|
```
|
||||||
Produces an anonymous client config containing only the server socket coordinates, authentication token, and the encryption-only public key & fingerprint.
|
Produces an anonymous client config containing only the server socket coordinates, authentication token, and the encryption-only public key & fingerprint.
|
||||||
- **Socket Protocol Framing**:
|
- **Socket Protocol Framing**:
|
||||||
@@ -110,11 +112,15 @@ Incoming candidate logs are tracked in SQLite table `active_issues`:
|
|||||||
- **Issue Fingerprint**: Formatted as `{site_name}:{server}:{signature}`.
|
- **Issue Fingerprint**: Formatted as `{site_name}:{server}:{signature}`.
|
||||||
- **12-Hour Evaluation Window**:
|
- **12-Hour Evaluation Window**:
|
||||||
- When an issue is observed, the hub compares `(now - last_seen)`.
|
- When an issue is observed, the hub compares `(now - last_seen)`.
|
||||||
- If more than 12 hours have passed since the issue was last recorded, the previous window is expired and the cycle resets to `run_count = 1` with status `TRANSIENT`.
|
- If more than 12 hours have passed since the issue was last recorded, the previous window is expired and the cycle resets to `run_count = 1`.
|
||||||
- **4-Run Rule**:
|
- **4-Run Rule for Warnings**:
|
||||||
|
- The 4-run persistence threshold specifically applies to `WARNING` (and `INFO`) events to eliminate transient operational noise.
|
||||||
- For each distinct run batch, `run_count` increments.
|
- For each distinct run batch, `run_count` increments.
|
||||||
- Issues with `run_count < 4` are marked as `TRANSIENT` and ignored by downstream reporting.
|
- Warnings with `run_count < 4` are marked as `TRANSIENT` and excluded from Hermes reports.
|
||||||
- When `run_count >= 4` within the active 12-hour window, the status transitions to `VERIFIED`.
|
- When `run_count >= 4` within the active 12-hour window, the warning transitions to `VERIFIED`.
|
||||||
|
- **Immediate Verification for Errors**:
|
||||||
|
- High-severity events (`ERROR`, `CRITICAL`, `FATAL`) **always pass immediately**.
|
||||||
|
- On their very first ingestion (`run_count = 1`), errors are promoted directly to `VERIFIED` and surfaced to Hermes without waiting for 4 runs.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -123,7 +129,7 @@ Incoming candidate logs are tracked in SQLite table `active_issues`:
|
|||||||
The server hub serves a REST reporting API (default port `8443`):
|
The server hub serves a REST reporting API (default port `8443`):
|
||||||
|
|
||||||
### `GET /api/hermes/report`
|
### `GET /api/hermes/report`
|
||||||
Returns exclusively **verified anomalies** that have satisfied the 4-run rule within the active 12-hour evaluation window:
|
Returns all **verified anomalies** (immediate critical errors and warnings verified after 4 consecutive runs within the 12-hour evaluation window):
|
||||||
|
|
||||||
```json
|
```json
|
||||||
[
|
[
|
||||||
@@ -171,36 +177,42 @@ The server automatically infers site attribution from domain qualifiers (e.g. `n
|
|||||||
|
|
||||||
```
|
```
|
||||||
LOGAR/
|
LOGAR/
|
||||||
|
├── .gitea/
|
||||||
|
│ └── workflows/
|
||||||
|
│ ├── ci.yml # Continuous Integration automated test suite (runs on every push)
|
||||||
|
│ ├── release-linux.yml # Linux release workflow (compiles Server.bin, Linux_Client.bin, checksums)
|
||||||
|
│ └── release-windows.yml # Windows release workflow (compiles Server.exe, Win_Client.exe, checksums)
|
||||||
|
├── compilation/ # Build, packaging, and release automation tools
|
||||||
|
│ ├── package_dist.py # Multi-platform standalone binary packaging script
|
||||||
|
│ ├── requirements.txt # Unified project dependencies
|
||||||
|
│ └── upload_release.py # Direct Gitea REST API release asset publisher
|
||||||
|
├── src/ # Core application source modules
|
||||||
|
│ ├── __init__.py
|
||||||
|
│ ├── Server.py # Central TCP server and Hermes API
|
||||||
|
│ ├── Win_Client.py # Windows edge forwarder
|
||||||
|
│ └── Linux_Client.py # Linux edge forwarder
|
||||||
|
├── tests/ # Automated test suites
|
||||||
|
│ ├── test_linux_client.py # Linux client unit tests
|
||||||
|
│ ├── test_pipeline.py # End-to-end integration test
|
||||||
|
│ ├── test_server.py # Server unit tests
|
||||||
|
│ └── test_win_client.py # Windows client unit tests
|
||||||
├── .gitignore # Ignore venv, caches, DBs, and private keys
|
├── .gitignore # Ignore venv, caches, DBs, and private keys
|
||||||
├── requirements.txt # Unified dependencies
|
|
||||||
├── README.md # Comprehensive documentation
|
├── README.md # Comprehensive documentation
|
||||||
├── Server.py # Central TCP server and Hermes API
|
├── RELEASE_NOTES.md # Release history and changelog
|
||||||
├── Win_Client.py # Windows edge forwarder
|
├── server_config.sample.json # Central server sample configuration
|
||||||
├── Linux_Client.py # Linux edge forwarder
|
└── out/ # Standalone deployment documentation & sample configs
|
||||||
├── test_pipeline.py # End-to-end integration test
|
├── linux_server/
|
||||||
└── out/ # Standalone shippable distributions
|
│ ├── README.md # Linux systemd service installation & hub guide
|
||||||
├── server/
|
│ └── server_config.sample.json # Reference server configuration
|
||||||
│ ├── Server.py # Python source
|
├── win_server/
|
||||||
│ ├── server_config.sample.json
|
│ ├── README.md # Windows service (NSSM/Task Scheduler) installation guide
|
||||||
│ ├── requirements.txt
|
│ └── server_config.sample.json # Reference server configuration
|
||||||
│ ├── README.md
|
├── linux_client/
|
||||||
│ └── test/
|
│ ├── README.md # Linux service & timer installation guide
|
||||||
│ └── test_server.py # Server unit tests
|
│ └── client_config.sample.json # Reference client configuration
|
||||||
├── win_client/
|
└── win_client/
|
||||||
│ ├── Win_Client.py # Python source
|
├── README.md # Windows service installation & configuration guide
|
||||||
│ ├── client_config.sample.json
|
└── client_config.sample.json # Reference client configuration
|
||||||
│ ├── requirements.txt
|
|
||||||
│ ├── README.md
|
|
||||||
│ └── test/
|
|
||||||
│ └── test_win_client.py # Windows client unit tests
|
|
||||||
└── linux_client/
|
|
||||||
├── build_bin.sh # PyInstaller native ELF compiler script
|
|
||||||
├── Linux_Client.py # Python source
|
|
||||||
├── client_config.sample.json
|
|
||||||
├── requirements.txt
|
|
||||||
├── README.md
|
|
||||||
└── test/
|
|
||||||
└── test_linux_client.py# Linux client unit tests
|
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -211,32 +223,61 @@ LOGAR/
|
|||||||
|
|
||||||
1. **Install dependencies**:
|
1. **Install dependencies**:
|
||||||
```bash
|
```bash
|
||||||
pip install -r requirements.txt
|
pip install -r compilation/requirements.txt
|
||||||
```
|
```
|
||||||
2. **Start the server** (generates `server_config.json` and keypair on first run):
|
2. **Start the server** (generates `server_config.json` and keypair on first run):
|
||||||
```bash
|
```bash
|
||||||
python Server.py
|
python src/Server.py
|
||||||
```
|
```
|
||||||
3. **Export a client configuration**:
|
3. **Export a client configuration**:
|
||||||
```bash
|
```bash
|
||||||
python Server.py --create-client-config --server-host <SERVER_IP> --server-port 9443 --client-out client_config.json
|
python src/Server.py --create-client-config --server-host <SERVER_IP> --server-port 9443 --client-out client_config.json
|
||||||
```
|
```
|
||||||
|
|
||||||
### 2. Windows Client Deployment
|
### 2. Windows Client Deployment
|
||||||
|
|
||||||
1. Copy `Win_Client.py` (and `requirements.txt`) plus `client_config.json` to the target machine.
|
#### Option A: Precompiled Standalone Executable (Recommended)
|
||||||
2. Run manually or schedule via Task Scheduler (every 3 hours):
|
1. Download `Win_Client.exe` (or `Win_Client.pyz`) from the repository releases.
|
||||||
|
2. Place `client_config.json` (exported from the server) in the same directory.
|
||||||
|
3. Run manually or schedule via Task Scheduler (every 3 hours):
|
||||||
```powershell
|
```powershell
|
||||||
python Win_Client.py --hours 6
|
.\Win_Client.exe --hours 24
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Option B: Python Source Execution
|
||||||
|
1. Copy `Win_Client.py`, `requirements.txt`, and `client_config.json` to the target machine.
|
||||||
|
2. Install client dependencies:
|
||||||
|
```powershell
|
||||||
|
python -m pip install -r requirements.txt
|
||||||
|
```
|
||||||
|
3. Run manually or schedule via Task Scheduler:
|
||||||
|
```powershell
|
||||||
|
python Win_Client.py --hours 24
|
||||||
```
|
```
|
||||||
|
|
||||||
### 3. Linux Client Deployment
|
### 3. Linux Client Deployment
|
||||||
|
|
||||||
1. Copy `Linux_Client.py` (and `requirements.txt`) plus `client_config.json` to `/opt/logar/`.
|
#### Option A: Precompiled Standalone Binary (Recommended)
|
||||||
2. (Optional) Run `build_bin.sh` to compile a standalone ELF binary if desired.
|
1. Download `Linux_Client.bin` from the repository releases.
|
||||||
|
2. Place `Linux_Client.bin` and `client_config.json` into `/opt/logar/` and make it executable:
|
||||||
|
```bash
|
||||||
|
chmod +x /opt/logar/Linux_Client.bin
|
||||||
|
```
|
||||||
3. Run via cron or systemd timer:
|
3. Run via cron or systemd timer:
|
||||||
```bash
|
```bash
|
||||||
0 */3 * * * python3 /opt/logar/Linux_Client.py --hours 6
|
0 */3 * * * /opt/logar/Linux_Client.bin --hours 24
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Option B: Python Source Execution
|
||||||
|
1. Copy `Linux_Client.py`, `requirements.txt`, and `client_config.json` to `/opt/logar/`.
|
||||||
|
2. Install client dependencies:
|
||||||
|
```bash
|
||||||
|
python3 -m pip install -r requirements.txt
|
||||||
|
```
|
||||||
|
3. (Optional) Run `out/linux_client/build_bin.sh` to compile a standalone ELF binary locally if desired.
|
||||||
|
4. Run via cron or systemd timer:
|
||||||
|
```bash
|
||||||
|
0 */3 * * * python3 /opt/logar/Linux_Client.py --hours 24
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -244,46 +285,103 @@ LOGAR/
|
|||||||
## Running Tests
|
## Running Tests
|
||||||
|
|
||||||
### 1. Component-Specific Unit Tests
|
### 1. Component-Specific Unit Tests
|
||||||
Each component in `out/` includes its own isolated test suite:
|
The test suite is located in `tests/` and exercises all components:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Server tests (config generation, SQLite persistence, 4-run rule)
|
# Run all unit tests
|
||||||
python out/server/test/test_server.py
|
python -m unittest discover -s tests
|
||||||
|
|
||||||
# Windows client tests (config anonymity, machine ID, OpenPGP encryption)
|
# Or run component tests individually:
|
||||||
python out/win_client/test/test_win_client.py
|
python -m unittest tests/test_server.py
|
||||||
|
python -m unittest tests/test_win_client.py
|
||||||
# Linux client tests (config anonymity, journalctl priority filter, OpenPGP)
|
python -m unittest tests/test_linux_client.py
|
||||||
python out/linux_client/test/test_linux_client.py
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### 2. End-to-End Pipeline Integration Test
|
### 2. End-to-End Pipeline Integration Test
|
||||||
Start the server in one shell and run the pipeline test:
|
The pipeline test exercises invalid token rejection, encrypted socket streaming, database persistence, status promotion upon the 4th run, and the Hermes API report output.
|
||||||
```bash
|
|
||||||
python test_pipeline.py
|
1. **Start the server** in Shell 1 (creates `server_config.json` on first run):
|
||||||
```
|
```bash
|
||||||
This tests invalid token rejection, encrypted socket streaming, database persistence, status promotion upon the 4th run, and the Hermes API output.
|
python src/Server.py
|
||||||
|
```
|
||||||
|
2. **Export client configuration** in Shell 2 (required for testing):
|
||||||
|
```bash
|
||||||
|
python src/Server.py --create-client-config --server-host 127.0.0.1 --server-port 9443 --client-out client_config.json
|
||||||
|
```
|
||||||
|
3. **Execute the integration test** in Shell 2:
|
||||||
|
```bash
|
||||||
|
python tests/test_pipeline.py
|
||||||
|
```
|
||||||
|
|
||||||
|
## Continuous Integration via Gitea Actions
|
||||||
|
|
||||||
|
Continuous integration is automated via [`.gitea/workflows/ci.yml`](.gitea/workflows/ci.yml) and triggers automatically on **every push** and pull request:
|
||||||
|
1. **Syntax Compilation**: Validates all Python scripts (`src/Server.py`, `src/Win_Client.py`, `src/Linux_Client.py`, `compilation/package_dist.py`, `compilation/upload_release.py`, `tests/test_pipeline.py`, and test suites).
|
||||||
|
2. **Component Unit Tests**: Discovers and runs all unit tests in `tests/` (`test_server.py`, `test_win_client.py`, `test_linux_client.py`).
|
||||||
|
3. **End-to-End Pipeline Verification**: Automatically spins up the LOGAR server hub, generates test configs, runs `tests/test_pipeline.py` (testing socket authentication, 4-run rule persistence, Hermes API report, and client integrations), and shuts down the test instance.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Automated Releases via Gitea Actions
|
## Automated Releases via Gitea Actions
|
||||||
|
|
||||||
Releases are automated via [`.gitea/workflows/release.yml`](.gitea/workflows/release.yml) using your Gitea action runner:
|
Release builds are automated via two dedicated Gitea Actions workflows running concurrently on native platform runners:
|
||||||
|
- [`.gitea/workflows/release-linux.yml`](.gitea/workflows/release-linux.yml) (`ubuntu-latest`)
|
||||||
|
- [`.gitea/workflows/release-windows.yml`](.gitea/workflows/release-windows.yml) (`windows-latest`)
|
||||||
|
|
||||||
### Publishing a Release
|
### Publishing a Release
|
||||||
Whenever you want to release a new version with compiled standalone binaries:
|
Whenever you want to release a new version with compiled standalone binaries:
|
||||||
```bash
|
```bash
|
||||||
git tag v1.0.0
|
git tag v1.0.2
|
||||||
git push origin v1.0.0
|
git push origin v1.0.2
|
||||||
```
|
```
|
||||||
|
*(You can also trigger builds manually via the Gitea UI using the **Run workflow** button (`workflow_dispatch`) on either workflow).*
|
||||||
|
|
||||||
### What Gitea Actions Does Automatically:
|
### Automated Multi-Platform Compilation:
|
||||||
1. Gitea runner executes the workflow on tag push.
|
1. **Linux Runner** (`release-linux.yml`):
|
||||||
2. Runs `package_dist.py` to compile native standalone binaries:
|
- Compiles native Linux ELF executables: `Linux_Client.bin` and `Server.bin`.
|
||||||
- `Linux_Client.bin` (standalone binary)
|
- Generates dedicated SHA-256 checksum files:
|
||||||
- `Server.bin` (standalone server binary)
|
- `linux_client_sha256sum` (verification for `Linux_Client.bin`)
|
||||||
- `Win_Client.pyz` (standalone executable zipapp)
|
- `linux_agent_sha256sum` (alias for client/agent integrations)
|
||||||
- `SHA256SUMS.txt` (checksums)
|
- `linux_server_sha256sum` (verification for `Server.bin`)
|
||||||
3. Publishes the Gitea release using `gitea-release-action` and attaches the compiled binary assets.
|
- `SHA256SUMS_linux.txt` (summary manifest)
|
||||||
|
- Attaches all Linux assets to the Gitea release.
|
||||||
|
|
||||||
*(Note: You can also use `upload_release.py` from your Windows machine to upload Windows `.exe` binaries directly if desired).*
|
2. **Windows Runner** (`release-windows.yml`):
|
||||||
|
- Compiles native Windows PE executables: `Win_Client.exe` and `Server.exe`.
|
||||||
|
- Generates dedicated SHA-256 checksum files:
|
||||||
|
- `win_client_sha256sum` (verification for `Win_Client.exe`)
|
||||||
|
- `win_agent_sha256sum` (alias for client/agent integrations)
|
||||||
|
- `win_server_sha256sum` (verification for `Server.exe`)
|
||||||
|
- `SHA256SUMS_windows.txt` (summary manifest)
|
||||||
|
- Attaches all Windows assets to the Gitea release.
|
||||||
|
|
||||||
|
3. **Concurrent Publishing & Conflict Handling**:
|
||||||
|
`upload_release.py` includes automatic retry and conflict resolution so concurrent Windows and Linux runners attach their respective assets to the release without collision.
|
||||||
|
|
||||||
|
### Verifying Checksums
|
||||||
|
- On Linux:
|
||||||
|
```bash
|
||||||
|
sha256sum -c linux_client_sha256sum
|
||||||
|
# or
|
||||||
|
sha256sum -c linux_server_sha256sum
|
||||||
|
```
|
||||||
|
- On Windows (PowerShell):
|
||||||
|
```powershell
|
||||||
|
Get-FileHash .\Win_Client.exe -Algorithm SHA256
|
||||||
|
Get-Content .\win_client_sha256sum
|
||||||
|
```
|
||||||
|
|
||||||
|
### Local Packaging & Manual Upload
|
||||||
|
You can also compile and package binaries locally anytime:
|
||||||
|
```bash
|
||||||
|
# Windows
|
||||||
|
py -3.12 compilation/package_dist.py --target windows
|
||||||
|
|
||||||
|
# Linux
|
||||||
|
python3 compilation/package_dist.py --target linux
|
||||||
|
```
|
||||||
|
To upload local builds directly to Gitea:
|
||||||
|
```powershell
|
||||||
|
python compilation/upload_release.py --tag v1.0.2 --token <YOUR_GITEA_TOKEN>
|
||||||
|
```
|
||||||
|
*(Environment variables `GITEA_TOKEN`, `GITEA_SERVER_URL`, `GITEA_REPOSITORY`, and `GITEA_REF_NAME` are also supported automatically).*
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
# LOGAR Release v1.0.2
|
||||||
|
|
||||||
|
### Changes in this Release:
|
||||||
|
- **Warning Persistence & Immediate Error Routing**: Restructured temporal verification on the central hub so the 4-run persistence rule across the 12-hour evaluation window strictly governs `WARNING` and `INFO` events to suppress transient blips. High-severity `ERROR`, `CRITICAL`, and `FATAL` events are now promoted to `VERIFIED` immediately on their first occurrence and reported to Hermes without waiting for consecutive runs.
|
||||||
|
- **Server Deployment Packages in `out/`**: Added comprehensive deployment guides and configuration templates for both Linux Server hub (systemd service) and Windows Server hub (NSSM service / Task Scheduler) under `out/linux_server` and `out/win_server`.
|
||||||
|
- **Refactored Repository Layout**: Reorganized codebase by moving runtime forwarders and server hub into `src/`, compilation/release packaging utilities into `compilation/`, and all unit and pipeline verification tests into `tests/`.
|
||||||
|
- **Dual Platform Gitea Release Automation**: Dedicated Windows (`release-windows.yml`) and Linux (`release-linux.yml`) Gitea Actions to compile native platform binaries (`Win_Client.exe` and `Server.exe` on Windows; `Linux_Client.bin` and `Server.bin` on Linux).
|
||||||
|
- **Dedicated SHA-256 Checksums**: Release assets now include dedicated checksum files matching `[win/linux]_[client/agent]_sha256sum` (`win_client_sha256sum`, `win_agent_sha256sum`, `win_server_sha256sum`, `linux_client_sha256sum`, `linux_agent_sha256sum`, `linux_server_sha256sum`).
|
||||||
|
- **Removed Client Filter Logic**: Removed restrictive source-level noise filtering on edge forwarders. Clients now collect and stream all candidate events from `INFO` up to `ERROR` over the lookback window instead of discarding them at the source.
|
||||||
|
- **State Tracking & Deduplication**: Added persistent client state tracking (`client_state.json`) with journalctl cursors and Windows Event Log record numbers to guarantee that previously transmitted events are never resent.
|
||||||
|
- **24-Hour Lookback Window**: Forwarders now scan and upload events from the last 24 hours (default `--hours 24`), skipping older entries.
|
||||||
|
- **Lightweight Distribution Structure**: Cleaned `out/` to strictly contain deployment documentation and sample configurations.
|
||||||
|
- **Automated Gitea CI/CD**: Integrated push testing workflow (`ci.yml`) and multi-platform release asset packaging.
|
||||||
-209
@@ -1,209 +0,0 @@
|
|||||||
import os
|
|
||||||
import sys
|
|
||||||
import json
|
|
||||||
import socket
|
|
||||||
import struct
|
|
||||||
import argparse
|
|
||||||
import warnings
|
|
||||||
from datetime import datetime, timezone, timedelta
|
|
||||||
|
|
||||||
# Suppress cryptography / pgpy deprecation notices
|
|
||||||
warnings.filterwarnings("ignore")
|
|
||||||
|
|
||||||
import pgpy
|
|
||||||
|
|
||||||
try:
|
|
||||||
import win32evtlog
|
|
||||||
except ImportError:
|
|
||||||
win32evtlog = None
|
|
||||||
|
|
||||||
CONFIG_FILE_NAME = "client_config.json"
|
|
||||||
|
|
||||||
|
|
||||||
def load_config(config_path: str = CONFIG_FILE_NAME):
|
|
||||||
if not os.path.exists(config_path):
|
|
||||||
raise FileNotFoundError(
|
|
||||||
f"Client configuration file not found at: {config_path}\n"
|
|
||||||
f"Generate one from the server using: python Server.py --create-client-config --client-out {config_path}"
|
|
||||||
)
|
|
||||||
with open(config_path, "r", encoding="utf-8") as f:
|
|
||||||
return json.load(f)
|
|
||||||
|
|
||||||
|
|
||||||
def get_machine_identifier() -> str:
|
|
||||||
"""
|
|
||||||
Returns the hostname of the machine sending the logs,
|
|
||||||
and appends the network/DNS domain if available.
|
|
||||||
"""
|
|
||||||
fqdn = socket.getfqdn()
|
|
||||||
if fqdn and "." in fqdn and not fqdn.startswith("localhost"):
|
|
||||||
return fqdn
|
|
||||||
|
|
||||||
hostname = socket.gethostname()
|
|
||||||
user_dns_domain = os.environ.get("USERDNSDOMAIN")
|
|
||||||
if user_dns_domain and user_dns_domain.lower() != hostname.lower():
|
|
||||||
return f"{hostname}.{user_dns_domain.lower()}"
|
|
||||||
|
|
||||||
try:
|
|
||||||
host_ip = socket.gethostbyname(hostname)
|
|
||||||
canonical_name = socket.gethostbyaddr(host_ip)[0]
|
|
||||||
if canonical_name and "." in canonical_name and not canonical_name.startswith("localhost"):
|
|
||||||
return canonical_name
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return hostname
|
|
||||||
|
|
||||||
|
|
||||||
def get_recent_windows_logs(hours: int = 6):
|
|
||||||
"""
|
|
||||||
Scans the Windows Application Event Log backwards for events within the window.
|
|
||||||
Edge Thinness & Noise Stripping: INFO and DEBUG events are dropped at the source.
|
|
||||||
"""
|
|
||||||
if win32evtlog is None:
|
|
||||||
print("[!] pywin32 is not installed or not running on Windows. Returning mock/empty candidate list.")
|
|
||||||
return []
|
|
||||||
|
|
||||||
server = "localhost"
|
|
||||||
log_type = "Application"
|
|
||||||
flags = win32evtlog.EVENTLOG_BACKWARDS_READ | win32evtlog.EVENTLOG_SEQUENTIAL_READ
|
|
||||||
|
|
||||||
try:
|
|
||||||
hand = win32evtlog.OpenEventLog(server, log_type)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"[!] Error opening Windows event log: {e}")
|
|
||||||
return []
|
|
||||||
|
|
||||||
logs = []
|
|
||||||
cutoff_time = datetime.now() - timedelta(hours=hours)
|
|
||||||
machine_id = get_machine_identifier()
|
|
||||||
|
|
||||||
sev_map = {
|
|
||||||
1: "CRITICAL",
|
|
||||||
2: "ERROR",
|
|
||||||
3: "WARNING"
|
|
||||||
}
|
|
||||||
|
|
||||||
while True:
|
|
||||||
events = win32evtlog.ReadEventLog(hand, flags, 0)
|
|
||||||
if not events:
|
|
||||||
break
|
|
||||||
|
|
||||||
for event in events:
|
|
||||||
if event.TimeGenerated < cutoff_time:
|
|
||||||
break
|
|
||||||
|
|
||||||
# Drop conversational or informational noise (INFO=4, etc.) at source
|
|
||||||
# Only retain Critical (1), Error (2), and Warning (3)
|
|
||||||
if event.EventType in sev_map:
|
|
||||||
msg = " ".join(event.StringInserts) if event.StringInserts else "Event Log Entry"
|
|
||||||
logs.append({
|
|
||||||
"server": machine_id,
|
|
||||||
"os_type": "windows",
|
|
||||||
"signature": event.SourceName or "Windows-Event",
|
|
||||||
"severity": sev_map[event.EventType],
|
|
||||||
"message": msg[:2048] # Limit message length
|
|
||||||
})
|
|
||||||
|
|
||||||
if events[-1].TimeGenerated < cutoff_time:
|
|
||||||
break
|
|
||||||
|
|
||||||
win32evtlog.CloseEventLog(hand)
|
|
||||||
return logs
|
|
||||||
|
|
||||||
|
|
||||||
def send_encrypted_logs_over_socket(config: dict, logs: list):
|
|
||||||
"""
|
|
||||||
Encrypts the payload using the server's OpenPGP public key and streams
|
|
||||||
over an authenticated TCP socket. Zero local state is maintained on the client.
|
|
||||||
"""
|
|
||||||
server_host = config["server_host"]
|
|
||||||
server_port = int(config["server_port"])
|
|
||||||
auth_token = config["auth_token"]
|
|
||||||
pub_key_armored = config["server_public_key"]
|
|
||||||
expected_fp = config.get("server_fingerprint", "").replace(" ", "").upper()
|
|
||||||
|
|
||||||
# Load and verify server public key
|
|
||||||
pub_key, _ = pgpy.PGPKey.from_blob(pub_key_armored)
|
|
||||||
actual_fp = str(pub_key.fingerprint).replace(" ", "").upper()
|
|
||||||
if expected_fp and actual_fp != expected_fp:
|
|
||||||
raise ValueError(
|
|
||||||
f"Server fingerprint mismatch! Expected {expected_fp}, but key has {actual_fp}."
|
|
||||||
)
|
|
||||||
|
|
||||||
machine_id = get_machine_identifier()
|
|
||||||
|
|
||||||
# Prepare zero-state candidate batch
|
|
||||||
payload = {
|
|
||||||
"server": machine_id,
|
|
||||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
|
||||||
"logs": logs
|
|
||||||
}
|
|
||||||
payload_json = json.dumps(payload)
|
|
||||||
|
|
||||||
# Encrypt payload with server's encryption-only key
|
|
||||||
pgp_msg = pgpy.PGPMessage.new(payload_json)
|
|
||||||
encrypted_msg = pub_key.encrypt(pgp_msg)
|
|
||||||
encrypted_armored = str(encrypted_msg)
|
|
||||||
|
|
||||||
# Envelope with socket authentication header
|
|
||||||
envelope = {
|
|
||||||
"auth_token": auth_token,
|
|
||||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
|
||||||
"encrypted_payload": encrypted_armored
|
|
||||||
}
|
|
||||||
envelope_bytes = json.dumps(envelope).encode("utf-8")
|
|
||||||
|
|
||||||
# Connect over TCP socket and transmit with 4-byte length prefix framing
|
|
||||||
print(f"[*] Connecting to LOGAR server at {server_host}:{server_port} over secure TCP socket...")
|
|
||||||
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
|
|
||||||
sock.settimeout(15.0)
|
|
||||||
sock.connect((server_host, server_port))
|
|
||||||
|
|
||||||
# Send frame: length (4 bytes big-endian) + envelope
|
|
||||||
frame = struct.pack(">I", len(envelope_bytes)) + envelope_bytes
|
|
||||||
sock.sendall(frame)
|
|
||||||
|
|
||||||
# Receive response length
|
|
||||||
resp_len_bytes = sock.recv(4)
|
|
||||||
if not resp_len_bytes:
|
|
||||||
raise ConnectionError("Server closed connection without response.")
|
|
||||||
|
|
||||||
resp_len = struct.unpack(">I", resp_len_bytes)[0]
|
|
||||||
resp_bytes = bytearray()
|
|
||||||
while len(resp_bytes) < resp_len:
|
|
||||||
chunk = sock.recv(min(4096, resp_len - len(resp_bytes)))
|
|
||||||
if not chunk:
|
|
||||||
break
|
|
||||||
resp_bytes.extend(chunk)
|
|
||||||
|
|
||||||
response = json.loads(resp_bytes.decode("utf-8"))
|
|
||||||
print(f"[+] Server response: {response}")
|
|
||||||
return response
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
parser = argparse.ArgumentParser(description="LOGAR Windows Edge Log Forwarder (Zero State)")
|
|
||||||
parser.add_argument("--config", default=CONFIG_FILE_NAME, help="Path to client_config.json")
|
|
||||||
parser.add_argument("--hours", type=int, default=6, help="Lookback window in hours for event logs")
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
try:
|
|
||||||
config = load_config(args.config)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"[!] Configuration error: {e}")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
print(f"[*] Scanning Windows Application event log for candidate anomalies (last {args.hours} hours)...")
|
|
||||||
candidate_logs = get_recent_windows_logs(hours=args.hours)
|
|
||||||
print(f"[*] Found {len(candidate_logs)} candidate anomalies (noise stripped at source).")
|
|
||||||
|
|
||||||
try:
|
|
||||||
send_encrypted_logs_over_socket(config, candidate_logs)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"[!] Failed to stream logs to server: {e}")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -0,0 +1,206 @@
|
|||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import shutil
|
||||||
|
import zipapp
|
||||||
|
import hashlib
|
||||||
|
import platform
|
||||||
|
import subprocess
|
||||||
|
import argparse
|
||||||
|
|
||||||
|
ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
|
||||||
|
SRC_DIR = os.path.join(ROOT_DIR, "src")
|
||||||
|
DIST_DIR = os.path.join(ROOT_DIR, "dist")
|
||||||
|
BUILD_TEMP = os.path.join(ROOT_DIR, "build_temp")
|
||||||
|
|
||||||
|
def clean_and_prep():
|
||||||
|
if os.path.exists(DIST_DIR):
|
||||||
|
shutil.rmtree(DIST_DIR)
|
||||||
|
os.makedirs(DIST_DIR, exist_ok=True)
|
||||||
|
if os.path.exists(BUILD_TEMP):
|
||||||
|
shutil.rmtree(BUILD_TEMP)
|
||||||
|
os.makedirs(BUILD_TEMP, exist_ok=True)
|
||||||
|
|
||||||
|
def build_pyinstaller_binary(script_path, binary_name):
|
||||||
|
print(f"[*] Compiling {binary_name} with PyInstaller...")
|
||||||
|
cmd = [
|
||||||
|
sys.executable, "-m", "PyInstaller",
|
||||||
|
"--onefile",
|
||||||
|
"--clean",
|
||||||
|
"--distpath", DIST_DIR,
|
||||||
|
"--workpath", os.path.join(BUILD_TEMP, f"work_{binary_name}"),
|
||||||
|
"--specpath", os.path.join(BUILD_TEMP, f"spec_{binary_name}"),
|
||||||
|
"--name", binary_name,
|
||||||
|
script_path
|
||||||
|
]
|
||||||
|
res = subprocess.run(cmd, capture_output=True, text=True)
|
||||||
|
if res.returncode != 0:
|
||||||
|
print(f"[!] Compilation error for {binary_name}:\n{res.stderr}")
|
||||||
|
raise RuntimeError(f"Failed to build {binary_name}")
|
||||||
|
print(f"[+] Successfully compiled {binary_name}")
|
||||||
|
|
||||||
|
def calculate_sha256(filepath):
|
||||||
|
h = hashlib.sha256()
|
||||||
|
with open(filepath, "rb") as f:
|
||||||
|
while chunk := f.read(65536):
|
||||||
|
h.update(chunk)
|
||||||
|
return h.hexdigest()
|
||||||
|
|
||||||
|
def write_checksum_file(filename, digest, binary_filename):
|
||||||
|
out_path = os.path.join(DIST_DIR, filename)
|
||||||
|
with open(out_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write(f"{digest} {binary_filename}\n")
|
||||||
|
print(f"[+] Generated checksum file: {filename} ({digest[:16]}...)")
|
||||||
|
|
||||||
|
def build_linux_zipapp_fallback():
|
||||||
|
print("[*] Packaging Linux standalone zipapp fallback binaries...")
|
||||||
|
# Linux Client zipapp
|
||||||
|
app_dir = os.path.join(BUILD_TEMP, "linux_app")
|
||||||
|
os.makedirs(app_dir, exist_ok=True)
|
||||||
|
shutil.copy(os.path.join(SRC_DIR, "Linux_Client.py"), os.path.join(app_dir, "Linux_Client.py"))
|
||||||
|
client_out = os.path.join(DIST_DIR, "Linux_Client.bin")
|
||||||
|
zipapp.create_archive(
|
||||||
|
source=app_dir,
|
||||||
|
target=client_out,
|
||||||
|
interpreter="/usr/bin/env python3",
|
||||||
|
main="Linux_Client:main"
|
||||||
|
)
|
||||||
|
# Server zipapp
|
||||||
|
srv_dir = os.path.join(BUILD_TEMP, "linux_srv")
|
||||||
|
os.makedirs(srv_dir, exist_ok=True)
|
||||||
|
shutil.copy(os.path.join(SRC_DIR, "Server.py"), os.path.join(srv_dir, "Server.py"))
|
||||||
|
server_out = os.path.join(DIST_DIR, "Server.bin")
|
||||||
|
zipapp.create_archive(
|
||||||
|
source=srv_dir,
|
||||||
|
target=server_out,
|
||||||
|
interpreter="/usr/bin/env python3",
|
||||||
|
main="Server:main"
|
||||||
|
)
|
||||||
|
|
||||||
|
def build_windows():
|
||||||
|
print("[*] Compiling Windows standalone executables...")
|
||||||
|
win_client_script = os.path.join(SRC_DIR, "Win_Client.py")
|
||||||
|
build_pyinstaller_binary(win_client_script, "Win_Client")
|
||||||
|
|
||||||
|
server_script = os.path.join(SRC_DIR, "Server.py")
|
||||||
|
build_pyinstaller_binary(server_script, "Server")
|
||||||
|
|
||||||
|
client_bin = os.path.join(DIST_DIR, "Win_Client.exe")
|
||||||
|
server_bin = os.path.join(DIST_DIR, "Server.exe")
|
||||||
|
|
||||||
|
sums = []
|
||||||
|
if os.path.exists(client_bin):
|
||||||
|
client_hash = calculate_sha256(client_bin)
|
||||||
|
write_checksum_file("win_client_sha256sum", client_hash, "Win_Client.exe")
|
||||||
|
write_checksum_file("win_agent_sha256sum", client_hash, "Win_Client.exe")
|
||||||
|
sums.append(f"{client_hash} Win_Client.exe")
|
||||||
|
else:
|
||||||
|
print(f"[!] Warning: Expected {client_bin} was not found.")
|
||||||
|
|
||||||
|
if os.path.exists(server_bin):
|
||||||
|
server_hash = calculate_sha256(server_bin)
|
||||||
|
write_checksum_file("win_server_sha256sum", server_hash, "Server.exe")
|
||||||
|
sums.append(f"{server_hash} Server.exe")
|
||||||
|
else:
|
||||||
|
print(f"[!] Warning: Expected {server_bin} was not found.")
|
||||||
|
|
||||||
|
sums_path = os.path.join(DIST_DIR, "SHA256SUMS_windows.txt")
|
||||||
|
with open(sums_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write("\n".join(sums) + "\n")
|
||||||
|
|
||||||
|
def build_linux():
|
||||||
|
print("[*] Compiling Linux standalone binaries...")
|
||||||
|
is_linux_host = platform.system() == "Linux"
|
||||||
|
|
||||||
|
if is_linux_host:
|
||||||
|
linux_client_script = os.path.join(SRC_DIR, "Linux_Client.py")
|
||||||
|
build_pyinstaller_binary(linux_client_script, "Linux_Client.bin")
|
||||||
|
|
||||||
|
server_script = os.path.join(SRC_DIR, "Server.py")
|
||||||
|
build_pyinstaller_binary(server_script, "Server.bin")
|
||||||
|
|
||||||
|
# Normalize extensions in case PyInstaller dropped .bin
|
||||||
|
for name in ["Linux_Client", "Server"]:
|
||||||
|
plain_path = os.path.join(DIST_DIR, name)
|
||||||
|
bin_path = os.path.join(DIST_DIR, f"{name}.bin")
|
||||||
|
if os.path.exists(plain_path) and not os.path.exists(bin_path):
|
||||||
|
os.rename(plain_path, bin_path)
|
||||||
|
|
||||||
|
# Ensure executable permissions on Linux
|
||||||
|
for b in ["Linux_Client.bin", "Server.bin"]:
|
||||||
|
p = os.path.join(DIST_DIR, b)
|
||||||
|
if os.path.exists(p):
|
||||||
|
try:
|
||||||
|
os.chmod(p, 0o755)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
print("[!] Note: Host platform is not Linux. Generating executable zipapps for Linux target.")
|
||||||
|
build_linux_zipapp_fallback()
|
||||||
|
|
||||||
|
client_bin = os.path.join(DIST_DIR, "Linux_Client.bin")
|
||||||
|
server_bin = os.path.join(DIST_DIR, "Server.bin")
|
||||||
|
|
||||||
|
sums = []
|
||||||
|
if os.path.exists(client_bin):
|
||||||
|
client_hash = calculate_sha256(client_bin)
|
||||||
|
write_checksum_file("linux_client_sha256sum", client_hash, "Linux_Client.bin")
|
||||||
|
write_checksum_file("linux_agent_sha256sum", client_hash, "Linux_Client.bin")
|
||||||
|
sums.append(f"{client_hash} Linux_Client.bin")
|
||||||
|
else:
|
||||||
|
print(f"[!] Warning: Expected {client_bin} was not found.")
|
||||||
|
|
||||||
|
if os.path.exists(server_bin):
|
||||||
|
server_hash = calculate_sha256(server_bin)
|
||||||
|
write_checksum_file("linux_server_sha256sum", server_hash, "Server.bin")
|
||||||
|
sums.append(f"{server_hash} Server.bin")
|
||||||
|
else:
|
||||||
|
print(f"[!] Warning: Expected {server_bin} was not found.")
|
||||||
|
|
||||||
|
sums_path = os.path.join(DIST_DIR, "SHA256SUMS_linux.txt")
|
||||||
|
with open(sums_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write("\n".join(sums) + "\n")
|
||||||
|
|
||||||
|
def main(target=None):
|
||||||
|
if target is None:
|
||||||
|
parser = argparse.ArgumentParser(description="LOGAR Standalone Binary Compiler & Packager")
|
||||||
|
parser.add_argument(
|
||||||
|
"--target", "-t",
|
||||||
|
choices=["windows", "win", "linux", "auto"],
|
||||||
|
default="auto",
|
||||||
|
help="Target platform to compile binaries for (default: auto-detect)"
|
||||||
|
)
|
||||||
|
args, _ = parser.parse_known_args()
|
||||||
|
target = args.target
|
||||||
|
|
||||||
|
if target == "auto":
|
||||||
|
target = "windows" if platform.system() == "Windows" else "linux"
|
||||||
|
elif target == "win":
|
||||||
|
target = "windows"
|
||||||
|
|
||||||
|
print("=" * 60)
|
||||||
|
print(" LOGAR Binary Packaging")
|
||||||
|
print(f" Host Platform: {platform.system()} ({platform.machine()})")
|
||||||
|
print(f" Target Platform: {target.upper()}")
|
||||||
|
print("=" * 60)
|
||||||
|
|
||||||
|
clean_and_prep()
|
||||||
|
|
||||||
|
if target == "windows":
|
||||||
|
build_windows()
|
||||||
|
elif target == "linux":
|
||||||
|
build_linux()
|
||||||
|
else:
|
||||||
|
raise ValueError(f"Unsupported target: {target}")
|
||||||
|
|
||||||
|
# Clean temporary build directory
|
||||||
|
if os.path.exists(BUILD_TEMP):
|
||||||
|
shutil.rmtree(BUILD_TEMP, ignore_errors=True)
|
||||||
|
|
||||||
|
print("\n[+] Binary shipping artifacts assembled in 'dist/':")
|
||||||
|
for f in sorted(os.listdir(DIST_DIR)):
|
||||||
|
sz = os.path.getsize(os.path.join(DIST_DIR, f))
|
||||||
|
print(f" - {f} ({sz / (1024*1024):.2f} MB)" if sz > 1024*1024 else f" - {f} ({sz} bytes)")
|
||||||
|
print("=" * 60)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -0,0 +1,205 @@
|
|||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import json
|
||||||
|
import argparse
|
||||||
|
import urllib.request
|
||||||
|
import urllib.parse
|
||||||
|
ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
|
||||||
|
sys.path.insert(0, os.path.dirname(__file__))
|
||||||
|
import package_dist
|
||||||
|
|
||||||
|
import time
|
||||||
|
|
||||||
|
DEFAULT_GITEA_URL = os.environ.get("GITEA_SERVER_URL", "https://gitea.eibl.tech")
|
||||||
|
DEFAULT_REPO = os.environ.get("GITEA_REPOSITORY", "me0nline/LOGAR")
|
||||||
|
|
||||||
|
def get_existing_assets(base_url, repo, release_id, token):
|
||||||
|
url = f"{base_url}/api/v1/repos/{repo}/releases/{release_id}/assets"
|
||||||
|
req = urllib.request.Request(url, headers={"Authorization": f"token {token}", "Accept": "application/json"})
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(req) as resp:
|
||||||
|
return json.loads(resp.read().decode("utf-8"))
|
||||||
|
except Exception:
|
||||||
|
return []
|
||||||
|
|
||||||
|
def delete_asset(base_url, repo, release_id, asset_id, token):
|
||||||
|
url = f"{base_url}/api/v1/repos/{repo}/releases/{release_id}/assets/{asset_id}"
|
||||||
|
req = urllib.request.Request(url, method="DELETE", headers={"Authorization": f"token {token}"})
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(req) as resp:
|
||||||
|
pass
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def upload_file_to_release(base_url, repo, release_id, token, file_path, max_retries=3):
|
||||||
|
filename = os.path.basename(file_path)
|
||||||
|
|
||||||
|
# Clean up existing asset with same name if already present
|
||||||
|
existing_assets = get_existing_assets(base_url, repo, release_id, token)
|
||||||
|
for asset in existing_assets:
|
||||||
|
if asset.get("name") == filename:
|
||||||
|
print(f"[*] Removing existing asset '{filename}' (ID: {asset['id']})...")
|
||||||
|
delete_asset(base_url, repo, release_id, asset["id"], token)
|
||||||
|
|
||||||
|
url = f"{base_url}/api/v1/repos/{repo}/releases/{release_id}/assets?name={urllib.parse.quote(filename)}"
|
||||||
|
with open(file_path, "rb") as f:
|
||||||
|
file_bytes = f.read()
|
||||||
|
|
||||||
|
for attempt in range(1, max_retries + 1):
|
||||||
|
req = urllib.request.Request(url, data=file_bytes, method="POST")
|
||||||
|
req.add_header("Authorization", f"token {token}")
|
||||||
|
req.add_header("Content-Type", "application/octet-stream")
|
||||||
|
req.add_header("Accept", "application/json")
|
||||||
|
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(req) as resp:
|
||||||
|
data = json.loads(resp.read().decode("utf-8"))
|
||||||
|
print(f"[+] Attached {filename} ({len(file_bytes)} bytes) to release.")
|
||||||
|
return data
|
||||||
|
except urllib.error.HTTPError as e:
|
||||||
|
err = e.read().decode("utf-8", errors="ignore")
|
||||||
|
print(f"[!] Attempt {attempt}/{max_retries} - Error uploading {filename}: HTTP {e.code} - {err}")
|
||||||
|
if attempt < max_retries:
|
||||||
|
time.sleep(2 * attempt)
|
||||||
|
else:
|
||||||
|
return None
|
||||||
|
except Exception as ex:
|
||||||
|
print(f"[!] Attempt {attempt}/{max_retries} - Exception uploading {filename}: {ex}")
|
||||||
|
if attempt < max_retries:
|
||||||
|
time.sleep(2 * attempt)
|
||||||
|
else:
|
||||||
|
return None
|
||||||
|
|
||||||
|
def create_or_get_release(base_url, repo, tag, token, title=None, notes=None):
|
||||||
|
url = f"{base_url}/api/v1/repos/{repo}/releases"
|
||||||
|
headers = {
|
||||||
|
"Authorization": f"token {token}",
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
"Accept": "application/json"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Check if release exists
|
||||||
|
check_url = f"{base_url}/api/v1/repos/{repo}/releases/tags/{urllib.parse.quote(tag)}"
|
||||||
|
check_req = urllib.request.Request(check_url, headers={"Authorization": f"token {token}"})
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(check_req) as resp:
|
||||||
|
existing = json.loads(resp.read().decode("utf-8"))
|
||||||
|
print(f"[*] Found existing release for tag {tag} (ID: {existing['id']})")
|
||||||
|
if notes or title:
|
||||||
|
patch_url = f"{base_url}/api/v1/repos/{repo}/releases/{existing['id']}"
|
||||||
|
patch_payload = {}
|
||||||
|
if title:
|
||||||
|
patch_payload["name"] = title
|
||||||
|
if notes:
|
||||||
|
patch_payload["body"] = notes
|
||||||
|
patch_req = urllib.request.Request(
|
||||||
|
patch_url,
|
||||||
|
data=json.dumps(patch_payload).encode("utf-8"),
|
||||||
|
headers=headers,
|
||||||
|
method="PATCH"
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(patch_req) as p_resp:
|
||||||
|
print(f"[+] Updated release description for tag {tag}")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[!] Warning: Could not update existing release description: {e}")
|
||||||
|
return existing["id"]
|
||||||
|
except urllib.error.HTTPError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Create new release
|
||||||
|
payload = {
|
||||||
|
"tag_name": tag,
|
||||||
|
"name": title or f"LOGAR Release {tag}",
|
||||||
|
"body": notes or f"Automated binary release for {tag}.",
|
||||||
|
"draft": False,
|
||||||
|
"prerelease": False
|
||||||
|
}
|
||||||
|
req = urllib.request.Request(url, data=json.dumps(payload).encode("utf-8"), headers=headers, method="POST")
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(req) as resp:
|
||||||
|
created = json.loads(resp.read().decode("utf-8"))
|
||||||
|
print(f"[+] Created release {tag} (ID: {created['id']})")
|
||||||
|
return created["id"]
|
||||||
|
except urllib.error.HTTPError as e:
|
||||||
|
print(f"[*] Release creation returned HTTP {e.code}. Checking if peer runner created it concurrently...")
|
||||||
|
for attempt in range(1, 6):
|
||||||
|
time.sleep(2)
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(check_req) as resp:
|
||||||
|
existing = json.loads(resp.read().decode("utf-8"))
|
||||||
|
print(f"[+] Retrieved peer-created release for tag {tag} (ID: {existing['id']})")
|
||||||
|
return existing["id"]
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
raise
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser = argparse.ArgumentParser(description="Upload LOGAR compiled binaries directly to Gitea Release")
|
||||||
|
parser.add_argument("--tag", default=os.environ.get("GITEA_REF_NAME"), help="Release tag name (e.g. v1.0.1)")
|
||||||
|
parser.add_argument("--token", default=os.environ.get("GITEA_TOKEN"), help="Gitea Personal Access Token (or set GITEA_TOKEN env var)")
|
||||||
|
parser.add_argument("--url", default=DEFAULT_GITEA_URL, help="Base Gitea instance URL")
|
||||||
|
parser.add_argument("--repo", default=DEFAULT_REPO, help="Repository owner/name")
|
||||||
|
parser.add_argument("--title", default=os.environ.get("RELEASE_TITLE"), help="Release title")
|
||||||
|
parser.add_argument("--notes", default=os.environ.get("RELEASE_NOTES"), help="Release description / notes")
|
||||||
|
parser.add_argument("--notes-file", default=None, help="Path to markdown file with release notes")
|
||||||
|
parser.add_argument("--skip-build", action="store_true", help="Skip running package_dist.py before upload")
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
tag = args.tag
|
||||||
|
if not tag:
|
||||||
|
tag = input("Enter tag name (e.g. v1.0.1): ").strip()
|
||||||
|
|
||||||
|
token = args.token
|
||||||
|
if not token:
|
||||||
|
token = input("Enter Gitea Token: ").strip()
|
||||||
|
|
||||||
|
if not tag or not token:
|
||||||
|
print("[!] Tag and Token are required.")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
# Resolve release notes
|
||||||
|
notes = args.notes
|
||||||
|
if not notes and args.notes_file and os.path.exists(args.notes_file):
|
||||||
|
with open(args.notes_file, "r", encoding="utf-8") as nf:
|
||||||
|
notes = nf.read()
|
||||||
|
elif not notes and os.path.exists(os.path.join(ROOT_DIR, "RELEASE_NOTES.md")):
|
||||||
|
with open(os.path.join(ROOT_DIR, "RELEASE_NOTES.md"), "r", encoding="utf-8") as nf:
|
||||||
|
notes = nf.read()
|
||||||
|
elif not notes:
|
||||||
|
notes = (
|
||||||
|
f"## LOGAR Release {tag}\n\n"
|
||||||
|
"### Changes in this Release:\n"
|
||||||
|
"- **Dual Platform Gitea Release Automation**: Added dedicated Windows (`release-windows.yml`) and Linux (`release-linux.yml`) Gitea Actions to compile native executables and publish assets concurrently.\n"
|
||||||
|
"- **Dedicated SHA-256 Checksums**: Release assets now include dedicated checksum files matching `[win/linux]_[client/agent]_sha256sum` (e.g., `win_client_sha256sum`, `win_agent_sha256sum`, `win_server_sha256sum`, `linux_client_sha256sum`, `linux_agent_sha256sum`, `linux_server_sha256sum`).\n"
|
||||||
|
"- **Removed Client Filter Logic**: Removed restrictive source-level noise filtering on edge forwarders. Clients now stream all candidate events from `INFO` up to `ERROR` across the lookback window instead of discarding them at the source.\n"
|
||||||
|
"- **State Tracking & Deduplication**: Added persistent state tracking (`client_state.json`) with cursor and record number deduplication so previously transmitted events are never resent.\n"
|
||||||
|
"- **24-Hour Lookback Window**: Forwarders now scan and upload events from the last 24 hours, skipping older entries.\n"
|
||||||
|
"- **Lightweight Distribution Structure**: Cleaned `out/` to strictly contain deployment documentation and sample configurations.\n"
|
||||||
|
"- **Automated Gitea CI/CD**: Integrated push testing workflow (`ci.yml`) and automated release asset packaging.\n"
|
||||||
|
)
|
||||||
|
|
||||||
|
title = args.title or f"LOGAR Release {tag}"
|
||||||
|
|
||||||
|
if not args.skip_build:
|
||||||
|
print("[*] Assembling compiled binaries...")
|
||||||
|
package_dist.main()
|
||||||
|
|
||||||
|
dist_dir = os.path.join(ROOT_DIR, "dist")
|
||||||
|
if not os.path.exists(dist_dir) or not os.listdir(dist_dir):
|
||||||
|
print(f"[!] No binaries found in {dist_dir}. Run package_dist.py first.")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
print(f"[*] Connecting to Gitea: {args.url} (repo: {args.repo})...")
|
||||||
|
release_id = create_or_get_release(args.url, args.repo, tag, token, title=title, notes=notes)
|
||||||
|
|
||||||
|
print(f"[*] Uploading binary assets from '{dist_dir}'...")
|
||||||
|
for f in sorted(os.listdir(dist_dir)):
|
||||||
|
fpath = os.path.join(dist_dir, f)
|
||||||
|
if os.path.isfile(fpath):
|
||||||
|
upload_file_to_release(args.url, args.repo, release_id, token, fpath)
|
||||||
|
|
||||||
|
print(f"\n[+] Release successfully published with binary assets: {args.url}/{args.repo}/releases/tag/{tag}")
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -1,194 +0,0 @@
|
|||||||
import os
|
|
||||||
import sys
|
|
||||||
import json
|
|
||||||
import socket
|
|
||||||
import struct
|
|
||||||
import argparse
|
|
||||||
import subprocess
|
|
||||||
import warnings
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
|
|
||||||
# Suppress cryptography / pgpy deprecation notices
|
|
||||||
warnings.filterwarnings("ignore")
|
|
||||||
|
|
||||||
import pgpy
|
|
||||||
|
|
||||||
CONFIG_FILE_NAME = "client_config.json"
|
|
||||||
|
|
||||||
|
|
||||||
def load_config(config_path: str = CONFIG_FILE_NAME):
|
|
||||||
if not os.path.exists(config_path):
|
|
||||||
raise FileNotFoundError(
|
|
||||||
f"Client configuration file not found at: {config_path}\n"
|
|
||||||
f"Generate one from the server using: python Server.py --create-client-config --client-out {config_path}"
|
|
||||||
)
|
|
||||||
with open(config_path, "r", encoding="utf-8") as f:
|
|
||||||
return json.load(f)
|
|
||||||
|
|
||||||
|
|
||||||
def get_machine_identifier() -> str:
|
|
||||||
"""
|
|
||||||
Returns the hostname of the machine sending the logs,
|
|
||||||
and appends the network/DNS domain if available.
|
|
||||||
"""
|
|
||||||
fqdn = socket.getfqdn()
|
|
||||||
if fqdn and "." in fqdn and not fqdn.startswith("localhost"):
|
|
||||||
return fqdn
|
|
||||||
|
|
||||||
hostname = socket.gethostname()
|
|
||||||
|
|
||||||
try:
|
|
||||||
if os.path.exists("/etc/resolv.conf"):
|
|
||||||
with open("/etc/resolv.conf", "r", encoding="utf-8") as f:
|
|
||||||
for line in f:
|
|
||||||
parts = line.strip().split()
|
|
||||||
if parts and parts[0] in ["domain", "search"] and len(parts) > 1:
|
|
||||||
domain = parts[1]
|
|
||||||
if domain and not domain.startswith("."):
|
|
||||||
return f"{hostname}.{domain}"
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
try:
|
|
||||||
host_ip = socket.gethostbyname(hostname)
|
|
||||||
canonical_name = socket.gethostbyaddr(host_ip)[0]
|
|
||||||
if canonical_name and "." in canonical_name and not canonical_name.startswith("localhost"):
|
|
||||||
return canonical_name
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return hostname
|
|
||||||
|
|
||||||
|
|
||||||
def get_recent_linux_logs(hours: int = 6):
|
|
||||||
"""
|
|
||||||
Collects warnings and errors from systemd journalctl over the lookback window.
|
|
||||||
Edge Thinness: Drops INFO and DEBUG entries at the source.
|
|
||||||
"""
|
|
||||||
cmd = ["journalctl", "--since", f"{hours} hours ago", "-p", "warning", "--output=json"]
|
|
||||||
try:
|
|
||||||
result = subprocess.run(cmd, capture_output=True, text=True, check=False)
|
|
||||||
except FileNotFoundError:
|
|
||||||
print("[!] journalctl command not found. Ensure this script runs on a systemd-enabled Linux system.")
|
|
||||||
return []
|
|
||||||
except Exception as e:
|
|
||||||
print(f"[!] Error running journalctl: {e}")
|
|
||||||
return []
|
|
||||||
|
|
||||||
logs = []
|
|
||||||
machine_id = get_machine_identifier()
|
|
||||||
|
|
||||||
for line in result.stdout.splitlines():
|
|
||||||
line_str = line.strip()
|
|
||||||
if not line_str:
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
entry = json.loads(line_str)
|
|
||||||
priority = str(entry.get("PRIORITY", "4"))
|
|
||||||
if int(priority) > 4:
|
|
||||||
continue
|
|
||||||
|
|
||||||
sev = "WARNING" if priority == "4" else "ERROR"
|
|
||||||
logs.append({
|
|
||||||
"server": machine_id,
|
|
||||||
"os_type": "linux",
|
|
||||||
"signature": entry.get("SYSLOG_IDENTIFIER", "unknown"),
|
|
||||||
"severity": sev,
|
|
||||||
"message": entry.get("MESSAGE", "")[:2048]
|
|
||||||
})
|
|
||||||
except (json.JSONDecodeError, ValueError):
|
|
||||||
continue
|
|
||||||
|
|
||||||
return logs
|
|
||||||
|
|
||||||
|
|
||||||
def send_encrypted_logs_over_socket(config: dict, logs: list):
|
|
||||||
"""
|
|
||||||
Encrypts the payload using the server's OpenPGP public key and streams
|
|
||||||
over an authenticated TCP socket. Zero local state is maintained on the client.
|
|
||||||
"""
|
|
||||||
server_host = config["server_host"]
|
|
||||||
server_port = int(config["server_port"])
|
|
||||||
auth_token = config["auth_token"]
|
|
||||||
pub_key_armored = config["server_public_key"]
|
|
||||||
expected_fp = config.get("server_fingerprint", "").replace(" ", "").upper()
|
|
||||||
|
|
||||||
pub_key, _ = pgpy.PGPKey.from_blob(pub_key_armored)
|
|
||||||
actual_fp = str(pub_key.fingerprint).replace(" ", "").upper()
|
|
||||||
if expected_fp and actual_fp != expected_fp:
|
|
||||||
raise ValueError(
|
|
||||||
f"Server fingerprint mismatch! Expected {expected_fp}, but key has {actual_fp}."
|
|
||||||
)
|
|
||||||
|
|
||||||
machine_id = get_machine_identifier()
|
|
||||||
|
|
||||||
payload = {
|
|
||||||
"server": machine_id,
|
|
||||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
|
||||||
"logs": logs
|
|
||||||
}
|
|
||||||
payload_json = json.dumps(payload)
|
|
||||||
|
|
||||||
pgp_msg = pgpy.PGPMessage.new(payload_json)
|
|
||||||
encrypted_msg = pub_key.encrypt(pgp_msg)
|
|
||||||
encrypted_armored = str(encrypted_msg)
|
|
||||||
|
|
||||||
envelope = {
|
|
||||||
"auth_token": auth_token,
|
|
||||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
|
||||||
"encrypted_payload": encrypted_armored
|
|
||||||
}
|
|
||||||
envelope_bytes = json.dumps(envelope).encode("utf-8")
|
|
||||||
|
|
||||||
print(f"[*] Connecting to LOGAR server at {server_host}:{server_port} over secure TCP socket...")
|
|
||||||
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
|
|
||||||
sock.settimeout(15.0)
|
|
||||||
sock.connect((server_host, server_port))
|
|
||||||
|
|
||||||
frame = struct.pack(">I", len(envelope_bytes)) + envelope_bytes
|
|
||||||
sock.sendall(frame)
|
|
||||||
|
|
||||||
resp_len_bytes = sock.recv(4)
|
|
||||||
if not resp_len_bytes:
|
|
||||||
raise ConnectionError("Server closed connection without response.")
|
|
||||||
|
|
||||||
resp_len = struct.unpack(">I", resp_len_bytes)[0]
|
|
||||||
resp_bytes = bytearray()
|
|
||||||
while len(resp_bytes) < resp_len:
|
|
||||||
chunk = sock.recv(min(4096, resp_len - len(resp_bytes)))
|
|
||||||
if not chunk:
|
|
||||||
break
|
|
||||||
resp_bytes.extend(chunk)
|
|
||||||
|
|
||||||
response = json.loads(resp_bytes.decode("utf-8"))
|
|
||||||
print(f"[+] Server response: {response}")
|
|
||||||
return response
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
parser = argparse.ArgumentParser(description="LOGAR Linux Edge Log Forwarder (Zero State)")
|
|
||||||
parser.add_argument("--config", default=CONFIG_FILE_NAME, help="Path to client_config.json")
|
|
||||||
parser.add_argument("--hours", type=int, default=6, help="Lookback window in hours for journalctl logs")
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
try:
|
|
||||||
config = load_config(args.config)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"[!] Configuration error: {e}")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
machine_id = get_machine_identifier()
|
|
||||||
print(f"[*] Edge Forwarder Node: {machine_id}")
|
|
||||||
print(f"[*] Scanning Linux journalctl for candidate anomalies (last {args.hours} hours)...")
|
|
||||||
candidate_logs = get_recent_linux_logs(hours=args.hours)
|
|
||||||
print(f"[*] Found {len(candidate_logs)} candidate anomalies (noise stripped at source).")
|
|
||||||
|
|
||||||
try:
|
|
||||||
send_encrypted_logs_over_socket(config, candidate_logs)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"[!] Failed to stream logs to server: {e}")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
+112
-25
@@ -1,50 +1,111 @@
|
|||||||
# LOGAR Linux Edge Forwarder
|
# LOGAR Linux Edge Forwarder
|
||||||
|
|
||||||
Lightweight edge log forwarder for Linux servers running systemd.
|
Standalone compiled binary distribution for Linux edge servers running systemd.
|
||||||
|
|
||||||
## Features
|
---
|
||||||
- **Zero Local State**: No local SQLite database or state tracking on the edge server.
|
|
||||||
- **Edge Noise Stripping**: Strips conversational/informational noise (`INFO`, `DEBUG`) directly at the source via `journalctl -p warning`.
|
## Overview
|
||||||
- **End-to-End OpenPGP Encryption**: Encrypts logs using the server's public key; decrypted exclusively on the cloud hub.
|
`Linux_Client.bin` is a self-contained, pre-compiled executable that queries `systemd-journald` via `journalctl`, filters logs directly at the source, encrypts the payload using OpenPGP, and streams candidate events over an authenticated TCP socket to the central LOGAR hub.
|
||||||
- **Authenticated TCP Socket**: Direct, low-overhead TCP streaming with token authentication.
|
|
||||||
- **No GPG Binary Required**: Pure-Python implementation (`pgpy` + `cryptography`).
|
### Key Capabilities
|
||||||
|
- **Pre-compiled & Dependency-Free**: Ships as a standalone executable binary (`Linux_Client.bin`). No Python environment, pip packages, or GnuPG binaries are required on the host.
|
||||||
|
- **Source-Level Filtering**: Retains events spanning `INFO`, `WARNING`, and `ERROR` (`journalctl -p info`). Drops debug noise (priority 7) and skips events older than 24 hours.
|
||||||
|
- **State Tracking & Deduplication**: Maintains persistent client state in `client_state.json` (tracking systemd journalctl cursors and microsecond timestamps) so every log record is forwarded exactly once without duplicates.
|
||||||
|
- **Fail-Safe State Commit**: State is committed only when the server returns a verified `success` response. In the event of a network outage, state remains unchanged and unsent events are retried automatically on the next run.
|
||||||
|
- **End-to-End Encryption**: Encrypts payloads using the server's OpenPGP public key before transmission.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. Generating & Deploying the Configuration File
|
||||||
|
|
||||||
|
### Step 1: Generate `client_config.json` on the Server
|
||||||
|
Run the following command on your central LOGAR server to export a client bundle tailored for your environment:
|
||||||
|
|
||||||
## Installation
|
|
||||||
```bash
|
```bash
|
||||||
python3 -m pip install -r requirements.txt
|
python src/Server.py --create-client-config --server-host <SERVER_IP_OR_DNS> --server-port 9443 --client-out client_config.json
|
||||||
```
|
```
|
||||||
|
|
||||||
## Configuration
|
- Replace `<SERVER_IP_OR_DNS>` with the reachable IP address or FQDN of your central LOGAR server hub.
|
||||||
Place `client_config.json` generated by the server (`Server.py --create-client-config`) in the same directory as `Linux_Client.py`.
|
- Default TCP port is `9443`.
|
||||||
|
|
||||||
## Running the Forwarder
|
### Step 2: Configuration Structure
|
||||||
```bash
|
The generated `client_config.json` contains:
|
||||||
python3 Linux_Client.py --hours 6
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"server_host": "192.168.1.100",
|
||||||
|
"server_port": 9443,
|
||||||
|
"server_fingerprint": "375388960531264EA0648EC0D2C4E4ABC6F22AC2",
|
||||||
|
"server_public_key": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n...",
|
||||||
|
"auth_token": "a1b2c3d4e5f6..."
|
||||||
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## Cron / Systemd Timer Deployment
|
> [!NOTE]
|
||||||
### Option A: Cron Job (Every 3 hours)
|
> A reference example is provided in `client_config.sample.json`. The configuration file contains **no host-specific names or site names** to ensure client anonymity and easy redistribution.
|
||||||
|
|
||||||
|
### Step 3: Copy to Edge Node
|
||||||
|
Place `Linux_Client.bin` and `client_config.json` into the target directory (recommended: `/opt/logar/`):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
0 */3 * * * cd /opt/logar && /usr/bin/python3 Linux_Client.py --hours 6 >> /var/log/logar_client.log 2>&1
|
sudo mkdir -p /opt/logar
|
||||||
|
sudo cp Linux_Client.bin client_config.json /opt/logar/
|
||||||
|
sudo chmod +x /opt/logar/Linux_Client.bin
|
||||||
```
|
```
|
||||||
|
|
||||||
### Option B: Systemd Service & Timer
|
---
|
||||||
1. Create `/etc/systemd/system/logar-forwarder.service`:
|
|
||||||
|
## 2. Running Manually
|
||||||
|
|
||||||
|
Test the forwarder interactively:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /opt/logar
|
||||||
|
./Linux_Client.bin --hours 24
|
||||||
|
```
|
||||||
|
|
||||||
|
### Command-Line Arguments
|
||||||
|
| Argument | Default | Description |
|
||||||
|
| :--- | :--- | :--- |
|
||||||
|
| `--config` | `client_config.json` | Path to client configuration file |
|
||||||
|
| `--hours` | `24` | Lookback window in hours for journal logs |
|
||||||
|
| `--state-file` | `client_state.json` | Path to persistent state file |
|
||||||
|
| `--no-state` | `False` | Disable state tracking and send all events matching lookback window |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. Installing as a Systemd Service & Timer (Recommended)
|
||||||
|
|
||||||
|
Running `Linux_Client.bin` via a systemd timer ensures reliable periodic execution, automatic restart, and native log integration with `journalctl`.
|
||||||
|
|
||||||
|
### Step 1: Create the Systemd Service Unit
|
||||||
|
Create `/etc/systemd/system/logar-forwarder.service`:
|
||||||
|
|
||||||
```ini
|
```ini
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=LOGAR Edge Forwarder
|
Description=LOGAR Edge Log Forwarder
|
||||||
After=network.target
|
After=network-online.target
|
||||||
|
Wants=network-online.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
WorkingDirectory=/opt/logar
|
WorkingDirectory=/opt/logar
|
||||||
ExecStart=/usr/bin/python3 /opt/logar/Linux_Client.py --hours 6
|
ExecStart=/opt/logar/Linux_Client.bin --hours 24
|
||||||
|
User=root
|
||||||
|
StandardOutput=journal
|
||||||
|
StandardError=journal
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
```
|
```
|
||||||
|
|
||||||
2. Create `/etc/systemd/system/logar-forwarder.timer`:
|
### Step 2: Create the Systemd Timer Unit
|
||||||
|
Create `/etc/systemd/system/logar-forwarder.timer` to execute the forwarder every 3 hours (with a 5-minute initial delay upon boot):
|
||||||
|
|
||||||
```ini
|
```ini
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Run LOGAR Edge Forwarder every 3 hours
|
Description=Run LOGAR Edge Forwarder periodically
|
||||||
|
Requires=logar-forwarder.service
|
||||||
|
|
||||||
[Timer]
|
[Timer]
|
||||||
OnBootSec=5min
|
OnBootSec=5min
|
||||||
@@ -55,8 +116,34 @@ Persistent=true
|
|||||||
WantedBy=timers.target
|
WantedBy=timers.target
|
||||||
```
|
```
|
||||||
|
|
||||||
3. Enable and start:
|
### Step 3: Enable and Start the Timer
|
||||||
```bash
|
```bash
|
||||||
sudo systemctl daemon-reload
|
sudo systemctl daemon-reload
|
||||||
sudo systemctl enable --now logar-forwarder.timer
|
sudo systemctl enable --now logar-forwarder.timer
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Step 4: Verify Timer & Service Status
|
||||||
|
```bash
|
||||||
|
# Check timer schedule
|
||||||
|
sudo systemctl list-timers --all | grep logar
|
||||||
|
|
||||||
|
# Trigger an immediate manual execution
|
||||||
|
sudo systemctl start logar-forwarder.service
|
||||||
|
|
||||||
|
# View execution logs
|
||||||
|
sudo journalctl -u logar-forwarder.service -n 50
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. Alternative: Cron Job Deployment
|
||||||
|
|
||||||
|
If systemd timers are not preferred, configure a periodic cron job running every 3 hours:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Open root crontab
|
||||||
|
sudo crontab -e
|
||||||
|
|
||||||
|
# Add the following entry:
|
||||||
|
0 */3 * * * cd /opt/logar && ./Linux_Client.bin --hours 24 >> /var/log/logar_forwarder.log 2>&1
|
||||||
|
```
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# Build script to compile Linux_Client into a standalone native ELF binary on Linux
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "[*] Installing build requirements..."
|
|
||||||
pip3 install pyinstaller pgpy cryptography standard-imghdr
|
|
||||||
|
|
||||||
echo "[*] Compiling Linux_Client native binary..."
|
|
||||||
pyinstaller --onefile --clean --name Linux_Client.bin Linux_Client.py
|
|
||||||
|
|
||||||
echo "[+] Compilation successful: dist/Linux_Client.bin"
|
|
||||||
@@ -3,6 +3,5 @@
|
|||||||
"server_port": 9443,
|
"server_port": 9443,
|
||||||
"server_fingerprint": "PASTE_SERVER_FINGERPRINT_HERE",
|
"server_fingerprint": "PASTE_SERVER_FINGERPRINT_HERE",
|
||||||
"server_public_key": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n...\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
"server_public_key": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n...\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
||||||
"auth_token": "PASTE_AUTH_TOKEN_HERE",
|
"auth_token": "PASTE_AUTH_TOKEN_HERE"
|
||||||
"site_name": "Frankfurt-DC"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
pgpy>=0.6.0
|
|
||||||
standard-imghdr>=3.13.0; python_version >= "3.13"
|
|
||||||
cryptography>=42.0.0
|
|
||||||
@@ -1,107 +0,0 @@
|
|||||||
import os
|
|
||||||
import sys
|
|
||||||
import json
|
|
||||||
import struct
|
|
||||||
import unittest
|
|
||||||
import warnings
|
|
||||||
|
|
||||||
warnings.filterwarnings("ignore")
|
|
||||||
|
|
||||||
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
|
||||||
|
|
||||||
import Linux_Client
|
|
||||||
import pgpy
|
|
||||||
from pgpy.constants import PubKeyAlgorithm, KeyFlags, HashAlgorithm, SymmetricKeyAlgorithm, CompressionAlgorithm
|
|
||||||
|
|
||||||
|
|
||||||
class TestLinuxClientComponent(unittest.TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
self.dummy_config = "test_linux_client_config.json"
|
|
||||||
# Generate dummy PGP key for testing
|
|
||||||
key = pgpy.PGPKey.new(PubKeyAlgorithm.RSAEncryptOrSign, 2048)
|
|
||||||
uid = pgpy.PGPUID.new("TestHub")
|
|
||||||
key.add_uid(
|
|
||||||
uid,
|
|
||||||
usage={KeyFlags.EncryptCommunications, KeyFlags.EncryptStorage},
|
|
||||||
hashes=[HashAlgorithm.SHA256],
|
|
||||||
ciphers=[SymmetricKeyAlgorithm.AES256],
|
|
||||||
compression=[CompressionAlgorithm.Uncompressed]
|
|
||||||
)
|
|
||||||
self.server_priv = key
|
|
||||||
self.server_pub = key.pubkey
|
|
||||||
self.fingerprint = str(key.pubkey.fingerprint)
|
|
||||||
|
|
||||||
with open(self.dummy_config, "w", encoding="utf-8") as f:
|
|
||||||
json.dump({
|
|
||||||
"server_host": "127.0.0.1",
|
|
||||||
"server_port": 9443,
|
|
||||||
"server_fingerprint": self.fingerprint,
|
|
||||||
"server_public_key": str(self.server_pub),
|
|
||||||
"auth_token": "secret-test-token"
|
|
||||||
}, f)
|
|
||||||
|
|
||||||
def tearDown(self):
|
|
||||||
if os.path.exists(self.dummy_config):
|
|
||||||
try:
|
|
||||||
os.remove(self.dummy_config)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def test_client_config_anonymity(self):
|
|
||||||
config = Linux_Client.load_config(self.dummy_config)
|
|
||||||
self.assertNotIn("server_name", config)
|
|
||||||
self.assertNotIn("name", config)
|
|
||||||
self.assertNotIn("site_name", config)
|
|
||||||
self.assertEqual(config["server_fingerprint"], self.fingerprint)
|
|
||||||
|
|
||||||
def test_get_machine_identifier(self):
|
|
||||||
machine_id = Linux_Client.get_machine_identifier()
|
|
||||||
self.assertIsInstance(machine_id, str)
|
|
||||||
self.assertGreater(len(machine_id), 0)
|
|
||||||
self.assertNotEqual(machine_id, "localhost")
|
|
||||||
|
|
||||||
def test_journalctl_parsing_and_priority_filter(self):
|
|
||||||
sample_journal_lines = [
|
|
||||||
json.dumps({"PRIORITY": "3", "SYSLOG_IDENTIFIER": "sshd", "MESSAGE": "Failed password for root"}),
|
|
||||||
json.dumps({"PRIORITY": "4", "SYSLOG_IDENTIFIER": "systemd", "MESSAGE": "Unit entered failed state"}),
|
|
||||||
json.dumps({"PRIORITY": "6", "SYSLOG_IDENTIFIER": "cron", "MESSAGE": "Informational session opened"}),
|
|
||||||
]
|
|
||||||
logs = []
|
|
||||||
machine_id = Linux_Client.get_machine_identifier()
|
|
||||||
for line_str in sample_journal_lines:
|
|
||||||
entry = json.loads(line_str)
|
|
||||||
priority = str(entry.get("PRIORITY", "4"))
|
|
||||||
if int(priority) > 4:
|
|
||||||
continue
|
|
||||||
sev = "WARNING" if priority == "4" else "ERROR"
|
|
||||||
logs.append({
|
|
||||||
"server": machine_id,
|
|
||||||
"os_type": "linux",
|
|
||||||
"signature": entry.get("SYSLOG_IDENTIFIER", "unknown"),
|
|
||||||
"severity": sev,
|
|
||||||
"message": entry.get("MESSAGE", "")
|
|
||||||
})
|
|
||||||
|
|
||||||
# Priority 6 must be stripped (INFO noise)
|
|
||||||
self.assertEqual(len(logs), 2)
|
|
||||||
self.assertEqual(logs[0]["severity"], "ERROR")
|
|
||||||
self.assertEqual(logs[1]["severity"], "WARNING")
|
|
||||||
|
|
||||||
def test_encryption_and_decryption(self):
|
|
||||||
config = Linux_Client.load_config(self.dummy_config)
|
|
||||||
pub_key, _ = pgpy.PGPKey.from_blob(config["server_public_key"])
|
|
||||||
payload = {
|
|
||||||
"server": Linux_Client.get_machine_identifier(),
|
|
||||||
"logs": [{"signature": "kernel", "severity": "ERROR", "message": "Kernel panic - not syncing"}]
|
|
||||||
}
|
|
||||||
msg = pgpy.PGPMessage.new(json.dumps(payload))
|
|
||||||
enc = pub_key.encrypt(msg)
|
|
||||||
self.assertTrue(str(enc).startswith("-----BEGIN PGP MESSAGE-----"))
|
|
||||||
|
|
||||||
dec = self.server_priv.decrypt(enc)
|
|
||||||
restored = json.loads(dec.message)
|
|
||||||
self.assertEqual(restored["logs"][0]["signature"], "kernel")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
@@ -0,0 +1,208 @@
|
|||||||
|
# LOGAR Linux Server Hub
|
||||||
|
|
||||||
|
Standalone compiled executable binary distribution for Linux server environments (`Server.bin`).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
`Server.bin` is a self-contained, pre-compiled Linux ELF executable that operates as the central coordination and log analysis hub of the LOGAR telemetry architecture.
|
||||||
|
|
||||||
|
### Key Architecture & Capabilities
|
||||||
|
- **Pre-compiled & Dependency-Free**: Ships as a standalone native Linux ELF binary (`Server.bin`). No Python runtime, pip dependencies, or GnuPG binaries are required on the host system.
|
||||||
|
- **Authenticated TCP Ingestion Socket (Port 9443)**: Accepts framed OpenPGP encrypted log batches streamed by edge forwarders (`Linux_Client.bin` and `Win_Client.exe`).
|
||||||
|
- **Warning Persistence & Immediate Error Routing**: High-severity `ERROR`, `CRITICAL`, and `FATAL` events are promoted to `VERIFIED` immediately on their first occurrence. Operational `WARNING` and `INFO` events are evaluated against an episodic threshold, requiring persistence across at least 4 distinct client transmission cycles within a sliding 12-hour evaluation window before promotion from transient noise to `VERIFIED`.
|
||||||
|
- **Embedded Hermes Reporting API (Port 8443)**: Integrated REST API exposing `/api/hermes/report` for external scrapers, SIEM collectors, and alerting dashboards.
|
||||||
|
- **Pure-Python OpenPGP Cryptography**: Zero dependency on external `gpg` binaries. Automatically generates RSA-2048 encryption keys and SHA-256 fingerprints on first launch.
|
||||||
|
- **State Database**: Tracks anomaly lifecycles, run counters, and machine telemetry in a local SQLite state database (`logar_state.db`).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. Initializing & Generating Server Configuration
|
||||||
|
|
||||||
|
### Step 1: Automatic First-Run Generation
|
||||||
|
When launched without an existing `server_config.json`, `Server.bin` automatically generates:
|
||||||
|
1. A fresh OpenPGP RSA-2048 encryption keypair (`private_key` and `public_key`).
|
||||||
|
2. A SHA-256 public encryption fingerprint (`server_fingerprint`).
|
||||||
|
3. A cryptographically random secret authentication token (`auth_token`).
|
||||||
|
4. Default network socket coordinates (TCP 9443, Hermes API 8443).
|
||||||
|
|
||||||
|
Run `Server.bin` once to initialize:
|
||||||
|
```bash
|
||||||
|
./Server.bin
|
||||||
|
```
|
||||||
|
Output:
|
||||||
|
```
|
||||||
|
[!] Config 'server_config.json' not found. Initializing first-run configuration...
|
||||||
|
[+] Successfully generated new server config and OpenPGP keypair.
|
||||||
|
[+] Server Encryption Fingerprint: 375388960531264EA0648EC0D2C4E4ABC6F22AC2
|
||||||
|
[+] Saved to: server_config.json
|
||||||
|
```
|
||||||
|
|
||||||
|
### Step 2: Configuration Fields Reference
|
||||||
|
The generated `server_config.json` contains:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"server_name": "LOGAR-Linux-Hub",
|
||||||
|
"tcp_host": "0.0.0.0",
|
||||||
|
"tcp_port": 9443,
|
||||||
|
"hermes_host": "0.0.0.0",
|
||||||
|
"hermes_port": 8443,
|
||||||
|
"auth_token": "a1b2c3d4e5f67890abcdef1234567890...",
|
||||||
|
"db_path": "logar_state.db",
|
||||||
|
"evaluation_window_hours": 12,
|
||||||
|
"min_persistence_runs": 4,
|
||||||
|
"server_fingerprint": "375388960531264EA0648EC0D2C4E4ABC6F22AC2",
|
||||||
|
"public_key": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n...",
|
||||||
|
"private_key": "-----BEGIN PGP PRIVATE KEY BLOCK-----\n..."
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Parameter | Default | Description |
|
||||||
|
| :--- | :--- | :--- |
|
||||||
|
| `server_name` | `"LOGAR-Linux-Hub"` | Human-readable identifier for this hub instance |
|
||||||
|
| `tcp_host` | `"0.0.0.0"` | Network interface to bind for edge client TCP ingestion |
|
||||||
|
| `tcp_port` | `9443` | TCP port for incoming edge log batches |
|
||||||
|
| `hermes_host` | `"0.0.0.0"` | Network interface to bind for Hermes HTTP API |
|
||||||
|
| `hermes_port` | `8443` | HTTP port for the Hermes reporting endpoint |
|
||||||
|
| `auth_token` | *(auto-generated)* | Pre-shared secret required in edge client envelopes |
|
||||||
|
| `db_path` | `"logar_state.db"` | Path to persistent SQLite issue database |
|
||||||
|
| `evaluation_window_hours` | `12` | Sliding temporal window for warning persistence |
|
||||||
|
| `min_persistence_runs` | `4` | Number of distinct runs required to promote warnings to `VERIFIED` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. Generating Client Configuration Bundles
|
||||||
|
|
||||||
|
Edge forwarders (`Linux_Client.bin` and `Win_Client.exe`) require a minimal, anonymous configuration bundle containing socket coordinates, the authentication token, and the server's public key (without sensitive server names or private keys).
|
||||||
|
|
||||||
|
Run the following command on the server:
|
||||||
|
```bash
|
||||||
|
./Server.bin --create-client-config --server-host <SERVER_PUBLIC_OR_INTERNAL_IP> --server-port 9443 --client-out client_config.json
|
||||||
|
```
|
||||||
|
|
||||||
|
- Replace `<SERVER_PUBLIC_OR_INTERNAL_IP>` with the reachable IP or FQDN of your LOGAR server.
|
||||||
|
- The output `client_config.json` can be distributed directly to Linux and Windows edge forwarder nodes.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. Running Interactively
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./Server.bin --config /path/to/server_config.json
|
||||||
|
```
|
||||||
|
|
||||||
|
### Command-Line Arguments
|
||||||
|
| Argument | Description |
|
||||||
|
| :--- | :--- |
|
||||||
|
| `--config` | Path to server configuration JSON file (default: `server_config.json`) |
|
||||||
|
| `--create-client-config` | Exports an anonymous client configuration bundle and exits |
|
||||||
|
| `--server-host` | Hostname/IP to embed in the exported client configuration |
|
||||||
|
| `--server-port` | Port to embed in the exported client configuration (default: `9443`) |
|
||||||
|
| `--client-out` | Destination path for exported client configuration (default: `client_config.json`) |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. Installing as a Systemd Service (Recommended)
|
||||||
|
|
||||||
|
Running `Server.bin` as a native systemd background service ensures continuous execution, automatic restart upon reboot or crash, and centralized log management via `journalctl`.
|
||||||
|
|
||||||
|
### Step 1: Create Deployment Directory and User
|
||||||
|
```bash
|
||||||
|
# Create dedicated system group and user
|
||||||
|
sudo useradd --system --no-create-home --shell /usr/sbin/nologin logar
|
||||||
|
|
||||||
|
# Prepare deployment folder
|
||||||
|
sudo mkdir -p /opt/logar-server
|
||||||
|
sudo cp Server.bin server_config.json /opt/logar-server/
|
||||||
|
sudo chmod +x /opt/logar-server/Server.bin
|
||||||
|
sudo chown -R logar:logar /opt/logar-server
|
||||||
|
```
|
||||||
|
|
||||||
|
### Step 2: Create Systemd Service File
|
||||||
|
Create `/etc/systemd/system/logar-server.service`:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[Unit]
|
||||||
|
Description=LOGAR Central Server Hub Service
|
||||||
|
After=network-online.target
|
||||||
|
Wants=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=logar
|
||||||
|
Group=logar
|
||||||
|
WorkingDirectory=/opt/logar-server
|
||||||
|
ExecStart=/opt/logar-server/Server.bin --config /opt/logar-server/server_config.json
|
||||||
|
Restart=always
|
||||||
|
RestartSec=5
|
||||||
|
LimitNOFILE=65536
|
||||||
|
StandardOutput=journal
|
||||||
|
StandardError=journal
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
```
|
||||||
|
|
||||||
|
### Step 3: Enable and Start Service
|
||||||
|
```bash
|
||||||
|
sudo systemctl daemon-reload
|
||||||
|
sudo systemctl enable --now logar-server.service
|
||||||
|
```
|
||||||
|
|
||||||
|
### Step 4: Verify Status and Inspect Logs
|
||||||
|
```bash
|
||||||
|
# Check service status
|
||||||
|
sudo systemctl status logar-server.service
|
||||||
|
|
||||||
|
# Stream live server logs
|
||||||
|
sudo journalctl -u logar-server.service -f
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. Hermes Reporting API & Integration
|
||||||
|
|
||||||
|
The server embeds a high-performance HTTP service on port `8443` providing real-time intelligence on promoted anomalies:
|
||||||
|
|
||||||
|
### Fetching Promoted Anomalies
|
||||||
|
```bash
|
||||||
|
curl -s http://127.0.0.1:8443/api/hermes/report | jq .
|
||||||
|
```
|
||||||
|
|
||||||
|
### Response Schema:
|
||||||
|
```json
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"fingerprint": "prod-web-01.corp.internal:Out_Of_Memory",
|
||||||
|
"server": "prod-web-01.corp.internal",
|
||||||
|
"signature": "Out_Of_Memory",
|
||||||
|
"consecutive_runs": 4,
|
||||||
|
"first_seen": "2026-09-04T08:00:00Z",
|
||||||
|
"last_seen": "2026-09-04T14:30:00Z",
|
||||||
|
"status": "VERIFIED",
|
||||||
|
"verified": true,
|
||||||
|
"os_type": "linux",
|
||||||
|
"sample_message": "kernel: Out of memory: Kill process 1824"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. Firewall Configuration
|
||||||
|
|
||||||
|
Ensure the following inbound ports are open on your host firewall:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# UFW (Ubuntu / Debian)
|
||||||
|
sudo ufw allow 9443/tcp comment "LOGAR TCP Log Ingestion"
|
||||||
|
sudo ufw allow 8443/tcp comment "LOGAR Hermes Reporting API"
|
||||||
|
sudo ufw reload
|
||||||
|
|
||||||
|
# Firewalld (RHEL / CentOS / Rocky / Alma)
|
||||||
|
sudo firewall-cmd --permanent --add-port=9443/tcp
|
||||||
|
sudo firewall-cmd --permanent --add-port=8443/tcp
|
||||||
|
sudo firewall-cmd --reload
|
||||||
|
```
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"server_name": "LOGAR-Linux-Hub",
|
||||||
|
"tcp_host": "0.0.0.0",
|
||||||
|
"tcp_port": 9443,
|
||||||
|
"hermes_host": "0.0.0.0",
|
||||||
|
"hermes_port": 8443,
|
||||||
|
"auth_token": "replace_with_secure_random_hex_token",
|
||||||
|
"db_path": "logar_state.db",
|
||||||
|
"evaluation_window_hours": 12,
|
||||||
|
"min_persistence_runs": 4,
|
||||||
|
"server_fingerprint": "AUTO_GENERATED_ON_FIRST_RUN",
|
||||||
|
"public_key": "AUTO_GENERATED_ON_FIRST_RUN",
|
||||||
|
"private_key": "AUTO_GENERATED_ON_FIRST_RUN"
|
||||||
|
}
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
# LOGAR Server Hub
|
|
||||||
|
|
||||||
Central Python/TCP ingestion server for the LOGAR Log Analysis System.
|
|
||||||
|
|
||||||
## Features
|
|
||||||
- **Zero External GPG Requirement**: Uses pure-Python OpenPGP (`pgpy` + `cryptography`), no native GnuPG binary needed.
|
|
||||||
- **First-Run Key & Config Auto-generation**: Generates OpenPGP keypairs, auth tokens, and `server_config.json` automatically on first launch.
|
|
||||||
- **Client Config Exporter**: Generates `client_config.json` bundles containing the server's encryption-only fingerprint and address.
|
|
||||||
- **Cloud-Side Temporal Persistence**: SQLite database tracking candidate anomalies over 12-hour evaluation windows.
|
|
||||||
- **4-Run Persistence Rule**: Filters out transient infrastructure blips, promoting issues to `VERIFIED` anomalies only after persisting across $\ge 4$ runs.
|
|
||||||
- **Agentic Hermes Endpoint**: REST API (`GET /api/hermes/report`) providing verified system artifacts for Hermes agent alerts.
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
```bash
|
|
||||||
pip install -r requirements.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
## Running the Server
|
|
||||||
```bash
|
|
||||||
# Starts both the TCP socket listener (port 9443) and the Hermes API (port 8443)
|
|
||||||
python Server.py
|
|
||||||
```
|
|
||||||
|
|
||||||
## Generating Client Configurations
|
|
||||||
To deploy edge forwarders, generate a client config file:
|
|
||||||
```bash
|
|
||||||
python Server.py --create-client-config --server-host <SERVER_IP_OR_DNS> --server-port 9443 --site-name "Frankfurt-DC" --client-out client_config.json
|
|
||||||
```
|
|
||||||
Copy the generated `client_config.json` into the deployment directory of `Win_Client.py` or `Linux_Client.py`.
|
|
||||||
|
|
||||||
## Hermes Agent Integration
|
|
||||||
Hermes queries the verified anomalies via:
|
|
||||||
```
|
|
||||||
GET http://<SERVER_IP>:8443/api/hermes/report
|
|
||||||
```
|
|
||||||
Only issues meeting the 4-run persistence rule within the active 12-hour evaluation window are returned.
|
|
||||||
@@ -1,437 +0,0 @@
|
|||||||
# Copy of Server.py without site_name in client_config
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import json
|
|
||||||
import uuid
|
|
||||||
import struct
|
|
||||||
import socket
|
|
||||||
import sqlite3
|
|
||||||
import argparse
|
|
||||||
import asyncio
|
|
||||||
import secrets
|
|
||||||
import warnings
|
|
||||||
from datetime import datetime, timezone, timedelta
|
|
||||||
from typing import Dict, Any, List, Optional
|
|
||||||
|
|
||||||
# Suppress cryptography / pgpy deprecation notices for a clean terminal output
|
|
||||||
warnings.filterwarnings("ignore")
|
|
||||||
|
|
||||||
import pgpy
|
|
||||||
from pgpy.constants import (
|
|
||||||
PubKeyAlgorithm,
|
|
||||||
KeyFlags,
|
|
||||||
HashAlgorithm,
|
|
||||||
SymmetricKeyAlgorithm,
|
|
||||||
CompressionAlgorithm
|
|
||||||
)
|
|
||||||
from fastapi import FastAPI, HTTPException
|
|
||||||
import uvicorn
|
|
||||||
|
|
||||||
CONFIG_FILE_NAME = "server_config.json"
|
|
||||||
DEFAULT_DB_FILE = "logar_state.db"
|
|
||||||
EVALUATION_WINDOW_HOURS = 12
|
|
||||||
RUN_THRESHOLD = 4
|
|
||||||
|
|
||||||
app = FastAPI(title="LOGAR Cloud Ingestion & Hermes Hub", version="2.0.0")
|
|
||||||
|
|
||||||
SERVER_STATE: Dict[str, Any] = {}
|
|
||||||
|
|
||||||
|
|
||||||
def generate_server_keypair(server_name: str):
|
|
||||||
"""Generates an OpenPGP RSA 2048 key with encryption capability."""
|
|
||||||
key = pgpy.PGPKey.new(PubKeyAlgorithm.RSAEncryptOrSign, 2048)
|
|
||||||
uid = pgpy.PGPUID.new(server_name)
|
|
||||||
key.add_uid(
|
|
||||||
uid,
|
|
||||||
usage={KeyFlags.EncryptCommunications, KeyFlags.EncryptStorage},
|
|
||||||
hashes=[HashAlgorithm.SHA256],
|
|
||||||
ciphers=[SymmetricKeyAlgorithm.AES256],
|
|
||||||
compression=[CompressionAlgorithm.Uncompressed]
|
|
||||||
)
|
|
||||||
private_key_armored = str(key)
|
|
||||||
public_key_armored = str(key.pubkey)
|
|
||||||
fingerprint = str(key.pubkey.fingerprint)
|
|
||||||
return private_key_armored, public_key_armored, fingerprint
|
|
||||||
|
|
||||||
|
|
||||||
def load_or_init_config(config_path: str = CONFIG_FILE_NAME) -> Dict[str, Any]:
|
|
||||||
"""Loads existing server_config.json or creates a new one on first run."""
|
|
||||||
if os.path.exists(config_path):
|
|
||||||
print(f"[*] Loading server configuration from: {os.path.abspath(config_path)}")
|
|
||||||
with open(config_path, "r", encoding="utf-8") as f:
|
|
||||||
config = json.load(f)
|
|
||||||
return config
|
|
||||||
|
|
||||||
print(f"[!] Config '{config_path}' not found. Initializing first-run configuration...")
|
|
||||||
server_name = "LOGAR-Cloud-Hub"
|
|
||||||
private_key, public_key, fingerprint = generate_server_keypair(server_name)
|
|
||||||
auth_token = secrets.token_hex(24)
|
|
||||||
|
|
||||||
config = {
|
|
||||||
"server_name": server_name,
|
|
||||||
"tcp_host": "0.0.0.0",
|
|
||||||
"tcp_port": 9443,
|
|
||||||
"hermes_host": "0.0.0.0",
|
|
||||||
"hermes_port": 8443,
|
|
||||||
"auth_token": auth_token,
|
|
||||||
"db_path": DEFAULT_DB_FILE,
|
|
||||||
"evaluation_window_hours": EVALUATION_WINDOW_HOURS,
|
|
||||||
"min_persistence_runs": RUN_THRESHOLD,
|
|
||||||
"server_fingerprint": fingerprint,
|
|
||||||
"public_key": public_key,
|
|
||||||
"private_key": private_key
|
|
||||||
}
|
|
||||||
|
|
||||||
with open(config_path, "w", encoding="utf-8") as f:
|
|
||||||
json.dump(config, f, indent=2)
|
|
||||||
|
|
||||||
print(f"[+] Successfully generated new server config and OpenPGP keypair.")
|
|
||||||
print(f"[+] Server Encryption Fingerprint: {fingerprint}")
|
|
||||||
print(f"[+] Saved to: {os.path.abspath(config_path)}")
|
|
||||||
return config
|
|
||||||
|
|
||||||
|
|
||||||
def create_client_config(
|
|
||||||
server_host: str,
|
|
||||||
server_port: int,
|
|
||||||
output_path: str,
|
|
||||||
config_path: str = CONFIG_FILE_NAME
|
|
||||||
) -> Dict[str, Any]:
|
|
||||||
"""Creates a client configuration file containing the server address, auth token, and encryption-only key/fingerprint."""
|
|
||||||
server_conf = load_or_init_config(config_path)
|
|
||||||
|
|
||||||
client_conf = {
|
|
||||||
"server_host": server_host,
|
|
||||||
"server_port": server_port,
|
|
||||||
"server_fingerprint": server_conf["server_fingerprint"],
|
|
||||||
"server_public_key": server_conf["public_key"],
|
|
||||||
"auth_token": server_conf["auth_token"]
|
|
||||||
}
|
|
||||||
|
|
||||||
out_dir = os.path.dirname(os.path.abspath(output_path))
|
|
||||||
if out_dir and not os.path.exists(out_dir):
|
|
||||||
os.makedirs(out_dir, exist_ok=True)
|
|
||||||
|
|
||||||
with open(output_path, "w", encoding="utf-8") as f:
|
|
||||||
json.dump(client_conf, f, indent=2)
|
|
||||||
|
|
||||||
print(f"[+] Client configuration successfully written to: {os.path.abspath(output_path)}")
|
|
||||||
print(f" - Server Target: {server_host}:{server_port}")
|
|
||||||
print(f" - Encryption Fingerprint: {server_conf['server_fingerprint']}")
|
|
||||||
return client_conf
|
|
||||||
|
|
||||||
|
|
||||||
def init_db(db_path: str):
|
|
||||||
"""Initializes the SQLite schema for multi-run temporal tracking."""
|
|
||||||
conn = sqlite3.connect(db_path)
|
|
||||||
conn.execute("""
|
|
||||||
CREATE TABLE IF NOT EXISTS active_issues (
|
|
||||||
fingerprint TEXT PRIMARY KEY,
|
|
||||||
site_name TEXT,
|
|
||||||
server TEXT,
|
|
||||||
signature TEXT,
|
|
||||||
severity TEXT,
|
|
||||||
message TEXT,
|
|
||||||
os_type TEXT,
|
|
||||||
first_seen TEXT,
|
|
||||||
last_seen TEXT,
|
|
||||||
run_count INTEGER,
|
|
||||||
status TEXT,
|
|
||||||
last_run_id TEXT
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
conn.execute("""
|
|
||||||
CREATE TABLE IF NOT EXISTS ingest_runs (
|
|
||||||
run_id TEXT PRIMARY KEY,
|
|
||||||
site_name TEXT,
|
|
||||||
server TEXT,
|
|
||||||
timestamp TEXT,
|
|
||||||
log_count INTEGER
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
conn.commit()
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
|
|
||||||
def process_ingested_logs(payload: Dict[str, Any], db_path: str, window_hours: int, min_runs: int) -> Dict[str, Any]:
|
|
||||||
"""
|
|
||||||
Evaluates candidate issues against the 12-hour evaluation window and 4-run rule.
|
|
||||||
Zero-state clients send raw candidate entries; this engine handles temporal state.
|
|
||||||
"""
|
|
||||||
client_server = payload.get("server", "unknown-host")
|
|
||||||
site_name = payload.get("site_name") or (client_server.split(".", 1)[1] if "." in client_server else "default")
|
|
||||||
logs = payload.get("logs", [])
|
|
||||||
run_id = str(uuid.uuid4())
|
|
||||||
now = datetime.now(timezone.utc)
|
|
||||||
now_iso = now.isoformat()
|
|
||||||
|
|
||||||
conn = sqlite3.connect(db_path)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
|
|
||||||
cursor.execute(
|
|
||||||
"INSERT INTO ingest_runs (run_id, site_name, server, timestamp, log_count) VALUES (?, ?, ?, ?, ?)",
|
|
||||||
(run_id, site_name, client_server, now_iso, len(logs))
|
|
||||||
)
|
|
||||||
|
|
||||||
processed_count = 0
|
|
||||||
promoted_to_verified = 0
|
|
||||||
|
|
||||||
for log in logs:
|
|
||||||
severity = str(log.get("severity", "WARNING")).upper()
|
|
||||||
if severity in ["INFO", "DEBUG"]:
|
|
||||||
continue
|
|
||||||
|
|
||||||
signature = log.get("signature", "unknown")
|
|
||||||
server = log.get("server", client_server)
|
|
||||||
message = log.get("message", "")
|
|
||||||
os_type = log.get("os_type", "unknown")
|
|
||||||
fp = f"{site_name}:{server}:{signature}"
|
|
||||||
|
|
||||||
cursor.execute(
|
|
||||||
"SELECT run_count, first_seen, last_seen, status, last_run_id FROM active_issues WHERE fingerprint = ?",
|
|
||||||
(fp,)
|
|
||||||
)
|
|
||||||
row = cursor.fetchone()
|
|
||||||
|
|
||||||
if row:
|
|
||||||
run_count, first_seen_str, last_seen_str, current_status, last_run_id = row
|
|
||||||
try:
|
|
||||||
last_seen_dt = datetime.fromisoformat(last_seen_str)
|
|
||||||
except Exception:
|
|
||||||
last_seen_dt = now
|
|
||||||
|
|
||||||
if (now - last_seen_dt) > timedelta(hours=window_hours):
|
|
||||||
new_runs = 1
|
|
||||||
new_first_seen = now_iso
|
|
||||||
new_status = "TRANSIENT"
|
|
||||||
else:
|
|
||||||
if last_run_id != run_id:
|
|
||||||
new_runs = run_count + 1
|
|
||||||
else:
|
|
||||||
new_runs = run_count
|
|
||||||
new_first_seen = first_seen_str
|
|
||||||
new_status = "VERIFIED" if new_runs >= min_runs else "TRANSIENT"
|
|
||||||
|
|
||||||
if new_status == "VERIFIED" and current_status != "VERIFIED":
|
|
||||||
promoted_to_verified += 1
|
|
||||||
|
|
||||||
cursor.execute("""
|
|
||||||
UPDATE active_issues
|
|
||||||
SET run_count = ?, last_seen = ?, first_seen = ?, status = ?, last_run_id = ?, message = ?, severity = ?
|
|
||||||
WHERE fingerprint = ?
|
|
||||||
""", (new_runs, now_iso, new_first_seen, new_status, run_id, message, severity, fp))
|
|
||||||
else:
|
|
||||||
initial_status = "VERIFIED" if 1 >= min_runs else "TRANSIENT"
|
|
||||||
cursor.execute("""
|
|
||||||
INSERT INTO active_issues
|
|
||||||
(fingerprint, site_name, server, signature, severity, message, os_type, first_seen, last_seen, run_count, status, last_run_id)
|
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
||||||
""", (fp, site_name, server, signature, severity, message, os_type, now_iso, now_iso, 1, initial_status, run_id))
|
|
||||||
|
|
||||||
processed_count += 1
|
|
||||||
|
|
||||||
conn.commit()
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
return {
|
|
||||||
"status": "success",
|
|
||||||
"run_id": run_id,
|
|
||||||
"processed": processed_count,
|
|
||||||
"promoted_verified": promoted_to_verified
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
async def handle_socket_client(reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
|
|
||||||
try:
|
|
||||||
length_bytes = await reader.readexactly(4)
|
|
||||||
length = struct.unpack(">I", length_bytes)[0]
|
|
||||||
if length <= 0 or length > 10 * 1024 * 1024:
|
|
||||||
raise ValueError(f"Invalid frame size: {length}")
|
|
||||||
|
|
||||||
payload_bytes = await reader.readexactly(length)
|
|
||||||
envelope = json.loads(payload_bytes.decode("utf-8"))
|
|
||||||
|
|
||||||
expected_token = SERVER_STATE["config"]["auth_token"]
|
|
||||||
provided_token = envelope.get("auth_token")
|
|
||||||
if not secrets.compare_digest(str(provided_token), str(expected_token)):
|
|
||||||
err_msg = json.dumps({"status": "error", "message": "Authentication failed"}).encode("utf-8")
|
|
||||||
writer.write(struct.pack(">I", len(err_msg)) + err_msg)
|
|
||||||
await writer.drain()
|
|
||||||
writer.close()
|
|
||||||
await writer.wait_closed()
|
|
||||||
return
|
|
||||||
|
|
||||||
encrypted_armored = envelope.get("encrypted_payload", "")
|
|
||||||
pgp_msg = pgpy.PGPMessage.from_blob(encrypted_armored)
|
|
||||||
priv_key = SERVER_STATE["private_key_obj"]
|
|
||||||
decrypted_obj = priv_key.decrypt(pgp_msg)
|
|
||||||
decrypted_json_str = decrypted_obj.message
|
|
||||||
log_payload = json.loads(decrypted_json_str)
|
|
||||||
|
|
||||||
res = process_ingested_logs(
|
|
||||||
log_payload,
|
|
||||||
db_path=SERVER_STATE["config"]["db_path"],
|
|
||||||
window_hours=SERVER_STATE["config"]["evaluation_window_hours"],
|
|
||||||
min_runs=SERVER_STATE["config"]["min_persistence_runs"]
|
|
||||||
)
|
|
||||||
|
|
||||||
resp_bytes = json.dumps(res).encode("utf-8")
|
|
||||||
writer.write(struct.pack(">I", len(resp_bytes)) + resp_bytes)
|
|
||||||
await writer.drain()
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
err = json.dumps({"status": "error", "message": str(e)}).encode("utf-8")
|
|
||||||
try:
|
|
||||||
writer.write(struct.pack(">I", len(err)) + err)
|
|
||||||
await writer.drain()
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
finally:
|
|
||||||
writer.close()
|
|
||||||
try:
|
|
||||||
await writer.wait_closed()
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/api/hermes/report")
|
|
||||||
def get_hermes_report():
|
|
||||||
db_path = SERVER_STATE["config"]["db_path"]
|
|
||||||
window_hours = SERVER_STATE["config"]["evaluation_window_hours"]
|
|
||||||
min_runs = SERVER_STATE["config"]["min_persistence_runs"]
|
|
||||||
now = datetime.now(timezone.utc)
|
|
||||||
|
|
||||||
conn = sqlite3.connect(db_path)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
cursor.execute("""
|
|
||||||
SELECT fingerprint, site_name, server, signature, severity, message, os_type, first_seen, last_seen, run_count, status
|
|
||||||
FROM active_issues
|
|
||||||
WHERE status = 'VERIFIED' AND run_count >= ?
|
|
||||||
""", (min_runs,))
|
|
||||||
rows = cursor.fetchall()
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
report = []
|
|
||||||
for r in rows:
|
|
||||||
last_seen_dt = datetime.fromisoformat(r[8])
|
|
||||||
if (now - last_seen_dt) <= timedelta(hours=window_hours):
|
|
||||||
report.append({
|
|
||||||
"fingerprint": r[0],
|
|
||||||
"site": r[1],
|
|
||||||
"server": r[2],
|
|
||||||
"signature": r[3],
|
|
||||||
"severity": r[4],
|
|
||||||
"message": r[5],
|
|
||||||
"os_type": r[6],
|
|
||||||
"first_seen": r[7],
|
|
||||||
"last_seen": r[8],
|
|
||||||
"consecutive_runs": r[9],
|
|
||||||
"evaluation_window": f"{window_hours}h",
|
|
||||||
"verified": True,
|
|
||||||
"status": r[10]
|
|
||||||
})
|
|
||||||
|
|
||||||
return report
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/api/hermes/all")
|
|
||||||
def get_all_issues():
|
|
||||||
db_path = SERVER_STATE["config"]["db_path"]
|
|
||||||
conn = sqlite3.connect(db_path)
|
|
||||||
cursor = conn.cursor()
|
|
||||||
cursor.execute("""
|
|
||||||
SELECT fingerprint, site_name, server, signature, severity, message, os_type, first_seen, last_seen, run_count, status
|
|
||||||
FROM active_issues
|
|
||||||
""")
|
|
||||||
rows = cursor.fetchall()
|
|
||||||
conn.close()
|
|
||||||
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
"fingerprint": r[0],
|
|
||||||
"site": r[1],
|
|
||||||
"server": r[2],
|
|
||||||
"signature": r[3],
|
|
||||||
"severity": r[4],
|
|
||||||
"message": r[5],
|
|
||||||
"os_type": r[6],
|
|
||||||
"first_seen": r[7],
|
|
||||||
"last_seen": r[8],
|
|
||||||
"run_count": r[9],
|
|
||||||
"status": r[10]
|
|
||||||
}
|
|
||||||
for r in rows
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/health")
|
|
||||||
def health_check():
|
|
||||||
return {
|
|
||||||
"status": "healthy",
|
|
||||||
"server_name": SERVER_STATE["config"]["server_name"],
|
|
||||||
"fingerprint": SERVER_STATE["config"]["server_fingerprint"],
|
|
||||||
"tcp_port": SERVER_STATE["config"]["tcp_port"],
|
|
||||||
"hermes_port": SERVER_STATE["config"]["hermes_port"]
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
async def run_server():
|
|
||||||
config = SERVER_STATE["config"]
|
|
||||||
tcp_host = config["tcp_host"]
|
|
||||||
tcp_port = int(config["tcp_port"])
|
|
||||||
hermes_host = config["hermes_host"]
|
|
||||||
hermes_port = int(config["hermes_port"])
|
|
||||||
|
|
||||||
tcp_server = await asyncio.start_server(handle_socket_client, tcp_host, tcp_port)
|
|
||||||
print(f"[*] LOGAR TCP Socket Server listening on {tcp_host}:{tcp_port}")
|
|
||||||
|
|
||||||
uv_config = uvicorn.Config(app, host=hermes_host, port=hermes_port, log_level="warning")
|
|
||||||
uv_server = uvicorn.Server(uv_config)
|
|
||||||
print(f"[*] Hermes Reporting API available at http://{hermes_host}:{hermes_port}/api/hermes/report")
|
|
||||||
|
|
||||||
await asyncio.gather(
|
|
||||||
tcp_server.serve_forever(),
|
|
||||||
uv_server.serve()
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
parser = argparse.ArgumentParser(description="LOGAR Cloud Hub & TCP Socket Ingestion Server")
|
|
||||||
parser.add_argument("--config", default=CONFIG_FILE_NAME, help="Path to server_config.json")
|
|
||||||
parser.add_argument("--create-client-config", action="store_true", help="Generate a client config with encryption-only fingerprint and server address")
|
|
||||||
parser.add_argument("--client-out", default="client_config.json", help="Output file path for generated client config")
|
|
||||||
parser.add_argument("--server-host", default="127.0.0.1", help="Server address to embed in client config")
|
|
||||||
parser.add_argument("--server-port", type=int, default=None, help="TCP port to embed in client config")
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
config = load_or_init_config(args.config)
|
|
||||||
init_db(config["db_path"])
|
|
||||||
|
|
||||||
priv_key_obj, _ = pgpy.PGPKey.from_blob(config["private_key"])
|
|
||||||
SERVER_STATE["config"] = config
|
|
||||||
SERVER_STATE["private_key_obj"] = priv_key_obj
|
|
||||||
|
|
||||||
if args.create_client_config:
|
|
||||||
port = args.server_port or config["tcp_port"]
|
|
||||||
create_client_config(
|
|
||||||
server_host=args.server_host,
|
|
||||||
server_port=port,
|
|
||||||
output_path=args.client_out,
|
|
||||||
config_path=args.config
|
|
||||||
)
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
print("=" * 60)
|
|
||||||
print(f" LOGAR Server Hub: {config['server_name']}")
|
|
||||||
print(f" Encryption Fingerprint: {config['server_fingerprint']}")
|
|
||||||
print(f" Evaluation Window: {config['evaluation_window_hours']} hours | Rule: {config['min_persistence_runs']}+ consecutive runs")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
try:
|
|
||||||
asyncio.run(run_server())
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
print("\n[!] Server shutting down.")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
pgpy>=0.6.0
|
|
||||||
standard-imghdr>=3.13.0; python_version >= "3.13"
|
|
||||||
cryptography>=42.0.0
|
|
||||||
fastapi>=0.110.0
|
|
||||||
uvicorn>=0.28.0
|
|
||||||
pydantic>=2.6.0
|
|
||||||
+115
-19
@@ -1,31 +1,127 @@
|
|||||||
# LOGAR Windows Edge Forwarder
|
# LOGAR Windows Edge Forwarder
|
||||||
|
|
||||||
Lightweight edge log forwarder for Windows servers.
|
Standalone compiled executable distribution for Windows Server and workstation environments.
|
||||||
|
|
||||||
## Features
|
---
|
||||||
- **Zero Local State**: No local database or state tracking. Forwarder simply scans recent logs and streams candidates.
|
|
||||||
- **Edge Noise Stripping**: Strips conversational/informational noise (INFO, DEBUG, Audit) at the source.
|
|
||||||
- **End-to-End OpenPGP Encryption**: Encrypts logs using the server's public key so that only the server can decrypt them.
|
|
||||||
- **Authenticated TCP Socket**: Connects directly via raw TCP framing with token verification.
|
|
||||||
- **No GPG Binary Required**: Pure-Python cryptography (`pgpy` + `cryptography`).
|
|
||||||
|
|
||||||
## Installation
|
## Overview
|
||||||
```powershell
|
`Win_Client.exe` is a self-contained, pre-compiled executable that queries the Windows Application Event Log, filters candidate events at the source, encrypts the payload using OpenPGP, and streams records over an authenticated TCP socket to the central LOGAR hub.
|
||||||
python -m pip install -r requirements.txt
|
|
||||||
|
### Key Capabilities
|
||||||
|
- **Pre-compiled & Dependency-Free**: Ships as a standalone native Windows executable (`Win_Client.exe`). No Python installation, pip packages, or GnuPG binaries are required on the host.
|
||||||
|
- **Source-Level Filtering**: Retains events spanning `INFO`, `WARNING`, and `ERROR`. Strips audit success/failure events and debug noise, skipping events older than 24 hours.
|
||||||
|
- **State Tracking & Deduplication**: Maintains persistent client state in `client_state.json` (tracking event record numbers and timestamp signatures) so every log record is forwarded exactly once without duplicates.
|
||||||
|
- **Fail-Safe State Commit**: State is committed only when the server returns a verified `success` response. In the event of a network outage, state remains unchanged and unsent events are retried automatically on the next run.
|
||||||
|
- **End-to-End Encryption**: Encrypts payloads using the server's OpenPGP public key before transmission.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. Generating & Deploying the Configuration File
|
||||||
|
|
||||||
|
### Step 1: Generate `client_config.json` on the Server
|
||||||
|
Run the following command on your central LOGAR server to export a client bundle tailored for your environment:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python src/Server.py --create-client-config --server-host <SERVER_IP_OR_DNS> --server-port 9443 --client-out client_config.json
|
||||||
```
|
```
|
||||||
|
|
||||||
## Configuration
|
- Replace `<SERVER_IP_OR_DNS>` with the reachable IP address or FQDN of your central LOGAR server hub.
|
||||||
Place the `client_config.json` generated by the server (`Server.py --create-client-config`) in the same directory as `Win_Client.py`.
|
- Default TCP port is `9443`.
|
||||||
|
|
||||||
## Running the Forwarder
|
### Step 2: Configuration Structure
|
||||||
```powershell
|
The generated `client_config.json` contains:
|
||||||
python Win_Client.py --hours 6
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"server_host": "192.168.1.100",
|
||||||
|
"server_port": 9443,
|
||||||
|
"server_fingerprint": "375388960531264EA0648EC0D2C4E4ABC6F22AC2",
|
||||||
|
"server_public_key": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n...",
|
||||||
|
"auth_token": "a1b2c3d4e5f6..."
|
||||||
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## Scheduled Task Deployment
|
> [!NOTE]
|
||||||
To run periodically via Windows Task Scheduler (e.g., every 3 hours):
|
> A reference example is provided in `client_config.sample.json`. The configuration file contains **no host-specific names or site names** to ensure client anonymity and easy redistribution.
|
||||||
|
|
||||||
|
### Step 3: Copy to Edge Node
|
||||||
|
Place `Win_Client.exe` and `client_config.json` in the target directory (recommended: `C:\LOGAR\`):
|
||||||
|
|
||||||
```powershell
|
```powershell
|
||||||
$Action = New-ScheduledTaskAction -Execute "python.exe" -Argument "C:\LOGAR\Win_Client.py --hours 6" -WorkingDirectory "C:\LOGAR"
|
New-Item -ItemType Directory -Path "C:\LOGAR" -Force
|
||||||
|
Copy-Item "Win_Client.exe", "client_config.json" -Destination "C:\LOGAR\"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. Running Manually
|
||||||
|
|
||||||
|
Test the forwarder interactively from PowerShell or Command Prompt:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
cd C:\LOGAR
|
||||||
|
.\Win_Client.exe --hours 24
|
||||||
|
```
|
||||||
|
|
||||||
|
### Command-Line Arguments
|
||||||
|
| Argument | Default | Description |
|
||||||
|
| :--- | :--- | :--- |
|
||||||
|
| `--config` | `client_config.json` | Path to client configuration file |
|
||||||
|
| `--hours` | `24` | Lookback window in hours for event logs |
|
||||||
|
| `--state-file` | `client_state.json` | Path to persistent state tracking file |
|
||||||
|
| `--no-state` | `False` | Disable state tracking and send all events matching lookback window |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. Installing as a Background Service / Scheduled Task
|
||||||
|
|
||||||
|
Edge forwarders run as episodic background processes (run, forward unsent candidate records, commit state, and terminate). On Windows, this is natively managed via Windows Task Scheduler running as a background service under `SYSTEM`.
|
||||||
|
|
||||||
|
### Method A: Windows Scheduled Task via PowerShell (Recommended)
|
||||||
|
Open an **Elevated PowerShell (Run as Administrator)** window and execute:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
# Define action and periodic trigger (every 3 hours indefinitely)
|
||||||
|
$Action = New-ScheduledTaskAction -Execute "C:\LOGAR\Win_Client.exe" -Argument "--hours 24" -WorkingDirectory "C:\LOGAR"
|
||||||
$Trigger = New-ScheduledTaskTrigger -Once -At (Get-Date) -RepetitionInterval (New-TimeSpan -Hours 3)
|
$Trigger = New-ScheduledTaskTrigger -Once -At (Get-Date) -RepetitionInterval (New-TimeSpan -Hours 3)
|
||||||
Register-ScheduledTask -TaskName "LOGAR_Windows_Forwarder" -Action $Action -Trigger $Trigger -Description "LOGAR Edge Forwarder"
|
|
||||||
|
# Configure task settings (wake on sleep, start when ready, run hidden)
|
||||||
|
$Settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -ExecutionTimeLimit (New-TimeSpan -Minutes 15)
|
||||||
|
|
||||||
|
# Register task running under the local SYSTEM account with highest privileges
|
||||||
|
Register-ScheduledTask -TaskName "LOGAR_Forwarder" `
|
||||||
|
-Action $Action `
|
||||||
|
-Trigger $Trigger `
|
||||||
|
-Settings $Settings `
|
||||||
|
-User "NT AUTHORITY\SYSTEM" `
|
||||||
|
-RunLevel Highest `
|
||||||
|
-Description "LOGAR Windows Edge Log Forwarder Service"
|
||||||
|
|
||||||
|
# Verify task creation and trigger immediate execution
|
||||||
|
Start-ScheduledTask -TaskName "LOGAR_Forwarder"
|
||||||
|
Get-ScheduledTask -TaskName "LOGAR_Forwarder"
|
||||||
|
```
|
||||||
|
|
||||||
|
### Method B: Continuous Windows Service via NSSM
|
||||||
|
If your organizational policy requires a formal Windows Service listed under `services.msc`:
|
||||||
|
|
||||||
|
1. Download [NSSM (Non-Sucking Service Manager)](https://nssm.cc/).
|
||||||
|
2. Install the service using NSSM:
|
||||||
|
```cmd
|
||||||
|
nssm.exe install LOGAR_Forwarder "C:\LOGAR\Win_Client.exe" "--hours 24"
|
||||||
|
nssm.exe set LOGAR_Forwarder AppDirectory "C:\LOGAR"
|
||||||
|
nssm.exe set LOGAR_Forwarder AppRestartDelay 10800000
|
||||||
|
nssm.exe start LOGAR_Forwarder
|
||||||
|
```
|
||||||
|
*(Note: `AppRestartDelay 10800000` pauses 3 hours between execution cycles).*
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. Uninstallation & Removal
|
||||||
|
|
||||||
|
To remove the scheduled task:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
Unregister-ScheduledTask -TaskName "LOGAR_Forwarder" -Confirm:$false
|
||||||
|
Remove-Item -Recurse -Force "C:\LOGAR"
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -3,6 +3,5 @@
|
|||||||
"server_port": 9443,
|
"server_port": 9443,
|
||||||
"server_fingerprint": "PASTE_SERVER_FINGERPRINT_HERE",
|
"server_fingerprint": "PASTE_SERVER_FINGERPRINT_HERE",
|
||||||
"server_public_key": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n...\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
"server_public_key": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n...\n-----END PGP PUBLIC KEY BLOCK-----\n",
|
||||||
"auth_token": "PASTE_AUTH_TOKEN_HERE",
|
"auth_token": "PASTE_AUTH_TOKEN_HERE"
|
||||||
"site_name": "Frankfurt-DC"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
pgpy>=0.6.0
|
|
||||||
standard-imghdr>=3.13.0; python_version >= "3.13"
|
|
||||||
cryptography>=42.0.0
|
|
||||||
pywin32>=306
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
import os
|
|
||||||
import sys
|
|
||||||
import json
|
|
||||||
import struct
|
|
||||||
import unittest
|
|
||||||
import warnings
|
|
||||||
|
|
||||||
warnings.filterwarnings("ignore")
|
|
||||||
|
|
||||||
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
|
||||||
|
|
||||||
import Win_Client
|
|
||||||
import pgpy
|
|
||||||
from pgpy.constants import PubKeyAlgorithm, KeyFlags, HashAlgorithm, SymmetricKeyAlgorithm, CompressionAlgorithm
|
|
||||||
|
|
||||||
|
|
||||||
class TestWinClientComponent(unittest.TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
self.dummy_config = "test_win_client_config.json"
|
|
||||||
# Generate dummy PGP key for testing
|
|
||||||
key = pgpy.PGPKey.new(PubKeyAlgorithm.RSAEncryptOrSign, 2048)
|
|
||||||
uid = pgpy.PGPUID.new("TestHub")
|
|
||||||
key.add_uid(
|
|
||||||
uid,
|
|
||||||
usage={KeyFlags.EncryptCommunications, KeyFlags.EncryptStorage},
|
|
||||||
hashes=[HashAlgorithm.SHA256],
|
|
||||||
ciphers=[SymmetricKeyAlgorithm.AES256],
|
|
||||||
compression=[CompressionAlgorithm.Uncompressed]
|
|
||||||
)
|
|
||||||
self.server_priv = key
|
|
||||||
self.server_pub = key.pubkey
|
|
||||||
self.fingerprint = str(key.pubkey.fingerprint)
|
|
||||||
|
|
||||||
with open(self.dummy_config, "w", encoding="utf-8") as f:
|
|
||||||
json.dump({
|
|
||||||
"server_host": "127.0.0.1",
|
|
||||||
"server_port": 9443,
|
|
||||||
"server_fingerprint": self.fingerprint,
|
|
||||||
"server_public_key": str(self.server_pub),
|
|
||||||
"auth_token": "secret-test-token"
|
|
||||||
}, f)
|
|
||||||
|
|
||||||
def tearDown(self):
|
|
||||||
if os.path.exists(self.dummy_config):
|
|
||||||
try:
|
|
||||||
os.remove(self.dummy_config)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def test_client_config_anonymity(self):
|
|
||||||
config = Win_Client.load_config(self.dummy_config)
|
|
||||||
self.assertNotIn("server_name", config)
|
|
||||||
self.assertNotIn("name", config)
|
|
||||||
self.assertNotIn("site_name", config)
|
|
||||||
self.assertEqual(config["server_fingerprint"], self.fingerprint)
|
|
||||||
|
|
||||||
def test_get_machine_identifier(self):
|
|
||||||
machine_id = Win_Client.get_machine_identifier()
|
|
||||||
self.assertIsInstance(machine_id, str)
|
|
||||||
self.assertGreater(len(machine_id), 0)
|
|
||||||
self.assertNotEqual(machine_id, "localhost")
|
|
||||||
|
|
||||||
def test_encryption_and_envelope_creation(self):
|
|
||||||
config = Win_Client.load_config(self.dummy_config)
|
|
||||||
logs = [{
|
|
||||||
"server": Win_Client.get_machine_identifier(),
|
|
||||||
"signature": "TestWinSignature",
|
|
||||||
"severity": "WARNING",
|
|
||||||
"message": "Disk space threshold warning"
|
|
||||||
}]
|
|
||||||
|
|
||||||
pub_key, _ = pgpy.PGPKey.from_blob(config["server_public_key"])
|
|
||||||
payload = {
|
|
||||||
"server": Win_Client.get_machine_identifier(),
|
|
||||||
"logs": logs
|
|
||||||
}
|
|
||||||
msg = pgpy.PGPMessage.new(json.dumps(payload))
|
|
||||||
enc = pub_key.encrypt(msg)
|
|
||||||
self.assertTrue(str(enc).startswith("-----BEGIN PGP MESSAGE-----"))
|
|
||||||
|
|
||||||
# Decrypt with private key to verify end-to-end payload integrity
|
|
||||||
dec = self.server_priv.decrypt(enc)
|
|
||||||
restored = json.loads(dec.message)
|
|
||||||
self.assertEqual(restored["logs"][0]["signature"], "TestWinSignature")
|
|
||||||
|
|
||||||
def test_framing_protocol(self):
|
|
||||||
envelope_data = json.dumps({"test": "data"}).encode("utf-8")
|
|
||||||
frame = struct.pack(">I", len(envelope_data)) + envelope_data
|
|
||||||
self.assertEqual(len(frame), 4 + len(envelope_data))
|
|
||||||
length = struct.unpack(">I", frame[:4])[0]
|
|
||||||
self.assertEqual(length, len(envelope_data))
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
@@ -0,0 +1,237 @@
|
|||||||
|
# LOGAR Windows Server Hub
|
||||||
|
|
||||||
|
Standalone compiled executable distribution for Windows Server environments (`Server.exe`).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
`Server.exe` is a self-contained, pre-compiled native Windows PE executable that serves as the central log aggregation, temporal persistence analyzer, and reporting hub of the LOGAR infrastructure.
|
||||||
|
|
||||||
|
### Key Architecture & Capabilities
|
||||||
|
- **Pre-compiled & Dependency-Free**: Ships as a standalone Windows executable (`Server.exe`). No Python installation, pip packages, or GnuPG binaries are required on Windows Server.
|
||||||
|
- **Authenticated TCP Ingestion Socket (Port 9443)**: Ingests framed OpenPGP encrypted log batches streamed from edge forwarder nodes (`Win_Client.exe` and `Linux_Client.bin`).
|
||||||
|
- **Warning Persistence & Immediate Error Routing**: High-severity `ERROR`, `CRITICAL`, and `FATAL` events are promoted to `VERIFIED` immediately on their first occurrence. Operational `WARNING` and `INFO` events are evaluated against an episodic threshold, requiring persistence across at least 4 distinct client transmission cycles within a rolling 12-hour evaluation window before promotion to `VERIFIED`.
|
||||||
|
- **Embedded Hermes Reporting API (Port 8443)**: Integrated REST API exposing `/api/hermes/report` for external dashboards, monitoring agents, and scrapers.
|
||||||
|
- **Pure-Python OpenPGP Cryptography**: Automatically generates RSA-2048 encryption keys and a SHA-256 fingerprint on first launch without external dependencies.
|
||||||
|
- **State Database**: Stores issue lifecycle records, run counters, and machine telemetry in a local SQLite database (`logar_state.db`).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. Initializing & Generating Server Configuration
|
||||||
|
|
||||||
|
### Step 1: Automatic First-Run Generation
|
||||||
|
When launched without an existing `server_config.json`, `Server.exe` automatically initializes:
|
||||||
|
1. An OpenPGP RSA-2048 encryption keypair (`private_key` and `public_key`).
|
||||||
|
2. A SHA-256 public encryption fingerprint (`server_fingerprint`).
|
||||||
|
3. A cryptographically random secret authentication token (`auth_token`).
|
||||||
|
4. Default network socket coordinates (TCP 9443, Hermes API 8443).
|
||||||
|
|
||||||
|
Open PowerShell and run:
|
||||||
|
```powershell
|
||||||
|
.\Server.exe
|
||||||
|
```
|
||||||
|
Output:
|
||||||
|
```
|
||||||
|
[!] Config 'server_config.json' not found. Initializing first-run configuration...
|
||||||
|
[+] Successfully generated new server config and OpenPGP keypair.
|
||||||
|
[+] Server Encryption Fingerprint: 375388960531264EA0648EC0D2C4E4ABC6F22AC2
|
||||||
|
[+] Saved to: server_config.json
|
||||||
|
```
|
||||||
|
|
||||||
|
### Step 2: Configuration Fields Reference
|
||||||
|
The generated `server_config.json` contains:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"server_name": "LOGAR-Windows-Hub",
|
||||||
|
"tcp_host": "0.0.0.0",
|
||||||
|
"tcp_port": 9443,
|
||||||
|
"hermes_host": "0.0.0.0",
|
||||||
|
"hermes_port": 8443,
|
||||||
|
"auth_token": "a1b2c3d4e5f67890abcdef1234567890...",
|
||||||
|
"db_path": "logar_state.db",
|
||||||
|
"evaluation_window_hours": 12,
|
||||||
|
"min_persistence_runs": 4,
|
||||||
|
"server_fingerprint": "375388960531264EA0648EC0D2C4E4ABC6F22AC2",
|
||||||
|
"public_key": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n...",
|
||||||
|
"private_key": "-----BEGIN PGP PRIVATE KEY BLOCK-----\n..."
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Parameter | Default | Description |
|
||||||
|
| :--- | :--- | :--- |
|
||||||
|
| `server_name` | `"LOGAR-Windows-Hub"` | Identifier for this hub instance |
|
||||||
|
| `tcp_host` | `"0.0.0.0"` | Network interface to bind for incoming client socket traffic |
|
||||||
|
| `tcp_port` | `9443` | TCP port for incoming edge log batches |
|
||||||
|
| `hermes_host` | `"0.0.0.0"` | Network interface to bind for Hermes HTTP API |
|
||||||
|
| `hermes_port` | `8443` | HTTP port for the Hermes reporting endpoint |
|
||||||
|
| `auth_token` | *(auto-generated)* | Pre-shared authentication secret required in client envelopes |
|
||||||
|
| `db_path` | `"logar_state.db"` | Path to persistent SQLite issue database |
|
||||||
|
| `evaluation_window_hours` | `12` | Rolling evaluation window in hours for warning persistence |
|
||||||
|
| `min_persistence_runs` | `4` | Consecutive runs required to promote warning issues to `VERIFIED` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. Generating Client Configuration Bundles
|
||||||
|
|
||||||
|
Edge forwarders (`Win_Client.exe` and `Linux_Client.bin`) require an anonymous client configuration bundle that includes the server socket target, authentication token, and encryption public key, without exposing sensitive server names or private keys.
|
||||||
|
|
||||||
|
Run the following command on the server:
|
||||||
|
```powershell
|
||||||
|
.\Server.exe --create-client-config --server-host <SERVER_IP_OR_FQDN> --server-port 9443 --client-out client_config.json
|
||||||
|
```
|
||||||
|
|
||||||
|
- Replace `<SERVER_IP_OR_FQDN>` with the reachable IP or DNS name of your LOGAR server.
|
||||||
|
- Distribute `client_config.json` to client forwarder nodes along with `Win_Client.exe` or `Linux_Client.bin`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. Running Interactively
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
.\Server.exe --config C:\LOGAR-Server\server_config.json
|
||||||
|
```
|
||||||
|
|
||||||
|
### Command-Line Arguments
|
||||||
|
| Argument | Description |
|
||||||
|
| :--- | :--- |
|
||||||
|
| `--config` | Path to server configuration JSON file (default: `server_config.json`) |
|
||||||
|
| `--create-client-config` | Exports an anonymous client configuration bundle and exits |
|
||||||
|
| `--server-host` | Hostname/IP to embed in the exported client configuration |
|
||||||
|
| `--server-port` | Port to embed in the exported client configuration (default: `9443`) |
|
||||||
|
| `--client-out` | Destination path for exported client configuration (default: `client_config.json`) |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. Installing as a Continuous Windows Service
|
||||||
|
|
||||||
|
Because `Server.exe` acts as a continuous server hub (listening for TCP connections and HTTP API queries), it should run persistently in the background.
|
||||||
|
|
||||||
|
### Method A: Native Windows Service via NSSM (Recommended)
|
||||||
|
[NSSM (Non-Sucking Service Manager)](https://nssm.cc/) is the industry standard for wrapping standalone executables into formal Windows services managed by `services.msc`.
|
||||||
|
|
||||||
|
1. Place `Server.exe` and `server_config.json` in `C:\LOGAR-Server\`.
|
||||||
|
2. Open **Elevated PowerShell (Run as Administrator)**:
|
||||||
|
```powershell
|
||||||
|
# Create deployment folder
|
||||||
|
New-Item -ItemType Directory -Path "C:\LOGAR-Server" -Force
|
||||||
|
Copy-Item "Server.exe", "server_config.json" -Destination "C:\LOGAR-Server\"
|
||||||
|
|
||||||
|
# Install Windows Service via NSSM
|
||||||
|
nssm.exe install LOGAR_Server "C:\LOGAR-Server\Server.exe" "--config C:\LOGAR-Server\server_config.json"
|
||||||
|
nssm.exe set LOGAR_Server AppDirectory "C:\LOGAR-Server"
|
||||||
|
nssm.exe set LOGAR_Server Description "LOGAR Central Aggregation Hub Service"
|
||||||
|
nssm.exe set LOGAR_Server Start SERVICE_AUTO_START
|
||||||
|
nssm.exe set LOGAR_Server AppStdout "C:\LOGAR-Server\server_out.log"
|
||||||
|
nssm.exe set LOGAR_Server AppStderr "C:\LOGAR-Server\server_err.log"
|
||||||
|
|
||||||
|
# Start the service
|
||||||
|
nssm.exe start LOGAR_Server
|
||||||
|
```
|
||||||
|
3. Verify status in PowerShell:
|
||||||
|
```powershell
|
||||||
|
Get-Service -Name "LOGAR_Server"
|
||||||
|
```
|
||||||
|
|
||||||
|
### Method B: Windows Task Scheduler (Startup Daemon)
|
||||||
|
If third-party service wrappers are restricted by organizational policy, configure a Task Scheduler job triggered at boot under the `SYSTEM` account:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
# Action: Launch Server.exe
|
||||||
|
$Action = New-ScheduledTaskAction -Execute "C:\LOGAR-Server\Server.exe" `
|
||||||
|
-Argument "--config C:\LOGAR-Server\server_config.json" `
|
||||||
|
-WorkingDirectory "C:\LOGAR-Server"
|
||||||
|
|
||||||
|
# Trigger: At system startup
|
||||||
|
$Trigger = New-ScheduledTaskTrigger -AtStartup
|
||||||
|
|
||||||
|
# Settings: Restart on failure, no execution time limit
|
||||||
|
$Settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries `
|
||||||
|
-DontStopIfGoingOnBatteries `
|
||||||
|
-StartWhenAvailable `
|
||||||
|
-RestartCount 3 `
|
||||||
|
-RestartInterval (New-TimeSpan -Minutes 1) `
|
||||||
|
-ExecutionTimeLimit ([TimeSpan]::Zero)
|
||||||
|
|
||||||
|
# Register task under SYSTEM with highest privileges
|
||||||
|
Register-ScheduledTask -TaskName "LOGAR_Server_Daemon" `
|
||||||
|
-Action $Action `
|
||||||
|
-Trigger $Trigger `
|
||||||
|
-Settings $Settings `
|
||||||
|
-User "NT AUTHORITY\SYSTEM" `
|
||||||
|
-RunLevel Highest `
|
||||||
|
-Description "LOGAR Central Hub Daemon"
|
||||||
|
|
||||||
|
# Start the task immediately
|
||||||
|
Start-ScheduledTask -TaskName "LOGAR_Server_Daemon"
|
||||||
|
Get-ScheduledTask -TaskName "LOGAR_Server_Daemon"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. Hermes Reporting API & Health Checks
|
||||||
|
|
||||||
|
Test the embedded Hermes REST endpoint locally using PowerShell:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
$report = Invoke-RestMethod -Uri "http://127.0.0.1:8443/api/hermes/report" -Method GET
|
||||||
|
$report | Format-Table fingerprint, status, consecutive_runs, first_seen, last_seen
|
||||||
|
```
|
||||||
|
|
||||||
|
### Response Format:
|
||||||
|
```json
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"fingerprint": "win-dc-01.corp.internal:DiskCorruptionDetected",
|
||||||
|
"server": "win-dc-01.corp.internal",
|
||||||
|
"signature": "DiskCorruptionDetected",
|
||||||
|
"consecutive_runs": 4,
|
||||||
|
"first_seen": "2026-09-04T08:15:00Z",
|
||||||
|
"last_seen": "2026-09-04T15:00:00Z",
|
||||||
|
"status": "VERIFIED",
|
||||||
|
"verified": true,
|
||||||
|
"os_type": "windows",
|
||||||
|
"sample_message": "An error was detected on device \\Device\\Harddisk0\\DR0 during a paging operation."
|
||||||
|
}
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. Windows Defender Firewall Configuration
|
||||||
|
|
||||||
|
Open the necessary inbound firewall ports to allow incoming edge forwarder socket streams and HTTP API queries:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
# Allow TCP 9443 for edge log forwarding
|
||||||
|
New-NetFirewallRule -DisplayName "LOGAR TCP Log Ingestion" `
|
||||||
|
-Direction Inbound `
|
||||||
|
-LocalPort 9443 `
|
||||||
|
-Protocol TCP `
|
||||||
|
-Action Allow
|
||||||
|
|
||||||
|
# Allow TCP 8443 for Hermes Reporting REST API
|
||||||
|
New-NetFirewallRule -DisplayName "LOGAR Hermes Reporting API" `
|
||||||
|
-Direction Inbound `
|
||||||
|
-LocalPort 8443 `
|
||||||
|
-Protocol TCP `
|
||||||
|
-Action Allow
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. Uninstallation & Removal
|
||||||
|
|
||||||
|
To remove the server service:
|
||||||
|
```powershell
|
||||||
|
# If installed via NSSM:
|
||||||
|
nssm.exe stop LOGAR_Server
|
||||||
|
nssm.exe remove LOGAR_Server confirm
|
||||||
|
|
||||||
|
# If installed via Task Scheduler:
|
||||||
|
Unregister-ScheduledTask -TaskName "LOGAR_Server_Daemon" -Confirm:$false
|
||||||
|
|
||||||
|
# Clean files
|
||||||
|
Remove-Item -Recurse -Force "C:\LOGAR-Server"
|
||||||
|
```
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"server_name": "LOGAR-Windows-Hub",
|
||||||
|
"tcp_host": "0.0.0.0",
|
||||||
|
"tcp_port": 9443,
|
||||||
|
"hermes_host": "0.0.0.0",
|
||||||
|
"hermes_port": 8443,
|
||||||
|
"auth_token": "replace_with_secure_random_hex_token",
|
||||||
|
"db_path": "logar_state.db",
|
||||||
|
"evaluation_window_hours": 12,
|
||||||
|
"min_persistence_runs": 4,
|
||||||
|
"server_fingerprint": "AUTO_GENERATED_ON_FIRST_RUN",
|
||||||
|
"public_key": "AUTO_GENERATED_ON_FIRST_RUN",
|
||||||
|
"private_key": "AUTO_GENERATED_ON_FIRST_RUN"
|
||||||
|
}
|
||||||
-122
@@ -1,122 +0,0 @@
|
|||||||
import os
|
|
||||||
import sys
|
|
||||||
import shutil
|
|
||||||
import zipapp
|
|
||||||
import hashlib
|
|
||||||
import platform
|
|
||||||
import subprocess
|
|
||||||
|
|
||||||
DIST_DIR = os.path.abspath("dist")
|
|
||||||
OUT_DIR = os.path.abspath("out")
|
|
||||||
BUILD_TEMP = os.path.abspath("build_temp")
|
|
||||||
|
|
||||||
def clean_and_prep():
|
|
||||||
if os.path.exists(DIST_DIR):
|
|
||||||
shutil.rmtree(DIST_DIR)
|
|
||||||
os.makedirs(DIST_DIR, exist_ok=True)
|
|
||||||
if os.path.exists(BUILD_TEMP):
|
|
||||||
shutil.rmtree(BUILD_TEMP)
|
|
||||||
os.makedirs(BUILD_TEMP, exist_ok=True)
|
|
||||||
|
|
||||||
def build_pyinstaller_binary(script_path, binary_name):
|
|
||||||
print(f"[*] Compiling {binary_name} with PyInstaller...")
|
|
||||||
cmd = [
|
|
||||||
sys.executable, "-m", "PyInstaller",
|
|
||||||
"--onefile",
|
|
||||||
"--clean",
|
|
||||||
"--distpath", DIST_DIR,
|
|
||||||
"--workpath", os.path.join(BUILD_TEMP, f"work_{binary_name}"),
|
|
||||||
"--specpath", os.path.join(BUILD_TEMP, f"spec_{binary_name}"),
|
|
||||||
"--name", binary_name,
|
|
||||||
script_path
|
|
||||||
]
|
|
||||||
res = subprocess.run(cmd, capture_output=True, text=True)
|
|
||||||
if res.returncode != 0:
|
|
||||||
print(f"[!] Compilation error for {binary_name}:\n{res.stderr}")
|
|
||||||
raise RuntimeError(f"Failed to build {binary_name}")
|
|
||||||
print(f"[+] Successfully compiled {binary_name}")
|
|
||||||
|
|
||||||
def build_linux_zipapp_binary():
|
|
||||||
print("[*] Packaging Linux_Client.bin executable binary...")
|
|
||||||
app_dir = os.path.join(BUILD_TEMP, "linux_app")
|
|
||||||
os.makedirs(app_dir, exist_ok=True)
|
|
||||||
shutil.copy(os.path.join(OUT_DIR, "linux_client", "Linux_Client.py"), os.path.join(app_dir, "Linux_Client.py"))
|
|
||||||
|
|
||||||
bin_output = os.path.join(DIST_DIR, "Linux_Client.bin")
|
|
||||||
zipapp.create_archive(
|
|
||||||
source=app_dir,
|
|
||||||
target=bin_output,
|
|
||||||
interpreter="/usr/bin/env python3",
|
|
||||||
main="Linux_Client:main"
|
|
||||||
)
|
|
||||||
print(f"[+] Successfully generated {bin_output}")
|
|
||||||
|
|
||||||
def generate_checksums():
|
|
||||||
checksum_file = os.path.join(DIST_DIR, "SHA256SUMS.txt")
|
|
||||||
lines = []
|
|
||||||
for fname in sorted(os.listdir(DIST_DIR)):
|
|
||||||
if fname == "SHA256SUMS.txt":
|
|
||||||
continue
|
|
||||||
fpath = os.path.join(DIST_DIR, fname)
|
|
||||||
if os.path.isfile(fpath):
|
|
||||||
with open(fpath, "rb") as f:
|
|
||||||
digest = hashlib.sha256(f.read()).hexdigest()
|
|
||||||
lines.append(f"{digest} {fname}")
|
|
||||||
with open(checksum_file, "w", encoding="utf-8") as f:
|
|
||||||
f.write("\n".join(lines) + "\n")
|
|
||||||
|
|
||||||
def main():
|
|
||||||
print("=" * 60)
|
|
||||||
print(" LOGAR Binary Packaging (Binaries Only)")
|
|
||||||
print(f" Platform: {platform.system()} ({platform.machine()})")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
clean_and_prep()
|
|
||||||
|
|
||||||
is_windows = platform.system() == "Windows"
|
|
||||||
|
|
||||||
if is_windows:
|
|
||||||
# Build Windows client executable
|
|
||||||
win_client_script = os.path.join(OUT_DIR, "win_client", "Win_Client.py")
|
|
||||||
build_pyinstaller_binary(win_client_script, "Win_Client")
|
|
||||||
|
|
||||||
# Build Windows server executable
|
|
||||||
server_script = os.path.join(OUT_DIR, "server", "Server.py")
|
|
||||||
build_pyinstaller_binary(server_script, "Server")
|
|
||||||
|
|
||||||
# Build Linux client standalone binary
|
|
||||||
build_linux_zipapp_binary()
|
|
||||||
else:
|
|
||||||
# On Linux runner: Build native Linux binaries
|
|
||||||
linux_client_script = os.path.join(OUT_DIR, "linux_client", "Linux_Client.py")
|
|
||||||
build_pyinstaller_binary(linux_client_script, "Linux_Client.bin")
|
|
||||||
|
|
||||||
server_script = os.path.join(OUT_DIR, "server", "Server.py")
|
|
||||||
build_pyinstaller_binary(server_script, "Server.bin")
|
|
||||||
|
|
||||||
# Also package standalone Windows zipapp executable
|
|
||||||
win_app_dir = os.path.join(BUILD_TEMP, "win_app")
|
|
||||||
os.makedirs(win_app_dir, exist_ok=True)
|
|
||||||
shutil.copy(os.path.join(OUT_DIR, "win_client", "Win_Client.py"), os.path.join(win_app_dir, "Win_Client.py"))
|
|
||||||
win_bin_output = os.path.join(DIST_DIR, "Win_Client.pyz")
|
|
||||||
zipapp.create_archive(
|
|
||||||
source=win_app_dir,
|
|
||||||
target=win_bin_output,
|
|
||||||
interpreter="/usr/bin/env python3",
|
|
||||||
main="Win_Client:main"
|
|
||||||
)
|
|
||||||
|
|
||||||
generate_checksums()
|
|
||||||
|
|
||||||
# Clean temporary build directory
|
|
||||||
if os.path.exists(BUILD_TEMP):
|
|
||||||
shutil.rmtree(BUILD_TEMP, ignore_errors=True)
|
|
||||||
|
|
||||||
print("\n[+] Binary shipping artifacts assembled in 'dist/':")
|
|
||||||
for f in os.listdir(DIST_DIR):
|
|
||||||
sz = os.path.getsize(os.path.join(DIST_DIR, f))
|
|
||||||
print(f" - {f} ({sz / (1024*1024):.2f} MB)" if sz > 1024*1024 else f" - {f} ({sz} bytes)")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -0,0 +1,343 @@
|
|||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import json
|
||||||
|
import socket
|
||||||
|
import struct
|
||||||
|
import argparse
|
||||||
|
import subprocess
|
||||||
|
import warnings
|
||||||
|
from datetime import datetime, timezone, timedelta
|
||||||
|
from typing import Optional, Dict, Any, List
|
||||||
|
|
||||||
|
# Suppress cryptography / pgpy deprecation notices
|
||||||
|
warnings.filterwarnings("ignore")
|
||||||
|
|
||||||
|
import pgpy
|
||||||
|
|
||||||
|
CONFIG_FILE_NAME = "client_config.json"
|
||||||
|
STATE_FILE_NAME = "client_state.json"
|
||||||
|
|
||||||
|
|
||||||
|
def get_state_path(config_path: str, custom_state_path: Optional[str] = None) -> str:
|
||||||
|
if custom_state_path:
|
||||||
|
return custom_state_path
|
||||||
|
config_dir = os.path.dirname(os.path.abspath(config_path))
|
||||||
|
return os.path.join(config_dir, STATE_FILE_NAME)
|
||||||
|
|
||||||
|
|
||||||
|
def load_state(state_path: str) -> dict:
|
||||||
|
if os.path.exists(state_path):
|
||||||
|
try:
|
||||||
|
with open(state_path, "r", encoding="utf-8") as f:
|
||||||
|
return json.load(f)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[!] Warning: Failed to read state file '{state_path}': {e}")
|
||||||
|
return {}
|
||||||
|
return {}
|
||||||
|
|
||||||
|
|
||||||
|
def save_state(state_path: str, state: dict):
|
||||||
|
try:
|
||||||
|
temp_path = f"{state_path}.tmp"
|
||||||
|
with open(temp_path, "w", encoding="utf-8") as f:
|
||||||
|
json.dump(state, f, indent=2)
|
||||||
|
os.replace(temp_path, state_path)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[!] Warning: Could not save client state to '{state_path}': {e}")
|
||||||
|
|
||||||
|
|
||||||
|
def commit_state(state: dict, state_path: str):
|
||||||
|
if "new_last_cursor" in state:
|
||||||
|
val = state.pop("new_last_cursor")
|
||||||
|
if val:
|
||||||
|
state["last_cursor"] = val
|
||||||
|
if "new_last_timestamp_us" in state:
|
||||||
|
val = state.pop("new_last_timestamp_us")
|
||||||
|
if val:
|
||||||
|
state["last_timestamp_us"] = val
|
||||||
|
if "new_sent_cursors" in state:
|
||||||
|
state["sent_cursors"] = state.pop("new_sent_cursors")
|
||||||
|
save_state(state_path, state)
|
||||||
|
|
||||||
|
|
||||||
|
def load_config(config_path: str = CONFIG_FILE_NAME):
|
||||||
|
if not os.path.exists(config_path):
|
||||||
|
raise FileNotFoundError(
|
||||||
|
f"Client configuration file not found at: {config_path}\n"
|
||||||
|
f"Generate one from the server using: python Server.py --create-client-config --client-out {config_path}"
|
||||||
|
)
|
||||||
|
with open(config_path, "r", encoding="utf-8") as f:
|
||||||
|
return json.load(f)
|
||||||
|
|
||||||
|
|
||||||
|
def get_machine_identifier() -> str:
|
||||||
|
"""
|
||||||
|
Returns the hostname of the machine sending the logs,
|
||||||
|
and appends the network/DNS domain if available.
|
||||||
|
"""
|
||||||
|
# 1. Try fully-qualified domain name (FQDN)
|
||||||
|
fqdn = socket.getfqdn()
|
||||||
|
if fqdn and "." in fqdn and not fqdn.startswith("localhost"):
|
||||||
|
return fqdn
|
||||||
|
|
||||||
|
hostname = socket.gethostname()
|
||||||
|
|
||||||
|
# 2. Check /etc/resolv.conf domain or search directive
|
||||||
|
try:
|
||||||
|
if os.path.exists("/etc/resolv.conf"):
|
||||||
|
with open("/etc/resolv.conf", "r", encoding="utf-8") as f:
|
||||||
|
for line in f:
|
||||||
|
parts = line.strip().split()
|
||||||
|
if parts and parts[0] in ["domain", "search"] and len(parts) > 1:
|
||||||
|
domain = parts[1]
|
||||||
|
if domain and not domain.startswith("."):
|
||||||
|
return f"{hostname}.{domain}"
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
# 3. Try reverse DNS lookup
|
||||||
|
try:
|
||||||
|
host_ip = socket.gethostbyname(hostname)
|
||||||
|
canonical_name = socket.gethostbyaddr(host_ip)[0]
|
||||||
|
if canonical_name and "." in canonical_name and not canonical_name.startswith("localhost"):
|
||||||
|
return canonical_name
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return hostname
|
||||||
|
|
||||||
|
|
||||||
|
def get_recent_linux_logs(hours: int = 24, state: Optional[dict] = None) -> list:
|
||||||
|
"""
|
||||||
|
Collects info, warnings, and errors from systemd journalctl over the lookback window.
|
||||||
|
Edge Filtering: Retains INFO, WARNING, and ERROR. Strips DEBUG (priority 7) and skips events older than lookback window (default: 24h).
|
||||||
|
State Tracking: Skips events older than lookback window (default 24h) and events
|
||||||
|
that have already been sent in previous runs.
|
||||||
|
"""
|
||||||
|
last_cursor = None
|
||||||
|
last_timestamp_us = 0.0
|
||||||
|
sent_cursors = set()
|
||||||
|
if state:
|
||||||
|
last_cursor = state.get("last_cursor")
|
||||||
|
try:
|
||||||
|
last_timestamp_us = float(state.get("last_timestamp_us", 0))
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
last_timestamp_us = 0.0
|
||||||
|
sent_cursors = set(state.get("sent_cursors", []))
|
||||||
|
|
||||||
|
cmd = ["journalctl", "--since", f"{hours} hours ago", "-p", "info", "--output=json"]
|
||||||
|
result = None
|
||||||
|
|
||||||
|
if last_cursor:
|
||||||
|
cmd_with_cursor = ["journalctl", "--since", f"{hours} hours ago", "--after-cursor", str(last_cursor), "-p", "info", "--output=json"]
|
||||||
|
try:
|
||||||
|
res = subprocess.run(cmd_with_cursor, capture_output=True, text=True, check=False)
|
||||||
|
if res.returncode == 0:
|
||||||
|
result = res
|
||||||
|
except FileNotFoundError:
|
||||||
|
print("[!] journalctl command not found. Ensure this script runs on a systemd-enabled Linux system.")
|
||||||
|
return []
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
if result is None:
|
||||||
|
try:
|
||||||
|
result = subprocess.run(cmd, capture_output=True, text=True, check=False)
|
||||||
|
except FileNotFoundError:
|
||||||
|
print("[!] journalctl command not found. Ensure this script runs on a systemd-enabled Linux system.")
|
||||||
|
return []
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[!] Error running journalctl: {e}")
|
||||||
|
return []
|
||||||
|
|
||||||
|
logs = []
|
||||||
|
machine_id = get_machine_identifier()
|
||||||
|
cutoff_epoch_us = (datetime.now(timezone.utc) - timedelta(hours=hours)).timestamp() * 1_000_000
|
||||||
|
|
||||||
|
newest_cursor = None
|
||||||
|
newest_timestamp_us = last_timestamp_us
|
||||||
|
collected_cursors = []
|
||||||
|
|
||||||
|
for line in result.stdout.splitlines():
|
||||||
|
line_str = line.strip()
|
||||||
|
if not line_str:
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
entry = json.loads(line_str)
|
||||||
|
entry_cursor = entry.get("__CURSOR")
|
||||||
|
entry_ts_us_raw = entry.get("__REALTIME_TIMESTAMP")
|
||||||
|
|
||||||
|
entry_ts_us = 0.0
|
||||||
|
if entry_ts_us_raw:
|
||||||
|
try:
|
||||||
|
entry_ts_us = float(entry_ts_us_raw)
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
# 1. Skip entries older than lookback window (default: 24h)
|
||||||
|
if entry_ts_us and entry_ts_us < cutoff_epoch_us:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# 2. Skip already sent events
|
||||||
|
if entry_cursor and (entry_cursor in sent_cursors or entry_cursor == last_cursor):
|
||||||
|
continue
|
||||||
|
if last_timestamp_us > 0 and entry_ts_us > 0 and entry_ts_us < last_timestamp_us:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Advance newest tracking for new entries
|
||||||
|
if entry_cursor:
|
||||||
|
newest_cursor = entry_cursor
|
||||||
|
collected_cursors.append(entry_cursor)
|
||||||
|
if entry_ts_us > newest_timestamp_us:
|
||||||
|
newest_timestamp_us = entry_ts_us
|
||||||
|
|
||||||
|
priority = int(entry.get("PRIORITY", "6"))
|
||||||
|
# Priority 0: Emerg, 1: Alert, 2: Crit, 3: Err (-> ERROR)
|
||||||
|
# Priority 4: Warning, 5: Notice (-> WARNING)
|
||||||
|
# Priority 6: Info (-> INFO)
|
||||||
|
# Priority 7: Debug (skip)
|
||||||
|
if priority > 6:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if priority <= 3:
|
||||||
|
sev = "ERROR"
|
||||||
|
elif priority in (4, 5):
|
||||||
|
sev = "WARNING"
|
||||||
|
else:
|
||||||
|
sev = "INFO"
|
||||||
|
|
||||||
|
logs.append({
|
||||||
|
"server": machine_id,
|
||||||
|
"os_type": "linux",
|
||||||
|
"signature": entry.get("SYSLOG_IDENTIFIER", "unknown"),
|
||||||
|
"severity": sev,
|
||||||
|
"message": entry.get("MESSAGE", "")[:2048]
|
||||||
|
})
|
||||||
|
except (json.JSONDecodeError, ValueError):
|
||||||
|
continue
|
||||||
|
|
||||||
|
if state is not None:
|
||||||
|
state["new_last_cursor"] = newest_cursor or last_cursor
|
||||||
|
state["new_last_timestamp_us"] = max(newest_timestamp_us, last_timestamp_us)
|
||||||
|
state["new_sent_cursors"] = (list(sent_cursors) + collected_cursors)[-1000:]
|
||||||
|
state["last_run_timestamp"] = datetime.now(timezone.utc).isoformat()
|
||||||
|
|
||||||
|
return logs
|
||||||
|
|
||||||
|
|
||||||
|
def send_encrypted_logs_over_socket(config: dict, logs: list):
|
||||||
|
"""
|
||||||
|
Encrypts the payload using the server's OpenPGP public key and streams
|
||||||
|
over an authenticated TCP socket.
|
||||||
|
"""
|
||||||
|
server_host = config["server_host"]
|
||||||
|
server_port = int(config["server_port"])
|
||||||
|
auth_token = config["auth_token"]
|
||||||
|
pub_key_armored = config["server_public_key"]
|
||||||
|
expected_fp = config.get("server_fingerprint", "").replace(" ", "").upper()
|
||||||
|
|
||||||
|
# Load and verify server public key
|
||||||
|
pub_key, _ = pgpy.PGPKey.from_blob(pub_key_armored)
|
||||||
|
actual_fp = str(pub_key.fingerprint).replace(" ", "").upper()
|
||||||
|
if expected_fp and actual_fp != expected_fp:
|
||||||
|
raise ValueError(
|
||||||
|
f"Server fingerprint mismatch! Expected {expected_fp}, but key has {actual_fp}."
|
||||||
|
)
|
||||||
|
|
||||||
|
machine_id = get_machine_identifier()
|
||||||
|
|
||||||
|
# Prepare batch
|
||||||
|
payload = {
|
||||||
|
"server": machine_id,
|
||||||
|
"timestamp": datetime.now(timezone.utc).isoformat(),
|
||||||
|
"logs": logs
|
||||||
|
}
|
||||||
|
payload_json = json.dumps(payload)
|
||||||
|
|
||||||
|
# Encrypt payload with server's encryption-only key
|
||||||
|
pgp_msg = pgpy.PGPMessage.new(payload_json)
|
||||||
|
encrypted_msg = pub_key.encrypt(pgp_msg)
|
||||||
|
encrypted_armored = str(encrypted_msg)
|
||||||
|
|
||||||
|
# Envelope with socket authentication header
|
||||||
|
envelope = {
|
||||||
|
"auth_token": auth_token,
|
||||||
|
"timestamp": datetime.now(timezone.utc).isoformat(),
|
||||||
|
"encrypted_payload": encrypted_armored
|
||||||
|
}
|
||||||
|
envelope_bytes = json.dumps(envelope).encode("utf-8")
|
||||||
|
|
||||||
|
# Connect over TCP socket and transmit with 4-byte length prefix framing
|
||||||
|
print(f"[*] Connecting to LOGAR server at {server_host}:{server_port} over secure TCP socket...")
|
||||||
|
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
|
||||||
|
sock.settimeout(15.0)
|
||||||
|
sock.connect((server_host, server_port))
|
||||||
|
|
||||||
|
# Send frame: length (4 bytes big-endian) + envelope
|
||||||
|
frame = struct.pack(">I", len(envelope_bytes)) + envelope_bytes
|
||||||
|
sock.sendall(frame)
|
||||||
|
|
||||||
|
# Receive response length
|
||||||
|
resp_len_bytes = sock.recv(4)
|
||||||
|
if not resp_len_bytes:
|
||||||
|
raise ConnectionError("Server closed connection without response.")
|
||||||
|
|
||||||
|
resp_len = struct.unpack(">I", resp_len_bytes)[0]
|
||||||
|
resp_bytes = bytearray()
|
||||||
|
while len(resp_bytes) < resp_len:
|
||||||
|
chunk = sock.recv(min(4096, resp_len - len(resp_bytes)))
|
||||||
|
if not chunk:
|
||||||
|
break
|
||||||
|
resp_bytes.extend(chunk)
|
||||||
|
|
||||||
|
response = json.loads(resp_bytes.decode("utf-8"))
|
||||||
|
print(f"[+] Server response: {response}")
|
||||||
|
return response
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser = argparse.ArgumentParser(description="LOGAR Linux Edge Log Forwarder with State Tracking")
|
||||||
|
parser.add_argument("--config", default=CONFIG_FILE_NAME, help="Path to client_config.json")
|
||||||
|
parser.add_argument("--hours", type=int, default=24, help="Lookback window in hours for journalctl logs (default: 24)")
|
||||||
|
parser.add_argument("--state-file", default=None, help="Path to state tracking file (default: client_state.json next to config)")
|
||||||
|
parser.add_argument("--no-state", action="store_true", help="Disable state tracking and send all events matching lookback window")
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
try:
|
||||||
|
config = load_config(args.config)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[!] Configuration error: {e}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
state_path = get_state_path(args.config, args.state_file)
|
||||||
|
state = None if args.no_state else load_state(state_path)
|
||||||
|
|
||||||
|
machine_id = get_machine_identifier()
|
||||||
|
print(f"[*] Edge Forwarder Node: {machine_id}")
|
||||||
|
if state and ("last_cursor" in state or "last_timestamp_us" in state):
|
||||||
|
print(f"[*] State tracking active: resuming after previous cursor/timestamp (state file: {state_path})")
|
||||||
|
elif not args.no_state:
|
||||||
|
print(f"[*] State tracking initialized (state file: {state_path})")
|
||||||
|
|
||||||
|
print(f"[*] Scanning Linux journalctl for unsent entries (last {args.hours} hours)...")
|
||||||
|
candidate_logs = get_recent_linux_logs(hours=args.hours, state=state)
|
||||||
|
print(f"[*] Found {len(candidate_logs)} unsent candidate entries (INFO to ERROR, entries > {args.hours}h and already-sent skipped).")
|
||||||
|
|
||||||
|
if not candidate_logs:
|
||||||
|
print("[*] No new unsent events to transmit.")
|
||||||
|
if state is not None:
|
||||||
|
commit_state(state, state_path)
|
||||||
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
resp = send_encrypted_logs_over_socket(config, candidate_logs)
|
||||||
|
if state is not None and resp and resp.get("status") == "success":
|
||||||
|
commit_state(state, state_path)
|
||||||
|
print(f"[+] State successfully committed to {state_path}")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[!] Failed to stream logs to server: {e}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -179,10 +179,13 @@ def process_ingested_logs(payload: Dict[str, Any], db_path: str, window_hours: i
|
|||||||
|
|
||||||
for log in logs:
|
for log in logs:
|
||||||
severity = str(log.get("severity", "WARNING")).upper()
|
severity = str(log.get("severity", "WARNING")).upper()
|
||||||
# Edge forwarder filter safeguard (strip informational noise)
|
# Edge forwarder filter safeguard: retain INFO to ERROR / CRITICAL; strip verbose debug noise
|
||||||
if severity in ["INFO", "DEBUG"]:
|
if severity in ["DEBUG", "TRACE"]:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
# Errors are always passed immediately; the 4-run rule only concerns warnings
|
||||||
|
is_error = severity in ["ERROR", "CRITICAL", "FATAL"]
|
||||||
|
|
||||||
signature = log.get("signature", "unknown")
|
signature = log.get("signature", "unknown")
|
||||||
server = log.get("server", client_server)
|
server = log.get("server", client_server)
|
||||||
message = log.get("message", "")
|
message = log.get("message", "")
|
||||||
@@ -207,7 +210,7 @@ def process_ingested_logs(payload: Dict[str, Any], db_path: str, window_hours: i
|
|||||||
# Window elapsed: reset to new cycle
|
# Window elapsed: reset to new cycle
|
||||||
new_runs = 1
|
new_runs = 1
|
||||||
new_first_seen = now_iso
|
new_first_seen = now_iso
|
||||||
new_status = "TRANSIENT"
|
new_status = "VERIFIED" if is_error else "TRANSIENT"
|
||||||
else:
|
else:
|
||||||
# Same run guard: only increment count once per distinct run batch
|
# Same run guard: only increment count once per distinct run batch
|
||||||
if last_run_id != run_id:
|
if last_run_id != run_id:
|
||||||
@@ -215,8 +218,8 @@ def process_ingested_logs(payload: Dict[str, Any], db_path: str, window_hours: i
|
|||||||
else:
|
else:
|
||||||
new_runs = run_count
|
new_runs = run_count
|
||||||
new_first_seen = first_seen_str
|
new_first_seen = first_seen_str
|
||||||
# 4-run rule enforcement
|
# 4-run rule applies to warnings; errors are always passed immediately as VERIFIED
|
||||||
new_status = "VERIFIED" if new_runs >= min_runs else "TRANSIENT"
|
new_status = "VERIFIED" if (is_error or new_runs >= min_runs) else "TRANSIENT"
|
||||||
|
|
||||||
if new_status == "VERIFIED" and current_status != "VERIFIED":
|
if new_status == "VERIFIED" and current_status != "VERIFIED":
|
||||||
promoted_to_verified += 1
|
promoted_to_verified += 1
|
||||||
@@ -227,7 +230,9 @@ def process_ingested_logs(payload: Dict[str, Any], db_path: str, window_hours: i
|
|||||||
WHERE fingerprint = ?
|
WHERE fingerprint = ?
|
||||||
""", (new_runs, now_iso, new_first_seen, new_status, run_id, message, severity, fp))
|
""", (new_runs, now_iso, new_first_seen, new_status, run_id, message, severity, fp))
|
||||||
else:
|
else:
|
||||||
initial_status = "VERIFIED" if 1 >= min_runs else "TRANSIENT"
|
initial_status = "VERIFIED" if (is_error or 1 >= min_runs) else "TRANSIENT"
|
||||||
|
if initial_status == "VERIFIED":
|
||||||
|
promoted_to_verified += 1
|
||||||
cursor.execute("""
|
cursor.execute("""
|
||||||
INSERT INTO active_issues
|
INSERT INTO active_issues
|
||||||
(fingerprint, site_name, server, signature, severity, message, os_type, first_seen, last_seen, run_count, status, last_run_id)
|
(fingerprint, site_name, server, signature, severity, message, os_type, first_seen, last_seen, run_count, status, last_run_id)
|
||||||
@@ -328,8 +333,8 @@ def get_hermes_report():
|
|||||||
cursor.execute("""
|
cursor.execute("""
|
||||||
SELECT fingerprint, site_name, server, signature, severity, message, os_type, first_seen, last_seen, run_count, status
|
SELECT fingerprint, site_name, server, signature, severity, message, os_type, first_seen, last_seen, run_count, status
|
||||||
FROM active_issues
|
FROM active_issues
|
||||||
WHERE status = 'VERIFIED' AND run_count >= ?
|
WHERE status = 'VERIFIED'
|
||||||
""", (min_runs,))
|
""")
|
||||||
rows = cursor.fetchall()
|
rows = cursor.fetchall()
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|
||||||
@@ -452,7 +457,7 @@ def main():
|
|||||||
print("=" * 60)
|
print("=" * 60)
|
||||||
print(f" LOGAR Server Hub: {config['server_name']}")
|
print(f" LOGAR Server Hub: {config['server_name']}")
|
||||||
print(f" Encryption Fingerprint: {config['server_fingerprint']}")
|
print(f" Encryption Fingerprint: {config['server_fingerprint']}")
|
||||||
print(f" Evaluation Window: {config['evaluation_window_hours']} hours | Rule: {config['min_persistence_runs']}+ consecutive runs")
|
print(f" Evaluation Window: {config['evaluation_window_hours']} hours | 4-Run Rule: Warnings | Immediate Pass: Errors")
|
||||||
print("=" * 60)
|
print("=" * 60)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -6,6 +6,7 @@ import struct
|
|||||||
import argparse
|
import argparse
|
||||||
import warnings
|
import warnings
|
||||||
from datetime import datetime, timezone, timedelta
|
from datetime import datetime, timezone, timedelta
|
||||||
|
from typing import Optional, Dict, Any, List
|
||||||
|
|
||||||
# Suppress cryptography / pgpy deprecation notices
|
# Suppress cryptography / pgpy deprecation notices
|
||||||
warnings.filterwarnings("ignore")
|
warnings.filterwarnings("ignore")
|
||||||
@@ -18,6 +19,45 @@ except ImportError:
|
|||||||
win32evtlog = None
|
win32evtlog = None
|
||||||
|
|
||||||
CONFIG_FILE_NAME = "client_config.json"
|
CONFIG_FILE_NAME = "client_config.json"
|
||||||
|
STATE_FILE_NAME = "client_state.json"
|
||||||
|
|
||||||
|
|
||||||
|
def get_state_path(config_path: str, custom_state_path: Optional[str] = None) -> str:
|
||||||
|
if custom_state_path:
|
||||||
|
return custom_state_path
|
||||||
|
config_dir = os.path.dirname(os.path.abspath(config_path))
|
||||||
|
return os.path.join(config_dir, STATE_FILE_NAME)
|
||||||
|
|
||||||
|
|
||||||
|
def load_state(state_path: str) -> dict:
|
||||||
|
if os.path.exists(state_path):
|
||||||
|
try:
|
||||||
|
with open(state_path, "r", encoding="utf-8") as f:
|
||||||
|
return json.load(f)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[!] Warning: Failed to read state file '{state_path}': {e}")
|
||||||
|
return {}
|
||||||
|
return {}
|
||||||
|
|
||||||
|
|
||||||
|
def save_state(state_path: str, state: dict):
|
||||||
|
try:
|
||||||
|
temp_path = f"{state_path}.tmp"
|
||||||
|
with open(temp_path, "w", encoding="utf-8") as f:
|
||||||
|
json.dump(state, f, indent=2)
|
||||||
|
os.replace(temp_path, state_path)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[!] Warning: Could not save client state to '{state_path}': {e}")
|
||||||
|
|
||||||
|
|
||||||
|
def commit_state(state: dict, state_path: str):
|
||||||
|
if "new_last_record_number" in state:
|
||||||
|
val = state.pop("new_last_record_number")
|
||||||
|
if val:
|
||||||
|
state["last_record_number"] = val
|
||||||
|
if "new_sent_record_ids" in state:
|
||||||
|
state["sent_record_ids"] = state.pop("new_sent_record_ids")
|
||||||
|
save_state(state_path, state)
|
||||||
|
|
||||||
|
|
||||||
def load_config(config_path: str = CONFIG_FILE_NAME):
|
def load_config(config_path: str = CONFIG_FILE_NAME):
|
||||||
@@ -55,10 +95,12 @@ def get_machine_identifier() -> str:
|
|||||||
return hostname
|
return hostname
|
||||||
|
|
||||||
|
|
||||||
def get_recent_windows_logs(hours: int = 6):
|
def get_recent_windows_logs(hours: int = 24, state: Optional[dict] = None) -> list:
|
||||||
"""
|
"""
|
||||||
Scans the Windows Application Event Log backwards for events within the window.
|
Scans the Windows Application Event Log backwards for events within the window.
|
||||||
Edge Thinness & Noise Stripping: INFO and DEBUG events are dropped at the source.
|
Edge Filtering: Retains INFO, WARNING, and ERROR. Drops Audit and Debug noise.
|
||||||
|
State Tracking: Skips events older than lookback window (default 24h) and events
|
||||||
|
that have already been sent in previous runs.
|
||||||
"""
|
"""
|
||||||
if win32evtlog is None:
|
if win32evtlog is None:
|
||||||
print("[!] pywin32 is not installed or not running on Windows. Returning mock/empty candidate list.")
|
print("[!] pywin32 is not installed or not running on Windows. Returning mock/empty candidate list.")
|
||||||
@@ -78,23 +120,51 @@ def get_recent_windows_logs(hours: int = 6):
|
|||||||
cutoff_time = datetime.now() - timedelta(hours=hours)
|
cutoff_time = datetime.now() - timedelta(hours=hours)
|
||||||
machine_id = get_machine_identifier()
|
machine_id = get_machine_identifier()
|
||||||
|
|
||||||
|
last_record_number = 0
|
||||||
|
sent_record_ids = set()
|
||||||
|
if state:
|
||||||
|
last_record_number = int(state.get("last_record_number", 0))
|
||||||
|
sent_record_ids = set(state.get("sent_record_ids", []))
|
||||||
|
|
||||||
|
# Windows Event Log EventTypes:
|
||||||
|
# 1: EVENTLOG_ERROR_TYPE -> ERROR
|
||||||
|
# 2: EVENTLOG_WARNING_TYPE -> WARNING
|
||||||
|
# 4: EVENTLOG_INFORMATION_TYPE -> INFO
|
||||||
|
# Excludes: 8 (Audit Success), 16 (Audit Failure), and other verbose noise
|
||||||
sev_map = {
|
sev_map = {
|
||||||
1: "CRITICAL",
|
1: "ERROR",
|
||||||
2: "ERROR",
|
2: "WARNING",
|
||||||
3: "WARNING"
|
4: "INFO"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
newest_record_number = 0
|
||||||
|
collected_record_ids = []
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
events = win32evtlog.ReadEventLog(hand, flags, 0)
|
events = win32evtlog.ReadEventLog(hand, flags, 0)
|
||||||
if not events:
|
if not events:
|
||||||
break
|
break
|
||||||
|
|
||||||
for event in events:
|
for event in events:
|
||||||
|
rec_num = int(event.RecordNumber)
|
||||||
|
if newest_record_number == 0:
|
||||||
|
newest_record_number = rec_num
|
||||||
|
|
||||||
|
# 1. Skip entries older than lookback window (default: 24h)
|
||||||
if event.TimeGenerated < cutoff_time:
|
if event.TimeGenerated < cutoff_time:
|
||||||
break
|
break
|
||||||
|
|
||||||
# Drop conversational or informational noise (INFO=4, etc.) at source
|
# 2. Skip already sent events if we've reached records <= last_record_number
|
||||||
# Only retain Critical (1), Error (2), and Warning (3)
|
# (unless the log was cleared and numbers wrapped, i.e. newest_record_number < last_record_number)
|
||||||
|
if last_record_number > 0 and newest_record_number >= last_record_number:
|
||||||
|
if rec_num <= last_record_number:
|
||||||
|
break
|
||||||
|
|
||||||
|
rec_id = f"{rec_num}:{event.TimeGenerated.isoformat()}"
|
||||||
|
if rec_id in sent_record_ids:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Filter: upload everything from INFO to ERROR only
|
||||||
if event.EventType in sev_map:
|
if event.EventType in sev_map:
|
||||||
msg = " ".join(event.StringInserts) if event.StringInserts else "Event Log Entry"
|
msg = " ".join(event.StringInserts) if event.StringInserts else "Event Log Entry"
|
||||||
logs.append({
|
logs.append({
|
||||||
@@ -104,11 +174,21 @@ def get_recent_windows_logs(hours: int = 6):
|
|||||||
"severity": sev_map[event.EventType],
|
"severity": sev_map[event.EventType],
|
||||||
"message": msg[:2048] # Limit message length
|
"message": msg[:2048] # Limit message length
|
||||||
})
|
})
|
||||||
|
collected_record_ids.append(rec_id)
|
||||||
|
|
||||||
if events[-1].TimeGenerated < cutoff_time:
|
if events[-1].TimeGenerated < cutoff_time:
|
||||||
break
|
break
|
||||||
|
if last_record_number > 0 and newest_record_number >= last_record_number and events[-1].RecordNumber <= last_record_number:
|
||||||
|
break
|
||||||
|
|
||||||
win32evtlog.CloseEventLog(hand)
|
win32evtlog.CloseEventLog(hand)
|
||||||
|
|
||||||
|
if state is not None:
|
||||||
|
target_rec = max(newest_record_number, last_record_number)
|
||||||
|
state["new_last_record_number"] = target_rec
|
||||||
|
state["new_sent_record_ids"] = (list(sent_record_ids) + collected_record_ids)[-1000:]
|
||||||
|
state["last_run_timestamp"] = datetime.now(timezone.utc).isoformat()
|
||||||
|
|
||||||
return logs
|
return logs
|
||||||
|
|
||||||
|
|
||||||
@@ -183,9 +263,11 @@ def send_encrypted_logs_over_socket(config: dict, logs: list):
|
|||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
parser = argparse.ArgumentParser(description="LOGAR Windows Edge Log Forwarder (Zero State)")
|
parser = argparse.ArgumentParser(description="LOGAR Windows Edge Log Forwarder with State Tracking")
|
||||||
parser.add_argument("--config", default=CONFIG_FILE_NAME, help="Path to client_config.json")
|
parser.add_argument("--config", default=CONFIG_FILE_NAME, help="Path to client_config.json")
|
||||||
parser.add_argument("--hours", type=int, default=6, help="Lookback window in hours for event logs")
|
parser.add_argument("--hours", type=int, default=24, help="Lookback window in hours for event logs (default: 24)")
|
||||||
|
parser.add_argument("--state-file", default=None, help="Path to state tracking file (default: client_state.json next to config)")
|
||||||
|
parser.add_argument("--no-state", action="store_true", help="Disable state tracking and send all events matching lookback window")
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -194,14 +276,31 @@ def main():
|
|||||||
print(f"[!] Configuration error: {e}")
|
print(f"[!] Configuration error: {e}")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
state_path = get_state_path(args.config, args.state_file)
|
||||||
|
state = None if args.no_state else load_state(state_path)
|
||||||
|
|
||||||
machine_id = get_machine_identifier()
|
machine_id = get_machine_identifier()
|
||||||
print(f"[*] Edge Forwarder Node: {machine_id}")
|
print(f"[*] Edge Forwarder Node: {machine_id}")
|
||||||
print(f"[*] Scanning Windows Application event log for candidate anomalies (last {args.hours} hours)...")
|
if state and "last_record_number" in state:
|
||||||
candidate_logs = get_recent_windows_logs(hours=args.hours)
|
print(f"[*] State tracking active: resuming from record #{state['last_record_number']} (state file: {state_path})")
|
||||||
print(f"[*] Found {len(candidate_logs)} candidate anomalies (noise stripped at source).")
|
elif not args.no_state:
|
||||||
|
print(f"[*] State tracking initialized (state file: {state_path})")
|
||||||
|
|
||||||
|
print(f"[*] Scanning Windows Application event log for unsent entries (last {args.hours} hours)...")
|
||||||
|
candidate_logs = get_recent_windows_logs(hours=args.hours, state=state)
|
||||||
|
print(f"[*] Found {len(candidate_logs)} unsent candidate entries (INFO to ERROR, entries > {args.hours}h and already-sent skipped).")
|
||||||
|
|
||||||
|
if not candidate_logs:
|
||||||
|
print("[*] No new unsent events to transmit.")
|
||||||
|
if state is not None:
|
||||||
|
commit_state(state, state_path)
|
||||||
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
send_encrypted_logs_over_socket(config, candidate_logs)
|
resp = send_encrypted_logs_over_socket(config, candidate_logs)
|
||||||
|
if state is not None and resp and resp.get("status") == "success":
|
||||||
|
commit_state(state, state_path)
|
||||||
|
print(f"[+] State successfully committed to {state_path}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"[!] Failed to stream logs to server: {e}")
|
print(f"[!] Failed to stream logs to server: {e}")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
@@ -0,0 +1,203 @@
|
|||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import json
|
||||||
|
import struct
|
||||||
|
import unittest
|
||||||
|
import warnings
|
||||||
|
|
||||||
|
warnings.filterwarnings("ignore")
|
||||||
|
|
||||||
|
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
||||||
|
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
|
||||||
|
|
||||||
|
import Linux_Client
|
||||||
|
import pgpy
|
||||||
|
from pgpy.constants import PubKeyAlgorithm, KeyFlags, HashAlgorithm, SymmetricKeyAlgorithm, CompressionAlgorithm
|
||||||
|
|
||||||
|
|
||||||
|
class TestLinuxClientComponent(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.dummy_config = "test_linux_client_config.json"
|
||||||
|
# Generate dummy PGP key for testing
|
||||||
|
key = pgpy.PGPKey.new(PubKeyAlgorithm.RSAEncryptOrSign, 2048)
|
||||||
|
uid = pgpy.PGPUID.new("TestHub")
|
||||||
|
key.add_uid(
|
||||||
|
uid,
|
||||||
|
usage={KeyFlags.EncryptCommunications, KeyFlags.EncryptStorage},
|
||||||
|
hashes=[HashAlgorithm.SHA256],
|
||||||
|
ciphers=[SymmetricKeyAlgorithm.AES256],
|
||||||
|
compression=[CompressionAlgorithm.Uncompressed]
|
||||||
|
)
|
||||||
|
self.server_priv = key
|
||||||
|
self.server_pub = key.pubkey
|
||||||
|
self.fingerprint = str(key.pubkey.fingerprint)
|
||||||
|
|
||||||
|
with open(self.dummy_config, "w", encoding="utf-8") as f:
|
||||||
|
json.dump({
|
||||||
|
"server_host": "127.0.0.1",
|
||||||
|
"server_port": 9443,
|
||||||
|
"server_fingerprint": self.fingerprint,
|
||||||
|
"server_public_key": str(self.server_pub),
|
||||||
|
"auth_token": "secret-test-token"
|
||||||
|
}, f)
|
||||||
|
|
||||||
|
def tearDown(self):
|
||||||
|
if os.path.exists(self.dummy_config):
|
||||||
|
try:
|
||||||
|
os.remove(self.dummy_config)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def test_client_config_anonymity(self):
|
||||||
|
config = Linux_Client.load_config(self.dummy_config)
|
||||||
|
self.assertNotIn("server_name", config)
|
||||||
|
self.assertNotIn("name", config)
|
||||||
|
self.assertNotIn("site_name", config)
|
||||||
|
self.assertEqual(config["server_fingerprint"], self.fingerprint)
|
||||||
|
|
||||||
|
def test_get_machine_identifier(self):
|
||||||
|
machine_id = Linux_Client.get_machine_identifier()
|
||||||
|
self.assertIsInstance(machine_id, str)
|
||||||
|
self.assertGreater(len(machine_id), 0)
|
||||||
|
self.assertNotEqual(machine_id, "localhost")
|
||||||
|
|
||||||
|
def test_journalctl_parsing_and_priority_filter(self):
|
||||||
|
sample_journal_lines = [
|
||||||
|
json.dumps({"PRIORITY": "3", "SYSLOG_IDENTIFIER": "sshd", "MESSAGE": "Failed password for root"}),
|
||||||
|
json.dumps({"PRIORITY": "4", "SYSLOG_IDENTIFIER": "systemd", "MESSAGE": "Unit entered failed state"}),
|
||||||
|
json.dumps({"PRIORITY": "6", "SYSLOG_IDENTIFIER": "cron", "MESSAGE": "Informational session opened"}),
|
||||||
|
json.dumps({"PRIORITY": "7", "SYSLOG_IDENTIFIER": "debugd", "MESSAGE": "Verbose debugging log"}),
|
||||||
|
]
|
||||||
|
logs = []
|
||||||
|
machine_id = Linux_Client.get_machine_identifier()
|
||||||
|
for line_str in sample_journal_lines:
|
||||||
|
entry = json.loads(line_str)
|
||||||
|
priority = int(entry.get("PRIORITY", "6"))
|
||||||
|
# Filter: Retain INFO to ERROR (<= 6), drop DEBUG (> 6)
|
||||||
|
if priority > 6:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if priority <= 3:
|
||||||
|
sev = "ERROR"
|
||||||
|
elif priority in (4, 5):
|
||||||
|
sev = "WARNING"
|
||||||
|
else:
|
||||||
|
sev = "INFO"
|
||||||
|
|
||||||
|
logs.append({
|
||||||
|
"server": machine_id,
|
||||||
|
"os_type": "linux",
|
||||||
|
"signature": entry.get("SYSLOG_IDENTIFIER", "unknown"),
|
||||||
|
"severity": sev,
|
||||||
|
"message": entry.get("MESSAGE", "")
|
||||||
|
})
|
||||||
|
|
||||||
|
# Priority 7 (DEBUG) must be stripped, while 3 (ERROR), 4 (WARNING), 6 (INFO) are retained
|
||||||
|
self.assertEqual(len(logs), 3)
|
||||||
|
self.assertEqual(logs[0]["severity"], "ERROR")
|
||||||
|
self.assertEqual(logs[1]["severity"], "WARNING")
|
||||||
|
self.assertEqual(logs[2]["severity"], "INFO")
|
||||||
|
|
||||||
|
def test_encryption_and_decryption(self):
|
||||||
|
config = Linux_Client.load_config(self.dummy_config)
|
||||||
|
pub_key, _ = pgpy.PGPKey.from_blob(config["server_public_key"])
|
||||||
|
payload = {
|
||||||
|
"server": Linux_Client.get_machine_identifier(),
|
||||||
|
"logs": [{"signature": "kernel", "severity": "ERROR", "message": "Kernel panic - not syncing"}]
|
||||||
|
}
|
||||||
|
msg = pgpy.PGPMessage.new(json.dumps(payload))
|
||||||
|
enc = pub_key.encrypt(msg)
|
||||||
|
self.assertTrue(str(enc).startswith("-----BEGIN PGP MESSAGE-----"))
|
||||||
|
|
||||||
|
dec = self.server_priv.decrypt(enc)
|
||||||
|
restored = json.loads(dec.message)
|
||||||
|
self.assertEqual(restored["logs"][0]["signature"], "kernel")
|
||||||
|
|
||||||
|
def test_state_lifecycle(self):
|
||||||
|
state_path = "test_linux_state.json"
|
||||||
|
try:
|
||||||
|
# 1. Load non-existent returns empty dict
|
||||||
|
state = Linux_Client.load_state(state_path)
|
||||||
|
self.assertEqual(state, {})
|
||||||
|
|
||||||
|
# 2. Stage new cursor and timestamp
|
||||||
|
state["new_last_cursor"] = "s=abc;i=123"
|
||||||
|
state["new_last_timestamp_us"] = 1700000000000000
|
||||||
|
state["new_sent_cursors"] = ["s=abc;i=123"]
|
||||||
|
|
||||||
|
# 3. Commit state moves staged keys to permanent and writes atomically
|
||||||
|
Linux_Client.commit_state(state, state_path)
|
||||||
|
self.assertNotIn("new_last_cursor", state)
|
||||||
|
self.assertEqual(state.get("last_cursor"), "s=abc;i=123")
|
||||||
|
self.assertEqual(state.get("last_timestamp_us"), 1700000000000000)
|
||||||
|
self.assertEqual(state.get("sent_cursors"), ["s=abc;i=123"])
|
||||||
|
|
||||||
|
# 4. Reload from disk
|
||||||
|
reloaded = Linux_Client.load_state(state_path)
|
||||||
|
self.assertEqual(reloaded.get("last_cursor"), "s=abc;i=123")
|
||||||
|
self.assertEqual(reloaded.get("last_timestamp_us"), 1700000000000000)
|
||||||
|
finally:
|
||||||
|
if os.path.exists(state_path):
|
||||||
|
os.remove(state_path)
|
||||||
|
|
||||||
|
def test_duplicate_suppression_and_lookback_logic(self):
|
||||||
|
from datetime import datetime, timezone, timedelta
|
||||||
|
now_us = datetime.now(timezone.utc).timestamp() * 1_000_000
|
||||||
|
cutoff_epoch_us = (datetime.now(timezone.utc) - timedelta(hours=24)).timestamp() * 1_000_000
|
||||||
|
|
||||||
|
mock_entries = [
|
||||||
|
# 1. 26 hours old -> skip (> 24h)
|
||||||
|
{"__CURSOR": "c1", "__REALTIME_TIMESTAMP": str(int(now_us - 26 * 3600 * 1_000_000)), "PRIORITY": "3", "MESSAGE": "Old error"},
|
||||||
|
# 2. 2 hours old, already sent -> skip
|
||||||
|
{"__CURSOR": "c2", "__REALTIME_TIMESTAMP": str(int(now_us - 2 * 3600 * 1_000_000)), "PRIORITY": "4", "MESSAGE": "Already sent warning"},
|
||||||
|
# 3. 1 hour old, new entry -> retain
|
||||||
|
{"__CURSOR": "c3", "__REALTIME_TIMESTAMP": str(int(now_us - 1 * 3600 * 1_000_000)), "PRIORITY": "6", "MESSAGE": "New info"},
|
||||||
|
# 4. 30 mins old, debug -> skip priority
|
||||||
|
{"__CURSOR": "c4", "__REALTIME_TIMESTAMP": str(int(now_us - 1800 * 1_000_000)), "PRIORITY": "7", "MESSAGE": "Debug entry"}
|
||||||
|
]
|
||||||
|
|
||||||
|
state = {
|
||||||
|
"last_cursor": "c2",
|
||||||
|
"last_timestamp_us": int(now_us - 2 * 3600 * 1_000_000),
|
||||||
|
"sent_cursors": ["c2"]
|
||||||
|
}
|
||||||
|
|
||||||
|
# Simulate the filtering loop from get_recent_linux_logs
|
||||||
|
logs = []
|
||||||
|
last_cursor = state.get("last_cursor")
|
||||||
|
last_timestamp_us = float(state.get("last_timestamp_us", 0))
|
||||||
|
sent_cursors = set(state.get("sent_cursors", []))
|
||||||
|
newest_cursor = None
|
||||||
|
newest_timestamp_us = last_timestamp_us
|
||||||
|
collected_cursors = []
|
||||||
|
|
||||||
|
for entry in mock_entries:
|
||||||
|
entry_cursor = entry.get("__CURSOR")
|
||||||
|
entry_ts_us = float(entry.get("__REALTIME_TIMESTAMP"))
|
||||||
|
|
||||||
|
if entry_ts_us < cutoff_epoch_us:
|
||||||
|
continue
|
||||||
|
if entry_cursor and (entry_cursor in sent_cursors or entry_cursor == last_cursor):
|
||||||
|
continue
|
||||||
|
if last_timestamp_us > 0 and entry_ts_us < last_timestamp_us:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if entry_cursor:
|
||||||
|
newest_cursor = entry_cursor
|
||||||
|
collected_cursors.append(entry_cursor)
|
||||||
|
if entry_ts_us > newest_timestamp_us:
|
||||||
|
newest_timestamp_us = entry_ts_us
|
||||||
|
|
||||||
|
priority = int(entry.get("PRIORITY", "6"))
|
||||||
|
if priority > 6:
|
||||||
|
continue
|
||||||
|
|
||||||
|
logs.append(entry)
|
||||||
|
|
||||||
|
self.assertEqual(len(logs), 1)
|
||||||
|
self.assertEqual(logs[0]["__CURSOR"], "c3")
|
||||||
|
self.assertEqual(newest_cursor, "c4")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -9,6 +9,12 @@ import urllib.request
|
|||||||
import warnings
|
import warnings
|
||||||
from datetime import datetime, timezone, timedelta
|
from datetime import datetime, timezone, timedelta
|
||||||
|
|
||||||
|
# Ensure repository root and src/ directory are in sys.path
|
||||||
|
ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
|
||||||
|
SRC_DIR = os.path.join(ROOT_DIR, "src")
|
||||||
|
sys.path.insert(0, ROOT_DIR)
|
||||||
|
sys.path.insert(0, SRC_DIR)
|
||||||
|
|
||||||
warnings.filterwarnings("ignore")
|
warnings.filterwarnings("ignore")
|
||||||
import pgpy
|
import pgpy
|
||||||
|
|
||||||
@@ -20,13 +26,16 @@ HERMES_PORT = 8443
|
|||||||
|
|
||||||
def run_tests():
|
def run_tests():
|
||||||
print("=== [1] Verifying server_config.json & client_config.json ===")
|
print("=== [1] Verifying server_config.json & client_config.json ===")
|
||||||
assert os.path.exists("server_config.json"), "server_config.json must exist"
|
server_cfg_path = "server_config.json" if os.path.exists("server_config.json") else os.path.join(ROOT_DIR, "server_config.json")
|
||||||
assert os.path.exists("client_config.json"), "client_config.json must exist"
|
client_cfg_path = "client_config.json" if os.path.exists("client_config.json") else os.path.join(ROOT_DIR, "client_config.json")
|
||||||
|
|
||||||
with open("client_config.json", "r", encoding="utf-8") as f:
|
assert os.path.exists(server_cfg_path), f"{server_cfg_path} must exist"
|
||||||
|
assert os.path.exists(client_cfg_path), f"{client_cfg_path} must exist"
|
||||||
|
|
||||||
|
with open(client_cfg_path, "r", encoding="utf-8") as f:
|
||||||
client_conf = json.load(f)
|
client_conf = json.load(f)
|
||||||
|
|
||||||
with open("server_config.json", "r", encoding="utf-8") as f:
|
with open(server_cfg_path, "r", encoding="utf-8") as f:
|
||||||
server_conf = json.load(f)
|
server_conf = json.load(f)
|
||||||
|
|
||||||
assert "server_name" not in client_conf, "client_config.json must NOT contain server_name"
|
assert "server_name" not in client_conf, "client_config.json must NOT contain server_name"
|
||||||
@@ -71,20 +80,25 @@ def run_tests():
|
|||||||
assert bad_resp.get("status") == "error", f"Expected error, got: {bad_resp}"
|
assert bad_resp.get("status") == "error", f"Expected error, got: {bad_resp}"
|
||||||
print(f"[OK] Bad auth rejected correctly: {bad_resp['message']}")
|
print(f"[OK] Bad auth rejected correctly: {bad_resp['message']}")
|
||||||
|
|
||||||
test_signature = "TestServiceCrash"
|
test_signature = "TestServiceDegraded"
|
||||||
candidate_log = [{
|
candidate_log = [{
|
||||||
"server": "test-edge-node",
|
"server": "test-edge-node",
|
||||||
"os_type": "linux",
|
"os_type": "linux",
|
||||||
"signature": test_signature,
|
"signature": test_signature,
|
||||||
"severity": "ERROR",
|
"severity": "WARNING",
|
||||||
"message": "Out of memory killer triggered"
|
"message": "Resource usage high warning"
|
||||||
}]
|
}]
|
||||||
|
|
||||||
print("\n=== [3] Testing Temporal Persistence & 4-Run Rule ===")
|
print("\n=== [3] Testing Temporal Persistence & 4-Run Rule for Warnings ===")
|
||||||
for run_num in range(1, 5):
|
for run_num in range(1, 5):
|
||||||
resp = send_socket_batch(candidate_log)
|
resp = send_socket_batch(candidate_log)
|
||||||
assert resp.get("status") == "success", f"Run {run_num} failed: {resp}"
|
assert resp.get("status") == "success", f"Run {run_num} failed: {resp}"
|
||||||
print(f"[Run {run_num}/4] Ingested successfully. Promoted to verified: {resp.get('promoted_verified')}")
|
promoted = resp.get("promoted_verified", 0)
|
||||||
|
print(f"[Run {run_num}/4] Ingested successfully. Promoted to verified: {promoted}")
|
||||||
|
if run_num < 4:
|
||||||
|
assert promoted == 0, f"Expected 0 promoted on run {run_num} for warning, got {promoted}"
|
||||||
|
else:
|
||||||
|
assert promoted == 1, f"Expected 1 promoted on run 4 for warning, got {promoted}"
|
||||||
|
|
||||||
# Inspect SQLite database directly
|
# Inspect SQLite database directly
|
||||||
conn = sqlite3.connect(server_conf.get("db_path", "logar_state.db"))
|
conn = sqlite3.connect(server_conf.get("db_path", "logar_state.db"))
|
||||||
@@ -98,7 +112,33 @@ def run_tests():
|
|||||||
print(f"[DB Verification] Issue '{test_signature}' -> run_count: {run_count}, status: {status}")
|
print(f"[DB Verification] Issue '{test_signature}' -> run_count: {run_count}, status: {status}")
|
||||||
assert run_count >= 4, f"Expected run_count >= 4, got {run_count}"
|
assert run_count >= 4, f"Expected run_count >= 4, got {run_count}"
|
||||||
assert status == "VERIFIED", f"Expected status 'VERIFIED', got {status}"
|
assert status == "VERIFIED", f"Expected status 'VERIFIED', got {status}"
|
||||||
print("[OK] 4-Run Rule verified: Transient issue promoted to VERIFIED anomaly!")
|
print("[OK] 4-Run Rule verified: Warning promoted to VERIFIED anomaly on 4th run!")
|
||||||
|
|
||||||
|
print("\n=== [3b] Testing Immediate Pass for Errors ===")
|
||||||
|
error_signature = "TestServiceCrashImmediate"
|
||||||
|
error_log = [{
|
||||||
|
"server": "test-edge-node",
|
||||||
|
"os_type": "linux",
|
||||||
|
"signature": error_signature,
|
||||||
|
"severity": "ERROR",
|
||||||
|
"message": "Fatal process crash occurred"
|
||||||
|
}]
|
||||||
|
err_resp = send_socket_batch(error_log)
|
||||||
|
assert err_resp.get("status") == "success", f"Error run failed: {err_resp}"
|
||||||
|
print(f"[Run 1/1] Error ingested successfully. Promoted to verified: {err_resp.get('promoted_verified')}")
|
||||||
|
assert err_resp.get("promoted_verified") == 1, f"Expected error to be promoted to verified immediately on run 1, got {err_resp.get('promoted_verified')}"
|
||||||
|
|
||||||
|
conn = sqlite3.connect(server_conf.get("db_path", "logar_state.db"))
|
||||||
|
cursor = conn.cursor()
|
||||||
|
cursor.execute("SELECT run_count, status FROM active_issues WHERE signature = ?", (error_signature,))
|
||||||
|
err_row = cursor.fetchone()
|
||||||
|
conn.close()
|
||||||
|
assert err_row is not None, "Error issue not found in SQLite"
|
||||||
|
err_run_count, err_status = err_row
|
||||||
|
print(f"[DB Verification] Issue '{error_signature}' -> run_count: {err_run_count}, status: {err_status}")
|
||||||
|
assert err_run_count == 1, f"Expected run_count == 1, got {err_run_count}"
|
||||||
|
assert err_status == "VERIFIED", f"Expected status 'VERIFIED', got {err_status}"
|
||||||
|
print("[OK] Immediate pass verified: Error promoted to VERIFIED anomaly immediately!")
|
||||||
|
|
||||||
print("\n=== [4] Testing Hermes Reporting Endpoint (/api/hermes/report) ===")
|
print("\n=== [4] Testing Hermes Reporting Endpoint (/api/hermes/report) ===")
|
||||||
req = urllib.request.Request(f"http://{HERMES_HOST}:{HERMES_PORT}/api/hermes/report")
|
req = urllib.request.Request(f"http://{HERMES_HOST}:{HERMES_PORT}/api/hermes/report")
|
||||||
@@ -107,22 +147,33 @@ def run_tests():
|
|||||||
hermes_data = json.loads(response.read().decode("utf-8"))
|
hermes_data = json.loads(response.read().decode("utf-8"))
|
||||||
|
|
||||||
print(f"[Hermes API] Returned {len(hermes_data)} verified anomalies:")
|
print(f"[Hermes API] Returned {len(hermes_data)} verified anomalies:")
|
||||||
found_issue = False
|
found_warning = False
|
||||||
|
found_error = False
|
||||||
for issue in hermes_data:
|
for issue in hermes_data:
|
||||||
print(f" - Fingerprint: {issue['fingerprint']} | Consecutive Runs: {issue['consecutive_runs']} | Status: {issue['status']}")
|
print(f" - Fingerprint: {issue['fingerprint']} | Consecutive Runs: {issue['consecutive_runs']} | Status: {issue['status']}")
|
||||||
if issue["signature"] == test_signature:
|
if issue["signature"] == test_signature:
|
||||||
found_issue = True
|
found_warning = True
|
||||||
assert issue["verified"] is True
|
assert issue["verified"] is True
|
||||||
assert issue["consecutive_runs"] >= 4
|
assert issue["consecutive_runs"] >= 4
|
||||||
|
if issue["signature"] == error_signature:
|
||||||
|
found_error = True
|
||||||
|
assert issue["verified"] is True
|
||||||
|
assert issue["consecutive_runs"] == 1
|
||||||
|
|
||||||
assert found_issue, f"Test issue {test_signature} should be in Hermes report"
|
assert found_warning, f"Warning issue {test_signature} should be in Hermes report"
|
||||||
|
assert found_error, f"Error issue {error_signature} should be in Hermes report"
|
||||||
print("[OK] Hermes reporting validated!")
|
print("[OK] Hermes reporting validated!")
|
||||||
|
|
||||||
print("\n=== [5] Testing Windows Client Script Integration ===")
|
print("\n=== [5] Testing Windows Client Script Integration ===")
|
||||||
from Win_Client import get_recent_windows_logs
|
from Win_Client import get_recent_windows_logs
|
||||||
win_logs = get_recent_windows_logs(hours=6)
|
win_logs = get_recent_windows_logs(hours=24)
|
||||||
print(f"[Win_Client] Successfully queried Windows logs: {len(win_logs)} candidate entries.")
|
print(f"[Win_Client] Successfully queried Windows logs: {len(win_logs)} candidate entries.")
|
||||||
|
|
||||||
|
print("\n=== [6] Testing Linux Client Script Integration ===")
|
||||||
|
from Linux_Client import get_recent_linux_logs
|
||||||
|
linux_logs = get_recent_linux_logs(hours=24)
|
||||||
|
print(f"[Linux_Client] Successfully queried Linux logs: {len(linux_logs)} candidate entries.")
|
||||||
|
|
||||||
print("\n==========================================")
|
print("\n==========================================")
|
||||||
print(" ALL VERIFICATION TESTS PASSED SUCCESSFULLY! ")
|
print(" ALL VERIFICATION TESTS PASSED SUCCESSFULLY! ")
|
||||||
print("==========================================")
|
print("==========================================")
|
||||||
@@ -11,8 +11,9 @@ from datetime import datetime, timezone, timedelta
|
|||||||
|
|
||||||
warnings.filterwarnings("ignore")
|
warnings.filterwarnings("ignore")
|
||||||
|
|
||||||
# Ensure parent directory is in path to import Server
|
# Ensure parent directory and src directory are in path to import Server
|
||||||
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
||||||
|
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
|
||||||
|
|
||||||
import Server
|
import Server
|
||||||
import pgpy
|
import pgpy
|
||||||
@@ -78,9 +79,9 @@ class TestServerComponent(unittest.TestCase):
|
|||||||
Server.init_db(self.test_db)
|
Server.init_db(self.test_db)
|
||||||
log_entry = {
|
log_entry = {
|
||||||
"server": "app-worker-01.corp.local",
|
"server": "app-worker-01.corp.local",
|
||||||
"signature": "PostgresConnTimeout",
|
"signature": "PostgresConnWarning",
|
||||||
"severity": "ERROR",
|
"severity": "WARNING",
|
||||||
"message": "Connection to database pool timed out after 30s",
|
"message": "Connection to database pool near capacity: 85%",
|
||||||
"os_type": "linux"
|
"os_type": "linux"
|
||||||
}
|
}
|
||||||
payload = {
|
payload = {
|
||||||
@@ -88,7 +89,7 @@ class TestServerComponent(unittest.TestCase):
|
|||||||
"logs": [log_entry]
|
"logs": [log_entry]
|
||||||
}
|
}
|
||||||
|
|
||||||
# Runs 1 to 3: should remain TRANSIENT
|
# Runs 1 to 3: WARNING should remain TRANSIENT
|
||||||
for run_idx in range(1, 4):
|
for run_idx in range(1, 4):
|
||||||
res = Server.process_ingested_logs(payload, self.test_db, window_hours=12, min_runs=4)
|
res = Server.process_ingested_logs(payload, self.test_db, window_hours=12, min_runs=4)
|
||||||
self.assertEqual(res["status"], "success")
|
self.assertEqual(res["status"], "success")
|
||||||
@@ -96,24 +97,85 @@ class TestServerComponent(unittest.TestCase):
|
|||||||
|
|
||||||
conn = sqlite3.connect(self.test_db)
|
conn = sqlite3.connect(self.test_db)
|
||||||
c = conn.cursor()
|
c = conn.cursor()
|
||||||
c.execute("SELECT run_count, status FROM active_issues WHERE signature = ?", ("PostgresConnTimeout",))
|
c.execute("SELECT run_count, status FROM active_issues WHERE signature = ?", ("PostgresConnWarning",))
|
||||||
row = c.fetchone()
|
row = c.fetchone()
|
||||||
conn.close()
|
conn.close()
|
||||||
self.assertEqual(row[0], 3)
|
self.assertEqual(row[0], 3)
|
||||||
self.assertEqual(row[1], "TRANSIENT")
|
self.assertEqual(row[1], "TRANSIENT")
|
||||||
|
|
||||||
# Run 4: promotes to VERIFIED!
|
# Run 4: promotes WARNING to VERIFIED!
|
||||||
res4 = Server.process_ingested_logs(payload, self.test_db, window_hours=12, min_runs=4)
|
res4 = Server.process_ingested_logs(payload, self.test_db, window_hours=12, min_runs=4)
|
||||||
self.assertEqual(res4["promoted_verified"], 1)
|
self.assertEqual(res4["promoted_verified"], 1)
|
||||||
|
|
||||||
conn = sqlite3.connect(self.test_db)
|
conn = sqlite3.connect(self.test_db)
|
||||||
c = conn.cursor()
|
c = conn.cursor()
|
||||||
c.execute("SELECT run_count, status FROM active_issues WHERE signature = ?", ("PostgresConnTimeout",))
|
c.execute("SELECT run_count, status FROM active_issues WHERE signature = ?", ("PostgresConnWarning",))
|
||||||
row = c.fetchone()
|
row = c.fetchone()
|
||||||
conn.close()
|
conn.close()
|
||||||
self.assertEqual(row[0], 4)
|
self.assertEqual(row[0], 4)
|
||||||
self.assertEqual(row[1], "VERIFIED")
|
self.assertEqual(row[1], "VERIFIED")
|
||||||
|
|
||||||
|
def test_error_immediate_pass(self):
|
||||||
|
Server.init_db(self.test_db)
|
||||||
|
log_entry = {
|
||||||
|
"server": "app-worker-01.corp.local",
|
||||||
|
"signature": "KernelPanicCritical",
|
||||||
|
"severity": "ERROR",
|
||||||
|
"message": "Kernel panic - not syncing: Fatal hardware error",
|
||||||
|
"os_type": "linux"
|
||||||
|
}
|
||||||
|
payload = {
|
||||||
|
"server": "app-worker-01.corp.local",
|
||||||
|
"logs": [log_entry]
|
||||||
|
}
|
||||||
|
|
||||||
|
# Run 1: ERROR must immediately promote to VERIFIED
|
||||||
|
res = Server.process_ingested_logs(payload, self.test_db, window_hours=12, min_runs=4)
|
||||||
|
self.assertEqual(res["status"], "success")
|
||||||
|
self.assertEqual(res["promoted_verified"], 1)
|
||||||
|
|
||||||
|
conn = sqlite3.connect(self.test_db)
|
||||||
|
c = conn.cursor()
|
||||||
|
c.execute("SELECT run_count, status, severity FROM active_issues WHERE signature = ?", ("KernelPanicCritical",))
|
||||||
|
row = c.fetchone()
|
||||||
|
conn.close()
|
||||||
|
self.assertIsNotNone(row)
|
||||||
|
self.assertEqual(row[0], 1)
|
||||||
|
self.assertEqual(row[1], "VERIFIED")
|
||||||
|
self.assertEqual(row[2], "ERROR")
|
||||||
|
|
||||||
|
def test_server_severity_filtering(self):
|
||||||
|
Server.init_db(self.test_db)
|
||||||
|
payload = {
|
||||||
|
"server": "app-worker-01.corp.local",
|
||||||
|
"logs": [
|
||||||
|
{"server": "app-worker-01", "signature": "SigInfo", "severity": "INFO", "message": "Info msg", "os_type": "linux"},
|
||||||
|
{"server": "app-worker-01", "signature": "SigWarn", "severity": "WARNING", "message": "Warn msg", "os_type": "linux"},
|
||||||
|
{"server": "app-worker-01", "signature": "SigErr", "severity": "ERROR", "message": "Err msg", "os_type": "linux"},
|
||||||
|
{"server": "app-worker-01", "signature": "SigDebug", "severity": "DEBUG", "message": "Debug msg", "os_type": "linux"},
|
||||||
|
{"server": "app-worker-01", "signature": "SigTrace", "severity": "TRACE", "message": "Trace msg", "os_type": "linux"}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
res = Server.process_ingested_logs(payload, self.test_db, window_hours=12, min_runs=4)
|
||||||
|
self.assertEqual(res["status"], "success")
|
||||||
|
|
||||||
|
conn = sqlite3.connect(self.test_db)
|
||||||
|
c = conn.cursor()
|
||||||
|
c.execute("SELECT signature, status FROM active_issues ORDER BY signature")
|
||||||
|
rows = dict(c.fetchall())
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
self.assertIn("SigInfo", rows)
|
||||||
|
self.assertIn("SigWarn", rows)
|
||||||
|
self.assertIn("SigErr", rows)
|
||||||
|
self.assertNotIn("SigDebug", rows)
|
||||||
|
self.assertNotIn("SigTrace", rows)
|
||||||
|
|
||||||
|
# SigErr is immediately VERIFIED; SigWarn and SigInfo are TRANSIENT on run 1
|
||||||
|
self.assertEqual(rows["SigErr"], "VERIFIED")
|
||||||
|
self.assertEqual(rows["SigWarn"], "TRANSIENT")
|
||||||
|
self.assertEqual(rows["SigInfo"], "TRANSIENT")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
@@ -0,0 +1,189 @@
|
|||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import json
|
||||||
|
import struct
|
||||||
|
import unittest
|
||||||
|
import warnings
|
||||||
|
|
||||||
|
warnings.filterwarnings("ignore")
|
||||||
|
|
||||||
|
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
||||||
|
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
|
||||||
|
|
||||||
|
import Win_Client
|
||||||
|
import pgpy
|
||||||
|
from pgpy.constants import PubKeyAlgorithm, KeyFlags, HashAlgorithm, SymmetricKeyAlgorithm, CompressionAlgorithm
|
||||||
|
|
||||||
|
|
||||||
|
class TestWinClientComponent(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.dummy_config = "test_win_client_config.json"
|
||||||
|
# Generate dummy PGP key for testing
|
||||||
|
key = pgpy.PGPKey.new(PubKeyAlgorithm.RSAEncryptOrSign, 2048)
|
||||||
|
uid = pgpy.PGPUID.new("TestHub")
|
||||||
|
key.add_uid(
|
||||||
|
uid,
|
||||||
|
usage={KeyFlags.EncryptCommunications, KeyFlags.EncryptStorage},
|
||||||
|
hashes=[HashAlgorithm.SHA256],
|
||||||
|
ciphers=[SymmetricKeyAlgorithm.AES256],
|
||||||
|
compression=[CompressionAlgorithm.Uncompressed]
|
||||||
|
)
|
||||||
|
self.server_priv = key
|
||||||
|
self.server_pub = key.pubkey
|
||||||
|
self.fingerprint = str(key.pubkey.fingerprint)
|
||||||
|
|
||||||
|
with open(self.dummy_config, "w", encoding="utf-8") as f:
|
||||||
|
json.dump({
|
||||||
|
"server_host": "127.0.0.1",
|
||||||
|
"server_port": 9443,
|
||||||
|
"server_fingerprint": self.fingerprint,
|
||||||
|
"server_public_key": str(self.server_pub),
|
||||||
|
"auth_token": "secret-test-token"
|
||||||
|
}, f)
|
||||||
|
|
||||||
|
def tearDown(self):
|
||||||
|
if os.path.exists(self.dummy_config):
|
||||||
|
try:
|
||||||
|
os.remove(self.dummy_config)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def test_client_config_anonymity(self):
|
||||||
|
config = Win_Client.load_config(self.dummy_config)
|
||||||
|
self.assertNotIn("server_name", config)
|
||||||
|
self.assertNotIn("name", config)
|
||||||
|
self.assertNotIn("site_name", config)
|
||||||
|
self.assertEqual(config["server_fingerprint"], self.fingerprint)
|
||||||
|
|
||||||
|
def test_get_machine_identifier(self):
|
||||||
|
machine_id = Win_Client.get_machine_identifier()
|
||||||
|
self.assertIsInstance(machine_id, str)
|
||||||
|
self.assertGreater(len(machine_id), 0)
|
||||||
|
self.assertNotEqual(machine_id, "localhost")
|
||||||
|
|
||||||
|
def test_encryption_and_envelope_creation(self):
|
||||||
|
config = Win_Client.load_config(self.dummy_config)
|
||||||
|
logs = [{
|
||||||
|
"server": Win_Client.get_machine_identifier(),
|
||||||
|
"signature": "TestWinSignature",
|
||||||
|
"severity": "WARNING",
|
||||||
|
"message": "Disk space threshold warning"
|
||||||
|
}]
|
||||||
|
|
||||||
|
pub_key, _ = pgpy.PGPKey.from_blob(config["server_public_key"])
|
||||||
|
payload = {
|
||||||
|
"server": Win_Client.get_machine_identifier(),
|
||||||
|
"logs": logs
|
||||||
|
}
|
||||||
|
msg = pgpy.PGPMessage.new(json.dumps(payload))
|
||||||
|
enc = pub_key.encrypt(msg)
|
||||||
|
self.assertTrue(str(enc).startswith("-----BEGIN PGP MESSAGE-----"))
|
||||||
|
|
||||||
|
# Decrypt with private key to verify end-to-end payload integrity
|
||||||
|
dec = self.server_priv.decrypt(enc)
|
||||||
|
restored = json.loads(dec.message)
|
||||||
|
self.assertEqual(restored["logs"][0]["signature"], "TestWinSignature")
|
||||||
|
|
||||||
|
def test_framing_protocol(self):
|
||||||
|
envelope_data = json.dumps({"test": "data"}).encode("utf-8")
|
||||||
|
frame = struct.pack(">I", len(envelope_data)) + envelope_data
|
||||||
|
self.assertEqual(len(frame), 4 + len(envelope_data))
|
||||||
|
length = struct.unpack(">I", frame[:4])[0]
|
||||||
|
self.assertEqual(length, len(envelope_data))
|
||||||
|
|
||||||
|
def test_windows_event_filtering_and_severity_map(self):
|
||||||
|
# sev_map: 1 -> ERROR, 2 -> WARNING, 4 -> INFO
|
||||||
|
sev_map = {1: "ERROR", 2: "WARNING", 4: "INFO"}
|
||||||
|
raw_event_types = [1, 2, 4, 8, 16] # 8 is Audit Success, 16 is Audit Failure
|
||||||
|
filtered = [sev_map[et] for et in raw_event_types if et in sev_map]
|
||||||
|
self.assertEqual(filtered, ["ERROR", "WARNING", "INFO"])
|
||||||
|
|
||||||
|
def test_state_lifecycle(self):
|
||||||
|
state_path = "test_win_state.json"
|
||||||
|
try:
|
||||||
|
# 1. Load non-existent returns empty dict
|
||||||
|
state = Win_Client.load_state(state_path)
|
||||||
|
self.assertEqual(state, {})
|
||||||
|
|
||||||
|
# 2. Stage new record number and sent IDs
|
||||||
|
state["new_last_record_number"] = 42
|
||||||
|
state["new_sent_record_ids"] = ["42:2026-09-04T12:00:00"]
|
||||||
|
|
||||||
|
# 3. Commit state moves staged keys to permanent and writes atomically
|
||||||
|
Win_Client.commit_state(state, state_path)
|
||||||
|
self.assertNotIn("new_last_record_number", state)
|
||||||
|
self.assertEqual(state.get("last_record_number"), 42)
|
||||||
|
self.assertEqual(state.get("sent_record_ids"), ["42:2026-09-04T12:00:00"])
|
||||||
|
|
||||||
|
# 4. Reload from disk
|
||||||
|
reloaded = Win_Client.load_state(state_path)
|
||||||
|
self.assertEqual(reloaded.get("last_record_number"), 42)
|
||||||
|
self.assertEqual(reloaded.get("sent_record_ids"), ["42:2026-09-04T12:00:00"])
|
||||||
|
finally:
|
||||||
|
if os.path.exists(state_path):
|
||||||
|
os.remove(state_path)
|
||||||
|
|
||||||
|
def test_duplicate_suppression_and_lookback_logic(self):
|
||||||
|
from datetime import datetime, timezone, timedelta
|
||||||
|
now = datetime.now()
|
||||||
|
cutoff_time = now - timedelta(hours=24)
|
||||||
|
|
||||||
|
# Mock event object
|
||||||
|
class MockEvent:
|
||||||
|
def __init__(self, rec_num, time_gen, event_type, source="TestApp", inserts=None):
|
||||||
|
self.RecordNumber = rec_num
|
||||||
|
self.TimeGenerated = time_gen
|
||||||
|
self.EventType = event_type
|
||||||
|
self.SourceName = source
|
||||||
|
self.StringInserts = inserts or ["Test"]
|
||||||
|
|
||||||
|
# Events read backwards: newest (rec 103) down to older (rec 99)
|
||||||
|
mock_events = [
|
||||||
|
# 1. New error within last 24h
|
||||||
|
MockEvent(103, now - timedelta(hours=1), 1),
|
||||||
|
# 2. New warning within last 24h
|
||||||
|
MockEvent(102, now - timedelta(hours=2), 2),
|
||||||
|
# 3. Already sent event (rec 101)
|
||||||
|
MockEvent(101, now - timedelta(hours=3), 4),
|
||||||
|
# 4. Event at or before last_record_number (rec 100) -> should stop backwards scan
|
||||||
|
MockEvent(100, now - timedelta(hours=4), 1),
|
||||||
|
# 5. Old event (> 24h)
|
||||||
|
MockEvent(99, now - timedelta(hours=26), 1),
|
||||||
|
]
|
||||||
|
|
||||||
|
state = {
|
||||||
|
"last_record_number": 100,
|
||||||
|
"sent_record_ids": ["101:" + (now - timedelta(hours=3)).isoformat()]
|
||||||
|
}
|
||||||
|
|
||||||
|
sev_map = {1: "ERROR", 2: "WARNING", 4: "INFO"}
|
||||||
|
logs = []
|
||||||
|
last_record_number = int(state.get("last_record_number", 0))
|
||||||
|
sent_record_ids = set(state.get("sent_record_ids", []))
|
||||||
|
newest_record_number = 0
|
||||||
|
|
||||||
|
for event in mock_events:
|
||||||
|
rec_num = int(event.RecordNumber)
|
||||||
|
if newest_record_number == 0:
|
||||||
|
newest_record_number = rec_num
|
||||||
|
|
||||||
|
if event.TimeGenerated < cutoff_time:
|
||||||
|
break
|
||||||
|
|
||||||
|
if last_record_number > 0 and newest_record_number >= last_record_number:
|
||||||
|
if rec_num <= last_record_number:
|
||||||
|
break
|
||||||
|
|
||||||
|
rec_id = f"{rec_num}:{event.TimeGenerated.isoformat()}"
|
||||||
|
if rec_id in sent_record_ids:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if event.EventType in sev_map:
|
||||||
|
logs.append(rec_num)
|
||||||
|
|
||||||
|
# Only rec 103 and 102 should be processed (101 is already sent, <= 100 breaks early)
|
||||||
|
self.assertEqual(logs, [103, 102])
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -1,135 +0,0 @@
|
|||||||
import os
|
|
||||||
import sys
|
|
||||||
import json
|
|
||||||
import argparse
|
|
||||||
import urllib.request
|
|
||||||
import urllib.parse
|
|
||||||
import mimetypes
|
|
||||||
import package_dist
|
|
||||||
|
|
||||||
DEFAULT_GITEA_URL = os.environ.get("GITEA_SERVER_URL", "https://gitea.eibl.tech")
|
|
||||||
DEFAULT_REPO = os.environ.get("GITEA_REPOSITORY", "me0nline/LOGAR")
|
|
||||||
|
|
||||||
def get_existing_assets(base_url, repo, release_id, token):
|
|
||||||
url = f"{base_url}/api/v1/repos/{repo}/releases/{release_id}/assets"
|
|
||||||
req = urllib.request.Request(url, headers={"Authorization": f"token {token}", "Accept": "application/json"})
|
|
||||||
try:
|
|
||||||
with urllib.request.urlopen(req) as resp:
|
|
||||||
return json.loads(resp.read().decode("utf-8"))
|
|
||||||
except Exception:
|
|
||||||
return []
|
|
||||||
|
|
||||||
def delete_asset(base_url, repo, release_id, asset_id, token):
|
|
||||||
url = f"{base_url}/api/v1/repos/{repo}/releases/{release_id}/assets/{asset_id}"
|
|
||||||
req = urllib.request.Request(url, method="DELETE", headers={"Authorization": f"token {token}"})
|
|
||||||
try:
|
|
||||||
with urllib.request.urlopen(req) as resp:
|
|
||||||
pass
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def upload_file_to_release(base_url, repo, release_id, token, file_path):
|
|
||||||
filename = os.path.basename(file_path)
|
|
||||||
|
|
||||||
# Clean up existing asset with same name if already present
|
|
||||||
existing_assets = get_existing_assets(base_url, repo, release_id, token)
|
|
||||||
for asset in existing_assets:
|
|
||||||
if asset.get("name") == filename:
|
|
||||||
print(f"[*] Removing existing asset '{filename}' (ID: {asset['id']})...")
|
|
||||||
delete_asset(base_url, repo, release_id, asset["id"], token)
|
|
||||||
|
|
||||||
url = f"{base_url}/api/v1/repos/{repo}/releases/{release_id}/assets?name={urllib.parse.quote(filename)}"
|
|
||||||
with open(file_path, "rb") as f:
|
|
||||||
file_bytes = f.read()
|
|
||||||
|
|
||||||
req = urllib.request.Request(url, data=file_bytes, method="POST")
|
|
||||||
req.add_header("Authorization", f"token {token}")
|
|
||||||
req.add_header("Content-Type", "application/octet-stream")
|
|
||||||
req.add_header("Accept", "application/json")
|
|
||||||
|
|
||||||
try:
|
|
||||||
with urllib.request.urlopen(req) as resp:
|
|
||||||
data = json.loads(resp.read().decode("utf-8"))
|
|
||||||
print(f"[+] Attached {filename} ({len(file_bytes)} bytes) to release.")
|
|
||||||
return data
|
|
||||||
except urllib.error.HTTPError as e:
|
|
||||||
err = e.read().decode("utf-8", errors="ignore")
|
|
||||||
print(f"[!] Error uploading {filename}: HTTP {e.code} - {err}")
|
|
||||||
return None
|
|
||||||
|
|
||||||
def create_or_get_release(base_url, repo, tag, token, title=None, notes=None):
|
|
||||||
url = f"{base_url}/api/v1/repos/{repo}/releases"
|
|
||||||
headers = {
|
|
||||||
"Authorization": f"token {token}",
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
"Accept": "application/json"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Check if release exists
|
|
||||||
check_url = f"{base_url}/api/v1/repos/{repo}/releases/tags/{urllib.parse.quote(tag)}"
|
|
||||||
check_req = urllib.request.Request(check_url, headers={"Authorization": f"token {token}"})
|
|
||||||
try:
|
|
||||||
with urllib.request.urlopen(check_req) as resp:
|
|
||||||
existing = json.loads(resp.read().decode("utf-8"))
|
|
||||||
print(f"[*] Found existing release for tag {tag} (ID: {existing['id']})")
|
|
||||||
return existing["id"]
|
|
||||||
except urllib.error.HTTPError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Create new release
|
|
||||||
payload = {
|
|
||||||
"tag_name": tag,
|
|
||||||
"name": title or f"LOGAR Release {tag}",
|
|
||||||
"body": notes or f"Automated binary release for {tag}.",
|
|
||||||
"draft": False,
|
|
||||||
"prerelease": False
|
|
||||||
}
|
|
||||||
req = urllib.request.Request(url, data=json.dumps(payload).encode("utf-8"), headers=headers, method="POST")
|
|
||||||
with urllib.request.urlopen(req) as resp:
|
|
||||||
created = json.loads(resp.read().decode("utf-8"))
|
|
||||||
print(f"[+] Created release {tag} (ID: {created['id']})")
|
|
||||||
return created["id"]
|
|
||||||
|
|
||||||
def main():
|
|
||||||
parser = argparse.ArgumentParser(description="Upload LOGAR compiled binaries directly to Gitea Release")
|
|
||||||
parser.add_argument("--tag", default=os.environ.get("GITEA_REF_NAME"), help="Release tag name (e.g. v1.0.0)")
|
|
||||||
parser.add_argument("--token", default=os.environ.get("GITEA_TOKEN"), help="Gitea Personal Access Token (or set GITEA_TOKEN env var)")
|
|
||||||
parser.add_argument("--url", default=DEFAULT_GITEA_URL, help="Base Gitea instance URL")
|
|
||||||
parser.add_argument("--repo", default=DEFAULT_REPO, help="Repository owner/name")
|
|
||||||
parser.add_argument("--skip-build", action="store_true", help="Skip running package_dist.py before upload")
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
tag = args.tag
|
|
||||||
if not tag:
|
|
||||||
tag = input("Enter tag name (e.g. v1.0.0): ").strip()
|
|
||||||
|
|
||||||
token = args.token
|
|
||||||
if not token:
|
|
||||||
token = input("Enter Gitea Token: ").strip()
|
|
||||||
|
|
||||||
if not tag or not token:
|
|
||||||
print("[!] Tag and Token are required.")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
if not args.skip_build:
|
|
||||||
print("[*] Assembling compiled binaries...")
|
|
||||||
package_dist.main()
|
|
||||||
|
|
||||||
dist_dir = os.path.abspath("dist")
|
|
||||||
if not os.path.exists(dist_dir) or not os.listdir(dist_dir):
|
|
||||||
print("[!] No binaries found in dist/. Run package_dist.py first.")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
print(f"[*] Connecting to Gitea: {args.url} (repo: {args.repo})...")
|
|
||||||
release_id = create_or_get_release(args.url, args.repo, tag, token)
|
|
||||||
|
|
||||||
print(f"[*] Uploading binary assets from '{dist_dir}'...")
|
|
||||||
for f in sorted(os.listdir(dist_dir)):
|
|
||||||
fpath = os.path.join(dist_dir, f)
|
|
||||||
if os.path.isfile(fpath):
|
|
||||||
upload_file_to_release(args.url, args.repo, release_id, token, fpath)
|
|
||||||
|
|
||||||
print(f"\n[+] Release successfully published with binary assets: {args.url}/{args.repo}/releases/tag/{tag}")
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
Reference in New Issue
Block a user