fix: exec with cmd

Author: wrfly

route/exec.go

@@ -18,7 +18,11 @@ import (
 func (server *Server) handleExecRedirect(c *gin.Context) {
 	containerID := c.Param("cid")
 	execID := server.setContainerID(containerID)
-	c.Redirect(302, "/exec/"+execID)
+	if query := c.Request.URL.RawQuery; query != "" {
+		c.Redirect(302, "/exec/"+execID+"?"+c.Request.URL.RawQuery)
+	} else {
+		c.Redirect(302, "/exec/"+execID)
+	}
 }
 
 func (server *Server) handleExec(c *gin.Context, counter *counter) {
@@ -104,7 +108,7 @@ func (server *Server) processTTY(ctx context.Context, execID string, timeoutCanc
 	if err != nil {
 		return err
 	}
-	log.Debugf("exec container: %s, params: %s", container.ID[:7], arguments)
+	log.Debugf("exec container: %s, params: [%s]", container.ID[:7], arguments)
 
 	q, err := parseQuery(strings.TrimSpace(arguments))
 	if err != nil {

route/handler.go

@@ -102,15 +102,15 @@ func (server *Server) handleRestartContainer(c *gin.Context) {
 	server.handleContainerActions(c, "restart")
 }
 
-func (server *Server) makeTitleBuff(c types.Container, readonly ...bool) ([]byte, error) {
-	location := "127.0.0.1"
+func (server *Server) makeTitleBuff(c types.Container, extra ...string) ([]byte, error) {
+	location := "localhost"
 	if c.LocServer != "" {
 		location = c.LocServer
 	}
 
 	cName := c.Name
-	if len(readonly) == 1 && readonly[0] {
-		cName = "[READONLY] " + c.Name
+	if len(extra) != 0 {
+		cName = extra[0] + " " + c.Name
 	}
 
 	titleVars := server.titleVariables(

route/share.go

@@ -31,7 +31,11 @@ func (server *Server) processShare(c *gin.Context, execID string, masterTTY *typ
 	}
 
 	cInfo := server.containerCli.GetInfo(ctx, containerID)
-	titleBuf, err := server.makeTitleBuff(cInfo, !server.options.Collaborate)
+	var titleExtra = "[READONLY]"
+	if server.options.Collaborate {
+		titleExtra = "[SLAVE]"
+	}
+	titleBuf, err := server.makeTitleBuff(cInfo, titleExtra)
 	if err != nil {
 		e := fmt.Sprintf("failed to fill window title template: %s", err)
 		conn.WriteMessage(websocket.CloseMessage, []byte(e))