Skip to content
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

Jump to bottom

Ensure DNS configuration in VPNSetup #50

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Ensure DNS configuration in VPNSetup #50

merged 1 commit into from
Dec 11, 2023

Conversation

hwipl
Copy link
Contributor

@hwipl hwipl commented Dec 7, 2023

After configuring the VPN connection, monitor the DNS configuration and make sure the actual systemd-resolved settings match the settings in the VPN configuration. If the settings do not match, reset the settings in the VPN configuration.

@hwipl
Ensure DNS configuration in VPNSetup
62c8f5f 
After configuring the VPN connection, monitor the DNS configuration and
make sure the actual systemd-resolved settings match the settings in the
VPN configuration. If the settings do not match, reset the settings in
the VPN configuration.

Signed-off-by: hwipl <33433250+hwipl@users.noreply.github.com>
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 7, 2023

Test Result

🙌 199 Tests pass

Test Details

🟢 TestAddrMonStartStop (0.00s)
🟢 TestAddrMonUpdates (0.00s)
🟢 TestNewAddrMon (0.00s)
🟢 TestConfigValid (0.00s)
🟢 TestNewConfig (0.00s)
🟢 TestNewMessage (0.00s)
🟢 TestNewOK (0.00s)
🟢 TestNewError (0.00s)
🟢 TestReadWriteMessage (0.00s)
🟢 TestRequestType (0.00s)
🟢 TestRequestData (0.00s)
🟢 TestRequestReply (0.00s)
🟢 TestRequestError (0.00s)
🟢 TestRequestClose (0.00s)
🟢 TestServerStartStop (0.00s)
🟢 TestServerRequests (0.00s)
🟢 TestNewServer (0.00s)
🟢 TestConfigValid (0.00s)
🟢 TestNewConfig (0.00s)
🟢 TestCPDStartStop (0.00s)
🟢 TestCPDHosts (0.00s)
🟢 TestCPDProbe (3.40s)
🟢 TestCPDResults (0.00s)
🟢 TestNewCPD (0.00s)
🟢 TestConfigValid (0.00s)
🟢 TestConfigLoad (0.00s)
🟢 TestNewConfig (0.00s)
🟢 TestVPNConfigUpdateValid (0.00s)
🟢 TestVPNConfigUpdateJSON (0.00s)
🟢 TestNewVPNConfigUpdate (0.00s)
🟢 TestRequestWaitClose (0.00s)
🟢 TestDaemonConnect (0.00s)
🟢 TestDaemonDisconnect (0.00s)
🟢 TestServiceStartStop (0.00s)
🟢 TestServiceRequests (0.00s)
🟢 TestServiceSetProperty (0.00s)
🟢 TestNewService (0.00s)
🟢 TestDevMonStartStop (0.00s)
🟢 TestDevMonUpdates (0.00s)
🟢 TestNewDevMon (0.00s)
🟢 TestConfigResolvConfDirs (0.00s)
🟢 TestNewConfig (0.00s)
🟢 TestDNSMonStartStop (0.01s)
🟢 TestDNSMonUpdates (0.00s)
🟢 TestNewDNSMon (0.00s)
🟢 TestConfigValid (0.00s)
🟢 TestNewConfig (0.00s)
🟢 TestProxyStartStop (0.00s)
🟢 TestProxyReports (0.00s)
🟢 TestProxySetRemotes (0.00s)
🟢 TestProxySetWatches (0.00s)
🟢 TestNewProxy (0.00s)
🟢 TestRemotesAdd (0.00s)
🟢 TestRemotesRemove (0.00s)
🟢 TestRemotesFlush (0.00s)
🟢 TestRemotesGet (0.00s)
🟢 TestNewRemotes (0.00s)
🟢 TestReportString (0.00s)
🟢 TestReportWaitDone (0.00s)
🟢 TestNewReport (0.00s)
🟢 TestWatchesAdd (0.00s)
🟢 TestWatchesAddTemp (0.00s)
🟢 TestWatchesRemove (0.00s)
🟢 TestWatchesCleanTemp (0.00s)
🟢 TestWatchesFlush (0.00s)
🟢 TestWatchesContains (0.00s)
🟢 TestNewWatches (0.00s)
🟢 TestConfigValid (0.00s)
🟢 TestConfigCheckExecutables (0.00s)
🟢 TestNewConfig (0.00s)
🟢 TestRunCmd (0.00s)
🟢 TestRunCmdOutput (0.00s)
🟢 TestRunIP (0.00s)
🟢 TestRunIPLink (0.00s)
🟢 TestRunIPAddress (0.00s)
🟢 TestRunIP4Route (0.00s)
🟢 TestRunIP6Route (0.00s)
🟢 TestRunIP4Rule (0.00s)
🟢 TestRunIP6Rule (0.00s)
🟢 TestRunSysctl (0.00s)
🟢 TestRunNft (0.00s)
🟢 TestRunResolvectl (0.00s)
🟢 TestRunResolvectlOutput (0.00s)
🟢 TestSetExecutables (0.00s)
🟢 TestConfigValid (0.00s)
🟢 TestNewConfig (0.00s)
🟢 TestConnectStartStop (0.00s)
🟢 TestConnectDisconnect (0.00s)
🟢 TestConnectEvents (0.00s)
🟢 TestNewConnect (0.00s)
🟢 TestProfileMonHandleEvent (0.00s)
🟢 TestProfileMonStartStop (0.02s)
🟢 TestNewProfileMon (0.00s)
🟢 TestSleepMonHandleSignal (0.00s)
🟢 TestSleepMonStartStop (0.00s)
🟢 TestSleepMonEvents (0.00s)
🟢 TestNewSleepMon (0.00s)
🟢 TestAddressesAdd (0.00s)
🟢 TestAddressesRemove (0.00s)
🟢 TestAddressesGet (0.00s)
🟢 TestNewAddresses (0.00s)
🟢 TestConfigValid (0.00s)
🟢 TestNewConfig (0.00s)
🟢 TestDevicesAdd (0.00s)
🟢 TestDevicesRemove (0.00s)
🟢 TestDevicesGetReal (0.00s)
🟢 TestDevicesGetVirtual (0.00s)
🟢 TestDevicesGetAll (0.00s)
🟢 TestNewDevices (0.00s)
🟢 TestExcludesAddStatic (0.00s)
🟢 TestExcludesAddDynamic (0.00s)
🟢 TestExcludesRemove (0.00s)
🟢 TestExcludesCleanup (0.00s)
🟢 TestExcludesStartStop (0.00s)
🟢 TestNewExcludes (0.00s)
🟢 TestSplitRoutingHandleDeviceUpdate (0.00s)
🟢 TestSplitRoutingHandleAddressUpdate (0.00s)
🟢 TestSplitRoutingHandleDNSReport (0.00s)
🟢 TestSplitRoutingStartStop (0.00s)
🟢 TestSplitRoutingDNSReports (0.00s)
🟢 TestNewSplitRouting (0.00s)
🟢 TestCleanup (0.00s)
🟢 TestAllowDevsAdd (0.00s)
🟢 TestAllowDevsRemove (0.00s)
🟢 TestNewAllowDevs (0.00s)
🟢 TestAllowHostsAdd (0.00s)
🟢 TestAllowHostsRemove (0.00s)
🟢 TestAllowHostsStartStop (0.00s)
🟢 TestAllowHostsUpdate (0.00s)
🟢 TestNewAllowHosts (0.00s)
🟢 TestConfigValid (0.00s)
🟢 TestNewConfig (0.00s)
🟢 TestTrafPolHandleDeviceUpdate (0.00s)
🟢 TestTrafPolHandleDNSUpdate (0.00s)
🟢 TestTrafPolHandleCPDReport (0.00s)
🟢 TestTrafPolStartStop (0.01s)
🟢 TestNewTrafPol (0.00s)
🟢 TestCleanup (0.00s)
🟢 TestCreateConfigSplit (0.00s)
🟢 TestCreateConfigUpdate (0.00s)
🟢 TestParseEnvironmentSplit (0.00s)
🟢 TestParseDNSSplitExcXML (0.00s)
🟢 TestParseBypassVSubnetsXML (0.00s)
🟢 TestGetPostAuthXML (0.00s)
🟢 TestParseDNSSplitExc (0.00s)
🟢 TestParseBypassVSubnets (0.00s)
🟢 TestParseDisableAlwaysOnVPN (0.00s)
🟢 TestParseEnvironment (0.00s)
🟢 TestSetupVPNDevice (0.00s)
🟢 TestTeardownVPNDevice (0.00s)
🟢 TestVPNSetupSetupDNS (0.00s)
🟢 TestVPNSetupTeardownDNS (0.00s)
🟢 TestVPNSetupCheckDNSProtocols (0.00s)
🟢 TestVPNSetupCheckDNSServers (0.00s)
🟢 TestVPNSetupCheckDNSDomain (0.00s)
🟢 TestVPNSetupEnsureDNS (0.00s)
🟢 TestVPNSetupStartStop (0.00s)
🟢 TestVPNSetupEvents (0.00s)
🟢 TestNewVPNSetup (0.00s)
🟢 TestCleanup (0.00s)
🟢 TestDBusClientSetGetConfig (0.00s)
🟢 TestDBusClientSetGetEnv (0.00s)
🟢 TestDBusClientSetGetLogin (0.00s)
🟢 TestDBusClientPing (0.00s)
🟢 TestDBusClientQuery (0.00s)
🟢 TestDBusClientAuthenticate (0.00s)
🟢 TestDBusClientConnect (0.00s)
🟢 TestDBusClientDisconnect (0.00s)
🟢 TestNewDBusClient (0.00s)
🟢 TestNewClient (0.00s)
🟢 TestConfigCopy (0.00s)
🟢 TestConfigEmpty (0.00s)
🟢 TestConfigValid (0.00s)
🟢 TestNewConfig (0.00s)
🟢 TestLoadConfig (0.00s)
🟢 TestLoginInfoCopy (0.00s)
🟢 TestLoginInfoValid (0.00s)
🟢 TestLoginInfoParseLine (0.00s)
🟢 TestLoginInfoFromJSON (0.00s)
🟢 TestDNSRemotes (0.00s)
🟢 TestSplitDNSExcludes (0.00s)
🟢 TestConfigCopy (0.00s)
🟢 TestConfigEmpty (0.00s)
🟢 TestConfigEqual (0.00s)
🟢 TestConfigValid (0.00s)
🟢 TestConfigJSON (0.00s)
🟢 TestNew (0.00s)
🟢 TestNewFromJSON (0.00s)
🟢 TestStatusCopy (0.00s)
🟢 TestJSON (0.00s)
🟢 TestNew (0.00s)
🟢 TestProfileGetAllowedHosts (0.00s)
🟢 TestProfileGetVPNServers (0.00s)
🟢 TestProfileGetVPNServerHostNames (0.00s)
🟢 TestProfileGetTNDServers (0.00s)
🟢 TestProfileGetTNDHTTPSServers (0.00s)
🟢 TestProfileGetAlwaysOn (0.00s)
🟢 TestNewProfile (0.00s)
🟢 TestLoadProfile (0.00s)

