mirror of
https://github.com/matrix-org/dendrite.git
synced 2024-11-23 14:51:56 -06:00
bcb89ada5e
* fix conversion from int to string yields a string of one rune, not a string of digits * Add receipts table to syncapi * Use StreamingToken as the since value * Add required method to testEDUProducer * Make receipt json creation "easier" to read * Add receipts api to the eduserver * Add receipts endpoint * Add eduserver kafka consumer * Add missing kafka config * Add passing tests to whitelist Signed-off-by: Till Faelligen <tfaelligen@gmail.com> * Fix copy & paste error * Fix column count error * Make outbound federation receipts pass * Make "Inbound federation rejects receipts from wrong remote" pass * Don't use errors package * - Add TODO for batching requests - Rename variable * Return a better error message * - Use OutputReceiptEvent instead of InputReceiptEvent as result - Don't use the errors package for errors - Defer CloseAndLogIfError to close rows - Fix Copyright * Better creation/usage of JoinResponse * Query all joined rooms instead of just one * Update gomatrixserverlib * Add sqlite3 migration * Add postgres migration * Ensure required sequence exists before running migrations * Clarification on comment * - Fix a bug when creating client receipts - Use concrete types instead of interface{} * Remove dead code Use key for timestamp * Fix postgres query... * Remove single purpose struct * Use key/value directly * Only apply receipts on initial sync or if edu positions differ, otherwise we'll be sending the same receipts over and over again. * Actually update the id, so it is correctly send in syncs * Set receipt on request to /read_markers * Fix issue with receipts getting overwritten * Use fmt.Errorf instead of pkg/errors * Revert "Add postgres migration" This reverts commit722fe5a046
. * Revert "Add sqlite3 migration" This reverts commitd113b03f64
. * Fix selectRoomReceipts query * Make golangci-lint happy Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
207 lines
5.9 KiB
Go
207 lines
5.9 KiB
Go
// Copyright 2017 Vector Creations Ltd
|
|
//
|
|
// 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 routing
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/http"
|
|
|
|
"github.com/matrix-org/dendrite/clientapi/httputil"
|
|
"github.com/matrix-org/dendrite/clientapi/jsonerror"
|
|
"github.com/matrix-org/dendrite/clientapi/producers"
|
|
eduserverAPI "github.com/matrix-org/dendrite/eduserver/api"
|
|
roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
|
|
"github.com/matrix-org/dendrite/userapi/api"
|
|
|
|
"github.com/matrix-org/util"
|
|
)
|
|
|
|
// GetAccountData implements GET /user/{userId}/[rooms/{roomid}/]account_data/{type}
|
|
func GetAccountData(
|
|
req *http.Request, userAPI api.UserInternalAPI, device *api.Device,
|
|
userID string, roomID string, dataType string,
|
|
) util.JSONResponse {
|
|
if userID != device.UserID {
|
|
return util.JSONResponse{
|
|
Code: http.StatusForbidden,
|
|
JSON: jsonerror.Forbidden("userID does not match the current user"),
|
|
}
|
|
}
|
|
|
|
dataReq := api.QueryAccountDataRequest{
|
|
UserID: userID,
|
|
DataType: dataType,
|
|
RoomID: roomID,
|
|
}
|
|
dataRes := api.QueryAccountDataResponse{}
|
|
if err := userAPI.QueryAccountData(req.Context(), &dataReq, &dataRes); err != nil {
|
|
util.GetLogger(req.Context()).WithError(err).Error("userAPI.QueryAccountData failed")
|
|
return util.ErrorResponse(fmt.Errorf("userAPI.QueryAccountData: %w", err))
|
|
}
|
|
|
|
var data json.RawMessage
|
|
var ok bool
|
|
if roomID != "" {
|
|
data, ok = dataRes.RoomAccountData[roomID][dataType]
|
|
} else {
|
|
data, ok = dataRes.GlobalAccountData[dataType]
|
|
}
|
|
if ok {
|
|
return util.JSONResponse{
|
|
Code: http.StatusOK,
|
|
JSON: data,
|
|
}
|
|
}
|
|
|
|
return util.JSONResponse{
|
|
Code: http.StatusNotFound,
|
|
JSON: jsonerror.Forbidden("data not found"),
|
|
}
|
|
}
|
|
|
|
// SaveAccountData implements PUT /user/{userId}/[rooms/{roomId}/]account_data/{type}
|
|
func SaveAccountData(
|
|
req *http.Request, userAPI api.UserInternalAPI, device *api.Device,
|
|
userID string, roomID string, dataType string, syncProducer *producers.SyncAPIProducer,
|
|
) util.JSONResponse {
|
|
if userID != device.UserID {
|
|
return util.JSONResponse{
|
|
Code: http.StatusForbidden,
|
|
JSON: jsonerror.Forbidden("userID does not match the current user"),
|
|
}
|
|
}
|
|
|
|
defer req.Body.Close() // nolint: errcheck
|
|
|
|
if req.Body == http.NoBody {
|
|
return util.JSONResponse{
|
|
Code: http.StatusBadRequest,
|
|
JSON: jsonerror.NotJSON("Content not JSON"),
|
|
}
|
|
}
|
|
|
|
if dataType == "m.fully_read" {
|
|
return util.JSONResponse{
|
|
Code: http.StatusForbidden,
|
|
JSON: jsonerror.Forbidden("Unable to set read marker"),
|
|
}
|
|
}
|
|
|
|
body, err := ioutil.ReadAll(req.Body)
|
|
if err != nil {
|
|
util.GetLogger(req.Context()).WithError(err).Error("ioutil.ReadAll failed")
|
|
return jsonerror.InternalServerError()
|
|
}
|
|
|
|
if !json.Valid(body) {
|
|
return util.JSONResponse{
|
|
Code: http.StatusBadRequest,
|
|
JSON: jsonerror.BadJSON("Bad JSON content"),
|
|
}
|
|
}
|
|
|
|
dataReq := api.InputAccountDataRequest{
|
|
UserID: userID,
|
|
DataType: dataType,
|
|
RoomID: roomID,
|
|
AccountData: json.RawMessage(body),
|
|
}
|
|
dataRes := api.InputAccountDataResponse{}
|
|
if err := userAPI.InputAccountData(req.Context(), &dataReq, &dataRes); err != nil {
|
|
util.GetLogger(req.Context()).WithError(err).Error("userAPI.InputAccountData failed")
|
|
return util.ErrorResponse(err)
|
|
}
|
|
|
|
// TODO: user API should do this since it's account data
|
|
if err := syncProducer.SendData(userID, roomID, dataType); err != nil {
|
|
util.GetLogger(req.Context()).WithError(err).Error("syncProducer.SendData failed")
|
|
return jsonerror.InternalServerError()
|
|
}
|
|
|
|
return util.JSONResponse{
|
|
Code: http.StatusOK,
|
|
JSON: struct{}{},
|
|
}
|
|
}
|
|
|
|
type readMarkerJSON struct {
|
|
FullyRead string `json:"m.fully_read"`
|
|
Read string `json:"m.read"`
|
|
}
|
|
|
|
type fullyReadEvent struct {
|
|
EventID string `json:"event_id"`
|
|
}
|
|
|
|
// SaveReadMarker implements POST /rooms/{roomId}/read_markers
|
|
func SaveReadMarker(
|
|
req *http.Request,
|
|
userAPI api.UserInternalAPI, rsAPI roomserverAPI.RoomserverInternalAPI, eduAPI eduserverAPI.EDUServerInputAPI,
|
|
syncProducer *producers.SyncAPIProducer, device *api.Device, roomID string,
|
|
) util.JSONResponse {
|
|
// Verify that the user is a member of this room
|
|
resErr := checkMemberInRoom(req.Context(), rsAPI, device.UserID, roomID)
|
|
if resErr != nil {
|
|
return *resErr
|
|
}
|
|
|
|
var r readMarkerJSON
|
|
resErr = httputil.UnmarshalJSONRequest(req, &r)
|
|
if resErr != nil {
|
|
return *resErr
|
|
}
|
|
|
|
if r.FullyRead == "" {
|
|
return util.JSONResponse{
|
|
Code: http.StatusBadRequest,
|
|
JSON: jsonerror.BadJSON("Missing m.fully_read mandatory field"),
|
|
}
|
|
}
|
|
|
|
data, err := json.Marshal(fullyReadEvent{EventID: r.FullyRead})
|
|
if err != nil {
|
|
return jsonerror.InternalServerError()
|
|
}
|
|
|
|
dataReq := api.InputAccountDataRequest{
|
|
UserID: device.UserID,
|
|
DataType: "m.fully_read",
|
|
RoomID: roomID,
|
|
AccountData: data,
|
|
}
|
|
dataRes := api.InputAccountDataResponse{}
|
|
if err := userAPI.InputAccountData(req.Context(), &dataReq, &dataRes); err != nil {
|
|
util.GetLogger(req.Context()).WithError(err).Error("userAPI.InputAccountData failed")
|
|
return util.ErrorResponse(err)
|
|
}
|
|
|
|
if err := syncProducer.SendData(device.UserID, roomID, "m.fully_read"); err != nil {
|
|
util.GetLogger(req.Context()).WithError(err).Error("syncProducer.SendData failed")
|
|
return jsonerror.InternalServerError()
|
|
}
|
|
|
|
// Handle the read receipt that may be included in the read marker
|
|
if r.Read != "" {
|
|
return SetReceipt(req, eduAPI, device, roomID, "m.read", r.Read)
|
|
}
|
|
|
|
return util.JSONResponse{
|
|
Code: http.StatusOK,
|
|
JSON: struct{}{},
|
|
}
|
|
}
|