-
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: Cookie privacy (httponly and secure) backported to previous virtual appliances ENH: Weak SSL ciphers disabled ENH: Better Docker support ENH: Better log handling
- Loading branch information
Showing
19 changed files
with
1,113 additions
and
217 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,15 +15,16 @@ | |
| # 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.8.1.2 (apt-offline removed) | ||
| # @date 2021-03-24 | ||
| # @version 5.8.1.9 | ||
| # @date 2021-03-25 | ||
| # @since 2013-11-29 | ||
| # @copyright (c) 2013-2018 by SysCo systemes de communication sa | ||
| # @copyright (c) 2013-2021 SysCo systemes de communication sa | ||
| # @copyright GNU Lesser General Public License | ||
| # | ||
| # docker build . | ||
| # docker run --mount source=multiotp-data,target=/etc/multiotp -p 80:80 -p 443:443 -p 1812:1812/udp -p 1813:1813/udp -d xxxxxxxxxxxx | ||
| # | ||
| # 2021-03-25 5.8.1.9 SysCo/al Remove apt-offline, which is not used | ||
| # 2020-08-31 5.8.0.0 SysCo/al Debian Buster 10.5 support | ||
| # 2019-10-22 5.6.1.3 SysCo/al Debian 10 support | ||
| # 2019-01-07 5.4.1.1 SysCo/al Debian 9 support | ||
|
|
@@ -40,7 +41,7 @@ MAINTAINER Andre Liechti <[email protected]> | |
| LABEL Description="multiOTP open source, running on Debian ${DEBIAN} with PHP${PHPVERSION}." \ | ||
| License="LGPL-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.8.1.1" | ||
| Version="5.8.1.9" | ||
|
|
||
| ARG DEBIAN_FRONTEND=noninteractive | ||
|
|
||
|
|
@@ -101,7 +102,7 @@ COPY raspberry/boot-part/multiotp-tree /boot/multiotp-tree/ | |
| # (if you want to build an image with the latest | ||
| # available version instead of the local one) | ||
| # | ||
| # RUN wget -q http://download.multiotp.net/multiotp.zip -O /tmp/multiotp.zip && \ | ||
| # RUN wget -q https://download.multiotp.net/multiotp.zip -O /tmp/multiotp.zip && \ | ||
| # unzip -q -o /tmp/multiotp.zip -d /tmp/multiotp | ||
| # | ||
| # RUN mv /tmp/multiotp/raspberry/boot-part/* /boot && \ | ||
|
|
||
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.8.1.1 | ||
| * @date 2021-03-14 | ||
| * @version 5.8.1.9 | ||
| * @date 2021-03-25 | ||
| * @since 2013-07-10 | ||
| * @copyright (c) 2013-2021 SysCo systemes de communication sa | ||
| * @copyright GNU Lesser General Public License | ||
|
|
@@ -134,6 +134,8 @@ | |
| $GLOBALS['noresume'] = $_GET['noresume']; | ||
| } | ||
|
|
||
| $test_mail = isset($GLOBALS['test_mail'])?$GLOBALS['test_mail']:''; | ||
|
|
||
| if (!function_exists('echo_full')) { | ||
| function echo_full($to_display) { | ||
| if (!$GLOBALS['minima']) { | ||
|
|
@@ -498,7 +500,7 @@ function scrollToObject(object_div) | |
| echo_full($crlf); | ||
|
|
||
|
|
||
| //==================================================================== | ||
| //==================================================================== | ||
| // Delete the user test_user if it exists | ||
| echo_full($i_on); | ||
| echo_full("Deleting the test_user".$crlf); | ||
|
|
@@ -514,7 +516,7 @@ function scrollToObject(object_div) | |
| echo_full($crlf); | ||
|
|
||
|
|
||
| //==================================================================== | ||
| //==================================================================== | ||
| // Delete the user test_user twice if it exists | ||
| echo_full($i_on); | ||
| echo_full("Deleting the test_user (twice)".$crlf); | ||
|
|
@@ -530,7 +532,7 @@ function scrollToObject(object_div) | |
| echo_full($crlf); | ||
|
|
||
|
|
||
| //==================================================================== | ||
| //==================================================================== | ||
| // Delete the user test_totp if it exists | ||
| echo_full($i_on); | ||
| echo_full("Deleting the test_totp".$crlf); | ||
|
|
@@ -546,7 +548,7 @@ function scrollToObject(object_div) | |
| echo_full($crlf); | ||
|
|
||
|
|
||
| //==================================================================== | ||
| //==================================================================== | ||
| //==================================================================== | ||
| // Delete the token test_token if it exists | ||
| echo_full($i_on); | ||
|
|
@@ -563,7 +565,7 @@ function scrollToObject(object_div) | |
| echo_full($crlf); | ||
|
|
||
|
|
||
| //==================================================================== | ||
| //==================================================================== | ||
| //==================================================================== | ||
| // Delete the token test_token_totp if it exists | ||
| echo_full($i_on); | ||
|
|
@@ -773,6 +775,26 @@ function scrollToObject(object_div) | |
| echo_full($crlf); | ||
|
|
||
|
|
||
| //================================================ | ||
| // TEST: Generate Email token for the current user | ||
| if ('' != $test_mail) { | ||
| $tests++; | ||
| echo_full($b_on."Generate Email token for user test_user".$b_off.$crlf); | ||
| $multiotp->SetUser('test_user'); | ||
| $multiotp->SetEmailCodeAllowed(1); | ||
| $multiotp->SetUserEmail($test_mail); | ||
| $multiotp->WriteUserData(); | ||
| $token_result = $multiotp->GenerateEmailToken(); | ||
| if (18 == $token_result) { | ||
| echo_full("- ".$ok_on.'OK!'.$ok_off." Email token successfully generated".$crlf); | ||
| $successes++; | ||
| } else { | ||
| echo_full("- ".$ko_on.'KO!'.$ko_off." Email token generation failed, error $token_result.".$crlf); | ||
| } | ||
| echo_full($crlf); | ||
| } | ||
|
|
||
|
|
||
| //==================================================================== | ||
| // Delete the user test_user8 if it exists | ||
| echo_full($i_on); | ||
|
|
||
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/2019 | ||
| REM | ||
| REM @author Andre Liechti, SysCo systemes de communication sa, <[email protected]> | ||
| REM @version 5.8.1.1 | ||
| REM @date 2021-03-14 | ||
| REM @version 5.8.1.9 | ||
| REM @date 2021-03-25 | ||
| REM @since 2010-07-10 | ||
| REM @copyright (c) 2010-2021 SysCo systemes de communication sa | ||
| REM @copyright GNU Lesser General Public License | ||
|
|
@@ -250,9 +250,9 @@ SET /A TOTAL_TESTS=TOTAL_TESTS+1 | |
| ECHO. | ||
| ECHO Test replay rejection for user test_user | ||
| %_multiotp% -keep-local -log test_user "ThisIsALongNonDigitPinCode!755224" | ||
| IF NOT ERRORLEVEL 1 ECHO - KO! Replayed token *WRONGLY* accepted | ||
| IF NOT ERRORLEVEL 1 ECHO - KO! Replayed token *WRONGLY* accepted (%_backend%) >>"%TEMP%\multiotp_error.log" | ||
| IF NOT ERRORLEVEL 1 GOTO ErrorReplay | ||
| IF NOT ERRORLEVEL 26 ECHO - KO! Replayed token *WRONGLY* accepted | ||
| IF NOT ERRORLEVEL 26 ECHO - KO! Replayed token *WRONGLY* accepted (%_backend%) >>"%TEMP%\multiotp_error.log" | ||
| IF NOT ERRORLEVEL 26 GOTO ErrorReplay | ||
| ECHO - OK! Token of the user test_user successfully REJECTED (replay) | ||
| SET /A SUCCESSES=SUCCESSES+1 | ||
| :ErrorReplay | ||
|
|
@@ -310,11 +310,11 @@ ECHO. | |
| ECHO Authenticate test_user with replayed token 162583 with prefix using MS-CHAPv2 | ||
| REM user test_user and password "ThisIsALongNonDigitPinCode!162583" | ||
| %_multiotp% -keep-local -log test_user -ms-chap-challenge=0xc5356d83125a36b655c59a05b2245d68 -ms-chap2-response=0x00006cea45ad4f3e3a6af414cc09619aeb1e00000000000000004dd32ee9f3b898cf4fcd665ba167a303ce2c1266e7a26f10 | ||
| IF NOT ERRORLEVEL 1 ECHO - KO! Replayed token of the user test_user wrongly accepted | ||
| IF NOT ERRORLEVEL 1 ECHO - KO! Replayed token of the user test_user wrongly accepted (%_backend%) >>"%TEMP%\multiotp_error.log" | ||
| IF NOT ERRORLEVEL 1 GOTO ErrorReplayedMsChapV2 | ||
| IF ERRORLEVEL 1 ECHO - OK! Replayed Token of the test_user successfully REJECTED | ||
| IF ERRORLEVEL 1 SET /A SUCCESSES=SUCCESSES+1 | ||
| IF NOT ERRORLEVEL 26 ECHO - KO! Replayed token of the user test_user wrongly accepted | ||
| IF NOT ERRORLEVEL 26 ECHO - KO! Replayed token of the user test_user wrongly accepted (%_backend%) >>"%TEMP%\multiotp_error.log" | ||
| IF NOT ERRORLEVEL 26 GOTO ErrorReplayedMsChapV2 | ||
| IF ERRORLEVEL 26 ECHO - OK! Replayed Token of the test_user successfully REJECTED | ||
| IF ERRORLEVEL 26 SET /A SUCCESSES=SUCCESSES+1 | ||
| :ErrorReplayedMsChapV2 | ||
| SET /A TOTAL_TESTS=TOTAL_TESTS+1 | ||
|
|
||
|
|
||
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 |
|---|---|---|
|
|
@@ -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.8.1.1 | ||
| @date 2021-03-14 | ||
| @version 5.8.1.9 | ||
| @date 2021-03-25 | ||
| @since 2016-12-08 | ||
| @copyright (c) 2010-2021 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.8.1.1 | ||
| * @date 2021-03-14 | ||
| * @version 5.8.1.9 | ||
| * @date 2021-03-25 | ||
| * @since 2016-12-08 | ||
| * @copyright (c) 2010-2021 SysCo systemes de communication sa | ||
| * @copyright GNU Lesser General Public License | ||
|
|
@@ -68,8 +68,8 @@ | |
| #include <iostream> | ||
|
|
||
| #define SOFTWARE "LAUNCHPHPMULTIOTP" | ||
| #define VER_NUMBER "5.8.1.1" | ||
| #define VER_DATE "2021-03-14" | ||
| #define VER_NUMBER "5.8.1.9" | ||
| #define VER_DATE "2021-03-25" | ||
|
|
||
| int _tmain(int argc, _TCHAR* argv[]) | ||
| { | ||
|
|
||
Oops, something went wrong.