Skip to content

emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)#513

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
argszero merged 1 commit into from
Aug 6, 2026
Merged

emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON) #513

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
2 changes: 1 addition & 1 deletion Agent.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (484) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (488) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (86: 22 daemon_client + 22 app-commands + 17 renderer smoke + 15 i18n + 7 integration + 3 commands) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ EMRG doesn't just keep up — it catches up on its own.
git clone https://github.com/argszero/emrg.git
cd emrg
uv sync # install deps
uv run pytest tests/ -v # run tests (currently 484 items)
uv run pytest tests/ -v # run tests (currently 488 items)
uv run python -m emrg # launch TUI
# CI includes actionlint workflow gate (#444): workflow parse errors fail PR CI

Expand Down
39 changes: 38 additions & 1 deletion emrg/server/daemon.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,49 @@
# ── 日志脱敏（rant 2026-08-06T10:21:26）────────────────────────────
# tool call 参数可能含 api_key/token/authorization/password 等敏感字段，
# 递归替换值为 ***，避免 emrgd.log 泄露凭据。
# 除按键名脱敏外，字符串值内联的凭据模式（sk-*/ghp_*/Bearer/JWT/base64-JSON）
# 也会被遮蔽——防止 bash command 里 `export OPENAI_API_KEY=sk-...` 或
# base64 编码的 access_token 整体泄露（跨项目教训：明文正则匹配不到编码形式）。
_SENSITIVE_KEY_SUBSTRINGS = (
"api_key", "token", "authorization", "password", "secret",
"api-key", "auth", "credential", "key",
)

import re as _re

# 字符串值内联凭据模式（保守匹配，宁多勿漏）
_INLINE_SECRET_PATTERNS = (
_re.compile(r"(sk-[A-Za-z0-9_\-]{8,})"), # OpenAI/DeepSeek/Anthropic 密钥
_re.compile(r"(gh[pousr]_[A-Za-z0-9]{20,})"), # GitHub PAT / OAuth / gist token
_re.compile(r"(xox[baprs]-[A-Za-z0-9\-]{10,})"), # Slack token
_re.compile(r"(AKIA[0-9A-Z]{16})"), # AWS access key id
_re.compile(r"(Bearer\s+[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE), # Bearer 令牌
_re.compile(r"(Authorization\s*[:=]\s*[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE),
_re.compile(r"((api[_-]?key|apikey|password|passwd|secret|token)\s*[:=]\s*[^\s,;\"']+)", _re.IGNORECASE),
# JWT：三段 base64url（eyJ... 开头）—— 一段即泄露签名密钥
_re.compile(r"(eyJ[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+)"),
)


def _redact_string(s: str) -> str:
"""遮蔽字符串值内联的凭据模式；base64-JSON 含敏感键时整段遮蔽。"""
out = s
for pat in _INLINE_SECRET_PATTERNS:
out = pat.sub("***", out)
# base64 编码的 JSON（跨项目教训：access_token 以编码形式进日志，明文正则匹配不到）
for b64 in _re.findall(r"[A-Za-z0-9+/]{40,}={0,2}", out):
try:
import base64
decoded = base64.b64decode(b64, validate=True)
if any(k in decoded for k in (b"access_token", b"api_key", b"apikey", b"authorization", b"password", b"secret")):
out = out.replace(b64, "***")
except Exception:
continue
return out


def _redact(value):
"""递归脱敏 dict/list 中的敏感字段值（就地不修改原对象）。"""
"""递归脱敏 dict/list 中的敏感字段值与字符串内联凭据（不修改原对象）。"""
if isinstance(value, dict):
return {
k: ("***" if any(s in k.lower() for s in _SENSITIVE_KEY_SUBSTRINGS)
Expand All@@ -59,6 +94,8 @@ def _redact(value):
}
if isinstance(value, list):
return [_redact(v) for v in value]
if isinstance(value, str):
return _redact_string(value)
return value

from emrg.tools import ToolRegistry
Expand Down
43 changes: 43 additions & 0 deletions tests/test_daemon.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,3 +514,46 @@ def test_rant_field_order(tmp_path, monkeypatch):
assert entry["project"] == "emrg"
assert entry["status"] == "pending"
assert entry["message"] == "test rant message"


# ── _redact 日志脱敏（rant 10:21 + 跨项目 base64 教训）──────────────


def test_redact_masks_sensitive_keys():
"""按键名脱敏（原有行为）。"""
from emrg.server.daemon import _redact
assert _redact({"api_key": "sk-abc", "model": "m"}) == {"api_key": "***", "model": "m"}
assert _redact([{"token": "x"}, "plain"]) == [{"token": "***"}, "plain"]


def test_redact_inline_secrets_in_strings():
"""字符串值内联凭据（sk-/ghp_/Bearer/JWT）被遮蔽。"""
from emrg.server.daemon import _redact
# bash command 内联 API key
assert "sk-1234567890abcdef" not in str(_redact({"command": "export OPENAI_API_KEY=sk-1234567890abcdef; curl x"}))
# GitHub token 嵌在 URL
assert "ghp_" not in str(_redact({"command": "git push https://x-access-token:ghp_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890@github.com/r.git"}))
# Bearer + JWT
jwt = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.dozjgNryP4J3jVmNHl0w5N_XgL0n3I9PlFUP0THsR8U"
assert "eyJ" not in str(_redact({"text": f"Authorization: Bearer {jwt}"}))


def test_redact_base64_encoded_token_blob():
"""base64 编码的 access_token JSON 被整段遮蔽（跨项目教训：明文正则匹配不到编码形式）。"""
import base64
import json as _json
from emrg.server.daemon import _redact
blob = base64.b64encode(_json.dumps({"access_token": "super-secret"}).encode()).decode()
out = _redact({"command": f"curl -d {blob} http://x"})
assert "***" in out["command"]
assert "super-secret" not in out["command"]
assert blob not in out["command"]


def test_redact_no_false_positive_on_normal_strings():
"""普通字符串/短 sk- 前缀不被误伤。"""
from emrg.server.daemon import _redact
assert _redact({"command": "echo hello world", "path": "/tmp/a.txt"}) == {
"command": "echo hello world", "path": "/tmp/a.txt"}
# 短密钥（<8 位）不匹配 sk- 模式 → 保留
assert "sk-abc" in _redact({"command": "echo sk-abc"})["command"]
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON) by argszero · Pull Request #513 · argszero/emrg · GitHub
Skip to content
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)#513

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

argszero
merged 1 commit into

from

Aug 6, 2026
 Merged


emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)
#513
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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (484) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (488) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (86: 22 daemon_client + 22 app-commands + 17 renderer smoke + 15 i18n + 7 integration + 3 commands) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)

Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ EMRG doesn't just keep up — it catches up on its own.
git clone https://github.com/argszero/emrg.git
cd emrg
uv sync # install deps
uv run pytest tests/ -v # run tests (currently 484 items)
uv run pytest tests/ -v # run tests (currently 488 items)
uv run python -m emrg # launch TUI
# CI includes actionlint workflow gate (#444): workflow parse errors fail PR CI

