mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 19:11:07 +00:00
Merge pull request #7006 from wallabag/release/2.6.7
Prepare 2.6.7 release
This commit is contained in:
Jérémy Benoist
GitHub
commit
60623246ae
8 changed files with 77 additions and 67 deletions
11
CHANGELOG.md
11
CHANGELOG.md
|
|
@ -1,5 +1,16 @@
|
|||
# Changelog
|
||||
|
||||
## [2.6.7](https://github.com/wallabag/wallabag/tree/2.6.7)
|
||||
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.6...2.6.7)
|
||||
|
||||
### Security fix
|
||||
* A user can disable her 2FA unintentionally by @kdecherf in https://github.com/wallabag/wallabag/commit/0cfdddc2eb0aee5ffb69bf499d377d75655ba157
|
||||
|
||||
### Fixes
|
||||
* Fix deprecated null tag parameter by @Simounet in https://github.com/wallabag/wallabag/pull/6985
|
||||
* Full clickable card on mass action by @Simounet in https://github.com/wallabag/wallabag/pull/6991
|
||||
* Add tag form submit button always displayed by @Simounet in https://github.com/wallabag/wallabag/pull/6986
|
||||
|
||||
## [2.6.6](https://github.com/wallabag/wallabag/tree/2.6.6)
|
||||
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.5...2.6.6)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
wallabag_core:
|
||||
version: 2.6.6
|
||||
version: 2.6.7
|
||||
paypal_url: "https://liberapay.com/wallabag/donate"
|
||||
languages:
|
||||
en: 'English'
|
||||
|
|
|
|||
12
composer.lock
generated
12
composer.lock
generated
|
|
@ -4604,16 +4604,16 @@
|
|||
},
|
||||
{
|
||||
"name": "j0k3r/graby-site-config",
|
||||
"version": "1.0.176",
|
||||
"version": "1.0.177",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/j0k3r/graby-site-config.git",
|
||||
"reference": "77359be61295e15f08ad503c2ac37af6c9ff464c"
|
||||
"reference": "cce11a0d0ec6fc06cebda65c340fcfb7c63ce78a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/77359be61295e15f08ad503c2ac37af6c9ff464c",
|
||||
"reference": "77359be61295e15f08ad503c2ac37af6c9ff464c",
|
||||
"url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/cce11a0d0ec6fc06cebda65c340fcfb7c63ce78a",
|
||||
"reference": "cce11a0d0ec6fc06cebda65c340fcfb7c63ce78a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -4642,9 +4642,9 @@
|
|||
"description": "Graby site config files",
|
||||
"support": {
|
||||
"issues": "https://github.com/j0k3r/graby-site-config/issues",
|
||||
"source": "https://github.com/j0k3r/graby-site-config/tree/1.0.176"
|
||||
"source": "https://github.com/j0k3r/graby-site-config/tree/1.0.177"
|
||||
},
|
||||
"time": "2023-09-07T07:14:18+00:00"
|
||||
"time": "2023-10-01T02:12:17+00:00"
|
||||
},
|
||||
{
|
||||
"name": "j0k3r/httplug-ssrf-plugin",
|
||||
|
|
|
|||
|
|
@ -62,5 +62,5 @@ parameters:
|
|||
|
||||
-
|
||||
message: "#^Method FOS\\\\UserBundle\\\\Model\\\\UserManagerInterface\\:\\:updateUser()#"
|
||||
count: 7
|
||||
count: 6
|
||||
path: src/Wallabag/CoreBundle/Controller/ConfigController.php
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ class ConfigController extends AbstractController
|
|||
* Cancelling 2FA using OTP app.
|
||||
*
|
||||
* @Route("/config/otp/app/cancel", name="config_otp_app_cancel")
|
||||
*
|
||||
*
|
||||
* XXX: commented until we rewrite 2fa with a real two-steps activation
|
||||
*/
|
||||
/*public function otpAppCancelAction()
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ namespace Wallabag\CoreBundle\Form\Type;
|
|||
|
||||
use FOS\UserBundle\Form\Type\RegistrationFormType;
|
||||
use Symfony\Component\Form\AbstractType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\EmailType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
|
||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||
|
|
|
|||
|
|
@ -210,65 +210,65 @@
|
|||
{{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
|
||||
|
||||
{{ form_widget(form.user._token) }}
|
||||
|
||||
|
||||
{{ form_end(form.user) }}
|
||||
|
||||
<br/>
|
||||
<br/>
|
||||
<div class="row">
|
||||
<h5>{{ 'config.otp.page_title'|trans }}</h5>
|
||||
<br/>
|
||||
<br/>
|
||||
<div class="row">
|
||||
<h5>{{ 'config.otp.page_title'|trans }}</h5>
|
||||
|
||||
<p>{{ 'config.form_user.two_factor_description'|trans }}</p>
|
||||
<p>{{ 'config.form_user.two_factor_description'|trans }}</p>
|
||||
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ 'config.form_user.two_factor.table_method'|trans }}</th>
|
||||
<th>{{ 'config.form_user.two_factor.table_state'|trans }}</th>
|
||||
<th>{{ 'config.form_user.two_factor.table_action'|trans }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ 'config.form_user.two_factor.table_method'|trans }}</th>
|
||||
<th>{{ 'config.form_user.two_factor.table_state'|trans }}</th>
|
||||
<th>{{ 'config.form_user.two_factor.table_action'|trans }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>{{ 'config.form_user.two_factor.emailTwoFactor_label'|trans }}</td>
|
||||
<td>{% if app.user.isEmailTwoFactor %}<b>{{ 'config.form_user.two_factor.state_enabled'|trans }}</b>{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}</td>
|
||||
<td>
|
||||
<form action="{{ path('config_otp_email') }}" method="post" name="config_otp_email">
|
||||
<input type="hidden" name="token" value="{{ csrf_token('otp') }}" />
|
||||
|
||||
<button class="waves-effect waves-light btn{% if app.user.isEmailTwoFactor %} disabled{% endif %}" type="submit">{{ 'config.form_user.two_factor.action_email'|trans }}</button>
|
||||
</form>
|
||||
{% if app.user.isEmailTwoFactor %}
|
||||
<form action="{{ path('disable_otp_email') }}" method="post" name="disable_otp_email">
|
||||
<input type="hidden" name="token" value="{{ csrf_token('otp') }}" />
|
||||
|
||||
<button class="waves-effect waves-light btn red" type="submit">Disable</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ 'config.form_user.two_factor.googleTwoFactor_label'|trans }}</td>
|
||||
<td>{% if app.user.isGoogleTwoFactor %}<b>{{ 'config.form_user.two_factor.state_enabled'|trans }}</b>{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}</td>
|
||||
<td>
|
||||
<form action="{{ path('config_otp_app') }}" method="post" name="config_otp_app">
|
||||
<input type="hidden" name="token" value="{{ csrf_token('otp') }}" />
|
||||
|
||||
<button class="waves-effect waves-light btn{% if app.user.isGoogleTwoFactor %} disabled{% endif %}" type="submit">{{ 'config.form_user.two_factor.action_app'|trans }}</button>
|
||||
</form>
|
||||
{% if app.user.isGoogleTwoFactor %}
|
||||
<form action="{{ path('disable_otp_app') }}" method="post" name="disable_otp_app">
|
||||
<input type="hidden" name="token" value="{{ csrf_token('otp') }}" />
|
||||
|
||||
<button class="waves-effect waves-light btn red" type="submit">Disable</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>{{ 'config.form_user.two_factor.emailTwoFactor_label'|trans }}</td>
|
||||
<td>{% if app.user.isEmailTwoFactor %}<b>{{ 'config.form_user.two_factor.state_enabled'|trans }}</b>{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}</td>
|
||||
<td>
|
||||
<form action="{{ path('config_otp_email') }}" method="post" name="config_otp_email">
|
||||
<input type="hidden" name="token" value="{{ csrf_token('otp') }}" />
|
||||
|
||||
<button class="waves-effect waves-light btn{% if app.user.isEmailTwoFactor %} disabled{% endif %}" type="submit">{{ 'config.form_user.two_factor.action_email'|trans }}</button>
|
||||
</form>
|
||||
{% if app.user.isEmailTwoFactor %}
|
||||
<form action="{{ path('disable_otp_email') }}" method="post" name="disable_otp_email">
|
||||
<input type="hidden" name="token" value="{{ csrf_token('otp') }}" />
|
||||
|
||||
<button class="waves-effect waves-light btn red" type="submit">Disable</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ 'config.form_user.two_factor.googleTwoFactor_label'|trans }}</td>
|
||||
<td>{% if app.user.isGoogleTwoFactor %}<b>{{ 'config.form_user.two_factor.state_enabled'|trans }}</b>{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}</td>
|
||||
<td>
|
||||
<form action="{{ path('config_otp_app') }}" method="post" name="config_otp_app">
|
||||
<input type="hidden" name="token" value="{{ csrf_token('otp') }}" />
|
||||
|
||||
<button class="waves-effect waves-light btn{% if app.user.isGoogleTwoFactor %} disabled{% endif %}" type="submit">{{ 'config.form_user.two_factor.action_app'|trans }}</button>
|
||||
</form>
|
||||
{% if app.user.isGoogleTwoFactor %}
|
||||
<form action="{{ path('disable_otp_app') }}" method="post" name="disable_otp_app">
|
||||
<input type="hidden" name="token" value="{{ csrf_token('otp') }}" />
|
||||
|
||||
<button class="waves-effect waves-light btn red" type="submit">Disable</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="set4" class="col s12">
|
||||
|
|
|
|||
|
|
@ -1215,7 +1215,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
|||
$client->submit($form);
|
||||
|
||||
$this->assertSame(302, $client->getResponse()->getStatusCode());
|
||||
|
||||
|
||||
$this->assertStringContainsString('flashes.config.notice.otp_disabled', $client->getContainer()->get(SessionInterface::class)->getFlashBag()->get('notice')[0]);
|
||||
|
||||
// restore user
|
||||
|
|
@ -1264,7 +1264,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
|||
->getRepository(User::class)
|
||||
->findOneByUsername('admin');
|
||||
|
||||
$user->setGoogleAuthenticatorSecret("Google2FA");
|
||||
$user->setGoogleAuthenticatorSecret('Google2FA');
|
||||
$em->persist($user);
|
||||
$em->flush();
|
||||
|
||||
|
|
@ -1274,7 +1274,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
|||
$client->submit($form);
|
||||
|
||||
$this->assertSame(302, $client->getResponse()->getStatusCode());
|
||||
|
||||
|
||||
$this->assertStringContainsString('flashes.config.notice.otp_disabled', $client->getContainer()->get(SessionInterface::class)->getFlashBag()->get('notice')[0]);
|
||||
|
||||
// restore user
|
||||
|
|
|
|||
Loading…
Reference in a new issue