forked from OpenVPN/openvpn
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce tapctl.exe utility and openvpnmsica.dll MSI CA
The tapctl.exe utility is a future replacement for the devcon.exe/ tapinstall.exe utility. While this utility does not offer TAP driver installation or upgrading, its purpose is to manipulate TAP virtual network interfaces on Windows. In the long term, its code could be integrated into openvpn.exe with `--mktun` and `--rmtun`. The openvpnmsica.dll provides additional MSI custom actions for TUN/TAP interface creation on install. The interface creation is customizable using the `TAPInterface` MSI table and is fully compliant with MSI's deffered processing, commit and rollback. Detailed instruction and documentation is to be published when MSI packaging completed. Those utilities were placed into openvpn repository to join the established compile-sign-package OpenVPN workflow. Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20181010192337.6984-1-simon@rozman.si> URL: https://www.mail-archive.com/search?l=mid&q=20181010192337.6984-1-simon@rozman.si Signed-off-by: Gert Doering <gert@greenie.muc.de>
- Loading branch information
Showing
30 changed files
with
5,100 additions
and
2 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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,55 @@ | ||
| # | ||
| # openvpnmsica -- Custom Action DLL to provide OpenVPN-specific support to MSI packages | ||
| # | ||
| # Copyright (C) 2002-2018 OpenVPN Inc <sales@openvpn.net> | ||
| # Copyright (C) 2018 Simon Rozman <simon@rozman.si> | ||
| # | ||
| # This program is free software; you can redistribute it and/or modify | ||
| # it under the terms of the GNU General Public License version 2 | ||
| # as published by the Free Software Foundation. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License along | ||
| # with this program; if not, write to the Free Software Foundation, Inc., | ||
| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| # | ||
|
|
||
| include $(top_srcdir)/build/ltrc.inc | ||
|
|
||
| MAINTAINERCLEANFILES = $(srcdir)/Makefile.in | ||
|
|
||
| EXTRA_DIST = \ | ||
| openvpnmsica.vcxproj \ | ||
| openvpnmsica.vcxproj.filters \ | ||
| openvpnmsica.props \ | ||
| openvpnmsica-Debug.props \ | ||
| openvpnmsica-Release.props | ||
|
|
||
| AM_CPPFLAGS = \ | ||
| -I$(top_srcdir)/include -I$(top_srcdir)/src/compat | ||
|
|
||
| AM_CFLAGS = \ | ||
| $(TAP_CFLAGS) | ||
|
|
||
| if WIN32 | ||
| lib_LTLIBRARIES = libopenvpnmsica.la | ||
| libopenvpnmsica_la_CFLAGS = \ | ||
| -municode -D_UNICODE \ | ||
| -UNTDDI_VERSION -U_WIN32_WINNT \ | ||
| -D_WIN32_WINNT=_WIN32_WINNT_VISTA | ||
| libopenvpnmsica_la_LDFLAGS = -ladvapi32 -lole32 -lmsi -lsetupapi -lshlwapi -no-undefined -avoid-version | ||
| endif | ||
|
|
||
| libopenvpnmsica_la_SOURCES = \ | ||
| dllmain.c \ | ||
| msiex.c msiex.h \ | ||
| msica_op.c msica_op.h \ | ||
| openvpnmsica.c openvpnmsica.h \ | ||
| $(top_srcdir)/src/tapctl/basic.h \ | ||
| $(top_srcdir)/src/tapctl/error.c $(top_srcdir)/src/tapctl/error.h \ | ||
| $(top_srcdir)/src/tapctl/tap.c $(top_srcdir)/src/tapctl/tap.h \ | ||
| openvpnmsica_resources.rc |
This file contains 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,179 @@ | ||
| /* | ||
| * openvpnmsica -- Custom Action DLL to provide OpenVPN-specific support to MSI packages | ||
| * | ||
| * Copyright (C) 2018 Simon Rozman <simon@rozman.si> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 | ||
| * as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along | ||
| * with this program; if not, write to the Free Software Foundation, Inc., | ||
| * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| */ | ||
|
|
||
| #ifdef HAVE_CONFIG_H | ||
| #include <config.h> | ||
| #elif defined(_MSC_VER) | ||
| #include <config-msvc.h> | ||
| #endif | ||
|
|
||
| #include "openvpnmsica.h" | ||
| #include "../tapctl/error.h" | ||
|
|
||
| #include <windows.h> | ||
| #include <msi.h> | ||
| #include <msiquery.h> | ||
| #ifdef _MSC_VER | ||
| #pragma comment(lib, "msi.lib") | ||
| #endif | ||
| #include <stdio.h> | ||
| #include <tchar.h> | ||
|
|
||
|
|
||
| DWORD openvpnmsica_tlsidx_session = TLS_OUT_OF_INDEXES; | ||
|
|
||
|
|
||
| /** | ||
| * DLL entry point | ||
| */ | ||
| BOOL WINAPI DllMain( | ||
| _In_ HINSTANCE hinstDLL, | ||
| _In_ DWORD dwReason, | ||
| _In_ LPVOID lpReserved) | ||
| { | ||
| UNREFERENCED_PARAMETER(hinstDLL); | ||
| UNREFERENCED_PARAMETER(lpReserved); | ||
|
|
||
| switch (dwReason) | ||
| { | ||
| case DLL_PROCESS_ATTACH: | ||
| /* Allocate TLS index. */ | ||
| openvpnmsica_tlsidx_session = TlsAlloc(); | ||
| if (openvpnmsica_tlsidx_session == TLS_OUT_OF_INDEXES) | ||
| return FALSE; | ||
| /* Fall through. */ | ||
|
|
||
| case DLL_THREAD_ATTACH: | ||
| { | ||
| /* Create TLS data. */ | ||
| struct openvpnmsica_tls_data *s = (struct openvpnmsica_tls_data*)malloc(sizeof(struct openvpnmsica_tls_data)); | ||
| memset(s, 0, sizeof(struct openvpnmsica_tls_data)); | ||
| TlsSetValue(openvpnmsica_tlsidx_session, s); | ||
| break; | ||
| } | ||
|
|
||
| case DLL_PROCESS_DETACH: | ||
| if (openvpnmsica_tlsidx_session != TLS_OUT_OF_INDEXES) | ||
| { | ||
| /* Free TLS data and TLS index. */ | ||
| free(TlsGetValue(openvpnmsica_tlsidx_session)); | ||
| TlsFree(openvpnmsica_tlsidx_session); | ||
| } | ||
| break; | ||
|
|
||
| case DLL_THREAD_DETACH: | ||
| /* Free TLS data. */ | ||
| free(TlsGetValue(openvpnmsica_tlsidx_session)); | ||
| break; | ||
| } | ||
|
|
||
| return TRUE; | ||
| } | ||
|
|
||
|
|
||
| bool | ||
| dont_mute(unsigned int flags) | ||
| { | ||
| UNREFERENCED_PARAMETER(flags); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
|
|
||
| void | ||
| x_msg_va(const unsigned int flags, const char *format, va_list arglist) | ||
| { | ||
| /* Secure last error before it is overridden. */ | ||
| DWORD dwResult = (flags & M_ERRNO) != 0 ? GetLastError() : ERROR_SUCCESS; | ||
|
|
||
| struct openvpnmsica_tls_data *s = (struct openvpnmsica_tls_data *)TlsGetValue(openvpnmsica_tlsidx_session); | ||
| if (s->hInstall == 0) | ||
| { | ||
| /* No MSI session, no fun. */ | ||
| return; | ||
| } | ||
|
|
||
| /* Prepare the message record. The record will contain up to four fields. */ | ||
| MSIHANDLE hRecordProg = MsiCreateRecord(4); | ||
|
|
||
| { | ||
| /* Field 2: The message string. */ | ||
| char szBufStack[128]; | ||
| int iResultLen = vsnprintf(szBufStack, _countof(szBufStack), format, arglist); | ||
| if (iResultLen < _countof(szBufStack)) | ||
| { | ||
| /* Use from stack. */ | ||
| MsiRecordSetStringA(hRecordProg, 2, szBufStack); | ||
| } | ||
| else | ||
| { | ||
| /* Allocate on heap and retry. */ | ||
| char *szMessage = (char*)malloc(++iResultLen * sizeof(char)); | ||
| vsnprintf(szMessage, iResultLen, format, arglist); | ||
| MsiRecordSetStringA(hRecordProg, 2, szMessage); | ||
| free(szMessage); | ||
| } | ||
| } | ||
|
|
||
| if ((flags & M_ERRNO) == 0) | ||
| { | ||
| /* Field 1: MSI Error Code */ | ||
| MsiRecordSetInteger(hRecordProg, 1, ERROR_MSICA); | ||
| } | ||
| else | ||
| { | ||
| /* Field 1: MSI Error Code */ | ||
| MsiRecordSetInteger(hRecordProg, 1, ERROR_MSICA_ERRNO); | ||
|
|
||
| /* Field 3: The Windows error number. */ | ||
| MsiRecordSetInteger(hRecordProg, 3, dwResult); | ||
|
|
||
| /* Field 4: The Windows error description. */ | ||
| LPTSTR szErrMessage = NULL; | ||
| if (FormatMessage( | ||
| FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, | ||
| 0, | ||
| dwResult, | ||
| 0, | ||
| (LPTSTR)&szErrMessage, | ||
| 0, | ||
| NULL) && szErrMessage) | ||
| { | ||
| /* Trim trailing whitespace. Set terminator after the last non-whitespace character. This prevents excessive trailing line breaks. */ | ||
| for (size_t i = 0, i_last = 0; ; i++) | ||
| { | ||
| if (szErrMessage[i]) | ||
| { | ||
| if (!_istspace(szErrMessage[i])) | ||
| i_last = i + 1; | ||
| } | ||
| else | ||
| { | ||
| szErrMessage[i_last] = 0; | ||
| break; | ||
| } | ||
| } | ||
| MsiRecordSetString(hRecordProg, 4, szErrMessage); | ||
| LocalFree(szErrMessage); | ||
| } | ||
| } | ||
|
|
||
| MsiProcessMessage(s->hInstall, INSTALLMESSAGE_ERROR, hRecordProg); | ||
| MsiCloseHandle(hRecordProg); | ||
| } |
Oops, something went wrong.