diff --git a/route/v1/samba.go b/route/v1/samba.go index 80deb82..452f61d 100644 --- a/route/v1/samba.go +++ b/route/v1/samba.go @@ -16,7 +16,6 @@ import ( "net/http" "os" "path/filepath" - "regexp" "strings" "github.com/IceWhaleTech/CasaOS-Common/utils/logger" @@ -27,7 +26,6 @@ import ( "github.com/IceWhaleTech/CasaOS/pkg/samba" "github.com/IceWhaleTech/CasaOS/pkg/utils/common_err" "github.com/IceWhaleTech/CasaOS/pkg/utils/file" - "github.com/IceWhaleTech/CasaOS/pkg/utils/ip_helper" "github.com/IceWhaleTech/CasaOS/service" model2 "github.com/IceWhaleTech/CasaOS/service/model" "github.com/gin-gonic/gin" @@ -139,22 +137,22 @@ func PostSambaConnectionsCreate(c *gin.Context) { return } - if ok, _ := regexp.MatchString(`^[\w@#*.]{4,30}$`, connection.Password); !ok { - c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.CHARACTER_LIMIT, Message: common_err.GetMsg(common_err.CHARACTER_LIMIT)}) - return - } - if ok, _ := regexp.MatchString(`^[\w@#*.]{4,30}$`, connection.Username); !ok { - c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)}) - return - } - if !ip_helper.IsIPv4(connection.Host) && !ip_helper.IsIPv6(connection.Host) { - c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)}) - return - } - if ok, _ := regexp.MatchString("^[0-9]{1,6}$", connection.Port); !ok { - c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)}) - return - } + // if ok, _ := regexp.MatchString(`^[\w@#*.]{4,30}$`, connection.Password); !ok { + // c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.CHARACTER_LIMIT, Message: common_err.GetMsg(common_err.CHARACTER_LIMIT)}) + // return + // } + // if ok, _ := regexp.MatchString(`^[\w@#*.]{4,30}$`, connection.Username); !ok { + // c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)}) + // return + // } + // if !ip_helper.IsIPv4(connection.Host) && !ip_helper.IsIPv6(connection.Host) { + // c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)}) + // return + // } + // if ok, _ := regexp.MatchString("^[0-9]{1,6}$", connection.Port); !ok { + // c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)}) + // return + // } connection.Host = strings.Split(connection.Host, "/")[0] // check is exists