- commit
- b406165
- parent
- 219dd1d
- author
- Antonio Mika
- date
- 2025-03-12 21:58:39 -0400 EDT
More cleanup
9 files changed,
+13,
-77
+1,
-1
1@@ -10,7 +10,7 @@ import (
2 "github.com/picosh/pico/pkg/shared"
3 )
4
5-func WishMiddleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
6+func Middleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
7 return func(next pssh.SSHServerHandler) pssh.SSHServerHandler {
8 return func(sesh *pssh.SSHServerConnSession) error {
9 args := sesh.Command()
+1,
-1
1@@ -87,7 +87,7 @@ type CliHandler struct {
2 Logger *slog.Logger
3 }
4
5-func WishMiddleware(handler *CliHandler) pssh.SSHServerMiddleware {
6+func Middleware(handler *CliHandler) pssh.SSHServerMiddleware {
7 dbpool := handler.DBPool
8 log := handler.Logger
9
+1,
-1
1@@ -101,7 +101,7 @@ func StartSshServer() {
2 return pssh.PtyMdw(createTui(shrd))(next)(sesh)
3 }
4 },
5- WishMiddleware(cliHandler),
6+ Middleware(cliHandler),
7 pssh.LogMiddleware(handler, dbpool),
8 },
9 []pssh.SSHServerMiddleware{
+6,
-2
1@@ -71,7 +71,7 @@ func clientInfo(clients []*psub.Client, clientType string) string {
2 }
3
4 var helpStr = func(sshCmd string) string {
5- return fmt.Sprintf(`Command: ssh %s <help | ls | pub | sub | pipe> <topic> [-h | args...]
6+ data := fmt.Sprintf(`Command: ssh %s <help | ls | pub | sub | pipe> <topic> [-h | args...]
7
8 The simplest authenticated pubsub system. Send messages through
9 user-defined topics. Topics are private to the authenticated
10@@ -89,6 +89,10 @@ data is being sent:
11 - sub => reads from client
12 - pipe => read and write between clients
13 `, sshCmd)
14+
15+ data = strings.ReplaceAll(data, "\n", "\r\n")
16+
17+ return data
18 }
19
20 type CliHandler struct {
21@@ -136,7 +140,7 @@ func checkAccess(accessList []string, userName string, sesh *pssh.SSHServerConnS
22 return false
23 }
24
25-func WishMiddleware(handler *CliHandler) pssh.SSHServerMiddleware {
26+func Middleware(handler *CliHandler) pssh.SSHServerMiddleware {
27 pubsub := handler.PubSub
28
29 return func(next pssh.SSHServerHandler) pssh.SSHServerHandler {
+1,
-1
1@@ -67,7 +67,7 @@ func StartSshServer() {
2 return perms, nil
3 },
4 []pssh.SSHServerMiddleware{
5- WishMiddleware(handler),
6+ Middleware(handler),
7 pssh.LogMiddleware(handler, dbh),
8 },
9 nil,
+0,
-25
1@@ -1,25 +0,0 @@
2-package pobj
3-
4-// func createRouter(handler utils.CopyFromClientHandler) proxy.Router {
5-// return func(sh ssh.Handler, s ssh.Session) []wish.Middleware {
6-// return []wish.Middleware{
7-// pipe.Middleware(handler, ""),
8-// list.Middleware(handler),
9-// scp.Middleware(handler),
10-// wishrsync.Middleware(handler),
11-// auth.Middleware(handler),
12-// lm.Middleware(),
13-// }
14-// }
15-// }
16-
17-// func WithProxy(handler utils.CopyFromClientHandler, otherMiddleware ...wish.Middleware) ssh.Option {
18-// return func(server *ssh.Server) error {
19-// err := sftp.SSHOption(handler)(server)
20-// if err != nil {
21-// return err
22-// }
23-
24-// return proxy.WithProxy(createRouter(handler), otherMiddleware...)(server)
25-// }
26-// }
+3,
-3
1@@ -246,7 +246,7 @@ type SSHServer struct {
2 func (s *SSHServer) ListenAndServe() error {
3 if s.Config.PromListenAddr != "" {
4 s.SessionsCreated = promauto.With(prometheus.DefaultRegisterer).NewCounterVec(prometheus.CounterOpts{
5- Name: "wish_sessions_created_total",
6+ Name: "pssh_sessions_created_total",
7 Help: "The total number of sessions created",
8 ConstLabels: prometheus.Labels{
9 "app": s.Config.App,
10@@ -254,7 +254,7 @@ func (s *SSHServer) ListenAndServe() error {
11 }, []string{"command"})
12
13 s.SessionsFinished = promauto.With(prometheus.DefaultRegisterer).NewCounterVec(prometheus.CounterOpts{
14- Name: "wish_sessions_finished_total",
15+ Name: "pssh_sessions_finished_total",
16 Help: "The total number of sessions created",
17 ConstLabels: prometheus.Labels{
18 "app": s.Config.App,
19@@ -262,7 +262,7 @@ func (s *SSHServer) ListenAndServe() error {
20 }, []string{"command"})
21
22 s.SessionsDuration = promauto.With(prometheus.DefaultRegisterer).NewCounterVec(prometheus.CounterOpts{
23- Name: "wish_sessions_duration_seconds",
24+ Name: "pssh_sessions_duration_seconds",
25 Help: "The total sessions duration in seconds",
26 ConstLabels: prometheus.Labels{
27 "app": s.Config.App,
+0,
-17
1@@ -1,17 +0,0 @@
2-package protocols
3-
4-// func Middleware(writeHandler utils.CopyFromClientHandler) ssh.Option {
5-// return func(server *ssh.Server) error {
6-// err := wish.WithMiddleware(
7-// pipe.Middleware(writeHandler, ""),
8-// scp.Middleware(writeHandler),
9-// rsync.Middleware(writeHandler),
10-// auth.Middleware(writeHandler),
11-// )(server)
12-// if err != nil {
13-// return err
14-// }
15-
16-// return sftp.SSHOption(writeHandler)(server)
17-// }
18-// }
+0,
-26
1@@ -1,26 +0,0 @@
2-package proxy
3-
4-// type Router func(sh ssh.Handler, s ssh.Session) []wish.Middleware
5-
6-// func withMiddleware(mdw ...wish.Middleware) ssh.Handler {
7-// handler := func(s ssh.Session) {}
8-// for _, mw := range mdw {
9-// handler = mw(handler)
10-// }
11-// return handler
12-// }
13-
14-// func WithProxy(router Router, otherMiddleware ...wish.Middleware) ssh.Option {
15-// mdw := func(sh ssh.Handler) ssh.Handler {
16-// return func(s ssh.Session) {
17-// mw := router(sh, s)
18-// fn := withMiddleware(mw...)
19-// fn(s)
20-// }
21-// }
22-
23-// newMiddleware := []wish.Middleware{mdw}
24-// newMiddleware = append(newMiddleware, otherMiddleware...)
25-
26-// return wish.WithMiddleware(newMiddleware...)
27-// }