mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2025-12-17 21:08:25 +08:00
fix: Validate StreamPorts in StreamConfig to prevent empty values (#11332)
This commit is contained in:
parent
956a64c692
commit
191396c78a
3 changed files with 12 additions and 2 deletions
|
|
@ -42,7 +42,7 @@ type WebsiteCreate struct {
|
|||
}
|
||||
|
||||
type StreamConfig struct {
|
||||
StreamPorts string `json:"streamPorts" validate:"required"`
|
||||
StreamPorts string `json:"streamPorts"`
|
||||
Name string `json:"name"`
|
||||
Algorithm string `json:"algorithm"`
|
||||
|
||||
|
|
|
|||
|
|
@ -282,6 +282,9 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) (err error)
|
|||
primaryDomain string
|
||||
)
|
||||
if website.Type == constant.Stream {
|
||||
if create.StreamConfig.StreamPorts == "" {
|
||||
return buserr.New("ErrTypePortRange")
|
||||
}
|
||||
website.PrimaryDomain = create.Name
|
||||
website.Protocol = constant.ProtocolStream
|
||||
website.StreamPorts = create.StreamConfig.StreamPorts
|
||||
|
|
@ -2400,6 +2403,9 @@ func (w WebsiteService) ExecComposer(req request.ExecComposerReq) error {
|
|||
}
|
||||
|
||||
func (w WebsiteService) UpdateStream(req request.StreamUpdate) error {
|
||||
if req.StreamConfig.StreamPorts == ""{
|
||||
return buserr.New("ErrTypePortRange")
|
||||
}
|
||||
website, err := websiteRepo.GetFirst(repo.WithByID(req.WebsiteID))
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import (
|
|||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/1Panel-dev/1Panel/agent/utils/xpack"
|
||||
"log"
|
||||
"net"
|
||||
"os"
|
||||
|
|
@ -15,6 +14,8 @@ import (
|
|||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/1Panel-dev/1Panel/agent/utils/xpack"
|
||||
|
||||
"github.com/1Panel-dev/1Panel/agent/app/repo"
|
||||
|
||||
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
|
||||
|
|
@ -189,6 +190,9 @@ func configDefaultNginx(website *model.Website, domains []model.WebsiteDomain, a
|
|||
config *components.Config
|
||||
)
|
||||
if website.Type == constant.Stream {
|
||||
if streamConfig.StreamPorts == "" {
|
||||
return buserr.New("ErrTypePortRange")
|
||||
}
|
||||
nginxContent := nginx_conf.GetWebsiteFile("stream_default.conf")
|
||||
config, err = parser.NewStringParser(string(nginxContent)).Parse()
|
||||
if err != nil {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue