Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[IMPROVE][2FA] Password enforcement setting and 2FA protection when saving settings or resetting E2E encryption #18640

Merged
merged 9 commits into from
Aug 22, 2020
Merged

[IMPROVE][2FA] Password enforcement setting and 2FA protection when saving settings or resetting E2E encryption #18640

merged 9 commits into from
Aug 22, 2020

Conversation

rodrigok
Copy link
Member

Proposed changes

Issue(s)

How to test or reproduce

Screenshots

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Hotfix (a major bugfix that has to be merged asap)
  • Documentation Update (if none of the other choices apply)

Changelog

  • Increase the 2FA remembering time from 5min to 30min
  • Add new setting to enforce 2FA password fallback (enabled only for new installations)
  • Require 2FA to save settings and reset E2E Encryption keys

Further comments

@rodrigok rodrigok mentioned this pull request Aug 21, 2020
Merged
12 tasks
sampaiodiego
sampaiodiego previously approved these changes Aug 21, 2020
View reviewed changes
@rodrigok rodrigok added this to the 3.6.0 milestone Aug 21, 2020
@sampaiodiego
Move to endpoint
011ef5d
@sampaiodiego
Merge pull request #18642 from RocketChat/reset-other-e2ekey
dbd0e3e 
[NEW] Admin option to reset other users’ E2E encryption key
@sampaiodiego sampaiodiego changed the title [IMPROVE] 2FA password enforcement setting and 2FA protection when saving settings or resetting e2e encryption [IMPROVE] 2FA password enforcement setting and 2FA protection when saving settings or resetting E2E encryption Aug 22, 2020
@sampaiodiego sampaiodiego merged commit fe7fe3c into develop Aug 22, 2020
@sampaiodiego sampaiodiego deleted the 2fa-enforcement branch August 22, 2020 03:04
@rodrigok rodrigok changed the title [IMPROVE] 2FA password enforcement setting and 2FA protection when saving settings or resetting E2E encryption [IMPROVE][2FA] Password enforcement setting and 2FA protection when saving settings or resetting E2E encryption Aug 24, 2020
@sampaiodiego sampaiodiego mentioned this pull request Aug 29, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sampaiodiego sampaiodiego sampaiodiego approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.6.0
Development

Successfully merging this pull request may close these issues.
2 participants
@rodrigok @sampaiodiego