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.

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

Lift the restriction on pragmarx/google2fa #16407

Closed
williamdes opened this issue Oct 13, 2020 · 11 comments
Closed

Lift the restriction on pragmarx/google2fa #16407

williamdes opened this issue Oct 13, 2020 · 11 comments
Assignees
@williamdes
Labels
enhancement A feature request for improving phpMyAdmin
Projects
issues
Milestone
5.1.0

Comments

@williamdes
Copy link
Member

Ref: #14074

Re-licenced to MIT antonioribeiro/google2fa#100

MIT since 3.0.1 https://github.com/antonioribeiro/google2fa/blob/8.x/CHANGELOG.md#301---2018-03-15

phpmyadmin/composer.json

Line 66 in e6d84af

"pragmarx/google2fa": ">=6.1",

@williamdes
Copy link
Member Author

cc @MauricioFauth @ibennetch
Do you agree ?

@williamdes williamdes added this to Needs triage in issues via automation Oct 13, 2020
@williamdes williamdes moved this from Needs triage to to be fixed soon in issues Oct 13, 2020
@MauricioFauth
Copy link
Member

I don't remember why I added "pragmarx/google2fa": ">=6.1" as a conflict.

@williamdes
Copy link
Member Author

It looks strange, I will surely sort out this after next 5.0 is out.

Thank you for the feedback :)

phpmyadmin/composer.json

Line 67 in e6d84af

"pragmarx/google2fa-qrcode": "<1.0.1",

Seems like you did not want image backends 🤔 (https://github.com/antonioribeiro/google2fa-qrcode/blob/master/CHANGELOG.md#101---2018-10-10)

@MauricioFauth
Copy link
Member

phpmyadmin/composer.json

Line 67 in e6d84af

"pragmarx/google2fa-qrcode": "<1.0.1",

Seems like you did not want image backends thinking (https://github.com/antonioribeiro/google2fa-qrcode/blob/master/CHANGELOG.md#101---2018-10-10)

This is because we can't add a minimum requirement to suggested packages.

I don't remember why I added "pragmarx/google2fa": ">=6.1" as a conflict.

If I remember correctly, I added this to avoid a bug in pragmarx/google2fa 6.1 and forgot about that.

@ibennetch
Copy link
Member

What is your hope here, to replace the pragmarx/google2fa library with something else?

@ibennetch
Copy link
Member

ibennetch commented Oct 16, 2020 •
edited

I don't remember why I added "pragmarx/google2fa": ">=6.1" as a conflict.

If I remember correctly, I added this to avoid a bug in pragmarx/google2fa 6.1 and forgot about that.

I had forgotten about this but I believe you are correct...I can't remember what the bug was exactly, but that version requirement sounds familiar for fixing something.

@williamdes
Copy link
Member Author

What is your hope here, to replace the pragmarx/google2fa library with something else?

I just want to clarify the restrictions because I have some Debian packaging to do and I can't afford to loose months of work for one line ^^

Maybe insure we can swap in and out 2FA providers very easily :)

@williamdes
Copy link
Member Author 

        "phpseclib/phpseclib": "2.0.8",
        "tecnickcom/tcpdf": "<6.2",
        "pragmarx/google2fa": ">=6.1",
        "pragmarx/google2fa-qrcode": "<1.0.1",
        "samyoul/u2f-php-server": "<1.1"

See #13846 phpseclib/phpseclib, 2.0.8 was broken.
See #12975 tecnickcom/tcpdf for tcpdf.
See dd5d6d8 for pragmarx/google2fa

@williamdes williamdes added this to the 5.1.0 milestone Nov 12, 2020
@williamdes williamdes added enhancement A feature request for improving phpMyAdmin and removed undecided labels Nov 12, 2020
@williamdes williamdes self-assigned this Nov 12, 2020
williamdes added a commit that referenced this issue Nov 12, 2020
@williamdes
#16407 - Bump pragmarx/google2fa conflict to >8.0
cc6d1be 
Signed-off-by: William Desportes <williamdes@wdes.fr>
williamdes added a commit that referenced this issue Nov 12, 2020
@williamdes
Add a ChangeLog entry for #16407
bb3082b 
Signed-off-by: William Desportes <williamdes@wdes.fr>
issues automation moved this from to be fixed soon to Closed Nov 12, 2020
@williamdes
Copy link
Member Author

Fixed by cc6d1be

williamdes added a commit that referenced this issue Nov 13, 2020
@williamdes
#16407 - Make all versions of pragmarx/google2fa below 6.1.0 incompat…
d7a27c3 
…ible

Because of this commit: antonioribeiro/google2fa@c1bb594
Fixed the tests for newer versions.

Signed-off-by: William Desportes <williamdes@wdes.fr>
@williamdes
Copy link
Member Author

The reason why we added the conflict is in this commit d7a27c3
Now conflicts versions are clear.

@MauricioFauth
Copy link
Member

The reason why we added the conflict is in this commit d7a27c3
Now conflicts versions are clear.

Thank you, William. I added the conflict line and forgot to fix it later.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 14, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@williamdes williamdes

Labels
enhancement A feature request for improving phpMyAdmin
Projects
issues
  
Closed
Milestone
5.1.0
Development

No branches or pull requests
3 participants
@MauricioFauth @ibennetch @williamdes