quick media viewer (using new hmac read-file urls)

.github/workflows/build-helper.yml

@@ -41,7 +41,6 @@ jobs:
                   cd scripthaus;
                   go get ./...;
                   CGO_ENABLED=1 go build -o scripthaus cmd/main.go
-                  echo $PWD >> $GITHUB_PATH
             - uses: actions/setup-node@v4
               with:
                   node-version: ${{env.NODE_VERSION}}
@@ -54,7 +53,7 @@ jobs:
             - name: Install Yarn Dependencies
               run: yarn --frozen-lockfile
             - name: Build ${{ matrix.platform }}/${{ matrix.arch }}
-              run: scripthaus run ${{ matrix.scripthaus }}
+              run: ./scripthaus/scripthaus run ${{ matrix.scripthaus }}
               env:
                   GOARCH: ${{ matrix.arch }}
                   CSC_LINK: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE}}

.github/workflows/codeql.yml

@@ -47,32 +47,6 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@v4
 
-            - name: Checkout Scripthaus (Go only)
-              if: matrix.language == 'go'
-              uses: actions/checkout@v4
-              with:
-                  repository: scripthaus-dev/scripthaus
-                  path: scripthaus
-
-            - name: Setup Go (Go only)
-              uses: actions/setup-go@v5
-              if: matrix.language == 'go'
-              with:
-                  go-version: stable
-                  cache-dependency-path: |
-                      wavesrv/go.sum
-                      waveshell/go.sum
-                      scripthaus/go.sum
-
-            - name: Install Scripthaus (Go only)
-              if: matrix.language == 'go'
-              run: |
-                  go work use ./scripthaus;
-                  cd scripthaus;
-                  go get ./...;
-                  CGO_ENABLED=1 go build -o scripthaus cmd/main.go
-                  echo $PWD >> $GITHUB_PATH
-
             # Initializes the CodeQL tools for scanning.
             - name: Initialize CodeQL
               uses: github/codeql-action/init@v3
@@ -87,14 +61,9 @@ jobs:
 
             # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
             # If this step fails, then you should remove it and run the build manually (see below)
-            - name: Autobuild (not Go)
-              if: matrix.language != 'go'
+            - name: Autobuild
               uses: github/codeql-action/autobuild@v3
 
-            - name: Build (Go only)
-              if: matrix.language == 'go'
-              run: scripthaus run build-backend
-
             # ℹ️ Command-line programs to run using the OS shell.
             # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 

src/app/common/modals/userinput.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { GlobalModel } from "@/models";
 import { Choose, When, If } from "tsx-control-statements/components";
-import { Modal, PasswordField, TextField, Markdown, Checkbox } from "@/elements";
+import { Modal, PasswordField, Markdown, Checkbox } from "@/elements";
 import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 import "./userinput.less";
