Skip to content

remove validate query checks #252

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
merged 1 commit into from
Jul 29, 2025
Merged

remove validate query checks #252

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
65 changes: 0 additions & 65 deletions internal/common/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package common

import (
"fmt"
"math/big"
"regexp"
"strings"
)

func SliceToChunks[T any](values []T, chunkSize int) [][]T {
Expand All @@ -22,68 +19,6 @@ func SliceToChunks[T any](values []T, chunkSize int) [][]T {
return chunks
}

var allowedFunctions = map[string]struct{}{
"sum": {},
"count": {},
"countdistinct": {},
"avg": {},
"max": {},
"min": {},
"reinterpretasuint256": {},
"reverse": {},
"unhex": {},
"substring": {},
"length": {},
"touint256": {},
"if": {},
"tostartofmonth": {},
"tostartofday": {},
"tostartofhour": {},
"tostartofminute": {},
"todate": {},
"todatetime": {},
"concat": {},
"in": {},
"and": {},
"or": {},
}

var disallowedPatterns = []string{
`(?i)\b(INSERT|DELETE|UPDATE|DROP|CREATE|ALTER|TRUNCATE|EXEC|;|--)`,
}

// ValidateQuery checks the query for disallowed patterns and ensures only allowed functions are used.
func ValidateQuery(query string) error {
// Check for disallowed patterns
for _, pattern := range disallowedPatterns {
matched, err := regexp.MatchString(pattern, query)
if err != nil {
return fmt.Errorf("error checking disallowed patterns: %v", err)
}
if matched {
return fmt.Errorf("query contains disallowed keywords or patterns")
}
}

// Ensure the query is a SELECT statement
trimmedQuery := strings.TrimSpace(strings.ToUpper(query))
if !strings.HasPrefix(trimmedQuery, "SELECT") {
return fmt.Errorf("only SELECT queries are allowed")
}

// Extract function names and validate them
functionPattern := regexp.MustCompile(`(?i)(\b\w+\b)\s*\(`)
matches := functionPattern.FindAllStringSubmatch(query, -1)
for _, match := range matches {
funcName := match[1]
if _, ok := allowedFunctions[strings.ToLower(funcName)]; !ok {
return fmt.Errorf("function '%s' is not allowed", funcName)
}
}

return nil
}

func ConvertBigNumbersToString(data interface{}) interface{} {
switch v := data.(type) {
case map[string]interface{}:
Expand Down
6 changes: 0 additions & 6 deletions internal/storage/clickhouse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,6 @@ func (c *ClickHouseConnector) GetAggregations(table string, qf QueryFilter) (Que
// Use the new query building logic
query := c.buildQuery(table, selectColumns, qf)

if err := common.ValidateQuery(query); err != nil {
return QueryResult[interface{}]{}, err
}
// Execute the query
rows, err := c.conn.Query(context.Background(), query)
if err != nil {
Expand Down Expand Up @@ -528,9 +525,6 @@ func (c *ClickHouseConnector) GetAggregations(table string, qf QueryFilter) (Que
func executeQuery[T any](c *ClickHouseConnector, table, columns string, qf QueryFilter, scanFunc func(driver.Rows) (T, error)) (QueryResult[T], error) {
query := c.buildQuery(table, columns, qf)

if err := common.ValidateQuery(query); err != nil {
return QueryResult[T]{}, err
}
rows, err := c.conn.Query(context.Background(), query)
if err != nil {
return QueryResult[T]{}, err
Expand Down