Coverage

Total coverage: 🟩🟩🟥🟥 55.7%

Coverage Details
Coverage File Uncovered Lines
🟩🟩🟩🟥 80.0% /internal/addrmon/addrmon.go 33-43, 77-79, 96-98
🟩🟩🟩🟩 100.0% /internal/api/config.go
🟩🟩🟥🟥 71.4% /internal/api/message.go 37-39, 64-66, 69-71, 72-74, 79-81, 95-97, 100-102, 104-106
🟩🟩🟩🟥 81.2% /internal/api/request.go 40-42, 48-50, 55-57
🟩🟥🟥🟥 43.9% /internal/api/server.go 42-75, 93-98, 109-123, 133-147, 152-155, 158-161, 163-165, 172-174, 178-180, 201-203, 204-206
🟩🟩🟩🟩 100.0% /internal/cpd/config.go
🟩🟩🟥🟥 63.7% /internal/cpd/cpd.go 30-32, 35-38, 40-43, 52-68, 84-85, 91-92, 105-107, 122-127, 130-133, 141-143, 153-157, 159-161, 164-173, 177-179, 193-195
🟥🟥🟥🟥 0.0% /internal/daemon/cmd.go 26-106
🟩🟩🟩🟩 100.0% /internal/daemon/config.go
🟥🟥🟥🟥 0.0% /internal/daemon/daemon.go 65-759
🟩🟩🟥🟥 73.7% /internal/daemon/vpnconfigupdate.go 21-23, 26-28, 29-31, 42-44, 53-55
🟩🟩🟩🟥 83.8% /internal/dbusapi/service.go 138-139, 143-145, 159-160, 164-166, 192-205, 213-215, 220-222, 223-225, 230-232, 294-296, 313-315, 378-378
🟩🟩🟩🟥 75.6% /internal/devmon/devmon.go 48-50, 56-58, 60-63, 78-88, 112-115, 122-124
🟩🟩🟩🟩 100.0% /internal/dnsmon/config.go
🟩🟥🟥🟥 48.6% /internal/dnsmon/dnsmon.go 16-25, 32-32, 43-45, 47-49, 54-56, 65-83, 99-101
🟩🟩🟩🟩 100.0% /internal/dnsproxy/config.go
🟩🟥🟥🟥 47.7% /internal/dnsproxy/proxy.go 33-111, 121-126, 130-132, 140-142, 149-151, 156-158, 204-206
🟩🟩🟩🟩 95.7% /internal/dnsproxy/remotes.go 45-48
🟩🟩🟩🟩 100.0% /internal/dnsproxy/report.go
🟩🟩🟩🟩 97.3% /internal/dnsproxy/watches.go 90-92
🟩🟩🟩🟩 100.0% /internal/execs/config.go
🟩🟩🟩🟥 93.1% /internal/execs/execs.go 20-22, 29-31
🟩🟩🟩🟩 100.0% /internal/ocrunner/config.go
🟥🟥🟥🟥 15.3% /internal/ocrunner/connect.go 49-193, 205-218, 222-227, 236-238, 242-243, 260-273, 301-331
🟩🟩🟥🟥 57.9% /internal/profilemon/profilemon.go 26-26, 34-37, 54-56, 58-60, 65-67, 72-92, 108-116
🟩🟩🟩🟥 77.8% /internal/sleepmon/sleepmon.go 26-26, 61-64, 73-76, 85-90, 105-107
🟩🟩🟩🟥 90.9% /internal/splitrt/addresses.go 37-39, 48-48
🟩🟩🟩🟥 83.3% /internal/splitrt/config.go 44-46, 48-50
🟩🟩🟩🟩 100.0% /internal/splitrt/devices.go
🟩🟩🟩🟩 95.0% /internal/splitrt/excludes.go 150-152, 155-157
🟩🟩🟩🟥 80.0% /internal/splitrt/filter.go 106-108, 113-115, 127-129, 132-134, 163-165, 189-191, 213-215
🟩🟩🟥🟥 67.6% /internal/splitrt/route.go 14-16, 20-22, 24-26, 30-32, 39-41, 45-47, 49-51, 57-59, 61-63, 69-71, 73-75
🟩🟩🟩🟥 85.9% /internal/splitrt/splitrt.go 70-74, 78-83, 111-113, 141-144, 173-176, 177-181, 242-247
🟩🟩🟩🟩 100.0% /internal/trafpol/allowdevs.go
🟩🟥🟥🟥 47.7% /internal/trafpol/allowhosts.go 24-24, 27-29, 36-47, 68-107, 176-193, 199-201, 207-233, 248-251, 258-278, 288-290
🟩🟩🟩🟩 100.0% /internal/trafpol/config.go
🟩🟩🟥🟥 51.2% /internal/trafpol/filter.go 158-160, 165-167, 173-175, 181-214, 232-234, 241-243
🟩🟩🟩🟥 86.0% /internal/trafpol/trafpol.go 32-34, 113-126
🟥🟥🟥🟥 0.0% /internal/vpncscript/client.go 12-44
🟥🟥🟥🟥 0.0% /internal/vpncscript/cmd.go 18-60
🟩🟩🟩🟥 82.9% /internal/vpncscript/config.go 24-26, 33-35, 50-52, 68-71, 86-92, 107-110, 118-120, 130-133, 141-143, 163-165
🟩🟩🟩🟥 94.7% /internal/vpncscript/env.go 141-144, 157-158, 392-395
🟩🟩🟥🟥 60.6% /internal/vpnsetup/vpnsetup.go 58-61, 69-75, 78-82, 92-98, 112-135, 141-146, 152-157, 163-166, 195-197, 200-202, 219-222, 225-227, 230-232, 352-440, 457-460, 475-494
🟩🟥🟥🟥 30.7% /pkg/client/client.go 119-121, 133-146, 149-161, 164-166, 174-177, 185-195, 202-204, 208-210, 217-280, 294-352, 359-361, 364-366, 367-369, 370-372, 377-463, 469-471, 478-490, 496-498, 505-509, 515-517, 518-520, 530-532, 534-538, 548-550
🟩🟥🟥🟥 45.7% /pkg/client/config.go 68-70, 105-130, 135-137, 158-160, 162-164, 170-199
🟩🟩🟩🟥 85.7% /pkg/logininfo/logininfo.go 20-22, 45-47, 72-74, 83-85
🟩🟩🟩🟥 85.7% /pkg/vpnconfig/config.go 49-51, 61-64, 102-104, 117-123, 173-175, 231-233, 246-248
🟩🟥🟥🟥 30.3% /pkg/vpnstatus/status.go 20-96, 114-116, 132-134, 143-145

@hwipl hwipl requested review from jandd and malaupa December 7, 2023 16:04
@hwipl hwipl merged commit 910a9a7 into main Dec 11, 2023
2 checks passed
@hwipl hwipl deleted the feature/ensure-dns-config branch December 11, 2023 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jandd jandd jandd approved these changes

@malaupa malaupa Awaiting requested review from malaupa

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@hwipl @jandd