diff --git a/server/api/term.go b/server/api/term.go index 8d9ff96de..c09df1918 100644 --- a/server/api/term.go +++ b/server/api/term.go @@ -365,17 +365,7 @@ func (api WebTerminalApi) AccessTerminalEndpoint(c echo.Context) error { func (api WebTerminalApi) permissionCheck(c echo.Context, assetId string) error { user, _ := GetCurrentAccount(c) - if nt.TypeUser == user.Type { - // 检测是否有访问权限 TODO - //assetIds, err := repository.ResourceSharerRepository.FindAssetIdsByUserId(context.TODO(), user.ID) - //if err != nil { - // return err - //} - // - //if !utils.Contains(assetIds, assetId) { - // return errors.New("您没有权限访问此资产") - //} - } + _ = user return nil } diff --git a/server/global/gateway/gateway.go b/server/global/gateway/gateway.go index ae92fc9ed..cc4d9cfe0 100644 --- a/server/global/gateway/gateway.go +++ b/server/global/gateway/gateway.go @@ -1,15 +1,15 @@ package gateway import ( + "next-terminal/server/common/term" + "next-terminal/server/utils" + "errors" "fmt" "net" - "next-terminal/server/common/term" "os" "sync" - "next-terminal/server/utils" - "golang.org/x/crypto/ssh" ) diff --git a/server/global/session/session.go b/server/global/session/session.go index eacf6b0b2..04fd22a3f 100644 --- a/server/global/session/session.go +++ b/server/global/session/session.go @@ -3,10 +3,11 @@ package session import ( "next-terminal/server/common/guacamole" "next-terminal/server/common/term" + "next-terminal/server/dto" + "sync" "github.com/gorilla/websocket" - "next-terminal/server/dto" ) type Session struct { diff --git a/server/model/role.go b/server/model/role.go index eaa510111..7ffda901d 100644 --- a/server/model/role.go +++ b/server/model/role.go @@ -3,6 +3,7 @@ package model import ( "next-terminal/server/common" "next-terminal/server/utils" + "strings" ) diff --git a/server/service/job_exec_shell.go b/server/service/job_exec_shell.go index 4f8ce678f..10f9f3dc7 100644 --- a/server/service/job_exec_shell.go +++ b/server/service/job_exec_shell.go @@ -194,7 +194,7 @@ func (r ShellJob) executeShellByLocal() { } now := time.Now() - var msg = "" + var msg string log.Debug("run local command", log.String("cmd", metadataShell.Shell)) output, outerr, err := utils.Exec(metadataShell.Shell) if err != nil { diff --git a/server/service/migrate.go b/server/service/migrate.go index 7617cadf7..736c653ad 100644 --- a/server/service/migrate.go +++ b/server/service/migrate.go @@ -31,8 +31,8 @@ type migrateService struct { } func (s *migrateService) Migrate() error { - var needMigrate = false - var localVersion = "" + var needMigrate bool + var localVersion string property, err := repository.PropertyRepository.FindByName(context.Background(), "version") if err != nil { if !errors.Is(err, gorm.ErrRecordNotFound) { diff --git a/server/service/user.go b/server/service/user.go index 0530f730d..4d6476813 100644 --- a/server/service/user.go +++ b/server/service/user.go @@ -172,11 +172,10 @@ func (service userService) GetUserLoginToken(c context.Context, username string) } func (service userService) OnEvicted(token string, value interface{}) { - - if strings.HasPrefix(token, "forever") { - } else { + if !strings.HasPrefix(token, "forever") { err := service.LogoutByToken(token) if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) { + log.Warn("logout by token failed", log.NamedError("err", err)) } } }