Enable 2FA by default #1213

joshbetz · 2019-04-11T20:08:31Z

Enables two-factor by default and requires it for anyone with edit_posts capabilities.

Deploy Notes

We need to deploy a fix to two-factor that lets it work with Jetpack SSO: WordPress/two-factor#276 / #1214

Testing

Load this PR on a sandbox.
You may need to comment out the line that disables this for proxied users.
See that most of the sidebar options are gone except for Profile.
Enable two-factor in your profile.
See that sidebar options are back as expected.

joshbetz · 2019-04-11T20:57:55Z

We should just need Automattic/jetpack#12029 to make this all work.

joshbetz · 2019-04-12T15:54:30Z

Instead of the previous Jetpack PR, we need WordPress/two-factor#276 / #1214

two-factor.php

joshbetz · 2019-04-22T14:56:29Z

I'm thinking we get this deployed with wpcom_vip_force_two_factor defaulting to false for now. So, nobody is locked out, but you can still enable 2FA or opt-in to force it on your site.

Then we announce via the lobby that you can filter that now to force 2FA for any users you want and starting some time in the future (maybe 1 month from now?) we will default it for all users that can edit posts.

mjangda

Spotted a couple of minor things.

two-factor.php

mjangda · 2019-04-23T06:59:52Z

We'll want to test this out with the following scenarios:

Applications using the Jetpack Force 2fa plugin
Applications using the force 2fa setting in Jetpack
Applications manually enabling two-factor and our filter

two-factor.php

The only caps a restricted user needs are `read` and `edit_user` (only for theirself).

The issue in question has been fixed, so U2F should be safe to use now.

Co-Authored-By: joshbetz <[email protected]>

…or clarity

If we call current_user_can inside map_map_cap, we create a callback loop. By calling it outside, we avoid that issue.

Before this date, we just output an admin notice to users that will need to enable 2FA. The logic to display the date got a little complex, but ensuring the notice is in their local timezone is worth it. After the date specified, the admin notice switches to say 2FA is required and only the most basic functions are available. This is a date that's a month from now in the middle-ish of the day in the middle of the week (so plenty of support will be around in case there are questions).

joshbetz · 2019-04-23T20:46:09Z

In 1f8dc49 we time gate forcing for everyone with edit_posts after Thursday, May 23, 2019 at 18:00 UTC / 2 PM ET. Happy to change that date and time as necessary.

joshbetz · 2019-04-23T20:46:59Z

Whatever date we decide, we should set up a couple Slack reminders :)

This allows clients to override the time gate and force two factor at any time. Previously two factor could only be force enabled after the date specified.

If the timezone string is not set, use UTC as a backup.

joshbetz · 2019-04-24T15:57:42Z

Tested variations sites that are manually loading two-factor and our filter.

wpcom_vip_load_plugin( 'two-factor' );
add_action( 'muplugins_loaded', 'wpcom_enable_two_factor_plugin' );

Also, sites that load another copy of two-factor in the admin.

I didn't experience any issues. The sites I tested on a sandbox transparently switched to our version of two-factor and showed the admin notice as expected.

joshbetz · 2019-04-24T16:06:40Z

Also tested sites with jetpack-force-2fa enabled, the require two-step setting in Jetpack, and both at the same time.

joshbetz · 2019-04-24T16:11:34Z

@mjangda I think we should be all set here as long as we're OK with May 23 @ 1800 UTC for forcing 2FA for everyone.

``` Notice: wp_register_script was called incorrectly. Scripts and styles should not be registered or enqueued until the wp_enqueue_scripts, admin_enqueue_scripts, or login_enqueue_scripts hooks. ```

two-factor.php

https://codex.wordpress.org/Roles_and_Capabilities#User_Levels Co-Authored-By: joshbetz <[email protected]>

Make the message more prominent, consistent, and add more context.

mjangda · 2019-04-26T20:40:24Z

Only blocker now is being able to link directly to the "Two-Factor Options". Everything else is good to go.

mjangda

👍 🎉 🎂

mjangda · 2019-04-26T20:51:09Z

To be deployed on Tuesday.

joshbetz · 2019-04-30T20:04:59Z

r138198-deploy

joshbetz added the [Status] In Progress label Apr 11, 2019

joshbetz commented Apr 12, 2019

View reviewed changes

two-factor.php Outdated Show resolved Hide resolved

joshbetz marked this pull request as ready for review April 12, 2019 16:55

joshbetz added [Status] Needs Review and removed [Status] In Progress labels Apr 12, 2019

mjangda requested changes Apr 23, 2019

View reviewed changes

two-factor.php Outdated Show resolved Hide resolved

