Skip to content

fix: Fix the problem of terminal saving failure #8043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 1 commit into from
Mar 3, 2025
Merged

fix: Fix the problem of terminal saving failure #8043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions agent/app/api/v2/dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,24 +137,3 @@ func (b *BaseApi) LoadDashboardCurrentInfo(c *gin.Context) {
data := dashboardService.LoadCurrentInfo(ioOption, netOption)
helper.SuccessWithData(c, data)
}

// @Tags Dashboard
// @Summary System restart
// @Accept json
// @Param operation path string true "request"
// @Success 200
// @Security ApiKeyAuth
// @Security Timestamp
// @Router /dashboard/system/restart/:operation [post]
func (b *BaseApi) SystemRestart(c *gin.Context) {
operation, ok := c.Params.Get("operation")
if !ok {
helper.BadRequest(c, errors.New("error operation in path"))
return
}
if err := dashboardService.Restart(operation); err != nil {
helper.InternalServer(c, err)
return
}
helper.SuccessWithOutData(c)
}
18 changes: 0 additions & 18 deletions agent/app/service/dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ type IDashboardService interface {

LoadAppLauncher() ([]dto.AppLauncher, error)
ListLauncherOption(filter string) ([]dto.LauncherOption, error)
Restart(operation string) error
}

func NewIDashboardService() IDashboardService {
Expand Down Expand Up @@ -78,23 +77,6 @@ func (u *DashboardService) Sync(req dto.SyncFromMaster) error {
}
}

func (u *DashboardService) Restart(operation string) error {
if operation != "1panel" && operation != "system" {
return fmt.Errorf("handle restart operation %s failed, err: nonsupport such operation", operation)
}
itemCmd := fmt.Sprintf("%s systemctl restart 1panel-agent.service", cmd.SudoHandleCmd())
if operation == "system" {
itemCmd = fmt.Sprintf("%s reboot", cmd.SudoHandleCmd())
}
go func() {
stdout, err := cmd.Exec(itemCmd)
if err != nil {
global.LOG.Errorf("handle %s failed, err: %v", itemCmd, stdout)
}
}()
return nil
}

func (u *DashboardService) LoadOsInfo() (*dto.OsInfo, error) {
var baseInfo dto.OsInfo
hostInfo, err := host.Info()
Expand Down
1 change: 0 additions & 1 deletion agent/router/ro_dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@ func (s *DashboardRouter) InitRouter(Router *gin.RouterGroup) {
cmdRouter.GET("/base/:ioOption/:netOption", baseApi.LoadDashboardBaseInfo)
cmdRouter.GET("/current/node", baseApi.LoadCurrentInfoForNode)
cmdRouter.GET("/current/:ioOption/:netOption", baseApi.LoadDashboardCurrentInfo)
cmdRouter.POST("/system/restart/:operation", baseApi.SystemRestart)
}
}
33 changes: 28 additions & 5 deletions core/app/api/v2/host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/1Panel-dev/1Panel/core/app/api/v2/helper"
"github.com/1Panel-dev/1Panel/core/app/dto"
"github.com/1Panel-dev/1Panel/core/app/service"
"github.com/1Panel-dev/1Panel/core/global"
"github.com/1Panel-dev/1Panel/core/utils/copier"
"github.com/1Panel-dev/1Panel/core/utils/encrypt"
Expand Down Expand Up @@ -159,7 +160,7 @@ func (b *BaseApi) DeleteHost(c *gin.Context) {
// @Summary Update host
// @Accept json
// @Param request body dto.HostOperate true "request"
// @Success 200
// @Success 200 {object} dto.HostInfo
// @Security ApiKeyAuth
// @Security Timestamp
// @Router /core/hosts/update [post]
Expand Down Expand Up @@ -214,11 +215,12 @@ func (b *BaseApi) UpdateHost(c *gin.Context) {
upMap["pass_phrase"] = req.PassPhrase
}
upMap["description"] = req.Description
if err := hostService.Update(req.ID, upMap); err != nil {
hostItem, err := hostService.Update(req.ID, upMap)
if err != nil {
helper.InternalServer(c, err)
return
}
helper.SuccessWithOutData(c)
helper.SuccessWithData(c, hostItem)
}

// @Tags Host
Expand All @@ -238,13 +240,34 @@ func (b *BaseApi) UpdateHostGroup(c *gin.Context) {

upMap := make(map[string]interface{})
upMap["group_id"] = req.GroupID
if err := hostService.Update(req.ID, upMap); err != nil {
if _, err := hostService.Update(req.ID, upMap); err != nil {
helper.InternalServer(c, err)
return
}
helper.SuccessWithOutData(c)
}

// @Tags Host
// @Summary Get host info
// @Accept json
// @Param request body dto.OperateByID true "request"
// @Success 200 {object} dto.HostInfo
// @Security ApiKeyAuth
// @Security Timestamp
// @Router /core/hosts/info [post]
func (b *BaseApi) GetHostByID(c *gin.Context) {
var req dto.OperateByID
if err := helper.CheckBindAndValidate(&req, c); err != nil {
return
}
info, err := hostService.GetHostByID(req.ID)
if err != nil {
helper.InternalServer(c, err)
return
}
helper.SuccessWithData(c, info)
}

func (b *BaseApi) WsSsh(c *gin.Context) {
wsConn, err := upGrader.Upgrade(c.Writer, c.Request, nil)
if err != nil {
Expand All @@ -265,7 +288,7 @@ func (b *BaseApi) WsSsh(c *gin.Context) {
if wshandleError(wsConn, errors.WithMessage(err, "invalid param rows in request")) {
return
}
host, err := hostService.GetHostInfo(uint(id))
host, err := service.GetHostInfo(uint(id))
if wshandleError(wsConn, errors.WithMessage(err, "load host info by id failed")) {
return
}
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Mar 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no issues to report. The code appears well-established in terms of design. In fact, there don't seem to be any discrepancies between the two versions provided. This is great! I appreciate that each function has been defined accurately and all functions work properly under their respective circumstances.

However, if you have more specific questions about how certain parts of this code operate, please feel free to ask those directly within your messages to avoid cluttering the summary with irrelevant detail.

As long as everything works fine as designed for these purposes, it can safely stand on its own without substantial change from this update. However, since we're here discussing improvements instead:

I would suggest considering an upgrade strategy that's flexible enough to accommodate future enhancements at minimal cost while ensuring compatibility across various environments (development, test, release). If you need help making such decisions or implementing updates based on the feedback from tests and real-world deployment scenarios, simply let me know!

Lastly, remember that the best advice on improving code quality generally comes from actual users; so, do get back from time to time to gauge application usage against our documentation for further guidance.

Expand Down
112 changes: 81 additions & 31 deletions core/app/service/host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ type HostService struct{}
type IHostService interface {
TestLocalConn(id uint) bool
TestByInfo(req dto.HostConnTest) bool
GetHostInfo(id uint) (*model.Host, error)
GetHostByID(id uint) (*dto.HostInfo, error)
SearchForTree(search dto.SearchForTree) ([]dto.HostTree, error)
SearchWithPage(search dto.SearchHostWithPage) (int64, interface{}, error)
Create(hostDto dto.HostOperate) (*dto.HostInfo, error)
Update(id uint, upMap map[string]interface{}) error
Update(id uint, upMap map[string]interface{}) (*dto.HostInfo, error)
Delete(id []uint) error

EncryptHost(itemVal string) (string, error)
Expand Down Expand Up @@ -124,33 +124,6 @@ func (u *HostService) TestLocalConn(id uint) bool {
return true
}

func (u *HostService) GetHostInfo(id uint) (*model.Host, error) {
host, err := hostRepo.Get(repo.WithByID(id))
if err != nil {
return nil, buserr.New("ErrRecordNotFound")
}
if len(host.Password) != 0 {
host.Password, err = encrypt.StringDecrypt(host.Password)
if err != nil {
return nil, err
}
}
if len(host.PrivateKey) != 0 {
host.PrivateKey, err = encrypt.StringDecrypt(host.PrivateKey)
if err != nil {
return nil, err
}
}

if len(host.PassPhrase) != 0 {
host.PassPhrase, err = encrypt.StringDecrypt(host.PassPhrase)
if err != nil {
return nil, err
}
}
return &host, err
}

func (u *HostService) SearchWithPage(req dto.SearchHostWithPage) (int64, interface{}, error) {
var options []global.DBOption
if len(req.Info) != 0 {
Expand Down Expand Up @@ -230,6 +203,48 @@ func (u *HostService) SearchForTree(search dto.SearchForTree) ([]dto.HostTree, e
return datas, err
}

func (u *HostService) GetHostByID(id uint) (*dto.HostInfo, error) {
var item dto.HostInfo
var host model.Host
if id == 0 {
host, _ = hostRepo.Get(repo.WithByName("local"))
} else {
host, _ = hostRepo.Get(repo.WithByID(id))
}
if host.ID == 0 {
return nil, buserr.New("ErrRecordNotFound")
}
if err := copier.Copy(&item, &host); err != nil {
return nil, buserr.WithDetail("ErrStructTransform", err.Error(), nil)
}
if !item.RememberPassword {
item.Password = ""
item.PrivateKey = ""
item.PassPhrase = ""
return &item, nil
}
var err error
if len(host.Password) != 0 {
item.Password, err = encrypt.StringDecrypt(host.Password)
if err != nil {
return nil, err
}
}
if len(host.PrivateKey) != 0 {
item.PrivateKey, err = encrypt.StringDecrypt(host.PrivateKey)
if err != nil {
return nil, err
}
}
if len(host.PassPhrase) != 0 {
item.PassPhrase, err = encrypt.StringDecrypt(host.PassPhrase)
if err != nil {
return nil, err
}
}
return &item, err
}

func (u *HostService) Create(req dto.HostOperate) (*dto.HostInfo, error) {
if req.Name == "local" {
return nil, buserr.New("ErrRecordExist")
Expand Down Expand Up @@ -297,8 +312,16 @@ func (u *HostService) Delete(ids []uint) error {
return hostRepo.Delete(repo.WithByIDs(ids))
}

func (u *HostService) Update(id uint, upMap map[string]interface{}) error {
return hostRepo.Update(id, upMap)
func (u *HostService) Update(id uint, upMap map[string]interface{}) (*dto.HostInfo, error) {
if err := hostRepo.Update(id, upMap); err != nil {
return nil, err
}
hostItem, _ := hostRepo.Get(repo.WithByID(id))
var hostinfo dto.HostInfo
if err := copier.Copy(&hostinfo, &hostItem); err != nil {
return nil, buserr.WithDetail("ErrStructTransform", err.Error(), nil)
}
return &hostinfo, nil
}

func (u *HostService) EncryptHost(itemVal string) (string, error) {
Expand All @@ -309,3 +332,30 @@ func (u *HostService) EncryptHost(itemVal string) (string, error) {
keyItem, err := encrypt.StringEncrypt(string(privateKey))
return keyItem, err
}

func GetHostInfo(id uint) (*model.Host, error) {
host, err := hostRepo.Get(repo.WithByID(id))
if err != nil {
return nil, buserr.New("ErrRecordNotFound")
}
if len(host.Password) != 0 {
host.Password, err = encrypt.StringDecrypt(host.Password)
if err != nil {
return nil, err
}
}
if len(host.PrivateKey) != 0 {
host.PrivateKey, err = encrypt.StringDecrypt(host.PrivateKey)
if err != nil {
return nil, err
}
}

if len(host.PassPhrase) != 0 {
host.PassPhrase, err = encrypt.StringDecrypt(host.PassPhrase)
if err != nil {
return nil, err
}
}
return &host, err
}
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Mar 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The provided code snippet appears to be outdated because it includes comments written using markdown style that is not suitable for this platform. Additionally, the use of placeholder names like buserr suggests there may be incomplete implementation in some parts with regards to error handling or database connection setup.

Please note that you're mentioning changes on github.com/xxx/models, which indicates this code base might belong to a specific project or team where the developer was working independently. If these differences apply only within your context or need clarification regarding how a particular part works today relative to its functionality at one time ago, could please let me know the areas for comparison? This will help answer more accurately your questions about current conditions vs what they were previously.

As far as potential issues go, without actual checks or additional details, identifying them requires looking into function logic execution flow and comparing against expectations from past code versions. It's usually safer for developers to always update their own work under consideration.

To summarize:

  • There seems to be an inconsistency between the original comments and the new formatting.
  • The updated version introduces missing errors / warnings etc when accessing global variables directly through index (for instance var x int; var y string;). Make sure variable name matches real types otherwise expected behavior might vary significantly.
  • Function names seem changed or reorganised without justification in many places.
  • Potential improvements include better parameterization and validation, added error checking around database calls if relevant, enhanced logging system support.
  • As mentioned initially: no issues detected based purely on syntax/formatting unless further context provides more significant problems (e.g., bugs).

For future reference, if possible make clear which parts have been updated/rejected, so we can focus our attention properly.

22 changes: 11 additions & 11 deletions core/constant/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,16 @@ var WebUrlMap = map[string]struct{}{
"/ai/model": {},
"/ai/gpu": {},

"/containers": {},
"/containers/container": {},
"containers/container/operate": {},
"/containers/image": {},
"/containers/network": {},
"/containers/volume": {},
"/containers/repo": {},
"/containers/compose": {},
"/containers/template": {},
"/containers/setting": {},
"/containers/dashboard": {},
"/containers": {},
"/containers/container": {},
"/containers/image": {},
"/containers/network": {},
"/containers/volume": {},
"/containers/repo": {},
"/containers/compose": {},
"/containers/template": {},
"/containers/setting": {},
"/containers/dashboard": {},

"/cronjobs": {},

Expand Down Expand Up @@ -147,6 +146,7 @@ var WebUrlMap = map[string]struct{}{
}

var DynamicRoutes = []string{
`^/containers/container/operate/[^/]+$`,
`^/containers/composeDetail/[^/]+$`,
`^/databases/mysql/setting/[^/]+/[^/]+$`,
`^/databases/postgresql/setting/[^/]+/[^/]+$`,
Expand Down
1 change: 1 addition & 0 deletions core/router/ro_host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ func (s *HostRouter) InitRouter(Router *gin.RouterGroup) {
baseApi := v2.ApiGroupApp.BaseApi
{
hostRouter.POST("", baseApi.CreateHost)
hostRouter.POST("/info", baseApi.GetHostByID)
hostRouter.POST("/del", baseApi.DeleteHost)
hostRouter.POST("/update", baseApi.UpdateHost)
hostRouter.POST("/update/group", baseApi.UpdateHostGroup)
Expand Down
7 changes: 7 additions & 0 deletions core/utils/ssh/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ func (c *SSHClient) Run(shell string) (string, error) {
return string(buf), err
}

func (c *SSHClient) SudoHandleCmd() string {
if _, err := c.Run("sudo -n ls"); err == nil {
return "sudo "
}
return ""
}

func (c *SSHClient) Runf(shell string, args ...interface{}) (string, error) {
session, err := c.Client.NewSession()
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/api/modules/terminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import { deepCopy } from '@/utils/util';
export const searchHosts = (params: Host.SearchWithPage) => {
return http.post<ResPage<Host.Host>>(`/core/hosts/search`, params);
};
export const getHostByID = (id: number) => {
return http.post<Host.Host>(`/core/hosts/info`, { id: id });
};
export const getHostTree = (params: Host.ReqSearch) => {
return http.post<Array<Host.HostTree>>(`/core/hosts/tree`, params);
};
Expand Down
Loading
Loading