Skip to content

dev2: log AgentDB access safely for ThreatCrush #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sh1pt-actions-fleet merged 1 commit into from
Oct 31, 2026
Merged

dev2: log AgentDB access safely for ThreatCrush #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion dev2/dev2-edge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,16 @@ def caddy_site(site, s):
if site.get("gzip"):
lines.append("\tencode gzip")
if site.get("access_log"):
lines += ["\tlog {", f"\t\toutput file /var/log/caddy/{site['hosts'][0]}.access.log", "\t}"]
lines += ["\tlog {", f"\t\toutput file /var/log/caddy/{site['hosts'][0]}.access.log"]
if site.get("sanitize_query"):
lines += [
"\t\tformat filter {",
'\t\t\trequest>uri regexp `\\?.*` ""',
"\t\t\trequest>headers delete",
"\t\t\tresp_headers delete",
"\t\t}",
]
lines.append("\t}")
if "proxy" in site and site.get("retry"):
# While the app restarts (a deploy), hold the request and keep dialing instead of
# answering 502: webhooks that drive live calls (Telnyx) must not fail mid-call.
Expand Down
1 change: 1 addition & 0 deletions dev2/edge/edge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
{ "hosts": ["pit.world"], "proxy": 8787, "max_body": "1MiB" },
{ "hosts": ["www.pit.world"], "redirect": "https://pit.world{uri}" },
{ "hosts": ["ad.network.pit.world"], "proxy": 8800, "max_body": "1MiB", "gzip": true },
{ "hosts": ["agent.database.pit.world"], "proxy": 18080, "max_body": "512KiB", "gzip": true, "access_log": true, "sanitize_query": true },
{ "hosts": ["group.call.pit.world"], "proxy": 8810, "max_body": "1MiB", "retry": "20s",
"//": "group.call (moshcoder/group.call): no gzip, so the room page's server-sent events are not held back; retry holds Telnyx webhooks across a deploy instead of 502" },
{ "hosts": ["*.*.pit.world", "*.*.*.pit.world"], "proxy": 8787, "max_body": "30MiB", "gzip": true,
Expand Down
8 changes: 7 additions & 1 deletion test/dev2-edge.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,18 @@ describe('dev2-edge render', () => {
const head = site.hosts.map((h: string) => `https://${h}`).join(', ') + ' {';
expect(caddy).toContain(head);
const block = caddy.slice(caddy.indexOf(head), caddy.indexOf('\n}\n', caddy.indexOf(head)));
if (site.proxy) expect(block).toContain(`import edge_proxy ${site.proxy}`);
if (site.proxy && site.retry) expect(block).toContain(`reverse_proxy 127.0.0.1:${site.proxy}`);
else if (site.proxy) expect(block).toContain(`import edge_proxy ${site.proxy}`);
if (site.root) expect(block).toContain(`root * ${site.root}`);
if (site.redirect) expect(block).toContain(`redir ${site.redirect} 301`);
if (site.max_body) expect(block).toContain(`max_size ${site.max_body}`);
expect(block).toContain(site.moshpit ? 'import edge_tls_moshpit' : 'import edge_tls');
}
const agentDb = caddy.slice(caddy.indexOf('https://agent.database.pit.world {'));
expect(agentDb).toContain('output file /var/log/caddy/agent.database.pit.world.access.log');
expect(agentDb).toContain('request>uri regexp `\\?.*` ""');
expect(agentDb).toContain('request>headers delete');
expect(agentDb).toContain('resp_headers delete');
expect(caddy).toMatch(/\(edge_tls_moshpit\) \{\s+tls \{\s+load \/etc\/caddy\/edge-certs\s+protocols tls1\.3/);
});

Expand Down
Loading