Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion pkg/github/security_outputs.go
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,9 @@ func normalizeSecurityIntegerArguments(fields ...string) inventory.InputNormaliz
}
}
parsed, err := strconv.ParseFloat(number, 64)
limit := math.Ldexp(1, strconv.IntSize-1)
if err != nil || math.IsNaN(parsed) || math.IsInf(parsed, 0) ||
parsed != math.Trunc(parsed) || parsed > float64(math.MaxInt) || parsed < float64(math.MinInt) {
parsed != math.Trunc(parsed) || parsed >= limit || parsed < -limit {
return nil, fmt.Errorf("parameter %s is not a valid number", field)
}
arguments[field], err = json.Marshal(int(parsed))
Expand Down
3 changes: 2 additions & 1 deletion pkg/github/typed_read_normalizers.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ func normalizeTypedReadArguments(uppercaseFields []string, preserveZeroPage bool
}
if text, ok := number.(string); ok {
parsed, err := strconv.ParseFloat(text, 64)
if err != nil || math.IsNaN(parsed) || math.IsInf(parsed, 0) || parsed != math.Trunc(parsed) || parsed > float64(math.MaxInt) || parsed < float64(math.MinInt) {
limit := math.Ldexp(1, strconv.IntSize-1)
if err != nil || math.IsNaN(parsed) || math.IsInf(parsed, 0) || parsed != math.Trunc(parsed) || parsed >= limit || parsed < -limit {
return nil, fmt.Errorf("parameter %s is not a valid number", field)
}
number = int(parsed)
Expand Down
57 changes: 57 additions & 0 deletions pkg/github/typed_search_outputs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -383,3 +383,60 @@ func mustMarshalJSON(t *testing.T, value any) string {
require.NoError(t, err)
return string(encoded)
}

func TestNormalizeTypedReadArgumentsRejectsOutOfRangeIntegers(t *testing.T) {
normalize := normalizeTypedReadArguments(nil, false)

tests := []struct {
name string
input string
expected string
expectError bool
}{
{
name: "valid perPage string",
input: `{"perPage": "50"}`,
expected: `{"perPage": 50}`,
expectError: false,
},
{
name: "valid page string",
input: `{"page": "3"}`,
expected: `{"page": 3}`,
expectError: false,
},
{
name: "2^63 string page parameter rejected",
input: `{"page": "9223372036854775808"}`,
expectError: true,
},
{
name: "MaxInt64 string perPage parameter rounds up to 2^63 rejected",
input: `{"perPage": "9223372036854775807"}`,
expectError: true,
},
{
name: "non-integer string rejected",
input: `{"perPage": "12.5"}`,
expectError: true,
},
{
name: "invalid syntax rejected",
input: `{"page": "invalid"}`,
expectError: true,
},
}

for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
normalized, err := normalize(json.RawMessage(tc.input))
if tc.expectError {
require.Error(t, err)
assert.Contains(t, err.Error(), "is not a valid number")
} else {
require.NoError(t, err)
assert.JSONEq(t, tc.expected, string(normalized))
}
})
}
}
85 changes: 85 additions & 0 deletions pkg/github/typed_security_outputs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -390,3 +390,88 @@ func TestSecurityOutputDTOs(t *testing.T) {
check(typ)
}
}

func TestNormalizeSecurityIntegerArguments(t *testing.T) {
normalize := normalizeSecurityIntegerArguments("alertNumber", "page")

tests := []struct {
name string
input string
expected string
expectError bool
}{
{
name: "valid numeric integer",
input: `{"alertNumber": 42}`,
expected: `{"alertNumber": 42}`,
expectError: false,
},
{
name: "valid string integer",
input: `{"alertNumber": "42"}`,
expected: `{"alertNumber": 42}`,
expectError: false,
},
{
name: "valid MaxInt32 string",
input: `{"alertNumber": "2147483647"}`,
expected: `{"alertNumber": 2147483647}`,
expectError: false,
},
{
name: "2^63 string parameter rejected",
input: `{"alertNumber": "9223372036854775808"}`,
expectError: true,
},
{
name: "MaxInt64 string parameter rounds up to 2^63 rejected",
input: `{"alertNumber": "9223372036854775807"}`,
expectError: true,
},
{
name: "2^63 numeric parameter rejected",
input: `{"alertNumber": 9223372036854775808}`,
expectError: true,
},
{
name: "non-integer string rejected",
input: `{"alertNumber": "1.5"}`,
expectError: true,
},
{
name: "invalid syntax string rejected",
input: `{"alertNumber": "abc"}`,
expectError: true,
},
{
name: "null value rejected",
input: `{"alertNumber": null}`,
expectError: true,
},
{
name: "omitted field preserved",
input: `{"other": "value"}`,
expected: `{"other": "value"}`,
expectError: false,
},
{
name: "multiple fields normalized",
input: `{"alertNumber": "10", "page": "2"}`,
expected: `{"alertNumber": 10, "page": 2}`,
expectError: false,
},
}

for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
normalized, err := normalize(json.RawMessage(tc.input))
if tc.expectError {
require.Error(t, err)
assert.Contains(t, err.Error(), "is not a valid number")
} else {
require.NoError(t, err)
assert.JSONEq(t, tc.expected, string(normalized))
}
})
}
}