Convert go/incorrect-integer-conversion tests to postprocessing query

owen-mc · owen-mc · commit b578c1d626c0 · 2025-03-07T10:40:19.000Z
diff --git a/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.expected b/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.expected
diff --git a/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.go b/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.go
diff --git a/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.ql b/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.ql
diff --git a/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.qlref b/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.qlref
@@ -0,0 +1,2 @@
+query: Security/CWE-681/IncorrectIntegerConversionQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraintInFileName_386.go b/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraintInFileName_386.go
@@ -16,11 +16,11 @@ func testIntSource386() {
 		_ = uint32(parsed)
 	}
 	{
-		parsed, err := strconv.ParseUint("3456", 10, 0)
+		parsed, err := strconv.ParseUint("3456", 10, 0) // $ Source
 		if err != nil {
 			panic(err)
 		}
-		_ = int32(parsed) // $ hasValueFlow="parsed"
+		_ = int32(parsed) // $ Alert Sink
 		_ = uint32(parsed)
 	}
 	{
diff --git a/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraints.go b/go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraints.go
@@ -19,11 +19,11 @@ func testIntSource32() {
 		_ = uint32(parsed)
 	}
 	{
-		parsed, err := strconv.ParseUint("3456", 10, 0)
+		parsed, err := strconv.ParseUint("3456", 10, 0) // $ Source
 		if err != nil {
 			panic(err)
 		}
-		_ = int32(parsed) // $ hasValueFlow="parsed"
+		_ = int32(parsed) // $ Alert Sink
 		_ = uint32(parsed)
 	}
 	{
diff --git a/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraintInFileName_amd64.go b/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraintInFileName_amd64.go
@@ -16,11 +16,11 @@ func testIntSinkAmd64() {
 		_ = uint(parsed)
 	}
 	{
-		parsed, err := strconv.ParseUint("3456", 10, 64)
+		parsed, err := strconv.ParseUint("3456", 10, 64) // $ Source
 		if err != nil {
 			panic(err)
 		}
-		_ = int(parsed) // $ hasValueFlow="parsed"
+		_ = int(parsed) // $ Alert Sink
 		_ = uint(parsed)
 	}
 }
diff --git a/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraints.go b/go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraints.go
@@ -19,11 +19,11 @@ func testIntSink64() {
 		_ = uint(parsed)
 	}
 	{
-		parsed, err := strconv.ParseUint("3456", 10, 64)
+		parsed, err := strconv.ParseUint("3456", 10, 64) // $ Source
 		if err != nil {
 			panic(err)
 		}
-		_ = int(parsed) // $ hasValueFlow="parsed"
+		_ = int(parsed) // $ Alert Sink
 		_ = uint(parsed)
 	}
 }
