apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-12-24 11:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

hotfix: fix parse dig command output (#529)

Browse Source
This commit is contained in:
naison
2025-04-11 18:50:14 +08:00
committed by GitHub
parent d08f74a57e
commit 0c122473ce
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/handler/connect.go
View File

@@ -814,18 +814,35 @@ func (c *ConnectOptions) addExtraRoute(ctx context.Context, name string) error {
return nil
}
// parse cname
//dig +short db-name.postgres.database.azure.com
//1234567.privatelink.db-name.postgres.database.azure.com.
//10.0.100.1
var parseIP = func(cmdDigOutput string) net.IP {
for _, s := range strings.Split(cmdDigOutput, "\n") {
ip := net.ParseIP(strings.TrimSpace(s))
if ip != nil {
return ip
}
}
return nil
}
// 1) use dig +short query, if ok, just return
for _, domain := range c.ExtraRouteInfo.ExtraDomain {
ip, err := util.Shell(ctx, c.clientset, c.config, name, config.ContainerSidecarVPN, c.Namespace, []string{"dig", "+short", domain})
output, err := util.Shell(ctx, c.clientset, c.config, name, config.ContainerSidecarVPN, c.Namespace, []string{"dig", "+short", domain})
if err != nil {
return errors.WithMessage(err, "failed to resolve DNS for domain by command dig")
}
// try to get ingress record
if net.ParseIP(ip) == nil {
var ip string
if parseIP(output) == nil {
// try to get ingress record
ip = getIngressRecord(ctx, c.clientset.NetworkingV1(), []string{v1.NamespaceAll, c.Namespace}, domain)
} else {
ip = parseIP(output).String()
}
if net.ParseIP(ip) == nil {
return fmt.Errorf("failed to resolve DNS for domain %s by command dig", domain)
return fmt.Errorf("failed to resolve DNS for domain %s by command dig, output: %s", domain, output)
}
err = c.addRoute(ip)
if err != nil {