Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Authentication plugin #207

Closed
wants to merge 6 commits into from
Closed

Authentication plugin #207

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
025a1b5
separate basic auth into its own package
Aug 5, 2019
dabdede
golint
Aug 5, 2019
ed940a3
suggestions
Aug 10, 2019
23f1a83
add external authenticaor compat
Aug 11, 2019
85cd266
add config for external authenticators
Aug 11, 2019
3b28e3c
register external authenticator compat
Aug 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions api/message_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ func (s *MessageSuite) Test_CreateMessage_onJson_allParams() {
timeNow = func() time.Time { return t }
defer func() { timeNow = time.Now }()

auth.RegisterAuthentication(s.ctx, nil, 4, "app-token")
auth.RegisterAuthentication(s.ctx, nil, "app-token")
s.db.User(4).AppWithToken(7, "app-token")
s.ctx.Request = httptest.NewRequest("POST", "/message", strings.NewReader(`{"title": "mytitle", "message": "mymessage", "priority": 1}`))
s.ctx.Request.Header.Set("Content-Type", "application/json")
Expand All @@ -343,7 +343,7 @@ func (s *MessageSuite) Test_CreateMessage_WithTitle() {
timeNow = func() time.Time { return t }
defer func() { timeNow = time.Now }()

auth.RegisterAuthentication(s.ctx, nil, 4, "app-token")
auth.RegisterAuthentication(s.ctx, nil, "app-token")
s.db.User(4).AppWithToken(5, "app-token")
s.ctx.Request = httptest.NewRequest("POST", "/message", strings.NewReader(`{"title": "mytitle", "message": "mymessage"}`))
s.ctx.Request.Header.Set("Content-Type", "application/json")
Expand All @@ -360,7 +360,7 @@ func (s *MessageSuite) Test_CreateMessage_WithTitle() {
}

func (s *MessageSuite) Test_CreateMessage_failWhenNoMessage() {
auth.RegisterAuthentication(s.ctx, nil, 4, "app-token")
auth.RegisterAuthentication(s.ctx, nil, "app-token")
s.db.User(4).AppWithToken(1, "app-token")

s.ctx.Request = httptest.NewRequest("POST", "/message", strings.NewReader(`{"title": "mytitle"}`))
Expand All @@ -376,7 +376,7 @@ func (s *MessageSuite) Test_CreateMessage_failWhenNoMessage() {
}

func (s *MessageSuite) Test_CreateMessage_WithoutTitle() {
auth.RegisterAuthentication(s.ctx, nil, 4, "app-token")
auth.RegisterAuthentication(s.ctx, nil, "app-token")
s.db.User(4).AppWithTokenAndName(8, "app-token", "Application name")

s.ctx.Request = httptest.NewRequest("POST", "/message", strings.NewReader(`{"message": "mymessage"}`))
Expand All @@ -393,7 +393,7 @@ func (s *MessageSuite) Test_CreateMessage_WithoutTitle() {
}

func (s *MessageSuite) Test_CreateMessage_WithBlankTitle() {
auth.RegisterAuthentication(s.ctx, nil, 4, "app-token")
auth.RegisterAuthentication(s.ctx, nil, "app-token")
s.db.User(4).AppWithTokenAndName(8, "app-token", "Application name")

s.ctx.Request = httptest.NewRequest("POST", "/message", strings.NewReader(`{"message": "mymessage", "title": " "}`))
Expand All @@ -409,7 +409,7 @@ func (s *MessageSuite) Test_CreateMessage_WithBlankTitle() {
assert.Equal(s.T(), "mymessage", msgs[0].Message)
}
func (s *MessageSuite) Test_CreateMessage_WithExtras() {
auth.RegisterAuthentication(s.ctx, nil, 4, "app-token")
auth.RegisterAuthentication(s.ctx, nil, "app-token")
s.db.User(4).AppWithTokenAndName(8, "app-token", "Application name")

t, _ := time.Parse("2006/01/02", "2017/01/02")
Expand Down Expand Up @@ -447,7 +447,7 @@ func (s *MessageSuite) Test_CreateMessage_WithExtras() {
}

func (s *MessageSuite) Test_CreateMessage_failWhenPriorityNotNumber() {
auth.RegisterAuthentication(s.ctx, nil, 4, "app-token")
auth.RegisterAuthentication(s.ctx, nil, "app-token")
s.db.User(4).AppWithToken(8, "app-token")

s.ctx.Request = httptest.NewRequest("POST", "/message", strings.NewReader(`{"title": "mytitle", "message": "mymessage", "priority": "asd"}`))
Expand All @@ -463,7 +463,7 @@ func (s *MessageSuite) Test_CreateMessage_failWhenPriorityNotNumber() {
}

func (s *MessageSuite) Test_CreateMessage_onQueryData() {
auth.RegisterAuthentication(s.ctx, nil, 4, "app-token")
auth.RegisterAuthentication(s.ctx, nil, "app-token")
s.db.User(4).AppWithToken(2, "app-token")

t, _ := time.Parse("2006/01/02", "2017/01/02")
Expand All @@ -485,7 +485,7 @@ func (s *MessageSuite) Test_CreateMessage_onQueryData() {
assert.Equal(s.T(), uint(1), s.notifiedMessage.ID)
}
func (s *MessageSuite) Test_CreateMessage_onFormData() {
auth.RegisterAuthentication(s.ctx, nil, 4, "app-token")
auth.RegisterAuthentication(s.ctx, nil, "app-token")
s.db.User(4).AppWithToken(99, "app-token")

t, _ := time.Parse("2006/01/02", "2017/01/02")
Expand Down
12 changes: 5 additions & 7 deletions api/stream/stream_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestWriteMessageFails(t *testing.T) {
defer leaktest.Check(t)()

server, api := bootTestServer(func(context *gin.Context) {
auth.RegisterAuthentication(context, nil, 1, "")
auth.RegisterAuthentication(context, nil, "")
})
defer server.Close()
defer api.Close()
Expand Down Expand Up @@ -199,11 +199,10 @@ func TestDeleteMultipleClients(t *testing.T) {
mode.Set(mode.TestDev)

defer leaktest.Check(t)()
userIDs := []uint{1, 1, 1, 1, 2, 2, 3}
tokens := []string{"1-1", "1-2", "1-2", "1-3", "2-1", "2-2", "3"}
i := 0
server, api := bootTestServer(func(context *gin.Context) {
auth.RegisterAuthentication(context, nil, userIDs[i], tokens[i])
auth.RegisterAuthentication(context, nil, tokens[i])
i++
})
defer server.Close()
Expand Down Expand Up @@ -263,11 +262,10 @@ func TestDeleteUser(t *testing.T) {
mode.Set(mode.TestDev)

defer leaktest.Check(t)()
userIDs := []uint{1, 1, 1, 1, 2, 2, 3}
tokens := []string{"1-1", "1-2", "1-2", "1-3", "2-1", "2-2", "3"}
i := 0
server, api := bootTestServer(func(context *gin.Context) {
auth.RegisterAuthentication(context, nil, userIDs[i], tokens[i])
auth.RegisterAuthentication(context, nil, tokens[i])
i++
})
defer server.Close()
Expand Down Expand Up @@ -329,7 +327,7 @@ func TestMultipleClients(t *testing.T) {
userIDs := []uint{1, 1, 1, 2, 2, 3}
i := 0
server, api := bootTestServer(func(context *gin.Context) {
auth.RegisterAuthentication(context, nil, userIDs[i], "t"+string(userIDs[i]))
auth.RegisterAuthentication(context, nil, "t"+string(userIDs[i]))
i++
})
defer server.Close()
Expand Down Expand Up @@ -558,6 +556,6 @@ func wsURL(httpURL string) string {

func staticUserID() gin.HandlerFunc {
return func(context *gin.Context) {
auth.RegisterAuthentication(context, nil, 1, "customtoken")
auth.RegisterAuthentication(context, nil, "customtoken")
}
}
2 changes: 1 addition & 1 deletion api/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/gin-gonic/gin"
"github.com/gotify/server/auth"
"github.com/gotify/server/auth/password"
"github.com/gotify/server/auth/basicauthenticator/password"
"github.com/gotify/server/model"
)

Expand Down
2 changes: 1 addition & 1 deletion api/user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/gin-gonic/gin"
"github.com/gotify/server/auth/password"
"github.com/gotify/server/auth/basicauthenticator/password"
"github.com/gotify/server/mode"
"github.com/gotify/server/model"
"github.com/gotify/server/test"
Expand Down
Loading