-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from ifad/unit-tests-and-refactoring
Unit tests and refactoring
- Loading branch information
Showing
7 changed files
with
375 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "clammit/scanner" | ||
| "io" | ||
| "log" | ||
| "mime/multipart" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "os" | ||
| "testing" | ||
| ) | ||
|
|
||
| const virusCode = 418 | ||
|
|
||
| var mockVirusFound = false | ||
|
|
||
| type MockScanner struct { | ||
| scanner.Engine | ||
| } | ||
|
|
||
| func (s MockScanner) HasVirus(reader io.Reader) (bool, error) { | ||
| return mockVirusFound, nil | ||
| } | ||
|
|
||
| var scanInterceptor = ScanInterceptor{ | ||
| VirusStatusCode: virusCode, | ||
| Scanner: new(MockScanner), | ||
| } | ||
|
|
||
| var handler = http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { scanInterceptor.Handle(w, req, req.Body) }) | ||
|
|
||
| func TestNonMultipartRequest_VirusFound_Without_ContentDisposition(t *testing.T) { | ||
| setup() | ||
| mockVirusFound = true | ||
| req := newHTTPRequest("POST", "application/octet-stream", bytes.NewReader([]byte(`<virus/>`))) | ||
| rr := httptest.NewRecorder() | ||
| handler.ServeHTTP(rr, req) | ||
|
|
||
| if status := rr.Code; status != virusCode { | ||
| t.Errorf("handler returned wrong status code: got %v want %v", | ||
| status, virusCode) | ||
| } | ||
| expected := `File untitled has a virus!` | ||
| if rr.Body.String() != expected { | ||
| t.Errorf("handler returned unexpected body: got %v want %v", | ||
| rr.Body.String(), expected) | ||
| } | ||
| } | ||
|
|
||
| func TestNonMultipartRequest_VirusFound_With_ContentDisposition(t *testing.T) { | ||
| setup() | ||
| mockVirusFound = true | ||
| req := newHTTPRequest("POST", "application/octet-stream", bytes.NewReader([]byte(`<virus/>`))) | ||
| req.Header["Content-Disposition"] = []string{"attachment;filename=virus.dat"} | ||
| rr := httptest.NewRecorder() | ||
| handler.ServeHTTP(rr, req) | ||
|
|
||
| if status := rr.Code; status != virusCode { | ||
| t.Errorf("handler returned wrong status code: got %v want %v", | ||
| status, virusCode) | ||
| } | ||
| expected := `File virus.dat has a virus!` | ||
| if rr.Body.String() != expected { | ||
| t.Errorf("handler returned unexpected body: got %v want %v", | ||
| rr.Body.String(), expected) | ||
| } | ||
| } | ||
|
|
||
| func TestNonMultipartRequest_Clean(t *testing.T) { | ||
| setup() | ||
| mockVirusFound = false | ||
| req := newHTTPRequest("POST", "application/octet-stream", bytes.NewReader([]byte(`<clean/>`))) | ||
| rr := httptest.NewRecorder() | ||
| handler.ServeHTTP(rr, req) | ||
|
|
||
| if status := rr.Code; status != 200 { | ||
| t.Errorf("handler returned wrong status code: got %v want %v", | ||
| status, 200) | ||
| } | ||
| } | ||
|
|
||
| func TestMultipartRequest_VirusFound(t *testing.T) { | ||
| setup() | ||
| mockVirusFound = true | ||
|
|
||
| body, contentType := makeMultipartBody() | ||
|
|
||
| req := newHTTPRequest("POST", contentType, body) | ||
| rr := httptest.NewRecorder() | ||
| handler.ServeHTTP(rr, req) | ||
|
|
||
| if status := rr.Code; status != virusCode { | ||
| t.Errorf("handler returned wrong status code: got %v want %v", | ||
| status, virusCode) | ||
| } | ||
| expected := `File foo.dat has a virus!` | ||
| if rr.Body.String() != expected { | ||
| t.Errorf("handler returned unexpected body: got %v want %v", | ||
| rr.Body.String(), expected) | ||
| } | ||
| } | ||
|
|
||
| func TestMultipartRequest_Clean(t *testing.T) { | ||
| setup() | ||
| mockVirusFound = false | ||
|
|
||
| body, contentType := makeMultipartBody() | ||
|
|
||
| req := newHTTPRequest("POST", contentType, body) | ||
| rr := httptest.NewRecorder() | ||
| handler.ServeHTTP(rr, req) | ||
|
|
||
| if status := rr.Code; status != 200 { | ||
| t.Errorf("handler returned wrong status code: got %v want %v", | ||
| status, virusCode) | ||
| } | ||
| } | ||
|
|
||
| func makeMultipartBody() (*bytes.Buffer, string) { | ||
| body := &bytes.Buffer{} | ||
| writer := multipart.NewWriter(body) | ||
|
|
||
| defer writer.Close() | ||
|
|
||
| addPart(writer, "file1", "foo.dat") | ||
| addPart(writer, "file2", "bar.dat") | ||
|
|
||
| err := writer.Close() | ||
| if err != nil { | ||
| log.Fatal("Can't close multipart writer: %v", err) | ||
| } | ||
|
|
||
| return body, writer.FormDataContentType() | ||
| } | ||
|
|
||
| func addPart(w *multipart.Writer, name, fileName string) { | ||
| part, err := w.CreateFormFile(name, fileName) | ||
| if err != nil { | ||
| log.Fatal("Cannot create multipart body: %v", err) | ||
| } | ||
|
|
||
| _, err = io.WriteString(part, name) | ||
| if err != nil { | ||
| log.Fatal("Can't write part to multipart body: %v", err) | ||
| } | ||
| return | ||
| } | ||
|
|
||
| func setup() { | ||
| ctx = &Ctx{ | ||
| ShuttingDown: false, | ||
| } | ||
| ctx.Logger = log.New(os.Stdout, "", log.LstdFlags) | ||
| } | ||
|
|
||
| func newHTTPRequest(method string, contentType string, body io.Reader) *http.Request { | ||
| req, _ := http.NewRequest(method, "http://clammit/scan", body) | ||
| req.Header = map[string][]string{ | ||
| "Content-Type": []string{contentType}, | ||
| "X-Forwarded-For": []string{"kermit"}, | ||
| } | ||
| return req | ||
| } |
Oops, something went wrong.