-
-
Notifications
You must be signed in to change notification settings - Fork 665
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Appservice Login (2nd attempt) (#3078)
Rebase of #2936 as @vijfhoek wrote he got no time to work on this, and I kind of needed it for my experiments. I checked the tests, and it is working with my example code (i.e. impersonating, registering, creating channel, invite people, write messages). I'm not a huge `go` pro, and still learning, but I tried to fix and/or integrate the changes as best as possible with the current `main` branch changes. If there is anything left, let me know and I'll try to figure it out. Signed-off-by: `Kuhn Christopher <kuhnchris+git@kuhnchris.eu>` --------- Signed-off-by: Sijmen <me@sijman.nl> Signed-off-by: Sijmen Schoon <me@sijman.nl> Co-authored-by: Sijmen Schoon <me@sijman.nl> Co-authored-by: Sijmen Schoon <me@vijf.life> Co-authored-by: Till <2353100+S7evinK@users.noreply.github.com>
- Loading branch information
1 parent
b8f9148
commit 4f94377
Showing
11 changed files
with
530 additions
and
35 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
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.