Skip to content

fixup! fix DNS leak in VPN lockdown mode when VPN is down #15

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
liamsmith827 wants to merge 1 commit into
base: 16-qpr2
Choose a base branch
from
Open

fixup! fix DNS leak in VPN lockdown mode when VPN is down #15

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
10 changes: 7 additions & 3 deletions server/NetworkController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,12 @@ uint32_t NetworkController::getNetworkForDnsLocked(unsigned* netId, uid_t uid) c
// servers (through the default network). Otherwise, the query is guaranteed to fail.
// http://b/29498052
Network *network = getNetworkLocked(*netId);
if (network && network->isVirtual() && !resolv_has_nameservers(*netId)) {
*netId = defaultNetId;
if (network && network->isVirtual()) {
if (!resolv_has_nameservers(*netId)) {
*netId = defaultNetId;
} else {
fwmark.protectedFromVpn = false;
}
}
} else {
// If the user is subject to a VPN and the VPN provides DNS servers, use those servers
Expand All @@ -253,7 +257,7 @@ uint32_t NetworkController::getNetworkForDnsLocked(unsigned* netId, uid_t uid) c
VirtualNetwork* virtualNetwork = getVirtualNetworkForUserLocked(uid);
if (virtualNetwork && resolv_has_nameservers(virtualNetwork->getNetId())) {
*netId = virtualNetwork->getNetId();
fwmark.explicitlySelected = true;
fwmark.protectedFromVpn = false;
} else {
// TODO: return an error instead of silently doing the DNS lookup on the wrong network.
// http://b/27560555
Expand Down