Expand Down

39 changes: 38 additions & 1 deletion
emrg/server/daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,49 @@
# ── 日志脱敏（rant 2026-08-06T10:21:26）────────────────────────────
# tool call 参数可能含 api_key/token/authorization/password 等敏感字段，
# 递归替换值为 ***，避免 emrgd.log 泄露凭据。
# 除按键名脱敏外，字符串值内联的凭据模式（sk-*/ghp_*/Bearer/JWT/base64-JSON）
# 也会被遮蔽——防止 bash command 里 `export OPENAI_API_KEY=sk-...` 或
# base64 编码的 access_token 整体泄露（跨项目教训：明文正则匹配不到编码形式）。
_SENSITIVE_KEY_SUBSTRINGS = (
 "api_key", "token", "authorization", "password", "secret",
 "api-key", "auth", "credential", "key",
)

import re as _re

# 字符串值内联凭据模式（保守匹配，宁多勿漏）
_INLINE_SECRET_PATTERNS = (
 _re.compile(r"(sk-[A-Za-z0-9_\-]{8,})"), # OpenAI/DeepSeek/Anthropic 密钥
 _re.compile(r"(gh[pousr]_[A-Za-z0-9]{20,})"), # GitHub PAT / OAuth / gist token
 _re.compile(r"(xox[baprs]-[A-Za-z0-9\-]{10,})"), # Slack token
 _re.compile(r"(AKIA[0-9A-Z]{16})"), # AWS access key id
 _re.compile(r"(Bearer\s+[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE), # Bearer 令牌
 _re.compile(r"(Authorization\s*[:=]\s*[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE),
 _re.compile(r"((api[_-]?key|apikey|password|passwd|secret|token)\s*[:=]\s*[^\s,;\"']+)", _re.IGNORECASE),
 # JWT：三段 base64url（eyJ... 开头）—— 一段即泄露签名密钥
 _re.compile(r"(eyJ[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+)"),
)


def _redact_string(s: str) -> str:
 """遮蔽字符串值内联的凭据模式；base64-JSON 含敏感键时整段遮蔽。"""
 out = s
 for pat in _INLINE_SECRET_PATTERNS:
 out = pat.sub("***", out)
 # base64 编码的 JSON（跨项目教训：access_token 以编码形式进日志，明文正则匹配不到）
 for b64 in _re.findall(r"[A-Za-z0-9+/]{40,}={0,2}", out):
 try:
 import base64
 decoded = base64.b64decode(b64, validate=True)
 if any(k in decoded for k in (b"access_token", b"api_key", b"apikey", b"authorization", b"password", b"secret")):
 out = out.replace(b64, "***")
 except Exception:
 continue
 return out


def _redact(value):
 """递归脱敏 dict/list 中的敏感字段值（就地不修改原对象）。"""
 """递归脱敏 dict/list 中的敏感字段值与字符串内联凭据（不修改原对象）。"""
 if isinstance(value, dict):
 return {
 k: ("***" if any(s in k.lower() for s in _SENSITIVE_KEY_SUBSTRINGS)
Expand All@@ -59,6 +94,8 @@ def _redact(value):
 }
 if isinstance(value, list):
 return [_redact(v) for v in value]
 if isinstance(value, str):
 return _redact_string(value)
 return value

from emrg.tools import ToolRegistry
Expand Down

43 changes: 43 additions & 0 deletions
tests/test_daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,3 +514,46 @@ def test_rant_field_order(tmp_path, monkeypatch):
 assert entry["project"] == "emrg"
 assert entry["status"] == "pending"
 assert entry["message"] == "test rant message"


# ── _redact 日志脱敏（rant 10:21 + 跨项目 base64 教训）──────────────


def test_redact_masks_sensitive_keys():
 """按键名脱敏（原有行为）。"""
 from emrg.server.daemon import _redact
 assert _redact({"api_key": "sk-abc", "model": "m"}) == {"api_key": "***", "model": "m"}
 assert _redact([{"token": "x"}, "plain"]) == [{"token": "***"}, "plain"]


def test_redact_inline_secrets_in_strings():
 """字符串值内联凭据（sk-/ghp_/Bearer/JWT）被遮蔽。"""
 from emrg.server.daemon import _redact
 # bash command 内联 API key
 assert "sk-1234567890abcdef" not in str(_redact({"command": "export OPENAI_API_KEY=sk-1234567890abcdef; curl x"}))
 # GitHub token 嵌在 URL
 assert "ghp_" not in str(_redact({"command": "git push https://x-access-token:ghp_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890@github.com/r.git"}))
 # Bearer + JWT
 jwt = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.dozjgNryP4J3jVmNHl0w5N_XgL0n3I9PlFUP0THsR8U"
 assert "eyJ" not in str(_redact({"text": f"Authorization: Bearer {jwt}"}))


def test_redact_base64_encoded_token_blob():
 """base64 编码的 access_token JSON 被整段遮蔽（跨项目教训：明文正则匹配不到编码形式）。"""
 import base64
 import json as _json
 from emrg.server.daemon import _redact
 blob = base64.b64encode(_json.dumps({"access_token": "super-secret"}).encode()).decode()
 out = _redact({"command": f"curl -d {blob} http://x"})
 assert "***" in out["command"]
 assert "super-secret" not in out["command"]
 assert blob not in out["command"]


def test_redact_no_false_positive_on_normal_strings():
 """普通字符串/短 sk- 前缀不被误伤。"""
 from emrg.server.daemon import _redact
 assert _redact({"command": "echo hello world", "path": "/tmp/a.txt"}) == {
 "command": "echo hello world", "path": "/tmp/a.txt"}
 # 短密钥（<8 位）不匹配 sk- 模式 → 保留
 assert "sk-abc" in _redact({"command": "echo sk-abc"})["command"]
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON) by argszero · Pull Request #513 · argszero/emrg · GitHub
Skip to content
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)#513

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

argszero
merged 1 commit into

from

Aug 6, 2026
 Merged


emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)
#513
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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (484) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (488) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (86: 22 daemon_client + 22 app-commands + 17 renderer smoke + 15 i18n + 7 integration + 3 commands) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)

Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ EMRG doesn't just keep up — it catches up on its own.
git clone https://github.com/argszero/emrg.git
cd emrg
uv sync # install deps
uv run pytest tests/ -v # run tests (currently 484 items)
uv run pytest tests/ -v # run tests (currently 488 items)
uv run python -m emrg # launch TUI
# CI includes actionlint workflow gate (#444): workflow parse errors fail PR CI

