Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Lowercase strings which should be case insensitive, like email and username. (#302)

Browse source 
Fixes #299
Closes #300
This commit is contained in:
Victor Vrantchan 2016-10-12 12:35:34 -04:00 committed by GitHub
parent f6a3fafd2c
commit 93eaae7454
4 changed files with 51 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/service/transport_invites.go
View file

@ -3,6 +3,7 @@ package service
import (
"encoding/json"
"net/http"
"strings"
"golang.org/x/net/context"
)
@ -12,6 +13,9 @@ func decodeCreateInviteRequest(ctx context.Context, r *http.Request) (interface{
if err := json.NewDecoder(r.Body).Decode(&req.payload); err != nil {
return nil, err
}
if req.payload.Email != nil {
*req.payload.Email = strings.ToLower(*req.payload.Email)
}
return req, nil
}

30
server/service/transport_invites_test.go
View file

@ -23,15 +23,33 @@ func TestDecodeCreateInviteRequest(t *testing.T) {
assert.Equal(t, uint(1), *params.payload.InvitedBy)
}).Methods("POST")
var body bytes.Buffer
body.Write([]byte(`{
t.Run("lowercase email", func(t *testing.T) {
var body bytes.Buffer
body.Write([]byte(`{
"name": "foo",
"email": "foo@kolide.co",
"invited_by": 1
}`))
router.ServeHTTP(
httptest.NewRecorder(),
httptest.NewRequest("POST", "/api/v1/kolide/invites", &body),
)
router.ServeHTTP(
httptest.NewRecorder(),
httptest.NewRequest("POST", "/api/v1/kolide/invites", &body),
)
})
t.Run("uppercase email", func(t *testing.T) {
// email string should be lowerased after decode.
var body bytes.Buffer
body.Write([]byte(`{
"name": "foo",
"email": "Foo@Kolide.co",
"invited_by": 1
}`))
router.ServeHTTP(
httptest.NewRecorder(),
httptest.NewRequest("POST", "/api/v1/kolide/invites", &body),
)
})
}

2
server/service/transport_sessions.go
View file

@ -3,6 +3,7 @@ package service
import (
"encoding/json"
"net/http"
"strings"
"golang.org/x/net/context"
)
@ -44,5 +45,6 @@ func decodeLoginRequest(ctx context.Context, r *http.Request) (interface{}, erro
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
return nil, err
}
req.Username = strings.ToLower(req.Username)
return req, nil
}

28
server/service/transport_sessions_test.go
View file

@ -85,15 +85,29 @@ func TestDecodeLoginRequest(t *testing.T) {
assert.Equal(t, "foo", params.Username)
assert.Equal(t, "bar", params.Password)
}).Methods("POST")
var body bytes.Buffer
body.Write([]byte(`{
t.Run("lowercase username", func(t *testing.T) {
var body bytes.Buffer
body.Write([]byte(`{
"username": "foo",
"password": "bar"
}`))
router.ServeHTTP(
httptest.NewRecorder(),
httptest.NewRequest("POST", "/api/v1/kolide/login", &body),
)
router.ServeHTTP(
httptest.NewRecorder(),
httptest.NewRequest("POST", "/api/v1/kolide/login", &body),
)
})
t.Run("uppercase username", func(t *testing.T) {
var body bytes.Buffer
body.Write([]byte(`{
"username": "Foo",
"password": "bar"
}`))
router.ServeHTTP(
httptest.NewRecorder(),
httptest.NewRequest("POST", "/api/v1/kolide/login", &body),
)
})
}