From: "d12fk (Code Review)" Date: Tue, 9 Jan 2024 00:48:54 +0000 References: Reply-To: heiko@...515..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <2b1c779f10bc36e410aa0fee2c30a78564824cdf-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="RykBHYKWIXQ="; charset=UTF-8 Subject: [Openvpn-devel] [L] Change in openvpn[master]: Windows: enforce 'block-local' with WFP filters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --RykBHYKWIXQ= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/489?usp=3Demail to review the following change. Change subject: Windows: enforce 'block-local' with WFP filters ...................................................................... Windows: enforce 'block-local' with WFP filters In an attempt to better defend against the TunnelCrack attacks, enforce that no traffic can pass to anything else than the VPN interface when the 'block-local' flags is given with either --redirect-gateway or --redirect-private. Reuse much of the existing --block-outside-dns code, but make it more general, so that it can also block any traffic, not just port 53. Uses the Windows Filtering Platform for enforcement in addition to the routes redirecting the networks into the tunnel. Change-Id: Ic9bf797bfc7e2d471998a84cb0f071db3e4832ba Signed-off-by: Heiko Hund --- M CMakeLists.txt M doc/man-sections/vpn-network-options.rst M include/openvpn-msg.h M src/openvpn/Makefile.am M src/openvpn/init.c M src/openvpn/route.c M src/openvpn/route.h M src/openvpn/tun.c R src/openvpn/wfp_block.c R src/openvpn/wfp_block.h M src/openvpn/win32.c M src/openvpn/win32.h M src/openvpnserv/CMakeLists.txt M src/openvpnserv/Makefile.am M src/openvpnserv/interactive.c 15 files changed, 299 insertions(+), 213 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/89/489/1 diff --git a/CMakeLists.txt b/CMakeLists.txt index bc46c27..e560ef3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -352,8 +352,6 @@ src/openvpn/base64.c src/openvpn/base64.h src/openvpn/basic.h - src/openvpn/block_dns.h - src/openvpn/block_dns.c src/openvpn/buffer.c src/openvpn/buffer.h src/openvpn/circ_list.h @@ -533,6 +531,8 @@ src/openvpn/ssl_util.h src/openvpn/vlan.c src/openvpn/vlan.h + src/openvpn/wfp_block.c + src/openvpn/wfp_block.h src/openvpn/win32.c src/openvpn/win32-util.c src/openvpn/win32.h diff --git a/doc/man-sections/vpn-network-options.rst b/doc/man-sections/vp= n-network-options.rst index 41d367b..630e8f5 100644 --- a/doc/man-sections/vpn-network-options.rst +++ b/doc/man-sections/vpn-network-options.rst @@ -352,6 +352,9 @@ Block access to local LAN when the tunnel is active, except for the LAN gateway itself. This is accomplished by routing the local LAN (except for the LAN gateway address) into the tunnel. + On Windows WFP filters are added in addition to the routes which + block access to resources not routed through the VPN adapter. + Push this flag to defend against the TunnelCrack attacks. :code:`ipv6` Redirect IPv6 routing into the tunnel. This works similar to diff --git a/include/openvpn-msg.h b/include/openvpn-msg.h index a1464cd..0fa0cb5 100644 --- a/include/openvpn-msg.h +++ b/include/openvpn-msg.h @@ -24,6 +24,9 @@ #ifndef OPENVPN_MSG_H_ #define OPENVPN_MSG_H_ +#include +#include + typedef enum { msg_acknowledgement, msg_add_address, @@ -35,8 +38,8 @@ msg_add_nbt_cfg, msg_del_nbt_cfg, msg_flush_neighbors, - msg_add_block_dns, - msg_del_block_dns, + msg_add_wfp_block, + msg_del_wfp_block, msg_register_dns, msg_enable_dhcp, msg_register_ring_buffers, @@ -61,6 +64,11 @@ char name[256]; } interface_t; +typedef enum { + wfp_block_local =3D 1<<0, + wfp_block_dns =3D 1<<1 +} wfp_block_flags_t; + typedef struct { message_header_t header; short family; @@ -120,8 +128,9 @@ typedef struct { message_header_t header; + wfp_block_flags_t flags; interface_t iface; -} block_dns_message_t; +} wfp_block_message_t; typedef struct { message_header_t header; diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am index b953961..6bf3862 100644 --- a/src/openvpn/Makefile.am +++ b/src/openvpn/Makefile.am @@ -156,6 +156,6 @@ $(OPTIONAL_DL_LIBS) \ $(OPTIONAL_INOTIFY_LIBS) if WIN32 -openvpn_SOURCES +=3D openvpn_win32_resources.rc block_dns.c block_dns.h ri= ng_buffer.h +openvpn_SOURCES +=3D openvpn_win32_resources.rc wfp_block.c wfp_block.h ri= ng_buffer.h openvpn_LDADD +=3D -lgdi32 -lws2_32 -lwininet -lcrypt32 -liphlpapi -lwinmm= -lfwpuclnt -lrpcrt4 -lncrypt -lsetupapi -lbcrypt endif diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 9e2b3845..4108e8c 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -1916,12 +1916,15 @@ c->c2.es); #if defined(_WIN32) - if (c->options.block_outside_dns) + /* Fortify 'redirect-gateway block-local' with firewall rules? */ + bool block_local =3D do_block_local(c->c1.route_list); + + if (c->options.block_outside_dns || block_local) { - dmsg(D_LOW, "Blocking outside DNS"); - if (!win_wfp_block_dns(c->c1.tuntap->adapter_index, c->options= .msg_channel)) + BOOL dns_only =3D !block_local; + if (!win_wfp_block(c->c1.tuntap->adapter_index, c->options.msg= _channel, dns_only)) { - msg(M_FATAL, "Blocking DNS failed!"); + msg(M_FATAL, "WFP: blocking failed!"); } } #endif @@ -1965,12 +1968,15 @@ c->c2.es); } #if defined(_WIN32) - if (c->options.block_outside_dns) + /* Fortify 'redirect-gateway block-local' with firewall rules? */ + bool block_local =3D do_block_local(c->c1.route_list); + + if (c->options.block_outside_dns || block_local) { - dmsg(D_LOW, "Blocking outside DNS"); - if (!win_wfp_block_dns(c->c1.tuntap->adapter_index, c->options= .msg_channel)) + BOOL dns_only =3D !block_local; + if (!win_wfp_block(c->c1.tuntap->adapter_index, c->options.msg= _channel, dns_only)) { - msg(M_FATAL, "Blocking DNS failed!"); + msg(M_FATAL, "WFP: blocking failed!"); } } #endif @@ -2093,7 +2099,7 @@ c->c2.es); #if defined(_WIN32) - if (c->options.block_outside_dns) + if (c->options.block_outside_dns || do_block_local(c->c1.route_lis= t)) { if (!win_wfp_uninit(adapter_index, c->options.msg_channel)) { @@ -2132,7 +2138,7 @@ } #if defined(_WIN32) - if (c->options.block_outside_dns) + if (c->options.block_outside_dns || do_block_local(c->c1.route_lis= t)) { if (!win_wfp_uninit(adapter_index, c->options.msg_channel)) { diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 6c027d9..19457ea 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -25,6 +25,7 @@ * Support routines for adding/deleting network routes. */ #include +#include #ifdef HAVE_CONFIG_H #include "config.h" @@ -74,7 +75,13 @@ #endif -static void delete_route(struct route_ipv4 *r, const struct tuntap *tt, un= signed int flags, const struct route_gateway_info *rgi, const struct env_se= t *es, openvpn_net_ctx_t *ctx); +static bool add_route(struct route_ipv4 *r, const struct tuntap *tt, unsig= ned int flags, + const struct route_gateway_info *rgi, const struct e= nv_set *es, + openvpn_net_ctx_t *ctx); + +static void delete_route(struct route_ipv4 *r, const struct tuntap *tt, un= signed int flags, + const struct route_gateway_info *rgi, const struc= t env_set *es, + openvpn_net_ctx_t *ctx); static void get_bypass_addresses(struct route_bypass *rb, const unsigned i= nt flags); @@ -566,9 +573,7 @@ const struct route_gateway_address *gateway, in_addr_t target) { - const int rgi_needed =3D (RGI_ADDR_DEFINED|RGI_NETMASK_DEFINED); - if ((rl->rgi.flags & rgi_needed) =3D=3D rgi_needed - && rl->rgi.gateway.netmask < 0xFFFFFFFF) + if (rl->rgi.gateway.netmask < 0xFFFFFFFF) { struct route_ipv4 *r1, *r2; unsigned int l2; @@ -593,39 +598,41 @@ } static void -add_block_local(struct route_list *rl) +add_block_local_routes(struct route_list *rl) { - const int rgi_needed =3D (RGI_ADDR_DEFINED|RGI_NETMASK_DEFINED); - if ((rl->flags & RG_BLOCK_LOCAL) - && (rl->rgi.flags & rgi_needed) =3D=3D rgi_needed - && (rl->spec.flags & RTSA_REMOTE_ENDPOINT) - && rl->spec.remote_host_local !=3D TLA_LOCAL) - { - size_t i; - #ifndef TARGET_ANDROID - /* add bypass for gateway addr */ - add_bypass_address(&rl->spec.bypass, rl->rgi.gateway.addr); + /* add bypass for gateway addr */ + add_bypass_address(&rl->spec.bypass, rl->rgi.gateway.addr); #endif - /* block access to local subnet */ - add_block_local_item(rl, &rl->rgi.gateway, rl->spec.remote_endpoin= t); + /* block access to local subnet */ + add_block_local_item(rl, &rl->rgi.gateway, rl->spec.remote_endpoint); - /* process additional subnets on gateway interface */ - for (i =3D 0; i < rl->rgi.n_addrs; ++i) + /* process additional subnets on gateway interface */ + size_t i; + for (i =3D 0; i < rl->rgi.n_addrs; ++i) + { + const struct route_gateway_address *gwa =3D &rl->rgi.addrs[i]; + /* omit the add/subnet in &rl->rgi which we processed above */ + if (!((rl->rgi.gateway.addr & rl->rgi.gateway.netmask) =3D=3D (gwa= ->addr & gwa->netmask) + && rl->rgi.gateway.netmask =3D=3D gwa->netmask)) { - const struct route_gateway_address *gwa =3D &rl->rgi.addrs[i]; - /* omit the add/subnet in &rl->rgi which we processed above */ - if (!((rl->rgi.gateway.addr & rl->rgi.gateway.netmask) =3D=3D = (gwa->addr & gwa->netmask) - && rl->rgi.gateway.netmask =3D=3D gwa->netmask)) - { - add_block_local_item(rl, gwa, rl->spec.remote_endpoint); - } + add_block_local_item(rl, gwa, rl->spec.remote_endpoint); } } } bool +do_block_local(const struct route_list *rl) +{ + const int rgi_needed =3D (RGI_ADDR_DEFINED|RGI_NETMASK_DEFINED); + return (rl->flags & RG_BLOCK_LOCAL) + && (rl->rgi.flags & rgi_needed) =3D=3D rgi_needed + && (rl->spec.flags & RTSA_REMOTE_ENDPOINT) + && rl->spec.remote_host_local !=3D TLA_LOCAL; +} + +bool init_route_list(struct route_list *rl, const struct route_option_list *opt, const char *remote_endpoint, @@ -698,7 +705,10 @@ if (rl->flags & RG_ENABLE) { - add_block_local(rl); + if (do_block_local(rl)) + { + add_block_local_routes(rl); + } get_bypass_addresses(&rl->spec.bypass, rl->flags); #ifdef ENABLE_DEBUG print_bypass_addresses(&rl->spec.bypass); @@ -1241,6 +1251,7 @@ } rl6->iflags |=3D RL_ROUTES_ADDED; } + return ret; } diff --git a/src/openvpn/route.h b/src/openvpn/route.h index 71b4cf4..7112936 100644 --- a/src/openvpn/route.h +++ b/src/openvpn/route.h @@ -243,6 +243,18 @@ struct iroute_ipv6 *next; }; +/** + * Get the decision whether to block traffic to local networks while the V= PN + * is connected. This definatly returns false when not redirecting the gat= eway + * or when the 'block-local' flag is not set. Also checks for other + * prerequisites to redirect local networks into the tunnel. + * + * @param rl const pointer to the struct route_list to base the decision o= n. + * + * @return boolean indicating whether local traffic should be blocked. + */ +bool do_block_local(const struct route_list *rl); + struct route_option_list *new_route_option_list(struct gc_arena *a); struct route_ipv6_option_list *new_route_ipv6_option_list(struct gc_arena = *a); @@ -263,10 +275,6 @@ void delete_route_ipv6(const struct route_ipv6 *r, const struct tuntap *tt= , unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx); -bool add_route(struct route_ipv4 *r, const struct tuntap *tt, unsigned int= flags, - const struct route_gateway_info *rgi, const struct env_set = *es, - openvpn_net_ctx_t *ctx); - void add_route_to_option_list(struct route_option_list *l, const char *network, const char *netmask, diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 8e96149..aa78c23 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -44,7 +44,7 @@ #include "manage.h" #include "route.h" #include "win32.h" -#include "block_dns.h" +#include "wfp_block.h" #include "networking.h" #include "memdbg.h" diff --git a/src/openvpn/block_dns.c b/src/openvpn/wfp_block.c similarity index 70% rename from src/openvpn/block_dns.c rename to src/openvpn/wfp_block.c index 05b2599..f694924 100644 --- a/src/openvpn/block_dns.c +++ b/src/openvpn/wfp_block.c @@ -37,7 +37,8 @@ #include #include #include -#include "block_dns.h" + +#include "wfp_block.h" /* * WFP-related defines and GUIDs not in mingw32 @@ -92,10 +93,19 @@ 0xb7, 0xf3, 0xbd, 0xa5, 0xd3, 0x28, 0x90, 0xa4 ); +/* 632ce23b-5167-435c-86d7-e903684aa80c */ +DEFINE_GUID( + FWPM_CONDITION_FLAGS, + 0x632ce23b, + 0x5167, + 0x435c, + 0x86, 0xd7, 0xe9, 0x03, 0x68, 0x4a, 0xa8, 0x0c + ); + /* UUID of WFP sublayer used by all instances of openvpn * 2f660d7e-6a37-11e6-a181-001e8c6e04a2 */ DEFINE_GUID( - OPENVPN_BLOCK_OUTSIDE_DNS_SUBLAYER, + OPENVPN_WFP_BLOCK_SUBLAYER, 0x2f660d7e, 0x6a37, 0x11e6, @@ -113,7 +123,7 @@ return; } -#define CHECK_ERROR(err, msg) \ +#define OUT_ON_ERROR(err, msg) \ if (err) { msg_handler(err, msg); goto out; } /* @@ -159,31 +169,36 @@ * OR * (ii) processes with the specified executable path * The firewall filters added here are automatically removed when the proc= ess exits or - * on calling delete_block_dns_filters(). + * on calling delete_wfp_block_filters(). * Arguments: * engine_handle : On successful return contains the handle for a newly = opened fwp session * in which the filters are added. - * May be closed by passing to delete_block_dns_filters = to remove the filters. + * May be closed by passing to delete_wfp_block_filters = to remove the filters. * index : The index of adapter for which traffic is permitted. * exe_path : Path of executable for which traffic is permitted. * msg_handler : An optional callback function for error reporting. + * dns_only : Whether the blocking filters should apply for DNS onl= y. * Returns 0 on success, a non-zero status code of the last failed action = on failure. */ DWORD -add_block_dns_filters(HANDLE *engine_handle, +add_wfp_block_filters(HANDLE *engine_handle, int index, const WCHAR *exe_path, - block_dns_msg_handler_t msg_handler - ) + wfp_block_msg_handler_t msg_handler, + BOOL dns_only) { FWPM_SESSION0 session =3D {0}; FWPM_SUBLAYER0 *sublayer_ptr =3D NULL; - NET_LUID tapluid; + NET_LUID itf_luid; UINT64 filterid; FWP_BYTE_BLOB *openvpnblob =3D NULL; FWPM_FILTER0 Filter =3D {0}; - FWPM_FILTER_CONDITION0 Condition[2] =3D {0}; + FWPM_FILTER_CONDITION0 Condition[2]; + FWPM_FILTER_CONDITION0 match_openvpn =3D {0}; + FWPM_FILTER_CONDITION0 match_port_53 =3D {0}; + FWPM_FILTER_CONDITION0 match_interface =3D {0}; + FWPM_FILTER_CONDITION0 match_not_loopback =3D {0}; DWORD err =3D 0; if (!msg_handler) @@ -197,116 +212,127 @@ *engine_handle =3D NULL; err =3D FwpmEngineOpen0(NULL, RPC_C_AUTHN_WINNT, NULL, &session, engin= e_handle); - CHECK_ERROR(err, "FwpEngineOpen: open fwp session failed"); - msg_handler(0, "Block_DNS: WFP engine opened"); + OUT_ON_ERROR(err, "FwpEngineOpen: open fwp session failed"); + msg_handler(0, "WFP Block: WFP engine opened"); /* Check sublayer exists and add one if it does not. */ - if (FwpmSubLayerGetByKey0(*engine_handle, &OPENVPN_BLOCK_OUTSIDE_DNS_S= UBLAYER, &sublayer_ptr) + if (FwpmSubLayerGetByKey0(*engine_handle, &OPENVPN_WFP_BLOCK_SUBLAYER,= &sublayer_ptr) =3D=3D ERROR_SUCCESS) { - msg_handler(0, "Block_DNS: Using existing sublayer"); + msg_handler(0, "WFP Block: Using existing sublayer"); FwpmFreeMemory0((void **)&sublayer_ptr); } else { /* Add a new sublayer -- as another process may add it in the meant= ime, * do not treat "already exists" as an error */ - err =3D add_sublayer(OPENVPN_BLOCK_OUTSIDE_DNS_SUBLAYER); + err =3D add_sublayer(OPENVPN_WFP_BLOCK_SUBLAYER); if (err =3D=3D FWP_E_ALREADY_EXISTS || err =3D=3D ERROR_SUCCESS) { - msg_handler(0, "Block_DNS: Added a persistent sublayer with pr= e-defined UUID"); + msg_handler(0, "WFP Block: Added a persistent sublayer with pr= e-defined UUID"); } else { - CHECK_ERROR(err, "add_sublayer: failed to add persistent subla= yer"); + OUT_ON_ERROR(err, "add_sublayer: failed to add persistent subl= ayer"); } } - err =3D ConvertInterfaceIndexToLuid(index, &tapluid); - CHECK_ERROR(err, "Convert interface index to luid failed"); + err =3D ConvertInterfaceIndexToLuid(index, &itf_luid); + OUT_ON_ERROR(err, "Convert interface index to luid failed"); err =3D FwpmGetAppIdFromFileName0(exe_path, &openvpnblob); - CHECK_ERROR(err, "Get byte blob for openvpn executable name failed"); + OUT_ON_ERROR(err, "Get byte blob for openvpn executable name failed"); + + /* Prepare match conditions */ + match_openvpn.fieldKey =3D FWPM_CONDITION_ALE_APP_ID; + match_openvpn.matchType =3D FWP_MATCH_EQUAL; + match_openvpn.conditionValue.type =3D FWP_BYTE_BLOB_TYPE; + match_openvpn.conditionValue.byteBlob =3D openvpnblob; + + match_port_53.fieldKey =3D FWPM_CONDITION_IP_REMOTE_PORT; + match_port_53.matchType =3D FWP_MATCH_EQUAL; + match_port_53.conditionValue.type =3D FWP_UINT16; + match_port_53.conditionValue.uint16 =3D 53; + + match_interface.fieldKey =3D FWPM_CONDITION_IP_LOCAL_INTERFACE; + match_interface.matchType =3D FWP_MATCH_EQUAL; + match_interface.conditionValue.type =3D FWP_UINT64; + match_interface.conditionValue.uint64 =3D &itf_luid.Value; + + match_not_loopback.fieldKey =3D FWPM_CONDITION_FLAGS; + match_not_loopback.matchType =3D FWP_MATCH_FLAGS_NONE_SET; + match_not_loopback.conditionValue.type =3D FWP_UINT32; + match_not_loopback.conditionValue.uint32 =3D FWP_CONDITION_FLAG_IS_LOO= PBACK; /* Prepare filter. */ - Filter.subLayerKey =3D OPENVPN_BLOCK_OUTSIDE_DNS_SUBLAYER; + Filter.subLayerKey =3D OPENVPN_WFP_BLOCK_SUBLAYER; Filter.displayData.name =3D FIREWALL_NAME; Filter.weight.type =3D FWP_UINT8; Filter.weight.uint8 =3D 0xF; Filter.filterCondition =3D Condition; - Filter.numFilterConditions =3D 2; + Filter.numFilterConditions =3D 1; - /* First filter. Permit IPv4 DNS queries from OpenVPN itself. */ + /* First filter. Permit IPv4 from OpenVPN itself. */ Filter.layerKey =3D FWPM_LAYER_ALE_AUTH_CONNECT_V4; Filter.action.type =3D FWP_ACTION_PERMIT; - - Condition[0].fieldKey =3D FWPM_CONDITION_IP_REMOTE_PORT; - Condition[0].matchType =3D FWP_MATCH_EQUAL; - Condition[0].conditionValue.type =3D FWP_UINT16; - Condition[0].conditionValue.uint16 =3D 53; - - Condition[1].fieldKey =3D FWPM_CONDITION_ALE_APP_ID; - Condition[1].matchType =3D FWP_MATCH_EQUAL; - Condition[1].conditionValue.type =3D FWP_BYTE_BLOB_TYPE; - Condition[1].conditionValue.byteBlob =3D openvpnblob; - + Condition[0] =3D match_openvpn; + if (dns_only) + { + Filter.numFilterConditions =3D 2; + Condition[1] =3D match_port_53; + } err =3D FwpmFilterAdd0(*engine_handle, &Filter, NULL, &filterid); - CHECK_ERROR(err, "Add filter to permit IPv4 port 53 traffic from OpenV= PN failed"); + OUT_ON_ERROR(err, "Add filter to permit IPv4 traffic from OpenVPN fail= ed"); - /* Second filter. Permit IPv6 DNS queries from OpenVPN itself. */ + /* Second filter. Permit IPv6 from OpenVPN itself. */ Filter.layerKey =3D FWPM_LAYER_ALE_AUTH_CONNECT_V6; - err =3D FwpmFilterAdd0(*engine_handle, &Filter, NULL, &filterid); - CHECK_ERROR(err, "Add filter to permit IPv6 port 53 traffic from OpenV= PN failed"); + OUT_ON_ERROR(err, "Add filter to permit IPv6 traffic from OpenVPN fail= ed"); - msg_handler(0, "Block_DNS: Added permit filters for exe_path"); + msg_handler(0, "WFP Block: Added permit filters for exe_path"); - /* Third filter. Block all IPv4 DNS queries. */ + /* Third filter. Block IPv4 to port 53 or all besided loopback. */ Filter.layerKey =3D FWPM_LAYER_ALE_AUTH_CONNECT_V4; Filter.action.type =3D FWP_ACTION_BLOCK; Filter.weight.type =3D FWP_EMPTY; Filter.numFilterConditions =3D 1; - + Condition[0] =3D dns_only ? match_port_53 : match_not_loopback; err =3D FwpmFilterAdd0(*engine_handle, &Filter, NULL, &filterid); - CHECK_ERROR(err, "Add filter to block IPv4 DNS traffic failed"); + OUT_ON_ERROR(err, "Add filter to block IPv4 traffic failed"); - /* Forth filter. Block all IPv6 DNS queries. */ + /* Forth filter. Block IPv6 to port 53 or all besides loopback */ Filter.layerKey =3D FWPM_LAYER_ALE_AUTH_CONNECT_V6; - err =3D FwpmFilterAdd0(*engine_handle, &Filter, NULL, &filterid); - CHECK_ERROR(err, "Add filter to block IPv6 DNS traffic failed"); + OUT_ON_ERROR(err, "Add filter to block IPv6 traffic failed"); - msg_handler(0, "Block_DNS: Added block filters for all interfaces"); + msg_handler(0, "WFP Block: Added block filters for all interfaces"); - /* Fifth filter. Permit IPv4 DNS queries from TAP. + /* Fifth filter. Permit IPv4 for the VPN interface. * Use a non-zero weight so that the permit filters get higher priority * over the block filter added with automatic weighting */ - Filter.weight.type =3D FWP_UINT8; Filter.weight.uint8 =3D 0xE; Filter.layerKey =3D FWPM_LAYER_ALE_AUTH_CONNECT_V4; Filter.action.type =3D FWP_ACTION_PERMIT; - Filter.numFilterConditions =3D 2; - - Condition[1].fieldKey =3D FWPM_CONDITION_IP_LOCAL_INTERFACE; - Condition[1].matchType =3D FWP_MATCH_EQUAL; - Condition[1].conditionValue.type =3D FWP_UINT64; - Condition[1].conditionValue.uint64 =3D &tapluid.Value; - + Filter.numFilterConditions =3D 1; + Condition[0] =3D match_interface; + if (dns_only) + { + Filter.numFilterConditions =3D 2; + Condition[1] =3D match_port_53; + } err =3D FwpmFilterAdd0(*engine_handle, &Filter, NULL, &filterid); - CHECK_ERROR(err, "Add filter to permit IPv4 DNS traffic through TAP fa= iled"); + OUT_ON_ERROR(err, "Add filter to permit IPv4 traffic through VPN inter= face failed"); - /* Sixth filter. Permit IPv6 DNS queries from TAP. + /* Sixth filter. Permit IPv6 for the VPN interface. * Use same weight as IPv4 filter */ Filter.layerKey =3D FWPM_LAYER_ALE_AUTH_CONNECT_V6; - err =3D FwpmFilterAdd0(*engine_handle, &Filter, NULL, &filterid); - CHECK_ERROR(err, "Add filter to permit IPv6 DNS traffic through TAP fa= iled"); + OUT_ON_ERROR(err, "Add filter to permit IPv6 traffic through VPN inter= face failed"); - msg_handler(0, "Block_DNS: Added permit filters for TAP interface"); + msg_handler(0, "WFP Block: Added permit filters for VPN interface"); out: - if (openvpnblob) { FwpmFreeMemory0((void **)&openvpnblob); @@ -322,7 +348,7 @@ } DWORD -delete_block_dns_filters(HANDLE engine_handle) +delete_wfp_block_filters(HANDLE engine_handle) { DWORD err =3D 0; /* diff --git a/src/openvpn/block_dns.h b/src/openvpn/wfp_block.h similarity index 83% rename from src/openvpn/block_dns.h rename to src/openvpn/wfp_block.h index 89b88d6..60c9171 100644 --- a/src/openvpn/block_dns.h +++ b/src/openvpn/wfp_block.h @@ -23,20 +23,24 @@ #ifdef _WIN32 -#ifndef OPENVPN_BLOCK_DNS_H -#define OPENVPN_BLOCK_DNS_H +#ifndef WFP_BLOCK_H +#define WFP_BLOCK_H + +#include +#include +#include /* Any value less than 5 should work fine. 3 is chosen without any real re= ason. */ -#define BLOCK_DNS_IFACE_METRIC 3 +#define WFP_BLOCK_IFACE_METRIC 3 -typedef void (*block_dns_msg_handler_t) (DWORD err, const char *msg); +typedef void (*wfp_block_msg_handler_t) (DWORD err, const char *msg); DWORD -delete_block_dns_filters(HANDLE engine); +delete_wfp_block_filters(HANDLE engine); DWORD -add_block_dns_filters(HANDLE *engine, int iface_index, const WCHAR *exe_pa= th, - block_dns_msg_handler_t msg_handler_callback); +add_wfp_block_filters(HANDLE *engine, int iface_index, const WCHAR *exe_pa= th, + wfp_block_msg_handler_t msg_handler_callback, BOOL d= ns_only); /** * Return interface metric value for the specified interface index. @@ -65,5 +69,5 @@ set_interface_metric(const NET_IFINDEX index, const ADDRESS_FAMILY family, const ULONG metric); -#endif /* ifndef OPENVPN_BLOCK_DNS_H */ +#endif /* ifndef WFP_BLOCK_H */ #endif /* ifdef _WIN32 */ diff --git a/src/openvpn/win32.c b/src/openvpn/win32.c index 6b7ba5e..9d08554 100644 --- a/src/openvpn/win32.c +++ b/src/openvpn/win32.c @@ -34,6 +34,9 @@ #ifdef _WIN32 +#include +#include + #include "buffer.h" #include "error.h" #include "mtu.h" @@ -47,7 +50,7 @@ #include -#include "block_dns.h" +#include "wfp_block.h" /* * WFP handle @@ -1138,43 +1141,19 @@ } static bool -win_block_dns_service(bool add, int index, const HANDLE pipe) +win_get_exe_path(PWCHAR path, DWORD size) { - bool ret =3D false; - ack_message_t ack; - struct gc_arena gc =3D gc_new(); - - block_dns_message_t data =3D { - .header =3D { - (add ? msg_add_block_dns : msg_del_block_dns), - sizeof(block_dns_message_t), - 0 - }, - .iface =3D { .index =3D index, .name =3D "" } - }; - - if (!send_msg_iservice(pipe, &data, sizeof(data), &ack, "Block_DNS")) + DWORD status =3D GetModuleFileNameW(NULL, path, size); + if (status =3D=3D 0 || status =3D=3D size) { - goto out; + msg(M_WARN|M_ERRNO, "cannot get executable path"); + return false; } - - if (ack.error_number !=3D NO_ERROR) - { - msg(M_WARN, "Block_DNS: %s block dns filters using service failed:= %s [status=3D0x%x if_index=3D%d]", - (add ? "adding" : "deleting"), strerror_win32(ack.error_number= , &gc), - ack.error_number, data.iface.index); - goto out; - } - - ret =3D true; - msg(M_INFO, "%s outside dns using service succeeded.", (add ? "Blockin= g" : "Unblocking")); -out: - gc_free(&gc); - return ret; + return true; } static void -block_dns_msg_handler(DWORD err, const char *msg) +win_wfp_msg_handler(DWORD err, const char *msg) { struct gc_arena gc =3D gc_new(); @@ -1184,15 +1163,52 @@ } else { - msg(M_WARN, "Error in add_block_dns_filters(): %s : %s [status=3D0= x%lx]", + msg(M_WARN, "Error in WFP: %s : %s [status=3D0x%lx]", msg, strerror_win32(err, &gc), err); } gc_free(&gc); } +static bool +win_wfp_block_service(bool add, bool dns_only, int index, const HANDLE pip= e) +{ + bool ret =3D false; + ack_message_t ack; + struct gc_arena gc =3D gc_new(); + + wfp_block_message_t data =3D { + .header =3D { + (add ? msg_add_wfp_block : msg_del_wfp_block), + sizeof(wfp_block_message_t), + 0 + }, + .flags =3D dns_only ? wfp_block_dns : wfp_block_local, + .iface =3D { .index =3D index, .name =3D "" } + }; + + if (!send_msg_iservice(pipe, &data, sizeof(data), &ack, "WFP block")) + { + goto out; + } + + if (ack.error_number !=3D NO_ERROR) + { + msg(M_WARN, "WFP block: %s block filters using service failed: %s = [status=3D0x%x if_index=3D%d]", + (add ? "adding" : "deleting"), strerror_win32(ack.error_number= , &gc), + ack.error_number, data.iface.index); + goto out; + } + + ret =3D true; + msg(M_INFO, "%s WFP block filters using service succeeded.", (add ? "A= dding" : "Deleting")); +out: + gc_free(&gc); + return ret; +} + bool -win_wfp_block_dns(const NET_IFINDEX index, const HANDLE msg_channel) +win_wfp_block(const NET_IFINDEX index, const HANDLE msg_channel, BOOL dns_= only) { WCHAR openvpnpath[MAX_PATH]; bool ret =3D false; @@ -1200,20 +1216,19 @@ if (msg_channel) { - dmsg(D_LOW, "Using service to add block dns filters"); - ret =3D win_block_dns_service(true, index, msg_channel); + dmsg(D_LOW, "Using service to add WFP block filters"); + ret =3D win_wfp_block_service(true, dns_only, index, msg_channel); goto out; } - status =3D GetModuleFileNameW(NULL, openvpnpath, _countof(openvpnpath)= ); - if (status =3D=3D 0 || status =3D=3D _countof(openvpnpath)) + ret =3D win_get_exe_path(openvpnpath, _countof(openvpnpath)); + if (ret =3D=3D false) { - msg(M_WARN|M_ERRNO, "block_dns: cannot get executable path"); goto out; } - status =3D add_block_dns_filters(&m_hEngineHandle, index, openvpnpath, - block_dns_msg_handler); + status =3D add_wfp_block_filters(&m_hEngineHandle, index, openvpnpath, + win_wfp_msg_handler, dns_only); if (status =3D=3D 0) { int is_auto =3D 0; @@ -1227,10 +1242,10 @@ { tap_metric_v6 =3D 0; } - status =3D set_interface_metric(index, AF_INET, BLOCK_DNS_IFACE_ME= TRIC); + status =3D set_interface_metric(index, AF_INET, WFP_BLOCK_IFACE_ME= TRIC); if (!status) { - set_interface_metric(index, AF_INET6, BLOCK_DNS_IFACE_METRIC); + set_interface_metric(index, AF_INET6, WFP_BLOCK_IFACE_METRIC); } } @@ -1248,12 +1263,12 @@ if (msg_channel) { - msg(D_LOW, "Using service to delete block dns filters"); - win_block_dns_service(false, index, msg_channel); + msg(D_LOW, "Using service to delete WFP block filters"); + win_wfp_block_service(false, false, index, msg_channel); } else { - delete_block_dns_filters(m_hEngineHandle); + delete_wfp_block_filters(m_hEngineHandle); m_hEngineHandle =3D NULL; if (tap_metric_v4 >=3D 0) { diff --git a/src/openvpn/win32.h b/src/openvpn/win32.h index aa8513b..92b3528 100644 --- a/src/openvpn/win32.h +++ b/src/openvpn/win32.h @@ -25,8 +25,10 @@ #ifndef OPENVPN_WIN32_H #define OPENVPN_WIN32_H -#include +#include +#include +#include "syshead.h" #include "mtu.h" #include "openvpn-msg.h" #include "argv.h" @@ -286,7 +288,7 @@ /* call self in a subprocess */ void fork_to_self(const char *cmdline); -bool win_wfp_block_dns(const NET_IFINDEX index, const HANDLE msg_channel); +bool win_wfp_block(const NET_IFINDEX index, const HANDLE msg_channel, BOOL= dns_only); bool win_wfp_uninit(const NET_IFINDEX index, const HANDLE msg_channel); diff --git a/src/openvpnserv/CMakeLists.txt b/src/openvpnserv/CMakeLists.txt index 17cd90c..154e17c 100644 --- a/src/openvpnserv/CMakeLists.txt +++ b/src/openvpnserv/CMakeLists.txt @@ -17,7 +17,7 @@ interactive.c service.c service.h validate.c validate.h - ../openvpn/block_dns.c ../openvpn/block_dns.h + ../openvpn/wfp_block.c ../openvpn/wfp_block.h openvpnserv_resources.rc ../openvpn/ring_buffer.h ) diff --git a/src/openvpnserv/Makefile.am b/src/openvpnserv/Makefile.am index d8ba4eb..49ad8aa 100644 --- a/src/openvpnserv/Makefile.am +++ b/src/openvpnserv/Makefile.am @@ -33,6 +33,6 @@ interactive.c \ service.c service.h \ validate.c validate.h \ - $(top_srcdir)/src/openvpn/block_dns.c $(top_srcdir)/src/openvpn/block_dns= .h \ + $(top_srcdir)/src/openvpn/wfp_block.c $(top_srcdir)/src/openvpn/wfp_block= .h \ openvpnserv_resources.rc \ $(top_srcdir)/src/openvpn/ring_buffer.h diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 32c8996..68a8106 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -38,7 +38,7 @@ #include "openvpn-msg.h" #include "validate.h" -#include "block_dns.h" +#include "wfp_block.h" #include "ring_buffer.h" #define IO_TIMEOUT 2000 /*ms*/ @@ -84,7 +84,7 @@ typedef enum { address, route, - block_dns, + wfp_block, undo_dns4, undo_dns6, undo_domain, @@ -99,7 +99,7 @@ int index; int metric_v4; int metric_v6; -} block_dns_data_t; +} wfp_block_data_t; typedef struct { struct tun_ring *send_ring; @@ -774,74 +774,76 @@ } static DWORD -DeleteBlockDNS(const block_dns_message_t *msg, undo_lists_t *lists) +DeleteWfpBlock(const wfp_block_message_t *msg, undo_lists_t *lists) { DWORD err =3D 0; - block_dns_data_t *interface_data =3D RemoveListItem(&(*lists)[block_dn= s], CmpAny, NULL); + wfp_block_data_t *block_data =3D RemoveListItem(&(*lists)[wfp_block], = CmpAny, NULL); - if (interface_data) + if (block_data) { - err =3D delete_block_dns_filters(interface_data->engine); - if (interface_data->metric_v4 >=3D 0) + err =3D delete_wfp_block_filters(block_data->engine); + if (block_data->metric_v4 >=3D 0) { set_interface_metric(msg->iface.index, AF_INET, - interface_data->metric_v4); + block_data->metric_v4); } - if (interface_data->metric_v6 >=3D 0) + if (block_data->metric_v6 >=3D 0) { set_interface_metric(msg->iface.index, AF_INET6, - interface_data->metric_v6); + block_data->metric_v6); } - free(interface_data); + free(block_data); } else { - MsgToEventLog(M_ERR, TEXT("No previous block DNS filters to delete= ")); + MsgToEventLog(M_ERR, TEXT("No previous block filters to delete")); } return err; } static DWORD -AddBlockDNS(const block_dns_message_t *msg, undo_lists_t *lists) +AddWfpBlock(const wfp_block_message_t *msg, undo_lists_t *lists) { DWORD err =3D 0; - block_dns_data_t *interface_data =3D NULL; + wfp_block_data_t *block_data =3D NULL; HANDLE engine =3D NULL; LPCWSTR exe_path; + BOOL dns_only; exe_path =3D settings.exe_path; + dns_only =3D (msg->flags =3D=3D wfp_block_dns); - err =3D add_block_dns_filters(&engine, msg->iface.index, exe_path, Blo= ckDNSErrHandler); + err =3D add_wfp_block_filters(&engine, msg->iface.index, exe_path, Blo= ckDNSErrHandler, dns_only); if (!err) { - interface_data =3D malloc(sizeof(block_dns_data_t)); - if (!interface_data) + block_data =3D malloc(sizeof(wfp_block_data_t)); + if (!block_data) { err =3D ERROR_OUTOFMEMORY; goto out; } - interface_data->engine =3D engine; - interface_data->index =3D msg->iface.index; + block_data->engine =3D engine; + block_data->index =3D msg->iface.index; int is_auto =3D 0; - interface_data->metric_v4 =3D get_interface_metric(msg->iface.inde= x, - AF_INET, &is_auto= ); + block_data->metric_v4 =3D get_interface_metric(msg->iface.index, + AF_INET, &is_auto); if (is_auto) { - interface_data->metric_v4 =3D 0; + block_data->metric_v4 =3D 0; } - interface_data->metric_v6 =3D get_interface_metric(msg->iface.inde= x, - AF_INET6, &is_aut= o); + block_data->metric_v6 =3D get_interface_metric(msg->iface.index, + AF_INET6, &is_auto); if (is_auto) { - interface_data->metric_v6 =3D 0; + block_data->metric_v6 =3D 0; } - err =3D AddListItem(&(*lists)[block_dns], interface_data); + err =3D AddListItem(&(*lists)[wfp_block], block_data); if (!err) { err =3D set_interface_metric(msg->iface.index, AF_INET, - BLOCK_DNS_IFACE_METRIC); + WFP_BLOCK_IFACE_METRIC); if (!err) { /* for IPv6, we intentionally ignore errors, because @@ -850,12 +852,12 @@ * (if OpenVPN wants IPv6 ifconfig, we'll fail there) */ set_interface_metric(msg->iface.index, AF_INET6, - BLOCK_DNS_IFACE_METRIC); + WFP_BLOCK_IFACE_METRIC); } if (err) { /* delete the filters, remove undo item and free interface= data */ - DeleteBlockDNS(msg, lists); + DeleteWfpBlock(msg, lists); engine =3D NULL; } } @@ -864,23 +866,23 @@ out: if (err && engine) { - delete_block_dns_filters(engine); - free(interface_data); + delete_wfp_block_filters(engine); + free(block_data); } return err; } static DWORD -HandleBlockDNSMessage(const block_dns_message_t *msg, undo_lists_t *lists) +HandleWfpBlockMessage(const wfp_block_message_t *msg, undo_lists_t *lists) { - if (msg->header.type =3D=3D msg_add_block_dns) + if (msg->header.type =3D=3D msg_add_wfp_block) { - return AddBlockDNS(msg, lists); + return AddWfpBlock(msg, lists); } else { - return DeleteBlockDNS(msg, lists); + return DeleteWfpBlock(msg, lists); } } =20 @@ -1616,7 +1618,7 @@ address_message_t address; route_message_t route; flush_neighbors_message_t flush_neighbors; - block_dns_message_t block_dns; + wfp_block_message_t wfp_block; dns_cfg_message_t dns; enable_dhcp_message_t dhcp; register_ring_buffers_message_t rrb; @@ -1665,11 +1667,11 @@ } break; - case msg_add_block_dns: - case msg_del_block_dns: - if (msg.header.size =3D=3D sizeof(msg.block_dns)) + case msg_add_wfp_block: + case msg_del_wfp_block: + if (msg.header.size =3D=3D sizeof(msg.wfp_block)) { - ack.error_number =3D HandleBlockDNSMessage(&msg.block_dns,= lists); + ack.error_number =3D HandleWfpBlockMessage(&msg.wfp_block,= lists); } break; @@ -1723,7 +1725,7 @@ Undo(undo_lists_t *lists) { undo_type_t type; - block_dns_data_t *interface_data; + wfp_block_data_t *interface_data; for (type =3D 0; type < _undo_type_max; type++) { list_item_t **pnext =3D &(*lists)[type]; @@ -1756,9 +1758,9 @@ SetDNSDomain(item->data, "", NULL); break; - case block_dns: - interface_data =3D (block_dns_data_t *)(item->data); - delete_block_dns_filters(interface_data->engine); + case wfp_block: + interface_data =3D (wfp_block_data_t *)(item->data); + delete_wfp_block_filters(interface_data->engine); if (interface_data->metric_v4 >=3D 0) { set_interface_metric(interface_data->index, AF_INE= T, -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/489?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ic9bf797bfc7e2d471998a84cb0f071db3e4832ba Gerrit-Change-Number: 489 Gerrit-PatchSet: 1 Gerrit-Owner: d12fk Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --RykBHYKWIXQ= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

