Skip to content

O
OpnSense
Commit 3981b45d authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

openvpn: unpack the client exporter by default

parent fec03ede
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 516 additions and 34 deletions
src/etc/inc/openvpn-client-export.inc
View file @ 3981b45d
......@@ -39,36 +39,6 @@ global $current_openvpn_version, $current_openvpn_version_rev;
$current_openvpn_version = "2.3.6";
$current_openvpn_version_rev = "01";
function openvpn_client_export_install()
{
global $current_openvpn_version;
$tarpath = "/usr/local/pkg/openvpn-client-export-{$current_openvpn_version}.tgz";
$phpfile = "vpn_openvpn_export.php";
$ovpndir = "/usr/local/share/openvpn";
$workdir = "{$ovpndir}/client-export";
@mkdir($workdir, 0777, true);
exec("/usr/bin/tar zxf {$tarpath} -C {$ovpndir}");
}
function openvpn_client_export_deinstall()
{
global $current_openvpn_version;
$phpfile = "vpn_openvpn_export.php";
$phpfile2 = "vpn_openvpn_export_shared.php";
$ovpndir = "/usr/local/share/openvpn";
$workdir = "{$ovpndir}/client-export";
@unlink("/usr/local/www/{$phpfile}");
@unlink("/usr/local/www/{$phpfile2}");
@unlink("/usr/local/pkg/openvpn-client-export-{$current_openvpn_version}.tgz");
exec("/bin/rm -r {$workdir}");
}
function openvpn_client_export_prefix($srvid, $usrid = null, $crtid = null) {
global $config;
......@@ -499,8 +469,6 @@ function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $veri
$ovpndir = "/usr/local/share/openvpn";
$workdir = "{$ovpndir}/client-export";
if (!file_exists($workdir . "/template/{$client_install_exe}"))
openvpn_client_export_install();
$validconfig = openvpn_client_export_validate_config($srvid, $usrid, $crtid);
if ($validconfig) {
......@@ -604,8 +572,6 @@ function viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $usead
$uname_p = trim(exec("uname -p"));
$ovpndir = "/usr/local/share/openvpn/";
if (!file_exists($workdir . "/template/openvpn-install.exe"))
openvpn_client_export_install();
$uniq = uniqid();
$tempdir = "/tmp/openvpn-export-{$uniq}";
......
src/share/openvpn/client-export/template/config-import 0 → 100755
View file @ 3981b45d
;!@Install@!UTF-8!
RunProgram="procchain.exe procchain-import"
;!@InstallEnd@!
src/share/openvpn/client-export/template/config-standard 0 → 100755
View file @ 3981b45d
;!@Install@!UTF-8!
RunProgram="procchain.exe procchain-standard"
;!@InstallEnd@!
src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.application 0 → 100755
View file @ 3981b45d
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<assemblyIdentity name="OpenVPNManager.application" version="0.0.3.3" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="Jochen Wierum" asmv2:product="OpenVPN Manager" asmv2:supportUrl="http://jowisoftware.dyndns.org/~jochen/OpenVPN_Manager" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true">
<subscription>
<update>
<beforeApplicationStartup />
</update>
</subscription>
<deploymentProvider codebase="http://jowisoftware.dyndns.org/~jochen/OpenVPN_Manager/OpenVPNManager.application" />
</deployment>
<dependency>
<dependentAssembly dependencyType="install" codebase="OpenVPNManager.exe.manifest" size="5378">
<assemblyIdentity name="OpenVPNManager.exe" version="0.0.3.3" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<dsig:DigestValue>XT90/vo/vuC6FKm0d16lyYf4VLc=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
</asmv1:assembly>
\ No newline at end of file
src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.config 0 → 100755
View file @ 3981b45d
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="OpenVPNManager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<userSettings>
<OpenVPNManager.Properties.Settings>
<setting name="vpnbin" serializeAs="String">
<value />
</setting>
<setting name="vpnconf" serializeAs="String">
<value />
</setting>
<setting name="debugLevel" serializeAs="String">
<value>1</value>
</setting>
<setting name="firstStart" serializeAs="String">
<value>True</value>
</setting>
<setting name="startMinimized" serializeAs="String">
<value>True</value>
</setting>
<setting name="searchUpdate" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastUpdateCheck" serializeAs="String">
<value />
</setting>
<setting name="allowRemoteControl" serializeAs="String">
<value>False</value>
</setting>
<setting name="callUpdate" serializeAs="String">
<value>True</value>
</setting>
<setting name="smartCardSupport" serializeAs="String">
<value>False</value>
</setting>
</OpenVPNManager.Properties.Settings>
</userSettings>
</configuration>
\ No newline at end of file
src/share/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.manifest 0 → 100755
View file @ 3981b45d
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly manifestVersion="1.0" xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1">
<asmv1:assemblyIdentity version="0.0.3.3" name="OpenVPNManager.exe" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
<description asmv2:iconFile="Resources\icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
<application />
<entryPoint>
<assemblyIdentity name="OpenVPNManager" version="0.0.3.6" publicKeyToken="CBDAF510072A0F11" language="neutral" processorArchitecture="msil" />
<commandLine file="OpenVPNManager.exe" parameters="" />
</entryPoint>
<trustInfo>
<security>
<applicationRequestMinimum>
<PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
<defaultAssemblyRequest permissionSetReference="Custom" />
</applicationRequestMinimum>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- UAC-Manifestoptionen
Wenn Sie die Ebene der Benutzerkontensteuerung für Windows ändern
möchten, ersetzen Sie den Knoten "requestedExecutionLevel" wie folgt:
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<dependency>
<dependentOS>
<osVersionInfo>
<os majorVersion="4" minorVersion="10" buildNumber="0" servicePackMajor="0" />
</osVersionInfo>
</dependentOS>
</dependency>
<dependency>
<dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
<assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="2.0.50727.0" />
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="OpenVPN.dll" size="34816">
<assemblyIdentity name="OpenVPN" version="0.0.3.6" publicKeyToken="CBDAF510072A0F11" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<dsig:DigestValue>oEuOAn0+Ihgt2BeRcJ4LL1v9cxg=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="OpenVPNManager.exe" size="348160">
<assemblyIdentity name="OpenVPNManager" version="0.0.3.6" publicKeyToken="CBDAF510072A0F11" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<dsig:DigestValue>Wjl/w91fCfDa6PJr/BjVc91QBkM=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="de\OpenVPNManager.resources.dll" size="57344">
<assemblyIdentity name="OpenVPNManager.resources" version="0.0.3.6" publicKeyToken="CBDAF510072A0F11" language="de" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<dsig:DigestValue>nXALIba1RuoneuzYgzYAjkZA70c=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<file name="license.txt" size="18282">
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<dsig:DigestValue>RX3X90u9Cg0J+ZgyIVKgiGjAZHg=</dsig:DigestValue>
</hash>
</file>
<file name="OpenVPNManager.exe.config" size="1919">
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<dsig:DigestValue>K7eDMvkLnFQNVnJnsYCU+W+tUkY=</dsig:DigestValue>
</hash>
</file>
<file name="Resources\icon.ico" size="4286">
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<dsig:DigestValue>BDfrWnbambquEU7H76KpaKGK+U4=</dsig:DigestValue>
</hash>
</file>
</asmv1:assembly>
\ No newline at end of file
src/share/openvpn/client-export/template/procchain-import 0 → 100755
View file @ 3981b45d
"openvpn-install.exe"
"openvpn-postinstall.exe" /Import
src/share/openvpn/client-export/template/procchain-standard 0 → 100755
View file @ 3981b45d
"openvpn-install.exe"
"openvpn-postinstall.exe"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023