-
Notifications
You must be signed in to change notification settings - Fork 150
feat: forward guest DNS to Docker's embedded resolver #793
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.
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
alimx07
wants to merge
1
commit into
urunc-dev:main
Choose a base branch
from
alimx07:feat/add-docker-dns
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+766
−24
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| // Copyright (c) 2023-2026, Nubificus LTD | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package localhost | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "net" | ||
| "os/exec" | ||
| "strings" | ||
| "syscall" | ||
|
|
||
| "github.com/vishvananda/netlink" | ||
| ) | ||
|
|
||
| func dockerRules(f *Forwarder) error { | ||
|
|
||
| tcpPort, udpPort, err := dockerDNSPorts(f.LoIP) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| lhlog.Debugf("Docker DNS resolver: tcp/%s udp/%s", tcpPort, udpPort) | ||
|
|
||
| if err := dnat(f.VirtIP, "udp", net.JoinHostPort(f.LoIP.String(), udpPort)); err != nil { | ||
| return err | ||
| } | ||
| if err := dnat(f.VirtIP, "tcp", net.JoinHostPort(f.LoIP.String(), tcpPort)); err != nil { | ||
| return err | ||
| } | ||
| lhlog.Debug("Applied Docker DNAT rules") | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func dockerDNSPorts(loIP net.IP) (string, string, error) { | ||
| var tcpPort, udpPort string | ||
|
|
||
| // syscall.AF_INET : IPv4 | ||
| tcp, err := netlink.SocketDiagTCPInfo(syscall.AF_INET) | ||
| if err != nil { | ||
| return "", "", fmt.Errorf("could not list TCP sockets in namespace: %w", err) | ||
| } | ||
| for _, s := range tcp { | ||
| if s.InetDiagMsg.ID.Source.String() == loIP.String() { | ||
| tcpPort = fmt.Sprintf("%d", s.InetDiagMsg.ID.SourcePort) | ||
| break | ||
| } | ||
| } | ||
| udp, err := netlink.SocketDiagUDPInfo(syscall.AF_INET) | ||
| if err != nil { | ||
| return "", "", fmt.Errorf("could not list UDP sockets in namespace: %w", err) | ||
| } | ||
| for _, s := range udp { | ||
| if s.InetDiagMsg.ID.Source.String() == loIP.String() { | ||
| udpPort = fmt.Sprintf("%d", s.InetDiagMsg.ID.SourcePort) | ||
| break | ||
| } | ||
| } | ||
| if tcpPort == "" || udpPort == "" { | ||
| return "", "", fmt.Errorf("could not find docker embedded resolver ports for %s (tcp=%q udp=%q)", loIP, tcpPort, udpPort) | ||
| } | ||
| return tcpPort, udpPort, nil | ||
| } | ||
|
|
||
|
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unfortunately, this doesn't affect the performance much. It's basically the same (plus a few microseconds). I still think we can optimize this, but I would rather move forward, finalize support for the other unikernels, and come back to this later. |
||
| // ClearRules removes DNAT rules dockerRules could have added. | ||
| func clearRules() error { | ||
|
|
||
| // This will be run from kill() so no memory state could be used. | ||
| // we list all IPtable rules from scratch. | ||
|
|
||
| // iptables-save output example: | ||
| // -A PREROUTING -d 192.168.100.100/32 -i lo -p udp -j DNAT --to-destination 127.0.0.11:60269 | ||
| ipt, err := exec.LookPath("iptables-save") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| out, err := exec.Command(ipt, "-t", "nat").Output() //nolint:gosec | ||
| if err != nil { | ||
| return fmt.Errorf("iptables-save failed: %w", err) | ||
| } | ||
|
|
||
| var retErr error | ||
| for line := range strings.SplitSeq(string(out), "\n") { | ||
| fields := strings.Fields(line) | ||
| if len(fields) < 2 || fields[0] != "-A" || fields[1] != "PREROUTING" { | ||
| continue | ||
| } | ||
| if !strings.Contains(line, "-i lo") || !strings.Contains(line, "-j DNAT") { | ||
| continue | ||
| } | ||
| args := append([]string{"-t", "nat", "-D"}, fields[1:]...) | ||
| if err := ipTablesExec(args); err != nil { | ||
| retErr = errors.Join(retErr, err) | ||
| } | ||
| } | ||
| return retErr | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can merge this file with "loclahost.go" or its new name.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what about something like
local_dns.goorloDns.goas shorter one ?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, both are better than
localhost.go.