Add/jetpack protect #1501

roccotripaldi · 2015-01-15T16:39:05Z

No description provided.

Adding a function to get the jetpack blog id, or the jetpack blog id of the main blog in a network.

For the duration of development, i'll be using my .com sandbox for obtaining a jetpack protect key.

Adding some params to our request to .com for an api key. Sending them the blog id ( or the blog id of the main blog in the network ), the bruteprotect api key ( if one exists ), and the number of sites in their network.

Adding an endpoint to get the whitelist. The whitelist will be stored as a site option. This allows us, if we are on multisite, to have one option that applies to the entire network.

Added a new POST endpoint for updating a site's protect whitelist. I still need to add some IP Address validation.

Adding proper parameters to the validate_input method. It needs to match the parent class in order to jibe with Travis CI.

in a previous commit, i changed the api base to my dotcom sandbox. i realize that it is not a good practice, so i'm changing it back. from now on i'll do this in wp-config.php

On activation, if we can't find the main blog id, that means we are on multisite, and the main blog hasn't connected to Jetpack. If this is the case, we will bail on getting the protect api key. since there will be cases where getting the protect api key will fail, we'll need to make a configuration page for this module that will give more information, and give them a chance to retry. the next commits will focus on the config page.

Getting an api key for protect is now in its own function.

adding in some more error checking and saving the api key to a site option.

I'm adding the standard configuration logic to the module so we can ensure that they received an api key and their site is protected. If there was an error getting their api key, they'll be able to use the configuration screen to retry.

I've decided that I do not want to automatiaclly deactivate bruteprotect when Protect is activated. There's a small chance there could be an error while generating a key for Protect, in which case the site could be without protection. I'm going to build some custom logic for deactivating bruteprotect.

moving the config ui to it's own file as it's about to grow a bit

On the protect config page, adding some javascript functionallity to the whitelist management form

georgestephanis · 2015-01-15T17:22:01Z

@roccotripaldi: I'm seeing a lot of JSHint errors on protect.js -- you can check by running grunt jshint on your branch to see them.

They're all mostly trivial (I think nearly all are just using doublequote strings instead of singlequote), but should be tidied before merging.