d12fk would like plaisthos and flichtenheld to review t= his change.

Vi= ew Change

Windows: enforce 'block-local' with WFP filters
In an attempt to better defend against the TunnelCrack attacks, enforcethat no traffic can pass to anything else than the VPN interface when
= the 'block-local' flags is given with either --redirect-gateway or<= br>--redirect-private.

Reuse much of the existing --block-outside-dn= s code, but make it more
general, so that it can also block any traffic,= not just port 53.

Uses the Windows Filtering Platform for enforceme= nt in addition to the
routes redirecting the networks into the tunnel.
Change-Id: Ic9bf797bfc7e2d471998a84cb0f071db3e4832ba
Signed-off-by= : Heiko Hund <heiko@...2662...>
---
M CMakeLists.txt
M doc/m= an-sections/vpn-network-options.rst
M include/openvpn-msg.h
M src/ope= nvpn/Makefile.am
M src/openvpn/init.c
M src/openvpn/route.c
M src/= openvpn/route.h
M src/openvpn/tun.c
R src/openvpn/wfp_block.c
R sr= c/openvpn/wfp_block.h
M src/openvpn/win32.c
M src/openvpn/win32.h
= M src/openvpnserv/CMakeLists.txt
M src/openvpnserv/Makefile.am
M src/= openvpnserv/interactive.c
15 files changed, 299 insertions(+), 213 delet= ions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/chan=
ges/89/489/1
diff --git a/CMakeLists.txt b/CMakeLists.txtindex bc46c27..e560ef3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -352,8 +352,6 @@
src/openvpn/base64.c
src/openvpn/bas= e64.h
src/openvpn/basic.h
- src/openvpn/block_dns.h
- src/openvpn/block_dns.c
src/openvpn/buffer.c

