mirror of
https://github.com/strukturag/nextcloud-spreed-signaling
synced 2024-05-18 13:36:34 +02:00
Add hello version "2.0" that authenticates connections using a JWT.
This commit is contained in:
parent
88e4c5f2c3
commit
156bc360ff
|
@ -40,6 +40,11 @@ const (
|
||||||
HeaderBackendSignalingRandom = "Spreed-Signaling-Random"
|
HeaderBackendSignalingRandom = "Spreed-Signaling-Random"
|
||||||
HeaderBackendSignalingChecksum = "Spreed-Signaling-Checksum"
|
HeaderBackendSignalingChecksum = "Spreed-Signaling-Checksum"
|
||||||
HeaderBackendServer = "Spreed-Signaling-Backend"
|
HeaderBackendServer = "Spreed-Signaling-Backend"
|
||||||
|
|
||||||
|
ConfigGroupSignaling = "signaling"
|
||||||
|
|
||||||
|
ConfigKeyHelloV2TokenKey = "hello-v2-token-key"
|
||||||
|
ConfigKeySessionPingLimit = "session-ping-limit"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newRandomString(length int) string {
|
func newRandomString(length int) string {
|
||||||
|
|
|
@ -142,7 +142,7 @@ type HelloProxyClientMessage struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *HelloProxyClientMessage) CheckValid() error {
|
func (m *HelloProxyClientMessage) CheckValid() error {
|
||||||
if m.Version != HelloVersion {
|
if m.Version != HelloVersionV1 {
|
||||||
return fmt.Errorf("unsupported hello version: %s", m.Version)
|
return fmt.Errorf("unsupported hello version: %s", m.Version)
|
||||||
}
|
}
|
||||||
if m.ResumeId == "" {
|
if m.ResumeId == "" {
|
||||||
|
|
|
@ -27,11 +27,16 @@ import (
|
||||||
"net/url"
|
"net/url"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v4"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
// Version that must be sent in a "hello" message.
|
// Version 1.0 validates auth params against the Nextcloud instance.
|
||||||
HelloVersion = "1.0"
|
HelloVersionV1 = "1.0"
|
||||||
|
|
||||||
|
// Version 2.0 validates auth params encoded as JWT.
|
||||||
|
HelloVersionV2 = "2.0"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ClientMessage is a message that is sent from a client to the server.
|
// ClientMessage is a message that is sent from a client to the server.
|
||||||
|
@ -325,6 +330,23 @@ func (p *ClientTypeInternalAuthParams) CheckValid() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type HelloV2AuthParams struct {
|
||||||
|
Token string `json:"token"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *HelloV2AuthParams) CheckValid() error {
|
||||||
|
if p.Token == "" {
|
||||||
|
return fmt.Errorf("token missing")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type HelloV2TokenClaims struct {
|
||||||
|
jwt.RegisteredClaims
|
||||||
|
|
||||||
|
UserData *json.RawMessage `json:"userdata,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
type HelloClientMessageAuth struct {
|
type HelloClientMessageAuth struct {
|
||||||
// The client type that is connecting. Leave empty to use the default
|
// The client type that is connecting. Leave empty to use the default
|
||||||
// "HelloClientTypeClient"
|
// "HelloClientTypeClient"
|
||||||
|
@ -336,6 +358,7 @@ type HelloClientMessageAuth struct {
|
||||||
parsedUrl *url.URL
|
parsedUrl *url.URL
|
||||||
|
|
||||||
internalParams ClientTypeInternalAuthParams
|
internalParams ClientTypeInternalAuthParams
|
||||||
|
helloV2Params HelloV2AuthParams
|
||||||
}
|
}
|
||||||
|
|
||||||
// Type "hello"
|
// Type "hello"
|
||||||
|
@ -352,8 +375,8 @@ type HelloClientMessage struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *HelloClientMessage) CheckValid() error {
|
func (m *HelloClientMessage) CheckValid() error {
|
||||||
if m.Version != HelloVersion {
|
if m.Version != HelloVersionV1 && m.Version != HelloVersionV2 {
|
||||||
return fmt.Errorf("unsupported hello version: %s", m.Version)
|
return InvalidHelloVersion
|
||||||
}
|
}
|
||||||
if m.ResumeId == "" {
|
if m.ResumeId == "" {
|
||||||
if m.Auth.Params == nil || len(*m.Auth.Params) == 0 {
|
if m.Auth.Params == nil || len(*m.Auth.Params) == 0 {
|
||||||
|
@ -375,6 +398,17 @@ func (m *HelloClientMessage) CheckValid() error {
|
||||||
|
|
||||||
m.Auth.parsedUrl = u
|
m.Auth.parsedUrl = u
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch m.Version {
|
||||||
|
case HelloVersionV1:
|
||||||
|
// No additional validation necessary.
|
||||||
|
case HelloVersionV2:
|
||||||
|
if err := json.Unmarshal(*m.Auth.Params, &m.Auth.helloV2Params); err != nil {
|
||||||
|
return err
|
||||||
|
} else if err := m.Auth.helloV2Params.CheckValid(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
case HelloClientTypeInternal:
|
case HelloClientTypeInternal:
|
||||||
if err := json.Unmarshal(*m.Auth.Params, &m.Auth.internalParams); err != nil {
|
if err := json.Unmarshal(*m.Auth.Params, &m.Auth.internalParams); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -90,16 +90,18 @@ func TestClientMessage(t *testing.T) {
|
||||||
|
|
||||||
func TestHelloClientMessage(t *testing.T) {
|
func TestHelloClientMessage(t *testing.T) {
|
||||||
internalAuthParams := []byte("{\"backend\":\"https://domain.invalid\"}")
|
internalAuthParams := []byte("{\"backend\":\"https://domain.invalid\"}")
|
||||||
|
tokenAuthParams := []byte("{\"token\":\"invalid-token\"}")
|
||||||
valid_messages := []testCheckValid{
|
valid_messages := []testCheckValid{
|
||||||
|
// Hello version 1
|
||||||
&HelloClientMessage{
|
&HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: HelloVersionV1,
|
||||||
Auth: HelloClientMessageAuth{
|
Auth: HelloClientMessageAuth{
|
||||||
Params: &json.RawMessage{'{', '}'},
|
Params: &json.RawMessage{'{', '}'},
|
||||||
Url: "https://domain.invalid",
|
Url: "https://domain.invalid",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
&HelloClientMessage{
|
&HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: HelloVersionV1,
|
||||||
Auth: HelloClientMessageAuth{
|
Auth: HelloClientMessageAuth{
|
||||||
Type: "client",
|
Type: "client",
|
||||||
Params: &json.RawMessage{'{', '}'},
|
Params: &json.RawMessage{'{', '}'},
|
||||||
|
@ -107,61 +109,116 @@ func TestHelloClientMessage(t *testing.T) {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
&HelloClientMessage{
|
&HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: HelloVersionV1,
|
||||||
Auth: HelloClientMessageAuth{
|
Auth: HelloClientMessageAuth{
|
||||||
Type: "internal",
|
Type: "internal",
|
||||||
Params: (*json.RawMessage)(&internalAuthParams),
|
Params: (*json.RawMessage)(&internalAuthParams),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
&HelloClientMessage{
|
&HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: HelloVersionV1,
|
||||||
|
ResumeId: "the-resume-id",
|
||||||
|
},
|
||||||
|
// Hello version 2
|
||||||
|
&HelloClientMessage{
|
||||||
|
Version: HelloVersionV2,
|
||||||
|
Auth: HelloClientMessageAuth{
|
||||||
|
Params: (*json.RawMessage)(&tokenAuthParams),
|
||||||
|
Url: "https://domain.invalid",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
&HelloClientMessage{
|
||||||
|
Version: HelloVersionV2,
|
||||||
|
Auth: HelloClientMessageAuth{
|
||||||
|
Type: "client",
|
||||||
|
Params: (*json.RawMessage)(&tokenAuthParams),
|
||||||
|
Url: "https://domain.invalid",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
&HelloClientMessage{
|
||||||
|
Version: HelloVersionV2,
|
||||||
ResumeId: "the-resume-id",
|
ResumeId: "the-resume-id",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
invalid_messages := []testCheckValid{
|
invalid_messages := []testCheckValid{
|
||||||
|
// Hello version 1
|
||||||
&HelloClientMessage{},
|
&HelloClientMessage{},
|
||||||
&HelloClientMessage{Version: "0.0"},
|
&HelloClientMessage{Version: "0.0"},
|
||||||
&HelloClientMessage{Version: HelloVersion},
|
&HelloClientMessage{Version: HelloVersionV1},
|
||||||
&HelloClientMessage{
|
&HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: HelloVersionV1,
|
||||||
Auth: HelloClientMessageAuth{
|
Auth: HelloClientMessageAuth{
|
||||||
Params: &json.RawMessage{'{', '}'},
|
Params: &json.RawMessage{'{', '}'},
|
||||||
Type: "invalid-type",
|
Type: "invalid-type",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
&HelloClientMessage{
|
&HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: HelloVersionV1,
|
||||||
Auth: HelloClientMessageAuth{
|
Auth: HelloClientMessageAuth{
|
||||||
Url: "https://domain.invalid",
|
Url: "https://domain.invalid",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
&HelloClientMessage{
|
&HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: HelloVersionV1,
|
||||||
Auth: HelloClientMessageAuth{
|
Auth: HelloClientMessageAuth{
|
||||||
Params: &json.RawMessage{'{', '}'},
|
Params: &json.RawMessage{'{', '}'},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
&HelloClientMessage{
|
&HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: HelloVersionV1,
|
||||||
Auth: HelloClientMessageAuth{
|
Auth: HelloClientMessageAuth{
|
||||||
Params: &json.RawMessage{'{', '}'},
|
Params: &json.RawMessage{'{', '}'},
|
||||||
Url: "invalid-url",
|
Url: "invalid-url",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
&HelloClientMessage{
|
&HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: HelloVersionV1,
|
||||||
Auth: HelloClientMessageAuth{
|
Auth: HelloClientMessageAuth{
|
||||||
Type: "internal",
|
Type: "internal",
|
||||||
Params: &json.RawMessage{'{', '}'},
|
Params: &json.RawMessage{'{', '}'},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
&HelloClientMessage{
|
&HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: HelloVersionV1,
|
||||||
Auth: HelloClientMessageAuth{
|
Auth: HelloClientMessageAuth{
|
||||||
Type: "internal",
|
Type: "internal",
|
||||||
Params: &json.RawMessage{'x', 'y', 'z'}, // Invalid JSON.
|
Params: &json.RawMessage{'x', 'y', 'z'}, // Invalid JSON.
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
// Hello version 2
|
||||||
|
&HelloClientMessage{
|
||||||
|
Version: HelloVersionV2,
|
||||||
|
Auth: HelloClientMessageAuth{
|
||||||
|
Url: "https://domain.invalid",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
&HelloClientMessage{
|
||||||
|
Version: HelloVersionV2,
|
||||||
|
Auth: HelloClientMessageAuth{
|
||||||
|
Params: (*json.RawMessage)(&tokenAuthParams),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
&HelloClientMessage{
|
||||||
|
Version: HelloVersionV2,
|
||||||
|
Auth: HelloClientMessageAuth{
|
||||||
|
Params: (*json.RawMessage)(&tokenAuthParams),
|
||||||
|
Url: "invalid-url",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
&HelloClientMessage{
|
||||||
|
Version: HelloVersionV2,
|
||||||
|
Auth: HelloClientMessageAuth{
|
||||||
|
Params: (*json.RawMessage)(&internalAuthParams),
|
||||||
|
Url: "https://domain.invalid",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
&HelloClientMessage{
|
||||||
|
Version: HelloVersionV2,
|
||||||
|
Auth: HelloClientMessageAuth{
|
||||||
|
Params: &json.RawMessage{'x', 'y', 'z'}, // Invalid JSON.
|
||||||
|
Url: "https://domain.invalid",
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
testMessages(t, "hello", valid_messages, invalid_messages)
|
testMessages(t, "hello", valid_messages, invalid_messages)
|
||||||
|
|
|
@ -603,7 +603,7 @@ func main() {
|
||||||
request := &signaling.ClientMessage{
|
request := &signaling.ClientMessage{
|
||||||
Type: "hello",
|
Type: "hello",
|
||||||
Hello: &signaling.HelloClientMessage{
|
Hello: &signaling.HelloClientMessage{
|
||||||
Version: signaling.HelloVersion,
|
Version: signaling.HelloVersionV1,
|
||||||
Auth: signaling.HelloClientMessageAuth{
|
Auth: signaling.HelloClientMessageAuth{
|
||||||
Url: backendUrl + "/auth",
|
Url: backendUrl + "/auth",
|
||||||
Params: &json.RawMessage{'{', '}'},
|
Params: &json.RawMessage{'{', '}'},
|
||||||
|
|
|
@ -238,7 +238,7 @@ func TestBandwidth_Backend(t *testing.T) {
|
||||||
params := TestBackendClientAuthParams{
|
params := TestBackendClientAuthParams{
|
||||||
UserId: testDefaultUserId,
|
UserId: testDefaultUserId,
|
||||||
}
|
}
|
||||||
if err := client.SendHelloParams(server.URL+"/one", "client", params); err != nil {
|
if err := client.SendHelloParams(server.URL+"/one", HelloVersionV1, "client", params); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
160
hub.go
160
hub.go
|
@ -40,20 +40,24 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/dlintw/goconf"
|
"github.com/dlintw/goconf"
|
||||||
|
"github.com/golang-jwt/jwt/v4"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/gorilla/securecookie"
|
"github.com/gorilla/securecookie"
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
DuplicateClient = NewError("duplicate_client", "Client already registered.")
|
DuplicateClient = NewError("duplicate_client", "Client already registered.")
|
||||||
HelloExpected = NewError("hello_expected", "Expected Hello request.")
|
HelloExpected = NewError("hello_expected", "Expected Hello request.")
|
||||||
UserAuthFailed = NewError("auth_failed", "The user could not be authenticated.")
|
InvalidHelloVersion = NewError("invalid_hello_version", "The hello version is not supported.")
|
||||||
RoomJoinFailed = NewError("room_join_failed", "Could not join the room.")
|
UserAuthFailed = NewError("auth_failed", "The user could not be authenticated.")
|
||||||
InvalidClientType = NewError("invalid_client_type", "The client type is not supported.")
|
RoomJoinFailed = NewError("room_join_failed", "Could not join the room.")
|
||||||
InvalidBackendUrl = NewError("invalid_backend", "The backend URL is not supported.")
|
InvalidClientType = NewError("invalid_client_type", "The client type is not supported.")
|
||||||
InvalidToken = NewError("invalid_token", "The passed token is invalid.")
|
InvalidBackendUrl = NewError("invalid_backend", "The backend URL is not supported.")
|
||||||
NoSuchSession = NewError("no_such_session", "The session to resume does not exist.")
|
InvalidToken = NewError("invalid_token", "The passed token is invalid.")
|
||||||
|
NoSuchSession = NewError("no_such_session", "The session to resume does not exist.")
|
||||||
|
TokenNotValidYet = NewError("token_not_valid_yet", "The token is not valid yet.")
|
||||||
|
TokenExpired = NewError("token_expired", "The token is expired.")
|
||||||
|
|
||||||
// Maximum number of concurrent requests to a backend.
|
// Maximum number of concurrent requests to a backend.
|
||||||
defaultMaxConcurrentRequestsPerHost = 8
|
defaultMaxConcurrentRequestsPerHost = 8
|
||||||
|
@ -850,10 +854,18 @@ func (h *Hub) processMessage(client *Client, data []byte) {
|
||||||
if err := message.CheckValid(); err != nil {
|
if err := message.CheckValid(); err != nil {
|
||||||
if session := client.GetSession(); session != nil {
|
if session := client.GetSession(); session != nil {
|
||||||
log.Printf("Invalid message %+v from client %s: %v", message, session.PublicId(), err)
|
log.Printf("Invalid message %+v from client %s: %v", message, session.PublicId(), err)
|
||||||
session.SendMessage(message.NewErrorServerMessage(InvalidFormat))
|
if err, ok := err.(*Error); ok {
|
||||||
|
session.SendMessage(message.NewErrorServerMessage(err))
|
||||||
|
} else {
|
||||||
|
session.SendMessage(message.NewErrorServerMessage(InvalidFormat))
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
log.Printf("Invalid message %+v from %s: %v", message, client.RemoteAddr(), err)
|
log.Printf("Invalid message %+v from %s: %v", message, client.RemoteAddr(), err)
|
||||||
client.SendMessage(message.NewErrorServerMessage(InvalidFormat))
|
if err, ok := err.(*Error); ok {
|
||||||
|
client.SendMessage(message.NewErrorServerMessage(err))
|
||||||
|
} else {
|
||||||
|
client.SendMessage(message.NewErrorServerMessage(InvalidFormat))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -896,7 +908,7 @@ func (h *Hub) sendHelloResponse(session *ClientSession, message *ClientMessage)
|
||||||
Id: message.Id,
|
Id: message.Id,
|
||||||
Type: "hello",
|
Type: "hello",
|
||||||
Hello: &HelloServerMessage{
|
Hello: &HelloServerMessage{
|
||||||
Version: HelloVersion,
|
Version: message.Hello.Version,
|
||||||
SessionId: session.PublicId(),
|
SessionId: session.PublicId(),
|
||||||
ResumeId: session.PrivateId(),
|
ResumeId: session.PrivateId(),
|
||||||
UserId: session.UserId(),
|
UserId: session.UserId(),
|
||||||
|
@ -975,31 +987,137 @@ func (h *Hub) processHello(client *Client, message *ClientMessage) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Hub) processHelloClient(client *Client, message *ClientMessage) {
|
func (h *Hub) processHelloV1(client *Client, message *ClientMessage) (*Backend, *BackendClientResponse, error) {
|
||||||
// Make sure the client must send another "hello" in case of errors.
|
|
||||||
defer h.startExpectHello(client)
|
|
||||||
|
|
||||||
url := message.Hello.Auth.parsedUrl
|
url := message.Hello.Auth.parsedUrl
|
||||||
backend := h.backend.GetBackend(url)
|
backend := h.backend.GetBackend(url)
|
||||||
if backend == nil {
|
if backend == nil {
|
||||||
client.SendMessage(message.NewErrorServerMessage(InvalidBackendUrl))
|
return nil, nil, InvalidBackendUrl
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Run in timeout context to prevent blocking too long.
|
// Run in timeout context to prevent blocking too long.
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), h.backendTimeout)
|
ctx, cancel := context.WithTimeout(context.Background(), h.backendTimeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
request := NewBackendClientAuthRequest(message.Hello.Auth.Params)
|
|
||||||
var auth BackendClientResponse
|
var auth BackendClientResponse
|
||||||
|
request := NewBackendClientAuthRequest(message.Hello.Auth.Params)
|
||||||
if err := h.backend.PerformJSONRequest(ctx, url, request, &auth); err != nil {
|
if err := h.backend.PerformJSONRequest(ctx, url, request, &auth); err != nil {
|
||||||
client.SendMessage(message.NewWrappedErrorServerMessage(err))
|
return nil, nil, err
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(jojo): Validate response
|
// TODO(jojo): Validate response
|
||||||
|
|
||||||
h.processRegister(client, message, backend, &auth)
|
return backend, &auth, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Hub) processHelloV2(client *Client, message *ClientMessage) (*Backend, *BackendClientResponse, error) {
|
||||||
|
url := message.Hello.Auth.parsedUrl
|
||||||
|
backend := h.backend.GetBackend(url)
|
||||||
|
if backend == nil {
|
||||||
|
return nil, nil, InvalidBackendUrl
|
||||||
|
}
|
||||||
|
|
||||||
|
token, err := jwt.ParseWithClaims(message.Hello.Auth.helloV2Params.Token, &HelloV2TokenClaims{}, func(token *jwt.Token) (interface{}, error) {
|
||||||
|
// Only public-private-key algorithms are supported.
|
||||||
|
var loadKeyFunc func([]byte) (interface{}, error)
|
||||||
|
switch token.Method.(type) {
|
||||||
|
case *jwt.SigningMethodRSA:
|
||||||
|
loadKeyFunc = func(data []byte) (interface{}, error) {
|
||||||
|
return jwt.ParseRSAPublicKeyFromPEM(data)
|
||||||
|
}
|
||||||
|
case *jwt.SigningMethodECDSA:
|
||||||
|
loadKeyFunc = func(data []byte) (interface{}, error) {
|
||||||
|
return jwt.ParseECPublicKeyFromPEM(data)
|
||||||
|
}
|
||||||
|
case *jwt.SigningMethodEd25519:
|
||||||
|
loadKeyFunc = func(data []byte) (interface{}, error) {
|
||||||
|
return jwt.ParseEdPublicKeyFromPEM(data)
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
log.Printf("Unexpected signing method: %v", token.Header["alg"])
|
||||||
|
return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"])
|
||||||
|
}
|
||||||
|
|
||||||
|
// Run in timeout context to prevent blocking too long.
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), h.backendTimeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
keyData, found := h.backend.capabilities.GetStringConfig(ctx, url, ConfigGroupSignaling, ConfigKeyHelloV2TokenKey)
|
||||||
|
if !found {
|
||||||
|
return nil, fmt.Errorf("No key found for issuer")
|
||||||
|
}
|
||||||
|
|
||||||
|
key, err := loadKeyFunc([]byte(keyData))
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("Could not parse token key: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return key, nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
if err, ok := err.(*jwt.ValidationError); ok {
|
||||||
|
if err.Errors&jwt.ValidationErrorIssuedAt == jwt.ValidationErrorIssuedAt {
|
||||||
|
return nil, nil, TokenNotValidYet
|
||||||
|
}
|
||||||
|
if err.Errors&jwt.ValidationErrorExpired == jwt.ValidationErrorExpired {
|
||||||
|
return nil, nil, TokenExpired
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, nil, InvalidToken
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, ok := token.Claims.(*HelloV2TokenClaims)
|
||||||
|
if !ok || !token.Valid {
|
||||||
|
return nil, nil, InvalidToken
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
if !claims.VerifyIssuedAt(now, true) {
|
||||||
|
return nil, nil, TokenNotValidYet
|
||||||
|
}
|
||||||
|
if !claims.VerifyExpiresAt(now, true) {
|
||||||
|
return nil, nil, TokenExpired
|
||||||
|
}
|
||||||
|
|
||||||
|
auth := &BackendClientResponse{
|
||||||
|
Type: "auth",
|
||||||
|
Auth: &BackendClientAuthResponse{
|
||||||
|
Version: message.Hello.Version,
|
||||||
|
UserId: claims.Subject,
|
||||||
|
User: claims.UserData,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
return backend, auth, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Hub) processHelloClient(client *Client, message *ClientMessage) {
|
||||||
|
// Make sure the client must send another "hello" in case of errors.
|
||||||
|
defer h.startExpectHello(client)
|
||||||
|
|
||||||
|
var authFunc func(*Client, *ClientMessage) (*Backend, *BackendClientResponse, error)
|
||||||
|
switch message.Hello.Version {
|
||||||
|
case HelloVersionV1:
|
||||||
|
// Auth information contains a ticket that must be validated against the
|
||||||
|
// Nextcloud instance.
|
||||||
|
authFunc = h.processHelloV1
|
||||||
|
case HelloVersionV2:
|
||||||
|
// Auth information contains a JWT that contains all information of the user.
|
||||||
|
authFunc = h.processHelloV2
|
||||||
|
default:
|
||||||
|
client.SendMessage(message.NewErrorServerMessage(InvalidHelloVersion))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
backend, auth, err := authFunc(client, message)
|
||||||
|
if err != nil {
|
||||||
|
if e, ok := err.(*Error); ok {
|
||||||
|
client.SendMessage(message.NewErrorServerMessage(e))
|
||||||
|
} else {
|
||||||
|
client.SendMessage(message.NewWrappedErrorServerMessage(err))
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
h.processRegister(client, message, backend, auth)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Hub) processHelloInternal(client *Client, message *ClientMessage) {
|
func (h *Hub) processHelloInternal(client *Client, message *ClientMessage) {
|
||||||
|
|
383
hub_test.go
383
hub_test.go
|
@ -23,12 +23,21 @@ package signaling
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/ecdsa"
|
||||||
|
"crypto/ed25519"
|
||||||
|
"crypto/elliptic"
|
||||||
|
"crypto/rand"
|
||||||
|
"crypto/rsa"
|
||||||
|
"crypto/x509"
|
||||||
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"encoding/pem"
|
||||||
"errors"
|
"errors"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"os"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
@ -37,6 +46,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/dlintw/goconf"
|
"github.com/dlintw/goconf"
|
||||||
|
"github.com/golang-jwt/jwt/v4"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
)
|
)
|
||||||
|
@ -53,6 +63,12 @@ var (
|
||||||
"local",
|
"local",
|
||||||
"clustered",
|
"clustered",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
testHelloV2Algorithms = []string{
|
||||||
|
"RSA",
|
||||||
|
"ECDSA",
|
||||||
|
"Ed25519",
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
// Only used for testing.
|
// Only used for testing.
|
||||||
|
@ -511,6 +527,131 @@ func processPingRequest(t *testing.T, w http.ResponseWriter, r *http.Request, re
|
||||||
return response
|
return response
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ensureAuthTokens(t *testing.T) (string, string) {
|
||||||
|
if privateKey := os.Getenv("PRIVATE_AUTH_TOKEN_" + t.Name()); privateKey != "" {
|
||||||
|
publicKey := os.Getenv("PUBLIC_AUTH_TOKEN_" + t.Name())
|
||||||
|
if publicKey == "" {
|
||||||
|
// should not happen, always both keys are created
|
||||||
|
t.Fatal("public key is empty")
|
||||||
|
}
|
||||||
|
return privateKey, publicKey
|
||||||
|
}
|
||||||
|
|
||||||
|
var private []byte
|
||||||
|
var public []byte
|
||||||
|
|
||||||
|
if strings.Contains(t.Name(), "ECDSA") {
|
||||||
|
key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
private, err = x509.MarshalECPrivateKey(key)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
private = pem.EncodeToMemory(&pem.Block{
|
||||||
|
Type: "ECDSA PRIVATE KEY",
|
||||||
|
Bytes: private,
|
||||||
|
})
|
||||||
|
|
||||||
|
public, err = x509.MarshalPKIXPublicKey(&key.PublicKey)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
public = pem.EncodeToMemory(&pem.Block{
|
||||||
|
Type: "ECDSA PUBLIC KEY",
|
||||||
|
Bytes: public,
|
||||||
|
})
|
||||||
|
} else if strings.Contains(t.Name(), "Ed25519") {
|
||||||
|
publicKey, privateKey, err := ed25519.GenerateKey(rand.Reader)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
private, err = x509.MarshalPKCS8PrivateKey(privateKey)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
private = pem.EncodeToMemory(&pem.Block{
|
||||||
|
Type: "Ed25519 PRIVATE KEY",
|
||||||
|
Bytes: private,
|
||||||
|
})
|
||||||
|
|
||||||
|
public, err = x509.MarshalPKIXPublicKey(publicKey)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
public = pem.EncodeToMemory(&pem.Block{
|
||||||
|
Type: "Ed25519 PUBLIC KEY",
|
||||||
|
Bytes: public,
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
key, err := rsa.GenerateKey(rand.Reader, 1024)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
private = pem.EncodeToMemory(&pem.Block{
|
||||||
|
Type: "RSA PRIVATE KEY",
|
||||||
|
Bytes: x509.MarshalPKCS1PrivateKey(key),
|
||||||
|
})
|
||||||
|
|
||||||
|
public, err = x509.MarshalPKIXPublicKey(&key.PublicKey)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
public = pem.EncodeToMemory(&pem.Block{
|
||||||
|
Type: "RSA PUBLIC KEY",
|
||||||
|
Bytes: public,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
privateKey := base64.StdEncoding.EncodeToString(private)
|
||||||
|
t.Setenv("PRIVATE_AUTH_TOKEN_"+t.Name(), privateKey)
|
||||||
|
publicKey := base64.StdEncoding.EncodeToString(public)
|
||||||
|
t.Setenv("PUBLIC_AUTH_TOKEN_"+t.Name(), publicKey)
|
||||||
|
return privateKey, publicKey
|
||||||
|
}
|
||||||
|
|
||||||
|
func getPrivateAuthToken(t *testing.T) (key interface{}) {
|
||||||
|
private, _ := ensureAuthTokens(t)
|
||||||
|
data, err := base64.StdEncoding.DecodeString(private)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if strings.Contains(t.Name(), "ECDSA") {
|
||||||
|
key, err = jwt.ParseECPrivateKeyFromPEM(data)
|
||||||
|
} else if strings.Contains(t.Name(), "Ed25519") {
|
||||||
|
key, err = jwt.ParseEdPrivateKeyFromPEM(data)
|
||||||
|
} else {
|
||||||
|
key, err = jwt.ParseRSAPrivateKeyFromPEM(data)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
return key
|
||||||
|
}
|
||||||
|
|
||||||
|
func getPublicAuthToken(t *testing.T) (key interface{}) {
|
||||||
|
_, public := ensureAuthTokens(t)
|
||||||
|
data, err := base64.StdEncoding.DecodeString(public)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if strings.Contains(t.Name(), "ECDSA") {
|
||||||
|
key, err = jwt.ParseECPublicKeyFromPEM(data)
|
||||||
|
} else if strings.Contains(t.Name(), "Ed25519") {
|
||||||
|
key, err = jwt.ParseEdPublicKeyFromPEM(data)
|
||||||
|
} else {
|
||||||
|
key, err = jwt.ParseRSAPublicKeyFromPEM(data)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
return key
|
||||||
|
}
|
||||||
|
|
||||||
func registerBackendHandler(t *testing.T, router *mux.Router) {
|
func registerBackendHandler(t *testing.T, router *mux.Router) {
|
||||||
registerBackendHandlerUrl(t, router, "/")
|
registerBackendHandlerUrl(t, router, "/")
|
||||||
}
|
}
|
||||||
|
@ -555,6 +696,27 @@ func registerBackendHandlerUrl(t *testing.T, router *mux.Router, url string) {
|
||||||
if strings.Contains(t.Name(), "MultiRoom") {
|
if strings.Contains(t.Name(), "MultiRoom") {
|
||||||
signaling[ConfigKeySessionPingLimit] = 2
|
signaling[ConfigKeySessionPingLimit] = 2
|
||||||
}
|
}
|
||||||
|
if strings.Contains(t.Name(), "V2") {
|
||||||
|
key := getPublicAuthToken(t)
|
||||||
|
public, err := x509.MarshalPKIXPublicKey(key)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var pemType string
|
||||||
|
if strings.Contains(t.Name(), "ECDSA") {
|
||||||
|
pemType = "ECDSA PUBLIC KEY"
|
||||||
|
} else if strings.Contains(t.Name(), "Ed25519") {
|
||||||
|
pemType = "Ed25519 PUBLIC KEY"
|
||||||
|
} else {
|
||||||
|
pemType = "RSA PUBLIC KEY"
|
||||||
|
}
|
||||||
|
|
||||||
|
public = pem.EncodeToMemory(&pem.Block{
|
||||||
|
Type: pemType,
|
||||||
|
Bytes: public,
|
||||||
|
})
|
||||||
|
signaling[ConfigKeyHelloV2TokenKey] = string(public)
|
||||||
|
}
|
||||||
spreedCapa, _ := json.Marshal(map[string]interface{}{
|
spreedCapa, _ := json.Marshal(map[string]interface{}{
|
||||||
"features": features,
|
"features": features,
|
||||||
"config": config,
|
"config": config,
|
||||||
|
@ -665,7 +827,35 @@ func TestExpectClientHello(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestClientHello(t *testing.T) {
|
func TestExpectClientHelloUnsupportedVersion(t *testing.T) {
|
||||||
|
hub, _, _, server := CreateHubForTest(t)
|
||||||
|
|
||||||
|
client := NewTestClient(t, server, hub)
|
||||||
|
defer client.CloseWithBye()
|
||||||
|
|
||||||
|
params := TestBackendClientAuthParams{
|
||||||
|
UserId: testDefaultUserId,
|
||||||
|
}
|
||||||
|
if err := client.SendHelloParams(server.URL, "0.0", "", params); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
message, err := client.RunUntilMessage(ctx)
|
||||||
|
if err := checkUnexpectedClose(err); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := checkMessageType(message, "error"); err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
} else if message.Error.Code != "invalid_hello_version" {
|
||||||
|
t.Errorf("Expected \"invalid_hello_version\" reason, got %+v", message.Error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestClientHelloV1(t *testing.T) {
|
||||||
hub, _, _, server := CreateHubForTest(t)
|
hub, _, _, server := CreateHubForTest(t)
|
||||||
|
|
||||||
client := NewTestClient(t, server, hub)
|
client := NewTestClient(t, server, hub)
|
||||||
|
@ -690,6 +880,179 @@ func TestClientHello(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestClientHelloV2(t *testing.T) {
|
||||||
|
for _, algo := range testHelloV2Algorithms {
|
||||||
|
t.Run(algo, func(t *testing.T) {
|
||||||
|
hub, _, _, server := CreateHubForTest(t)
|
||||||
|
|
||||||
|
client := NewTestClient(t, server, hub)
|
||||||
|
defer client.CloseWithBye()
|
||||||
|
|
||||||
|
if err := client.SendHelloV2(testDefaultUserId); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
hello, err := client.RunUntilHello(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if hello.Hello.UserId != testDefaultUserId {
|
||||||
|
t.Errorf("Expected \"%s\", got %+v", testDefaultUserId, hello.Hello)
|
||||||
|
}
|
||||||
|
if hello.Hello.SessionId == "" {
|
||||||
|
t.Errorf("Expected session id, got %+v", hello.Hello)
|
||||||
|
}
|
||||||
|
|
||||||
|
data := hub.decodeSessionId(hello.Hello.SessionId, publicSessionName)
|
||||||
|
if data == nil {
|
||||||
|
t.Fatalf("Could not decode session id: %s", hello.Hello.SessionId)
|
||||||
|
}
|
||||||
|
|
||||||
|
hub.mu.RLock()
|
||||||
|
session := hub.sessions[data.Sid]
|
||||||
|
hub.mu.RUnlock()
|
||||||
|
if session == nil {
|
||||||
|
t.Fatalf("Could not get session for id %+v", data)
|
||||||
|
}
|
||||||
|
|
||||||
|
var userdata map[string]string
|
||||||
|
if err := json.Unmarshal(*session.UserData(), &userdata); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if expected := "Displayname " + testDefaultUserId; userdata["displayname"] != expected {
|
||||||
|
t.Errorf("Expected displayname %s, got %s", expected, userdata["displayname"])
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestClientHelloV2_IssuedInFuture(t *testing.T) {
|
||||||
|
for _, algo := range testHelloV2Algorithms {
|
||||||
|
t.Run(algo, func(t *testing.T) {
|
||||||
|
hub, _, _, server := CreateHubForTest(t)
|
||||||
|
|
||||||
|
client := NewTestClient(t, server, hub)
|
||||||
|
defer client.CloseWithBye()
|
||||||
|
|
||||||
|
issuedAt := time.Now().Add(time.Minute)
|
||||||
|
expiresAt := issuedAt.Add(time.Second)
|
||||||
|
if err := client.SendHelloV2WithTimes(testDefaultUserId, issuedAt, expiresAt); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
message, err := client.RunUntilMessage(ctx)
|
||||||
|
if err := checkUnexpectedClose(err); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := checkMessageType(message, "error"); err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
} else if message.Error.Code != "token_not_valid_yet" {
|
||||||
|
t.Errorf("Expected \"token_not_valid_yet\" reason, got %+v", message.Error)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestClientHelloV2_Expired(t *testing.T) {
|
||||||
|
for _, algo := range testHelloV2Algorithms {
|
||||||
|
t.Run(algo, func(t *testing.T) {
|
||||||
|
hub, _, _, server := CreateHubForTest(t)
|
||||||
|
|
||||||
|
client := NewTestClient(t, server, hub)
|
||||||
|
defer client.CloseWithBye()
|
||||||
|
|
||||||
|
issuedAt := time.Now().Add(-time.Minute)
|
||||||
|
if err := client.SendHelloV2WithTimes(testDefaultUserId, issuedAt, issuedAt.Add(time.Second)); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
message, err := client.RunUntilMessage(ctx)
|
||||||
|
if err := checkUnexpectedClose(err); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := checkMessageType(message, "error"); err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
} else if message.Error.Code != "token_expired" {
|
||||||
|
t.Errorf("Expected \"token_expired\" reason, got %+v", message.Error)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestClientHelloV2_IssuedAtMissing(t *testing.T) {
|
||||||
|
for _, algo := range testHelloV2Algorithms {
|
||||||
|
t.Run(algo, func(t *testing.T) {
|
||||||
|
hub, _, _, server := CreateHubForTest(t)
|
||||||
|
|
||||||
|
client := NewTestClient(t, server, hub)
|
||||||
|
defer client.CloseWithBye()
|
||||||
|
|
||||||
|
var issuedAt time.Time
|
||||||
|
expiresAt := time.Now().Add(time.Minute)
|
||||||
|
if err := client.SendHelloV2WithTimes(testDefaultUserId, issuedAt, expiresAt); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
message, err := client.RunUntilMessage(ctx)
|
||||||
|
if err := checkUnexpectedClose(err); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := checkMessageType(message, "error"); err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
} else if message.Error.Code != "token_not_valid_yet" {
|
||||||
|
t.Errorf("Expected \"token_not_valid_yet\" reason, got %+v", message.Error)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestClientHelloV2_ExpiresAtMissing(t *testing.T) {
|
||||||
|
for _, algo := range testHelloV2Algorithms {
|
||||||
|
t.Run(algo, func(t *testing.T) {
|
||||||
|
hub, _, _, server := CreateHubForTest(t)
|
||||||
|
|
||||||
|
client := NewTestClient(t, server, hub)
|
||||||
|
defer client.CloseWithBye()
|
||||||
|
|
||||||
|
issuedAt := time.Now().Add(-time.Minute)
|
||||||
|
var expiresAt time.Time
|
||||||
|
if err := client.SendHelloV2WithTimes(testDefaultUserId, issuedAt, expiresAt); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
message, err := client.RunUntilMessage(ctx)
|
||||||
|
if err := checkUnexpectedClose(err); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := checkMessageType(message, "error"); err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
} else if message.Error.Code != "token_expired" {
|
||||||
|
t.Errorf("Expected \"token_expired\" reason, got %+v", message.Error)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestClientHelloWithSpaces(t *testing.T) {
|
func TestClientHelloWithSpaces(t *testing.T) {
|
||||||
hub, _, _, server := CreateHubForTest(t)
|
hub, _, _, server := CreateHubForTest(t)
|
||||||
|
|
||||||
|
@ -826,7 +1189,7 @@ func TestClientHelloSessionLimit(t *testing.T) {
|
||||||
params1 := TestBackendClientAuthParams{
|
params1 := TestBackendClientAuthParams{
|
||||||
UserId: testDefaultUserId,
|
UserId: testDefaultUserId,
|
||||||
}
|
}
|
||||||
if err := client.SendHelloParams(server1.URL+"/one", "client", params1); err != nil {
|
if err := client.SendHelloParams(server1.URL+"/one", HelloVersionV1, "client", params1); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -851,7 +1214,7 @@ func TestClientHelloSessionLimit(t *testing.T) {
|
||||||
params2 := TestBackendClientAuthParams{
|
params2 := TestBackendClientAuthParams{
|
||||||
UserId: testDefaultUserId + "2",
|
UserId: testDefaultUserId + "2",
|
||||||
}
|
}
|
||||||
if err := client2.SendHelloParams(server1.URL+"/one", "client", params2); err != nil {
|
if err := client2.SendHelloParams(server1.URL+"/one", HelloVersionV1, "client", params2); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -867,7 +1230,7 @@ func TestClientHelloSessionLimit(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// The client can connect to a different backend.
|
// The client can connect to a different backend.
|
||||||
if err := client2.SendHelloParams(server1.URL+"/two", "client", params2); err != nil {
|
if err := client2.SendHelloParams(server1.URL+"/two", HelloVersionV1, "client", params2); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -894,7 +1257,7 @@ func TestClientHelloSessionLimit(t *testing.T) {
|
||||||
params3 := TestBackendClientAuthParams{
|
params3 := TestBackendClientAuthParams{
|
||||||
UserId: testDefaultUserId + "3",
|
UserId: testDefaultUserId + "3",
|
||||||
}
|
}
|
||||||
if err := client3.SendHelloParams(server1.URL+"/one", "client", params3); err != nil {
|
if err := client3.SendHelloParams(server1.URL+"/one", HelloVersionV1, "client", params3); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1498,7 +1861,7 @@ func TestClientHelloClient_V3Api(t *testing.T) {
|
||||||
}
|
}
|
||||||
// The "/api/v1/signaling/" URL will be changed to use "v3" as the "signaling-v3"
|
// The "/api/v1/signaling/" URL will be changed to use "v3" as the "signaling-v3"
|
||||||
// feature is returned by the capabilities endpoint.
|
// feature is returned by the capabilities endpoint.
|
||||||
if err := client.SendHelloParams(server.URL+"/ocs/v2.php/apps/spreed/api/v1/signaling/backend", "client", params); err != nil {
|
if err := client.SendHelloParams(server.URL+"/ocs/v2.php/apps/spreed/api/v1/signaling/backend", HelloVersionV1, "client", params); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3841,7 +4204,7 @@ func TestNoSendBetweenSessionsOnDifferentBackends(t *testing.T) {
|
||||||
params1 := TestBackendClientAuthParams{
|
params1 := TestBackendClientAuthParams{
|
||||||
UserId: "user1",
|
UserId: "user1",
|
||||||
}
|
}
|
||||||
if err := client1.SendHelloParams(server.URL+"/one", "client", params1); err != nil {
|
if err := client1.SendHelloParams(server.URL+"/one", HelloVersionV1, "client", params1); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
hello1, err := client1.RunUntilHello(ctx)
|
hello1, err := client1.RunUntilHello(ctx)
|
||||||
|
@ -3855,7 +4218,7 @@ func TestNoSendBetweenSessionsOnDifferentBackends(t *testing.T) {
|
||||||
params2 := TestBackendClientAuthParams{
|
params2 := TestBackendClientAuthParams{
|
||||||
UserId: "user2",
|
UserId: "user2",
|
||||||
}
|
}
|
||||||
if err := client2.SendHelloParams(server.URL+"/two", "client", params2); err != nil {
|
if err := client2.SendHelloParams(server.URL+"/two", HelloVersionV1, "client", params2); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
hello2, err := client2.RunUntilHello(ctx)
|
hello2, err := client2.RunUntilHello(ctx)
|
||||||
|
@ -3911,7 +4274,7 @@ func TestNoSameRoomOnDifferentBackends(t *testing.T) {
|
||||||
params1 := TestBackendClientAuthParams{
|
params1 := TestBackendClientAuthParams{
|
||||||
UserId: "user1",
|
UserId: "user1",
|
||||||
}
|
}
|
||||||
if err := client1.SendHelloParams(server.URL+"/one", "client", params1); err != nil {
|
if err := client1.SendHelloParams(server.URL+"/one", HelloVersionV1, "client", params1); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
hello1, err := client1.RunUntilHello(ctx)
|
hello1, err := client1.RunUntilHello(ctx)
|
||||||
|
@ -3925,7 +4288,7 @@ func TestNoSameRoomOnDifferentBackends(t *testing.T) {
|
||||||
params2 := TestBackendClientAuthParams{
|
params2 := TestBackendClientAuthParams{
|
||||||
UserId: "user2",
|
UserId: "user2",
|
||||||
}
|
}
|
||||||
if err := client2.SendHelloParams(server.URL+"/two", "client", params2); err != nil {
|
if err := client2.SendHelloParams(server.URL+"/two", HelloVersionV1, "client", params2); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
hello2, err := client2.RunUntilHello(ctx)
|
hello2, err := client2.RunUntilHello(ctx)
|
||||||
|
|
|
@ -589,7 +589,7 @@ func (s *ProxyServer) processMessage(client *ProxyClient, data []byte) {
|
||||||
Id: message.Id,
|
Id: message.Id,
|
||||||
Type: "hello",
|
Type: "hello",
|
||||||
Hello: &signaling.HelloProxyServerMessage{
|
Hello: &signaling.HelloProxyServerMessage{
|
||||||
Version: signaling.HelloVersion,
|
Version: signaling.HelloVersionV1,
|
||||||
SessionId: session.PublicId(),
|
SessionId: session.PublicId(),
|
||||||
Server: &signaling.WelcomeServerMessage{
|
Server: &signaling.WelcomeServerMessage{
|
||||||
Version: s.version,
|
Version: s.version,
|
||||||
|
|
|
@ -29,11 +29,6 @@ import (
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
|
||||||
ConfigGroupSignaling = "signaling"
|
|
||||||
ConfigKeySessionPingLimit = "session-ping-limit"
|
|
||||||
)
|
|
||||||
|
|
||||||
type pingEntries struct {
|
type pingEntries struct {
|
||||||
url *url.URL
|
url *url.URL
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/golang-jwt/jwt/v4"
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -359,11 +360,14 @@ func (c *TestClient) WaitForSessionRemoved(ctx context.Context, sessionId string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *TestClient) WriteJSON(data interface{}) error {
|
func (c *TestClient) WriteJSON(data interface{}) error {
|
||||||
if msg, ok := data.(*ClientMessage); ok {
|
if !strings.Contains(c.t.Name(), "HelloUnsupportedVersion") {
|
||||||
if err := msg.CheckValid(); err != nil {
|
if msg, ok := data.(*ClientMessage); ok {
|
||||||
return err
|
if err := msg.CheckValid(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return c.conn.WriteJSON(data)
|
return c.conn.WriteJSON(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -374,10 +378,63 @@ func (c *TestClient) EnsuerWriteJSON(data interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *TestClient) SendHello(userid string) error {
|
func (c *TestClient) SendHello(userid string) error {
|
||||||
|
return c.SendHelloV1(userid)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *TestClient) SendHelloV1(userid string) error {
|
||||||
params := TestBackendClientAuthParams{
|
params := TestBackendClientAuthParams{
|
||||||
UserId: userid,
|
UserId: userid,
|
||||||
}
|
}
|
||||||
return c.SendHelloParams(c.server.URL, "", params)
|
return c.SendHelloParams(c.server.URL, HelloVersionV1, "", params)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *TestClient) SendHelloV2(userid string) error {
|
||||||
|
now := time.Now()
|
||||||
|
return c.SendHelloV2WithTimes(userid, now, now.Add(time.Minute))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *TestClient) SendHelloV2WithTimes(userid string, issuedAt time.Time, expiresAt time.Time) error {
|
||||||
|
userdata := map[string]string{
|
||||||
|
"displayname": "Displayname " + userid,
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := json.Marshal(userdata)
|
||||||
|
if err != nil {
|
||||||
|
c.t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
claims := &HelloV2TokenClaims{
|
||||||
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
|
Issuer: c.server.URL,
|
||||||
|
Subject: userid,
|
||||||
|
},
|
||||||
|
UserData: (*json.RawMessage)(&data),
|
||||||
|
}
|
||||||
|
if !issuedAt.IsZero() {
|
||||||
|
claims.IssuedAt = jwt.NewNumericDate(issuedAt)
|
||||||
|
}
|
||||||
|
if !expiresAt.IsZero() {
|
||||||
|
claims.ExpiresAt = jwt.NewNumericDate(expiresAt)
|
||||||
|
}
|
||||||
|
|
||||||
|
var token *jwt.Token
|
||||||
|
if strings.Contains(c.t.Name(), "ECDSA") {
|
||||||
|
token = jwt.NewWithClaims(jwt.SigningMethodES256, claims)
|
||||||
|
} else if strings.Contains(c.t.Name(), "Ed25519") {
|
||||||
|
token = jwt.NewWithClaims(jwt.SigningMethodEdDSA, claims)
|
||||||
|
} else {
|
||||||
|
token = jwt.NewWithClaims(jwt.SigningMethodRS256, claims)
|
||||||
|
}
|
||||||
|
private := getPrivateAuthToken(c.t)
|
||||||
|
tokenString, err := token.SignedString(private)
|
||||||
|
if err != nil {
|
||||||
|
c.t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
params := HelloV2AuthParams{
|
||||||
|
Token: tokenString,
|
||||||
|
}
|
||||||
|
return c.SendHelloParams(c.server.URL, HelloVersionV2, "", params)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *TestClient) SendHelloResume(resumeId string) error {
|
func (c *TestClient) SendHelloResume(resumeId string) error {
|
||||||
|
@ -385,7 +442,7 @@ func (c *TestClient) SendHelloResume(resumeId string) error {
|
||||||
Id: "1234",
|
Id: "1234",
|
||||||
Type: "hello",
|
Type: "hello",
|
||||||
Hello: &HelloClientMessage{
|
Hello: &HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: HelloVersionV1,
|
||||||
ResumeId: resumeId,
|
ResumeId: resumeId,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -396,7 +453,7 @@ func (c *TestClient) SendHelloClient(userid string) error {
|
||||||
params := TestBackendClientAuthParams{
|
params := TestBackendClientAuthParams{
|
||||||
UserId: userid,
|
UserId: userid,
|
||||||
}
|
}
|
||||||
return c.SendHelloParams(c.server.URL, "client", params)
|
return c.SendHelloParams(c.server.URL, HelloVersionV1, "client", params)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *TestClient) SendHelloInternal() error {
|
func (c *TestClient) SendHelloInternal() error {
|
||||||
|
@ -411,10 +468,10 @@ func (c *TestClient) SendHelloInternal() error {
|
||||||
Token: token,
|
Token: token,
|
||||||
Backend: backend,
|
Backend: backend,
|
||||||
}
|
}
|
||||||
return c.SendHelloParams("", "internal", params)
|
return c.SendHelloParams("", HelloVersionV1, "internal", params)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *TestClient) SendHelloParams(url string, clientType string, params interface{}) error {
|
func (c *TestClient) SendHelloParams(url string, version string, clientType string, params interface{}) error {
|
||||||
data, err := json.Marshal(params)
|
data, err := json.Marshal(params)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.t.Fatal(err)
|
c.t.Fatal(err)
|
||||||
|
@ -424,7 +481,7 @@ func (c *TestClient) SendHelloParams(url string, clientType string, params inter
|
||||||
Id: "1234",
|
Id: "1234",
|
||||||
Type: "hello",
|
Type: "hello",
|
||||||
Hello: &HelloClientMessage{
|
Hello: &HelloClientMessage{
|
||||||
Version: HelloVersion,
|
Version: version,
|
||||||
Auth: HelloClientMessageAuth{
|
Auth: HelloClientMessageAuth{
|
||||||
Type: clientType,
|
Type: clientType,
|
||||||
Url: url,
|
Url: url,
|
||||||
|
|
Loading…
Reference in a new issue