chg: remove user kick and user ban commands

This reverts commit 51d8669 This feature doesn't work
alterway · Sep 20, 2023 · b1ba647 · b1ba647
1 parent 9d44c0f
commit b1ba647
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 68 deletions.
diff --git a/pkg/bastion/shell.go b/pkg/bastion/shell.go
@@ -1621,59 +1621,6 @@ GLOBAL OPTIONS:
 						enc.SetIndent("", "  ")
 						return enc.Encode(users)
 					},
-				}, {
-					Name:      "kick",
-					Usage:     "Kills all active sessions for user(s)",
-					ArgsUsage: "USER...",
-					Action: func(c *cli.Context) error {
-						if c.NArg() < 1 {
-							return cli.ShowSubcommandHelp(c)
-						}
-
-						if err := myself.CheckRoles([]string{"admin"}); err != nil {
-							return err
-						}
-
-						var users []*dbmodels.User
-						if err := dbmodels.UsersByIdentifiers(db, c.Args()).Find(&users).Error; err != nil {
-							return err
-						}
-
-						for _, user := range users {
-							if err := db.Model(&dbmodels.Session{}).Where(&dbmodels.Session{User: user, Status: string(dbmodels.SessionStatusActive)}).Update("status", "closed").Error; err != nil {
-								return err
-							}
-						}
-						return nil
-					},
-				}, {
-					Name:      "ban",
-					Usage:     "Kills all active sessions for user(s), and wipes all his ssh keys",
-					ArgsUsage: "USER...",
-					Action: func(c *cli.Context) error {
-						if c.NArg() < 1 {
-							return cli.ShowSubcommandHelp(c)
-						}
-
-						if err := myself.CheckRoles([]string{"admin"}); err != nil {
-							return err
-						}
-
-						var users []*dbmodels.User
-						if err := dbmodels.UsersByIdentifiers(db, c.Args()).Find(&users).Error; err != nil {
-							return err
-						}
-
-						for _, user := range users {
-							if err := db.Where("user_id = ?", user.ID).Delete(&dbmodels.UserKey{}).Error; err != nil {
-								return err
-							}
-							if err := db.Model(&dbmodels.Session{}).Where(&dbmodels.Session{User: user, Status: string(dbmodels.SessionStatusActive)}).Update("status", "closed").Error; err != nil {
-								return err
-							}
-						}
-						return nil
-					},
 				}, {
 					Name:        "invite",
 					ArgsUsage:   "<email>",

diff --git a/pkg/bastion/ssh.go b/pkg/bastion/ssh.go
@@ -169,21 +169,6 @@ func ChannelHandler(srv *ssh.Server, conn *gossh.ServerConn, newChan gossh.NewCh
 				_ = ch.Close()
 				return
 			}
-			go func(_ *gossh.ServerConn, sessionID uint) {
-				for {
-					sess := dbmodels.Session{
-						Model:  gorm.Model{ID: sessionID},
-						Status: string(dbmodels.SessionStatusActive),
-					}
-
-					if sess.Status != string(dbmodels.SessionStatusActive) {
-						log.Println("Session", sessionID, "should be closed : closing connection")
-						conn.Close()
-						break
-					}
-					time.Sleep(60 * time.Second)
-				}
-			}(conn, sess.ID)
 			go func() {
 				err = multiChannelHandler(conn, newChan, ctx, sessionConfigs, sess.ID)
 				if err != nil {