mirror of
https://github.com/matrix-org/sliding-sync.git
synced 2025-03-10 13:37:11 +00:00
extract HomeServerUrl struct
This commit is contained in:
Boris Rybalkin
parent
ae73ace4a4
commit
b055d27d22
4
go.mod
4
go.mod
@ -15,6 +15,7 @@ require (
|
||||
github.com/pressly/goose/v3 v3.14.0
|
||||
github.com/prometheus/client_golang v1.13.0
|
||||
github.com/rs/zerolog v1.29.0
|
||||
github.com/stretchr/testify v1.8.4
|
||||
github.com/tidwall/gjson v1.16.0
|
||||
github.com/tidwall/sjson v1.2.5
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0
|
||||
@ -31,6 +32,7 @@ require (
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/felixge/httpsnoop v1.0.3 // indirect
|
||||
github.com/go-logr/logr v1.2.4 // indirect
|
||||
github.com/go-logr/stdr v1.2.2 // indirect
|
||||
@ -40,6 +42,7 @@ require (
|
||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||
github.com/mattn/go-isatty v0.0.19 // indirect
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/prometheus/client_model v0.2.0 // indirect
|
||||
github.com/prometheus/common v0.37.0 // indirect
|
||||
github.com/prometheus/procfs v0.11.0 // indirect
|
||||
@ -59,5 +62,6 @@ require (
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
|
||||
google.golang.org/grpc v1.58.3 // indirect
|
||||
google.golang.org/protobuf v1.31.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
maunium.net/go/mautrix v0.11.0 // indirect
|
||||
)
|
||||
|
||||
6
go.sum
6
go.sum
@ -174,8 +174,10 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
||||
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||
@ -242,6 +244,7 @@ github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuR
|
||||
github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
|
||||
github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
|
||||
github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
|
||||
github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w=
|
||||
@ -258,6 +261,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
|
||||
github.com/tidwall/gjson v1.16.0 h1:SyXa+dsSPpUlcwEDuKuEBJEz5vzTvOea+9rjyYodQFg=
|
||||
github.com/tidwall/gjson v1.16.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
|
||||
@ -591,6 +595,7 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||
gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY=
|
||||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
@ -602,6 +607,7 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
|
||||
@ -76,7 +76,7 @@ func ExpiredSessionError() *HandlerError {
|
||||
// An optional debugContext map can be provided. If it is present and sentry is configured,
|
||||
// it is added as context to the sentry events generated for failed assertions.
|
||||
func Assert(msg string, expr bool, debugContext ...map[string]interface{}) {
|
||||
assert(msg, expr)
|
||||
assertCustom(msg, expr)
|
||||
if !expr {
|
||||
sentry.WithScope(func(scope *sentry.Scope) {
|
||||
if len(debugContext) > 0 {
|
||||
@ -90,13 +90,13 @@ func Assert(msg string, expr bool, debugContext ...map[string]interface{}) {
|
||||
// AssertWithContext is a version of Assert that associates any sentry events with a
|
||||
// request context.
|
||||
func AssertWithContext(ctx context.Context, msg string, expr bool) {
|
||||
assert(msg, expr)
|
||||
assertCustom(msg, expr)
|
||||
if !expr {
|
||||
GetSentryHubFromContextOrDefault(ctx).CaptureException(fmt.Errorf("assertion failed: %s", msg))
|
||||
}
|
||||
}
|
||||
|
||||
func assert(msg string, expr bool) {
|
||||
func assertCustom(msg string, expr bool) {
|
||||
if expr {
|
||||
return
|
||||
}
|
||||
|
||||
25
internal/home_server_url.go
Normal file
25
internal/home_server_url.go
Normal file
@ -0,0 +1,25 @@
|
||||
package internal
|
||||
|
||||
import "strings"
|
||||
|
||||
type HomeServerUrl struct {
|
||||
HttpOrUnixStr string
|
||||
}
|
||||
|
||||
func (u HomeServerUrl) IsUnixSocket() bool {
|
||||
return strings.HasPrefix(u.HttpOrUnixStr, "/")
|
||||
}
|
||||
|
||||
func (u HomeServerUrl) GetUnixSocket() string {
|
||||
if u.IsUnixSocket() {
|
||||
return u.HttpOrUnixStr
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (u HomeServerUrl) GetBaseUrl() string {
|
||||
if u.IsUnixSocket() {
|
||||
return "http://unix"
|
||||
}
|
||||
return u.HttpOrUnixStr
|
||||
}
|
||||
30
internal/home_server_url_test.go
Normal file
30
internal/home_server_url_test.go
Normal file
@ -0,0 +1,30 @@
|
||||
package internal
|
||||
|
||||
import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestHomeServerUrl_IsUnixSocket_True(t *testing.T) {
|
||||
assert.True(t, HomeServerUrl{"/path/to/socket"}.IsUnixSocket())
|
||||
}
|
||||
|
||||
func TestHomeServerUrl_IsUnixSocket_False(t *testing.T) {
|
||||
assert.False(t, HomeServerUrl{"localhost:8080"}.IsUnixSocket())
|
||||
}
|
||||
|
||||
func TestHomeServerUrl_GetUnixSocket(t *testing.T) {
|
||||
assert.Equal(t, "/path/to/socket", HomeServerUrl{"/path/to/socket"}.GetUnixSocket())
|
||||
}
|
||||
|
||||
func TestHomeServerUrl_GetUnixSocket_Http(t *testing.T) {
|
||||
assert.Equal(t, "", HomeServerUrl{"localhost:8080"}.GetUnixSocket())
|
||||
}
|
||||
|
||||
func TestHomeServerUrl_GetBaseUrl_UnixSocket(t *testing.T) {
|
||||
assert.Equal(t, "http://unix", HomeServerUrl{"/path/to/socket"}.GetBaseUrl())
|
||||
}
|
||||
|
||||
func TestHomeServerUrl_GetBaseUrl_Http(t *testing.T) {
|
||||
assert.Equal(t, "localhost:8080", HomeServerUrl{"localhost:8080"}.GetBaseUrl())
|
||||
}
|
||||
@ -4,11 +4,11 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/matrix-org/sliding-sync/internal"
|
||||
"io"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
|
||||
@ -41,24 +41,20 @@ type HTTPClient struct {
|
||||
}
|
||||
|
||||
func NewHTTPClient(shortTimeout, longTimeout time.Duration, destHomeServer string) *HTTPClient {
|
||||
baseUrl := destHomeServer
|
||||
if strings.HasPrefix(destHomeServer, "/") {
|
||||
baseUrl = "http://unix"
|
||||
}
|
||||
|
||||
hsUrl := internal.HomeServerUrl{HttpOrUnixStr: destHomeServer}
|
||||
return &HTTPClient{
|
||||
LongTimeoutClient: newClient(longTimeout, destHomeServer),
|
||||
Client: newClient(shortTimeout, destHomeServer),
|
||||
DestinationServer: baseUrl,
|
||||
LongTimeoutClient: newClient(longTimeout, hsUrl),
|
||||
Client: newClient(shortTimeout, hsUrl),
|
||||
DestinationServer: hsUrl.GetBaseUrl(),
|
||||
}
|
||||
}
|
||||
|
||||
func newClient(timeout time.Duration, destHomeServer string) *http.Client {
|
||||
func newClient(timeout time.Duration, url internal.HomeServerUrl) *http.Client {
|
||||
transport := http.DefaultTransport
|
||||
if strings.HasPrefix(destHomeServer, "/") {
|
||||
if url.IsUnixSocket() {
|
||||
transport = &http.Transport{
|
||||
DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
|
||||
return net.Dial("unix", destHomeServer)
|
||||
return net.Dial("unix", url.GetUnixSocket())
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user