mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-21 04:53:14 -06:00
Add test for federation send endpoint
This commit is contained in:
parent
a5e012eda9
commit
f18a838297
|
|
@ -40,6 +40,10 @@ import (
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
SendRouteName = "Send"
|
||||||
|
)
|
||||||
|
|
||||||
// Setup registers HTTP handlers with the given ServeMux.
|
// Setup registers HTTP handlers with the given ServeMux.
|
||||||
// The provided publicAPIMux MUST have `UseEncodedPath()` enabled or else routes will incorrectly
|
// The provided publicAPIMux MUST have `UseEncodedPath()` enabled or else routes will incorrectly
|
||||||
// path unescape twice (once from the router, once from MakeFedAPI). We need to have this enabled
|
// path unescape twice (once from the router, once from MakeFedAPI). We need to have this enabled
|
||||||
|
|
@ -131,7 +135,7 @@ func Setup(
|
||||||
cfg, rsAPI, keyAPI, keys, federation, mu, servers, producer,
|
cfg, rsAPI, keyAPI, keys, federation, mu, servers, producer,
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
)).Methods(http.MethodPut, http.MethodOptions)
|
)).Methods(http.MethodPut, http.MethodOptions).Name(SendRouteName)
|
||||||
|
|
||||||
v1fedmux.Handle("/invite/{roomID}/{eventID}", MakeFedAPI(
|
v1fedmux.Handle("/invite/{roomID}/{eventID}", MakeFedAPI(
|
||||||
"federation_invite", cfg.Matrix.ServerName, cfg.Matrix.IsLocalServerName, keys, wakeup,
|
"federation_invite", cfg.Matrix.ServerName, cfg.Matrix.IsLocalServerName, keys, wakeup,
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,42 @@
|
||||||
package routing
|
// Copyright 2022 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 routing_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/hex"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/http/httptest"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/gorilla/mux"
|
||||||
|
"github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/signing"
|
||||||
|
fedAPI "github.com/matrix-org/dendrite/federationapi"
|
||||||
|
fedInternal "github.com/matrix-org/dendrite/federationapi/internal"
|
||||||
|
"github.com/matrix-org/dendrite/federationapi/routing"
|
||||||
"github.com/matrix-org/dendrite/internal"
|
"github.com/matrix-org/dendrite/internal"
|
||||||
|
"github.com/matrix-org/dendrite/internal/httputil"
|
||||||
"github.com/matrix-org/dendrite/roomserver/api"
|
"github.com/matrix-org/dendrite/roomserver/api"
|
||||||
|
"github.com/matrix-org/dendrite/setup/config"
|
||||||
"github.com/matrix-org/dendrite/test"
|
"github.com/matrix-org/dendrite/test"
|
||||||
|
"github.com/matrix-org/dendrite/test/testrig"
|
||||||
"github.com/matrix-org/gomatrixserverlib"
|
"github.com/matrix-org/gomatrixserverlib"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"golang.org/x/crypto/ed25519"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|
@ -513,3 +539,55 @@ func TestTransactionFetchMissingStateByStateIDs(t *testing.T) {
|
||||||
assertInputRoomEvents(t, rsAPI.inputRoomEvents, []*gomatrixserverlib.HeaderedEvent{eventB, eventC, eventD})
|
assertInputRoomEvents(t, rsAPI.inputRoomEvents, []*gomatrixserverlib.HeaderedEvent{eventB, eventC, eventD})
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
type sendContent struct {
|
||||||
|
PDUs []json.RawMessage `json:"pdus"`
|
||||||
|
EDUs []gomatrixserverlib.EDU `json:"edus"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleSend(t *testing.T) {
|
||||||
|
base, close := testrig.CreateBaseDendrite(t, test.DBTypeSQLite)
|
||||||
|
defer close()
|
||||||
|
|
||||||
|
fedMux := mux.NewRouter().SkipClean(true).PathPrefix(httputil.PublicFederationPathPrefix).Subrouter().UseEncodedPath()
|
||||||
|
keyMux := mux.NewRouter().SkipClean(true).PathPrefix(httputil.PublicKeyPathPrefix).Subrouter().UseEncodedPath()
|
||||||
|
cfg := config.FederationAPI{
|
||||||
|
Matrix: &config.Global{
|
||||||
|
SigningIdentity: gomatrixserverlib.SigningIdentity{
|
||||||
|
ServerName: "remote",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
fedapi := fedAPI.NewInternalAPI(base, nil, nil, nil, nil, true)
|
||||||
|
serverKeyAPI := &signing.YggdrasilKeys{}
|
||||||
|
keyRing := serverKeyAPI.KeyRing()
|
||||||
|
r, ok := fedapi.(*fedInternal.FederationInternalAPI)
|
||||||
|
if !ok {
|
||||||
|
panic("This is a programming error.")
|
||||||
|
}
|
||||||
|
routing.Setup(fedMux, keyMux, nil, &cfg, nil, r, keyRing, nil, nil, nil, &base.Cfg.MSCs, nil, nil)
|
||||||
|
|
||||||
|
handler := fedMux.Get(routing.SendRouteName).GetHandler().ServeHTTP
|
||||||
|
_, sk, _ := ed25519.GenerateKey(nil)
|
||||||
|
keyID := signing.KeyID
|
||||||
|
pk := sk.Public().(ed25519.PublicKey)
|
||||||
|
serverName := gomatrixserverlib.ServerName(hex.EncodeToString(pk))
|
||||||
|
req := gomatrixserverlib.NewFederationRequest("PUT", serverName, "remote", "/send/1234")
|
||||||
|
content := sendContent{}
|
||||||
|
err := req.SetContent(content)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Error: %s", err.Error())
|
||||||
|
}
|
||||||
|
req.Sign(serverName, gomatrixserverlib.KeyID(keyID), sk)
|
||||||
|
httpReq, err := req.HTTPRequest()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Error: %s", err.Error())
|
||||||
|
}
|
||||||
|
vars := map[string]string{"txnID": "1234"}
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
httpReq = mux.SetURLVars(httpReq, vars)
|
||||||
|
handler(w, httpReq)
|
||||||
|
|
||||||
|
res := w.Result()
|
||||||
|
assert.Equal(t, 200, res.StatusCode)
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue