diff --git a/internal/configloaders/admin_module.go b/internal/configloaders/admin_module.go index 07c1c232..602083f5 100644 --- a/internal/configloaders/admin_module.go +++ b/internal/configloaders/admin_module.go @@ -16,6 +16,7 @@ const ( AdminModuleCodeAdmin AdminModuleCode = "admin" AdminModuleCodeLog AdminModuleCode = "log" AdminModuleCodeSetting AdminModuleCode = "setting" + AdminModuleCodeCommon AdminModuleCode = "common" // 只要登录就可以访问的模块 ) var sharedAdminModuleMapping = map[int64]*AdminModuleList{} // adminId => AdminModuleList @@ -68,6 +69,10 @@ func AllowModule(adminId int64, module string) bool { locker.Lock() defer locker.Unlock() + if module == AdminModuleCodeCommon { + return true + } + if len(sharedAdminModuleMapping) == 0 { _, _ = loadAdminModuleMapping() } diff --git a/internal/web/actions/default/admins/init.go b/internal/web/actions/default/admins/init.go index 8ef5e76a..a602d385 100644 --- a/internal/web/actions/default/admins/init.go +++ b/internal/web/actions/default/admins/init.go @@ -1,6 +1,7 @@ package admins import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,9 +9,8 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeAdmin)). Data("teaMenu", "admins"). - Data("teaModule", "admin"). Prefix("/admins"). Get("", new(IndexAction)). GetPost("/createPopup", new(CreatePopupAction)). diff --git a/internal/web/actions/default/api/init.go b/internal/web/actions/default/api/init.go index 005c1067..06020c8c 100644 --- a/internal/web/actions/default/api/init.go +++ b/internal/web/actions/default/api/init.go @@ -1,6 +1,7 @@ package api import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/api/node" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(NewHelper()). Helper(settingutils.NewHelper("apiNodes")). Prefix("/api"). diff --git a/internal/web/actions/default/api/node/init.go b/internal/web/actions/default/api/node/init.go index 413a526f..f485d5d4 100644 --- a/internal/web/actions/default/api/node/init.go +++ b/internal/web/actions/default/api/node/init.go @@ -1,6 +1,7 @@ package node import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(settingutils.NewHelper("apiNodes")). Prefix("/api/node"). diff --git a/internal/web/actions/default/clusters/cluster/init.go b/internal/web/actions/default/clusters/cluster/init.go index d6a11830..2035698c 100644 --- a/internal/web/actions/default/clusters/cluster/init.go +++ b/internal/web/actions/default/clusters/cluster/init.go @@ -1,6 +1,7 @@ package cluster import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/groups" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node" clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils" @@ -11,7 +12,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNode)). Helper(clusters.NewClusterHelper()). Prefix("/clusters/cluster"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/clusters/cluster/settings/init.go b/internal/web/actions/default/clusters/cluster/settings/init.go index f0eb03f4..be428aa2 100644 --- a/internal/web/actions/default/clusters/cluster/settings/init.go +++ b/internal/web/actions/default/clusters/cluster/settings/init.go @@ -1,6 +1,7 @@ package settings import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/dns" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/toa" clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils" @@ -11,7 +12,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNode)). Helper(clusters.NewClusterHelper()). Prefix("/clusters/cluster/settings"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/clusters/grants/init.go b/internal/web/actions/default/clusters/grants/init.go index 695edaeb..932adb28 100644 --- a/internal/web/actions/default/clusters/grants/init.go +++ b/internal/web/actions/default/clusters/grants/init.go @@ -1,6 +1,7 @@ package grants import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNode)). Helper(clusterutils.NewClustersHelper()). Data("teaSubMenu", "grant"). Prefix("/clusters/grants"). diff --git a/internal/web/actions/default/clusters/init.go b/internal/web/actions/default/clusters/init.go index 02589dd1..0db9cd5f 100644 --- a/internal/web/actions/default/clusters/init.go +++ b/internal/web/actions/default/clusters/init.go @@ -1,6 +1,7 @@ package clusters import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,9 +10,8 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNode)). Helper(clusterutils.NewClustersHelper()). - Data("teaModule", "node"). Prefix("/clusters"). Get("", new(IndexAction)). GetPost("/create", new(CreateAction)). diff --git a/internal/web/actions/default/dashboard/index.go b/internal/web/actions/default/dashboard/index.go index f77ec229..6e84e7d2 100644 --- a/internal/web/actions/default/dashboard/index.go +++ b/internal/web/actions/default/dashboard/index.go @@ -24,4 +24,6 @@ func (this *IndexAction) RunGet(params struct{}) { } } } + + this.Show() } diff --git a/internal/web/actions/default/dashboard/init.go b/internal/web/actions/default/dashboard/init.go index cde856c7..886bb474 100644 --- a/internal/web/actions/default/dashboard/init.go +++ b/internal/web/actions/default/dashboard/init.go @@ -1,6 +1,7 @@ package dashboard import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,7 +9,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server.Prefix("/dashboard"). - Helper(new(helpers.UserMustAuth)). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeCommon)). GetPost("", new(IndexAction)). EndAll() }) diff --git a/internal/web/actions/default/db/init.go b/internal/web/actions/default/db/init.go index 0b4c439a..036f4bd0 100644 --- a/internal/web/actions/default/db/init.go +++ b/internal/web/actions/default/db/init.go @@ -1,6 +1,7 @@ package db import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(new(helpers.UserMustAuth)). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(new(Helper)). Helper(settingutils.NewHelper("dbNodes")). Prefix("/db"). diff --git a/internal/web/actions/default/dns/init.go b/internal/web/actions/default/dns/init.go index b6834e15..364c5b2d 100644 --- a/internal/web/actions/default/dns/init.go +++ b/internal/web/actions/default/dns/init.go @@ -1,6 +1,7 @@ package dns import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/clusters" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/issues" @@ -12,9 +13,8 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(new(helpers.UserMustAuth)). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeDNS)). Helper(new(Helper)). - Data("teaModule", "dns"). Prefix("/dns"). Get("", new(IndexAction)). GetPost("/updateClusterPopup", new(UpdateClusterPopupAction)). diff --git a/internal/web/actions/default/log/init.go b/internal/web/actions/default/log/init.go index 90bfa139..4572c552 100644 --- a/internal/web/actions/default/log/init.go +++ b/internal/web/actions/default/log/init.go @@ -1,6 +1,7 @@ package log import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,9 +9,8 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(new(helpers.UserMustAuth)). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeLog)). Helper(new(Helper)). - Data("teaModule", "log"). Prefix("/log"). Get("", new(IndexAction)). Get("/exportExcel", new(ExportExcelAction)). diff --git a/internal/web/actions/default/messages/init.go b/internal/web/actions/default/messages/init.go index 39cc0efe..75b06a8a 100644 --- a/internal/web/actions/default/messages/init.go +++ b/internal/web/actions/default/messages/init.go @@ -1,6 +1,7 @@ package messages import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,7 +9,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(new(helpers.UserMustAuth)). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeCommon)). Helper(new(Helper)). Prefix("/messages"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/nodes/init.go b/internal/web/actions/default/nodes/init.go index 00064620..64b05a83 100644 --- a/internal/web/actions/default/nodes/init.go +++ b/internal/web/actions/default/nodes/init.go @@ -1,6 +1,7 @@ package nodes import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(new(helpers.UserMustAuth)). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNode)). Helper(new(Helper)). Prefix("/nodes"). Post("/delete", new(DeleteAction)). diff --git a/internal/web/actions/default/servers/certs/init.go b/internal/web/actions/default/servers/certs/init.go index 9af61b81..21297d23 100644 --- a/internal/web/actions/default/servers/certs/init.go +++ b/internal/web/actions/default/servers/certs/init.go @@ -1,6 +1,7 @@ package certs import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/certs/acme" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/certs/acme/users" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(NewHelper()). Data("teaSubMenu", "cert"). diff --git a/internal/web/actions/default/servers/components/cache/init.go b/internal/web/actions/default/servers/components/cache/init.go index 59f2c9ec..be5ae613 100644 --- a/internal/web/actions/default/servers/components/cache/init.go +++ b/internal/web/actions/default/servers/components/cache/init.go @@ -1,6 +1,7 @@ package cache import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,7 +9,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(NewHelper()). Data("teaMenu", "servers"). Data("teaSubMenu", "cache"). diff --git a/internal/web/actions/default/servers/components/groups/init.go b/internal/web/actions/default/servers/components/groups/init.go index 2f561610..1a839c57 100644 --- a/internal/web/actions/default/servers/components/groups/init.go +++ b/internal/web/actions/default/servers/components/groups/init.go @@ -1,6 +1,7 @@ package groups import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,7 +9,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(NewHelper()). Data("teaSubMenu", "group"). Prefix("/servers/components/groups"). diff --git a/internal/web/actions/default/servers/components/init.go b/internal/web/actions/default/servers/components/init.go index ff952c27..d5c29756 100644 --- a/internal/web/actions/default/servers/components/init.go +++ b/internal/web/actions/default/servers/components/init.go @@ -1,6 +1,7 @@ package components import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,7 +9,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Data("teaSubMenu", "global"). Helper(NewHelper()). Prefix("/servers/components"). diff --git a/internal/web/actions/default/servers/components/log/init.go b/internal/web/actions/default/servers/components/log/init.go index 915213cc..87345cfa 100644 --- a/internal/web/actions/default/servers/components/log/init.go +++ b/internal/web/actions/default/servers/components/log/init.go @@ -1,6 +1,7 @@ package log import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,7 +9,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(NewHelper()). Prefix("/servers/components/log"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/components/waf/init.go b/internal/web/actions/default/servers/components/waf/init.go index 0e0ed36b..bc2bc8b9 100644 --- a/internal/web/actions/default/servers/components/waf/init.go +++ b/internal/web/actions/default/servers/components/waf/init.go @@ -1,6 +1,7 @@ package waf import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/waf/ipadmin" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(NewHelper()). Data("teaMenu", "servers"). Data("teaSubMenu", "waf"). diff --git a/internal/web/actions/default/servers/init.go b/internal/web/actions/default/servers/init.go index f6fb1b60..f68a2cd9 100644 --- a/internal/web/actions/default/servers/init.go +++ b/internal/web/actions/default/servers/init.go @@ -1,6 +1,7 @@ package servers import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,7 +9,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(NewHelper()). Data("teaModule", "server"). Prefix("/servers"). diff --git a/internal/web/actions/default/servers/server/board/init.go b/internal/web/actions/default/servers/server/board/init.go index e528c60d..82910025 100644 --- a/internal/web/actions/default/servers/server/board/init.go +++ b/internal/web/actions/default/servers/server/board/init.go @@ -1,6 +1,7 @@ package board import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/board"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/delete/init.go b/internal/web/actions/default/servers/server/delete/init.go index 15032292..d0ae7892 100644 --- a/internal/web/actions/default/servers/server/delete/init.go +++ b/internal/web/actions/default/servers/server/delete/init.go @@ -1,6 +1,7 @@ package delete import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/delete"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/init.go b/internal/web/actions/default/servers/server/init.go index 2bec7a04..fae6a2ec 100644 --- a/internal/web/actions/default/servers/server/init.go +++ b/internal/web/actions/default/servers/server/init.go @@ -1,6 +1,7 @@ package server import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/log/init.go b/internal/web/actions/default/servers/server/log/init.go index 8016e1b2..8e5a348a 100644 --- a/internal/web/actions/default/servers/server/log/init.go +++ b/internal/web/actions/default/servers/server/log/init.go @@ -1,6 +1,7 @@ package log import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/log"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/access/init.go b/internal/web/actions/default/servers/server/settings/access/init.go index ab47a0b7..6c213793 100644 --- a/internal/web/actions/default/servers/server/settings/access/init.go +++ b/internal/web/actions/default/servers/server/settings/access/init.go @@ -1,6 +1,7 @@ package access import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/access"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/accessLog/init.go b/internal/web/actions/default/servers/server/settings/accessLog/init.go index d7a6931f..fb08ba65 100644 --- a/internal/web/actions/default/servers/server/settings/accessLog/init.go +++ b/internal/web/actions/default/servers/server/settings/accessLog/init.go @@ -1,6 +1,7 @@ package accessLog import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/accessLog"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/cache/init.go b/internal/web/actions/default/servers/server/settings/cache/init.go index a455096d..058d7aa0 100644 --- a/internal/web/actions/default/servers/server/settings/cache/init.go +++ b/internal/web/actions/default/servers/server/settings/cache/init.go @@ -1,6 +1,7 @@ package cache import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/cache"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/charset/init.go b/internal/web/actions/default/servers/server/settings/charset/init.go index 2cb835ec..ba991c7d 100644 --- a/internal/web/actions/default/servers/server/settings/charset/init.go +++ b/internal/web/actions/default/servers/server/settings/charset/init.go @@ -1,6 +1,7 @@ package charset import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/charset"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/conds/init.go b/internal/web/actions/default/servers/server/settings/conds/init.go index cdaf2dd0..f753a6fc 100644 --- a/internal/web/actions/default/servers/server/settings/conds/init.go +++ b/internal/web/actions/default/servers/server/settings/conds/init.go @@ -1,6 +1,7 @@ package conds import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,7 +9,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Prefix("/servers/server/settings/conds"). GetPost("/addGroupPopup", new(AddGroupPopupAction)). GetPost("/addCondPopup", new(AddCondPopupAction)). diff --git a/internal/web/actions/default/servers/server/settings/dns/init.go b/internal/web/actions/default/servers/server/settings/dns/init.go index a5c575c3..ab0110d4 100644 --- a/internal/web/actions/default/servers/server/settings/dns/init.go +++ b/internal/web/actions/default/servers/server/settings/dns/init.go @@ -1,6 +1,7 @@ package dns import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/dns"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/gzip/init.go b/internal/web/actions/default/servers/server/settings/gzip/init.go index d0f5a798..6963e58f 100644 --- a/internal/web/actions/default/servers/server/settings/gzip/init.go +++ b/internal/web/actions/default/servers/server/settings/gzip/init.go @@ -1,6 +1,7 @@ package gzip import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/gzip"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/headers/init.go b/internal/web/actions/default/servers/server/settings/headers/init.go index 590fa76b..08153096 100644 --- a/internal/web/actions/default/servers/server/settings/headers/init.go +++ b/internal/web/actions/default/servers/server/settings/headers/init.go @@ -1,6 +1,7 @@ package headers import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/headers"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/http/init.go b/internal/web/actions/default/servers/server/settings/http/init.go index 9591bdd7..d49156f9 100644 --- a/internal/web/actions/default/servers/server/settings/http/init.go +++ b/internal/web/actions/default/servers/server/settings/http/init.go @@ -1,6 +1,7 @@ package http import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/http"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/https/init.go b/internal/web/actions/default/servers/server/settings/https/init.go index aa201b5f..cca3f2c2 100644 --- a/internal/web/actions/default/servers/server/settings/https/init.go +++ b/internal/web/actions/default/servers/server/settings/https/init.go @@ -1,6 +1,7 @@ package https import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/https"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/init.go b/internal/web/actions/default/servers/server/settings/init.go index 2c6e99c5..48a1d773 100644 --- a/internal/web/actions/default/servers/server/settings/init.go +++ b/internal/web/actions/default/servers/server/settings/init.go @@ -1,6 +1,7 @@ package settings import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/locations/access/init.go b/internal/web/actions/default/servers/server/settings/locations/access/init.go index ef3edce7..53958c11 100644 --- a/internal/web/actions/default/servers/server/settings/locations/access/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/access/init.go @@ -1,6 +1,7 @@ package access import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "access"). diff --git a/internal/web/actions/default/servers/server/settings/locations/accessLog/init.go b/internal/web/actions/default/servers/server/settings/locations/accessLog/init.go index 774c0e1d..c41ea03c 100644 --- a/internal/web/actions/default/servers/server/settings/locations/accessLog/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/accessLog/init.go @@ -1,6 +1,7 @@ package accessLog import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "accessLog"). diff --git a/internal/web/actions/default/servers/server/settings/locations/cache/init.go b/internal/web/actions/default/servers/server/settings/locations/cache/init.go index d40fdd28..2424f65a 100644 --- a/internal/web/actions/default/servers/server/settings/locations/cache/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/cache/init.go @@ -1,6 +1,7 @@ package cache import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "cache"). diff --git a/internal/web/actions/default/servers/server/settings/locations/charset/init.go b/internal/web/actions/default/servers/server/settings/locations/charset/init.go index ebd4a44c..f573f92a 100644 --- a/internal/web/actions/default/servers/server/settings/locations/charset/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/charset/init.go @@ -1,6 +1,7 @@ package charset import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "charset"). diff --git a/internal/web/actions/default/servers/server/settings/locations/gzip/init.go b/internal/web/actions/default/servers/server/settings/locations/gzip/init.go index 1dcf483b..f95b7437 100644 --- a/internal/web/actions/default/servers/server/settings/locations/gzip/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/gzip/init.go @@ -1,6 +1,7 @@ package gzip import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "gzip"). diff --git a/internal/web/actions/default/servers/server/settings/locations/headers/init.go b/internal/web/actions/default/servers/server/settings/locations/headers/init.go index 5d70e9f1..2f9dcbcf 100644 --- a/internal/web/actions/default/servers/server/settings/locations/headers/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/headers/init.go @@ -1,6 +1,7 @@ package headers import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "header"). diff --git a/internal/web/actions/default/servers/server/settings/locations/http/init.go b/internal/web/actions/default/servers/server/settings/locations/http/init.go index e884876e..2ae5c217 100644 --- a/internal/web/actions/default/servers/server/settings/locations/http/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/http/init.go @@ -1,6 +1,7 @@ package http import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "http"). diff --git a/internal/web/actions/default/servers/server/settings/locations/init.go b/internal/web/actions/default/servers/server/settings/locations/init.go index ccb6330e..1a765c55 100644 --- a/internal/web/actions/default/servers/server/settings/locations/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/init.go @@ -1,6 +1,7 @@ package locations import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/locations"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/locations/location/init.go b/internal/web/actions/default/servers/server/settings/locations/location/init.go index 09731895..e18c2820 100644 --- a/internal/web/actions/default/servers/server/settings/locations/location/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/location/init.go @@ -1,6 +1,7 @@ package location import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "basic"). diff --git a/internal/web/actions/default/servers/server/settings/locations/pages/init.go b/internal/web/actions/default/servers/server/settings/locations/pages/init.go index 7e036a1e..1c6fc22a 100644 --- a/internal/web/actions/default/servers/server/settings/locations/pages/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/pages/init.go @@ -1,6 +1,7 @@ package pages import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "pages"). diff --git a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/init.go b/internal/web/actions/default/servers/server/settings/locations/reverseProxy/init.go index f7ba5a63..0ae79824 100644 --- a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/reverseProxy/init.go @@ -1,6 +1,7 @@ package reverseProxy import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("mainTab", "setting"). diff --git a/internal/web/actions/default/servers/server/settings/locations/rewrite/init.go b/internal/web/actions/default/servers/server/settings/locations/rewrite/init.go index e03b352c..d7d1ac96 100644 --- a/internal/web/actions/default/servers/server/settings/locations/rewrite/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/rewrite/init.go @@ -1,6 +1,7 @@ package rewrite import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "rewrite"). diff --git a/internal/web/actions/default/servers/server/settings/locations/stat/init.go b/internal/web/actions/default/servers/server/settings/locations/stat/init.go index 54f32572..96be208c 100644 --- a/internal/web/actions/default/servers/server/settings/locations/stat/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/stat/init.go @@ -1,6 +1,7 @@ package stat import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "stat"). diff --git a/internal/web/actions/default/servers/server/settings/locations/waf/init.go b/internal/web/actions/default/servers/server/settings/locations/waf/init.go index 635cb54f..e8c2d015 100644 --- a/internal/web/actions/default/servers/server/settings/locations/waf/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/waf/init.go @@ -1,6 +1,7 @@ package waf import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "waf"). diff --git a/internal/web/actions/default/servers/server/settings/locations/web/init.go b/internal/web/actions/default/servers/server/settings/locations/web/init.go index d3570db3..0791c3e4 100644 --- a/internal/web/actions/default/servers/server/settings/locations/web/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/web/init.go @@ -1,6 +1,7 @@ package web import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "web"). diff --git a/internal/web/actions/default/servers/server/settings/locations/websocket/init.go b/internal/web/actions/default/servers/server/settings/locations/websocket/init.go index 3c8c2d55..612e5d14 100644 --- a/internal/web/actions/default/servers/server/settings/locations/websocket/init.go +++ b/internal/web/actions/default/servers/server/settings/locations/websocket/init.go @@ -1,6 +1,7 @@ package websocket import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/locations/locationutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -10,7 +11,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(locationutils.NewLocationHelper()). Helper(serverutils.NewServerHelper()). Data("tinyMenuItem", "websocket"). diff --git a/internal/web/actions/default/servers/server/settings/origins/init.go b/internal/web/actions/default/servers/server/settings/origins/init.go index ab1f2539..563bad7b 100644 --- a/internal/web/actions/default/servers/server/settings/origins/init.go +++ b/internal/web/actions/default/servers/server/settings/origins/init.go @@ -1,6 +1,7 @@ package origins import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,7 +9,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Prefix("/servers/server/settings/origins"). GetPost("/addPopup", new(AddPopupAction)). Post("/delete", new(DeleteAction)). diff --git a/internal/web/actions/default/servers/server/settings/pages/init.go b/internal/web/actions/default/servers/server/settings/pages/init.go index 9947900d..5eedcce4 100644 --- a/internal/web/actions/default/servers/server/settings/pages/init.go +++ b/internal/web/actions/default/servers/server/settings/pages/init.go @@ -1,6 +1,7 @@ package pages import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/pages"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/reverseProxy/init.go b/internal/web/actions/default/servers/server/settings/reverseProxy/init.go index 0cea5f0a..89e79a42 100644 --- a/internal/web/actions/default/servers/server/settings/reverseProxy/init.go +++ b/internal/web/actions/default/servers/server/settings/reverseProxy/init.go @@ -1,6 +1,7 @@ package reverseProxy import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Data("mainTab", "setting"). Data("secondMenuItem", "reverseProxy"). diff --git a/internal/web/actions/default/servers/server/settings/rewrite/init.go b/internal/web/actions/default/servers/server/settings/rewrite/init.go index b66d916a..642575ea 100644 --- a/internal/web/actions/default/servers/server/settings/rewrite/init.go +++ b/internal/web/actions/default/servers/server/settings/rewrite/init.go @@ -1,6 +1,7 @@ package rewrite import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/rewrite"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/serverNames/init.go b/internal/web/actions/default/servers/server/settings/serverNames/init.go index 89a0f1e3..f7ef2551 100644 --- a/internal/web/actions/default/servers/server/settings/serverNames/init.go +++ b/internal/web/actions/default/servers/server/settings/serverNames/init.go @@ -1,6 +1,7 @@ package serverNames import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Data("mainTab", "setting"). Data("secondMenuItem", "serverName"). diff --git a/internal/web/actions/default/servers/server/settings/stat/init.go b/internal/web/actions/default/servers/server/settings/stat/init.go index 4e7da8ec..ff2019f8 100644 --- a/internal/web/actions/default/servers/server/settings/stat/init.go +++ b/internal/web/actions/default/servers/server/settings/stat/init.go @@ -1,6 +1,7 @@ package stat import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/stat"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/tcp/init.go b/internal/web/actions/default/servers/server/settings/tcp/init.go index 7fe9f132..a14fe388 100644 --- a/internal/web/actions/default/servers/server/settings/tcp/init.go +++ b/internal/web/actions/default/servers/server/settings/tcp/init.go @@ -1,6 +1,7 @@ package tcp import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/tcp"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/tls/init.go b/internal/web/actions/default/servers/server/settings/tls/init.go index 46a6ddfb..9e73e0b4 100644 --- a/internal/web/actions/default/servers/server/settings/tls/init.go +++ b/internal/web/actions/default/servers/server/settings/tls/init.go @@ -1,6 +1,7 @@ package tls import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/tls"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/udp/init.go b/internal/web/actions/default/servers/server/settings/udp/init.go index 9343bd57..a2a0543e 100644 --- a/internal/web/actions/default/servers/server/settings/udp/init.go +++ b/internal/web/actions/default/servers/server/settings/udp/init.go @@ -1,6 +1,7 @@ package udp import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/udp"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/unix/init.go b/internal/web/actions/default/servers/server/settings/unix/init.go index 41458a4c..669fcebb 100644 --- a/internal/web/actions/default/servers/server/settings/unix/init.go +++ b/internal/web/actions/default/servers/server/settings/unix/init.go @@ -1,6 +1,7 @@ package unix import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/unix"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/waf/init.go b/internal/web/actions/default/servers/server/settings/waf/init.go index c6792bae..5d29c5b9 100644 --- a/internal/web/actions/default/servers/server/settings/waf/init.go +++ b/internal/web/actions/default/servers/server/settings/waf/init.go @@ -1,6 +1,7 @@ package waf import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/waf"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/web/init.go b/internal/web/actions/default/servers/server/settings/web/init.go index 76f611ea..3e3ad49d 100644 --- a/internal/web/actions/default/servers/server/settings/web/init.go +++ b/internal/web/actions/default/servers/server/settings/web/init.go @@ -1,6 +1,7 @@ package web import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/web"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/settings/websocket/init.go b/internal/web/actions/default/servers/server/settings/websocket/init.go index 92f67b30..5d723fc0 100644 --- a/internal/web/actions/default/servers/server/settings/websocket/init.go +++ b/internal/web/actions/default/servers/server/settings/websocket/init.go @@ -1,6 +1,7 @@ package websocket import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/settings/websocket"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/servers/server/stat/init.go b/internal/web/actions/default/servers/server/stat/init.go index 01331dd8..b5e75735 100644 --- a/internal/web/actions/default/servers/server/stat/init.go +++ b/internal/web/actions/default/servers/server/stat/init.go @@ -1,6 +1,7 @@ package stat import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(serverutils.NewServerHelper()). Prefix("/servers/server/stat"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/settings/backup/init.go b/internal/web/actions/default/settings/backup/init.go index 4601f271..0503591f 100644 --- a/internal/web/actions/default/settings/backup/init.go +++ b/internal/web/actions/default/settings/backup/init.go @@ -1,6 +1,7 @@ package backup import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(settingutils.NewHelper("backup")). Prefix("/settings/backup"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/settings/database/init.go b/internal/web/actions/default/settings/database/init.go index d8c7173b..10fb9a30 100644 --- a/internal/web/actions/default/settings/database/init.go +++ b/internal/web/actions/default/settings/database/init.go @@ -1,6 +1,7 @@ package profile import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(settingutils.NewHelper("database")). Prefix("/settings/database"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/settings/init.go b/internal/web/actions/default/settings/init.go index 08aefac0..a53634f5 100644 --- a/internal/web/actions/default/settings/init.go +++ b/internal/web/actions/default/settings/init.go @@ -1,6 +1,7 @@ package settings import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" ) @@ -8,9 +9,8 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(NewHelper()). - Data("teaModule", "setting"). Prefix("/settings"). Get("", new(IndexAction)). EndAll() diff --git a/internal/web/actions/default/settings/ip-library/init.go b/internal/web/actions/default/settings/ip-library/init.go index 30e35ef1..6e66de93 100644 --- a/internal/web/actions/default/settings/ip-library/init.go +++ b/internal/web/actions/default/settings/ip-library/init.go @@ -1,6 +1,7 @@ package iplibrary import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(NewHelper()). Helper(settingutils.NewHelper("ipLibrary")). Prefix("/settings/ip-library"). diff --git a/internal/web/actions/default/settings/login/init.go b/internal/web/actions/default/settings/login/init.go index 3473eba2..92886ef0 100644 --- a/internal/web/actions/default/settings/login/init.go +++ b/internal/web/actions/default/settings/login/init.go @@ -1,6 +1,7 @@ package login import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeCommon)). Helper(settingutils.NewHelper("login")). Prefix("/settings/login"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/settings/profile/init.go b/internal/web/actions/default/settings/profile/init.go index 23858f75..7d18c25c 100644 --- a/internal/web/actions/default/settings/profile/init.go +++ b/internal/web/actions/default/settings/profile/init.go @@ -1,6 +1,7 @@ package profile import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeCommon)). Helper(settingutils.NewHelper("profile")). Prefix("/settings/profile"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/settings/security/init.go b/internal/web/actions/default/settings/security/init.go index accd2ce0..ef6d5ef0 100644 --- a/internal/web/actions/default/settings/security/init.go +++ b/internal/web/actions/default/settings/security/init.go @@ -1,6 +1,7 @@ package security import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(settingutils.NewHelper("security")). Prefix("/settings/security"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/settings/server/init.go b/internal/web/actions/default/settings/server/init.go index 3b872de9..a9705736 100644 --- a/internal/web/actions/default/settings/server/init.go +++ b/internal/web/actions/default/settings/server/init.go @@ -1,6 +1,7 @@ package server import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)). Helper(settingutils.NewHelper("server")). Prefix("/settings/server"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/settings/settingutils/utils.go b/internal/web/actions/default/settings/settingutils/utils.go index e9badddd..7d831c41 100644 --- a/internal/web/actions/default/settings/settingutils/utils.go +++ b/internal/web/actions/default/settings/settingutils/utils.go @@ -1,6 +1,7 @@ package settingutils import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/iwind/TeaGo/actions" ) @@ -25,14 +26,18 @@ func (this *Helper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool) // 标签栏 tabbar := actionutils.NewTabbar() - tabbar.Add("Web服务", "", "/settings/server", "", this.tab == "server") - tabbar.Add("界面设置", "", "/settings/ui", "", this.tab == "ui") - tabbar.Add("安全设置", "", "/settings/security", "", this.tab == "security") - tabbar.Add("数据库", "", "/settings/database", "", this.tab == "database") - tabbar.Add("API节点", "", "/api", "", this.tab == "apiNodes") - tabbar.Add("日志数据库", "", "/db", "", this.tab == "dbNodes") - tabbar.Add("IP库", "", "/settings/ip-library", "", this.tab == "ipLibrary") - tabbar.Add("备份", "", "/settings/backup", "", this.tab == "backup") + var session = action.Session() + var adminId = session.GetInt64("adminId") + if configloaders.AllowModule(adminId, configloaders.AdminModuleCodeSetting) { + tabbar.Add("Web服务", "", "/settings/server", "", this.tab == "server") + tabbar.Add("界面设置", "", "/settings/ui", "", this.tab == "ui") + tabbar.Add("安全设置", "", "/settings/security", "", this.tab == "security") + tabbar.Add("数据库", "", "/settings/database", "", this.tab == "database") + tabbar.Add("API节点", "", "/api", "", this.tab == "apiNodes") + tabbar.Add("日志数据库", "", "/db", "", this.tab == "dbNodes") + tabbar.Add("IP库", "", "/settings/ip-library", "", this.tab == "ipLibrary") + tabbar.Add("备份", "", "/settings/backup", "", this.tab == "backup") + } tabbar.Add("个人资料", "", "/settings/profile", "", this.tab == "profile") tabbar.Add("登录设置", "", "/settings/login", "", this.tab == "login") actionutils.SetTabbar(actionPtr, tabbar) diff --git a/internal/web/actions/default/settings/ui/init.go b/internal/web/actions/default/settings/ui/init.go index 3e0f01a2..5faaf9ee 100644 --- a/internal/web/actions/default/settings/ui/init.go +++ b/internal/web/actions/default/settings/ui/init.go @@ -1,6 +1,7 @@ package server import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeCommon)). Helper(settingutils.NewHelper("ui")). Prefix("/settings/ui"). GetPost("", new(IndexAction)). diff --git a/internal/web/actions/default/settings/upgrade/init.go b/internal/web/actions/default/settings/upgrade/init.go index 7aa7e41b..c495cadd 100644 --- a/internal/web/actions/default/settings/upgrade/init.go +++ b/internal/web/actions/default/settings/upgrade/init.go @@ -1,6 +1,7 @@ package upgrade import ( + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/settings/settingutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" @@ -9,7 +10,7 @@ import ( func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. - Helper(helpers.NewUserMustAuth()). + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)). Helper(settingutils.NewHelper("upgrade")). Prefix("/settings/upgrade"). Get("", new(IndexAction)). diff --git a/internal/web/actions/default/ui/download.go b/internal/web/actions/default/ui/download.go index bd94c66a..d0ea6b60 100644 --- a/internal/web/actions/default/ui/download.go +++ b/internal/web/actions/default/ui/download.go @@ -2,7 +2,6 @@ package ui import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" - "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" ) // 下载指定的文本内容 @@ -17,8 +16,6 @@ func (this *DownloadAction) Init() { func (this *DownloadAction) RunGet(params struct { File string Text string - - Auth *helpers.UserMustAuth }) { this.AddHeader("Content-Disposition", "attachment; filename=\""+params.File+"\";") this.WriteString(params.Text) diff --git a/internal/web/actions/default/ui/init.go b/internal/web/actions/default/ui/init.go index 2a519fad..654db405 100644 --- a/internal/web/actions/default/ui/init.go +++ b/internal/web/actions/default/ui/init.go @@ -2,6 +2,8 @@ package ui import ( "compress/gzip" + "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" "github.com/iwind/TeaGo" "github.com/iwind/TeaGo/actions" ) @@ -10,13 +12,18 @@ func init() { TeaGo.BeforeStart(func(server *TeaGo.Server) { server. Prefix("/ui"). - Get("/download", new(DownloadAction)). - GetPost("/selectProvincesPopup", new(SelectProvincesPopupAction)). - GetPost("/selectCountriesPopup", new(SelectCountriesPopupAction)). // 以下的需要压缩 Helper(&actions.Gzip{Level: gzip.BestCompression}). Get("/components.js", new(ComponentsAction)). + EndHelpers(). + + // 以下需要登录 + Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeCommon)). + Get("/download", new(DownloadAction)). + GetPost("/selectProvincesPopup", new(SelectProvincesPopupAction)). + GetPost("/selectCountriesPopup", new(SelectCountriesPopupAction)). + EndAll() }) } diff --git a/internal/web/helpers/user_must_auth.go b/internal/web/helpers/user_must_auth.go index d6ae4e28..18c16b3e 100644 --- a/internal/web/helpers/user_must_auth.go +++ b/internal/web/helpers/user_must_auth.go @@ -14,16 +14,16 @@ import ( ) // 认证拦截 -type UserMustAuth struct { +type userMustAuth struct { AdminId int64 - Grant string + module string } -func NewUserMustAuth() *UserMustAuth { - return &UserMustAuth{} +func NewUserMustAuth(module string) *userMustAuth { + return &userMustAuth{module: module} } -func (this *UserMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramName string) (goNext bool) { +func (this *userMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramName string) (goNext bool) { var action = actionPtr.Object() // 安全相关 @@ -55,8 +55,8 @@ func (this *UserMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramNam } // 检查用户权限 - teaModule := action.Data.GetString("teaModule") - if len(teaModule) > 0 && !configloaders.AllowModule(adminId, teaModule) { + if len(this.module) > 0 && !configloaders.AllowModule(adminId, this.module) { + action.ResponseWriter.WriteHeader(http.StatusForbidden) action.WriteString("Permission Denied.") return false } @@ -69,7 +69,7 @@ func (this *UserMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramNam return false } - rpcResp, err := rpc.AdminRPC().CheckAdminExists(rpc.Context(0), &pb.CheckAdminExistsRequest{AdminId: int64(adminId)}) + rpcResp, err := rpc.AdminRPC().CheckAdminExists(rpc.Context(0), &pb.CheckAdminExistsRequest{AdminId: adminId}) if err != nil { utils.PrintError(err) action.WriteString(teaconst.ErrServer) @@ -105,7 +105,7 @@ func (this *UserMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramNam action.Data["teaTitle"] = config.AdminSystemName action.Data["teaName"] = config.ProductName - resp, err := rpc.AdminRPC().FindAdminFullname(rpc.Context(0), &pb.FindAdminFullnameRequest{AdminId: int64(this.AdminId)}) + resp, err := rpc.AdminRPC().FindAdminFullname(rpc.Context(0), &pb.FindAdminFullnameRequest{AdminId: this.AdminId}) if err != nil { utils.PrintError(err) action.Data["teaUsername"] = "" @@ -149,7 +149,7 @@ func (this *UserMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramNam } // 菜单配置 -func (this *UserMustAuth) modules(adminId int64) []maps.Map { +func (this *userMustAuth) modules(adminId int64) []maps.Map { allMaps := []maps.Map{ { "code": "servers", @@ -246,6 +246,6 @@ func (this *UserMustAuth) modules(adminId int64) []maps.Map { } // 跳转到登录页 -func (this *UserMustAuth) login(action *actions.ActionObject) { +func (this *userMustAuth) login(action *actions.ActionObject) { action.RedirectURL("/") } diff --git a/web/views/@default/dashboard/index.html b/web/views/@default/dashboard/index.html new file mode 100644 index 00000000..8b13c859 --- /dev/null +++ b/web/views/@default/dashboard/index.html @@ -0,0 +1,2 @@ +{$layout} +