Skip to content

Commit 191396c

Browse files
authored
fix: Validate StreamPorts in StreamConfig to prevent empty values (#11332)
1 parent 956a64c commit 191396c

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

agent/app/dto/request/website.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type WebsiteCreate struct {
4242
}
4343

4444
type StreamConfig struct {
45-
StreamPorts string `json:"streamPorts" validate:"required"`
45+
StreamPorts string `json:"streamPorts"`
4646
Name string `json:"name"`
4747
Algorithm string `json:"algorithm"`
4848

agent/app/service/website.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,9 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) (err error)
282282
primaryDomain string
283283
)
284284
if website.Type == constant.Stream {
285+
if create.StreamConfig.StreamPorts == "" {
286+
return buserr.New("ErrTypePortRange")
287+
}
285288
website.PrimaryDomain = create.Name
286289
website.Protocol = constant.ProtocolStream
287290
website.StreamPorts = create.StreamConfig.StreamPorts
@@ -2400,6 +2403,9 @@ func (w WebsiteService) ExecComposer(req request.ExecComposerReq) error {
24002403
}
24012404

24022405
func (w WebsiteService) UpdateStream(req request.StreamUpdate) error {
2406+
if req.StreamConfig.StreamPorts == ""{
2407+
return buserr.New("ErrTypePortRange")
2408+
}
24032409
website, err := websiteRepo.GetFirst(repo.WithByID(req.WebsiteID))
24042410
if err != nil {
24052411
return err

agent/app/service/website_utils.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7-
"github.com/1Panel-dev/1Panel/agent/utils/xpack"
87
"log"
98
"net"
109
"os"
@@ -15,6 +14,8 @@ import (
1514
"syscall"
1615
"time"
1716

17+
"github.com/1Panel-dev/1Panel/agent/utils/xpack"
18+
1819
"github.com/1Panel-dev/1Panel/agent/app/repo"
1920

2021
"github.com/1Panel-dev/1Panel/agent/app/dto/request"
@@ -189,6 +190,9 @@ func configDefaultNginx(website *model.Website, domains []model.WebsiteDomain, a
189190
config *components.Config
190191
)
191192
if website.Type == constant.Stream {
193+
if streamConfig.StreamPorts == "" {
194+
return buserr.New("ErrTypePortRange")
195+
}
192196
nginxContent := nginx_conf.GetWebsiteFile("stream_default.conf")
193197
config, err = parser.NewStringParser(string(nginxContent)).Parse()
194198
if err != nil {

0 commit comments

Comments
 (0)