diff --git a/contrib/openvpn/client-export/template/7zS.sfx b/contrib/openvpn/client-export/template/7zS.sfx deleted file mode 100644 index f72ac75ef..000000000 Binary files a/contrib/openvpn/client-export/template/7zS.sfx and /dev/null differ diff --git a/contrib/openvpn/client-export/template/config-import b/contrib/openvpn/client-export/template/config-import deleted file mode 100644 index 6b4465c27..000000000 --- a/contrib/openvpn/client-export/template/config-import +++ /dev/null @@ -1,3 +0,0 @@ -;!@Install@!UTF-8! -RunProgram="procchain.exe procchain-import" -;!@InstallEnd@! diff --git a/contrib/openvpn/client-export/template/config-standard b/contrib/openvpn/client-export/template/config-standard deleted file mode 100644 index 19e410e98..000000000 --- a/contrib/openvpn/client-export/template/config-standard +++ /dev/null @@ -1,3 +0,0 @@ -;!@Install@!UTF-8! -RunProgram="procchain.exe procchain-standard" -;!@InstallEnd@! diff --git a/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I001-i686.exe b/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I001-i686.exe deleted file mode 100644 index ff2e3fc4c..000000000 Binary files a/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I001-i686.exe and /dev/null differ diff --git a/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I001-x86_64.exe b/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I001-x86_64.exe deleted file mode 100644 index 1285d2ac8..000000000 Binary files a/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I001-x86_64.exe and /dev/null differ diff --git a/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I601-i686.exe b/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I601-i686.exe deleted file mode 100644 index f2a11d98d..000000000 Binary files a/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I601-i686.exe and /dev/null differ diff --git a/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I601-x86_64.exe b/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I601-x86_64.exe deleted file mode 100644 index b0203a5ec..000000000 Binary files a/contrib/openvpn/client-export/template/openvpn-install-2.3.6-I601-x86_64.exe and /dev/null differ diff --git a/contrib/openvpn/client-export/template/openvpn-postinstall.exe b/contrib/openvpn/client-export/template/openvpn-postinstall.exe deleted file mode 100644 index 180385ac2..000000000 Binary files a/contrib/openvpn/client-export/template/openvpn-postinstall.exe and /dev/null differ diff --git a/contrib/openvpn/client-export/template/openvpn-postinstall64.exe b/contrib/openvpn/client-export/template/openvpn-postinstall64.exe deleted file mode 100644 index cadc2f725..000000000 Binary files a/contrib/openvpn/client-export/template/openvpn-postinstall64.exe and /dev/null differ diff --git a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPN.dll b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPN.dll deleted file mode 100644 index 75b684e22..000000000 Binary files a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPN.dll and /dev/null differ diff --git a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPN.pdb b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPN.pdb deleted file mode 100644 index cff0de895..000000000 Binary files a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPN.pdb and /dev/null differ diff --git a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.application b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.application deleted file mode 100644 index 675d5d237..000000000 --- a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.application +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - XT90/vo/vuC6FKm0d16lyYf4VLc= - - - - \ No newline at end of file diff --git a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe deleted file mode 100644 index b8545d712..000000000 Binary files a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe and /dev/null differ diff --git a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.config b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.config deleted file mode 100644 index 00e720071..000000000 --- a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.config +++ /dev/null @@ -1,42 +0,0 @@ - - - - -
- - - - - - - - - - - - 1 - - - True - - - True - - - 0 - - - - - - False - - - True - - - False - - - - \ No newline at end of file diff --git a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.manifest b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.manifest deleted file mode 100644 index fc51a4175..000000000 --- a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.exe.manifest +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - oEuOAn0+Ihgt2BeRcJ4LL1v9cxg= - - - - - - - - - - - - Wjl/w91fCfDa6PJr/BjVc91QBkM= - - - - - - - - - - - - nXALIba1RuoneuzYgzYAjkZA70c= - - - - - - - - - - RX3X90u9Cg0J+ZgyIVKgiGjAZHg= - - - - - - - - - K7eDMvkLnFQNVnJnsYCU+W+tUkY= - - - - - - - - - BDfrWnbambquEU7H76KpaKGK+U4= - - - \ No newline at end of file diff --git a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.pdb b/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.pdb deleted file mode 100644 index a06611c48..000000000 Binary files a/contrib/openvpn/client-export/template/openvpnmanager/OpenVPNManager.pdb and /dev/null differ diff --git a/contrib/openvpn/client-export/template/openvpnmanager/de/OpenVPNManager.resources.dll b/contrib/openvpn/client-export/template/openvpnmanager/de/OpenVPNManager.resources.dll deleted file mode 100644 index 975438ea0..000000000 Binary files a/contrib/openvpn/client-export/template/openvpnmanager/de/OpenVPNManager.resources.dll and /dev/null differ diff --git a/contrib/openvpn/client-export/template/openvpnmanager/license.txt b/contrib/openvpn/client-export/template/openvpnmanager/license.txt deleted file mode 100644 index 103ccc129..000000000 --- a/contrib/openvpn/client-export/template/openvpnmanager/license.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/contrib/openvpn/client-export/template/openvpnmanager/openvpn-postinstall.exe b/contrib/openvpn/client-export/template/openvpnmanager/openvpn-postinstall.exe deleted file mode 100644 index fb7862ef0..000000000 Binary files a/contrib/openvpn/client-export/template/openvpnmanager/openvpn-postinstall.exe and /dev/null differ diff --git a/contrib/openvpn/client-export/template/procchain-import b/contrib/openvpn/client-export/template/procchain-import deleted file mode 100644 index 3b7c74fbb..000000000 --- a/contrib/openvpn/client-export/template/procchain-import +++ /dev/null @@ -1,2 +0,0 @@ -"openvpn-install.exe" -"openvpn-postinstall.exe" /Import diff --git a/contrib/openvpn/client-export/template/procchain-standard b/contrib/openvpn/client-export/template/procchain-standard deleted file mode 100644 index b9d1a1e50..000000000 --- a/contrib/openvpn/client-export/template/procchain-standard +++ /dev/null @@ -1,2 +0,0 @@ -"openvpn-install.exe" -"openvpn-postinstall.exe" diff --git a/contrib/openvpn/client-export/template/procchain.exe b/contrib/openvpn/client-export/template/procchain.exe deleted file mode 100644 index 924e7a478..000000000 Binary files a/contrib/openvpn/client-export/template/procchain.exe and /dev/null differ diff --git a/src/etc/inc/openvpn-client-export.inc b/src/etc/inc/openvpn-client-export.inc index 58e19d4af..4786951de 100644 --- a/src/etc/inc/openvpn-client-export.inc +++ b/src/etc/inc/openvpn-client-export.inc @@ -29,10 +29,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -global $current_openvpn_version, $current_openvpn_version_rev; -$current_openvpn_version = "2.3.6"; -$current_openvpn_version_rev = "01"; - function openvpn_client_export_prefix($srvid, $usrid = null, $crtid = null) { global $config; @@ -455,134 +451,12 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifys } } -function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $outpass, $proxy, $openvpnmanager, $advancedoptions, $openvpn_version = "x86-xp") -{ - global $config, $input_errors, $current_openvpn_version, $current_openvpn_version_rev; - - switch ($openvpn_version) { - case "x86-xp": - $client_install_exe = "openvpn-install-{$current_openvpn_version}-I0{$current_openvpn_version_rev}-i686.exe"; - break; - case "x64-xp": - $client_install_exe = "openvpn-install-{$current_openvpn_version}-I0{$current_openvpn_version_rev}-x86_64.exe"; - break; - case "x86-win6": - $client_install_exe = "openvpn-install-{$current_openvpn_version}-I6{$current_openvpn_version_rev}-i686.exe"; - break; - case "x64-win6": - $client_install_exe = "openvpn-install-{$current_openvpn_version}-I6{$current_openvpn_version_rev}-x86_64.exe"; - break; - default: - $input_errors[] = gettext("Could not find matching OpenVPN architecture."); - return false; - } - - $validconfig = openvpn_client_export_validate_config($srvid, $usrid, $crtid); - if (!$validconfig) { - $input_errors[] = gettext("Could not validate OpenVPN config."); - return false; - } - - list($settings, $server_cert, $server_ca, $servercn, $user, $cert, $nokeys) = $validconfig; - - // create template directory - $tempdir = '/tmp/openvpn-export-' . uniqid(); - mkdir($tempdir, 0700, true); - - // create config directory - $confdir = "{$tempdir}/config"; - if (!is_dir($conf_dir)) { - mkdir($confdir, 0700, true); - } - - // copy the template directory - exec("cp -r /usr/local/opnsense/contrib/openvpn/client-export/template/* {$tempdir}"); - // and put the required installer exe in place - exec("/bin/cp {$tempdir}/{$client_install_exe} {$tempdir}/openvpn-install.exe"); - if (stristr($openvpn_version, "x64")) { - rename("{$tempdir}/openvpn-postinstall64.exe", "{$tempdir}/openvpn-postinstall.exe"); - } - - // write configuration file - $prefix = openvpn_client_export_prefix($srvid, $usrid, $crtid); - $cfgfile = "{$confdir}/{$prefix}-config.ovpn"; - if (!empty($proxy) && $proxy['proxy_authtype'] != "none") { - $proxy['passwdfile'] = "{$prefix}-password"; - $pwdfle = "{$proxy['user']}\r\n"; - $pwdfle .= "{$proxy['password']}\r\n"; - file_put_contents("{$confdir}/{$proxy['passwdfile']}", $pwdfle); - } - $conf = openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $nokeys, $proxy, "", "baseconf", false, true, $openvpnmanager, $advancedoptions); - if (!$conf) { - $input_errors[] = gettext("Could not create a config to export."); - return false; - } - - file_put_contents($cfgfile, $conf); - - $cafile = "{$tempdir}/config/{$prefix}-ca.crt"; - file_put_contents($cafile, $server_ca); - if ($settings['tls']) { - $tlsfile = "{$tempdir}/config/{$prefix}-tls.key"; - file_put_contents($tlsfile, base64_decode($settings['tls'])); - } - - // write key files - if ($settings['mode'] != "server_user") { - $crtfile = "{$tempdir}/config/{$prefix}-{$user['name']}.crt"; - file_put_contents($crtfile, base64_decode($cert['crt'])); - $keyfile = "{$tempdir}/config/{$prefix}-{$user['name']}.key"; - file_put_contents($keyfile, base64_decode($cert['prv'])); - // convert to pkcs12 format - $p12file = "{$tempdir}/config/{$prefix}.p12"; - if ($usetoken) { - openvpn_client_pem_to_pk12($p12file, $outpass, $crtfile, $keyfile); - } else { - openvpn_client_pem_to_pk12($p12file, $outpass, $crtfile, $keyfile, $cafile); - } - } - - // 7zip the configuration data - chdir($tempdir); - $files = "config "; - if ($openvpnmanager) { - $files .= "openvpnmanager "; - } - - $files .= "openvpn-install.exe "; - $files .= "openvpn-postinstall.exe "; - if ($usetoken) { - $procchain = ';!@Install@!UTF-8! -RunProgram="openvpn-postinstall.exe /Import" -;!@InstallEnd@!' -; - } else { - $procchain = ';!@Install@!UTF-8! -RunProgram="openvpn-postinstall.exe" -;!@InstallEnd@!'; - } - file_put_contents("{$tempdir}/7zipConfig",$procchain); - - exec("/usr/local/bin/7z -y a archive.7z {$files}"); - - // create the final installer - $outfile = "{$tempdir}-install.exe"; - chdir('/tmp'); - exec("/bin/cat {$tempdir}/7zS.sfx {$tempdir}/7zipConfig {$tempdir}/archive.7z > {$outfile}"); - - // cleanup - exec("/bin/rm -r {$tempdir}"); - - return $outfile; -} - -function viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $outpass, $proxy, $openvpnmanager, $advancedoptions) +function viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $outpass, $proxy, $openvpnmanager, $advancedoptions, $compression_type) { global $config; $uniq = uniqid(); $tempdir = "/tmp/openvpn-export-{$uniq}"; - $zipfile = "/tmp/{$uniq}-Viscosity.visc.zip"; $validconfig = openvpn_client_export_validate_config($srvid, $usrid, $crtid); if (!$validconfig) { @@ -678,12 +552,18 @@ EOF; } // Zip Viscosity file - exec("cd {$tempdir}/.. && /usr/local/bin/7z -tzip -y a {$zipfile} Viscosity.visc"); + if ($compression_type == 'targz') { + $outputfile = "/tmp/{$uniq}-Viscosity.visz"; + exec("cd {$tempdir}/.. && /usr/bin/tar cfz {$outputfile} Viscosity.visc"); + } else { + $outputfile = "/tmp/{$uniq}-Viscosity.visc.zip"; + exec("cd {$tempdir}/.. && /usr/local/bin/7z -tzip -y a {$outputfile} Viscosity.visc"); + } // Remove temporary directory exec("rm -rf {$tempdir}"); - return $zipfile; + return $outputfile; } function openvpn_client_export_sharedkey_config($srvid, $useaddr, $proxy, $zipconf = false) diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php index 65fd1eac6..f2bf85ca2 100644 --- a/src/www/vpn_openvpn_export.php +++ b/src/www/vpn_openvpn_export.php @@ -224,10 +224,10 @@ if (isset($config['openvpn']['openvpn-server'])) { $exp_path = openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $nokeys, $proxy, $expformat, $password, false, false, $openvpnmanager, $advancedoptions); } elseif ($act == "visc") { $exp_name = urlencode($exp_name."-Viscosity.visc.zip"); - $exp_path = viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $password, $proxy, $openvpnmanager, $advancedoptions); - } elseif (substr($act, 0, 4) == "inst") { - $exp_name = urlencode($exp_name."-install.exe"); - $exp_path = openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $password, $proxy, $openvpnmanager, $advancedoptions, substr($act, 5)); + $exp_path = viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $password, $proxy, $openvpnmanager, $advancedoptions, 'zip'); + } elseif ($act == "visz") { + $exp_name = urlencode($exp_name."-Viscosity.visz"); + $exp_path = viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $password, $proxy, $openvpnmanager, $advancedoptions, 'targz'); } elseif ( $act == 'skconf') { $exp_path = openvpn_client_export_sharedkey_config($srvid, $useaddr, $proxy, false); $exp_name = urlencode($exp_name."-config.ovpn"); @@ -604,14 +604,9 @@ if (isset($savemsg)) { - "> - - - - - - "> - + "> + + @@ -636,14 +631,9 @@ if (isset($savemsg)) { - "> - - - - - - "> - + "> + + @@ -679,14 +669,9 @@ if (isset($savemsg)) { - "> - - - - - - "> - + "> + + @@ -715,15 +700,13 @@ if (isset($savemsg)) {