Whitelist Auth0 IPs by default and show in wp-admin #596
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joshcanhelp
changed the title
joshcanhelp
commented
Dec 1, 2018
| @@ -81,17 +81,6 @@ public function install_db( $version_to_install = null, $app_token = '' ) { | |||
| } | |||
| } | |||
|
|
|||
| if ( $this->current_db_version < 13 ) { | |||
There was a problem hiding this comment.
This migration is handled in v20 added below.
joshcanhelp
commented
Dec 1, 2018
| public function get_ips_by_domain( $domain ) { | ||
| return $this->get_ip_by_region( WP_Auth0::get_tenant_region( $domain ) ); | ||
| public function get_ips_by_domain( $domain = null, $glue = self::IP_STRING_GLUE ) { | ||
| if ( empty( $domain ) ) { |
There was a problem hiding this comment.
Default to current domain if none passed in.
joshcanhelp
commented
Dec 1, 2018
| * | ||
| * @return string | ||
| */ | ||
| public function get_ip_by_region( $region ) { | ||
| return implode( ',', $this->valid_webtask_ips[ $region ] ); | ||
| public function get_ip_by_region( $region, $glue = self::IP_STRING_GLUE ) { |
There was a problem hiding this comment.
Allow the glue to be customized.
joshcanhelp
commented
Dec 1, 2018
| } | ||
|
|
||
| return null; |
There was a problem hiding this comment.
Unreachable return line.
joshcanhelp
commented
Dec 1, 2018
| protected function process_ip_list( $ip_list ) { | ||
| $raw = explode( ',', $ip_list ); | ||
| $raw = is_array( $ip_list ) ? $ip_list : explode( self::IP_STRING_GLUE, $ip_list ); |
There was a problem hiding this comment.
Allow array and string
joshcanhelp
commented
Dec 1, 2018
| return true; | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| /** |
There was a problem hiding this comment.
Only moved and docblocks added, no functionality change.
joshcanhelp
commented
Dec 1, 2018
| @@ -182,14 +252,11 @@ private function validate_ip() { | |||
| return false; | |||
| } | |||
|
|
|||
| private function in_range( $ip, $range ) { | |||
joshcanhelp
commented
Dec 1, 2018
| @@ -105,7 +105,7 @@ public function init() { | |||
| 'function' => 'render_migration_ws_ips_filter', | |||
| ), | |||
| array( | |||
| 'name' => __( 'IP Addresses', 'wp-auth0' ), | |||
There was a problem hiding this comment.
Remove unnecessary label for this field (see screenshot)
joshcanhelp
commented
Dec 1, 2018
| @@ -231,7 +231,8 @@ protected function render_radio_buttons( array $buttons, $id, $input_name, $curr | |||
| * @param string $text - description text to display | |||
| */ | |||
| protected function render_field_description( $text ) { | |||
| printf( '<div class="subelement"><span class="description">%s.</span></div>', $text ); | |||
| $period = ! in_array( $text[ strlen( $text ) - 1 ], array( '.', ':', '>' ) ) ? '.' : ''; | |||
There was a problem hiding this comment.
Do not add a period if the final char is a period, colon, or open angle bracket
cocojoe
previously approved these changes
Dec 6, 2018
| } | ||
| } | ||
|
|
||
| /** | ||
| * Test a DB upgrade from v19 to v20. |
joshcanhelp
force-pushed
the
fix-migration-ip-filter
branch
from
b6e5e5d to
cd29681
Compare
Codecov Report
@@ Coverage Diff @@
## master #596 +/- ##
===========================================
+ Coverage 28.56% 29.87% +1.3%
+ Complexity 1309 1305 -4
===========================================
Files 52 52
Lines 4201 4178 -23
===========================================
+ Hits 1200 1248 +48
+ Misses 3001 2930 -71
Continue to review full report at Codecov.
|
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
References
Setting shows default IPs
Testing
Checklist