Expand Down

39 changes: 38 additions & 1 deletion
emrg/server/daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,49 @@
# ── 日志脱敏（rant 2026-08-06T10:21:26）────────────────────────────
# tool call 参数可能含 api_key/token/authorization/password 等敏感字段，
# 递归替换值为 ***，避免 emrgd.log 泄露凭据。
# 除按键名脱敏外，字符串值内联的凭据模式（sk-*/ghp_*/Bearer/JWT/base64-JSON）
# 也会被遮蔽——防止 bash command 里 `export OPENAI_API_KEY=sk-...` 或
# base64 编码的 access_token 整体泄露（跨项目教训：明文正则匹配不到编码形式）。
_SENSITIVE_KEY_SUBSTRINGS = (
 "api_key", "token", "authorization", "password", "secret",
 "api-key", "auth", "credential", "key",
)

import re as _re

# 字符串值内联凭据模式（保守匹配，宁多勿漏）
_INLINE_SECRET_PATTERNS = (
 _re.compile(r"(sk-[A-Za-z0-9_\-]{8,})"), # OpenAI/DeepSeek/Anthropic 密钥
 _re.compile(r"(gh[pousr]_[A-Za-z0-9]{20,})"), # GitHub PAT / OAuth / gist token
 _re.compile(r"(xox[baprs]-[A-Za-z0-9\-]{10,})"), # Slack token
 _re.compile(r"(AKIA[0-9A-Z]{16})"), # AWS access key id
 _re.compile(r"(Bearer\s+[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE), # Bearer 令牌
 _re.compile(r"(Authorization\s*[:=]\s*[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE),
 _re.compile(r"((api[_-]?key|apikey|password|passwd|secret|token)\s*[:=]\s*[^\s,;\"']+)", _re.IGNORECASE),
 # JWT：三段 base64url（eyJ... 开头）—— 一段即泄露签名密钥
 _re.compile(r"(eyJ[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+)"),
)


def _redact_string(s: str) -> str:
 """遮蔽字符串值内联的凭据模式；base64-JSON 含敏感键时整段遮蔽。"""
 out = s
 for pat in _INLINE_SECRET_PATTERNS:
 out = pat.sub("***", out)
 # base64 编码的 JSON（跨项目教训：access_token 以编码形式进日志，明文正则匹配不到）
 for b64 in _re.findall(r"[A-Za-z0-9+/]{40,}={0,2}", out):
 try:
 import base64
 decoded = base64.b64decode(b64, validate=True)
 if any(k in decoded for k in (b"access_token", b"api_key", b"apikey", b"authorization", b"password", b"secret")):
 out = out.replace(b64, "***")
 except Exception:
 continue
 return out


def _redact(value):
 """递归脱敏 dict/list 中的敏感字段值（就地不修改原对象）。"""
 """递归脱敏 dict/list 中的敏感字段值与字符串内联凭据（不修改原对象）。"""
 if isinstance(value, dict):
 return {
 k: ("***" if any(s in k.lower() for s in _SENSITIVE_KEY_SUBSTRINGS)
Expand All@@ -59,6 +94,8 @@ def _redact(value):
 }
 if isinstance(value, list):
 return [_redact(v) for v in value]
 if isinstance(value, str):
 return _redact_string(value)
 return value

from emrg.tools import ToolRegistry
Expand Down

43 changes: 43 additions & 0 deletions
tests/test_daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,3 +514,46 @@ def test_rant_field_order(tmp_path, monkeypatch):
 assert entry["project"] == "emrg"
 assert entry["status"] == "pending"
 assert entry["message"] == "test rant message"


# ── _redact 日志脱敏（rant 10:21 + 跨项目 base64 教训）──────────────


def test_redact_masks_sensitive_keys():
 """按键名脱敏（原有行为）。"""
 from emrg.server.daemon import _redact
 assert _redact({"api_key": "sk-abc", "model": "m"}) == {"api_key": "***", "model": "m"}
 assert _redact([{"token": "x"}, "plain"]) == [{"token": "***"}, "plain"]


def test_redact_inline_secrets_in_strings():
 """字符串值内联凭据（sk-/ghp_/Bearer/JWT）被遮蔽。"""
 from emrg.server.daemon import _redact
 # bash command 内联 API key
 assert "sk-1234567890abcdef" not in str(_redact({"command": "export OPENAI_API_KEY=sk-1234567890abcdef; curl x"}))
 # GitHub token 嵌在 URL
 assert "ghp_" not in str(_redact({"command": "git push https://x-access-token:ghp_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890@github.com/r.git"}))
 # Bearer + JWT
 jwt = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.dozjgNryP4J3jVmNHl0w5N_XgL0n3I9PlFUP0THsR8U"
 assert "eyJ" not in str(_redact({"text": f"Authorization: Bearer {jwt}"}))


def test_redact_base64_encoded_token_blob():
 """base64 编码的 access_token JSON 被整段遮蔽（跨项目教训：明文正则匹配不到编码形式）。"""
 import base64
 import json as _json
 from emrg.server.daemon import _redact
 blob = base64.b64encode(_json.dumps({"access_token": "super-secret"}).encode()).decode()
 out = _redact({"command": f"curl -d {blob} http://x"})
 assert "***" in out["command"]
 assert "super-secret" not in out["command"]
 assert blob not in out["command"]


def test_redact_no_false_positive_on_normal_strings():
 """普通字符串/短 sk- 前缀不被误伤。"""
 from emrg.server.daemon import _redact
 assert _redact({"command": "echo hello world", "path": "/tmp/a.txt"}) == {
 "command": "echo hello world", "path": "/tmp/a.txt"}
 # 短密钥（<8 位）不匹配 sk- 模式 → 保留
 assert "sk-abc" in _redact({"command": "echo sk-abc"})["command"]
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON) by argszero · Pull Request #513 · argszero/emrg · GitHub
Skip to content
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)#513

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

argszero
merged 1 commit into

from

Aug 6, 2026
 Merged


emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)
#513
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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (484) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (488) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (86: 22 daemon_client + 22 app-commands + 17 renderer smoke + 15 i18n + 7 integration + 3 commands) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)

Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ EMRG doesn't just keep up — it catches up on its own.
git clone https://github.com/argszero/emrg.git
cd emrg
uv sync # install deps
uv run pytest tests/ -v # run tests (currently 484 items)
uv run pytest tests/ -v # run tests (currently 488 items)
uv run python -m emrg # launch TUI
# CI includes actionlint workflow gate (#444): workflow parse errors fail PR CI