diff --git a/go/ql/test/query-tests/Security/CWE-681/TestNoArchitectureBuildConstraints.go b/go/ql/test/query-tests/Security/CWE-681/TestNoArchitectureBuildConstraints.go
@@ -9,19 +9,19 @@ import (
 
 func testIntSizeIsArchicturallyDependent1() {
 	{
-		parsed, err := strconv.ParseInt("3456", 10, 0)
+		parsed, err := strconv.ParseInt("3456", 10, 0) // $ Source
 		if err != nil {
 			panic(err)
 		}
-		_ = int32(parsed)  // $ hasValueFlow="parsed"
-		_ = uint32(parsed) // $ hasValueFlow="parsed"
+		_ = int32(parsed)  // $ Alert Sink
+		_ = uint32(parsed) // $ Alert Sink
 	}
 	{
-		parsed, err := strconv.ParseInt("3456", 10, 64)
+		parsed, err := strconv.ParseInt("3456", 10, 64) // $ Source
 		if err != nil {
 			panic(err)
 		}
-		_ = int(parsed)  // $ hasValueFlow="parsed"
-		_ = uint(parsed) // $ hasValueFlow="parsed"
+		_ = int(parsed)  // $ Alert Sink
+		_ = uint(parsed) // $ Alert Sink
 	}
 }
diff --git a/go/ql/test/query-tests/Security/CWE-681/TestOldBuildConstraints.go b/go/ql/test/query-tests/Security/CWE-681/TestOldBuildConstraints.go
@@ -20,11 +20,11 @@ func oldTestIntSink64() {
 		_ = uint(parsed)
 	}
 	{
-		parsed, err := strconv.ParseUint("3456", 10, 64)
+		parsed, err := strconv.ParseUint("3456", 10, 64) // $ Source
 		if err != nil {
 			panic(err)
 		}
-		_ = int(parsed) // $ hasValueFlow="parsed"
+		_ = int(parsed) // $ Alert Sink
 		_ = uint(parsed)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+query: Security/CWE-681/IncorrectIntegerConversionQuery.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ func testIntSource386() {`
`16`	`16`	`_ = uint32(parsed)`
`17`	`17`	`}`
`18`	`18`	`{`
`19`		`- parsed, err := strconv.ParseUint("3456", 10, 0)`
	`19`	`+ parsed, err := strconv.ParseUint("3456", 10, 0) // $ Source`
`20`	`20`	`if err != nil {`
`21`	`21`	`panic(err)`
`22`	`22`	`}`
`23`		`- _ = int32(parsed) // $ hasValueFlow="parsed"`
	`23`	`+ _ = int32(parsed) // $ Alert Sink`
`24`	`24`	`_ = uint32(parsed)`
`25`	`25`	`}`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ func testIntSource32() {`
`19`	`19`	`_ = uint32(parsed)`
`20`	`20`	`}`
`21`	`21`	`{`
`22`		`- parsed, err := strconv.ParseUint("3456", 10, 0)`
	`22`	`+ parsed, err := strconv.ParseUint("3456", 10, 0) // $ Source`
`23`	`23`	`if err != nil {`
`24`	`24`	`panic(err)`
`25`	`25`	`}`
`26`		`- _ = int32(parsed) // $ hasValueFlow="parsed"`
	`26`	`+ _ = int32(parsed) // $ Alert Sink`
`27`	`27`	`_ = uint32(parsed)`
`28`	`28`	`}`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ func testIntSinkAmd64() {`
`16`	`16`	`_ = uint(parsed)`
`17`	`17`	`}`
`18`	`18`	`{`
`19`		`- parsed, err := strconv.ParseUint("3456", 10, 64)`
	`19`	`+ parsed, err := strconv.ParseUint("3456", 10, 64) // $ Source`
`20`	`20`	`if err != nil {`
`21`	`21`	`panic(err)`
`22`	`22`	`}`
`23`		`- _ = int(parsed) // $ hasValueFlow="parsed"`
	`23`	`+ _ = int(parsed) // $ Alert Sink`
`24`	`24`	`_ = uint(parsed)`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ func testIntSink64() {`
`19`	`19`	`_ = uint(parsed)`
`20`	`20`	`}`
`21`	`21`	`{`
`22`		`- parsed, err := strconv.ParseUint("3456", 10, 64)`
	`22`	`+ parsed, err := strconv.ParseUint("3456", 10, 64) // $ Source`
`23`	`23`	`if err != nil {`
`24`	`24`	`panic(err)`
`25`	`25`	`}`
`26`		`- _ = int(parsed) // $ hasValueFlow="parsed"`
	`26`	`+ _ = int(parsed) // $ Alert Sink`
`27`	`27`	`_ = uint(parsed)`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,19 +9,19 @@ import (`
`9`	`9`
`10`	`10`	`func testIntSizeIsArchicturallyDependent1() {`
`11`	`11`	`{`
`12`		`- parsed, err := strconv.ParseInt("3456", 10, 0)`
	`12`	`+ parsed, err := strconv.ParseInt("3456", 10, 0) // $ Source`
`13`	`13`	`if err != nil {`
`14`	`14`	`panic(err)`
`15`	`15`	`}`
`16`		`- _ = int32(parsed) // $ hasValueFlow="parsed"`
`17`		`- _ = uint32(parsed) // $ hasValueFlow="parsed"`
	`16`	`+ _ = int32(parsed) // $ Alert Sink`
	`17`	`+ _ = uint32(parsed) // $ Alert Sink`
`18`	`18`	`}`
`19`	`19`	`{`
`20`		`- parsed, err := strconv.ParseInt("3456", 10, 64)`
	`20`	`+ parsed, err := strconv.ParseInt("3456", 10, 64) // $ Source`
`21`	`21`	`if err != nil {`
`22`	`22`	`panic(err)`
`23`	`23`	`}`
`24`		`- _ = int(parsed) // $ hasValueFlow="parsed"`
`25`		`- _ = uint(parsed) // $ hasValueFlow="parsed"`
	`24`	`+ _ = int(parsed) // $ Alert Sink`
	`25`	`+ _ = uint(parsed) // $ Alert Sink`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ func oldTestIntSink64() {`
`20`	`20`	`_ = uint(parsed)`
`21`	`21`	`}`
`22`	`22`	`{`
`23`		`- parsed, err := strconv.ParseUint("3456", 10, 64)`
	`23`	`+ parsed, err := strconv.ParseUint("3456", 10, 64) // $ Source`
`24`	`24`	`if err != nil {`
`25`	`25`	`panic(err)`
`26`	`26`	`}`
`27`		`- _ = int(parsed) // $ hasValueFlow="parsed"`
	`27`	`+ _ = int(parsed) // $ Alert Sink`
`28`	`28`	`_ = uint(parsed)`
`29`	`29`	`}`
`30`	`30`	`}`