aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--appservice/api/query.go9
-rw-r--r--cmd/roomserver-integration-tests/main.go18
-rw-r--r--common/basecomponent/base.go39
-rw-r--r--eduserver/api/input.go7
-rw-r--r--federationsender/api/query.go9
-rw-r--r--roomserver/api/alias.go9
-rw-r--r--roomserver/api/input.go9
-rw-r--r--roomserver/api/query.go9
8 files changed, 77 insertions, 32 deletions
diff --git a/appservice/api/query.go b/appservice/api/query.go
index 7e61d623..afd5c5d7 100644
--- a/appservice/api/query.go
+++ b/appservice/api/query.go
@@ -20,6 +20,7 @@ package api
import (
"context"
"database/sql"
+ "errors"
"net/http"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
@@ -97,15 +98,15 @@ type httpAppServiceQueryAPI struct {
// NewAppServiceQueryAPIHTTP creates a AppServiceQueryAPI implemented by talking
// to a HTTP POST API.
-// If httpClient is nil then it uses http.DefaultClient
+// If httpClient is nil an error is returned
func NewAppServiceQueryAPIHTTP(
appserviceURL string,
httpClient *http.Client,
-) AppServiceQueryAPI {
+) (AppServiceQueryAPI, error) {
if httpClient == nil {
- httpClient = http.DefaultClient
+ return nil, errors.New("NewRoomserverAliasAPIHTTP: httpClient is <nil>")
}
- return &httpAppServiceQueryAPI{appserviceURL, httpClient}
+ return &httpAppServiceQueryAPI{appserviceURL, httpClient}, nil
}
// RoomAliasExists implements AppServiceQueryAPI
diff --git a/cmd/roomserver-integration-tests/main.go b/cmd/roomserver-integration-tests/main.go
index d4a8a1d1..df5607bc 100644
--- a/cmd/roomserver-integration-tests/main.go
+++ b/cmd/roomserver-integration-tests/main.go
@@ -44,6 +44,8 @@ var (
// This needs to be high enough to account for the time it takes to create
// the postgres database tables which can take a while on travis.
timeoutString = defaulting(os.Getenv("TIMEOUT"), "60s")
+ // Timeout for http client
+ timeoutHTTPClient = defaulting(os.Getenv("TIMEOUT_HTTP"), "30s")
// The name of maintenance database to connect to in order to create the test database.
postgresDatabase = defaulting(os.Getenv("POSTGRES_DATABASE"), "postgres")
// The name of the test database to create.
@@ -68,7 +70,10 @@ func defaulting(value, defaultValue string) string {
return value
}
-var timeout time.Duration
+var (
+ timeout time.Duration
+ timeoutHTTP time.Duration
+)
func init() {
var err error
@@ -76,6 +81,10 @@ func init() {
if err != nil {
panic(err)
}
+ timeoutHTTP, err = time.ParseDuration(timeoutHTTPClient)
+ if err != nil {
+ panic(err)
+ }
}
func createDatabase(database string) error {
@@ -199,7 +208,10 @@ func writeToRoomServer(input []string, roomserverURL string) error {
return err
}
}
- x := api.NewRoomserverInputAPIHTTP(roomserverURL, nil)
+ x, err := api.NewRoomserverInputAPIHTTP(roomserverURL, &http.Client{Timeout: timeoutHTTP})
+ if err != nil {
+ return err
+ }
return x.InputRoomEvents(context.Background(), &request, &response)
}
@@ -258,7 +270,7 @@ func testRoomserver(input []string, wantOutput []string, checkQueries func(api.R
cmd.Args = []string{"dendrite-room-server", "--config", filepath.Join(dir, test.ConfigFile)}
gotOutput, err := runAndReadFromTopic(cmd, cfg.RoomServerURL()+"/metrics", doInput, outputTopic, len(wantOutput), func() {
- queryAPI := api.NewRoomserverQueryAPIHTTP("http://"+string(cfg.Listen.RoomServer), nil)
+ queryAPI, _ := api.NewRoomserverQueryAPIHTTP("http://"+string(cfg.Listen.RoomServer), &http.Client{Timeout: timeoutHTTP})
checkQueries(queryAPI)
})
if err != nil {
diff --git a/common/basecomponent/base.go b/common/basecomponent/base.go
index 8d559f4d..432819a2 100644
--- a/common/basecomponent/base.go
+++ b/common/basecomponent/base.go
@@ -19,6 +19,7 @@ import (
"io"
"net/http"
"net/url"
+ "time"
"golang.org/x/crypto/ed25519"
@@ -52,6 +53,7 @@ type BaseDendrite struct {
// APIMux should be used to register new public matrix api endpoints
APIMux *mux.Router
+ httpClient *http.Client
Cfg *config.Dendrite
KafkaConsumer sarama.Consumer
KafkaProducer sarama.SyncProducer
@@ -77,11 +79,14 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string) *BaseDendrite {
kafkaConsumer, kafkaProducer = setupKafka(cfg)
}
+ const defaultHTTPTimeout = 30 * time.Second
+
return &BaseDendrite{
componentName: componentName,
tracerCloser: closer,
Cfg: cfg,
APIMux: mux.NewRouter().UseEncodedPath(),
+ httpClient: &http.Client{Timeout: defaultHTTPTimeout},
KafkaConsumer: kafkaConsumer,
KafkaProducer: kafkaProducer,
}
@@ -95,7 +100,11 @@ func (b *BaseDendrite) Close() error {
// CreateHTTPAppServiceAPIs returns the QueryAPI for hitting the appservice
// component over HTTP.
func (b *BaseDendrite) CreateHTTPAppServiceAPIs() appserviceAPI.AppServiceQueryAPI {
- return appserviceAPI.NewAppServiceQueryAPIHTTP(b.Cfg.AppServiceURL(), nil)
+ a, err := appserviceAPI.NewAppServiceQueryAPIHTTP(b.Cfg.AppServiceURL(), b.httpClient)
+ if err != nil {
+ logrus.WithError(err).Panic("CreateHTTPAppServiceAPIs failed")
+ }
+ return a
}
// CreateHTTPRoomserverAPIs returns the AliasAPI, InputAPI and QueryAPI for hitting
@@ -105,22 +114,40 @@ func (b *BaseDendrite) CreateHTTPRoomserverAPIs() (
roomserverAPI.RoomserverInputAPI,
roomserverAPI.RoomserverQueryAPI,
) {
- alias := roomserverAPI.NewRoomserverAliasAPIHTTP(b.Cfg.RoomServerURL(), nil)
- input := roomserverAPI.NewRoomserverInputAPIHTTP(b.Cfg.RoomServerURL(), nil)
- query := roomserverAPI.NewRoomserverQueryAPIHTTP(b.Cfg.RoomServerURL(), nil)
+
+ alias, err := roomserverAPI.NewRoomserverAliasAPIHTTP(b.Cfg.RoomServerURL(), b.httpClient)
+ if err != nil {
+ logrus.WithError(err).Panic("NewRoomserverAliasAPIHTTP failed")
+ }
+ input, err := roomserverAPI.NewRoomserverInputAPIHTTP(b.Cfg.RoomServerURL(), b.httpClient)
+ if err != nil {
+ logrus.WithError(err).Panic("NewRoomserverInputAPIHTTP failed", b.httpClient)
+ }
+ query, err := roomserverAPI.NewRoomserverQueryAPIHTTP(b.Cfg.RoomServerURL(), nil)
+ if err != nil {
+ logrus.WithError(err).Panic("NewRoomserverQueryAPIHTTP failed", b.httpClient)
+ }
return alias, input, query
}
// CreateHTTPEDUServerAPIs returns eduInputAPI for hitting the EDU
// server over HTTP
func (b *BaseDendrite) CreateHTTPEDUServerAPIs() eduServerAPI.EDUServerInputAPI {
- return eduServerAPI.NewEDUServerInputAPIHTTP(b.Cfg.EDUServerURL(), nil)
+ e, err := eduServerAPI.NewEDUServerInputAPIHTTP(b.Cfg.EDUServerURL(), nil)
+ if err != nil {
+ logrus.WithError(err).Panic("NewEDUServerInputAPIHTTP failed", b.httpClient)
+ }
+ return e
}
// CreateHTTPFederationSenderAPIs returns FederationSenderQueryAPI for hitting
// the federation sender over HTTP
func (b *BaseDendrite) CreateHTTPFederationSenderAPIs() federationSenderAPI.FederationSenderQueryAPI {
- return federationSenderAPI.NewFederationSenderQueryAPIHTTP(b.Cfg.FederationSenderURL(), nil)
+ f, err := federationSenderAPI.NewFederationSenderQueryAPIHTTP(b.Cfg.FederationSenderURL(), nil)
+ if err != nil {
+ logrus.WithError(err).Panic("NewFederationSenderQueryAPIHTTP failed", b.httpClient)
+ }
+ return f
}
// CreateDeviceDB creates a new instance of the device database. Should only be
diff --git a/eduserver/api/input.go b/eduserver/api/input.go
index ad3f1ed5..be2d4c56 100644
--- a/eduserver/api/input.go
+++ b/eduserver/api/input.go
@@ -15,6 +15,7 @@ package api
import (
"context"
+ "errors"
"net/http"
commonHTTP "github.com/matrix-org/dendrite/common/http"
@@ -57,11 +58,11 @@ type EDUServerInputAPI interface {
const EDUServerInputTypingEventPath = "/api/eduserver/input"
// NewEDUServerInputAPIHTTP creates a EDUServerInputAPI implemented by talking to a HTTP POST API.
-func NewEDUServerInputAPIHTTP(eduServerURL string, httpClient *http.Client) EDUServerInputAPI {
+func NewEDUServerInputAPIHTTP(eduServerURL string, httpClient *http.Client) (EDUServerInputAPI, error) {
if httpClient == nil {
- httpClient = http.DefaultClient
+ return nil, errors.New("NewTypingServerInputAPIHTTP: httpClient is <nil>")
}
- return &httpEDUServerInputAPI{eduServerURL, httpClient}
+ return &httpEDUServerInputAPI{eduServerURL, httpClient}, nil
}
type httpEDUServerInputAPI struct {
diff --git a/federationsender/api/query.go b/federationsender/api/query.go
index ebc6e833..7c0ca7ff 100644
--- a/federationsender/api/query.go
+++ b/federationsender/api/query.go
@@ -2,6 +2,7 @@ package api
import (
"context"
+ "errors"
"net/http"
commonHTTP "github.com/matrix-org/dendrite/common/http"
@@ -58,12 +59,12 @@ const FederationSenderQueryJoinedHostsInRoomPath = "/api/federationsender/queryJ
const FederationSenderQueryJoinedHostServerNamesInRoomPath = "/api/federationsender/queryJoinedHostServerNamesInRoom"
// NewFederationSenderQueryAPIHTTP creates a FederationSenderQueryAPI implemented by talking to a HTTP POST API.
-// If httpClient is nil then it uses the http.DefaultClient
-func NewFederationSenderQueryAPIHTTP(federationSenderURL string, httpClient *http.Client) FederationSenderQueryAPI {
+// If httpClient is nil an error is returned
+func NewFederationSenderQueryAPIHTTP(federationSenderURL string, httpClient *http.Client) (FederationSenderQueryAPI, error) {
if httpClient == nil {
- httpClient = http.DefaultClient
+ return nil, errors.New("NewFederationSenderQueryAPIHTTP: httpClient is <nil>")
}
- return &httpFederationSenderQueryAPI{federationSenderURL, httpClient}
+ return &httpFederationSenderQueryAPI{federationSenderURL, httpClient}, nil
}
type httpFederationSenderQueryAPI struct {
diff --git a/roomserver/api/alias.go b/roomserver/api/alias.go
index cb78f726..ad375a83 100644
--- a/roomserver/api/alias.go
+++ b/roomserver/api/alias.go
@@ -16,6 +16,7 @@ package api
import (
"context"
+ "errors"
"net/http"
commonHTTP "github.com/matrix-org/dendrite/common/http"
@@ -139,12 +140,12 @@ const RoomserverGetCreatorIDForAliasPath = "/api/roomserver/GetCreatorIDForAlias
const RoomserverRemoveRoomAliasPath = "/api/roomserver/removeRoomAlias"
// NewRoomserverAliasAPIHTTP creates a RoomserverAliasAPI implemented by talking to a HTTP POST API.
-// If httpClient is nil then it uses the http.DefaultClient
-func NewRoomserverAliasAPIHTTP(roomserverURL string, httpClient *http.Client) RoomserverAliasAPI {
+// If httpClient is nil an error is returned
+func NewRoomserverAliasAPIHTTP(roomserverURL string, httpClient *http.Client) (RoomserverAliasAPI, error) {
if httpClient == nil {
- httpClient = http.DefaultClient
+ return nil, errors.New("NewRoomserverAliasAPIHTTP: httpClient is <nil>")
}
- return &httpRoomserverAliasAPI{roomserverURL, httpClient}
+ return &httpRoomserverAliasAPI{roomserverURL, httpClient}, nil
}
type httpRoomserverAliasAPI struct {
diff --git a/roomserver/api/input.go b/roomserver/api/input.go
index f07cc022..42e8385d 100644
--- a/roomserver/api/input.go
+++ b/roomserver/api/input.go
@@ -17,6 +17,7 @@ package api
import (
"context"
+ "errors"
"net/http"
commonHTTP "github.com/matrix-org/dendrite/common/http"
@@ -112,12 +113,12 @@ type RoomserverInputAPI interface {
const RoomserverInputRoomEventsPath = "/api/roomserver/inputRoomEvents"
// NewRoomserverInputAPIHTTP creates a RoomserverInputAPI implemented by talking to a HTTP POST API.
-// If httpClient is nil then it uses the http.DefaultClient
-func NewRoomserverInputAPIHTTP(roomserverURL string, httpClient *http.Client) RoomserverInputAPI {
+// If httpClient is nil an error is returned
+func NewRoomserverInputAPIHTTP(roomserverURL string, httpClient *http.Client) (RoomserverInputAPI, error) {
if httpClient == nil {
- httpClient = http.DefaultClient
+ return nil, errors.New("NewRoomserverInputAPIHTTP: httpClient is <nil>")
}
- return &httpRoomserverInputAPI{roomserverURL, httpClient}
+ return &httpRoomserverInputAPI{roomserverURL, httpClient}, nil
}
type httpRoomserverInputAPI struct {
diff --git a/roomserver/api/query.go b/roomserver/api/query.go
index 3cb1b8a7..9120da4b 100644
--- a/roomserver/api/query.go
+++ b/roomserver/api/query.go
@@ -18,6 +18,7 @@ package api
import (
"context"
+ "errors"
"net/http"
commonHTTP "github.com/matrix-org/dendrite/common/http"
@@ -406,12 +407,12 @@ const RoomserverQueryRoomVersionCapabilitiesPath = "/api/roomserver/queryRoomVer
const RoomserverQueryRoomVersionForRoomPath = "/api/roomserver/queryRoomVersionForRoom"
// NewRoomserverQueryAPIHTTP creates a RoomserverQueryAPI implemented by talking to a HTTP POST API.
-// If httpClient is nil then it uses the http.DefaultClient
-func NewRoomserverQueryAPIHTTP(roomserverURL string, httpClient *http.Client) RoomserverQueryAPI {
+// If httpClient is nil an error is returned
+func NewRoomserverQueryAPIHTTP(roomserverURL string, httpClient *http.Client) (RoomserverQueryAPI, error) {
if httpClient == nil {
- httpClient = http.DefaultClient
+ return nil, errors.New("NewRoomserverQueryAPIHTTP: httpClient is <nil>")
}
- return &httpRoomserverQueryAPI{roomserverURL, httpClient}
+ return &httpRoomserverQueryAPI{roomserverURL, httpClient}, nil
}
type httpRoomserverQueryAPI struct {
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-25 15:08:06 +0000