src/openvpn/buffer.h=
src/openvpn/circ_list.h
@@ -533,6 +531,8 @@<= /span>
src/openvpn/ssl_util.h
src/openvp= n/vlan.c
src/openvpn/vlan.h
+ src/openvpn/wfp_block.c
+ src/openvpn/wfp_block.h
= src/openvpn/win32.c
src/openvpn/win32-util.= c
src/openvpn/win32.h
diff --git a/doc= /man-sections/vpn-network-options.rst b/doc/man-sections/vpn-network-option= s.rst
index 41d367b..630e8f5 100644
--- a/d= oc/man-sections/vpn-network-options.rst
+++ b/doc/man-secti= ons/vpn-network-options.rst
@@ -352,6 +352,9 @@
<= span> Block access to local LAN when the tunnel is active, except for=

the LAN gateway itself. This is accomplished by rou= ting the local
LAN (except for the LAN gateway addre= ss) into the tunnel.
= + On Windows WFP filters are added in addition to the routes which
+ block access to r= esources not routed through the VPN adapter.
+ Push this flag to defend against the TunnelC= rack attacks.

:code:`ipv6`
<= span> Redirect IPv6 routing into the tunnel. This works similar to
diff --git a/include/openvpn-msg.h b/include/openvpn-msg.h
index a1464cd..0fa0cb5 100644
--- a/include/o= penvpn-msg.h
+++ b/include/openvpn-msg.h
@@= -24,6 +24,9 @@
#ifndef OPENVPN_MSG_H_
#d= efine OPENVPN_MSG_H_

