Skip to content

fix(mysql): 安装proxy增加dbha白名单 #7525 #7528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: v1.5.0
Choose a base branch
from
Open

fix(mysql): 安装proxy增加dbha白名单 #7525 #7528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions dbm-services/mysql/db-tools/dbactuator/pkg/components/mysql_proxy/install_mysql_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ type InstallMySQLProxyComp struct {
// payload param
type InstallMySQLProxyParam struct {
components.Medium
ProxyConfigs json.RawMessage `json:"proxy_configs"`
Host string `json:"host" validate:"required,ip"`
Ports []int `json:"ports" validate:"required,gt=0,dive"`
ProxyConfigs json.RawMessage `json:"proxy_configs"`
Host string `json:"host" validate:"required,ip"`
Ports []int `json:"ports" validate:"required,gt=0,dive"`
DBHAAccountName string `json:"dbha_account" validate:"required"`
}

// InitDirs 别名
Expand Down Expand Up @@ -373,6 +374,13 @@ func (i *InstallMySQLProxyComp) initOneProxyAdminAccount(port Port) (err error)
logger.Error("add ProxyAdminAccount failed %s", err.Error())
return err
}

_, err = pc.Exec(fmt.Sprintf(`refresh_users('%s@%%', '+')`, i.Params.DBHAAccountName))
if err != nil {
logger.Error("add dbha account failed %s", err.Error())
return err
}

return nil
}

Expand Down
11 changes: 11 additions & 0 deletions dbm-ui/backend/flow/utils/mysql/proxy_act_payload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@

from backend.components import DBConfigApi
from backend.components.dbconfig.constants import FormatType, LevelName
from backend.core.encrypt.constants import AsymmetricCipherConfigType
from backend.core.encrypt.handlers import AsymmetricHandler
from backend.db_package.models import Package
from backend.db_proxy.constants import ExtensionType
from backend.db_proxy.models import DBExtension
from backend.flow.consts import ConfigTypeEnum, DBActuatorActionEnum, DBActuatorTypeEnum, MediumEnum, NameSpaceEnum

logger = logging.getLogger("flow")
Expand All @@ -22,6 +26,11 @@ class ProxyActPayload(object):
定义proxy不同执行类型，拼接不同的payload参数，对应不同的dict结构体.
"""

def __proxy_get_dbha_account_name(self, bk_cloud_id: int):
bk_cloud_name = AsymmetricCipherConfigType.get_cipher_cloud_name(bk_cloud_id)
dbha = DBExtension.get_latest_extension(bk_cloud_id=bk_cloud_id, extension_type=ExtensionType.DBHA)
return AsymmetricHandler.decrypt(name=bk_cloud_name, content=dbha.details["user"])

@staticmethod
def __get_proxy_account():
"""
Expand Down Expand Up @@ -59,6 +68,7 @@ def get_install_proxy_payload(self, **kwargs) -> dict:
"""
拼接安装proxy的payload参数
"""

proxy_pkg = Package.get_latest_package(version="latest", pkg_type=MediumEnum.MySQLProxy)
return {
"db_type": DBActuatorTypeEnum.Proxy.value,
Expand All @@ -71,6 +81,7 @@ def get_install_proxy_payload(self, **kwargs) -> dict:
"pkg_md5": proxy_pkg.md5,
"ports": self.ticket_data.get("proxy_ports", []),
"proxy_configs": {"mysql-proxy": self.__get_proxy_config()},
"dbha_account": self.__proxy_get_dbha_account_name(bk_cloud_id=kwargs["bk_cloud_id"]),
},
},
}
Expand Down
Loading