BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr
Adjust console ip whitelist Settings
lotk8d47d82b4f61
diff --git a/core/api/settings/settings.go b/core/api/settings/settings.goindex 5f29b268..e05f7f05 100644--- a/core/api/settings/settings.go+++ b/core/api/settings/settings.go@@ -18,4 +18,6 @@ type ISettingsV1 interface {SetSSLConfig(ctx context.Context, req *v1.SetSSLConfigReq) (res *v1.SetSSLConfigRes, err error)GetTimeZoneList(ctx context.Context, req *v1.GetTimeZoneListReq) (res *v1.GetTimeZoneListRes, err error)SetIPWhitelist(ctx context.Context, req *v1.SetIPWhitelistReq) (res *v1.SetIPWhitelistRes, err error)+ DeleteIPWhitelist(ctx context.Context, req *v1.DeleteIPWhitelistReq) (res *v1.DeleteIPWhitelistRes, err error)+ AddIPWhitelist(ctx context.Context, req *v1.AddIPWhitelistReq) (res *v1.AddIPWhitelistRes, err error)}diff --git a/core/api/settings/v1/settings.go b/core/api/settings/v1/settings.goindex 4ee308e9..09f23613 100644--- a/core/api/settings/v1/settings.go+++ b/core/api/settings/v1/settings.go@@ -77,8 +77,8 @@ type SystemConfig struct {SSL SSLConfig `json:"ssl" dc:"ssl certificate configuration"`// IP whitelist configuration- IPWhitelist []string `json:"ip_whitelist" dc:"ip whitelist"`- IPWhitelistEnabled bool `json:"ip_whitelist_enable" dc:"ip whitelist enabled"`+ IPWhitelist []g.Map `json:"ip_whitelist" dc:"ip whitelist"`+ IPWhitelistEnabled bool `json:"ip_whitelist_enable" dc:"ip whitelist enabled"`}type GetVersionReq struct {@@ -155,3 +155,21 @@ type SetIPWhitelistReq struct {type SetIPWhitelistRes struct {api_v1.StandardRes}++type DeleteIPWhitelistReq struct {+ g.Meta `path:"/settings/delete_ip_whitelist" tags:"Settings" method:"post" summary:"Delete IP whitelist"`+ ID int `json:"id" dc:"ID"`+}++type DeleteIPWhitelistRes struct {+ api_v1.StandardRes+}++type AddIPWhitelistReq struct {+ g.Meta `path:"/settings/add_ip_whitelist" tags:"Settings" method:"post" summary:"Add IP whitelist"`+ IP string `json:"ip" dc:"IP"`+}++type AddIPWhitelistRes struct {+ api_v1.StandardRes+}diff --git a/core/internal/controller/settings/settings_v1_add_ip_whitelist.go b/core/internal/controller/settings/settings_v1_add_ip_whitelist.gonew file mode 100644index 00000000..e888c7e6--- /dev/null+++ b/core/internal/controller/settings/settings_v1_add_ip_whitelist.go@@ -0,0 +1,57 @@+package settings++import (+ "billionmail-core/internal/service/public"+ "context"+ "github.com/gogf/gf/v2/frame/g"+ "net"+ "strings"+ "time"++ "github.com/gogf/gf/v2/errors/gerror"++ "billionmail-core/api/settings/v1"+)++func (c *ControllerV1) AddIPWhitelist(ctx context.Context, req *v1.AddIPWhitelistReq) (res *v1.AddIPWhitelistRes, err error) {+ res = &v1.AddIPWhitelistRes{}++ ip := strings.TrimSpace(req.IP)+ if ip == "" {+ res.SetError(gerror.New(public.LangCtx(ctx, "IP cannot be empty")))+ return+ }+ if net.ParseIP(ip) == nil {+ res.SetError(gerror.New(public.LangCtx(ctx, "Invalid IP address: {}", ip)))+ return+ }++ ipType := 1 // IPv4+ if net.ParseIP(ip).To4() == nil {+ ipType = 2 // IPv6+ }++ // Check if already exists+ count, err := g.DB().Model("bm_console_ip_whitelist").Where("ip", ip).Count()+ if err != nil {+ res.SetError(gerror.New(public.LangCtx(ctx, "Failed to query IP whitelist: {}", err)))+ return+ }+ if count > 0 {+ res.SetError(gerror.New(public.LangCtx(ctx, "This IP is already in the whitelist")))+ return+ }++ _, err = g.DB().Model("bm_console_ip_whitelist").Insert(g.Map{+ "ip": ip,+ "ip_type": ipType,+ "create_time": time.Now().Unix(),+ })+ if err != nil {+ res.SetError(gerror.New(public.LangCtx(ctx, "Failed to add IP to whitelist: {}", err)))+ return+ }++ res.SetSuccess(public.LangCtx(ctx, "IP added to whitelist successfully"))+ return res, nil+}diff --git a/core/internal/controller/settings/settings_v1_delete_ip_whitelist.go b/core/internal/controller/settings/settings_v1_delete_ip_whitelist.gonew file mode 100644index 00000000..bf3315d9--- /dev/null+++ b/core/internal/controller/settings/settings_v1_delete_ip_whitelist.go@@ -0,0 +1,40 @@+package settings++import (+ "billionmail-core/internal/service/public"+ "context"+ "github.com/gogf/gf/v2/frame/g"++ "github.com/gogf/gf/v2/errors/gerror"++ "billionmail-core/api/settings/v1"+)++func (c *ControllerV1) DeleteIPWhitelist(ctx context.Context, req *v1.DeleteIPWhitelistReq) (res *v1.DeleteIPWhitelistRes, err error) {+ res = &v1.DeleteIPWhitelistRes{}++ if req.ID <= 0 {+ res.SetError(gerror.New(public.LangCtx(ctx, "ID cannot be empty")))+ return+ }++ // Check if it exists+ count, err := g.DB().Model("bm_console_ip_whitelist").Where("id", req.ID).Count()+ if err != nil {+ res.SetError(gerror.New(public.LangCtx(ctx, "Failed to query IP whitelist: {}", err)))+ return+ }+ if count == 0 {+ res.SetError(gerror.New(public.LangCtx(ctx, "The IP whitelist does not exist")))+ return+ }++ _, err = g.DB().Model("bm_console_ip_whitelist").Where("id", req.ID).Delete()+ if err != nil {+ res.SetError(gerror.New(public.LangCtx(ctx, "Failed to delete IP from whitelist: {}", err)))+ return+ }++ res.SetSuccess(public.LangCtx(ctx, "IP removed from whitelist successfully"))+ return res, nil+}diff --git a/core/internal/controller/settings/settings_v1_get_system_config.go b/core/internal/controller/settings/settings_v1_get_system_config.goindex 43074d31..0f9318d3 100644--- a/core/internal/controller/settings/settings_v1_get_system_config.go+++ b/core/internal/controller/settings/settings_v1_get_system_config.go@@ -29,20 +29,38 @@ func (c *ControllerV1) GetSystemConfig(ctx context.Context, req *v1.GetSystemCon}config.ServerIP = serverIP- ipWhitelist, err := g.DB().Model("bm_console_ip_whitelist").Fields("ip").All()+ whitelist, err := GetIPWhitelist()if err != nil {- res.SetError(gerror.New(public.LangCtx(ctx, "Failed to read IP whitelist: {}", err)))- return res, nil- }- if len(ipWhitelist) == 0 {- config.IPWhitelist = []string{}- } else {- for _, ip := range ipWhitelist {- config.IPWhitelist = append(config.IPWhitelist, ip["ip"].String())- }+ whitelist = []g.Map{}}+ config.IPWhitelist = whitelistres.Data = configres.SetSuccess(public.LangCtx(ctx, "Successfully retrieved system configuration"))return res, nil}++func GetIPWhitelist() ([]g.Map, error) {++ result, err := g.DB().Model("bm_console_ip_whitelist").+ Fields("id, ip").+ All()++ if err != nil {+ return nil, gerror.Wrap(err, "Failed to get IP whitelist")+ }++ if result.IsEmpty() {+ return []g.Map{}, nil+ }++ var whitelist []g.Map+ for _, record := range result.List() {+ whitelist = append(whitelist, g.Map{+ "id": record["id"],+ "ip": record["ip"],+ })+ }++ return whitelist, nil+}