Skip to content

Commit 4c3b902

Browse files
author
Rafael Grigorian
committed
Released Version 1.1.2
1 parent ecb11ee commit 4c3b902

File tree

49 files changed

+80
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+80
-69
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,9 @@
7272

7373
## Version 1.1.1
7474
- Added enterprise compatibility
75+
76+
## Version 1.1.2
77+
- Refreshing config cache when saving 2fa settings
78+
- Fixed logout not working for custom admin frontend
79+
- TOTP class now being loaded properly on case-sensitive systems
80+
- Moved all controller actions to live under admin route

COMPATIBILITY.md

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
| 1.9.3.6 | 12/15/2017 | SUCCESS | Rafael Grigorian |
2929
| 1.9.3.7 | 12/15/2017 | SUCCESS | Rafael Grigorian |
3030
| 1.9.3.8 | 03/01/2018 | SUCCESS | Rafael Grigorian |
31+
| 1.9.3.9 | 09/05/2018 | SUCCESS | Rafael Grigorian |
3132

3233
## Magento Commerce 1.x
3334

@@ -36,3 +37,4 @@
3637
| 1.13.1.0 | 03/01/2018 | SUCCESS | Rafael Grigorian |
3738
| 1.14.3.7 | 03/01/2018 | SUCCESS | Rafael Grigorian |
3839
| 1.14.3.8 | 03/01/2018 | SUCCESS | Rafael Grigorian |
40+
| 1.14.3.9 | 09/05/2018 | SUCCESS | Rafael Grigorian |

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
![](https://img.shields.io/badge/Magento-1-orange.svg?style=for-the-badge)
55
![](https://img.shields.io/badge/License-MIT-orange.svg?style=for-the-badge)
6-
![](https://img.shields.io/badge/Version-1.1.1-orange.svg?style=for-the-badge)
6+
![](https://img.shields.io/badge/Version-1.1.2-orange.svg?style=for-the-badge)
77
![](https://img.shields.io/badge/Stability-Stable-orange.svg?style=for-the-badge)
88

99
<p align="center" >

conf/package.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
- The 2FA account can be setup for devices (something they have) using the Google Authenticator app, which is available for every platform including iPhone and Android.
3131
</description>
3232
<notes>
33-
- Added enterprise compatibility
33+
- Refreshing config cache when saving 2fa settings
34+
- Fixed logout not working for custom admin frontend
35+
- TOTP class now being loaded properly on case-sensitive systems
36+
- Moved all controller actions to live under admin route
3437
</notes>
3538
<authors>
3639
<author>

design/User Guide.sketch

-13.6 KB
Binary file not shown.

docs/User Guide.pdf

62 Bytes
Binary file not shown.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.1.1",
2+
"version": "1.1.2",
33
"name": "magento-twofactor",
44
"description": "User based 2FA enablement for admin users in Magento 1.x",
55
"author": "Rafael Grigorian",

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Configure/Edit.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Edit.php - This class exists to simply tell Magento's grid system where to look for the
55
* proper controller for the configure page. It also specifies the proper block group within
66
* the constructor.
7-
* @version 1.1.1
7+
* @version 1.1.2
88
* @package JetRails® TwoFactor
99
* @category Configure
1010
* @author Rafael Grigorian - JetRails®
@@ -40,4 +40,4 @@ public function getHeaderText () {
4040
return Mage::helper ("twofactor")->__("Configure 2FA Settings");
4141
}
4242

43-
}
43+
}

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Configure/Edit/Form.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Form.php - This class initializes the form, field-set, and form fields that will exist on the
55
* configure page. All information is set in the _prepareForm method.
6-
* @version 1.1.1
6+
* @version 1.1.2
77
* @package JetRails® TwoFactor
88
* @category Edit
99
* @author Rafael Grigorian - JetRails®
@@ -58,4 +58,4 @@ protected function _prepareForm () {
5858
return parent::_prepareForm ();
5959
}
6060

61-
}
61+
}

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Manage/Container.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Container.php - This class exists to simply tell Magento's grid system where to look for the
55
* proper controller for the configure page. It also specifies the proper block group within
66
* the constructor.
7-
* @version 1.1.1
7+
* @version 1.1.2
88
* @package JetRails® TwoFactor
99
* @category Manage
1010
* @author Rafael Grigorian - JetRails®
@@ -28,4 +28,4 @@ public function __construct () {
2828
$this->_removeButton ("add");
2929
}
3030

31-
}
31+
}

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Manage/Container/Grid.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Grid.php - This class defines what collection to use for the grid collection. It also
55
* defines all the columns for the grid widget. Additionally it defines all the mass-action
66
* options for the widget grid.
7-
* @version 1.1.1
7+
* @version 1.1.2
88
* @package JetRails® TwoFactor
99
* @category Container
1010
* @author Rafael Grigorian - JetRails®
@@ -165,4 +165,4 @@ protected function _prepareMassaction () {
165165
return $this;
166166
}
167167

