FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

feat: support DisableBuiltin("$env") to hide the $env variable by boinger · Pull Request #949 · expr-lang/expr · GitHub

/ expr Public

feat: support DisableBuiltin("$env") to hide the $env variable #949

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

Open
boinger wants to merge 4 commits into
base: master
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
+74 −5
Conversation 2 Commits 4 Checks 0 Files changed 3
Open

feat: support DisableBuiltin("$env") to hide the $env variable #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa10d51
feat: support DisableBuiltin("$env") to hide the $env variable
boinger Mar 26, 2026
9718fb1
Merge remote-tracking branch 'upstream/master' into feat/disable-env-…
boinger Apr 13, 2026
0a8c967
Merge branch 'master' into feat/disable-env-builtin
boinger May 26, 2026
d9e10d8
Merge branch 'master' into feat/disable-env-builtin
boinger Jul 8, 2026
File filter

Filter by extension

Filter by extension .go  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
8 changes: 4 additions & 4 deletions checker/checker.go
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ func (v *Checker) identifierNode(node *ast.IdentifierNode) Nature {
return v.varScopes[i].nature
}
}
if node.Value == "$env" {
if node.Value == "$env" && !v.config.Disabled["$env"] {
return Nature{}
}

Expand Down Expand Up @@ -514,7 +514,7 @@ func (v *Checker) chainNode(node *ast.ChainNode) Nature {

func (v *Checker) memberNode(node *ast.MemberNode) Nature {
// $env variable
if an, ok := node.Node.(*ast.IdentifierNode); ok && an.Value == "$env" {
if an, ok := node.Node.(*ast.IdentifierNode); ok && an.Value == "$env" && !v.config.Disabled["$env"] {
if name, ok := node.Property.(*ast.StringNode); ok {
strict := v.config.Strict
if node.Optional {
Expand Down Expand Up @@ -661,7 +661,7 @@ func (v *Checker) callNode(node *ast.CallNode) Nature {
}

// $env is not callable.
if id, ok := node.Callee.(*ast.IdentifierNode); ok && id.Value == "$env" {
if id, ok := node.Callee.(*ast.IdentifierNode); ok && id.Value == "$env" && !v.config.Disabled["$env"] {
return v.error(node, "%s is not callable", v.config.Env.String())
}

Expand Down Expand Up @@ -974,7 +974,7 @@ func (v *Checker) checkBuiltinGet(node *ast.BuiltinNode) Nature {
prop := v.visit(node.Arguments[1])
prop = prop.Deref(&v.config.NtCache)

if id, ok := node.Arguments[0].(*ast.IdentifierNode); ok && id.Value == "$env" {
if id, ok := node.Arguments[0].(*ast.IdentifierNode); ok && id.Value == "$env" && !v.config.Disabled["$env"] {
if s, ok := node.Arguments[1].(*ast.StringNode); ok {
if nt, ok := v.config.Env.Get(&v.config.NtCache, s.Value); ok {
return nt
Expand Down
2 changes: 1 addition & 1 deletion compiler/compiler.go
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ func (c *compiler) IdentifierNode(node *ast.IdentifierNode) {
c.emit(OpLoadVar, index)
return
}
if node.Value == "$env" {
if node.Value == "$env" && (c.config == nil || !c.config.Disabled["$env"]) {
c.emit(OpLoadEnv)
return
}
Expand Down
69 changes: 69 additions & 0 deletions test/issues/710/issue_test.go
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package issue_test

import (
"testing"

"github.com/expr-lang/expr"
"github.com/expr-lang/expr/internal/testify/assert"
"github.com/expr-lang/expr/internal/testify/require"
)

func TestIssue710_disable_env_builtin(t *testing.T) {
env := map[string]any{
"foo": 42,
}

t.Run("$env disabled in strict mode", func(t *testing.T) {
_, err := expr.Compile(`$env`, expr.Env(env), expr.DisableBuiltin("$env"))
require.Error(t, err)
assert.Contains(t, err.Error(), "unknown name $env")
})

t.Run("$env.field disabled in strict mode", func(t *testing.T) {
_, err := expr.Compile(`$env.foo`, expr.Env(env), expr.DisableBuiltin("$env"))
require.Error(t, err)
assert.Contains(t, err.Error(), "unknown name $env")
})

t.Run("get($env, field) disabled in strict mode", func(t *testing.T) {
_, err := expr.Compile(`get($env, "foo")`, expr.Env(env), expr.DisableBuiltin("$env"))
require.Error(t, err)
assert.Contains(t, err.Error(), "unknown name $env")
})

t.Run("$env() disabled in strict mode", func(t *testing.T) {
_, err := expr.Compile(`$env()`, expr.Env(env), expr.DisableBuiltin("$env"))
require.Error(t, err)
assert.Contains(t, err.Error(), "unknown name $env")
})

t.Run("$env disabled without strict mode", func(t *testing.T) {
// Without expr.Env(), the checker runs in non-strict mode.
// Disabled $env falls through to normal identifier resolution,
// which returns nil for unknown names in non-strict mode.
program, err := expr.Compile(`$env`, expr.DisableBuiltin("$env"))
require.NoError(t, err)

out, err := expr.Run(program, map[string]any{})
require.NoError(t, err)
assert.Nil(t, out)
})

t.Run("$env enabled by default", func(t *testing.T) {
program, err := expr.Compile(`$env.foo`, expr.Env(env))
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, 42, out)
})

t.Run("$env standalone enabled by default", func(t *testing.T) {
program, err := expr.Compile(`$env`, expr.Env(env))
require.NoError(t, err)

out, err := expr.Run(program, env)
require.NoError(t, err)
assert.Equal(t, env, out)
})
}
Back | FazBrowse Home | New Git URL