github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84480 from BrendanSChang/fuzz

Browse Source 
Fix validation for metav1 fuzz targets.
This commit is contained in:
Kubernetes Prow Robot 2019-12-19 12:40:10 -08:00 committed by GitHub
commit 4c6bed6e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/fuzz/yaml/yaml.go
View File

@ -20,7 +20,8 @@ limitations under the License.
package yaml
import (
"bytes"
"fmt"
"strings"
"gopkg.in/yaml.v2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -41,8 +42,12 @@ func FuzzDurationStrict(b []byte) int {
if err != nil {
panic(err)
}
if !bytes.Equal(result, b) {
panic("result != input")
// Result is in the format "d: <duration>\n", so strip off the trailing
// newline and convert durationHolder.D to the expected format.
resultStr := strings.TrimSpace(string(result[:]))
inputStr := fmt.Sprintf("d: %s", durationHolder.D.Duration)
if resultStr != inputStr {
panic(fmt.Sprintf("result(%v) != input(%v)", resultStr, inputStr))
}
return 1
}
@ -61,8 +66,18 @@ func FuzzMicroTimeStrict(b []byte) int {
if err != nil {
panic(err)
}
if !bytes.Equal(result, b) {
panic("result != input")
// Result is in the format "t: <time>\n", so strip off the trailing
// newline and convert microTimeHolder.T to the expected format. If
// time is zero, the value is marshaled to "null".
resultStr := strings.TrimSpace(string(result[:]))
var inputStr string
if microTimeHolder.T.Time.IsZero() {
inputStr = "t: null"
} else {
inputStr = fmt.Sprintf("t: %s", microTimeHolder.T.Time)
}
if resultStr != inputStr {
panic(fmt.Sprintf("result(%v) != input(%v)", resultStr, inputStr))
}
return 1
}
@ -95,8 +110,18 @@ func FuzzTimeStrict(b []byte) int {
if err != nil {
panic(err)
}
if !bytes.Equal(result, b) {
panic("result != input")
// Result is in the format "t: <time>\n", so strip off the trailing
// newline and convert timeHolder.T to the expected format. If time is
// zero, the value is marshaled to "null".
resultStr := strings.TrimSpace(string(result[:]))
var inputStr string
if timeHolder.T.Time.IsZero() {
inputStr = "t: null"
} else {
inputStr = fmt.Sprintf("t: %s", timeHolder.T.Time)
}
if resultStr != inputStr {
panic(fmt.Sprintf("result(%v) != input(%v)", resultStr, inputStr))
}
return 1
}