two-factor.php Outdated Show resolved Hide resolved

two-factor.php Outdated Show resolved Hide resolved

two-factor.php Show resolved Hide resolved

mjangda reviewed Apr 23, 2019

View reviewed changes

two-factor.php Outdated Show resolved Hide resolved

joshbetz and others added 6 commits April 23, 2019 14:33

Enable 2FA by default

fba68dc

More limited caps for restricted users

7b887fa

The only caps a restricted user needs are `read` and `edit_user` (only for theirself).

Allow U2F

068812d

The issue in question has been fixed, so U2F should be safe to use now.

lint

5fd2aaa

Rename contributor_caps to subscriber_caps

c351bcf

Co-Authored-By: joshbetz <[email protected]>

Rename wpcom_vip_force_two_factor to wpcom_vip_is_two_factor_forced f…

8bfe566

…or clarity

joshbetz force-pushed the update/enforce-2fa branch from a831d3b to 8bfe566 Compare April 23, 2019 19:33

joshbetz added 2 commits April 23, 2019 20:39

Set the 2FA capability outside map_meta_cap

c66a3df

If we call current_user_can inside map_map_cap, we create a callback loop. By calling it outside, we avoid that issue.

joshbetz added 2 commits April 24, 2019 13:27

Fix time gate

5b00e15

This allows clients to override the time gate and force two factor at any time. Previously two factor could only be force enabled after the date specified.

Use UTC as the default timezone

030f080

If the timezone string is not set, use UTC as a backup.

Disable U2F due to PHP notices

6702094

``` Notice: wp_register_script was called incorrectly. Scripts and styles should not be registered or enqueued until the wp_enqueue_scripts, admin_enqueue_scripts, or login_enqueue_scripts hooks. ```

mjangda reviewed Apr 26, 2019

View reviewed changes

two-factor.php Show resolved Hide resolved

two-factor.php Show resolved Hide resolved

two-factor.php Show resolved Hide resolved

two-factor.php Outdated Show resolved Hide resolved

Allow level_0 for logged in users

8c007fe

https://codex.wordpress.org/Roles_and_Capabilities#User_Levels Co-Authored-By: joshbetz <[email protected]>

Better warnings / errors

dd49167

Make the message more prominent, consistent, and add more context.

Link directly to Two-Factor Options

c7f35ab

mjangda approved these changes Apr 26, 2019

View reviewed changes

mjangda added [Status] Ready to Deploy and removed [Status] Needs Review labels Apr 26, 2019

joshbetz merged commit 652461b into master Apr 30, 2019

joshbetz deleted the update/enforce-2fa branch April 30, 2019 13:23

joshbetz added [Status] Deployed to production and removed [Status] Ready to Deploy labels Apr 30, 2019

mjangda mentioned this pull request May 1, 2019

Restore accidentally revert submodules #1232

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable 2FA by default #1213

Enable 2FA by default #1213

joshbetz commented Apr 11, 2019 •

edited by mjangda

Loading

joshbetz commented Apr 11, 2019

joshbetz commented Apr 12, 2019 •

edited by mjangda

Loading

joshbetz commented Apr 22, 2019

mjangda left a comment

mjangda commented Apr 23, 2019 •

edited by joshbetz

Loading

joshbetz commented Apr 23, 2019

joshbetz commented Apr 23, 2019

joshbetz commented Apr 24, 2019

joshbetz commented Apr 24, 2019

joshbetz commented Apr 24, 2019

mjangda commented Apr 26, 2019

mjangda left a comment

mjangda commented Apr 26, 2019

joshbetz commented Apr 30, 2019

Enable 2FA by default #1213

Enable 2FA by default #1213

Conversation

joshbetz commented Apr 11, 2019 • edited by mjangda Loading

Deploy Notes

Testing

joshbetz commented Apr 11, 2019

joshbetz commented Apr 12, 2019 • edited by mjangda Loading

joshbetz commented Apr 22, 2019

mjangda left a comment

Choose a reason for hiding this comment

mjangda commented Apr 23, 2019 • edited by joshbetz Loading

joshbetz commented Apr 23, 2019

joshbetz commented Apr 23, 2019

joshbetz commented Apr 24, 2019

joshbetz commented Apr 24, 2019

joshbetz commented Apr 24, 2019

mjangda commented Apr 26, 2019

mjangda left a comment

Choose a reason for hiding this comment

mjangda commented Apr 26, 2019

joshbetz commented Apr 30, 2019

joshbetz commented Apr 11, 2019 •

edited by mjangda

Loading

joshbetz commented Apr 12, 2019 •

edited by mjangda

Loading

mjangda commented Apr 23, 2019 •

edited by joshbetz

Loading