@@ -82,17 +82,8 @@ export const UserInputModal = (userInputRequest: UserInputRequest) => {
                         </If>
                         <If condition={!userInputRequest.markdown}>{userInputRequest.querytext}</If>
                     </div>
-                    <If condition={userInputRequest.responsetype == "text"}>
-                        <If condition={userInputRequest.publictext}>
-                            <TextField
-                                onChange={setResponseText}
-                                value={responseText}
-                                maxLength={400}
-                                autoFocus={true}
-                                onKeyDown={(e) => handleTextKeyDown(e)}
-                            />
-                        </If>
-                        <If condition={!userInputRequest.publictext}>
+                    <Choose>
+                        <When condition={userInputRequest.responsetype == "text"}>
                             <PasswordField
                                 onChange={setResponseText}
                                 value={responseText}
@@ -100,8 +91,8 @@ export const UserInputModal = (userInputRequest: UserInputRequest) => {
                                 autoFocus={true}
                                 onKeyDown={(e) => handleTextKeyDown(e)}
                             />
-                        </If>
-                    </If>
+                        </When>
+                    </Choose>
                 </div>
                 <If condition={userInputRequest.checkboxmsg != ""}>
                     <Checkbox

src/app/line/line.less

@@ -126,7 +126,6 @@
 
     &:hover .line-actions {
         background-color: var(--line-actions-bg-color);
-        backdrop-filter: blur(8px);
         .line-icon {
             visibility: visible;
         }

src/plugins/image/image.tsx

@@ -48,15 +48,12 @@ class SimpleImageRenderer extends React.Component<
             return (
                 <div className="image-renderer" style={{ fontSize: this.props.opts.termFontSize }}>
                     <div className="load-error-text">
-                        ERROR: file {dataBlob?.name ? JSON.stringify(dataBlob.name) : ""} not found
+                        ERROR: file {dataBlob && dataBlob.name ? JSON.stringify(dataBlob.name) : ""} not found
                     </div>
                 </div>
             );
         }
         if (this.objUrl == null) {
-            if (dataBlob.name?.endsWith(".svg")) {
-                dataBlob = new Blob([dataBlob], { type: "image/svg+xml" }) as ExtBlob;
-            }
             this.objUrl = URL.createObjectURL(dataBlob);
         }
         let opts = this.props.opts;

src/plugins/media/media.less

@@ -4,11 +4,4 @@
     align-items: center;
     justify-content: center;
     padding-top: var(--termpad);
-
-    video {
-        object-fit: contain;
-        object-position: center;
-        height: 100%;
-        width: auto;
-    }
 }

src/plugins/media/media.tsx

@@ -4,7 +4,6 @@
 import * as React from "react";
 import * as mobx from "mobx";
 import * as mobxReact from "mobx-react";
-import * as util from "@/util/util";
 import { GlobalModel } from "@/models";
 
 import "./media.less";
@@ -33,24 +32,14 @@ class SimpleMediaRenderer extends React.Component<
                 </div>
             );
         }
-        let fileUrl = this.props.lineState["wave:fileurl"];
-        if (util.isBlank(fileUrl)) {
-            return (
-                <div className="media-renderer" style={{ fontSize: this.props.opts.termFontSize }}>
-                    <div className="load-error-text">
-                        ERROR: no fileurl found (please use `mediaview` to view media files)
-                    </div>
-                </div>
-            );
-        }
-        let fullVideoUrl = GlobalModel.getBaseHostPort() + fileUrl;
+        let videoUrl = GlobalModel.getBaseHostPort() + this.props.lineState["wave:fileurl"];
         const opts = this.props.opts;
-        const height = opts.idealSize.height - 10;
-        const width = opts.maxSize.width - 10;
+        const maxHeight = opts.maxSize.height - 10;
+        const maxWidth = opts.maxSize.width - 10;
         return (
-            <div className="media-renderer" style={{ height: height, width: width }}>
-                <video controls>
-                    <source src={fullVideoUrl} />
+            <div className="media-renderer">
+                <video width="320" height="240" controls>
+                    <source src={videoUrl} />
                 </video>
             </div>
         );

src/types/custom.d.ts