Expand Down

39 changes: 38 additions & 1 deletion
emrg/server/daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,49 @@
# ── 日志脱敏（rant 2026-08-06T10:21:26）────────────────────────────
# tool call 参数可能含 api_key/token/authorization/password 等敏感字段，
# 递归替换值为 ***，避免 emrgd.log 泄露凭据。
# 除按键名脱敏外，字符串值内联的凭据模式（sk-*/ghp_*/Bearer/JWT/base64-JSON）
# 也会被遮蔽——防止 bash command 里 `export OPENAI_API_KEY=sk-...` 或
# base64 编码的 access_token 整体泄露（跨项目教训：明文正则匹配不到编码形式）。
_SENSITIVE_KEY_SUBSTRINGS = (
 "api_key", "token", "authorization", "password", "secret",
 "api-key", "auth", "credential", "key",
)

import re as _re

# 字符串值内联凭据模式（保守匹配，宁多勿漏）
_INLINE_SECRET_PATTERNS = (
 _re.compile(r"(sk-[A-Za-z0-9_\-]{8,})"), # OpenAI/DeepSeek/Anthropic 密钥
 _re.compile(r"(gh[pousr]_[A-Za-z0-9]{20,})"), # GitHub PAT / OAuth / gist token
 _re.compile(r"(xox[baprs]-[A-Za-z0-9\-]{10,})"), # Slack token
 _re.compile(r"(AKIA[0-9A-Z]{16})"), # AWS access key id
 _re.compile(r"(Bearer\s+[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE), # Bearer 令牌
 _re.compile(r"(Authorization\s*[:=]\s*[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE),
 _re.compile(r"((api[_-]?key|apikey|password|passwd|secret|token)\s*[:=]\s*[^\s,;\"']+)", _re.IGNORECASE),
 # JWT：三段 base64url（eyJ... 开头）—— 一段即泄露签名密钥
 _re.compile(r"(eyJ[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+)"),
)


def _redact_string(s: str) -> str:
 """遮蔽字符串值内联的凭据模式；base64-JSON 含敏感键时整段遮蔽。"""
 out = s
 for pat in _INLINE_SECRET_PATTERNS:
 out = pat.sub("***", out)
 # base64 编码的 JSON（跨项目教训：access_token 以编码形式进日志，明文正则匹配不到）
 for b64 in _re.findall(r"[A-Za-z0-9+/]{40,}={0,2}", out):
 try:
 import base64
 decoded = base64.b64decode(b64, validate=True)
 if any(k in decoded for k in (b"access_token", b"api_key", b"apikey", b"authorization", b"password", b"secret")):
 out = out.replace(b64, "***")
 except Exception:
 continue
 return out


def _redact(value):
 """递归脱敏 dict/list 中的敏感字段值（就地不修改原对象）。"""
 """递归脱敏 dict/list 中的敏感字段值与字符串内联凭据（不修改原对象）。"""
 if isinstance(value, dict):
 return {
 k: ("***" if any(s in k.lower() for s in _SENSITIVE_KEY_SUBSTRINGS)
Expand All@@ -59,6 +94,8 @@ def _redact(value):
 }
 if isinstance(value, list):
 return [_redact(v) for v in value]
 if isinstance(value, str):
 return _redact_string(value)
 return value

from emrg.tools import ToolRegistry
Expand Down

43 changes: 43 additions & 0 deletions
tests/test_daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,3 +514,46 @@ def test_rant_field_order(tmp_path, monkeypatch):
 assert entry["project"] == "emrg"
 assert entry["status"] == "pending"
 assert entry["message"] == "test rant message"


# ── _redact 日志脱敏（rant 10:21 + 跨项目 base64 教训）──────────────


def test_redact_masks_sensitive_keys():
 """按键名脱敏（原有行为）。"""
 from emrg.server.daemon import _redact
 assert _redact({"api_key": "sk-abc", "model": "m"}) == {"api_key": "***", "model": "m"}
 assert _redact([{"token": "x"}, "plain"]) == [{"token": "***"}, "plain"]


def test_redact_inline_secrets_in_strings():
 """字符串值内联凭据（sk-/ghp_/Bearer/JWT）被遮蔽。"""
 from emrg.server.daemon import _redact
 # bash command 内联 API key
 assert "sk-1234567890abcdef" not in str(_redact({"command": "export OPENAI_API_KEY=sk-1234567890abcdef; curl x"}))
 # GitHub token 嵌在 URL
 assert "ghp_" not in str(_redact({"command": "git push https://x-access-token:ghp_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890@github.com/r.git"}))
 # Bearer + JWT
 jwt = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.dozjgNryP4J3jVmNHl0w5N_XgL0n3I9PlFUP0THsR8U"
 assert "eyJ" not in str(_redact({"text": f"Authorization: Bearer {jwt}"}))


def test_redact_base64_encoded_token_blob():
 """base64 编码的 access_token JSON 被整段遮蔽（跨项目教训：明文正则匹配不到编码形式）。"""
 import base64
 import json as _json
 from emrg.server.daemon import _redact
 blob = base64.b64encode(_json.dumps({"access_token": "super-secret"}).encode()).decode()
 out = _redact({"command": f"curl -d {blob} http://x"})
 assert "***" in out["command"]
 assert "super-secret" not in out["command"]
 assert blob not in out["command"]


def test_redact_no_false_positive_on_normal_strings():
 """普通字符串/短 sk- 前缀不被误伤。"""
 from emrg.server.daemon import _redact
 assert _redact({"command": "echo hello world", "path": "/tmp/a.txt"}) == {
 "command": "echo hello world", "path": "/tmp/a.txt"}
 # 短密钥（<8 位）不匹配 sk- 模式 → 保留
 assert "sk-abc" in _redact({"command": "echo sk-abc"})["command"]
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON) by argszero · Pull Request #513 · argszero/emrg · GitHub
Skip to content
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)#513

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

argszero
merged 1 commit into

from

Aug 6, 2026
 Merged


emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)
#513
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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (484) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (488) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (86: 22 daemon_client + 22 app-commands + 17 renderer smoke + 15 i18n + 7 integration + 3 commands) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)

Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ EMRG doesn't just keep up — it catches up on its own.
git clone https://github.com/argszero/emrg.git
cd emrg
uv sync # install deps
uv run pytest tests/ -v # run tests (currently 484 items)
uv run pytest tests/ -v # run tests (currently 488 items)
uv run python -m emrg # launch TUI
# CI includes actionlint workflow gate (#444): workflow parse errors fail PR CI

