Don't check origin if ws-origin is not set

Author: liqiang-fit2cloud

gotty/server/handlers.go

@@ -75,13 +75,12 @@ func (server *Server) generateHandleWS(ctx context.Context, cancel context.Cance
 		server.upgrader.WriteBufferSize = webtty.MaxBufferSize
 		server.upgrader.EnableCompression = true
 		conn, err := server.upgrader.Upgrade(w, r, nil)
-		conn.SetCompressionLevel(9)
 		if err != nil {
 			closeReason = err.Error()
 			return
 		}
 		defer conn.Close()
-
+		conn.SetCompressionLevel(9)
 		err = server.processWSConn(ctx, conn)
 
 		switch err {

gotty/server/server.go

@@ -59,15 +59,20 @@ func New(factory Factory, options *Options) (*Server, error) {
 		return nil, errors.Wrapf(err, "failed to parse window title format `%s`", options.TitleFormat)
 	}
 
-	var originChekcer func(r *http.Request) bool
+	var originChecker func(r *http.Request) bool
 	if options.WSOrigin != "" {
 		matcher, err := regexp.Compile(options.WSOrigin)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to compile regular expression of Websocket Origin: %s", options.WSOrigin)
 		}
-		originChekcer = func(r *http.Request) bool {
+		originChecker = func(r *http.Request) bool {
 			return matcher.MatchString(r.Header.Get("Origin"))
 		}
+	} else {
+		// Don't check origin if ws-origin is not set
+		originChecker = func(r *http.Request) bool {
+			return true
+		}
 	}
 
 	return &Server{
@@ -78,7 +83,7 @@ func New(factory Factory, options *Options) (*Server, error) {
 			ReadBufferSize:  webtty.MaxBufferSize,
 			WriteBufferSize: webtty.MaxBufferSize,
 			Subprotocols:    webtty.Protocols,
-			CheckOrigin:     originChekcer,
+			CheckOrigin:     originChecker,
 		},
 		terminalTemplate: terminalTemplate,
 		titleTemplate:    titleTemplate,