Running "jshint:src" (jshint) task

   modules/protect/protect.js
      6 |    jQuery( "#editable-whitelist").on( "click", ".delete-ip-address", function() {
                                          ^ Strings must use singlequote.
      6 |    jQuery( "#editable-whitelist").on( "click", ".delete-ip-address", function() {
                                                       ^ Strings must use singlequote.
      6 |    jQuery( "#editable-whitelist").on( "click", ".delete-ip-address", function() {
                                                                             ^ Strings must use singlequote.
      7 |        var id = jQuery( this).data( "id" );
                                                  ^ Strings must use singlequote.
      8 |        jQuery("#editable-whitelist #row-" + id).detach();
                                                   ^ Strings must use singlequote.
     12 |    jQuery( ".ip-add" ).click( function() {
                              ^ Strings must use singlequote.
     13 |        var template = jQuery( this).data( "template" );
                                                              ^ Strings must use singlequote.
     14 |        var row = _.template(
                     ^ Too many var statements.
     15 |            jQuery("script." + template ).html()
                                     ^ Strings must use singlequote.
     17 |        jQuery( ".editable-whitelist-rows").append( row( { id : "new" + whitelist_item_index } ) );
                                                   ^ Strings must use singlequote.
     17 |        jQuery( ".editable-whitelist-rows").append( row( { id : "new" + whitelist_item_index } ) );
                                                                              ^ Strings must use singlequote.
     24 |    jQuery( "#whitelist-save-button" ).removeAttr( "disabled" );
                                             ^ Strings must use singlequote.
     24 |    jQuery( "#whitelist-save-button" ).removeAttr( "disabled" );
                                                                      ^ Strings must use singlequote.
      3 |function protectInit() {
                             ^ 'protectInit' is defined but never used.

>> 14 errors in 52 files
Warning: Task "jshint:src" failed. Used --force, continuing.

Done, but with warnings.

adding a way to pre-popluate your site with a placeholder whitelist. This will allow jeff golenski to have some stuff to style!

roccotripaldi · 2015-01-16T01:31:55Z

+1 George. Thanks for catching that.

Copied blocking mechanisms from the BruteProtect plugin, and refactored them into the Protect module.

We need to de-increment available attempts if user proved humanity through math

get_ip() will be needed by both the module and the endpoint

…nto add/jetpack-protect Conflicts: modules/protect.php

now that we've moved the get_ip function out of a class, we need to re-structure it.

I'd like to include the current user's ip in the endpoint response. Also fixing a translation string.

Styled whitelist config textarea

…nto add/jetpack-protect

another text area adjustment

Loading widget styles only on initial dashboard, rather than all admin pages.

@jeherve

thanks @jeherve for the tip

…nto add/jetpack-protect

Link to wordpress.com to enable file scanning

Conflicts: css/jetpack-admin-rtl.css css/jetpack-admin-rtl.min.css css/jetpack-admin.css.map css/jetpack-admin.min.css css/jetpack-admin.min.css.map css/jetpack-rtl.css css/jetpack.css

Let's use a site_option for 'jetpack_file_scanning_enabled' and 'jetpack_protect_blocked_attempts' because they will apply to the entire network on multisite installs

…nto add/jetpack-protect

removing inline styles from config_ui.php, added to protect css. (grunt added new styles, not sure exactly what they are)

Adding a conditional notification that tells user if the protect module is configured properly.

…nto add/jetpack-protect

Add/jetpack protect

roccotripaldi added 21 commits December 30, 2014 17:27

Adding the base class for the Jetpack Protect Module

0996960

Protect Module: Deactivate BruteProtect on activation

c847f4b

Protect Module: new function

b379a10

Adding a function to get the jetpack blog id, or the jetpack blog id of the main blog in a network.

Jepack API Base

9e1515c

For the duration of development, i'll be using my .com sandbox for obtaining a jetpack protect key.

Protect Module: .com request

5f8315f

Adding some params to our request to .com for an api key. Sending them the blog id ( or the blog id of the main blog in the network ), the bruteprotect api key ( if one exists ), and the number of sites in their network.

Jetpack Protect: New endpoint

7dbb410

Adding an endpoint to get the whitelist. The whitelist will be stored as a site option. This allows us, if we are on multisite, to have one option that applies to the entire network.

Jetpack Protect: New Endpoint

6048f1b

Added a new POST endpoint for updating a site's protect whitelist. I still need to add some IP Address validation.

Jetpack Protect: Whitelist Endpoint

d0c4b25

Adding proper parameters to the validate_input method. It needs to match the parent class in order to jibe with Travis CI.

Changing JETPACK__API_BASE

342ac89

in a previous commit, i changed the api base to my dotcom sandbox. i realize that it is not a good practice, so i'm changing it back. from now on i'll do this in wp-config.php

Fixing incorrect jetpack_api_base

9e5ecfa

Protect Module: new function

5963ec2

Getting an api key for protect is now in its own function.

Protect Module: save api key

b2925d2

adding in some more error checking and saving the api key to a site option.

Jetpack Protect: adding configuration logic

1b43fa7

I'm adding the standard configuration logic to the module so we can ensure that they received an api key and their site is protected. If there was an error getting their api key, they'll be able to use the configuration screen to retry.

Protect Module: adding some helpful code comments

35896bb

Protect Module: disable BP on succesful key

3ce56c0

Protect Module: configuration ui

5a86ead

moving the config ui to it's own file as it's about to grow a bit

Jetpack Protect: adding whitelist form to the config page

3946ffc

Protect Module: whitelist javascript

7bd0f06

On the protect config page, adding some javascript functionallity to the whitelist management form

Protect Module: validating and saving whitelist

5624fdd

georgestephanis added the [Status] In Progress label Jan 15, 2015

Protect Module: removing an oops!

27c40cc

jeherve added [Feature] Protect Also known as Brute Force Attack Protection [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it labels Jan 15, 2015

jeherve added this to the 3.4 milestone Jan 15, 2015

Protect Module: Adding a debug tool

22b4c80

adding a way to pre-popluate your site with a placeholder whitelist. This will allow jeff golenski to have some stuff to style!

Protect Module: Adding blocking mechanisms

09152ea

Copied blocking mechanisms from the BruteProtect plugin, and refactored them into the Protect module.

samhotchkiss and others added 26 commits January 30, 2015 13:32

fix function name

ffc2137

change namespacing to use jpp, not brute

fb0fe35

reduce available attempts

38e042d

We need to de-increment available attempts if user proved humanity through math

Protect Module: moving get_ip() to shared functions

24d5953

get_ip() will be needed by both the module and the endpoint

Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…

e575110

…nto add/jetpack-protect Conflicts: modules/protect.php

Protect Module: fixing structure of get_ip function

aa64d9c

now that we've moved the get_ip function out of a class, we need to re-structure it.

Protect Module: moving IP is private to shared functions

a21dab2

Protect Module: adding a field to the whitelist endpoint response

7fa8c11

I'd like to include the current user's ip in the endpoint response. Also fixing a translation string.

Styled whitelist config textarea

60a072b

Styled whitelist config textarea

Protect Module: Improving translation strings

cf28c77

Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…

6e2c0e3

…nto add/jetpack-protect

another text area adjustment

96ab61e

another text area adjustment

Loading widget styles only on dashboard setup

1e45cda

Loading widget styles only on initial dashboard, rather than all admin pages.

Protect Module: Improving translation wrapping

9b44ff3

thanks @jeherve for the tip

Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…

7614b46

…nto add/jetpack-protect

Minor verbiage/whitespace/docs edits

68b0bfa

remove completed TODOs

9c62c18

prep widget for i11n

ba8958f

Protect Module: adding link to dashboard widget

75a700b

Link to wordpress.com to enable file scanning

Merge branch 'master' into add/jetpack-protect

9ab2ec6

Conflicts: css/jetpack-admin-rtl.css css/jetpack-admin-rtl.min.css css/jetpack-admin.css.map css/jetpack-admin.min.css css/jetpack-admin.min.css.map css/jetpack-rtl.css css/jetpack.css

Protect Module: using site_option

cc2f341

Let's use a site_option for 'jetpack_file_scanning_enabled' and 'jetpack_protect_blocked_attempts' because they will apply to the entire network on multisite installs

Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…

81b3158

…nto add/jetpack-protect

removing inline styles fron config page

cca0eb3

removing inline styles from config_ui.php, added to protect css. (grunt added new styles, not sure exactly what they are)

Protect Module: dashboard widget notification

987cb4b

Adding a conditional notification that tells user if the protect module is configured properly.

Merge branch 'add/jetpack-protect' of github.com:Automattic/jetpack i…

f4eca85

…nto add/jetpack-protect

Protect Module: don't need user_ip in the whitelist endpoint

ce8579e

samhotchkiss added a commit that referenced this pull request Feb 2, 2015

Merge pull request #1501 from Automattic/add/jetpack-protect

4773a7f

Add/jetpack protect

samhotchkiss merged commit 4773a7f into master Feb 2, 2015

kraftbj removed the [Status] In Progress label Apr 9, 2015

samhotchkiss deleted the add/jetpack-protect branch April 15, 2015 12:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add/jetpack protect #1501

Add/jetpack protect #1501

roccotripaldi commented Jan 15, 2015

georgestephanis commented Jan 15, 2015

roccotripaldi commented Jan 16, 2015

Add/jetpack protect #1501

Add/jetpack protect #1501

Conversation

roccotripaldi commented Jan 15, 2015

georgestephanis commented Jan 15, 2015

roccotripaldi commented Jan 16, 2015