Expand Down

39 changes: 38 additions & 1 deletion
emrg/server/daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,49 @@
# ── 日志脱敏（rant 2026-08-06T10:21:26）────────────────────────────
# tool call 参数可能含 api_key/token/authorization/password 等敏感字段，
# 递归替换值为 ***，避免 emrgd.log 泄露凭据。
# 除按键名脱敏外，字符串值内联的凭据模式（sk-*/ghp_*/Bearer/JWT/base64-JSON）
# 也会被遮蔽——防止 bash command 里 `export OPENAI_API_KEY=sk-...` 或
# base64 编码的 access_token 整体泄露（跨项目教训：明文正则匹配不到编码形式）。
_SENSITIVE_KEY_SUBSTRINGS = (
 "api_key", "token", "authorization", "password", "secret",
 "api-key", "auth", "credential", "key",
)

import re as _re

# 字符串值内联凭据模式（保守匹配，宁多勿漏）
_INLINE_SECRET_PATTERNS = (
 _re.compile(r"(sk-[A-Za-z0-9_\-]{8,})"), # OpenAI/DeepSeek/Anthropic 密钥
 _re.compile(r"(gh[pousr]_[A-Za-z0-9]{20,})"), # GitHub PAT / OAuth / gist token
 _re.compile(r"(xox[baprs]-[A-Za-z0-9\-]{10,})"), # Slack token
 _re.compile(r"(AKIA[0-9A-Z]{16})"), # AWS access key id
 _re.compile(r"(Bearer\s+[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE), # Bearer 令牌
 _re.compile(r"(Authorization\s*[:=]\s*[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE),
 _re.compile(r"((api[_-]?key|apikey|password|passwd|secret|token)\s*[:=]\s*[^\s,;\"']+)", _re.IGNORECASE),
 # JWT：三段 base64url（eyJ... 开头）—— 一段即泄露签名密钥
 _re.compile(r"(eyJ[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+)"),
)


def _redact_string(s: str) -> str:
 """遮蔽字符串值内联的凭据模式；base64-JSON 含敏感键时整段遮蔽。"""
 out = s
 for pat in _INLINE_SECRET_PATTERNS:
 out = pat.sub("***", out)
 # base64 编码的 JSON（跨项目教训：access_token 以编码形式进日志，明文正则匹配不到）
 for b64 in _re.findall(r"[A-Za-z0-9+/]{40,}={0,2}", out):
 try:
 import base64
 decoded = base64.b64decode(b64, validate=True)
 if any(k in decoded for k in (b"access_token", b"api_key", b"apikey", b"authorization", b"password", b"secret")):
 out = out.replace(b64, "***")
 except Exception:
 continue
 return out


def _redact(value):
 """递归脱敏 dict/list 中的敏感字段值（就地不修改原对象）。"""
 """递归脱敏 dict/list 中的敏感字段值与字符串内联凭据（不修改原对象）。"""
 if isinstance(value, dict):
 return {
 k: ("***" if any(s in k.lower() for s in _SENSITIVE_KEY_SUBSTRINGS)
Expand All@@ -59,6 +94,8 @@ def _redact(value):
 }
 if isinstance(value, list):
 return [_redact(v) for v in value]
 if isinstance(value, str):
 return _redact_string(value)
 return value

from emrg.tools import ToolRegistry
Expand Down

43 changes: 43 additions & 0 deletions
tests/test_daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,3 +514,46 @@ def test_rant_field_order(tmp_path, monkeypatch):
 assert entry["project"] == "emrg"
 assert entry["status"] == "pending"
 assert entry["message"] == "test rant message"


# ── _redact 日志脱敏（rant 10:21 + 跨项目 base64 教训）──────────────


def test_redact_masks_sensitive_keys():
 """按键名脱敏（原有行为）。"""
 from emrg.server.daemon import _redact
 assert _redact({"api_key": "sk-abc", "model": "m"}) == {"api_key": "***", "model": "m"}
 assert _redact([{"token": "x"}, "plain"]) == [{"token": "***"}, "plain"]


def test_redact_inline_secrets_in_strings():
 """字符串值内联凭据（sk-/ghp_/Bearer/JWT）被遮蔽。"""
 from emrg.server.daemon import _redact
 # bash command 内联 API key
 assert "sk-1234567890abcdef" not in str(_redact({"command": "export OPENAI_API_KEY=sk-1234567890abcdef; curl x"}))
 # GitHub token 嵌在 URL
 assert "ghp_" not in str(_redact({"command": "git push https://x-access-token:ghp_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890@github.com/r.git"}))
 # Bearer + JWT
 jwt = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.dozjgNryP4J3jVmNHl0w5N_XgL0n3I9PlFUP0THsR8U"
 assert "eyJ" not in str(_redact({"text": f"Authorization: Bearer {jwt}"}))


def test_redact_base64_encoded_token_blob():
 """base64 编码的 access_token JSON 被整段遮蔽（跨项目教训：明文正则匹配不到编码形式）。"""
 import base64
 import json as _json
 from emrg.server.daemon import _redact
 blob = base64.b64encode(_json.dumps({"access_token": "super-secret"}).encode()).decode()
 out = _redact({"command": f"curl -d {blob} http://x"})
 assert "***" in out["command"]
 assert "super-secret" not in out["command"]
 assert blob not in out["command"]


def test_redact_no_false_positive_on_normal_strings():
 """普通字符串/短 sk- 前缀不被误伤。"""
 from emrg.server.daemon import _redact
 assert _redact({"command": "echo hello world", "path": "/tmp/a.txt"}) == {
 "command": "echo hello world", "path": "/tmp/a.txt"}
 # 短密钥（<8 位）不匹配 sk- 模式 → 保留
 assert "sk-abc" in _redact({"command": "echo sk-abc"})["command"]
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON) by argszero · Pull Request #513 · argszero/emrg · GitHub
Skip to content
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)#513

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

argszero
merged 1 commit into

from

Aug 6, 2026
 Merged


emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)
#513
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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (484) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (488) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (86: 22 daemon_client + 22 app-commands + 17 renderer smoke + 15 i18n + 7 integration + 3 commands) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)

Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ EMRG doesn't just keep up — it catches up on its own.
git clone https://github.com/argszero/emrg.git
cd emrg
uv sync # install deps
uv run pytest tests/ -v # run tests (currently 484 items)
uv run pytest tests/ -v # run tests (currently 488 items)
uv run python -m emrg # launch TUI
# CI includes actionlint workflow gate (#444): workflow parse errors fail PR CI

