reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2024-11-27 13:20:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dashboard/app: don't log /api requests as errors

Browse Source 
Not so interesting if it was just /api request.
This commit is contained in:
Dmitry Vyukov 2018-03-20 11:49:18 +01:00
parent e8a29b89d0
commit b389d9170c
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dashboard/app/api.go
View File

@ -68,7 +68,10 @@ func handleJSON(fn JSONHandler) http.Handler {
c := appengine.NewContext(r)
reply, err := fn(c, r)
if err != nil {
log.Errorf(c, "%v", err)
// ErrAccess is logged earlier.
if err != ErrAccess {
log.Errorf(c, "%v", err)
}
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@ -90,8 +93,13 @@ func handleAPI(c context.Context, r *http.Request) (reply interface{}, err error
log.Infof(c, "api %q from %q", method, client)
ns, err := checkClient(c, client, r.PostFormValue("key"))
if err != nil {
log.Warningf(c, "%v", err)
return nil, fmt.Errorf("unauthorized request")
if client != "" {
log.Warningf(c, "%v", err)
} else {
// Don't log as error if somebody just invokes /api.
log.Infof(c, "%v", err)
}
return nil, err
}
var payload []byte
if str := r.PostFormValue("payload"); str != "" {
@ -125,7 +133,7 @@ func checkClient(c context.Context, name0, key0 string) (string, error) {
for name, key := range config.Clients {
if name == name0 {
if key != key0 {
return "", fmt.Errorf("wrong client %q key", name0)
return "", ErrAccess
}
return "", nil
}
@ -134,13 +142,13 @@ func checkClient(c context.Context, name0, key0 string) (string, error) {
for name, key := range cfg.Clients {
if name == name0 {
if key != key0 {
return "", fmt.Errorf("wrong client %q key", name0)
return "", ErrAccess
}
return ns, nil
}
}
}
return "", fmt.Errorf("unauthorized api request from %q", name0)
return "", ErrAccess
}
func apiLogError(c context.Context, r *http.Request, payload []byte) (interface{}, error) {

6
dashboard/app/app_test.go
View File

@ -227,9 +227,9 @@ func TestApp(t *testing.T) {
c.expectOK(c.API(client1, key1, "upload_build", build, nil))
// Some bad combinations of client/key.
c.expectFail("unauthorized request", c.API(client1, "", "upload_build", build, nil))
c.expectFail("unauthorized request", c.API("unknown", key1, "upload_build", build, nil))
c.expectFail("unauthorized request", c.API(client1, key2, "upload_build", build, nil))
c.expectFail("unauthorized", c.API(client1, "", "upload_build", build, nil))
c.expectFail("unauthorized", c.API("unknown", key1, "upload_build", build, nil))
c.expectFail("unauthorized", c.API(client1, key2, "upload_build", build, nil))
crash1 := &dashapi.Crash{
BuildID: "build1",