Merge branch 'master' into update/fix_validate_content_warning

Automattic · Feb 18, 2021 · efb76a5 · efb76a5
2 parents 5fc54c8 + 5dd0185
commit efb76a5
Show file tree

Hide file tree

Showing 5 changed files with 402 additions and 2 deletions.
diff --git a/000-vip-init.php b/000-vip-init.php
@@ -185,6 +185,7 @@
 // Load WP_CLI helpers
 if ( defined( 'WP_CLI' ) && WP_CLI ) {
 	require_once( __DIR__ . '/vip-helpers/vip-wp-cli.php' );
+	require_once( __DIR__ . '/vip-helpers/class-vip-backup-user-role-cli.php' );
 }
 
 // Load elasticsearch helpers
@@ -224,7 +225,7 @@
 
 	// VIP sites should not be set as staging in Jetpack
 	// since it breaks SSO and prevents data from being passed to
-	// WordPress.com 
+	// WordPress.com
 	add_filter( 'jetpack_is_staging_site', '__return_false' );
 }
 

diff --git a/blogpublic-notice.php b/blogpublic-notice.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Automattic\VIP\Blog_Public;
+
+if ( 'production' === VIP_GO_APP_ENVIRONMENT ) {
+	return;
+}
+
+/**
+ * Notice for blog_public value
+ */
+function notice( $wp_admin_bar ) {
+	$home_url_parsed = parse_url( home_url() );
+	if (
+		! current_user_can( 'manage_options' ) ||
+		get_option( 'blogpublic_notice_dismissed', false ) ||
+		! get_option( 'blog_public' ) ||
+		wp_endswith( $home_url_parsed['host'], '.go-vip.co' ) ||
+		wp_endswith( $home_url_parsed['host'], '.go-vip.net' )
+	) {
+		return;
+	}
+
+	printf(
+		'<div id="blogpublic-notice" class="notice notice-warning is-dismissible"><p>Your site may be discoverable by search engines. You can change this in <a href="%s">Reading Settings</a>, under <strong>Search Engine Visibility</strong>.</p></div>',
+		esc_url( admin_url( 'options-reading.php' ) )
+	);
+	add_action( 'admin_footer', __NAMESPACE__ . '\dismiss_handler' );
+}
+add_action( 'admin_notices', __NAMESPACE__ . '\notice' );
+
+/**
+ * JS to handle the dismiss button in the notice
+ */
+function dismiss_handler() {
+	?>
+	<script>
+	jQuery('#blogpublic-notice').on('click', 'button', function() {
+		jQuery.ajax( ajaxurl, {
+			data : {
+				action:'blogpublic_notice_dismiss'
+			},
+			dataType: 'json',
+			success: function(data) {
+			},
+			error: function( data ) {
+			}
+		} );
+
+	});
+	</script>
+	<?php
+}
+
+/**
+ * Ajax callback for dismiss button
+ */
+function dismiss_callback() {
+	if ( current_user_can( 'manage_options' ) ) {
+		update_option( 'blogpublic_notice_dismissed', true, 'no' );
+		wp_send_json_success();
+	}
+	wp_send_json_error();
+}
+add_action( 'wp_ajax_blogpublic_notice_dismiss', __NAMESPACE__ . '\dismiss_callback' );
+
+/**
+ * If blog_public is being updated to 1
+ * remove 'dismiss' flag to reshow the notice
+ */
+function reset_notice_dismissal( $old_value, $value, $option ) {
+	if ( ( '0' === $old_value || 0 === $old_value ) && 1 === $value ) {
+		delete_option( 'blogpublic_notice_dismissed' );
+	}
+}
+add_action( 'update_option_blog_public', __NAMESPACE__ . '\reset_notice_dismissal', 10, 3 );
diff --git a/search/includes/classes/queue/class-cron.php b/search/includes/classes/queue/class-cron.php
@@ -74,7 +74,6 @@ public function init() {
 			add_action( 'wp_loaded', [ $this, 'schedule_sweeper_job' ], 0 );
 		} else {
 			add_action( 'admin_init', [ $this, 'schedule_sweeper_job' ], 0 );
-			add_action( 'rest_api_init', [ $this, 'schedule_sweeper_job' ], 0 );
 		}
 	}
 