Expand Down

39 changes: 38 additions & 1 deletion
emrg/server/daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,49 @@
# ── 日志脱敏（rant 2026-08-06T10:21:26）────────────────────────────
# tool call 参数可能含 api_key/token/authorization/password 等敏感字段，
# 递归替换值为 ***，避免 emrgd.log 泄露凭据。
# 除按键名脱敏外，字符串值内联的凭据模式（sk-*/ghp_*/Bearer/JWT/base64-JSON）
# 也会被遮蔽——防止 bash command 里 `export OPENAI_API_KEY=sk-...` 或
# base64 编码的 access_token 整体泄露（跨项目教训：明文正则匹配不到编码形式）。
_SENSITIVE_KEY_SUBSTRINGS = (
 "api_key", "token", "authorization", "password", "secret",
 "api-key", "auth", "credential", "key",
)

import re as _re

# 字符串值内联凭据模式（保守匹配，宁多勿漏）
_INLINE_SECRET_PATTERNS = (
 _re.compile(r"(sk-[A-Za-z0-9_\-]{8,})"), # OpenAI/DeepSeek/Anthropic 密钥
 _re.compile(r"(gh[pousr]_[A-Za-z0-9]{20,})"), # GitHub PAT / OAuth / gist token
 _re.compile(r"(xox[baprs]-[A-Za-z0-9\-]{10,})"), # Slack token
 _re.compile(r"(AKIA[0-9A-Z]{16})"), # AWS access key id
 _re.compile(r"(Bearer\s+[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE), # Bearer 令牌
 _re.compile(r"(Authorization\s*[:=]\s*[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE),
 _re.compile(r"((api[_-]?key|apikey|password|passwd|secret|token)\s*[:=]\s*[^\s,;\"']+)", _re.IGNORECASE),
 # JWT：三段 base64url（eyJ... 开头）—— 一段即泄露签名密钥
 _re.compile(r"(eyJ[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+)"),
)


def _redact_string(s: str) -> str:
 """遮蔽字符串值内联的凭据模式；base64-JSON 含敏感键时整段遮蔽。"""
 out = s
 for pat in _INLINE_SECRET_PATTERNS:
 out = pat.sub("***", out)
 # base64 编码的 JSON（跨项目教训：access_token 以编码形式进日志，明文正则匹配不到）
 for b64 in _re.findall(r"[A-Za-z0-9+/]{40,}={0,2}", out):
 try:
 import base64
 decoded = base64.b64decode(b64, validate=True)
 if any(k in decoded for k in (b"access_token", b"api_key", b"apikey", b"authorization", b"password", b"secret")):
 out = out.replace(b64, "***")
 except Exception:
 continue
 return out


def _redact(value):
 """递归脱敏 dict/list 中的敏感字段值（就地不修改原对象）。"""
 """递归脱敏 dict/list 中的敏感字段值与字符串内联凭据（不修改原对象）。"""
 if isinstance(value, dict):
 return {
 k: ("***" if any(s in k.lower() for s in _SENSITIVE_KEY_SUBSTRINGS)
Expand All@@ -59,6 +94,8 @@ def _redact(value):
 }
 if isinstance(value, list):
 return [_redact(v) for v in value]
 if isinstance(value, str):
 return _redact_string(value)
 return value

from emrg.tools import ToolRegistry
Expand Down

43 changes: 43 additions & 0 deletions
tests/test_daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,3 +514,46 @@ def test_rant_field_order(tmp_path, monkeypatch):
 assert entry["project"] == "emrg"
 assert entry["status"] == "pending"
 assert entry["message"] == "test rant message"


# ── _redact 日志脱敏（rant 10:21 + 跨项目 base64 教训）──────────────


def test_redact_masks_sensitive_keys():
 """按键名脱敏（原有行为）。"""
 from emrg.server.daemon import _redact
 assert _redact({"api_key": "sk-abc", "model": "m"}) == {"api_key": "***", "model": "m"}
 assert _redact([{"token": "x"}, "plain"]) == [{"token": "***"}, "plain"]


def test_redact_inline_secrets_in_strings():
 """字符串值内联凭据（sk-/ghp_/Bearer/JWT）被遮蔽。"""
 from emrg.server.daemon import _redact
 # bash command 内联 API key
 assert "sk-1234567890abcdef" not in str(_redact({"command": "export OPENAI_API_KEY=sk-1234567890abcdef; curl x"}))
 # GitHub token 嵌在 URL
 assert "ghp_" not in str(_redact({"command": "git push https://x-access-token:ghp_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890@github.com/r.git"}))
 # Bearer + JWT
 jwt = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.dozjgNryP4J3jVmNHl0w5N_XgL0n3I9PlFUP0THsR8U"
 assert "eyJ" not in str(_redact({"text": f"Authorization: Bearer {jwt}"}))


def test_redact_base64_encoded_token_blob():
 """base64 编码的 access_token JSON 被整段遮蔽（跨项目教训：明文正则匹配不到编码形式）。"""
 import base64
 import json as _json
 from emrg.server.daemon import _redact
 blob = base64.b64encode(_json.dumps({"access_token": "super-secret"}).encode()).decode()
 out = _redact({"command": f"curl -d {blob} http://x"})
 assert "***" in out["command"]
 assert "super-secret" not in out["command"]
 assert blob not in out["command"]


def test_redact_no_false_positive_on_normal_strings():
 """普通字符串/短 sk- 前缀不被误伤。"""
 from emrg.server.daemon import _redact
 assert _redact({"command": "echo hello world", "path": "/tmp/a.txt"}) == {
 "command": "echo hello world", "path": "/tmp/a.txt"}
 # 短密钥（<8 位）不匹配 sk- 模式 → 保留
 assert "sk-abc" in _redact({"command": "echo sk-abc"})["command"]
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON) by argszero · Pull Request #513 · argszero/emrg · GitHub
Skip to content
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)#513

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

argszero
merged 1 commit into

from

Aug 6, 2026
 Merged


emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)
#513
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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (484) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (488) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (86: 22 daemon_client + 22 app-commands + 17 renderer smoke + 15 i18n + 7 integration + 3 commands) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)

Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ EMRG doesn't just keep up — it catches up on its own.
git clone https://github.com/argszero/emrg.git
cd emrg
uv sync # install deps
uv run pytest tests/ -v # run tests (currently 484 items)
uv run pytest tests/ -v # run tests (currently 488 items)
uv run python -m emrg # launch TUI
# CI includes actionlint workflow gate (#444): workflow parse errors fail PR CI

Expand Down

39 changes: 38 additions & 1 deletion
emrg/server/daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,49 @@
# ── 日志脱敏（rant 2026-08-06T10:21:26）────────────────────────────
# tool call 参数可能含 api_key/token/authorization/password 等敏感字段，
# 递归替换值为 ***，避免 emrgd.log 泄露凭据。
# 除按键名脱敏外，字符串值内联的凭据模式（sk-*/ghp_*/Bearer/JWT/base64-JSON）
# 也会被遮蔽——防止 bash command 里 `export OPENAI_API_KEY=sk-...` 或
# base64 编码的 access_token 整体泄露（跨项目教训：明文正则匹配不到编码形式）。
_SENSITIVE_KEY_SUBSTRINGS = (
 "api_key", "token", "authorization", "password", "secret",
 "api-key", "auth", "credential", "key",
)

import re as _re

# 字符串值内联凭据模式（保守匹配，宁多勿漏）
_INLINE_SECRET_PATTERNS = (
 _re.compile(r"(sk-[A-Za-z0-9_\-]{8,})"), # OpenAI/DeepSeek/Anthropic 密钥
 _re.compile(r"(gh[pousr]_[A-Za-z0-9]{20,})"), # GitHub PAT / OAuth / gist token
 _re.compile(r"(xox[baprs]-[A-Za-z0-9\-]{10,})"), # Slack token
 _re.compile(r"(AKIA[0-9A-Z]{16})"), # AWS access key id
 _re.compile(r"(Bearer\s+[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE), # Bearer 令牌
 _re.compile(r"(Authorization\s*[:=]\s*[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE),
 _re.compile(r"((api[_-]?key|apikey|password|passwd|secret|token)\s*[:=]\s*[^\s,;\"']+)", _re.IGNORECASE),
 # JWT：三段 base64url（eyJ... 开头）—— 一段即泄露签名密钥
 _re.compile(r"(eyJ[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+)"),
)


def _redact_string(s: str) -> str:
 """遮蔽字符串值内联的凭据模式；base64-JSON 含敏感键时整段遮蔽。"""
 out = s
 for pat in _INLINE_SECRET_PATTERNS:
 out = pat.sub("***", out)
 # base64 编码的 JSON（跨项目教训：access_token 以编码形式进日志，明文正则匹配不到）
 for b64 in _re.findall(r"[A-Za-z0-9+/]{40,}={0,2}", out):
 try:
 import base64
 decoded = base64.b64decode(b64, validate=True)
 if any(k in decoded for k in (b"access_token", b"api_key", b"apikey", b"authorization", b"password", b"secret")):
 out = out.replace(b64, "***")
 except Exception:
 continue
 return out


def _redact(value):
 """递归脱敏 dict/list 中的敏感字段值（就地不修改原对象）。"""
 """递归脱敏 dict/list 中的敏感字段值与字符串内联凭据（不修改原对象）。"""
 if isinstance(value, dict):
 return {
 k: ("***" if any(s in k.lower() for s in _SENSITIVE_KEY_SUBSTRINGS)
Expand All@@ -59,6 +94,8 @@ def _redact(value):
 }
 if isinstance(value, list):
 return [_redact(v) for v in value]
 if isinstance(value, str):
 return _redact_string(value)
 return value

from emrg.tools import ToolRegistry
Expand Down

43 changes: 43 additions & 0 deletions
tests/test_daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,3 +514,46 @@ def test_rant_field_order(tmp_path, monkeypatch):
 assert entry["project"] == "emrg"
 assert entry["status"] == "pending"
 assert entry["message"] == "test rant message"


# ── _redact 日志脱敏（rant 10:21 + 跨项目 base64 教训）──────────────


def test_redact_masks_sensitive_keys():
 """按键名脱敏（原有行为）。"""
 from emrg.server.daemon import _redact
 assert _redact({"api_key": "sk-abc", "model": "m"}) == {"api_key": "***", "model": "m"}
 assert _redact([{"token": "x"}, "plain"]) == [{"token": "***"}, "plain"]


def test_redact_inline_secrets_in_strings():
 """字符串值内联凭据（sk-/ghp_/Bearer/JWT）被遮蔽。"""
 from emrg.server.daemon import _redact
 # bash command 内联 API key
 assert "sk-1234567890abcdef" not in str(_redact({"command": "export OPENAI_API_KEY=sk-1234567890abcdef; curl x"}))
 # GitHub token 嵌在 URL
 assert "ghp_" not in str(_redact({"command": "git push https://x-access-token:ghp_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890@github.com/r.git"}))
 # Bearer + JWT
 jwt = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.dozjgNryP4J3jVmNHl0w5N_XgL0n3I9PlFUP0THsR8U"
 assert "eyJ" not in str(_redact({"text": f"Authorization: Bearer {jwt}"}))


def test_redact_base64_encoded_token_blob():
 """base64 编码的 access_token JSON 被整段遮蔽（跨项目教训：明文正则匹配不到编码形式）。"""
 import base64
 import json as _json
 from emrg.server.daemon import _redact
 blob = base64.b64encode(_json.dumps({"access_token": "super-secret"}).encode()).decode()
 out = _redact({"command": f"curl -d {blob} http://x"})
 assert "***" in out["command"]
 assert "super-secret" not in out["command"]
 assert blob not in out["command"]


def test_redact_no_false_positive_on_normal_strings():
 """普通字符串/短 sk- 前缀不被误伤。"""
 from emrg.server.daemon import _redact
 assert _redact({"command": "echo hello world", "path": "/tmp/a.txt"}) == {
 "command": "echo hello world", "path": "/tmp/a.txt"}
 # 短密钥（<8 位）不匹配 sk- 模式 → 保留
 assert "sk-abc" in _redact({"command": "echo sk-abc"})["command"]
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON) by argszero · Pull Request #513 · argszero/emrg · GitHub
Skip to content
emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)#513

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

argszero
merged 1 commit into

from

Aug 6, 2026
 Merged


emrg: Extend _redact to mask inline credentials in string values (sk-/ghp_/Bearer/JWT/base64-JSON)
#513
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


2 changes: 1 addition & 1 deletion
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ Community needs voiced in HN agent-UI discussions map directly to EMRG's design:
pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
```

Python: `uv run pytest tests/ -v` (484) — import check: `uv run python -c "from emrg.client.app import run_client"`
Python: `uv run pytest tests/ -v` (488) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (86: 22 daemon_client + 22 app-commands + 17 renderer smoke + 15 i18n + 7 integration + 3 commands) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)

Expand Down

2 changes: 1 addition & 1 deletion
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ EMRG doesn't just keep up — it catches up on its own.
git clone https://github.com/argszero/emrg.git
cd emrg
uv sync # install deps
uv run pytest tests/ -v # run tests (currently 484 items)
uv run pytest tests/ -v # run tests (currently 488 items)
uv run python -m emrg # launch TUI
# CI includes actionlint workflow gate (#444): workflow parse errors fail PR CI

Expand Down

39 changes: 38 additions & 1 deletion
emrg/server/daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,49 @@
# ── 日志脱敏（rant 2026-08-06T10:21:26）────────────────────────────
# tool call 参数可能含 api_key/token/authorization/password 等敏感字段，
# 递归替换值为 ***，避免 emrgd.log 泄露凭据。
# 除按键名脱敏外，字符串值内联的凭据模式（sk-*/ghp_*/Bearer/JWT/base64-JSON）
# 也会被遮蔽——防止 bash command 里 `export OPENAI_API_KEY=sk-...` 或
# base64 编码的 access_token 整体泄露（跨项目教训：明文正则匹配不到编码形式）。
_SENSITIVE_KEY_SUBSTRINGS = (
 "api_key", "token", "authorization", "password", "secret",
 "api-key", "auth", "credential", "key",
)

import re as _re

# 字符串值内联凭据模式（保守匹配，宁多勿漏）
_INLINE_SECRET_PATTERNS = (
 _re.compile(r"(sk-[A-Za-z0-9_\-]{8,})"), # OpenAI/DeepSeek/Anthropic 密钥
 _re.compile(r"(gh[pousr]_[A-Za-z0-9]{20,})"), # GitHub PAT / OAuth / gist token
 _re.compile(r"(xox[baprs]-[A-Za-z0-9\-]{10,})"), # Slack token
 _re.compile(r"(AKIA[0-9A-Z]{16})"), # AWS access key id
 _re.compile(r"(Bearer\s+[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE), # Bearer 令牌
 _re.compile(r"(Authorization\s*[:=]\s*[A-Za-z0-9\-._~+/]+=*)", _re.IGNORECASE),
 _re.compile(r"((api[_-]?key|apikey|password|passwd|secret|token)\s*[:=]\s*[^\s,;\"']+)", _re.IGNORECASE),
 # JWT：三段 base64url（eyJ... 开头）—— 一段即泄露签名密钥
 _re.compile(r"(eyJ[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+\.[A-Za-z0-9_\-]+)"),
)


def _redact_string(s: str) -> str:
 """遮蔽字符串值内联的凭据模式；base64-JSON 含敏感键时整段遮蔽。"""
 out = s
 for pat in _INLINE_SECRET_PATTERNS:
 out = pat.sub("***", out)
 # base64 编码的 JSON（跨项目教训：access_token 以编码形式进日志，明文正则匹配不到）
 for b64 in _re.findall(r"[A-Za-z0-9+/]{40,}={0,2}", out):
 try:
 import base64
 decoded = base64.b64decode(b64, validate=True)
 if any(k in decoded for k in (b"access_token", b"api_key", b"apikey", b"authorization", b"password", b"secret")):
 out = out.replace(b64, "***")
 except Exception:
 continue
 return out


def _redact(value):
 """递归脱敏 dict/list 中的敏感字段值（就地不修改原对象）。"""
 """递归脱敏 dict/list 中的敏感字段值与字符串内联凭据（不修改原对象）。"""
 if isinstance(value, dict):
 return {
 k: ("***" if any(s in k.lower() for s in _SENSITIVE_KEY_SUBSTRINGS)
Expand All@@ -59,6 +94,8 @@ def _redact(value):
 }
 if isinstance(value, list):
 return [_redact(v) for v in value]
 if isinstance(value, str):
 return _redact_string(value)
 return value

from emrg.tools import ToolRegistry
Expand Down

43 changes: 43 additions & 0 deletions
tests/test_daemon.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -514,3 +514,46 @@ def test_rant_field_order(tmp_path, monkeypatch):
 assert entry["project"] == "emrg"
 assert entry["status"] == "pending"
 assert entry["message"] == "test rant message"


# ── _redact 日志脱敏（rant 10:21 + 跨项目 base64 教训）──────────────


def test_redact_masks_sensitive_keys():
 """按键名脱敏（原有行为）。"""
 from emrg.server.daemon import _redact
 assert _redact({"api_key": "sk-abc", "model": "m"}) == {"api_key": "***", "model": "m"}
 assert _redact([{"token": "x"}, "plain"]) == [{"token": "***"}, "plain"]


def test_redact_inline_secrets_in_strings():
 """字符串值内联凭据（sk-/ghp_/Bearer/JWT）被遮蔽。"""
 from emrg.server.daemon import _redact
 # bash command 内联 API key
 assert "sk-1234567890abcdef" not in str(_redact({"command": "export OPENAI_API_KEY=sk-1234567890abcdef; curl x"}))
 # GitHub token 嵌在 URL
 assert "ghp_" not in str(_redact({"command": "git push https://x-access-token:ghp_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890@github.com/r.git"}))
 # Bearer + JWT
 jwt = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.dozjgNryP4J3jVmNHl0w5N_XgL0n3I9PlFUP0THsR8U"
 assert "eyJ" not in str(_redact({"text": f"Authorization: Bearer {jwt}"}))


def test_redact_base64_encoded_token_blob():
 """base64 编码的 access_token JSON 被整段遮蔽（跨项目教训：明文正则匹配不到编码形式）。"""
 import base64
 import json as _json
 from emrg.server.daemon import _redact
 blob = base64.b64encode(_json.dumps({"access_token": "super-secret"}).encode()).decode()
 out = _redact({"command": f"curl -d {blob} http://x"})
 assert "***" in out["command"]
 assert "super-secret" not in out["command"]
 assert blob not in out["command"]


def test_redact_no_false_positive_on_normal_strings():
 """普通字符串/短 sk- 前缀不被误伤。"""
 from emrg.server.daemon import _redact
 assert _redact({"command": "echo hello world", "path": "/tmp/a.txt"}) == {
 "command": "echo hello world", "path": "/tmp/a.txt"}
 # 短密钥（<8 位）不匹配 sk- 模式 → 保留
 assert "sk-abc" in _redact({"command": "echo sk-abc"})["command"]
Loading