diff --git a/.travis.yml b/.travis.yml index 025c019..6e1f47a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ jobs: dist: bionic script: ./fuzzit.sh local-regression - stage: Fuzz - if: branch = master AND type IN (push) + if: branch = fuzz AND type IN (push) go: 1.12.x dist: bionic script: ./fuzzit.sh fuzzing @@ -53,5 +53,5 @@ deploy: skip_cleanup: true on: tags: true - go: tip + go: 1.12.x overwrite: true diff --git a/fuzzit.sh b/fuzzit.sh index 2f1b4f6..5e503e9 100755 --- a/fuzzit.sh +++ b/fuzzit.sh @@ -30,6 +30,4 @@ function fuzz { clang -fsanitize=fuzzer fuzzer.a -o fuzzer ./fuzzit create job --type $TYPE $NAME/$TARGET fuzzer } -fuzz Profile profile -fuzz HTTP http -fuzz HTTPS https +fuzz LocalStorage local-storage diff --git a/server/server_fuzz.go b/server/server_fuzz.go index b97ea88..7a01c8b 100644 --- a/server/server_fuzz.go +++ b/server/server_fuzz.go @@ -3,126 +3,88 @@ package server import ( - "crypto/tls" - "io/ioutil" - "net" - "strings" + "bytes" + "io" + "math/rand" + "reflect" ) -// FuzzProfile tests the profile server. -func FuzzProfile(fuzz []byte) int { - if len(fuzz) == 0 { +const applicationOctetStream = "application/octet-stream" + +// FuzzLocalStorage tests the Local Storage. +func FuzzLocalStorage(fuzz []byte) int { + var fuzzLength = uint64(len(fuzz)) + if fuzzLength == 0 { return -1 } - server, err := New(EnableProfiler()) - if err != nil { - panic(err.Error()) - } - server.Run() - defer server.profileListener.Close() - defer server.httpListener.Close() - address := server.profileListener.Addr - connection, err := net.Dial("tcp", address) - if err != nil { - panic(err.Error()) - } - _, err = connection.Write(fuzz) - if err != nil { - return 0 - } - response, err := ioutil.ReadAll(connection) - if err != nil { - return 0 - } - err = connection.Close() + + storage, err := NewLocalStorage("/tmp", nil) if err != nil { - return 0 + panic("unable to create local storage") } - fields := strings.Fields(string(response)) - if len(fields) < 2 { - panic("invalid HTTP response") - } - code := fields[1] - if code == "500" { - panic("server panicked") - } - return 1 -} -// FuzzHTTP tests the HTTP server. -func FuzzHTTP(fuzz []byte) int { - if len(fuzz) == 0 { - return -1 - } - server, err := New(Listener("localhost")) + token := Encode(10000000 + int64(rand.Intn(1000000000))) + filename := Encode(10000000 + int64(rand.Intn(1000000000))) + ".bin" + + input := bytes.NewReader(fuzz) + err = storage.Put(token, filename, input, applicationOctetStream, fuzzLength) if err != nil { - panic(err.Error()) + panic("unable to save file") } - server.Run() - defer server.httpListener.Close() - address := server.httpListener.Addr - connection, err := net.Dial("tcp", address) + + contentType, contentLength, err := storage.Head(token, filename) if err != nil { - panic(err.Error()) + panic("not visible through head") } - _, err = connection.Write(fuzz) - if err != nil { - return 0 + + if contentType != applicationOctetStream { + panic("incorrect content type") } - response, err := ioutil.ReadAll(connection) - if err != nil { - return 0 + + if contentLength != fuzzLength { + panic("incorrect content length") } - err = connection.Close() + + output, contentType, contentLength, err := storage.Get(token, filename) if err != nil { - return 0 - } - fields := strings.Fields(string(response)) - if len(fields) < 2 { - panic("invalid HTTP response") - } - code := fields[1] - if code == "500" { - panic("server panicked") + panic("not visible through get") } - return 1 -} -// FuzzHTTPS tests the HTTPS server. -func FuzzHTTPS(fuzz []byte) int { - if len(fuzz) == 0 { - return -1 + if contentType != applicationOctetStream { + panic("incorrect content type") } - server, err := New(TLSListener("localhost", true)) - if err != nil { - panic(err.Error()) + + if contentLength != fuzzLength { + panic("incorrect content length") } - server.Run() - defer server.httpsListener.Close() - address := server.httpsListener.Addr - connection, err := tls.Dial("tcp", address, nil) - if err != nil { - panic(err.Error()) + + var length uint64 + b := make([]byte, len(fuzz)) + for { + n, err := output.Read(b) + length += uint64(n) + if err == io.EOF { + break + } } - _, err = connection.Write(fuzz) - if err != nil { - return 0 + + if !reflect.DeepEqual(b, fuzz) { + panic("incorrect content body") } - response, err := ioutil.ReadAll(connection) - if err != nil { - return 0 + + if length != fuzzLength { + panic("incorrect content length") } - err = connection.Close() + + err = storage.Delete(token, filename) if err != nil { - return 0 - } - fields := strings.Fields(string(response)) - if len(fields) < 2 { - panic("invalid HTTP response") + panic("unable to delete file") } - code := fields[1] - if code == "500" { - panic("server panicked") + + _, _, err = storage.Head(token, filename) + if !storage.IsNotExist(err) { + panic("file not deleted") } + return 1 }