fix: render Jinja2 instructions in an immutable sandbox - #7212
Open
devjoinedthechat wants to merge 1 commit into
Open
devjoinedthechat wants to merge 1 commit into
devjoinedthechat wants to merge 1 commit into
Conversation
use_jinja2 rendered templates with a plain jinja2.Environment, so a template could reach Python internals through attributes such as __class__ and __globals__. The template context also holds the live session state objects, so a template could modify them in place. Render with ImmutableSandboxedEnvironment, which blocks both. Follow-up to google#6186.
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Link to Issue or Description of Change
Problem:
inject_session_state(..., use_jinja2=True)renders with a plainjinja2.Environment, so a template can reach Python internals, e.g.''.__class__.__mro__[1].__subclasses__()or theartifacthelper's__globals__.Separately, the template context is
dict(session.state), a shallow copy, so a template can also mutate the live state objects in place ({{ items.append('b') }},{{ user.update(name='Bar') }}). That change never goes through a state delta.Solution:
Render with
jinja2.sandbox.ImmutableSandboxedEnvironment. It is theSandboxedEnvironmentalready used for the eval prompt templates, plus blocking the mutating methods of builtin lists, dicts and sets, which fits the read-only context this function gets. Variables, filters, conditionals, loops and the asyncartifact()helper behave as before.If you'd prefer plain
SandboxedEnvironmentto match the eval code, it's a one-word change.Testing Plan
Unit Tests:
New tests:
test_inject_session_state_jinja2_blocks_python_internals(2 cases) andtest_inject_session_state_jinja2_cannot_mutate_state. All three fail on main.Manual End-to-End (E2E) Tests:
Script using a real
InMemorySessionServicesession andReadonlyContext:Before (main):
After:
Checklist