-
Notifications
You must be signed in to change notification settings - Fork 77
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FIX: Values of SetUserCacheLevel(), GetUserCacheLevel(), SetUserCacheLifetime() and GetUserCacheLifetime() are not correctly initialized ENH: Enigma Virtual Box updated to version 9.10 (to create the special all-in-one-file) ENH: PHP 7.1.22 used in the one single file (only PHP < 7.2 is still compatible with Windows 7/2008) ENH: Compatibility mode to Windows 7 automatically added for radiusd.exe during radius service installation ENH: PHP display error flag is now set to off by default in the webservice under Windows
- Loading branch information
Showing
17 changed files
with
105 additions
and
67 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,8 +15,8 @@ | |
# Please check http://www.multiOTP.net/ and you will find the magic button ;-) | ||
# | ||
# @author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
# @version 5.3.0.3 | ||
# @date 2018-08-26 | ||
# @version 5.4.0.1 | ||
# @date 2018-09-14 | ||
# @since 2013-11-29 | ||
# @copyright (c) 2013-2018 by SysCo systemes de communication sa | ||
# @copyright GNU Lesser General Public License | ||
|
@@ -39,7 +39,7 @@ MAINTAINER Andre Liechti <[email protected]> | |
LABEL Description="multiOTP open source, running on Debian ${DEBIAN} with PHP${PHPVERSION}." \ | ||
License="LGPLG-3.0" \ | ||
Usage="docker run --mount source=[SOURCE PERSISTENT VOLUME],target=/etc/multiotp -p [HOST WWW PORT NUMBER]:80 -p [HOST SSL PORT NUMBER]:443 -p [HOST RADIUS-AUTH PORT NUMBER]:1812/udp -p [HOST RADIUS-ACCNT PORT NUMBER]:1813/udp -d multiotp-open-source" \ | ||
Version="5.3.0.3" | ||
Version="5.4.0.1" | ||
|
||
ARG DEBIAN_FRONTEND=noninteractive | ||
|
||
|
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 |
---|---|---|
|
@@ -22,8 +22,8 @@ | |
* PHP 5.3.0 or higher is supported. | ||
* | ||
* @author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
* @version 5.3.0.3 | ||
* @date 2018-08-26 | ||
* @version 5.4.0.1 | ||
* @date 2018-09-14 | ||
* @since 2013-07-10 | ||
* @copyright (c) 2013-2018 SysCo systemes de communication sa | ||
* @copyright GNU Lesser General Public License | ||
|
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 |
---|---|---|
|
@@ -11,8 +11,8 @@ REM | |
REM Windows batch file for Windows 2K/XP/2003/7/2008/8/2012/10 | ||
REM | ||
REM @author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
REM @version 5.3.0.3 | ||
REM @date 2018-08-26 | ||
REM @version 5.4.0.1 | ||
REM @date 2018-09-14 | ||
REM @since 2010-07-10 | ||
REM @copyright (c) 2010-2018 SysCo systemes de communication sa | ||
REM @copyright GNU Lesser General Public License | ||
|
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 |
---|---|---|
|
@@ -11,8 +11,8 @@ class MultiotpYubikey | |
* @brief Class definition for Yubikey handling. | ||
* | ||
* @author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
* @version 5.1.0.6 | ||
* @date 2018-02-26 | ||
* @version 5.4.0.0 | ||
* @date 2018-09-05 | ||
* @since 2014-11-04 | ||
* | ||
* | ||
|
@@ -24,6 +24,7 @@ class MultiotpYubikey | |
* | ||
* Change Log | ||
* | ||
* 2018-09-05 5.4.0.0 SysCo/al FIX: infinity_dev Fix UTC issue | ||
* 2018-02-26 5.1.0.6 SysCo/al ENH: __construct instead of the name of the class | ||
* 2016-03-22 4.3.2.7 SysCo/al ENH: private id support for CheckYubicoOtp method | ||
* 2014-11-04 4.3.0.0 SysCo/al Initial implementation of MultiotpYubikey class | ||
|
@@ -326,7 +327,14 @@ function CheckOnYubiCloud($otp_to_check) { | |
sort($yubicloud_response_parameters); | ||
|
||
if (isset($response['t'])) { | ||
$response['t_utc'] = date_format(date_create(substr($response['t'], 0, -4)), "U"); | ||
$posZ=strrpos($response['t'], 'Z'); | ||
$responseTime = $response['t']; | ||
if ($posZ > 0) | ||
$responseTime = substr($response['t'], 0, $posZ); | ||
$tzbackup = date_default_timezone_get(); | ||
date_default_timezone_set('UTC'); | ||
$response['t_utc'] = date_format(date_create($responseTime), "U"); | ||
date_default_timezone_set($tzbackup); | ||
} | ||
|
||
$parameters_for_hash = ''; | ||
|
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 |
---|---|---|
|
@@ -15,8 +15,8 @@ The multiOTP C++ launcher is simply used to launch PHP | |
and run multiotp.windows.php with the provided arguments. | ||
|
||
@author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
@version 5.3.0.3 | ||
@date 2018-08-26 | ||
@version 5.4.0.1 | ||
@date 2018-09-14 | ||
@since 2016-12-08 | ||
@copyright (c) 2010-2018 SysCo systemes de communication sa | ||
@copyright GNU Lesser General Public License | ||
|
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 |
---|---|---|
|
@@ -14,8 +14,8 @@ | |
* and run multiotp.windows.php with the provided arguments. | ||
* | ||
* @author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
* @version 5.3.0.3 | ||
* @date 2018-08-26 | ||
* @version 5.4.0.1 | ||
* @date 2018-09-14 | ||
* @since 2016-12-08 | ||
* @copyright (c) 2010-2018 SysCo systemes de communication sa | ||
* @copyright GNU Lesser General Public License | ||
|
@@ -68,8 +68,8 @@ | |
#include <iostream> | ||
|
||
#define SOFTWARE "LAUNCHPHPMULTIOTP" | ||
#define VER_NUMBER "5.3.0.3" | ||
#define VER_DATE "2018-08-26" | ||
#define VER_NUMBER "5.4.0.1" | ||
#define VER_DATE "2018-09-14" | ||
|
||
int _tmain(int argc, _TCHAR* argv[]) | ||
{ | ||
|
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 |
---|---|---|
|
@@ -70,8 +70,8 @@ | |
* PHP 5.3.0 or higher is supported. | ||
* | ||
* @author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
* @version 5.3.0.3 | ||
* @date 2018-08-26 | ||
* @version 5.4.0.1 | ||
* @date 2018-09-14 | ||
* @since 2010-06-08 | ||
* @copyright (c) 2010-2018 SysCo systemes de communication sa | ||
* @copyright GNU Lesser General Public License | ||
|
@@ -516,6 +516,12 @@ | |
* | ||
* Change Log | ||
* | ||
* 2018-09-14 5.4.0.1 SysCo/al FIX: Values of SetUserCacheLevel(), GetUserCacheLevel(), SetUserCacheLifetime() and GetUserCacheLifetime() | ||
* are not correctly initialized | ||
* ENH: Enigma Virtual Box updated to version 9.10 (to create the special all-in-one-file) | ||
* ENH: PHP 7.1.22 used in the one single file (only PHP < 7.2 is still compatible with Windows 7/2008) | ||
* ENH: Compatibility mode to Windows 7 automatically added for radiusd.exe during radius service installation | ||
* ENH: PHP display error flag is now set to off by default in the webservice under Windows | ||
* 2018-08-26 5.3.0.3 SysCo/al FIX: Better without2FA algorithm support | ||
* FIX: Restore configuration has been fixed in the command line edition | ||
* ENH: Cache-level and cache-lifetime can be set separately for each user | ||
|
@@ -833,8 +839,8 @@ class Multiotp | |
* @brief Main class definition of the multiOTP project. | ||
* | ||
* @author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
* @version 5.3.0.3 | ||
* @date 2018-08-26 | ||
* @version 5.4.0.1 | ||
* @date 2018-09-14 | ||
* @since 2010-07-18 | ||
*/ | ||
{ | ||
|
@@ -925,8 +931,8 @@ class Multiotp | |
* @retval void | ||
* | ||
* @author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
* @version 5.3.0.3 | ||
* @date 2018-08-26 | ||
* @version 5.4.0.1 | ||
* @date 2018-09-14 | ||
* @since 2010-07-18 | ||
*/ | ||
function __construct( | ||
|
@@ -945,11 +951,11 @@ function __construct( | |
|
||
if (!isset($this->_class)) { $this->_class = base64_decode('bXVsdGlPVFA='); } | ||
if (!isset($this->_version)) { | ||
$temp_version = '@version 5.3.0.3'; // You should add a suffix for your changes (for example 5.0.3.2-andy-2016-10-XX) | ||
$temp_version = '@version 5.4.0.1'; // You should add a suffix for your changes (for example 5.0.3.2-andy-2016-10-XX) | ||
$this->_version = trim(substr($temp_version, 8)); | ||
} | ||
if (!isset($this->_date)) { | ||
$temp_date = '@date 2018-08-26'; // You should update the date with the date of your changes | ||
$temp_date = '@date 2018-09-14'; // You should update the date with the date of your changes | ||
$this->_date = trim(substr($temp_date, 8)); | ||
} | ||
if (!isset($this->_copyright)) { $this->_copyright = base64_decode('KGMpIDIwMTAtMjAxOCBTeXNDbyBzeXN0ZW1lcyBkZSBjb21tdW5pY2F0aW9uIHNh'); } | ||
|
@@ -1684,26 +1690,26 @@ function IsMultipleGroupsEnabled() | |
function SetUserCacheLevel( | ||
$value | ||
) { | ||
$this->_config_data['cache_level'] = intval($value); | ||
$this->_user_data['cache_level'] = intval($value); | ||
} | ||
|
||
|
||
function GetUserCacheLevel() | ||
{ | ||
return intval($this->_config_data['cache_level']); | ||
return intval($this->_user_data['cache_level']); | ||
} | ||
|
||
|
||
function SetUserCacheLifetime( | ||
$value | ||
) { | ||
$this->_config_data['cache_lifetime'] = intval($value); | ||
$this->_user_data['cache_lifetime'] = intval($value); | ||
} | ||
|
||
|
||
function GetUserCacheLifetime() | ||
{ | ||
return intval($this->_config_data['cache_lifetime']); | ||
return intval($this->_user_data['cache_lifetime']); | ||
} | ||
|
||
|
||
|
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 |
---|---|---|
|
@@ -35,8 +35,8 @@ | |
* PHP 5.3.0 or higher is supported. | ||
* | ||
* @author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
* @version 5.3.0.3 | ||
* @date 2018-08-26 | ||
* @version 5.4.0.1 | ||
* @date 2018-09-14 | ||
* @since 2010-06-08 | ||
* @copyright (c) 2010-2018 SysCo systemes de communication sa | ||
* @copyright GNU Lesser General Public License | ||
|
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 |
---|---|---|
|
@@ -15,8 +15,8 @@ | |
* PHP 5.3.0 or higher is supported. | ||
* | ||
* @author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
* @version 5.3.0.3 | ||
* @date 2018-08-26 | ||
* @version 5.4.0.1 | ||
* @date 2018-09-14 | ||
* @since 2010-06-08 | ||
* @copyright (c) 2010-2018 SysCo systemes de communication sa | ||
* @copyright GNU Lesser General Public License | ||
|
Oops, something went wrong.