Skip to content

Commit 554368f

Browse files
authoredDec 18, 2024
fix(webconsole): vnc add cookie head (#21827)
1 parent c2bc6b1 commit 554368f

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed
 

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ require (
9393
k8s.io/cri-api v0.22.17
9494
k8s.io/klog/v2 v2.20.0
9595
moul.io/http2curl/v2 v2.3.0
96-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241216075633-a8665686cf63
96+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241218101206-5e3f6758dc2c
9797
yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256
9898
yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f
9999
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,8 +1376,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
13761376
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
13771377
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
13781378
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
1379-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241216075633-a8665686cf63 h1:j5XE/WcpbSolZfeQueXmtxiVVxdQWC2Qr9RtNnzEwR0=
1380-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241216075633-a8665686cf63/go.mod h1:rj/pb3DitJlQaQD8UW1oxx/KD+PzDZqoywzqRJaFE9A=
1379+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241218101206-5e3f6758dc2c h1:h5qhNEV9VsJ6VkbC/lmV+kZW2ZsMT+DRDwb+gGIpr+w=
1380+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241218101206-5e3f6758dc2c/go.mod h1:rj/pb3DitJlQaQD8UW1oxx/KD+PzDZqoywzqRJaFE9A=
13811381
yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256 h1:kLKQ6zbgPDQflRwoHFAjxNChcbhXIFgsUVLkJwiXu/8=
13821382
yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
13831383
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=

‎pkg/webconsole/server/websocketproxy_server.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
type WebsocketProxyServer struct {
3131
Session *session.SSession
3232
proxy *websocketproxy.WebsocketProxy
33+
cookie string
3334
}
3435

3536
func NewWebsocketProxyServer(s *session.SSession) (*WebsocketProxyServer, error) {
@@ -56,9 +57,13 @@ func NewWebsocketProxyServer(s *session.SSession) (*WebsocketProxyServer, error)
5657
return &WebsocketProxyServer{
5758
Session: s,
5859
proxy: proxySrv,
60+
cookie: info.Cookie,
5961
}, nil
6062
}
6163

6264
func (s *WebsocketProxyServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
65+
if len(s.cookie) > 0 {
66+
r.Header.Set("Cookie", s.cookie)
67+
}
6368
s.proxy.ServeHTTP(w, r)
6469
}

‎vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
17851785
# sigs.k8s.io/yaml v1.2.0
17861786
## explicit; go 1.12
17871787
sigs.k8s.io/yaml
1788-
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241216075633-a8665686cf63
1788+
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241218101206-5e3f6758dc2c
17891789
## explicit; go 1.21
17901790
yunion.io/x/cloudmux/pkg/apis
17911791
yunion.io/x/cloudmux/pkg/apis/billing

‎vendor/yunion.io/x/cloudmux/pkg/cloudprovider/instance.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)