mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-06 05:52:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4868 from wallabag/fix/4818/2fa-plaintext-secret

Browse source
This commit is contained in:
Jérémy Benoist 2020-12-31 06:10:55 +01:00 committed by GitHub
commit c4b24503f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Wallabag/CoreBundle/Controller/ConfigController.php
View file

@ -344,6 +344,7 @@ class ConfigController extends Controller
return $this->render('WallabagCoreBundle:Config:otp_app.html.twig', [ return $this->render('WallabagCoreBundle:Config:otp_app.html.twig', [
'backupCodes' => $backupCodes, 'backupCodes' => $backupCodes,
'qr_code' => $this->get('scheb_two_factor.security.google_authenticator')->getQRContent($user), 'qr_code' => $this->get('scheb_two_factor.security.google_authenticator')->getQRContent($user),
'secret' => $secret,
]); ]);
} }

1
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
View file

@ -209,6 +209,7 @@ config:
two_factor_code_description_2: 'You can scan that QR Code with your app:' two_factor_code_description_2: 'You can scan that QR Code with your app:'
two_factor_code_description_3: 'Also, save these backup codes in a safe place, you can use them in case you lose access to your OTP app:' two_factor_code_description_3: 'Also, save these backup codes in a safe place, you can use them in case you lose access to your OTP app:'
two_factor_code_description_4: 'Test an OTP code from your configured app:' two_factor_code_description_4: 'Test an OTP code from your configured app:'
two_factor_code_description_5: "If you can't see the QR Code or can't scan it, enter the following secret in your app:"
cancel: Cancel cancel: Cancel
enable: Enable enable: Enable
entry: entry:

1
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
View file

@ -209,6 +209,7 @@ config:
two_factor_code_description_2: 'Vous pouvez scanner le code QR avec votre application :' two_factor_code_description_2: 'Vous pouvez scanner le code QR avec votre application :'
two_factor_code_description_3: 'N’oubliez pas de sauvegarder ces codes de secours dans un endroit sûr, vous pourrez les utiliser si vous ne pouvez plus accéder à votre application A2F :' two_factor_code_description_3: 'N’oubliez pas de sauvegarder ces codes de secours dans un endroit sûr, vous pourrez les utiliser si vous ne pouvez plus accéder à votre application A2F :'
two_factor_code_description_4: 'Testez un code généré par votre application A2F :' two_factor_code_description_4: 'Testez un code généré par votre application A2F :'
two_factor_code_description_5: 'Si vous ne voyez pas le code QR ou ne pouvez pas le scanner, saisissez la clé suivante dans votre application :'
cancel: Annuler cancel: Annuler
enable: Activer enable: Activer
entry: entry:

6
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig
View file

@ -20,11 +20,15 @@
document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code }}'); document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code }}');
</script> </script>
</p> </p>
<p>
{{ 'config.otp.app.two_factor_code_description_5'|trans }} <pre>{{ secret }}</pre>
</p>
</li> </li>
<li> <li>
<p>{{ 'config.otp.app.two_factor_code_description_3'|trans }}</p> <p>{{ 'config.otp.app.two_factor_code_description_3'|trans }}</p>
<p><strong>{{ backupCodes|join("\n")|nl2br }}</strong></p> <p><pre>{{ backupCodes|join("\n") }}</pre></p>
</li> </li>
<li> <li>
<p>{{ 'config.otp.app.two_factor_code_description_4'|trans }}</p> <p>{{ 'config.otp.app.two_factor_code_description_4'|trans }}</p>