mirror of
https://github.com/strukturag/nextcloud-spreed-signaling
synced 2024-05-03 22:33:10 +02:00
Don't include empty "auth" field in hello client messages.
This commit is contained in:
parent
6960912681
commit
3721fb131f
|
@ -387,7 +387,7 @@ type HelloClientMessage struct {
|
|||
Features []string `json:"features,omitempty"`
|
||||
|
||||
// The authentication credentials.
|
||||
Auth HelloClientMessageAuth `json:"auth"`
|
||||
Auth *HelloClientMessageAuth `json:"auth,omitempty"`
|
||||
}
|
||||
|
||||
func (m *HelloClientMessage) CheckValid() error {
|
||||
|
@ -395,7 +395,7 @@ func (m *HelloClientMessage) CheckValid() error {
|
|||
return InvalidHelloVersion
|
||||
}
|
||||
if m.ResumeId == "" {
|
||||
if m.Auth.Params == nil || len(*m.Auth.Params) == 0 {
|
||||
if m.Auth == nil || m.Auth.Params == nil || len(*m.Auth.Params) == 0 {
|
||||
return fmt.Errorf("params missing")
|
||||
}
|
||||
if m.Auth.Type == "" {
|
||||
|
|
|
@ -95,14 +95,14 @@ func TestHelloClientMessage(t *testing.T) {
|
|||
// Hello version 1
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV1,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Params: &json.RawMessage{'{', '}'},
|
||||
Url: "https://domain.invalid",
|
||||
},
|
||||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV1,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Type: "client",
|
||||
Params: &json.RawMessage{'{', '}'},
|
||||
Url: "https://domain.invalid",
|
||||
|
@ -110,7 +110,7 @@ func TestHelloClientMessage(t *testing.T) {
|
|||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV1,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Type: "internal",
|
||||
Params: (*json.RawMessage)(&internalAuthParams),
|
||||
},
|
||||
|
@ -122,14 +122,14 @@ func TestHelloClientMessage(t *testing.T) {
|
|||
// Hello version 2
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV2,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Params: (*json.RawMessage)(&tokenAuthParams),
|
||||
Url: "https://domain.invalid",
|
||||
},
|
||||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV2,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Type: "client",
|
||||
Params: (*json.RawMessage)(&tokenAuthParams),
|
||||
Url: "https://domain.invalid",
|
||||
|
@ -147,40 +147,40 @@ func TestHelloClientMessage(t *testing.T) {
|
|||
&HelloClientMessage{Version: HelloVersionV1},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV1,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Params: &json.RawMessage{'{', '}'},
|
||||
Type: "invalid-type",
|
||||
},
|
||||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV1,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Url: "https://domain.invalid",
|
||||
},
|
||||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV1,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Params: &json.RawMessage{'{', '}'},
|
||||
},
|
||||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV1,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Params: &json.RawMessage{'{', '}'},
|
||||
Url: "invalid-url",
|
||||
},
|
||||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV1,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Type: "internal",
|
||||
Params: &json.RawMessage{'{', '}'},
|
||||
},
|
||||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV1,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Type: "internal",
|
||||
Params: &json.RawMessage{'x', 'y', 'z'}, // Invalid JSON.
|
||||
},
|
||||
|
@ -188,33 +188,33 @@ func TestHelloClientMessage(t *testing.T) {
|
|||
// Hello version 2
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV2,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Url: "https://domain.invalid",
|
||||
},
|
||||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV2,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Params: (*json.RawMessage)(&tokenAuthParams),
|
||||
},
|
||||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV2,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Params: (*json.RawMessage)(&tokenAuthParams),
|
||||
Url: "invalid-url",
|
||||
},
|
||||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV2,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Params: (*json.RawMessage)(&internalAuthParams),
|
||||
Url: "https://domain.invalid",
|
||||
},
|
||||
},
|
||||
&HelloClientMessage{
|
||||
Version: HelloVersionV2,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Params: &json.RawMessage{'x', 'y', 'z'}, // Invalid JSON.
|
||||
Url: "https://domain.invalid",
|
||||
},
|
||||
|
|
|
@ -601,7 +601,7 @@ func main() {
|
|||
Type: "hello",
|
||||
Hello: &signaling.HelloClientMessage{
|
||||
Version: signaling.HelloVersionV1,
|
||||
Auth: signaling.HelloClientMessageAuth{
|
||||
Auth: &signaling.HelloClientMessageAuth{
|
||||
Url: backendUrl + "/auth",
|
||||
Params: &json.RawMessage{'{', '}'},
|
||||
},
|
||||
|
|
|
@ -493,7 +493,7 @@ func (c *TestClient) SendHelloParams(url string, version string, clientType stri
|
|||
Hello: &HelloClientMessage{
|
||||
Version: version,
|
||||
Features: features,
|
||||
Auth: HelloClientMessageAuth{
|
||||
Auth: &HelloClientMessageAuth{
|
||||
Type: clientType,
|
||||
Url: url,
|
||||
Params: (*json.RawMessage)(&data),
|
||||
|
|
Loading…
Reference in a new issue