fix: fix cast security issue (#3243)

Signed-off-by: Song Gao <[email protected]>
lf-edge · Sep 29, 2024 · 58c15a6 · 58c15a6
1 parent 62299ee
commit 58c15a6
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 9 deletions.
diff --git a/internal/binder/function/funcs_math.go b/internal/binder/function/funcs_math.go
@@ -26,6 +26,7 @@ import (
 
 	"github.com/lf-edge/ekuiper/contract/v2/api"
 
+	"github.com/lf-edge/ekuiper/v2/internal/conf"
 	"github.com/lf-edge/ekuiper/v2/pkg/ast"
 	"github.com/lf-edge/ekuiper/v2/pkg/cast"
 )
@@ -630,6 +631,9 @@ func conv(str string, fromBase, toBase int64) (res string, isNull bool, err erro
 		val = -val
 	}
 
+	if val > math.MaxInt64 {
+		conf.Log.Warnf("value %d is out of int64 range", val)
+	}
 	if int64(val) < 0 {
 		negative = true
 	} else {

diff --git a/internal/binder/function/funcs_math_test.go b/internal/binder/function/funcs_math_test.go
@@ -559,6 +559,10 @@ func TestConvFunc(t *testing.T) {
 	}
 	for _, c := range cases {
 		got, _ := fConv.exec(fctx, []interface{}{c.args[0], c.args[1], c.args[2]})
+		if c.getErr {
+			require.Error(t, got.(error))
+			continue
+		}
 		if got != c.expected {
 			t.Errorf("%s:Expected %s, but got %s", c.args[0], c.expected, got)
 		}

diff --git a/internal/converter/protobuf/fieldConverterSingleton.go b/internal/converter/protobuf/fieldConverterSingleton.go
@@ -16,13 +16,15 @@ package protobuf
 
 import (
 	"fmt"
+	"math"
 
 	// TODO: replace with `google.golang.org/protobuf/proto` pkg.
 	"github.com/golang/protobuf/proto" //nolint:staticcheck
 	dpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
 	"github.com/jhump/protoreflect/desc"    //nolint:staticcheck
 	"github.com/jhump/protoreflect/dynamic" //nolint:staticcheck
 
+	"github.com/lf-edge/ekuiper/v2/internal/conf"
 	"github.com/lf-edge/ekuiper/v2/pkg/cast"
 )
 
@@ -111,6 +113,9 @@ func (fc *FieldConverter) EncodeField(field *desc.FieldDescriptor, v interface{}
 				if err != nil {
 					return 0, nil
 				} else {
+					if r > math.MaxInt32 {
+						conf.Log.Warnf("value %d is out of int32 range", r)
+					}
 					return int32(r), nil
 				}
 			}, "int", cast.CONVERT_SAMEKIND)
@@ -122,6 +127,9 @@ func (fc *FieldConverter) EncodeField(field *desc.FieldDescriptor, v interface{}
 				if err != nil {
 					return 0, nil
 				} else {
+					if r > math.MaxUint32 {
+						conf.Log.Warnf("value %d is out of uint32 range", v)
+					}
 					return uint32(r), nil
 				}
 			}, "uint", cast.CONVERT_SAMEKIND)
@@ -174,6 +182,9 @@ func (fc *FieldConverter) encodeSingleField(field *desc.FieldDescriptor, v inter
 	case dpb.FieldDescriptorProto_TYPE_INT32, dpb.FieldDescriptorProto_TYPE_SFIXED32, dpb.FieldDescriptorProto_TYPE_SINT32, dpb.FieldDescriptorProto_TYPE_ENUM:
 		r, err := cast.ToInt(v, cast.CONVERT_SAMEKIND)
 		if err == nil {
+			if r > math.MaxInt32 {
+				conf.Log.Warnf("value %d is out of int32 range", v)
+			}
 			return int32(r), nil
 		} else {
 			return nil, fmt.Errorf("invalid type for int type field '%s': %v", fn, err)
@@ -188,6 +199,9 @@ func (fc *FieldConverter) encodeSingleField(field *desc.FieldDescriptor, v inter
 	case dpb.FieldDescriptorProto_TYPE_FIXED32, dpb.FieldDescriptorProto_TYPE_UINT32:
 		r, err := cast.ToUint64(v, cast.CONVERT_SAMEKIND)
 		if err == nil {
+			if r > math.MaxUint32 {
+				conf.Log.Warnf("value %d is out of uint32 range", v)
+			}
 			return uint32(r), nil
 		} else {
 			return nil, fmt.Errorf("invalid type for uint type field '%s': %v", fn, err)

diff --git a/internal/server/tracer.go b/internal/server/tracer.go
@@ -74,7 +74,7 @@ func getTraceIDByRuleID(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		limit = 0
 	}
-	root, err := tracer.GetTraceIDListByRuleID(id, int(limit))
+	root, err := tracer.GetTraceIDListByRuleID(id, limit)
 	if err != nil {
 		handleError(w, err, "", logger)
 		return

diff --git a/pkg/cast/cast.go b/pkg/cast/cast.go
@@ -17,6 +17,7 @@ package cast
 import (
 	"encoding/base64"
 	"fmt"
+	"math"
 	"reflect"
 	"strconv"
 	"sync"
@@ -187,6 +188,9 @@ func ToInt8(input interface{}, sn Strictness) (int8, error) {
 		if sn == CONVERT_ALL {
 			v, err := strconv.ParseInt(s, 0, 0)
 			if err == nil {
+				if v > math.MaxInt8 {
+					return 0, fmt.Errorf("value %d is out of int8 range", v)
+				}
 				return int8(v), nil
 			}
 		}
@@ -239,6 +243,9 @@ func ToInt16(input interface{}, sn Strictness) (int16, error) {
 		if sn == CONVERT_ALL {
 			v, err := strconv.ParseInt(s, 0, 0)
 			if err == nil {
+				if v > math.MaxInt16 {
+					return 0, fmt.Errorf("value %d is out of int32 range", v)
+				}
 				return int16(v), nil
 			}
 		}
@@ -291,6 +298,9 @@ func ToInt32(input interface{}, sn Strictness) (int32, error) {
 		if sn == CONVERT_ALL {
 			v, err := strconv.ParseInt(s, 0, 0)
 			if err == nil {
+				if v > math.MaxInt32 {
+					return 0, fmt.Errorf("value %d is out of int32 range", v)
+				}
 				return int32(v), nil
 			}
 		}
@@ -577,6 +587,9 @@ func ToUint8(i interface{}, sn Strictness) (uint8, error) {
 		if sn == CONVERT_ALL {
 			v, err := strconv.ParseUint(s, 0, 64)
 			if err == nil {
+				if v > math.MaxUint8 {
+					return 0, fmt.Errorf("value %d is out of uint16 range", v)
+				}
 				return uint8(v), nil
 			}
 		}
@@ -650,6 +663,9 @@ func ToUint16(i interface{}, sn Strictness) (uint16, error) {
 		if sn == CONVERT_ALL {
 			v, err := strconv.ParseUint(s, 0, 64)
 			if err == nil {
+				if v > math.MaxUint16 {
+					return 0, fmt.Errorf("value %d is out of uint16 range", v)
+				}
 				return uint16(v), nil
 			}
 		}

diff --git a/pkg/tracer/manager.go b/pkg/tracer/manager.go
@@ -93,14 +93,14 @@ func (l *SpanExporter) GetTraceById(traceID string) (*LocalSpan, error) {
 	return l.spanStorage.GetTraceById(traceID)
 }
 
-func (l *SpanExporter) GetTraceByRuleID(ruleID string, limit int) ([]string, error) {
+func (l *SpanExporter) GetTraceByRuleID(ruleID string, limit int64) ([]string, error) {
 	return l.spanStorage.GetTraceByRuleID(ruleID, limit)
 }
 
 type LocalSpanStorage interface {
 	SaveSpan(span sdktrace.ReadOnlySpan) error
 	GetTraceById(traceID string) (*LocalSpan, error)
-	GetTraceByRuleID(ruleID string, limit int) ([]string, error)
+	GetTraceByRuleID(ruleID string, limit int64) ([]string, error)
 }
 
 type LocalSpanMemoryStorage struct {
@@ -169,15 +169,15 @@ func (l *LocalSpanMemoryStorage) GetTraceById(traceID string) (*LocalSpan, error
 	return rootSpan, nil
 }
 
-func (l *LocalSpanMemoryStorage) GetTraceByRuleID(ruleID string, limit int) ([]string, error) {
+func (l *LocalSpanMemoryStorage) GetTraceByRuleID(ruleID string, limit int64) ([]string, error) {
 	l.RLock()
 	defer l.RUnlock()
 	traceMap := l.ruleTraceMap[ruleID]
 	r := make([]string, 0)
 	if limit < 1 {
-		limit = len(traceMap)
+		limit = int64(len(traceMap))
 	}
-	count := 0
+	count := int64(0)
 	for traceID := range traceMap {
 		r = append(r, traceID)
 		count++
@@ -291,7 +291,7 @@ func (s *sqlSpanStorage) GetTraceById(traceID string) (*LocalSpan, error) {
 	return s.loadTraceByTraceID(traceID)
 }
 
-func (s *sqlSpanStorage) GetTraceByRuleID(ruleID string, limit int) ([]string, error) {
+func (s *sqlSpanStorage) GetTraceByRuleID(ruleID string, limit int64) ([]string, error) {
 	return s.loadTraceByRuleID(ruleID)
 }
 

diff --git a/pkg/tracer/tracer.go b/pkg/tracer/tracer.go
@@ -94,7 +94,7 @@ func (g *GlobalTracerManager) GetTraceById(traceID string) (root *LocalSpan, err
 	return g.SpanExporter.GetTraceById(traceID)
 }
 
-func (g *GlobalTracerManager) GetTraceByRuleID(ruleID string, limit int) ([]string, error) {
+func (g *GlobalTracerManager) GetTraceByRuleID(ruleID string, limit int64) ([]string, error) {
 	g.RLock()
 	defer g.RUnlock()
 	return g.SpanExporter.GetTraceByRuleID(ruleID, limit)
@@ -145,7 +145,7 @@ func loadTracerConfig() (*TracerConfig, error) {
 	return tracerConfig, nil
 }
 
-func GetTraceIDListByRuleID(ruleID string, limit int) ([]string, error) {
+func GetTraceIDListByRuleID(ruleID string, limit int64) ([]string, error) {
 	globalTracerManager.InitIfNot()
 	return globalTracerManager.GetTraceByRuleID(ruleID, limit)
 }