+#include <windef.h>
+#include <ws2tcpip.h>
+
typedef enum { msg_acknowledgement,
msg_add_address,
@@ -35,8 +38,8 @@
msg_add_nbt_cfg,=
msg_del_nbt_cfg,
msg_flush_neighbors,
- msg_add_block_dns,<= /span>
- msg_del_block_dns,=
+ msg_add_wfp_blo= ck,
+ msg_del_wfp_= block,
msg_register_dns,
msg_enab= le_dhcp,
msg_register_ring_buffers,
@@= -61,6 +64,11 @@
char name[256];
} in= terface_t;

+typedef enum {
+ wfp_block_local =3D 1<<0,
+ wfp_block_dns =3D 1<<1
+} wfp_block_flags_t;
+
typedef struct {
message_header_t header;
short family;=
@@ -120,8 +128,9 @@

typ= edef struct {
message_header_t header;
+ wfp_block_flags_t flags;
=
interface_t iface;
-} block_dns_message_t;
+} wfp_block_message_t;

ty= pedef struct {
message_header_t header;
diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am

= index b953961..6bf3862 100644
--- a/src/openvpn/Makef= ile.am
+++ b/src/openvpn/Makefile.am
@@ -15= 6,6 +156,6 @@
$(OPTIONAL_DL_LIBS) \
$(O= PTIONAL_INOTIFY_LIBS)
if WIN32
-openvpn_SOURCES +=3D openvpn_win32_resources.rc b= lock_dns.c block_dns.h ring_buffer.h
+openvpn_SOURCES +=3D openvpn_win32_resources.rc wfp_block.= c wfp_block.h ring_buffer.h
openvpn_LDADD +=3D -lgdi32 -lw= s2_32 -lwininet -lcrypt32 -liphlpapi -lwinmm -lfwpuclnt -lrpcrt4 -lncrypt -= lsetupapi -lbcrypt
endif
diff --git a/src/= openvpn/init.c b/src/openvpn/init.c
index 9e2b3845..4108e8c= 100644
--- a/src/openvpn/init.c
+++ b/src/= openvpn/init.c
@@ -1916,12 +1916,15 @@
= c->c2.es);

