opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9488 from tb365/bugfix/tb-bugfix-121702

Browse Source 
Bugfix/tb bugfix 121702
This commit is contained in:
Zexi Li
2020-12-18 16:36:17 +08:00
committed by GitHub
parent d5ec32534c 3f19bb1efc
commit c51dbaaa7b
10 changed files with 76 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/networks.go
+3 -3
View File
@@ -1391,6 +1391,9 @@ func (manager *SNetworkManager) ValidateCreateData(ctx context.Context, userCred
masklen = prefix.MaskLen
netAddr = prefix.Address.NetAddr(masklen)
input.GuestIpMask = int64(prefix.MaskLen)
if masklen >= 30 {
return input, httperrors.NewInputParameterError("subnet masklen should be smaller than 30")
}
// 根据掩码得到合法的GuestIpPrefix
input.GuestIpPrefix = prefix.String()
} else {
@@ -1487,9 +1490,6 @@ func (manager *SNetworkManager) ValidateCreateData(ctx context.Context, userCred
// reserve addresses for onecloud vpc networks
masklen := int8(input.GuestIpMask)
netAddr := ipStart.NetAddr(masklen)
if masklen >= 30 {
return input, httperrors.NewInputParameterError("subnet masklen should be smaller than 30")
}
if netAddr != ipEnd.NetAddr(masklen) {
return input, httperrors.NewInputParameterError("start and end ip when masked are not in the same cidr subnet")
}
pkg/compute/models/vpcs.go
+1 -1
View File
@@ -859,7 +859,7 @@ func (manager *SVpcManager) ValidateCreateData(
input, err = region.GetDriver().ValidateCreateVpcData(ctx, userCred, input)
if err != nil {
return input, errors.Wrapf(err, "region.GetDriver().ValidateCreateVpcData")
return input, err
}
if region.GetDriver().IsVpcCreateNeedInputCidr() && len(input.CidrBlock) == 0 {
pkg/compute/regiondrivers/aliyun.go
+9 -2
View File
@@ -1566,8 +1566,15 @@ func (self *SAliyunRegionDriver) ValidateCreateVpcData(ctx context.Context, user
if err := cidrV.Validate(jsonutils.Marshal(input).(*jsonutils.JSONDict)); err != nil {
return input, err
}
if cidrV.Value.MaskLen < 17 || cidrV.Value.MaskLen > 29 {
return input, httperrors.NewInputParameterError("%s request the mask range should be between 17 and 29", self.GetProvider())
err := IsInPrivateIpRange(cidrV.Value.ToIPRange())
if err != nil {
return input, err
}
if cidrV.Value.MaskLen > 24 {
return input, httperrors.NewInputParameterError("invalid cidr range %s, mask length should less than or equal to 24", cidrV.Value.String())
}
return input, nil
}
pkg/compute/regiondrivers/ctyun.go
+8 -2
View File
@@ -82,8 +82,14 @@ func (self *SCtyunRegionDriver) ValidateCreateVpcData(ctx context.Context, userC
if err := cidrV.Validate(jsonutils.Marshal(input).(*jsonutils.JSONDict)); err != nil {
return input, err
}
if cidrV.Value.MaskLen < 16 || cidrV.Value.MaskLen > 29 {
return input, httperrors.NewInputParameterError("%s request the mask range should be between 16 and 29", self.GetProvider())
err := IsInPrivateIpRange(cidrV.Value.ToIPRange())
if err != nil {
return input, err
}
if cidrV.Value.MaskLen > 24 {
return input, httperrors.NewInputParameterError("invalid cidr range %s, mask length should less than or equal to 24", cidrV.Value.String())
}
return input, nil
}
pkg/compute/regiondrivers/huawei.go
+8 -2
View File
@@ -2669,8 +2669,14 @@ func (self *SHuaWeiRegionDriver) ValidateCreateVpcData(ctx context.Context, user
if err := cidrV.Validate(jsonutils.Marshal(input).(*jsonutils.JSONDict)); err != nil {
return input, err
}
if cidrV.Value.MaskLen < 16 || cidrV.Value.MaskLen > 29 {
return input, httperrors.NewInputParameterError("%s request the mask range should be between 16 and 29", self.GetProvider())
err := IsInPrivateIpRange(cidrV.Value.ToIPRange())
if err != nil {
return input, err
}
if cidrV.Value.MaskLen > 24 {
return input, httperrors.NewInputParameterError("invalid cidr range %s, mask length should less than or equal to 24", cidrV.Value.String())
}
return input, nil
}
pkg/compute/regiondrivers/managedvirtual.go
+18
View File
@@ -24,6 +24,7 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/netutils"
"yunion.io/x/pkg/util/secrules"
"yunion.io/x/pkg/utils"
@@ -3198,3 +3199,20 @@ func (self *SManagedVirtualizationRegionDriver) RequestElasticcacheSetAutoRenew(
return ec.SetAutoRenew(autoRenew)
}
func IsInPrivateIpRange(ar netutils.IPV4AddrRange) error {
iprs := netutils.GetPrivateIPRanges()
match := false
for _, ipr := range iprs {
if ipr.ContainsRange(ar) {
match = true
break
}
}
if !match {
return httperrors.NewInputParameterError("invalid cidr range %s", ar.String())
}
return nil
}
pkg/compute/regiondrivers/qcloud.go
+6
View File
@@ -725,6 +725,12 @@ func (self *SQcloudRegionDriver) ValidateCreateVpcData(ctx context.Context, user
if err := cidrV.Validate(jsonutils.Marshal(input).(*jsonutils.JSONDict)); err != nil {
return input, err
}
err := IsInPrivateIpRange(cidrV.Value.ToIPRange())
if err != nil {
return input, err
}
if cidrV.Value.MaskLen < 16 || cidrV.Value.MaskLen > 28 {
return input, httperrors.NewInputParameterError("%s request the mask range should be between 16 and 28", self.GetProvider())
}
pkg/compute/regiondrivers/ucloud.go
+7 -2
View File
@@ -78,8 +78,13 @@ func (self *SUcloudRegionDriver) ValidateCreateVpcData(ctx context.Context, user
if err := cidrV.Validate(jsonutils.Marshal(input).(*jsonutils.JSONDict)); err != nil {
return input, err
}
if cidrV.Value.MaskLen < 16 || cidrV.Value.MaskLen > 29 {
return input, httperrors.NewInputParameterError("%s request the mask range should be between 16 and 29", self.GetProvider())
err := IsInPrivateIpRange(cidrV.Value.ToIPRange())
if err != nil {
return input, err
}
if cidrV.Value.MaskLen > 29 {
return input, httperrors.NewInputParameterError("%s request the mask range should be less than or equal to 29", self.GetProvider())
}
return input, nil
}
pkg/compute/tasks/eip_dissociate_task.go
+6 -3
View File
@@ -126,6 +126,7 @@ func (self *EipDissociateTask) OnInit(ctx context.Context, obj db.IStandaloneMod
err := errors.NewAggregate(errs)
msg := errors.Wrapf(err, "disassociate eip %s(%s)", eip.Name, eip.Id).Error()
self.TaskFail(ctx, eip, jsonutils.NewString(msg), model)
return
}
}
@@ -140,9 +141,11 @@ func (self *EipDissociateTask) OnInit(ctx context.Context, obj db.IStandaloneMod
logclient.AddActionLogWithStartable(self, model, logclient.ACT_EIP_DISSOCIATE, nil, self.UserCred, true)
logclient.AddActionLogWithStartable(self, eip, logOp, nil, self.UserCred, true)
switch srv := model.(type) {
case *models.SGuest:
srv.StartSyncstatus(ctx, self.UserCred, "")
if !self.IsSubtask() {
switch srv := model.(type) {
case *models.SGuest:
srv.StartSyncstatus(ctx, self.UserCred, "")
}
}
}
pkg/compute/tasks/guest_create_task.go
+10 -3
View File
@@ -119,10 +119,12 @@ func (self *GuestCreateTask) OnDeployGuestDescComplete(ctx context.Context, obj
{
eipId, _ := self.Params.GetString("eip")
if len(eipId) > 0 {
var err error
self.SetStage("OnDeployEipComplete", nil)
eipObj, err := models.ElasticipManager.FetchById(eipId)
if err != nil {
log.Errorf("fail to get eip %s %s", eipId, err)
msg := fmt.Sprintf("fail to get eip %s %s", eipId, err)
self.OnDeployEipCompleteFailed(ctx, obj, jsonutils.NewString(msg))
return
}
@@ -131,10 +133,15 @@ func (self *GuestCreateTask) OnDeployGuestDescComplete(ctx context.Context, obj
eipBw, _ := self.Params.Int("eip_bw")
if eipBw > 0 {
// newly allocated eip, need allocation and associate
eip.AllocateAndAssociateVM(ctx, self.UserCred, guest, self.GetId())
err = eip.AllocateAndAssociateVM(ctx, self.UserCred, guest, self.GetId())
} else {
// existing eip, association only
eip.StartEipAssociateInstanceTask(ctx, self.UserCred, guest, self.GetId())
err = eip.StartEipAssociateInstanceTask(ctx, self.UserCred, guest, self.GetId())
}
if err != nil {
msg := fmt.Sprintf("fail to asscociate eip %s %s", eipId, err)
self.OnDeployEipCompleteFailed(ctx, obj, jsonutils.NewString(msg))
return
}
return