Commit df75a3b
committed
security: add module blocklist for YAML agent config code references
- Enable _ENFORCE_DENYLIST by default (True) so the blocklist is active
out of the box, not opt-in.
- Expand _BLOCKED_MODULES from 27 to 36 entries, adding network-capable
stdlib modules (ftplib, smtplib, poplib, imaplib, nntplib, telnetlib,
xmlrpc, asyncio) and filesystem modules (pathlib) that were identified
as gaps during review.
- Gate _resolve_tools() in LlmAgent (llm_agent.py L1047) with
_validate_module_reference() before importlib.import_module().
This was the last ungated import site: a YAML config with
tools: [{name: os.system}] would previously import the os module
without restriction.
- Organise _BLOCKED_MODULES by category (process/OS, code eval,
native/unsafe, network, filesystem/serialisation, interactive).
- Add comprehensive tests:
* _resolve_tools() blocks dangerous modules (os, subprocess, builtins,
pickle) and allows ADK built-in tools (no dot in name).
* Newly blocked network modules are rejected (ftplib, smtplib, xmlrpc,
telnetlib, poplib, imaplib, asyncio, pathlib).
* _set_enforce_denylist(False) escape hatch works.
Import sites gated (audit):
config_agent_utils.py: resolve_fully_qualified_name (L192),
_resolve_agent_code_reference (L246), resolve_code_reference (L274)
llm_agent.py: _resolve_tools user-defined path (L1049)
llm_agent.py: _resolve_tools built-in path (L1043) — N/A, hardcoded
to google.adk.tools
Fixes #58221 parent 9670ce2 commit df75a3b
3 files changed
Lines changed: 201 additions & 0 deletions
File tree
- src/google/adk/agents
- tests/unittests/agents
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
108 | 188 | | |
109 | 189 | | |
110 | 190 | | |
111 | 191 | | |
| 192 | + | |
112 | 193 | | |
113 | 194 | | |
114 | 195 | | |
| |||
160 | 241 | | |
161 | 242 | | |
162 | 243 | | |
| 244 | + | |
163 | 245 | | |
164 | 246 | | |
165 | 247 | | |
| |||
189 | 271 | | |
190 | 272 | | |
191 | 273 | | |
| 274 | + | |
192 | 275 | | |
193 | 276 | | |
194 | 277 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1044 | 1044 | | |
1045 | 1045 | | |
1046 | 1046 | | |
| 1047 | + | |
| 1048 | + | |
| 1049 | + | |
1047 | 1050 | | |
1048 | 1051 | | |
1049 | 1052 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
465 | 465 | | |
466 | 466 | | |
467 | 467 | | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
0 commit comments