#if defin= ed(_WIN32)
- if = (c->options.block_outside_dns)
+ /* Fortify 'redirect-gateway block-local' wit= h firewall rules? */
= + bool block_local =3D do_block_local(c->c1.route_list);+
+ if (c->options.block_outside_dns || = block_local)
{
- dmsg(D_LOW, "Blocking outside DNS")= ;
- if (!win= _wfp_block_dns(c->c1.tuntap->adapter_index, c->options.msg_channel= ))
+ BOOL = dns_only =3D !block_local;
+ if (!win_wfp_block(c->c1.tuntap->adapter_index, c-= >options.msg_channel, dns_only))
{- msg(M_FATAL, &= quot;Blocking DNS failed!");
+ msg(M_FATAL, "WFP: blocking failed!"= ;);
}
}
#endif

@@ -1965,12 +1968,15 @@
= c->c2.es);
}
= #if defined(_WIN32)
- = if (c->options.block_outside_dns)
+ /* Fortify 'redirect-gateway block-local= ' with firewall rules? */
+ bool block_local =3D do_block_local(c->c1.route_list);=
+
+ if (c->options.block_outsid= e_dns || block_local)
{
- dmsg(D_LOW, "Blocking outside D= NS");
- = if (!win_wfp_block_dns(c->c1.tuntap->adapter_index, c->options.ms= g_channel))
+ = BOOL dns_only =3D !block_local;
+ if (!win_wfp_block(c->c1.tuntap->adapter_= index, c->options.msg_channel, dns_only))
{=
- msg(M= _FATAL, "Blocking DNS failed!");
+ msg(M_FATAL, "WFP: blocking fai= led!");
}
}
#endif
@@ -2093,7 +2099,7 @@
= c->c2.es);

