Skip to content

Commit

Permalink
chore(prose): rm cli mdw
Browse files Browse the repository at this point in the history
neurosnap committed Jan 18, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 561ede5 commit f22cdb1
Showing 2 changed files with 3 additions and 164 deletions.
154 changes: 0 additions & 154 deletions prose/cli.go

This file was deleted.

13 changes: 3 additions & 10 deletions prose/ssh.go
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ import (
"github.com/picosh/utils"
)

func createRouter(handler *filehandlers.FileHandlerRouter, cliHandler *CliHandler) proxy.Router {
func createRouter(handler *filehandlers.FileHandlerRouter) proxy.Router {
return func(sh ssh.Handler, s ssh.Session) []wish.Middleware {
return []wish.Middleware{
pipe.Middleware(handler, ".md"),
@@ -36,20 +36,19 @@ func createRouter(handler *filehandlers.FileHandlerRouter, cliHandler *CliHandle
wishrsync.Middleware(handler),
auth.Middleware(handler),
wsh.PtyMdw(wsh.DeprecatedNotice()),
WishMiddleware(cliHandler),
wsh.LogMiddleware(handler.GetLogger()),
}
}
}

func withProxy(handler *filehandlers.FileHandlerRouter, cliHandler *CliHandler, otherMiddleware ...wish.Middleware) ssh.Option {
func withProxy(handler *filehandlers.FileHandlerRouter, otherMiddleware ...wish.Middleware) ssh.Option {
return func(server *ssh.Server) error {
err := sftp.SSHOption(handler)(server)
if err != nil {
return err
}

return proxy.WithProxy(createRouter(handler, cliHandler), otherMiddleware...)(server)
return proxy.WithProxy(createRouter(handler), otherMiddleware...)(server)
}
}

@@ -88,19 +87,13 @@ func StartSshServer() {
handler := filehandlers.NewFileHandlerRouter(cfg, dbh, fileMap)
handler.Spaces = []string{cfg.Space, "imgs"}

cliHandler := &CliHandler{
Logger: logger,
DBPool: dbh,
}

sshAuth := shared.NewSshAuthHandler(dbh, logger, cfg)
s, err := wish.NewServer(
wish.WithAddress(fmt.Sprintf("%s:%s", host, port)),
wish.WithHostKeyPath("ssh_data/term_info_ed25519"),
wish.WithPublicKeyAuth(sshAuth.PubkeyAuthHandler),
withProxy(
handler,
cliHandler,
promwish.Middleware(fmt.Sprintf("%s:%s", host, promPort), "prose-ssh"),
),
)

0 comments on commit f22cdb1

Please sign in to comment.