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

Retain 2FA authorization #15749

Merged
merged 2 commits into from Jan 7, 2020
Merged

Retain 2FA authorization #15749

merged 2 commits into from Jan 7, 2020

Conversation

victorphoenix3
Copy link
Contributor

@victorphoenix3 victorphoenix3 commented Jan 5, 2020 •
edited

Fixes #15351 .
Signed-off-by: Jayati Shrivastava gaurijove@gmail.com

BEFORE

before

AFTER

after

Before submitting pull request, please review the following checklist:

  • Make sure you have read our CONTRIBUTING.md document.
  • Make sure you are making a pull request against the correct branch. For example, for bug fixes in a released version use the corresponding QA branch and for new features use the master branch. If you have a doubt, you can ask as a comment in the bug report or on the mailing list.
  • Every commit has proper Signed-off-by line as described in our DCO. This ensures that the work you're submitting is your own creation.
  • Every commit has a descriptive commit message.
  • Every commit is needed on its own, if you have just minor fixes to previous commits, you can squash them.
  • Any new functionality is covered by tests.

williamdes
williamdes approved these changes Jan 7, 2020
View reviewed changes
Copy link
Member

@williamdes williamdes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@victorphoenix3 is it ready ?
I will test it soon

@williamdes
Add more tests for testCookieDecrypt
af100ab 
Signed-off-by: William Desportes <williamdes@wdes.fr>
@victorphoenix3
Copy link
Contributor Author

@williamdes Yes, the PR seems to fix the bug ,do test it.
But i haven't yet been able to find WHY the set value for the 2fa backend gets lost.

@williamdes
Copy link
Member

williamdes commented Jan 7, 2020 •
edited

But i haven't yet been able to find WHY the set value for the 2fa backend gets lost.

Okay, you know your fix looks like the issue #15724 fixed by #15735 🤔

@williamdes
Copy link
Member

My guess is that the 2FA settings are not loaded from the database

@victorphoenix3 victorphoenix3 changed the title [WIP] retain 2FA authorization Retain 2FA authorization Jan 7, 2020
@victorphoenix3
Copy link
Contributor Author

My guess is that the 2FA settings are not loaded from the database

@williamdes oh, I'll try to debug and pin down the cause.
PR is ready for review.

@williamdes
Copy link
Member

I am also trying to debug actually ^^
I found out that userPreferences is loaded with 2fa value but is not saved with 2fa value

This first one who finds posts it here :)

@williamdes
Copy link
Member

williamdes commented Jan 7, 2020 •
edited

Done, I used your fix because it was the best option

@victorphoenix3 @williamdes
Fix phpmyadmin#15351 - retain 2FA setting
7e007f8 
Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com>
@williamdes williamdes changed the base branch from master to QA_5_0 January 7, 2020 20:06
@codecov
Copy link

codecov bot commented Jan 7, 2020 •
edited

Codecov Report

Merging #15749 into QA_5_0 will decrease coverage by 0.3%.
The diff coverage is 17.68%.

@@             Coverage Diff              @@
##             QA_5_0   #15749      +/-   ##
============================================
- Coverage     53.05%   52.75%   -0.31%     
- Complexity    14153    14825     +672     
============================================
  Files           482      473       -9     
  Lines         62127    60999    -1128     
============================================
- Hits          32964    32178     -786     
+ Misses        29163    28821     -342

@williamdes
Copy link
Member

@victorphoenix3 can you review so I can merge quickly ?

@williamdes williamdes self-assigned this Jan 7, 2020
@williamdes williamdes added this to In progress in pull-requests via automation Jan 7, 2020
@williamdes williamdes moved this from In progress to Reviewer approved in pull-requests Jan 7, 2020
@williamdes williamdes added this to the 5.0.1 milestone Jan 7, 2020
williamdes added a commit that referenced this pull request Jan 7, 2020
@williamdes
Merge #15749 - Fix #15351 - retain 2FA setting
21c1bb8 
Pull-request: #15749
Fixes: #15351
Signed-off-by: William Desportes <williamdes@wdes.fr>
@williamdes williamdes merged commit 7e007f8 into phpmyadmin:QA_5_0 Jan 7, 2020
pull-requests automation moved this from Reviewer approved to Done Jan 7, 2020
@williamdes
Copy link
Member

Thank you for your contribution @victorphoenix3 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@williamdes williamdes williamdes approved these changes

Assignees

@williamdes williamdes

Labels
None yet
Projects
pull-requests
  
Done
Milestone
5.0.1
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@victorphoenix3 @williamdes