#if de= fined(_WIN32)
- = if (c->options.block_outside_dns)
+ if (c->options.block_outside_dns || do_block_lo= cal(c->c1.route_list))
{
= if (!win_wfp_uninit(adapter_index, c->options.msg_channel))
{
@@ -2132,7 +2138,7 @@
<= span> }


#if defined(_WIN32)
- if (c->options.= block_outside_dns)
+ = if (c->options.block_outside_dns || do_block_local(c->c1.route= _list))
{
if (!win_wf= p_uninit(adapter_index, c->options.msg_channel))
= {
diff --git a/src/openvpn/route.c b/src/openvpn/rout= e.c
index 6c027d9..19457ea 100644
--- a/src= /openvpn/route.c
+++ b/src/openvpn/route.c
= @@ -25,6 +25,7 @@
* Support routines for adding/deleting = network routes.
*/
#include <stddef.h= >
+#include <st= dbool.h>

#ifdef HAVE_CONFIG_H<= br> #include "config.h"
@@ -74,7 +75,13 @@<= /span>

#endif

-static void delete_route(struct route= _ipv4 *r, const struct tuntap *tt, unsigned int flags, const struct route_g= ateway_info *rgi, const struct env_set *es, openvpn_net_ctx_t *ctx);
=
+static bool add_route(stru= ct route_ipv4 *r, const struct tuntap *tt, unsigned int flags,
+ const stru= ct route_gateway_info *rgi, const struct env_set *es,

+ openvpn_net_ctx_t *= ctx);
+
+static void delete_route(struct r= oute_ipv4 *r, const struct tuntap *tt, unsigned int flags,

+ const struc= t route_gateway_info *rgi, const struct env_set *es,
+ openvpn_net_ctx_= t *ctx);

static void get_bypass_addresse= s(struct route_bypass *rb, const unsigned int flags);

@@ -566,9 +573,7 @@
cons= t struct route_gateway_address *gateway,
= in_addr_t target)
{
- const int rgi_needed =3D (RGI_ADDR_DEFINED|RGI_NETMA= SK_DEFINED);
- if ((= rl->rgi.flags & rgi_needed) =3D=3D rgi_needed
- && rl->rgi.gateway.netma= sk < 0xFFFFFFFF)
+= if (rl->rgi.gateway.netmask < 0xFFFFFFFF)
{<= /span>
struct route_ipv4 *r1, *r2;
= unsigned int l2;
@@ -593,39 +598,41 @@
= }

static void
-add_block_local(struct route_list *rl)+add_block_local_routes(struct= route_list *rl)
{
- const int rgi_needed =3D (RGI_ADDR_DEFINED|RGI_NETMASK_DE= FINED);
- if ((rl-&g= t;flags & RG_BLOCK_LOCAL)
- && (rl->rgi.flags & rgi_needed) =3D=3D rgi_n= eeded
- &&am= p; (rl->spec.flags & RTSA_REMOTE_ENDPOINT)
- && rl->spec.remote_host_loca= l !=3D TLA_LOCAL)
- = {
- size_t i;
-
#ifnde= f TARGET_ANDROID
- = /* add bypass for gateway addr */
- add_bypass_address(&rl->spec.bypass, rl->r= gi.gateway.addr);
+ = /* add bypass for gateway addr */
+ add_bypass_address(&rl->spec.bypass, rl->rgi.= gateway.addr);
#endif

- /* block access to local subnet = */
- add_block_l= ocal_item(rl, &rl->rgi.gateway, rl->spec.remote_endpoint);=
+ /* block access to loc= al subnet */
+ add= _block_local_item(rl, &rl->rgi.gateway, rl->spec.remote_endpoint)= ;

- = /* process additional subnets on gateway interface */
- for (i =3D 0; i < rl->r= gi.n_addrs; ++i)

+ = /* process additional subnets on gateway interface */
+ size_t i;
+ for (i =3D 0; i < rl->rgi.n_addrs; += +i)
+ {
= + const struct route_gat= eway_address *gwa =3D &rl->rgi.addrs[i];
+ /* omit the add/subnet in &rl->r= gi which we processed above */
+ if (!((rl->rgi.gateway.addr & rl->rgi.gateway.= netmask) =3D=3D (gwa->addr & gwa->netmask)
+ && rl->rgi.gatew= ay.netmask =3D=3D gwa->netmask))
{
- const struct route_gat= eway_address *gwa =3D &rl->rgi.addrs[i];

- /* omit the add/subnet in &rl->= ;rgi which we processed above */
- if (!((rl->rgi.gateway.addr & rl->rgi.gate= way.netmask) =3D=3D (gwa->addr & gwa->netmask)
- && rl->rgi.= gateway.netmask =3D=3D gwa->netmask))
- {
- add_block_local_item(rl, gwa, rl->spec.remote= _endpoint);
- = }
+ add_= block_local_item(rl, gwa, rl->spec.remote_endpoint);
= }
}
}
<= br> bool
+do_bl= ock_local(const struct route_list *rl)
+{
= + const int rgi_needed =3D (RGI_ADDR_DEFINED|RGI_NETMASK_DEFINED);
+ return (rl->flags = & RG_BLOCK_LOCAL)
+ && (rl->rgi.flags & rgi_needed) =3D=3D rgi_need= ed
+ &&= amp; (rl->spec.flags & RTSA_REMOTE_ENDPOINT)
+ && rl->spec.remote_= host_local !=3D TLA_LOCAL;
+}
+
= +bool
init_rou= te_list(struct route_list *rl,
const struc= t route_option_list *opt,
const char *remo= te_endpoint,
@@ -698,7 +705,10 @@
<= br> if (rl->flags & RG_ENABLE)
{
- add_block_local(rl= );
+ if (do_bl= ock_local(rl))
+ = {
+ add= _block_local_routes(rl);
+ }
get_bypass_addresses(&rl->sp= ec.bypass, rl->flags);
#ifdef ENABLE_DEBUG
print_bypass_addresses(&rl->spec.bypass);

@@ -1241,6 +1251,7 @@

}
= rl6->iflags |=3D RL_ROUTES_ADDED;
}
+

return ret;=
}

diff --git a/src/open= vpn/route.h b/src/openvpn/route.h
index 71b4cf4..7112936 10= 0644
--- a/src/openvpn/route.h
+++ b/src/op= envpn/route.h
@@ -243,6 +243,18 @@
str= uct iroute_ipv6 *next;
};

+/**

+ * Get the decision whether to block traffic to lo= cal networks while the VPN
+ * is connected. This definatly returns false when not redirecting t= he gateway
+ * or whe= n the 'block-local' flag is not set. Also checks for other+ * prerequisites to redirect= local networks into the tunnel.
+ *
+ * @= param rl const pointer to the struct route_list to base the decision on.
+ *
+ * @return boolean indicating whether l= ocal traffic should be blocked.
+ */
+bool= do_block_local(const struct route_list *rl);
+
struct route_option_list *new_r= oute_option_list(struct gc_arena *a);

st= ruct route_ipv6_option_list *new_route_ipv6_option_list(struct gc_arena *a)= ;
@@ -263,10 +275,6 @@

v= oid delete_route_ipv6(const struct route_ipv6 *r, const struct tuntap *tt, = unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx);

-bool add= _route(struct route_ipv4 *r, const struct tuntap *tt, unsigned int flags,
- const st= ruct route_gateway_info *rgi, const struct env_set *es,
- openvpn_net_ctx_t *ctx);
-
void = add_route_to_option_list(struct route_option_list *l,
= const char *network,
= const char *netmask,
diff --git a/src/op= envpn/tun.c b/src/openvpn/tun.c
index 8e96149..aa78c23 1006= 44
--- a/src/openvpn/tun.c
+++ b/src/openvp= n/tun.c
@@ -44,7 +44,7 @@
#include "m= anage.h"
#include "route.h"
#include "win32.h"

-#include "block_dns.h"
+#include "wfp_block.h"
#in= clude "networking.h"

#include = "memdbg.h"
diff --git a/src/openvpn/block_dns.c b= /src/openvpn/wfp_block.c
similarity index 70%
rename from src/openvpn/block_dns.c

rename to src/openvp= n/wfp_block.c
index 05b2599..f694924 100644
--- a/src/openvpn/block_dns.c

+++ b/src/openvpn/wfp_block.= c
@@ -37,7 +37,8 @@
#include <winsock2.= h>
#include <ws2ipdef.h>
#includ= e <iphlpapi.h>
-#= include "block_dns.h"
+
+#includ= e "wfp_block.h"

/*
<= span> * WFP-related defines and GUIDs not in mingw32

@@ -9= 2,10 +93,19 @@
0xb7, 0xf3, 0xbd, 0xa5, 0xd3, 0x28, 0x9= 0, 0xa4
);

+/* 632ce23b-5167-435c-86d7-e903684aa80c */
+DEFINE_GUID(+ FWPM_CONDITION_FLAGS,
+ 0x632ce23b,<= br>+ 0x5167,
+ 0x435c,

+ 0x86, 0xd7, 0xe9, 0x03, 0x68, 0x4a, 0= xa8, 0x0c
+ );
+
/* UU= ID of WFP sublayer used by all instances of openvpn
* 2f6= 60d7e-6a37-11e6-a181-001e8c6e04a2 */
DEFINE_GUID(- OPENVPN_BLOCK_OUTSIDE_DNS_= SUBLAYER,
+ OPENVP= N_WFP_BLOCK_SUBLAYER,
0x2f660d7e,
= 0x6a37,
0x11e6,
@@ -113,7 +123,7 @@
return;
}

= -#define CHECK_ERROR(err, msg) \<= /span>
+#define OUT_ON_ERROR= (err, msg) \
if (err) { msg_handler(err, msg); goto ou= t; }

/*
@@ -159,31 +169,= 36 @@
* OR
* (ii) processes with the sp= ecified executable path
* The firewall filters added here= are automatically removed when the process exits or
- * on calling delete_block_dns_filters().
+ * on calling delete_= wfp_block_filters().
* Arguments:
* e= ngine_handle : On successful return contains the handle for a newly opened = fwp session
* in which the filters are = added.
- * = May be closed by passing to delete_block_dns_filters to remove the fi= lters.
+ * = May be closed by passing to delete_wfp_block_filters to remove the = filters.
* index : The index of adapter for whi= ch traffic is permitted.
* exe_path : Path of exec= utable for which traffic is permitted.
* msg_handler = : An optional callback function for error reporting.
+ * dns_only : Whether the blocking= filters should apply for DNS only.
* Returns 0 on succes= s, a non-zero status code of the last failed action on failure.
<= span> */


DWORD
-add_block_dns_filters(HANDLE *engine_handle,
+add_wfp_block_filters= (HANDLE *engine_handle,
int index,
const WCHAR *exe_path,
- block_dns_msg_= handler_t msg_handler

-= )
+ wfp_block_msg_handler_t msg_handler,
+ BOOL dns_o= nly)

{
FWPM_SESSION0 session =3D {0};=
FWPM_SUBLAYER0 *sublayer_ptr =3D NULL;
- NET_LUID tapluid;

+ NET_LUID itf_luid;

<= span> UINT64 filterid;

FWP_BYTE_BLOB *openvpnblob = =3D NULL;
FWPM_FILTER0 Filter =3D {0};
- FWPM_FILTER_CONDITION0 Condition[= 2] =3D {0};

+ FWPM= _FILTER_CONDITION0 Condition[2];
+ FWPM_FILTER_CONDITION0 match_openvpn =3D {0};
+ FWPM_FILTER_CONDITION0 match= _port_53 =3D {0};

+ = FWPM_FILTER_CONDITION0 match_interface =3D {0};
+ FWPM_FILTER_CONDITION0 match_not_loopback= =3D {0};
DWORD err =3D 0;
if (!msg_handler)
@@ -197,116 +212,127 @@
*engine_handle =3D NULL;

= err =3D FwpmEngineOpen0(NULL, RPC_C_AUTHN_WINNT, NULL, &session, e= ngine_handle);
- CHE= CK_ERROR(err, "FwpEngineOpen: open fwp session failed");- msg_handler(0, "Block= _DNS: WFP engine opened");
+ OUT_ON_ERROR(err, "FwpEngineOpen: open fwp session fai= led");
+ msg_= handler(0, "WFP Block: WFP engine opened");

/* Check sublayer exists and add one if it does not. */
- if (FwpmSubLayerGet= ByKey0(*engine_handle, &OPENVPN_BLOCK_OUTSIDE_DNS_SUBLAYER, &sublay= er_ptr)
+ if (Fwpm= SubLayerGetByKey0(*engine_handle, &OPENVPN_WFP_BLOCK_SUBLAYER, &sub= layer_ptr)
=3D=3D ERROR_SUCCESS)
= {
- msg_hand= ler(0, "Block_DNS: Using existing sublayer");
+ msg_handler(0, "WFP Block:= Using existing sublayer");
FwpmFreeMemory0((= void **)&sublayer_ptr);
}
els= e
{ /* Add a new sublayer -- as another process may a= dd it in the meantime,
* do not treat "alread= y exists" as an error */
- err =3D add_sublayer(OPENVPN_BLOCK_OUTSIDE_DNS_SUBLAYER);
+ err =3D add_s= ublayer(OPENVPN_WFP_BLOCK_SUBLAYER);

= if (err =3D=3D FWP_E_ALREADY_EXISTS || err =3D=3D ERROR_SUCCESS)
{
-= msg_handler(0, "Block_DNS: Added a persistent sublayer wit= h pre-defined UUID");
+ msg_handler(0, "WFP Block: Added a persistent subla= yer with pre-defined UUID");
}
else

{
- CHECK_ERROR(err, "add_sublayer: faile= d to add persistent sublayer");
+ OUT_ON_ERROR(err, "add_sublayer: failed t= o add persistent sublayer");
}
}


- err =3D ConvertInterfaceIndexToLuid(index, &tapluid);- CHECK_ERROR(err, "Con= vert interface index to luid failed");
+ err =3D ConvertInterfaceIndexToLuid(index, &= ;itf_luid);
+ OUT_= ON_ERROR(err, "Convert interface index to luid failed");
err =3D FwpmGetAppIdFromFileName0(exe_path, = &openvpnblob);
- = CHECK_ERROR(err, "Get byte blob for openvpn executable name failed&qu= ot;);
+ OUT_ON_ERR= OR(err, "Get byte blob for openvpn executable name failed");
+
+ /* Prepare match conditions */=
+ match_openvpn.fieldKey= =3D FWPM_CONDITION_ALE_APP_ID;
+ match_openvpn.matchType =3D FWP_MATCH_EQUAL;
+ match_openvpn.conditionValue.t= ype =3D FWP_BYTE_BLOB_TYPE;

+ match_openvpn.conditionValue.byteBlob =3D openvpnblob;+
+ match_port_53.fieldKey =3D FWPM_CONDITION_I= P_REMOTE_PORT;
+ m= atch_port_53.matchType =3D FWP_MATCH_EQUAL;
+ match_port_53.conditionValue.type =3D FWP_UINT1= 6;
+ match_port_53= .conditionValue.uint16 =3D 53;
+
+ matc= h_interface.fieldKey =3D FWPM_CONDITION_IP_LOCAL_INTERFACE;
+ match_interface.matchType =3D F= WP_MATCH_EQUAL;

+ = match_interface.conditionValue.type =3D FWP_UINT64;
+ match_interface.conditionValue.uint64= =3D &itf_luid.Value;
+
+ match_not= _loopback.fieldKey =3D FWPM_CONDITION_FLAGS;
+ match_not_loopback.matchType =3D FWP_MATCH_FLA= GS_NONE_SET;
+ mat= ch_not_loopback.conditionValue.type =3D FWP_UINT32;
+ match_not_loopback.conditionValue.uin= t32 =3D FWP_CONDITION_FLAG_IS_LOOPBACK;

= /* Prepare filter. */
- Filter.subLayerKey =3D OPENVPN_BLOCK_OUTSIDE_DNS_SUBLAYER;+ Filter.subLayerKey =3D O= PENVPN_WFP_BLOCK_SUBLAYER;
Filter.displayData.name =3D= FIREWALL_NAME;
Filter.weight.type =3D FWP_UINT8;
Filter.weight.uint8 =3D 0xF;
Filter.f= ilterCondition =3D Condition;
- Filter.numFilterConditions =3D 2;
+ Filter.numFilterConditions =3D 1;
<= span>

- /* First fi= lter. Permit IPv4 DNS queries from OpenVPN itself. */
+ /* First filter. Permit IPv4 from Ope= nVPN itself. */
Filter.layerKey =3D FWPM_LAYER_ALE_AUT= H_CONNECT_V4;
Filter.action.type =3D FWP_ACTION_PERMIT= ;
-
- Condition[0].fieldKey =3D FWPM_CONDIT= ION_IP_REMOTE_PORT;
- = Condition[0].matchType =3D FWP_MATCH_EQUAL;
- Condition[0].conditionValue.type =3D FWP_UINT16= ;
- Condition[0].con= ditionValue.uint16 =3D 53;
-
- Condition[1]= .fieldKey =3D FWPM_CONDITION_ALE_APP_ID;
- Condition[1].matchType =3D FWP_MATCH_EQUAL;- Condition[1].conditionValu= e.type =3D FWP_BYTE_BLOB_TYPE;
- Condition[1].conditionValue.byteBlob =3D openvpnblob;-
+ Condition[0] =3D match_openvpn;
+ if (dns_only)

+ {

+ Filter.numFilterConditions =3D 2;<= br>+ Condition[1] =3D ma= tch_port_53;
+ }
err =3D FwpmFilterAdd0(*engine_handle, &Filter, NUL= L, &filterid);
- = CHECK_ERROR(err, "Add filter to permit IPv4 port 53 traffic from Open= VPN failed");
+ = OUT_ON_ERROR(err, "Add filter to permit IPv4 traffic from OpenVPN f= ailed");

- /* Second filter. Permit IPv6 DNS queries from OpenVPN itself= . */
+ /* Second f= ilter. Permit IPv6 from OpenVPN itself. */
Filter.laye= rKey =3D FWPM_LAYER_ALE_AUTH_CONNECT_V6;
-
err =3D FwpmFilterAdd0(*engine_han= dle, &Filter, NULL, &filterid);
- CHECK_ERROR(err, "Add filter to permit IPv6 port= 53 traffic from OpenVPN failed");
+ OUT_ON_ERROR(err, "Add filter to permit IPv6 t= raffic from OpenVPN failed");

- msg_handler(0, "Block_DNS: Added p= ermit filters for exe_path");
+ msg_handler(0, "WFP Block: Added permit filters for= exe_path");

- /* Third filter. Block all IPv4 DNS queries. */+ /* Third filter. Block IP= v4 to port 53 or all besided loopback. */
Filter.layer= Key =3D FWPM_LAYER_ALE_AUTH_CONNECT_V4;
Filter.action.= type =3D FWP_ACTION_BLOCK;
Filter.weight.type =3D FWP_= EMPTY;
Filter.numFilterConditions =3D 1;
-

+ Condition[0] =3D dns_only ? match_port_53 : match_= not_loopback;
err =3D FwpmFilterAdd0(*engine_handle, &= amp;Filter, NULL, &filterid);
- CHECK_ERROR(err, "Add filter to block IPv4 DNS traffic= failed");
+ = OUT_ON_ERROR(err, "Add filter to block IPv4 traffic failed");

- /* = Forth filter. Block all IPv6 DNS queries. */
+ /* Forth filter. Block IPv6 to port 53 or all = besides loopback */
Filter.layerKey =3D FWPM_LAYER_ALE= _AUTH_CONNECT_V6;
-
err =3D FwpmFilterAdd0(*engine_handle, &Filter, NULL,= &filterid);
- C= HECK_ERROR(err, "Add filter to block IPv6 DNS traffic failed");
+ OUT_ON_ERROR(err,= "Add filter to block IPv6 traffic failed");

- msg_handler(0, "= ;Block_DNS: Added block filters for all interfaces");
+ msg_handler(0, "WFP Block: = Added block filters for all interfaces");

= - /* Fifth filter. Permit IPv4= DNS queries from TAP.
-
Filter.weight.type =3D FWP_UINT8;

Filter.weight= .uint8 =3D 0xE;
Filter.layerKey =3D FWPM_LAYER_ALE_AUT= H_CONNECT_V4;
Filter.action.type =3D FWP_ACTION_PERMIT= ;
- Filter.numFilter= Conditions =3D 2;
-
- Condition[1].fieldKey= =3D FWPM_CONDITION_IP_LOCAL_INTERFACE;
- Condition[1].matchType =3D FWP_MATCH_EQUAL;- Condition[1].conditionValue= .type =3D FWP_UINT64;
-= Condition[1].conditionValue.uint64 =3D &tapluid.Value;
-

+ Filter.numFilterConditions =3D 1;
+ Condition[0] =3D match_interfac= e;

+ if (dns_only)=
+ {
+ Filter.numFilterCondition= s =3D 2;

+ Con= dition[1] =3D match_port_53;
+ }
err =3D FwpmFilterAdd0(*engine_handle, = &Filter, NULL, &filterid);
- CHECK_ERROR(err, "Add filter to permit IPv4 DNS traff= ic through TAP failed");
+ OUT_ON_ERROR(err, "Add filter to permit IPv4 traffic thr= ough VPN interface failed");

- /* Sixth filter. Permit IPv6 DNS querie= s from TAP.
+ /* S= ixth filter. Permit IPv6 for the VPN interface.
* Use= same weight as IPv4 filter */
Filter.layerKey =3D FWP= M_LAYER_ALE_AUTH_CONNECT_V6;
-
err =3D FwpmFilterAdd0(*engine_handle, &Fi= lter, NULL, &filterid);
- CHECK_ERROR(err, "Add filter to permit IPv6 DNS traffic thro= ugh TAP failed");
- msg_handler(0, "Block_DNS: Added permit fil= ters for TAP interface");
+ msg_handler(0, "WFP Block: Added permit filters for VPN= interface");

out:
-
if (openvpnblob)=
{
FwpmFreeMemory0((void **)&= amp;openvpnblob);
@@ -322,7 +348,7 @@
}

DWORD
-delete_block_dns_filters(HANDLE engine_handle)
<= span style=3D"color: hsl(120, 100%, 40%);">+delete_wfp_block_filters(HANDLE= engine_handle)

{
DWORD err =3D 0;
/*
diff --git a/src/openvpn/block_dns.h = b/src/openvpn/wfp_block.h
similarity index 83%
rename from src/openvpn/block_dns.h

rename to src/openv= pn/wfp_block.h
index 89b88d6..60c9171 100644
--- a/src/openvpn/block_dns.h

+++ b/src/openvpn/wfp_block= .h
@@ -23,20 +23,24 @@

#= ifdef _WIN32

-#ifndef OPENVPN_BLOCK_DNS_H
-#define OPENVPN_BLOCK_DNS_H
+#ifndef WFP_BLOCK_H
+#define WFP_BLOCK_H
+
+#include <windef.h>
+#include <iphlpapi.h>
+#include <ws2tcpip.h>

<= span> /* Any value less than 5 should work fine. 3 is chosen without any re= al reason. */

-#define = BLOCK_DNS_IFACE_METRIC 3
+#define WFP_BLOCK_IFACE_METRIC 3

-typedef void (*block_dns_msg_handler_t) (= DWORD err, const char *msg);
+typedef void (*wfp_block_msg_handler_t) (DWORD err, const char *ms= g);

DWORD
-delete_block_dns_filters(HANDLE engine);
<= span style=3D"color: hsl(120, 100%, 40%);">+delete_wfp_block_filters(HANDLE= engine);


DWORD
-add_block_dns_filters(HANDLE *engine, int ifac= e_index, const WCHAR *exe_path,
- block_dns_msg_handler_t msg_handler_callbac= k);
+add_wfp_block_fi= lters(HANDLE *engine, int iface_index, const WCHAR *exe_path,
+ wfp_block_m= sg_handler_t msg_handler_callback, BOOL dns_only);
=
/**
* Return interface metric value for the sp= ecified interface index.
@@ -65,5 +69,5 @@
= set_interface_metric(const NET_IFINDEX index, const ADDRESS_FAMILY family,=
const ULONG metric);

-#endif /* ifndef OP= ENVPN_BLOCK_DNS_H */
= +#endif /* ifndef WFP_BLOCK_H */
#endif /* ifdef _WIN32 */=
diff --git a/src/openvpn/win32.c b/src/openvpn/win32.c

index 6b7ba5e..9d08554 100644
--- a/src/openvp= n/win32.c
+++ b/src/openvpn/win32.c
@@ -34,= 6 +34,9 @@

#ifdef _WIN32

+#include <minw= indef.h>
+#include= <winsock2.h>
+=
#include "buffer.h"
#include &= quot;error.h"
#include "mtu.h"
@@ -47,7 +50,7 @@

#include <versi= onhelpers.h>

-#include "block_dns.h"
+#include "wfp_block.h"
=
/*
* WFP handle
@@ -113= 8,43 +1141,19 @@
}

stat= ic bool
-win_block_dns_= service(bool add, int index, const HANDLE pipe)
+win_get_exe_path(PWCHAR path, DWORD size)

{
- bool= ret =3D false;
- ac= k_message_t ack;
- s= truct gc_arena gc =3D gc_new();
-
- block_d= ns_message_t data =3D {
- .header =3D {
- (add ? msg_add_block_dns : msg_del_block_dns),
- sizeof(block_dns_message= _t),
- 0
- },
- .iface =3D { .index =3D inde= x, .name =3D "" }

- };
-- if (!send_msg_iservice(pip= e, &data, sizeof(data), &ack, "Block_DNS"))
+ DWORD status =3D GetModuleFil= eNameW(NULL, path, size);
+ if (status =3D=3D 0 || status =3D=3D size)
{=
- goto out;

+ msg(M_WARN|M_ER= RNO, "cannot get executable path");
+ return false;
}

-
- if (ack.error_number !=3D NO_ERROR)<= br>- {
- msg(M_WARN, "Block_DNS: %s blo= ck dns filters using service failed: %s [status=3D0x%x if_index=3D%d]"= ,
- (add ? &= quot;adding" : "deleting"), strerror_win32(ack.error_number,= &gc),
- = ack.error_number, data.iface.index);
- goto out;
- }
-
- ret =3D true;<= br>- msg(M_INFO, "%s outs= ide dns using service succeeded.", (add ? "Blocking" : "= ;Unblocking"));
-o= ut:
- gc_free(&g= c);
- return ret;
+ return true;
}

static void
-block_dns_msg_handler(DWORD err, con= st char *msg)

+win_wf= p_msg_handler(DWORD err, const char *msg)
{
struct gc_arena gc =3D gc_new();


@= @ -1184,15 +1163,52 @@
}
else
{
- = msg(M_WARN, "Error in add_block_dns_filters(): %s : %s [status= =3D0x%lx]",
+ = msg(M_WARN, "Error in WFP: %s : %s [status=3D0x%lx]",=
msg, strerror_win32(err, &gc), err);
<= span> }


gc_free(&gc);=
}

+static bool
+{
+ bool ret =3D false;
+ ack_message_t ack;=
+ struct gc_arena gc =3D= gc_new();
++ wfp_block_message_t data= =3D {
+ .head= er =3D {
+ = (add ? msg_add_wfp_block : msg_del_wfp_block),
+ sizeof(wfp_block_message_t),=
+ 0
+ },
+ .flags =3D dns_only ? wfp_block_d= ns : wfp_block_local,
+ .iface =3D { .index =3D index, .name =3D "" }+ };
+
+ if (!send_msg_iservice(pipe, &data, sizeof(data), &a= mp;ack, "WFP block"))
+ {
+ = goto out;
+ = }
+
+ if (ack.error_number !=3D NO_ERRO= R)
+ {
<= span style=3D"color: hsl(120, 100%, 40%);">+ msg(M_WARN, "WFP b= lock: %s block filters using service failed: %s [status=3D0x%x if_index=3D%= d]",
+ = (add ? "adding" : "deleting"), strerror_win32(ack.err= or_number, &gc),
= + ack.error_number, data.iface.index);
+ goto out;
+ }
+
+ r= et =3D true;
+ msg= (M_INFO, "%s WFP block filters using service succeeded.", (add ? = "Adding" : "Deleting"));
+out:
+ gc_free(&gc);
+ return ret;
+}
+ bool
-win_wfp_b= lock_dns(const NET_IFINDEX index, const HANDLE msg_channel)
+win_wfp_block(const NET_IFINDEX ind= ex, const HANDLE msg_channel, BOOL dns_only)
{
<= span> WCHAR openvpnpath[MAX_PATH];
bool ret =3D fa= lse;
@@ -1200,20 +1216,19 @@

if (msg_channel)
{
- dmsg(D_LOW, "Using service to add b= lock dns filters");
+ dmsg(D_LOW, "U= sing service to add WFP block filters");
+ ret =3D win_wfp_block_service(true, dns_o= nly, index, msg_channel);
goto out;
}

- status =3D GetModuleFileNameW(NULL, openvpnpath, _countof(openvpnp= ath));
- if (status = =3D=3D 0 || status =3D=3D _countof(openvpnpath))
+ ret =3D win_get_exe_path(openvpnpath, _cou= ntof(openvpnpath));
+= if (ret =3D=3D false)
{
- msg(M_WARN|M_ERRNO, "block_dns: can= not get executable path");
goto out; }

- status =3D add_block_dns_filters(&m_hEngineHandle, index= , openvpnpath,
- = block_dns_msg_handler);
+ status =3D add_wfp_block_filters(&= ;m_hEngineHandle, index, openvpnpath,
+ win_wfp_msg_handler, d= ns_only);
if (status =3D=3D 0)
{<= /span>
int is_auto =3D 0;
@@ -1227,10 +12= 42,10 @@
{
tap_metric= _v6 =3D 0;
}
- status =3D set_interface_metric(index, AF_INET, BLO= CK_DNS_IFACE_METRIC);
+ status =3D set_interface_metric(index, AF_INET, WFP_BLOCK_IFACE_M= ETRIC);
if (!status)
{

- set_interfac= e_metric(index, AF_INET6, BLOCK_DNS_IFACE_METRIC);
+ set_interface_metric(index, AF_I= NET6, WFP_BLOCK_IFACE_METRIC);
}
= }

@@ -1248,12 +1263,12 @@
<= span>
if (msg_channel)
{<= br>- msg(D_LOW, "Usin= g service to delete block dns filters");
- win_block_dns_service(false, index, msg_cha= nnel);
+ msg(D= _LOW, "Using service to delete WFP block filters");
+ win_wfp_block_service(fal= se, false, index, msg_channel);
}
= else
{
- delete_block_dns_filters(m_hEngineHandle);
+ delete_wfp_block_filters(m_hE= ngineHandle);
m_hEngineHandle =3D NULL;
= if (tap_metric_v4 >=3D 0)
{
diff --git a/src/openvpn/win32.h b/src/openvpn/win32.hindex aa8513b..92b3528 100644
--- a/src/openvpn/win= 32.h
+++ b/src/openvpn/win32.h
@@ -25,8 +25= ,10 @@
#ifndef OPENVPN_WIN32_H
#define OP= ENVPN_WIN32_H

-#include <winioctl.h>
+#include <iphlpapi.h>
+#include <ws2tcpip.h>

+#include "syshead.= h"
#include "mtu.h"
#inclu= de "openvpn-msg.h"
#include "argv.h"
@@ -286,7 +288,7 @@
/* call self in a subpr= ocess */
void fork_to_self(const char *cmdline);
-bool win_wfp_= block_dns(const NET_IFINDEX index, const HANDLE msg_channel);
+bool win_wfp_block(const NET_IFIN= DEX index, const HANDLE msg_channel, BOOL dns_only);


bool win_wfp_uninit(const NET_IFINDEX index, const HANDLE msg_= channel);

diff --git a/src/openvpnserv/CM= akeLists.txt b/src/openvpnserv/CMakeLists.txt
index 17cd90c= ..154e17c 100644
--- a/src/openvpnserv/CMakeLists.txt

+++ b/src/openvpnserv/CMakeLists.txt
@@ -17,7 +1= 7,7 @@
interactive.c
service.c se= rvice.h
validate.c validate.h
- ../openvpn/block_dns.c ../openvpn/block_dn= s.h
+ ../openvpn/w= fp_block.c ../openvpn/wfp_block.h
openvpnserv_resource= s.rc
../openvpn/ring_buffer.h
)
diff --git a/src/openvpnserv/Makefile.am b/src/openvpnserv/M= akefile.am
index d8ba4eb..49ad8aa 100644
--= - a/src/openvpnserv/Makefile.am
+++ b/src/openvpnserv/Makef= ile.am
@@ -33,6 +33,6 @@
interactive.c \<= /span>
service.c service.h \
validate.c valida= te.h \
- $(top_srcdir)/= src/openvpn/block_dns.c $(top_srcdir)/src/openvpn/block_dns.h \
<= span style=3D"color: hsl(120, 100%, 40%);">+ $(top_srcdir)/src/openvpn/wfp_= block.c $(top_srcdir)/src/openvpn/wfp_block.h \

openvpnse= rv_resources.rc \
$(top_srcdir)/src/openvpn/ring_buffer.h=
diff --git a/src/openvpnserv/interactive.c b/src/openvpnse= rv/interactive.c
index 32c8996..68a8106 100644
--- a/src/openvpnserv/interactive.c

+++ b/src/openvpnse= rv/interactive.c
@@ -38,7 +38,7 @@
=
#include "openvpn-msg.h"
#include &qu= ot;validate.h"
-#i= nclude "block_dns.h"
+#include "wfp_block.h"
#include "= ;ring_buffer.h"

#define IO_TIMEOUT = 2000 /*ms*/
@@ -84,7 +84,7 @@
typedef enu= m {
address,
route,
- block_dns,
+ wfp_block,
undo= _dns4,
undo_dns6,
undo_domain,

@@ -99,7 +99,7 @@
int index;
<= span> int metric_v4;
int metric_v6;
-} block_dns_data_t;
+} wfp_block_data_t;
=
typedef struct {
struct tun_ring *s= end_ring;
@@ -774,74 +774,76 @@
}
static DWORD
-DeleteBlockDNS(const block_dns_message_t *msg, undo_lists= _t *lists)
+DeleteWfp= Block(const wfp_block_message_t *msg, undo_lists_t *lists)
= {
DWORD err =3D 0;
- block_dns_data_t *interface_data =3D RemoveListItem(= &(*lists)[block_dns], CmpAny, NULL);
+ wfp_block_data_t *block_data =3D RemoveListItem(&a= mp;(*lists)[wfp_block], CmpAny, NULL);

- if (interface_data)
+ if (block_data)
= {
- err =3D= delete_block_dns_filters(interface_data->engine);
- if (interface_data->metric_v4 &g= t;=3D 0)
+ err= =3D delete_wfp_block_filters(block_data->engine);
+ if (block_data->metric_v4 >= =3D 0)
{
set_interfac= e_metric(msg->iface.index, AF_INET,
- interface_data->metric= _v4);
+ = block_data->metric_v4);
}
- if (interface_da= ta->metric_v6 >=3D 0)
+ if (block_data->metric_v6 >=3D 0)
= {
set_interface_metric(msg->iface.ind= ex, AF_INET6,
- = interface_data->metric_v6);
+ block_= data->metric_v6);
}
- free(interface_data);
+ free(block_data);
}

else
{
- MsgToEventLog(M_ERR, TEXT(&quo= t;No previous block DNS filters to delete"));
+ MsgToEventLog(M_ERR, TEXT("No p= revious block filters to delete"));
}
<= span>
return err;
}
=
static DWORD
-AddBlockDNS(const block_dns_message_t *msg, undo_lists_t *lists)<= /span>
+AddWfpBlock(const wf= p_block_message_t *msg, undo_lists_t *lists)
{
<= span> DWORD err =3D 0;

- block_dns_data_t *interface_data =3D NULL;
+ wfp_block_data_t *block_data =3D NULL= ;
HANDLE engine =3D NULL;
LPCWSTR= exe_path;
+ BOOL = dns_only;

exe_path =3D settings.exe_= path;
+ dns_only = =3D (msg->flags =3D=3D wfp_block_dns);

- err =3D add_block_dns_filters(&am= p;engine, msg->iface.index, exe_path, BlockDNSErrHandler);
+ err =3D add_wfp_block_filters= (&engine, msg->iface.index, exe_path, BlockDNSErrHandler, dns_only);=
if (!err)
{
- interface_data =3D malloc(sizeof(b= lock_dns_data_t));
- = if (!interface_data)
+ block_data =3D malloc(sizeof(wfp_block_data_t));
+ if (!block_data)<= br> {
err =3D ERROR_OUTOFMEMORY;=
goto out;
}- interface_data->eng= ine =3D engine;
- = interface_data->index =3D msg->iface.index;
+ block_data->engine =3D engine;=
+ block_data-= >index =3D msg->iface.index;
int is_auto =3D= 0;
- interface_= data->metric_v4 =3D get_interface_metric(msg->iface.index,
= - = AF_INET, &is_auto);
+ block_data->metric_v4 =3D get_inter= face_metric(msg->iface.index,
+ AF_INET, = &is_auto);
if (is_auto)
= {
- inter= face_data->metric_v4 =3D 0;
+ block_data->metric_v4 =3D 0;
= }
- interfa= ce_data->metric_v6 =3D get_interface_metric(msg->iface.index,<= br>- = AF_INET6, &is_auto);
+ block_data->metric_v6 =3D get_= interface_metric(msg->iface.index,
+ AF_I= NET6, &is_auto);
if (is_auto)
= {
- = interface_data->metric_v6 =3D 0;
+ block_data->metric_v6 =3D 0;
}

- err =3D AddListItem(&(*lists)[block_dns], interface_da= ta);
+ err =3D= AddListItem(&(*lists)[wfp_block], block_data);
= if (!err)
{
err =3D= set_interface_metric(msg->iface.index, AF_INET,
- BLOC= K_DNS_IFACE_METRIC);
= + WFP_BLOCK_IFACE_METRIC);
= if (!err)
{
/* for IPv6, we intentionally ignore errors, because

@@ -850,12 +852,12 @@
* (if O= penVPN wants IPv6 ifconfig, we'll fail there)
= */
set_interface_metric(msg->i= face.index, AF_INET6,
-= BLOCK_DNS_IFACE_METRIC);
+ = WFP_BLOCK_IFACE_METRIC);
}
if (err)
{
= /* delete the filters, remove undo item and free interface data= */
- De= leteBlockDNS(msg, lists);
+ DeleteWfpBlock(msg, lists);
= engine =3D NULL;
}
= }
@@ -864,23 +866,23 @@
out:<= br> if (err && engine)
{
<= span style=3D"color: hsl(0, 100%, 40%);">- delete_block_dns_filters(= engine);
- free(= interface_data);
+ = delete_wfp_block_filters(engine);
+ free(block_data);
}<= br>
return err;
}

static DWORD
-HandleBlockDNSMessage(const block_dns_message_t *msg, undo_li= sts_t *lists)
+Handle= WfpBlockMessage(const wfp_block_message_t *msg, undo_lists_t *lists)=
{
- if (m= sg->header.type =3D=3D msg_add_block_dns)
+ if (msg->header.type =3D=3D msg_add_wfp_blo= ck)
{
- return AddBlockDNS(msg, lists);
+ return AddWfpBlock(msg, lists);
= }
else
{
- return DeleteBlockDNS(msg, = lists);
+ retu= rn DeleteWfpBlock(msg, lists);
}
}


@@ -1616,7 +1618,7 @@
= address_message_t address;
route_message_t rou= te;
flush_neighbors_message_t flush_neighbors;

- block_dns_message= _t block_dns;
+ = wfp_block_message_t wfp_block;
dns_cfg_message_t= dns;
enable_dhcp_message_t dhcp;
= register_ring_buffers_message_t rrb;
@@ -1665,11 += 1667,11 @@
}
brea= k;

- = case msg_add_block_dns:
- case msg_del_block_dns:
- if (msg.header.size =3D=3D sizeof(msg.block_= dns))
+ case m= sg_add_wfp_block:
+ = case msg_del_wfp_block:
+ if (msg.header.size =3D=3D sizeof(msg.wfp_block))

{
- ack.error_number =3D HandleBlockDNSMessage(&msg.b= lock_dns, lists);
+ = ack.error_number =3D HandleWfpBlockMessage(&msg.wfp_block= , lists);
}
break= ;

@@ -1723,7 +1725,7 @@
= Undo(undo_lists_t *lists)
{
undo_type= _t type;
- block_dns= _data_t *interface_data;
+ wfp_block_data_t *interface_data;
for (type = =3D 0; type < _undo_type_max; type++)
{
<= span> list_item_t **pnext =3D &(*lists)[type];
= @@ -1756,9 +1758,9 @@
SetDNSDomain(ite= m->data, "", NULL);
break= ;

- = case block_dns:
- interface_data =3D (block_dns_data_t *)(item-&g= t;data);
- = delete_block_dns_filters(interface_data->engine);
+ case wfp_block:
+ int= erface_data =3D (wfp_block_data_t *)(item->data);
+ delete_wfp_block_filt= ers(interface_data->engine);
if (in= terface_data->metric_v4 >=3D 0)
= {
set_interface_metric(interface_d= ata->index, AF_INET,

To view, visit = change 48= 9. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic9bf797bfc7e2d471998a84cb0f= 071db3e4832ba
Gerrit-Change-Number: 489
Gerrit-PatchSet: 1
Gerrit-Owner: d12fk <heiko@...515...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--RykBHYKWIXQ=--