-
-
Notifications
You must be signed in to change notification settings - Fork 669
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.
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
Appservice login #2936
Closed
Closed
Appservice login #2936
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
c335f6d
Replace "m.login.password" with authtypes constant
vijfhoek df6cd1a
Add LoginTypeApplicationService to GET /login
vijfhoek 6874539
Move ValidateApplicationService to a separate package for reuse
vijfhoek 3ec2c67
Implement POST /login for LoginTypeApplicationService
vijfhoek 2470985
Make ValidateApplicationService work with UserIDs and move to internal
vijfhoek 4f963dd
Add tests for m.login.application_service
vijfhoek 40938d2
Improve ValidateApplicationService test coverage
vijfhoek 11e16a7
Remove dead, untested code from userIDIsWithinApplicationServiceNames…
vijfhoek 0e657c9
Simplify GET /login and add test for it
vijfhoek 49eac14
Merge branch 'main' into sijmens/appservice_login
S7evinK dc14738
Merge branch 'main' into sijmens/appservice_login
S7evinK 2975279
Fix typo "POSTGERS" in CONTRIBUTING.md
vijfhoek b4e472a
Replace handcrafted genHTTPRequest with httptest.NewRequest
vijfhoek 0b06052
Improve documentation and naming
vijfhoek cc62f8e
Move UsernameMatchesExclusiveNamespaces back to register.go
vijfhoek 23f5d7d
Convert TestValidationOfApplicationServices to be table-driven
vijfhoek 902eb1e
Update TestValidationOfApplicationServices function name
vijfhoek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
// Copyright 2023 The Matrix.org Foundation C.I.C. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package auth | ||
|
||
import ( | ||
"context" | ||
|
||
"github.com/matrix-org/dendrite/clientapi/auth/authtypes" | ||
"github.com/matrix-org/dendrite/clientapi/httputil" | ||
"github.com/matrix-org/dendrite/internal" | ||
"github.com/matrix-org/dendrite/setup/config" | ||
"github.com/matrix-org/util" | ||
) | ||
|
||
// LoginTypeApplicationService describes how to authenticate as an | ||
// application service | ||
type LoginTypeApplicationService struct { | ||
Config *config.ClientAPI | ||
Token string | ||
} | ||
|
||
// Name implements Type | ||
func (t *LoginTypeApplicationService) Name() string { | ||
return authtypes.LoginTypeApplicationService | ||
} | ||
|
||
// LoginFromJSON implements Type | ||
func (t *LoginTypeApplicationService) LoginFromJSON( | ||
ctx context.Context, reqBytes []byte, | ||
) (*Login, LoginCleanupFunc, *util.JSONResponse) { | ||
var r Login | ||
if err := httputil.UnmarshalJSON(reqBytes, &r); err != nil { | ||
return nil, nil, err | ||
} | ||
|
||
_, err := internal.ValidateApplicationServiceRequest(t.Config, r.Identifier.User, t.Token) | ||
if err != nil { | ||
return nil, nil, err | ||
} | ||
|
||
cleanup := func(ctx context.Context, j *util.JSONResponse) {} | ||
return &r, cleanup, nil | ||
} |
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is only true if Dendrite has been configured with appservices surely.