Skip to content

Optimize context valid identifier check #340

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Optimize context valid identifier check #340

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
361d848
Add benchmark for valid identifier check
Richtermeister Dec 12, 2023
c0cb743
Switch valid identifier check to faster alternative
Richtermeister Dec 12, 2023
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
21 changes: 17 additions & 4 deletions context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ package pongo2
import (
"errors"
"fmt"
"regexp"
)

var reIdentifiers = regexp.MustCompile("^[a-zA-Z0-9_]+$")

var autoescape = true

func SetAutoescape(newValue bool) {
Expand All @@ -30,7 +27,7 @@ type Context map[string]any

func (c Context) checkForValidIdentifiers() *Error {
for k, v := range c {
if !reIdentifiers.MatchString(k) {
if !isValidIdentifier(k) {
return &Error{
Sender: "checkForValidIdentifiers",
OrigError: fmt.Errorf("context-key '%s' (value: '%+v') is not a valid identifier", k, v),
Expand All @@ -40,6 +37,22 @@ func (c Context) checkForValidIdentifiers() *Error {
return nil
}

func isValidIdentifier(s string) bool {
for i := range s {
if !isValidIdentifierChar(s[i]) {
return false
}
}
return true
}

func isValidIdentifierChar(c byte) bool {
return (c >= 'a' && c <= 'z') ||
(c >= 'A' && c <= 'Z') ||
(c >= '0' && c <= '9') ||
c == '_'
}

// Update updates this context with the key/value-pairs from another context.
func (c Context) Update(other Context) Context {
for k, v := range other {
Expand Down