168-
}
168+
}

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Address.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Address.php - This class is a renderer class that is used with the grid widget's columns.
55
* These classes are used to load information from the authentication model using the admin
66
* user's id.
7-
* @version 1.1.1
7+
* @version 1.1.2
88
* @package JetRails® TwoFactor
99
* @category Manage
1010
* @author Rafael Grigorian - JetRails®
@@ -31,4 +31,4 @@ public function render ( Varien_Object $row ) {
3131
return $address === null ? "-" : $address;
3232
}
3333

34-
}
34+
}

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/State.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* State.php - This class is a renderer class that is used with the grid widget's columns.
55
* These classes are used to load information from the authentication model using the admin
66
* user's id.
7-
* @version 1.1.1
7+
* @version 1.1.2
88
* @package JetRails® TwoFactor
99
* @category Manage
1010
* @author Rafael Grigorian - JetRails®
@@ -40,4 +40,4 @@ public function render ( Varien_Object $row ) {
4040
);
4141
}
4242

43-
}
43+
}

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Status.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Status.php - This class is a renderer class that is used with the grid widget's columns.
55
* These classes are used to load information from the authentication model using the admin
66
* user's id.
7-
* @version 1.1.1
7+
* @version 1.1.2
88
* @package JetRails® TwoFactor
99
* @category Manage
1010
* @author Rafael Grigorian - JetRails®
@@ -34,4 +34,4 @@ public function render ( Varien_Object $row ) {
3434
);
3535
}
3636

37-
}
37+
}

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Renderer/Manage/Timestamp.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Timestamp.php - This class is a renderer class that is used with the grid widget's columns.
55
* These classes are used to load information from the authentication model using the admin
66
* user's id.
7-
* @version 1.1.1
7+
* @version 1.1.2
88
* @package JetRails® TwoFactor
99
* @category Manage
1010
* @author Rafael Grigorian - JetRails®
@@ -34,4 +34,4 @@ public function render ( Varien_Object $row ) {
3434
);
3535
}
3636

37-
}
37+
}

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Backup.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Backup.php - This template block is used in hand with the associated template file and it
55
* is used to prepare information for the template file.
6-
* @version 1.1.1
6+
* @version 1.1.2
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®
@@ -45,4 +45,4 @@ public function getFormKey () {
4545
return Mage::getSingleton ("core/session")->getFormKey ();
4646
}
4747

48-
}
48+
}

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Banned.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Banned.php - This template block is used in hand with the associated template file and it
55
* is used to prepare information for the template file.
6-
* @version 1.1.1
6+
* @version 1.1.2
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®
@@ -34,4 +34,4 @@ public function getBanTime () {
3434
return $data->getData () ["ban_time"];
3535
}
3636

37-
}
37+
}

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Scan.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Scan.php - This template block is used in hand with the associated template file and it
55
* is used to prepare information for the template file.
6-
* @version 1.1.1
6+
* @version 1.1.2
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®
@@ -63,4 +63,4 @@ public function getFormKey () {
6363
return Mage::getSingleton ("core/session")->getFormKey ();
6464
}
6565

66-
}
66+
}

src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Verify.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Verify.php - This function aids the Verify template. This block offers helpful function that
55
* are used within the template, such as suppling the form action and stylesheet URL.
6-
* @version 1.1.1
6+
* @version 1.1.2
77
* @package JetRails® TwoFactor
88
* @category Template
99
* @author Rafael Grigorian - JetRails®
@@ -43,4 +43,4 @@ public function getFormKey () {
4343
return Mage::getSingleton ("core/session")->getFormKey ();
4444
}
4545

46-
}
46+
}

