hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-24 20:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP - Implementing /_matrix/client/r0/pushers/set

Browse source
This commit is contained in:
Dan Peleg 2021-04-25 17:42:36 +03:00
parent a1d1f2b02c
commit 633dbe0900
6 changed files with 146 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
clientapi/routing/pusher.go
View file

@ -78,3 +78,28 @@ func GetPushersByLocalpart(
JSON: res,
}
}
// SetPushersByLocalpart handles /_matrix/client/r0/pushers/set
// This endpoint allows the creation, modification and deletion of pushers for this user ID.
// The behaviour of this endpoint varies depending on the values in the JSON body.
func SetPusherByLocalpart(
req *http.Request, userAPI userapi.UserInternalAPI, device *api.Device,
) util.JSONResponse {
body := pusherJSON{}
if resErr := httputil.UnmarshalJSONRequest(req, &body); resErr != nil {
return *resErr
}
// TODO:
// 1. if kind == null, GetPusherByPushkey and delete it! 🗑
// 2. if GetPusherByPushkey returns existing Pusher, update it with the received body
// 3. if GetPusherByPushkey returns nothing, create a new Pusher with the received body
res := body
return util.JSONResponse{
Code: http.StatusOK,
JSON: res,
}
}

10
clientapi/routing/routing.go
View file

@ -808,6 +808,16 @@ func Setup(
return GetPushersByLocalpart(req, userAPI, device)
}),
).Methods(http.MethodGet, http.MethodOptions)
r0mux.Handle("/pushers/set",
httputil.MakeAuthAPI("set_pushers", userAPI, func(req *http.Request, device *userapi.Device) util.JSONResponse {
if r := rateLimits.rateLimit(req); r != nil {
return *r
}
return SetPushersByLocalpart(req, userAPI, device)
}),
).Methods(http.MethodPost, http.MethodOptions)
// Stub implementations for sytest
r0mux.Handle("/events",
httputil.MakeExternalAPI("events", func(req *http.Request) util.JSONResponse {

50
userapi/storage/pushers/postgres/pushers_table.go
View file

@ -61,8 +61,12 @@ CREATE UNIQUE INDEX IF NOT EXISTS pusher_localpart_pushkey_idx ON pusher_pushers
const selectPushersByLocalpartSQL = "" +
"SELECT pushkey, kind, app_id, app_display_name, device_display_name, profile_tag, lang, url, format FROM pusher_pushers WHERE localpart = $1"
const selectPusherByPushkeySQL = "" +
"SELECT pushkey, kind, app_id, app_display_name, device_display_name, profile_tag, lang, url, format FROM pusher_pushers WHERE localpart = $1 AND pushkey = $2"
type pushersStatements struct {
selectPushersByLocalpartStmt *sql.Stmt
selectPusherByPushkeyStmt *sql.Stmt
serverName gomatrixserverlib.ServerName
}
@ -75,7 +79,7 @@ func (s *pushersStatements) prepare(db *sql.DB, server gomatrixserverlib.ServerN
if s.selectPushersByLocalpartStmt, err = db.Prepare(selectPushersByLocalpartSQL); err != nil {
return
}
if s.selectPushersByPushkeyStmt, err = db.Prepare(selectPushersByPushkeySQL); err != nil {
if s.selectPusherByPushkeyStmt, err = db.Prepare(selectPusherByPushkeySQL); err != nil {
return
}
s.serverName = server
@ -134,3 +138,47 @@ func (s *pushersStatements) selectPushersByLocalpart(
return pushers, rows.Err()
}
func (s *pushersStatements) selectPusherByPushkey(
ctx context.Context, localpart, pushkey string,
) (*api.Pusher, error) {
var pusher api.Pusher
var id, key, kind, appid, appdisplayname, devicedisplayname, profiletag, lang, url, format sql.NullString
stmt := s.selectPusherByPushkeyStmt
err := stmt.QueryRowContext(ctx, localpart, pushkey).Scan(&id, &key, &kind, &appid, &appdisplayname, &devicedisplayname, &profiletag, &lang, &url, &format)
if err == nil {
if key.Valid {
pusher.PushKey = key.String
}
if kind.Valid {
pusher.Kind = kind.String
}
if appid.Valid {
pusher.AppID = appid.String
}
if appdisplayname.Valid {
pusher.AppDisplayName = appdisplayname.String
}
if devicedisplayname.Valid {
pusher.DeviceDisplayName = devicedisplayname.String
}
if profiletag.Valid {
pusher.ProfileTag = profiletag.String
}
if lang.Valid {
pusher.Language = lang.String
}
if url.Valid && format.Valid {
pusher.Data = api.PusherData{
URL: url.String,
Format: format.String,
}
}
pusher.UserID = userutil.MakeUserID(localpart, s.serverName)
}
return &pusher, err
}

6
userapi/storage/pushers/postgres/storage.go
View file

@ -61,4 +61,10 @@ func (d *Database) GetPushersByLocalpart(
) ([]api.Pusher, error) {
return d.pushers.selectPushersByLocalpart(ctx, nil, localpart)
}
// GetPushersByPushkey returns the pusers matching the given localpart.
func (d *Database) GetPushersByPushkey(
ctx context.Context, localpart, pushkey string,
) (*api.Pusher, error) {
return d.pushers.selectPushersByPushkey(ctx, localpart, pushkey)
}

52
userapi/storage/pushers/sqlite3/pushers_table.go
View file

@ -1,4 +1,4 @@
// Copyright 2017 Vector Creations Ltd
// Copyright 2021 Dan Peleg <dan@globekeeper.com>
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -20,7 +20,6 @@ import (
"github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/dendrite/userapi/api"
"github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/clientapi/userutil"
"github.com/matrix-org/gomatrixserverlib"
@ -46,10 +45,14 @@ CREATE TABLE IF NOT EXISTS pusher_pushers (
const selectPushersByLocalpartSQL = "" +
"SELECT pushkey, kind, app_id, app_display_name, device_display_name, profile_tag, lang, url, format FROM pusher_pushers WHERE localpart = $1"
const selectPusherByPushkeySQL = "" +
"SELECT pushkey, kind, app_id, app_display_name, device_display_name, profile_tag, lang, url, format FROM pusher_pushers WHERE localpart = $1 AND pushkey = $2"
type pushersStatements struct {
db *sql.DB
writer sqlutil.Writer
selectPushersByLocalpartStmt *sql.Stmt
selectPusherByPushkeyStmt *sql.Stmt
serverName gomatrixserverlib.ServerName
}
@ -62,8 +65,9 @@ func (s *pushersStatements) prepare(db *sql.DB, writer sqlutil.Writer, server go
s.db = db
s.writer = writer
if s.selectPushersByLocalpartStmt, err = db.Prepare(selectPushersByLocalpartSQL); err != nil {
logrus.WithError(err).Debug("💥💥💥 Preparing selectPushersByLocalpartStmt...")
return
}
if s.selectPusherByPushkeyStmt, err = db.Prepare(selectPusherByPushkeySQL); err != nil {
return
}
s.serverName = server
@ -121,3 +125,45 @@ func (s *pushersStatements) selectPushersByLocalpart(
return pushers, nil
}
// selectPusherByID retrieves a pusher from the database with the given user
// localpart and pusherID
func (s *pushersStatements) selectPusherByPushkey(
ctx context.Context, localpart, pushkey string,
) (*api.Pusher, error) {
var pusher api.Pusher
var id, key, kind, appid, appdisplayname, devicedisplayname, profiletag, lang, url, format sql.NullString
stmt := s.selectPusherByPushkeyStmt
err := stmt.QueryRowContext(ctx, localpart, pushkey).Scan(&id, &key, &kind, &appid, &appdisplayname, &devicedisplayname, &profiletag, &lang, &url, &format)
if err == nil {
pusher.UserID = userutil.MakeUserID(localpart, s.serverName)
if key.Valid {
pusher.PushKey = key.String
}
if kind.Valid {
pusher.Kind = kind.String
}
if appid.Valid {
pusher.AppID = appid.String
}
if appdisplayname.Valid {
pusher.AppDisplayName = appdisplayname.String
}
if devicedisplayname.Valid {
pusher.DeviceDisplayName = devicedisplayname.String
}
if profiletag.Valid {
pusher.ProfileTag = profiletag.String
}
if lang.Valid {
pusher.Language = lang.String
}
if url.Valid && format.Valid {
pusher.Data = api.PusherData{
URL: url.String,
Format: format.String,
}
}
}
return &pusher, err
}

8
userapi/storage/pushers/sqlite3/storage.go
View file

@ -1,4 +1,4 @@
// Copyright 2017 Vector Creations Ltd
// Copyright 2021 Dan Peleg <dan@globekeeper.com>
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -63,4 +63,10 @@ func (d *Database) GetPushersByLocalpart(
) ([]api.Pusher, error) {
return d.pushers.selectPushersByLocalpart(ctx, nil, localpart)
}
// GetPushersByLocalpart returns the pushers matching the given localpart.
func (d *Database) GetPushersByPushkey(
ctx context.Context, localpart, pushkey string,
) (*api.Pusher, error) {
return d.pushers.selectPusherByPushkey(ctx, localpart, pushkey)
}