@@ -667,7 +667,6 @@ declare global {
         markdown: boolean;
         timeoutms: number;
         checkboxmsg: string;
-        publictext: boolean;
     };
 
     type UserInputResponsePacket = {

wavesrv/pkg/cmdrunner/cmdrunner.go

@@ -126,7 +126,7 @@ var SetVarScopes = []SetVarScope{
 	{ScopeName: "remote", VarNames: []string{}},
 }
 
-var userHostRe = regexp.MustCompile(`^(sudo@)?([a-zA-Z0-9][a-zA-Z0-9._@\\-]*@)?([a-z0-9][a-z0-9.-]*)(?::([0-9]+))?$`)
+var userHostRe = regexp.MustCompile(`^(sudo@)?([a-zA-Z0-9][a-zA-Z0-9._@\\-]*)@([a-z0-9][a-z0-9.-]*)(?::([0-9]+))?$`)
 var remoteAliasRe = regexp.MustCompile("^[a-zA-Z0-9][a-zA-Z0-9._-]*$")
 var genericNameRe = regexp.MustCompile("^[a-zA-Z][a-zA-Z0-9_ .()<>,/\"'\\[\\]{}=+$@!*-]*$")
 var rendererRe = regexp.MustCompile("^[a-zA-Z][a-zA-Z0-9_.:-]*$")
@@ -1796,7 +1796,6 @@ func parseRemoteEditArgs(isNew bool, pk *scpacket.FeCommandPacketType, isLocal b
 			return nil, fmt.Errorf("invalid format of user@host argument")
 		}
 		sudoStr, remoteUser, remoteHost, remotePortStr := m[1], m[2], m[3], m[4]
-		remoteUser = strings.Trim(remoteUser, "@")
 		var uhPort int
 		if remotePortStr != "" {
 			var err error
@@ -1838,11 +1837,7 @@ func parseRemoteEditArgs(isNew bool, pk *scpacket.FeCommandPacketType, isLocal b
 			return nil, fmt.Errorf("invalid port argument, \"%d\" is not in the range of 1 to 65535", portVal)
 		}
 		sshOpts.SSHPort = portVal
-		if remoteUser == "" {
-			canonicalName = remoteHost
-		} else {
-			canonicalName = remoteUser + "@" + remoteHost
-		}
+		canonicalName = remoteUser + "@" + remoteHost
 		if portVal != 0 && portVal != 22 {
 			canonicalName = canonicalName + ":" + strconv.Itoa(portVal)
 		}
@@ -2141,17 +2136,17 @@ func createSshImportSummary(changeList map[string][]string) string {
 
 func NewHostInfo(hostName string) (*HostInfoType, error) {
 	userName, _ := ssh_config.GetStrict(hostName, "User")
-	var canonicalName string
-	if userName != "" {
-		canonicalName = userName + "@" + hostName
-	} else {
-		canonicalName = hostName
+	if userName == "" {
+		// we cannot store a remote with a missing user
+		// in the current setup
+		return nil, fmt.Errorf("could not parse \"%s\" - no User in config\n", hostName)
 	}
+	canonicalName := userName + "@" + hostName
 
-	// check if canonicalname is okay
+	// check if user and host are okay
 	m := userHostRe.FindStringSubmatch(canonicalName)
-	if m == nil {
-		return nil, fmt.Errorf("could not parse \"%s\" - %s did not fit user@host requirement", hostName, canonicalName)
+	if m == nil || m[2] == "" || m[3] == "" {
+		return nil, fmt.Errorf("could not parse \"%s\" - %s did not fit user@host requirement\n", hostName, canonicalName)
 	}
 
 	portStr, _ := ssh_config.GetStrict(hostName, "Port")
@@ -2162,10 +2157,10 @@ func NewHostInfo(hostName string) (*HostInfoType, error) {
 		portVal, err = strconv.Atoi(portStr)
 		if err != nil {
 			// do not make assumptions about port if incorrectly configured
-			return nil, fmt.Errorf("could not parse \"%s\" (%s) - %s could not be converted to a valid port", hostName, canonicalName, portStr)
+			return nil, fmt.Errorf("could not parse \"%s\" (%s) - %s could not be converted to a valid port\n", hostName, canonicalName, portStr)
 		}
 		if portVal <= 0 || portVal > 65535 {
-			return nil, fmt.Errorf("could not parse port \"%d\": number is not valid for a port", portVal)
+			return nil, fmt.Errorf("could not parse port \"%d\": number is not valid for a port\n", portVal)
 		}
 	}
 	identityFile, _ := ssh_config.GetStrict(hostName, "IdentityFile")

wavesrv/pkg/remote/remote.go

@@ -15,7 +15,6 @@ import (
 	"os/exec"
 	"path"
 	"regexp"
-	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
@@ -45,6 +44,8 @@ import (
 	"golang.org/x/mod/semver"
 )
 
+const UseSshLibrary = true
+
 const RemoteTypeMShell = "mshell"
 const DefaultTerm = "xterm-256color"
 const DefaultMaxPtySize = 1024 * 1024
@@ -128,6 +129,12 @@ type pendingStateKey struct {
 	RemotePtr sstore.RemotePtrType
 }
 
+// for conditional launch method based on ssh library in use
+// remove once ssh library is stabilized
+type Launcher interface {
+	Launch(*MShellProc, bool)
+}
+
 type MShellProc struct {
 	Lock   *sync.Mutex
 	Remote *sstore.RemoteType
@@ -156,6 +163,7 @@ type MShellProc struct {
 
 	RunningCmds      map[base.CommandKey]*RunCmdType
 	PendingStateCmds map[pendingStateKey]base.CommandKey // key=[remoteinstance name]
+	launcher         Launcher                            // for conditional launch method based on ssh library in use. remove once ssh library is stabilized
 	Client           *ssh.Client
 }
 
@@ -180,6 +188,12 @@ func CanComplete(remoteType string) bool {
 	}
 }
 
+// for conditional launch method based on ssh library in use
+// remove once ssh library is stabilized
+func (msh *MShellProc) Launch(interactive bool) {
+	msh.launcher.Launch(msh, interactive)
+}
+
 func (msh *MShellProc) GetStatus() string {
 	msh.Lock.Lock()
 	defer msh.Lock.Unlock()
@@ -697,8 +711,14 @@ func MakeMShell(r *sstore.RemoteType) *MShellProc {
 		RunningCmds:      make(map[base.CommandKey]*RunCmdType),
 		PendingStateCmds: make(map[pendingStateKey]base.CommandKey),
 		StateMap:         server.MakeShellStateMap(),
+		launcher:         LegacyLauncher{}, // for conditional launch method based on ssh library in use. remove once ssh library is stabilized
 		DataPosMap:       utilfn.MakeSyncMap[base.CommandKey, int64](),
 	}
+	// for conditional launch method based on ssh library in use
+	// remove once ssh library is stabilized
+	if UseSshLibrary {
+		rtn.launcher = NewLauncher{}
+	}
 
 	rtn.WriteToPtyBuffer("console for connection [%s]\n", r.GetName())
 	return rtn
@@ -1181,15 +1201,6 @@ func (msh *MShellProc) WaitAndSendPassword(pw string) {
 }
 
 func (msh *MShellProc) RunInstall(autoInstall bool) {
-	defer func() {
-		if r := recover(); r != nil {
-			errMsg := fmt.Errorf("this should not happen. if it does, please reach out to us in our discord or open an issue on our github\n\n"+
-				"error:\n%v\n\nstack trace:\n%s", r, string(debug.Stack()))
-			log.Printf("fatal error, %s\n", errMsg)
-			msh.WriteToPtyBuffer("*fatal error, %s\n", errMsg)
-			msh.setErrorStatus(errMsg)
-		}
-	}()
 	remoteCopy := msh.GetRemoteCopy()
 	if remoteCopy.Archived {
 		msh.WriteToPtyBuffer("*error: cannot install on archived remote\n")
@@ -1563,16 +1574,12 @@ func (msh *MShellProc) createWaveshellSession(clientCtx context.Context, remoteC
 	return wsSession, nil
 }
 
-func (msh *MShellProc) Launch(interactive bool) {
-	defer func() {
-		if r := recover(); r != nil {
-			errMsg := fmt.Errorf("this should not happen. if it does, please reach out to us in our discord or open an issue on our github\n\n"+
-				"error:\n%v\n\nstack trace:\n%s", r, string(debug.Stack()))
-			log.Printf("fatal error, %s\n", errMsg)
-			msh.WriteToPtyBuffer("*fatal error, %s\n", errMsg)
-			msh.setErrorStatus(errMsg)
-		}
-	}()
+// for conditional launch method based on ssh library in use
+// remove once ssh library is stabilized
+type NewLauncher struct{}
+
+// func (msh *MShellProc) LaunchNew(interactive bool) {
+func (NewLauncher) Launch(msh *MShellProc, interactive bool) {
 	remoteCopy := msh.GetRemoteCopy()
 	if remoteCopy.Archived {
 		msh.WriteToPtyBuffer("cannot launch archived remote\n")
@@ -1680,6 +1687,146 @@ func (msh *MShellProc) Launch(interactive bool) {
 	go msh.NotifyRemoteUpdate()
 }
 
+// for conditional launch method based on ssh library in use
+// remove once ssh library is stabilized
+type LegacyLauncher struct{}
+
+// func (msh *MShellProc) LaunchLegacy(interactive bool) {
+func (LegacyLauncher) Launch(msh *MShellProc, interactive bool) {
+	remoteCopy := msh.GetRemoteCopy()
+	if remoteCopy.Archived {
+		msh.WriteToPtyBuffer("cannot launch archived remote\n")
+		return
+	}
+	curStatus := msh.GetStatus()
+	if curStatus == StatusConnected {
+		msh.WriteToPtyBuffer("remote is already connected (no action taken)\n")
+		return
+	}
+	if curStatus == StatusConnecting {
+		msh.WriteToPtyBuffer("remote is already connecting, disconnect before trying to connect again\n")
+		return
+	}
+	sapi, err := shellapi.MakeShellApi(msh.GetShellType())
+	if err != nil {
+		msh.WriteToPtyBuffer("*error, %v\n", err)
+		return
+	}
+	istatus := msh.GetInstallStatus()
+	if istatus == StatusConnecting {
+		msh.WriteToPtyBuffer("remote is trying to install, cancel install before trying to connect again\n")
+		return
+	}
+	if remoteCopy.SSHOpts.SSHPort != 0 && remoteCopy.SSHOpts.SSHPort != 22 {
+		msh.WriteToPtyBuffer("connecting to %s (port %d)...\n", remoteCopy.RemoteCanonicalName, remoteCopy.SSHOpts.SSHPort)
+	} else {
+		msh.WriteToPtyBuffer("connecting to %s...\n", remoteCopy.RemoteCanonicalName)
+	}
+	sshOpts := convertSSHOpts(remoteCopy.SSHOpts)
+	sshOpts.SSHErrorsToTty = true
+	if remoteCopy.ConnectMode != sstore.ConnectModeManual && remoteCopy.SSHOpts.SSHPassword == "" && !interactive {
+		sshOpts.BatchMode = true
+	}
+	var cmdStr string
+	if sshOpts.SSHHost == "" && remoteCopy.Local {
+		var err error
+		cmdStr, err = MakeLocalMShellCommandStr(remoteCopy.IsSudo())
+		if err != nil {
+			msh.WriteToPtyBuffer("*error, cannot find local mshell binary: %v\n", err)
+			return
+		}
+	} else {
+		cmdStr = MakeServerCommandStr()
+	}
+	ecmd := sshOpts.MakeSSHExecCmd(cmdStr, sapi)
+	cmdPty, err := msh.addControllingTty(ecmd)
+	if err != nil {
+		statusErr := fmt.Errorf("cannot attach controlling tty to mshell command: %w", err)
+		msh.WriteToPtyBuffer("*error, %s\n", statusErr.Error())
+		msh.setErrorStatus(statusErr)
+		return
+	}
+	defer func() {
+		if len(ecmd.ExtraFiles) > 0 {
+			ecmd.ExtraFiles[len(ecmd.ExtraFiles)-1].Close()
+		}
+	}()
+	go msh.RunPtyReadLoop(cmdPty)
+	if remoteCopy.SSHOpts.SSHPassword != "" {
+		go msh.WaitAndSendPassword(remoteCopy.SSHOpts.SSHPassword)
+	}
+	var makeClientCtx context.Context
+	var makeClientCancelFn context.CancelFunc
+	msh.WithLock(func() {
+		deadlineTime := time.Now().Add(RemoteConnectTimeout)
+		makeClientCtx, makeClientCancelFn = context.WithDeadline(context.Background(), deadlineTime)
+		defer makeClientCancelFn()
+		msh.Err = nil
+		msh.ErrNoInitPk = false
+		msh.Status = StatusConnecting
+		msh.MakeClientCancelFn = makeClientCancelFn
+		msh.MakeClientDeadline = &deadlineTime
+		go msh.NotifyRemoteUpdate()
+	})
+	go msh.watchClientDeadlineTime()
+	cproc, err := shexec.MakeClientProc(makeClientCtx, shexec.CmdWrap{Cmd: ecmd})
+	msh.WithLock(func() {
+		msh.MakeClientCancelFn = nil
+		msh.MakeClientDeadline = nil
+		msh.StateMap.Clear()
+		// no notify here, because we'll call notify in either case below
+	})
+	if err == context.DeadlineExceeded {
+		msh.WriteToPtyBuffer("*connect timeout\n")
+		msh.setErrorStatus(errors.New("connect timeout"))
+		return
+	} else if err == context.Canceled {
+		msh.WriteToPtyBuffer("*forced disconnection\n")
+		msh.WithLock(func() {
+			msh.Status = StatusDisconnected
+			go msh.NotifyRemoteUpdate()
+		})
+		return
+	} else if serr, ok := err.(shexec.WaveshellLaunchError); ok {
+		msh.WithLock(func() {
+			msh.UName = serr.InitPk.UName
+			if semver.Compare(serr.InitPk.Version, scbase.MShellVersion) < 0 {
+				// only set NeedsMShellUpgrade if we got an InitPk
+				msh.NeedsMShellUpgrade = true
+			}
+			msh.InitPkShellType = serr.InitPk.Shell
+		})
+		msh.WriteToPtyBuffer("*error, %s\n", serr.Error())
+		msh.setErrorStatus(serr)
+		go msh.tryAutoInstall()
+		return
+	} else if err != nil {
+		msh.WriteToPtyBuffer("*error, %s\n", serr.Error())
+		msh.setErrorStatus(err)
+		return
+	}
+
+	msh.updateRemoteStateVars(context.Background(), msh.RemoteId, cproc.InitPk)
+	msh.WithLock(func() {
+		msh.ServerProc = cproc
+		msh.Status = StatusConnected
+	})
+	go func() {
+		exitErr := cproc.Cmd.Wait()
+		exitCode := shexec.GetExitCode(exitErr)
+		msh.WithLock(func() {
+			if msh.Status == StatusConnected || msh.Status == StatusConnecting {
+				msh.Status = StatusDisconnected
+				go msh.NotifyRemoteUpdate()
+			}
+		})
+		msh.WriteToPtyBuffer("*disconnected exitcode=%d\n", exitCode)
+	}()
+	go msh.ProcessPackets()
+	msh.initActiveShells()
+	go msh.NotifyRemoteUpdate()
+}
+
 func (msh *MShellProc) initActiveShells() {
 	ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancelFn()

wavesrv/pkg/remote/sshclient.go

@@ -230,7 +230,6 @@ func promptChallengeQuestion(connCtx context.Context, question string, echo bool
 		QueryText:    queryText,
 		Markdown:     true,
 		Title:        "Keyboard Interactive Authentication",
-		PublicText:   echo,
 	}
 	response, err := userinput.GetUserInput(ctx, scbus.MainRpcBus, request)
 	if err != nil {

wavesrv/pkg/userinput/userinput.go

@@ -22,7 +22,6 @@ type UserInputRequestType struct {
 	Markdown     bool   `json:"markdown"`
 	TimeoutMs    int    `json:"timeoutms"`
 	CheckBoxMsg  string `json:"checkboxmsg"`
-	PublicText   bool   `json:"publictext"`
 }
 
 func (*UserInputRequestType) GetType() string {

yarn.lock

@@ -4016,9 +4016,9 @@ fn.name@1.x.x:
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
 follow-redirects@^1.0.0:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
+  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
 
 foreground-child@^3.1.0:
   version "3.1.1"