diff --git a/vip-helpers/class-vip-backup-user-role-cli.php b/vip-helpers/class-vip-backup-user-role-cli.php
@@ -0,0 +1,297 @@
+<?php
+
+/**
+ * VIP Backup User Roles CLI
+
+ * @package wp-cli
+ */
+class VIP_Backup_User_Role_CLI extends \WPCOM_VIP_CLI_Command {
+
+	/**
+	 * List Available Backups
+	 *
+	 * ## OPTIONS
+	 *
+	 * [--format=<format>]
+	 * : The serialization format for the value. total_bytes displays the total size of matching options in bytes.
+	 * ---
+	 * default: table
+	 * options:
+	 *   - table
+	 *   - json
+	 *   - csv
+	 *   - count
+	 *   - yaml
+	 *
+	 * @subcommand list
+	 */
+	public function list_( $args, $assoc_args ) {
+
+		$backup_roles = get_option( 'vip_backup_user_roles', [] );
+		$backup_roles = array_reverse( $backup_roles, true );
+
+		$data = [];
+
+		foreach ( $backup_roles as $time => $roles ) {
+			$data[] = [
+				'time_key'   => $time,
+				'time_h'     => gmdate( 'Y-m-d H:i:s', $time ),
+				'num_roles'  => count( $roles ),
+				'role_names' => implode( ', ', array_keys( $roles ) ),
+			];
+		}
+
+		$formatter = new \WP_CLI\Formatter( $assoc_args, [ 'time_key', 'time_h', 'num_roles', 'role_names' ], 'role_backups' );
+		$formatter->display_items( $data );
+
+	}
+
+	/**
+	 * View Specific Backup
+	 *
+	 * ## OPTIONS
+	 *
+	 * [<time_key>]
+	 * : See `vip role-backup list`. Defaults to latest
+	 *
+	 * [--names-only]
+	 * : Get value in a particular format.
+	 *
+	 * [--format=<format>]
+	 * : Get value in a particular format.
+	 * ---
+	 * default: var_export
+	 * options:
+	 *   - var_export
+	 *   - json
+	 *   - yaml
+	 * ---
+	 *
+	 */
+	public function view( $args, $assoc_args ) {
+
+		$key = $args[0] ?? 'latest';
+		$names_only = WP_CLI\Utils\get_flag_value(
+			$assoc_args,
+			'names-only',
+			false
+		);
+		$backup_roles = get_option( 'vip_backup_user_roles', [] );
+
+		if ( 'latest' === $key ) {
+			$backup = array_pop( $backup_roles );
+		} else {
+			if ( isset( $backup_roles[ $key ] ) ) {
+				$backup = $backup_roles[ $key ];
+			} else {
+				\WP_CLI::error( 'Specified backup time_key not found.' );
+			}
+		}
+
+		if ( $names_only ) {
+			$backup = array_keys( $backup );
+		}
+
+		\WP_CLI::print_value( $backup, $assoc_args );
+
+	}
+
+	/**
+	 * Restore A Backup
+	 *
+	 * ## OPTIONS
+	 *
+	 * [<time_key>]
+	 * : See `vip role-backup list`. Defaults to latest
+	 *
+	 * [--diff]
+	 * : Show more diff
+	 *
+	 * [--yes]
+	 * : Skip confirmation prompt
+	 */
+	public function restore( $args, $assoc_args ) {
+
+		global $wpdb;
+		$key = $args[0] ?? 'latest';
+		$show_diff = WP_CLI\Utils\get_flag_value(
+			$assoc_args,
+			'diff',
+			false
+		);
+
+		$backup_roles = get_option( 'vip_backup_user_roles', [] );
+
+		if ( 'latest' === $key ) {
+			$date   = gmdate( 'Y-m-d H:i:s', array_key_last( $backup_roles ) );
+			$backup = array_pop( $backup_roles );
+		} else {
+			if ( isset( $backup_roles[ $key ] ) ) {
+				$date   = gmdate( 'Y-m-d H:i:s', $key );
+				$backup = $backup_roles[ $key ];
+			} else {
+				\WP_CLI::error( 'Specified backup time_key not found.' );
+			}
+		}
+
+		$current_roles = get_option( $wpdb->prefix . 'user_roles' );
+
+		if ( $current_roles === $backup ) {
+			WP_CLI::log( 'Selected backup matches existing roles.' );
+			exit;
+		}
+
+		$current_roles_count_caps = [];
+		$backup_count_caps        = [];
+
+		foreach ( $current_roles as $name => $role ) {
+			$current_roles_count_caps[] = sprintf( '%s (%d)', $name, count( $role['capabilities'] ) );
+		}
+
+
+		foreach ( $backup as $name => $role ) {
+			$backup_count_caps[] = sprintf( '%s (%d)', $name, count( $role['capabilities'] ) );
+		}
+
+		\WP_CLI::log(
+			\WP_CLI::colorize(
+				'%WNumber of caps per role shown in parentheses%n'
+			)
+		);
+
+		\WP_CLI::log(
+			\WP_CLI::colorize(
+				sprintf( '%%bCurrent roles: %%n %s', implode( ', ', $current_roles_count_caps ) )
+			)
+		);
+
+		\WP_CLI::log(
+			\WP_CLI::colorize(
+				sprintf( '%%mNew roles [%s]: %%n %s',
+					$date,
+					implode( ', ', $backup_count_caps )
+				)
+			)
+		);
+
+		if ( $show_diff ) {
+			\WP_CLI::run_command( [ 'vip', 'role-backup', 'diff', $key ] );
+		}
+
+		\WP_CLI::confirm( 'Okay to proceed with restoration?', $assoc_args );
+
+		update_option( $wpdb->prefix . 'user_roles', $backup );
+
+		\WP_CLI::success( sprintf( 'Restored %s backup with %d roles', $key, count( $backup ) ) );
+
+	}
+
+
+	/**
+	 * Get diff of selected backup compared to current roles
+	 *
+	 * ## OPTIONS
+	 *
+	 * [<time_key>]
+	 * : See `vip role-backup list`. Defaults to latest
+	 *
+	 */
+	public function diff( $args, $assoc_args ) {
+
+		global $wpdb;
+		$key = $args[0] ?? 'latest';
+
+		$backup_roles = get_option( 'vip_backup_user_roles', [] );
+
+		if ( 'latest' === $key ) {
+			$date   = gmdate( 'Y-m-d H:i:s', array_key_last( $backup_roles ) );
+			$backup = array_pop( $backup_roles );
+		} else {
+			if ( isset( $backup_roles[ $key ] ) ) {
+				$date   = gmdate( 'Y-m-d H:i:s', $key );
+				$backup = $backup_roles[ $key ];
+			} else {
+				\WP_CLI::error( 'Specified backup time_key not found.' );
+			}
+		}
+
+		$current_roles = get_option( $wpdb->prefix . 'user_roles' );
+
+		if ( $current_roles === $backup ) {
+			WP_CLI::log( 'Selected backup matches existing roles.' );
+			exit;
+		}
+
+		$current_roles_as_text_block = [];
+		$backup_as_text_block        = [];
+
+		ksort( $current_roles );
+		ksort( $backup );
+
+		foreach ( $current_roles as $name => $role ) {
+			$role['capabilities'] = array_keys( $role['capabilities'] );
+			ksort( $role['capabilities'] );
+			$current_roles_as_text_block[] = "Role: $name";
+			foreach ( $role['capabilities'] as $cap ) {
+				$current_roles_as_text_block[] = "Role-cap: $name: $cap";
+			}
+		}
+
+
+		foreach ( $backup as $name => $role ) {
+			$role['capabilities'] = array_keys( $role['capabilities'] );
+			ksort( $role['capabilities'] );
+			$backup_as_text_block[] = "Role: $name";
+			foreach ( $role['capabilities'] as $cap ) {
+				$backup_as_text_block[] = "Role-cap: $name: $cap";
+			}
+		}
+
+		\WP_CLI::log(
+			\WP_CLI::colorize(
+				'Diff roles. %G<added%n %R>removed%n'
+			)
+		);
+
+		if ( ! class_exists( 'Text_Diff' ) ) {
+			require ABSPATH . WPINC . '/Text/Diff.php';
+		}
+		if ( ! class_exists( 'Text_Diff_Renderer' ) ) {
+			require ABSPATH . WPINC . '/Text/Diff/Renderer.php';
+		}
+
+		$text_diff = new Text_Diff( 'shell', [ $backup_as_text_block, $current_roles_as_text_block ] );
+		$renderer  = new Text_Diff_Renderer( [ 'leading_context_lines' => 2 ] );
+		$diff      = $renderer->render( $text_diff );
+
+		$diff = preg_replace( '/(^>.*?$)/m', '%R$1%n', $diff );
+		$diff = preg_replace( '/(^<.*?$)/m', '%G$1%n', $diff );
+
+		\WP_CLI::log( \WP_CLI::colorize( $diff ) );
+
+	}
+
+	/**
+	 * Backup Current Roles Now
+	 *
+	 * ## OPTIONS
+	 *
+	 * [--yes]
+	 * : Skip confirmation prompt
+	 */
+	public function now( $args, $assoc_args ) {
+
+		$backup_roles = get_option( 'vip_backup_user_roles', [] );
+		if ( count( $backup_roles ) >= USER_ROLE_BACKUP_LENGTH ) {
+			\WP_CLI::confirm( 'This will remove the oldest backup. Ok?', $assoc_args );
+		}
+
+		\Automattic\VIP\do_user_role_backup();
+
+		\WP_CLI::success( 'Current roles backed up.' );
+
+	}
+
+}
+
+WP_CLI::add_command( 'vip role-backup', __NAMESPACE__ . '\VIP_Backup_User_Role_CLI' );