src/app/code/community/JetRails/TwoFactor/Helper/Cookie.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Cookie.php - This helper class contains functions that deal with cookie creation, deletion,
55
* and authentication. This cookie class is used to aid in the "remember for x days"
66
* functionality.
7-
* @version 1.1.1
7+
* @version 1.1.2
88
* @package JetRails® TwoFactor
99
* @category Helper
1010
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Helper/Data.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* user. This class also contains methods to get the configuration data which are extracted
88
* using Magento's getConfig method and supplying the with the XPATH constants which are defined
99
* internally.
10-
* @version 1.1.1
10+
* @version 1.1.2
1111
* @package JetRails® TwoFactor
1212
* @category Helper
1313
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Helper/Totp.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* pins. It is very flexible and can be initialized to different sized secrets and pins.
66
* Although the default values conform to the generally accepted configuration for 2FA. Apps
77
* such as Authy and Google Authenticator use the default configuration.
8-
* @version 1.1.1
8+
* @version 1.1.2
99
* @package JetRails® TwoFactor
1010
* @category Helper
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Auth.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* passed TOTP pin, and registers failed authentication attempts. In addition the constants
88
* that are defined within this class are used throughout the module and are accessed
99
* statically.
10-
* @version 1.1.1
10+
* @version 1.1.2
1111
* @package JetRails® TwoFactor
1212
* @category Model
1313
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Notify.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Notify.php - This class contains methods that help log and communicate messages. Messages
55
* can be logged into a custom log file, the logged in admin user can be notified, or all admin
66
* users in the 'Administrators' role can be notified.
7-
* @version 1.1.1
7+
* @version 1.1.2
88
* @package JetRails® TwoFactor
99
* @category Model
1010
* @author Rafael Grigorian - JetRails®
@@ -152,4 +152,4 @@ public function emailUser () {
152152
);
153153
}
154154

155-
}
155+
}

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Observer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* config.xml file. This observer fires before any adminhtml action gets executed. This way if
66
* a user is not authenticated, we can ban access to those actions and redirect to the
77
* verification page.
8-
* @version 1.1.1
8+
* @version 1.1.2
99
* @package JetRails® TwoFactor
1010
* @category Model
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Page.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Page.php - This class contains the page route constants that are used throughout the module.
55
* It also contains methods that link the state to the associated route.
6-
* @version 1.1.1
6+
* @version 1.1.2
77
* @package JetRails® TwoFactor
88
* @category Model
99
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Resource/Auth.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Auth.php - This class is the resource model for the authentication model. There is not much
55
* going on here other than the standard setup. The database table and primary column is
66
* defined in the constructor and auto incrementing primary key on data save is disabled.
7-
* @version 1.1.1
7+
* @version 1.1.2
88
* @package JetRails® TwoFactor
99
* @category Resource Model
1010
* @author Rafael Grigorian - JetRails®
@@ -31,4 +31,4 @@ protected function _construct () {
3131
$this->_init ( "twofactor/auth", "id" );
3232
}
3333

34-
}
34+
}

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/State.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* This basically means that based on the state of authentication, we can redirect user's to the
66
* proper pages to ensure that their two-factor authentication accounts are setup. The values as
77
* they relate to the user can be found in the authentication model.
8-
* @version 1.1.1
8+
* @version 1.1.2
99
* @package JetRails® TwoFactor
1010
* @category Model
1111
* @author Rafael Grigorian - JetRails®
@@ -60,4 +60,4 @@ public function getSeverity ( $state ) {
6060
}
6161
}
6262

63-
}
63+
}

src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Status.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* This basically means if the status is set to enabled for a user, then two-factor
66
* authentication is enforced for the user. The values as they relate to the user can be found
77
* in the authentication model.
8-
* @version 1.1.1
8+
* @version 1.1.2
99
* @package JetRails® TwoFactor
1010
* @category Model
1111
* @author Rafael Grigorian - JetRails®
@@ -56,4 +56,4 @@ public function getSeverity ( $status ) {
5656
return $this->isEnabled ( $status ) ? "notice" : "critical";
5757
}
5858

59-
}
59+
}

src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/ConfigureController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* be found in the "JetRails/Two-Factor Authentication" menu tab. It handles the rendering of
66
* that page as well as all the actions that are submitted with the grid container that the
77
* index action renders.
8-
* @version 1.1.1
8+
* @version 1.1.2
99
* @package JetRails® TwoFactor
1010
* @category Controllers
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/LoginController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* their two-factor authentication account. Actions that render the verification page as well
66
* as the banned page that a user will see on failed login are all encapsulated within this
77
* controller.
8-
* @version 1.1.1
8+
* @version 1.1.2
99
* @package JetRails® TwoFactor
1010
* @category Controllers
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/ManageController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* found in the "JetRails/Two-Factor Authentication" menu tab. It handles the rendering of that
66
* page as well as all the actions that are submitted with the grid container that the index
77
* action renders.
8-
* @version 1.1.1
8+
* @version 1.1.2
99
* @package JetRails® TwoFactor
1010
* @category Controllers
1111
* @author Rafael Grigorian - JetRails®

src/app/code/community/JetRails/TwoFactor/controllers/Twofactor/SetupController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SetupController.php - This controller contains all actions that relate to setting up the two
55
* factor authentication on an admin user's account. Actions that render both the scan and
66
* backup pages for setup, as well as an action that resets the whole process for an admin user.
7-
* @version 1.1.1
7+
* @version 1.1.2
88
* @package JetRails® TwoFactor
99
* @category Controllers
1010
* @author Rafael Grigorian - JetRails®

0 commit comments

Comments
 (0)