| @@ -107,8 +107,11 @@ | ||
| 107 | 107 | add_action( 'admin_init', array( $this, 'redirect_submenu_shortcuts' ) ); |
| 108 | 108 | add_action( 'admin_init', array( $this, 'register_settings' ) ); |
| 109 | 109 | add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) ); |
| 110 | 110 | add_action( 'admin_notices', array( $this, 'show_admin_notices' ) ); |
| 111 | + // Self-protection speaks in the network admin too: on a network its | |
| 112 | + // files are shared, and the super administrator is who can repair them. | |
| 113 | + add_action( 'network_admin_notices', array( $this, 'maybe_show_self_protection_notice' ) ); | |
| 111 | 114 | |
| 112 | 115 | // Highlight correct submenu based on active tab |
| 113 | 116 | add_filter( 'submenu_file', array( $this, 'highlight_submenu_tab' ) ); |
| 114 | 117 | |
| @@ -199,8 +202,26 @@ | ||
| 199 | 202 | /** |
| 200 | 203 | * Run database migrations based on stored version |
| 201 | 204 | */ |
| 202 | 205 | public function run_migrations() { |
| 206 | + /* | |
| 207 | + * admin-ajax.php fires admin_init before it decides who is asking | |
| 208 | + * (wp-admin/admin-ajax.php:45), so until 2.11.10 an anonymous POST to | |
| 209 | + * admin-ajax.php with any action ran every pending migration. That is | |
| 210 | + * not a read: the migrations rewrite wp-config.php through | |
| 211 | + * apply_security_constants(), rewrite the root .htaccess, move user meta | |
| 212 | + * of the whole network and can rebuild the file integrity baseline, | |
| 213 | + * taking whatever is on disk as approved. Reproduced on 12 sep 2026 with | |
| 214 | + * curl and no cookies, and found by the file-by-file review of 2.11.10. | |
| 215 | + * | |
| 216 | + * Migrations are maintenance for whoever administers the site, so they | |
| 217 | + * wait for an administrator to load a screen. Nothing is lost by | |
| 218 | + * waiting: every migration is idempotent and version gated. | |
| 219 | + */ | |
| 220 | + if ( ! is_user_logged_in() || ! current_user_can( 'manage_options' ) ) { | |
| 221 | + return; | |
| 222 | + } | |
| 223 | + | |
| 203 | 224 | $db_version = get_option( 'vigilante_db_version', '0' ); |
| 204 | 225 | |
| 205 | 226 | // 1.2.3: Fix IP lists corrupted by sanitize_text_field stripping newlines |
| 206 | 227 | if ( version_compare( $db_version, '1.2.3', '<' ) ) { |
| @@ -464,11 +485,213 @@ | ||
| 464 | 485 | $this->database->purge_for_2_11_0(); |
| 465 | 486 | |
| 466 | 487 | update_option( 'vigilante_db_version', '2.11.0' ); |
| 467 | 488 | } |
| 489 | + | |
| 490 | + /* | |
| 491 | + * 2.11.9: clear the raw .htaccess copies that older versions left in | |
| 492 | + * options, on the first admin load after the update. Uninstall already | |
| 493 | + * removes them, but that only fires when the plugin is deleted, so a | |
| 494 | + * site that keeps the plugin carried them until now. Three stores, each | |
| 495 | + * a copy of a file that can hold secrets (a SetEnv token, an | |
| 496 | + * Authorization header): the same exposure the wp.org review flagged as | |
| 497 | + * 4.4, on the paths its fix did not reach. | |
| 498 | + * | |
| 499 | + * - vigilante_htaccess_history: up to five raw copies, by design, until | |
| 500 | + * 2.11.8. The writer is gone, nothing reads it, so it is deleted. | |
| 501 | + * - vigilante_htaccess_backup: the single rollback buffer, normally | |
| 502 | + * cleared in the finally of each write; a copy only lingers if a write | |
| 503 | + * crashed mid-operation. Nothing outside one write reads it, so a | |
| 504 | + * leftover is deleted. | |
| 505 | + * - vigilante_htaccess_pre_migration: still read by the header recovery, | |
| 506 | + * but older versions stored the whole file where only our own block is | |
| 507 | + * ever used. Truncated to that block, so the feature keeps working and | |
| 508 | + * nothing outside our markers stays in the option. | |
| 509 | + */ | |
| 510 | + if ( version_compare( $db_version, '2.11.9', '<' ) ) { | |
| 511 | + delete_option( 'vigilante_htaccess_history' ); | |
| 512 | + delete_option( 'vigilante_htaccess_backup' ); | |
| 513 | + | |
| 514 | + $snapshot = get_option( 'vigilante_htaccess_pre_migration' ); | |
| 515 | + if ( is_array( $snapshot ) && isset( $snapshot['content'] ) && '' !== (string) $snapshot['content'] ) { | |
| 516 | + require_once VIGILANTE_INCLUDES_DIR . 'class-htaccess-recovery.php'; | |
| 517 | + $block = Vigilante_Htaccess_Recovery::get_raw_block(); | |
| 518 | + | |
| 519 | + if ( '' === $block ) { | |
| 520 | + delete_option( 'vigilante_htaccess_pre_migration' ); | |
| 521 | + } elseif ( $block !== $snapshot['content'] ) { | |
| 522 | + $snapshot['content'] = $block; | |
| 523 | + update_option( 'vigilante_htaccess_pre_migration', $snapshot, false ); | |
| 524 | + } | |
| 525 | + } | |
| 526 | + | |
| 527 | + update_option( 'vigilante_db_version', '2.11.9' ); | |
| 528 | + } | |
| 529 | + | |
| 530 | + /* | |
| 531 | + * 2.11.10: the pending-approval flag becomes one per site on a network. | |
| 532 | + * Until 2.11.9 it was a single global user meta, so the queue was shared | |
| 533 | + * across the whole network. Moving the key is not enough: the accounts | |
| 534 | + * already waiting carry the old key, and reading only the new one would | |
| 535 | + * let them log in. So they are moved here, each to the site it belongs | |
| 536 | + * to, and the old key is removed only once the new one is written. | |
| 537 | + */ | |
| 538 | + if ( version_compare( $db_version, '2.11.10', '<' ) ) { | |
| 539 | + $this->migrate_pending_approval_per_site(); | |
| 540 | + | |
| 541 | + update_option( 'vigilante_db_version', '2.11.10' ); | |
| 542 | + } | |
| 543 | + | |
| 544 | + /* | |
| 545 | + * 3.0.0: self-protection package. This block must stay the LAST one of | |
| 546 | + * run_migrations(): every block compares against the same $db_version | |
| 547 | + * captured at the top, so the last update_option() that runs is the | |
| 548 | + * one that sticks, and on a jump from any older version it has to be | |
| 549 | + * this one. | |
| 550 | + * | |
| 551 | + * 1. Capture the self-integrity anchor (the manifest fingerprint) and | |
| 552 | + * run an inline self-check. It covers every update the old code never | |
| 553 | + * saw through the upgrader hook: from any 2.x, and manual or FTP | |
| 554 | + * uploads. A plain new is enough, the constructor registers no hooks. | |
| 555 | + * 2. Drop the cached Security Check report: the Internal category grows | |
| 556 | + * from 30 to 33 points (the self_integrity check), and the cached | |
| 557 | + * report would keep the old denominator until the next full scan. | |
| 558 | + * Same reason and same background refresh as the 2.6.1 block above. | |
| 559 | + * 3. Remove Vigilant's own files from the ignore list before that check. | |
| 560 | + * Until 2.11.11 the generic scan listed them like any plugin, and any | |
| 561 | + * administrator could ignore one (after a false alarm while | |
| 562 | + * WordPress.org published new checksums, for example). Kept, those | |
| 563 | + * entries would silence the self-check of those files for good, | |
| 564 | + * PHP included. | |
| 565 | + */ | |
| 566 | + if ( version_compare( $db_version, '3.0.0', '<' ) ) { | |
| 567 | + if ( ! class_exists( 'Vigilante_Self_Integrity' ) ) { | |
| 568 | + require_once VIGILANTE_INCLUDES_DIR . 'class-self-integrity.php'; | |
| 569 | + } | |
| 570 | + $ignored_files = get_option( 'vigilante_ignored_files', array() ); | |
| 571 | + if ( is_array( $ignored_files ) && $ignored_files ) { | |
| 572 | + $kept_files = array_values( | |
| 573 | + array_filter( | |
| 574 | + $ignored_files, | |
| 575 | + function ( $ignored_file ) { | |
| 576 | + return ! Vigilante_Self_Integrity::is_own_file_path( (string) $ignored_file ); | |
| 577 | + } | |
| 578 | + ) | |
| 579 | + ); | |
| 580 | + if ( count( $kept_files ) !== count( $ignored_files ) ) { | |
| 581 | + update_option( 'vigilante_ignored_files', $kept_files ); | |
| 582 | + if ( $this->activity_log ) { | |
| 583 | + $this->activity_log->log( | |
| 584 | + 'system', | |
| 585 | + 'self_ignored_files_removed', | |
| 586 | + __( 'Vigilant files were removed from the File Integrity ignore list: self-protection checks them now.', 'vigilante' ), | |
| 587 | + array( 'removed' => count( $ignored_files ) - count( $kept_files ) ), | |
| 588 | + 'info' | |
| 589 | + ); | |
| 590 | + } | |
| 591 | + } | |
| 592 | + } | |
| 593 | + $self_integrity = new Vigilante_Self_Integrity( $this->settings, $this->activity_log ); | |
| 594 | + $self_integrity->run_check( 'migration' ); | |
| 595 | + | |
| 596 | + delete_option( 'vigilante_analyzer_last_scan' ); | |
| 597 | + if ( ! wp_next_scheduled( 'vigilante_under_attack_post_scan' ) ) { | |
| 598 | + wp_schedule_single_event( time() + 5, 'vigilante_under_attack_post_scan' ); | |
| 599 | + } | |
| 600 | + | |
| 601 | + update_option( 'vigilante_db_version', '3.0.0' ); | |
| 602 | + } | |
| 468 | 603 | } |
| 469 | 604 | |
| 470 | 605 | /** |
| 606 | + * Move the pending-approval flag of a network to a key per site | |
| 607 | + * | |
| 608 | + * Runs once for the whole network, not once per site: the data it moves is | |
| 609 | + * global, so the guard is a network option and any site may be the one that | |
| 610 | + * does it. On a single site the key does not change and there is nothing to | |
| 611 | + * do. | |
| 612 | + * | |
| 613 | + * Each waiting account goes to its primary site, or to the only site it | |
| 614 | + * belongs to; one that belongs to none goes to the main site rather than | |
| 615 | + * nowhere, because losing the flag would silently approve it. | |
| 616 | + * | |
| 617 | + * @since 2.11.10 | |
| 618 | + */ | |
| 619 | + private function migrate_pending_approval_per_site() { | |
| 620 | + global $wpdb; | |
| 621 | + | |
| 622 | + if ( ! is_multisite() ) { | |
| 623 | + return; | |
| 624 | + } | |
| 625 | + | |
| 626 | + if ( get_site_option( 'vigilante_pending_per_site_done' ) ) { | |
| 627 | + return; | |
| 628 | + } | |
| 629 | + | |
| 630 | + // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching -- One-off migration of the plugin's own user meta; the meta API has no "list every user with this key". | |
| 631 | + $user_ids = $wpdb->get_col( | |
| 632 | + $wpdb->prepare( "SELECT DISTINCT user_id FROM {$wpdb->usermeta} WHERE meta_key = %s", 'vigilante_pending_approval' ) | |
| 633 | + ); | |
| 634 | + | |
| 635 | + foreach ( (array) $user_ids as $user_id ) { | |
| 636 | + $user_id = (int) $user_id; | |
| 637 | + if ( ! $user_id ) { | |
| 638 | + continue; | |
| 639 | + } | |
| 640 | + | |
| 641 | + $pending = get_user_meta( $user_id, 'vigilante_pending_approval', true ); | |
| 642 | + $since = get_user_meta( $user_id, 'vigilante_pending_since', true ); | |
| 643 | + | |
| 644 | + /* | |
| 645 | + * Every site the account belongs to, not its primary one. The global | |
| 646 | + * flag does not say where the registration happened, and the first | |
| 647 | + * version of this guessed the primary blog: an account that | |
| 648 | + * registered on B while its primary was A came out pending on A and | |
| 649 | + * free to log in on B, which is the very site it had never been | |
| 650 | + * approved on. Found by the cross review of 2.11.10. | |
| 651 | + * | |
| 652 | + * Marking every site it belongs to fails closed instead: the account | |
| 653 | + * stays blocked wherever it can log in, and shows up in the queue of | |
| 654 | + * each of those sites so somebody can actually act on it. An account | |
| 655 | + * that belongs to no site goes to the main one rather than nowhere, | |
| 656 | + * because losing the flag would silently approve it. | |
| 657 | + */ | |
| 658 | + /* | |
| 659 | + * With $all true, because the default leaves out archived, spam and | |
| 660 | + * deleted sites (wp-includes/user.php:1113-1117): a site archived on | |
| 661 | + * the day this runs would lose the flag, and the account would walk | |
| 662 | + * in unapproved the moment it was brought back. Found by the second | |
| 663 | + * cross review of 2.11.10. | |
| 664 | + */ | |
| 665 | + $blog_ids = array(); | |
| 666 | + | |
| 667 | + foreach ( get_blogs_of_user( $user_id, true ) as $blog ) { | |
| 668 | + if ( ! empty( $blog->userblog_id ) ) { | |
| 669 | + $blog_ids[] = (int) $blog->userblog_id; | |
| 670 | + } | |
| 671 | + } | |
| 672 | + | |
| 673 | + if ( empty( $blog_ids ) ) { | |
| 674 | + $blog_ids[] = (int) get_main_site_id(); | |
| 675 | + } | |
| 676 | + | |
| 677 | + foreach ( array_unique( $blog_ids ) as $blog_id ) { | |
| 678 | + $prefix = $wpdb->get_blog_prefix( $blog_id ); | |
| 679 | + | |
| 680 | + update_user_meta( $user_id, $prefix . 'vigilante_pending_approval', $pending ); | |
| 681 | + if ( '' !== $since && false !== $since ) { | |
| 682 | + update_user_meta( $user_id, $prefix . 'vigilante_pending_since', $since ); | |
| 683 | + } | |
| 684 | + } | |
| 685 | + | |
| 686 | + delete_user_meta( $user_id, 'vigilante_pending_approval' ); | |
| 687 | + delete_user_meta( $user_id, 'vigilante_pending_since' ); | |
| 688 | + } | |
| 689 | + | |
| 690 | + update_site_option( 'vigilante_pending_per_site_done', 1 ); | |
| 691 | + } | |
| 692 | + | |
| 693 | + /** | |
| 471 | 694 | * Migration: Remove orphaned email fields from saved options |
| 472 | 695 | * |
| 473 | 696 | * v1.10.0 centralized notification recipients into email section. |
| 474 | 697 | * Old per-module notify_email fields and dead email section fields |
| @@ -564,17 +787,30 @@ | ||
| 564 | 787 | $pending_count = $this->get_pending_approvals_count(); |
| 565 | 788 | |
| 566 | 789 | // Get security issues with severity |
| 567 | 790 | $security_status = $this->get_security_status_for_badge(); |
| 568 | - | |
| 791 | + | |
| 792 | + /* | |
| 793 | + * Self-protection: a change to Vigilant own files is the one finding | |
| 794 | + * that has to be visible from any screen of WordPress, so it adds to | |
| 795 | + * the counter and paints it red. A verified state, a state with fewer | |
| 796 | + * references than usual and the check turned off add nothing: a counter | |
| 797 | + * that is always on is a counter nobody reads. | |
| 798 | + */ | |
| 799 | + $self_tone = Vigilante_Self_Integrity::tone( | |
| 800 | + Vigilante_Self_Integrity::display_state(), | |
| 801 | + Vigilante_Self_Integrity::is_on() | |
| 802 | + ); | |
| 803 | + $self_badge = in_array( $self_tone, array( 'critical', 'off', 'warning' ), true ) ? 1 : 0; | |
| 804 | + | |
| 569 | 805 | // Total count for badge |
| 570 | - $total_badge = $pending_count + $security_status['count']; | |
| 571 | - | |
| 806 | + $total_badge = $pending_count + $security_status['count'] + $self_badge; | |
| 807 | + | |
| 572 | 808 | if ( $total_badge > 0 ) { |
| 573 | 809 | // Determine badge color: |
| 574 | 810 | // - Red (awaiting-mod): pending approvals OR critical modules disabled |
| 575 | 811 | // - Orange (update-plugins): only non-critical modules disabled |
| 576 | - if ( $pending_count > 0 || $security_status['has_critical'] ) { | |
| 812 | + if ( $pending_count > 0 || $security_status['has_critical'] || in_array( $self_tone, array( 'critical', 'off' ), true ) ) { | |
| 577 | 813 | $badge_class = 'awaiting-mod'; |
| 578 | 814 | } else { |
| 579 | 815 | $badge_class = 'update-plugins vigilante-badge-warning'; |
| 580 | 816 | } |
| @@ -616,13 +852,21 @@ | ||
| 616 | 852 | 'vigilante-activity-log', |
| 617 | 853 | array( $this, 'redirect_to_tab' ) |
| 618 | 854 | ); |
| 619 | 855 | |
| 620 | - // File Integrity shortcut | |
| 856 | + // File Integrity shortcut, with its own counter when the self-check has | |
| 857 | + // something to say: that is the screen that explains it. | |
| 858 | + $fi_menu_title = __( 'File Integrity', 'vigilante' ); | |
| 859 | + if ( $self_badge > 0 ) { | |
| 860 | + $fi_menu_title .= sprintf( | |
| 861 | + ' <span class="%s count-1"><span class="pending-count">1</span></span>', | |
| 862 | + in_array( $self_tone, array( 'critical', 'off' ), true ) ? 'awaiting-mod' : 'update-plugins vigilante-badge-warning' | |
| 863 | + ); | |
| 864 | + } | |
| 621 | 865 | add_submenu_page( |
| 622 | 866 | 'vigilante', |
| 623 | 867 | __( 'File Integrity', 'vigilante' ), |
| 624 | - __( 'File Integrity', 'vigilante' ), | |
| 868 | + $fi_menu_title, | |
| 625 | 869 | 'manage_options', |
| 626 | 870 | 'vigilante-file-integrity', |
| 627 | 871 | array( $this, 'redirect_to_tab' ) |
| 628 | 872 | ); |
| @@ -736,27 +980,56 @@ | ||
| 736 | 980 | if ( ! did_action( 'plugins_loaded' ) ) { |
| 737 | 981 | return 0; |
| 738 | 982 | } |
| 739 | 983 | |
| 740 | - $registration_approval = $this->settings->get_section( 'user_security' ); | |
| 741 | - $approval_settings = $registration_approval['registration_approval'] ?? array(); | |
| 742 | - | |
| 743 | - if ( empty( $approval_settings['enabled'] ) ) { | |
| 744 | - return 0; | |
| 745 | - } | |
| 984 | + /* | |
| 985 | + * Counted whether the feature is on or off. An account already waiting | |
| 986 | + * stays blocked when it is switched off (see init_enforcement_hooks()), | |
| 987 | + * so reporting zero there hid people who cannot log in and whom nobody | |
| 988 | + * could see to approve. Found by the cross review of 2.11.10. | |
| 989 | + */ | |
| 746 | 990 | |
| 747 | 991 | // phpcs:disable WordPress.DB.SlowDBQuery.slow_db_query_meta_key, WordPress.DB.SlowDBQuery.slow_db_query_meta_value -- Limited results in admin context. |
| 748 | - $pending_users = get_users( array( | |
| 749 | - 'meta_key' => 'vigilante_pending_approval', | |
| 992 | + $args = array( | |
| 993 | + 'meta_key' => Vigilante_User_Security::site_user_meta_key( 'vigilante_pending_approval' ), | |
| 750 | 994 | 'meta_value' => '1', |
| 751 | 995 | 'fields' => 'ID', |
| 752 | - ) ); | |
| 996 | + ); | |
| 753 | 997 | // phpcs:enable WordPress.DB.SlowDBQuery.slow_db_query_meta_key, WordPress.DB.SlowDBQuery.slow_db_query_meta_value |
| 754 | 998 | |
| 999 | + // Same query as Vigilante_User_Security::get_pending_users(), and for the | |
| 1000 | + // same reason: the meta key already scopes this to the site, and adding | |
| 1001 | + // core's membership filter on top hid the accounts that have no role yet. | |
| 1002 | + if ( is_multisite() ) { | |
| 1003 | + $args['blog_id'] = 0; | |
| 1004 | + } | |
| 1005 | + | |
| 1006 | + $pending_users = get_users( $args ); | |
| 1007 | + | |
| 755 | 1008 | return count( $pending_users ); |
| 756 | 1009 | } |
| 757 | 1010 | |
| 758 | 1011 | /** |
| 1012 | + * Whether XML-RPC is blocked, whole or its pingback methods | |
| 1013 | + * | |
| 1014 | + * Both levels have to say so: the three-way setting under WP Hardening, read | |
| 1015 | + * through the module's own resolver, and the WP Hardening module that | |
| 1016 | + * enforces it. Until 3.0.2 the Dashboard read login_security[disable_xmlrpc], | |
| 1017 | + * the checkbox that moved to WP Hardening in 2.9.7 and is never written any | |
| 1018 | + * more, so the score never granted its three points and the recommendation | |
| 1019 | + * to disable XML-RPC stayed on for good. | |
| 1020 | + * | |
| 1021 | + * @since 3.0.2 | |
| 1022 | + * | |
| 1023 | + * @param array $options Plugin options. | |
| 1024 | + * @return bool | |
| 1025 | + */ | |
| 1026 | + private function is_xmlrpc_protected( $options ) { | |
| 1027 | + return ! empty( $options['modules']['wp_hardening'] ) | |
| 1028 | + && 'none' !== Vigilante_Comment_Security::resolve_xmlrpc_mode( $this->settings ); | |
| 1029 | + } | |
| 1030 | + | |
| 1031 | + /** | |
| 759 | 1032 | * Calculate comprehensive security score (0-100) |
| 760 | 1033 | * |
| 761 | 1034 | * @param array $options Plugin options. |
| 762 | 1035 | * @return int Security score. |
| @@ -814,10 +1087,10 @@ | ||
| 814 | 1087 | // Max attempts configured |
| 815 | 1088 | if ( isset( $login['max_attempts'] ) && $login['max_attempts'] <= 5 ) { |
| 816 | 1089 | $score += 3; |
| 817 | 1090 | } |
| 818 | - // XML-RPC disabled | |
| 819 | - if ( ! empty( $login['disable_xmlrpc'] ) ) { | |
| 1091 | + // XML-RPC blocked, whole or its pingback methods | |
| 1092 | + if ( $this->is_xmlrpc_protected( $options ) ) { | |
| 820 | 1093 | $score += 3; |
| 821 | 1094 | } |
| 822 | 1095 | // 2FA enabled |
| 823 | 1096 | if ( ! empty( $login['two_factor']['enabled'] ) ) { |
| @@ -876,8 +1149,28 @@ | ||
| 876 | 1149 | $score += 3; |
| 877 | 1150 | } |
| 878 | 1151 | } |
| 879 | 1152 | |
| 1153 | + /* | |
| 1154 | + * Self-protection (15 points). Having it on is configuration, which is | |
| 1155 | + * what this card measures; the state of the last check caps the card, | |
| 1156 | + * because a plugin whose own files were changed is not well configured | |
| 1157 | + * in any useful sense, whatever the rest of the settings say. The | |
| 1158 | + * environment block below already mixes measured state into this score | |
| 1159 | + * (WP_DEBUG, insecure usernames), so the card keeps its meaning. | |
| 1160 | + */ | |
| 1161 | + $max_score += 15; | |
| 1162 | + $self_enabled = Vigilante_Self_Integrity::is_on(); | |
| 1163 | + $self_tone = Vigilante_Self_Integrity::tone( Vigilante_Self_Integrity::display_state(), $self_enabled ); | |
| 1164 | + if ( $self_enabled ) { | |
| 1165 | + $score += 10; | |
| 1166 | + // The five points are for a check that ran and came out clean: a | |
| 1167 | + // site that has never checked itself has not earned them. | |
| 1168 | + if ( in_array( $self_tone, array( 'ok', 'info' ), true ) ) { | |
| 1169 | + $score += 5; | |
| 1170 | + } | |
| 1171 | + } | |
| 1172 | + | |
| 880 | 1173 | // Environment checks (8 points) - penalize insecure server configuration |
| 881 | 1174 | $max_score += 8; |
| 882 | 1175 | $env_score = 8; |
| 883 | 1176 | |
| @@ -893,9 +1186,14 @@ | ||
| 893 | 1186 | } |
| 894 | 1187 | |
| 895 | 1188 | $score += max( 0, $env_score ); |
| 896 | 1189 | |
| 897 | - return $max_score > 0 ? round( ( $score / $max_score ) * 100 ) : 0; | |
| 1190 | + $percent = $max_score > 0 ? (int) round( ( $score / $max_score ) * 100 ) : 0; | |
| 1191 | + if ( in_array( $self_tone, array( 'critical', 'off' ), true ) ) { | |
| 1192 | + // Same cap and same reason as the Security Check score. | |
| 1193 | + $percent = min( $percent, Vigilante_Security_Analyzer::SCORE_CAP_ON_TAMPER ); | |
| 1194 | + } | |
| 1195 | + return $percent; | |
| 898 | 1196 | } |
| 899 | 1197 | |
| 900 | 1198 | /** |
| 901 | 1199 | * Get security recommendations based on current settings |
| @@ -905,8 +1203,51 @@ | ||
| 905 | 1203 | */ |
| 906 | 1204 | private function get_security_recommendations( $options ) { |
| 907 | 1205 | $recommendations = array(); |
| 908 | 1206 | |
| 1207 | + // Self-protection first: if Vigilant itself cannot be trusted, nothing | |
| 1208 | + // else on this card means much. | |
| 1209 | + $vg_self_enabled = Vigilante_Self_Integrity::is_on(); | |
| 1210 | + $vg_self_tone = Vigilante_Self_Integrity::tone( Vigilante_Self_Integrity::display_state(), $vg_self_enabled ); | |
| 1211 | + if ( ! $vg_self_enabled ) { | |
| 1212 | + $recommendations[] = array( | |
| 1213 | + 'icon' => 'shield', | |
| 1214 | + 'priority' => 'high', | |
| 1215 | + 'tab' => 'file-integrity', | |
| 1216 | + 'message' => __( 'Turn Vigilant self-protection on, so a change to Vigilant own files does not go unnoticed.', 'vigilante' ), | |
| 1217 | + ); | |
| 1218 | + } elseif ( 'off' === $vg_self_tone ) { | |
| 1219 | + $recommendations[] = array( | |
| 1220 | + 'icon' => 'warning', | |
| 1221 | + 'priority' => 'critical', | |
| 1222 | + 'tab' => 'file-integrity', | |
| 1223 | + 'message' => __( 'Something on this site switched Vigilant self-protection off: File Integrity says which file does it.', 'vigilante' ), | |
| 1224 | + ); | |
| 1225 | + } elseif ( 'critical' === $vg_self_tone ) { | |
| 1226 | + $recommendations[] = array( | |
| 1227 | + 'icon' => 'warning', | |
| 1228 | + 'priority' => 'critical', | |
| 1229 | + 'tab' => 'file-integrity', | |
| 1230 | + 'message' => __( 'Vigilant own files have been changed: repair Vigilant from File Integrity before anything else.', 'vigilante' ), | |
| 1231 | + ); | |
| 1232 | + } elseif ( 'warning' === $vg_self_tone ) { | |
| 1233 | + $recommendations[] = array( | |
| 1234 | + 'icon' => 'shield', | |
| 1235 | + 'priority' => 'high', | |
| 1236 | + 'tab' => 'file-integrity', | |
| 1237 | + 'message' => __( 'Vigilant self-protection needs your attention: File Integrity says what it found and what to do.', 'vigilante' ), | |
| 1238 | + ); | |
| 1239 | + } elseif ( 'none' === $vg_self_tone ) { | |
| 1240 | + // The score holds back the points of a check that has not run yet, | |
| 1241 | + // so the card has to say why instead of just showing a lower number. | |
| 1242 | + $recommendations[] = array( | |
| 1243 | + 'icon' => 'shield', | |
| 1244 | + 'priority' => 'high', | |
| 1245 | + 'tab' => 'file-integrity', | |
| 1246 | + 'message' => __( 'Vigilant has not checked its own files yet: run a scan from File Integrity.', 'vigilante' ), | |
| 1247 | + ); | |
| 1248 | + } | |
| 1249 | + | |
| 909 | 1250 | // Critical: Firewall disabled |
| 910 | 1251 | if ( empty( $options['modules']['firewall'] ) ) { |
| 911 | 1252 | $recommendations[] = array( |
| 912 | 1253 | 'icon' => 'warning', |
| @@ -989,14 +1330,14 @@ | ||
| 989 | 1330 | ); |
| 990 | 1331 | } |
| 991 | 1332 | |
| 992 | 1333 | // Low: XML-RPC enabled (only if login security is active) |
| 993 | - if ( ! empty( $options['modules']['login_security'] ) && empty( $login['disable_xmlrpc'] ) ) { | |
| 1334 | + if ( ! empty( $options['modules']['login_security'] ) && ! $this->is_xmlrpc_protected( $options ) ) { | |
| 994 | 1335 | $recommendations[] = array( |
| 995 | 1336 | 'icon' => 'info', |
| 996 | 1337 | 'priority' => 'low', |
| 997 | 1338 | 'message' => __( 'Disable XML-RPC if not needed (reduces attack surface).', 'vigilante' ), |
| 998 | - 'tab' => 'login', | |
| 1339 | + 'tab' => 'wp-hardening', | |
| 999 | 1340 | ); |
| 1000 | 1341 | } |
| 1001 | 1342 | |
| 1002 | 1343 | // Low: Strong passwords not enforced (only if user security is active) |
| @@ -1309,8 +1650,9 @@ | ||
| 1309 | 1650 | // File Integrity |
| 1310 | 1651 | array( 'tab' => 'file-integrity', 'tab_label' => __( 'File Integrity', 'vigilante' ), 'section' => __( 'File Integrity Monitoring', 'vigilante' ), 'anchor' => 'vigilante-section-fi-monitoring', 'label' => __( 'File Integrity Monitoring', 'vigilante' ), 'label_en' => 'File Integrity Monitoring', 'keywords' => _x( 'file integrity monitoring files checksum checksums tamper', 'settings search keywords', 'vigilante' ) ), |
| 1311 | 1652 | array( 'tab' => 'file-integrity', 'tab_label' => __( 'File Integrity', 'vigilante' ), 'section' => __( 'File Integrity Monitoring', 'vigilante' ), 'anchor' => 'vigilante-section-fi-monitoring', 'label' => __( 'Scan schedule', 'vigilante' ), 'label_en' => 'Scan schedule', 'keywords' => _x( 'scan schedule scans scanning check cron', 'settings search keywords', 'vigilante' ) ), |
| 1312 | 1653 | array( 'tab' => 'file-integrity', 'tab_label' => __( 'File Integrity', 'vigilante' ), 'section' => __( 'File Integrity Monitoring', 'vigilante' ), 'anchor' => 'vigilante-section-fi-monitoring', 'label' => __( 'Instant alert', 'vigilante' ), 'label_en' => 'Instant alert', 'keywords' => _x( 'instant alert alerts notification warning email', 'settings search keywords', 'vigilante' ) ), |
| 1654 | + array( 'tab' => 'file-integrity', 'tab_label' => __( 'File Integrity', 'vigilante' ), 'section' => __( 'Vigilant self-protection', 'vigilante' ), 'anchor' => 'vigilante-section-fi-self', 'label' => __( 'Vigilant self-protection', 'vigilante' ), 'label_en' => 'Vigilant self-protection', 'keywords' => _x( 'self protection selfprotection self-check autoproteccion manifest sha256 checksums tampering tampered repair reinstall own files guardian integrity of the plugin', 'settings search keywords', 'vigilante' ) ), | |
| 1313 | 1655 | array( 'tab' => 'file-integrity', 'tab_label' => __( 'File Integrity', 'vigilante' ), 'section' => __( 'Ignored Files', 'vigilante' ), 'anchor' => 'vigilante-section-fi-ignored', 'label' => __( 'Ignored Files', 'vigilante' ), 'label_en' => 'Ignored Files', 'keywords' => _x( 'ignored files file exclude', 'settings search keywords', 'vigilante' ) ), |
| 1314 | 1656 | // Security Audit |
| 1315 | 1657 | array( 'tab' => 'activity-log', 'tab_label' => __( 'Security Audit', 'vigilante' ), 'section' => __( 'Security Audit Settings', 'vigilante' ), 'anchor' => 'vigilante-section-audit-settings', 'label' => __( 'Retention', 'vigilante' ), 'label_en' => 'Retention', 'keywords' => _x( 'retention keep days storage log', 'settings search keywords', 'vigilante' ) ), |
| 1316 | 1658 | array( 'tab' => 'activity-log', 'tab_label' => __( 'Security Audit', 'vigilante' ), 'section' => __( 'Security Audit Settings', 'vigilante' ), 'anchor' => 'vigilante-section-audit-settings', 'label' => __( 'Events to Log', 'vigilante' ), 'label_en' => 'Events to Log', 'keywords' => _x( 'events to log', 'settings search keywords', 'vigilante' ) ), |
| @@ -1463,8 +1805,9 @@ | ||
| 1463 | 1805 | ); |
| 1464 | 1806 | |
| 1465 | 1807 | wp_localize_script( 'vigilante-admin', 'vigilanteAdmin', array( |
| 1466 | 1808 | 'ajaxUrl' => admin_url( 'admin-ajax.php' ), |
| 1809 | + 'selfBoxUrl' => esc_url( admin_url( 'admin.php?page=vigilante&tab=file-integrity#vigilante-section-fi-self' ) ), | |
| 1467 | 1810 | 'nonce' => wp_create_nonce( 'vigilante_admin_nonce' ), |
| 1468 | 1811 | 'currentUserId' => get_current_user_id(), |
| 1469 | 1812 | 'logoutUrl' => wp_logout_url( wp_login_url() ), |
| 1470 | 1813 | 'adminUrl' => admin_url( 'admin.php?page=vigilante' ), |
| @@ -1512,8 +1855,13 @@ | ||
| 1512 | 1855 | 'file' => __( 'File', 'vigilante' ), |
| 1513 | 1856 | 'reason' => __( 'Reason', 'vigilante' ), |
| 1514 | 1857 | 'type' => __( 'Type', 'vigilante' ), |
| 1515 | 1858 | 'unknown' => __( 'Unknown', 'vigilante' ), |
| 1859 | + 'selfType' => __( 'Vigilant (self)', 'vigilante' ), | |
| 1860 | + 'logWhatHappened' => __( 'What happened', 'vigilante' ), | |
| 1861 | + 'logWhatItMeans' => __( 'What it means', 'vigilante' ), | |
| 1862 | + 'logWhatToDo' => __( 'What to do', 'vigilante' ), | |
| 1863 | + 'logSelfSeeDetails' => __( 'Open File Integrity for the full detail', 'vigilante' ), | |
| 1516 | 1864 | 'modifiedFiles' => __( 'Modified Files', 'vigilante' ), |
| 1517 | 1865 | 'modifiedDescription' => __( 'These files (apparently) differ from the original WordPress or plugin versions.', 'vigilante' ), |
| 1518 | 1866 | 'extraFiles' => __( 'Extra Files', 'vigilante' ), |
| 1519 | 1867 | 'extra' => __( 'Extra', 'vigilante' ), |
| @@ -1545,8 +1893,11 @@ | ||
| 1545 | 1893 | 'reviewChanges' => __( 'Review changes', 'vigilante' ), |
| 1546 | 1894 | 'hideChanges' => __( 'Hide changes', 'vigilante' ), |
| 1547 | 1895 | 'changes' => __( 'Changes', 'vigilante' ), |
| 1548 | 1896 | 'diffUnavailable' => __( 'Diff not available for this file (baseline was created before diff tracking was added). Approve to enable diff on future changes.', 'vigilante' ), |
| 1897 | + 'diffNetwork' => __( 'This file belongs to the whole network, so its line changes are only shown to network administrators, on the main site.', 'vigilante' ), | |
| 1898 | + 'diffRescan' => __( 'Run a new scan to see the line changes of this file.', 'vigilante' ), | |
| 1899 | + 'diffRedaction' => __( 'The line changes of this file are not shown because a value in it could not be hidden safely. The change itself is still detected.', 'vigilante' ), | |
| 1549 | 1900 | 'diffEmpty' => __( 'No line-level changes detected (may be whitespace or reordering).', 'vigilante' ), |
| 1550 | 1901 | 'diffLines' => __( 'lines', 'vigilante' ), |
| 1551 | 1902 | // Under Attack mode strings |
| 1552 | 1903 | 'underAttackConfirmActivate' => __( 'Activate Under Attack mode? All visitors will see a verification page for the next 4 hours.', 'vigilante' ), |
| @@ -1762,9 +2113,89 @@ | ||
| 1762 | 2113 | |
| 1763 | 2114 | /** |
| 1764 | 2115 | * Show admin notices |
| 1765 | 2116 | */ |
| 2117 | + /** | |
| 2118 | + * Self-protection notice. | |
| 2119 | + * | |
| 2120 | + * A change to Vigilant own files is shown on every admin screen, because | |
| 2121 | + * waiting for someone to open the plugin is exactly what an attacker who | |
| 2122 | + * patched it would want. A warning is shown only on Vigilant screens, so | |
| 2123 | + * the notice that matters is not diluted. Neither is dismissible, both are | |
| 2124 | + * for administrators only, and on a network the steps depend on whether | |
| 2125 | + * the person can install plugins at all. | |
| 2126 | + */ | |
| 2127 | + public function maybe_show_self_protection_notice() { | |
| 2128 | + if ( ! current_user_can( 'manage_options' ) ) { | |
| 2129 | + return; | |
| 2130 | + } | |
| 2131 | + $summary = $this->self_integrity_summary(); | |
| 2132 | + $tone = $summary['tone']; | |
| 2133 | + if ( ! in_array( $tone, array( 'critical', 'off', 'warning' ), true ) ) { | |
| 2134 | + return; | |
| 2135 | + } | |
| 2136 | + | |
| 2137 | + // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Reading the screen slug to decide where a notice is shown; no action taken. | |
| 2138 | + $page = isset( $_GET['page'] ) ? sanitize_key( wp_unslash( $_GET['page'] ) ) : ''; | |
| 2139 | + $on_vigilante = ( 0 === strpos( $page, 'vigilante' ) ); | |
| 2140 | + if ( 'warning' === $tone && ! $on_vigilante ) { | |
| 2141 | + return; | |
| 2142 | + } | |
| 2143 | + $alarma = in_array( $tone, array( 'critical', 'off' ), true ); | |
| 2144 | + | |
| 2145 | + $link = admin_url( 'admin.php?page=vigilante&tab=file-integrity#vigilante-section-fi-self' ); | |
| 2146 | + $network = is_multisite() && ! current_user_can( 'update_plugins' ); | |
| 2147 | + ?> | |
| 2148 | + <div class="notice notice-<?php echo $alarma ? 'error' : 'warning'; ?> vigilante-self-notice"> | |
| 2149 | + <p class="vigilante-self-notice-title"> | |
| 2150 | + <span class="dashicons dashicons-shield" aria-hidden="true"></span> | |
| 2151 | + <strong> | |
| 2152 | + <?php | |
| 2153 | + if ( 'critical' === $tone ) { | |
| 2154 | + esc_html_e( 'Vigilant detected changes in its own files', 'vigilante' ); | |
| 2155 | + } elseif ( 'off' === $tone ) { | |
| 2156 | + esc_html_e( 'Vigilant self-protection is switched off by code', 'vigilante' ); | |
| 2157 | + } else { | |
| 2158 | + echo esc_html( $this->self_integrity_headline( $tone, $summary['state'] ) ); | |
| 2159 | + } | |
| 2160 | + ?> | |
| 2161 | + </strong> | |
| 2162 | + </p> | |
| 2163 | + <p class="vigilante-self-notice-text"> | |
| 2164 | + <span> | |
| 2165 | + <?php | |
| 2166 | + if ( 'critical' === $tone ) { | |
| 2167 | + esc_html_e( 'Your security plugin may have been tampered with, and while that is true nothing it reports can be trusted.', 'vigilante' ); | |
| 2168 | + } elseif ( 'off' === $tone ) { | |
| 2169 | + esc_html_e( 'Nothing is checking that Vigilant own files are intact. File Integrity says which file switches it off.', 'vigilante' ); | |
| 2170 | + } else { | |
| 2171 | + esc_html_e( 'File Integrity says what was found, what it means and what to do about it.', 'vigilante' ); | |
| 2172 | + } | |
| 2173 | + if ( $network ) { | |
| 2174 | + echo ' ' . esc_html__( 'Only your network administrator can repair Vigilant, because its files are shared by every site in the network. Let them know.', 'vigilante' ); | |
| 2175 | + } | |
| 2176 | + ?> | |
| 2177 | + </span> | |
| 2178 | + <?php | |
| 2179 | + /* | |
| 2180 | + * One button, on the same line as the text it belongs to, and it | |
| 2181 | + * leads to the whole story. Repairing from a notice, without | |
| 2182 | + * seeing which files, what it means and what it will do, is | |
| 2183 | + * asking someone to fix what they have not read: the repair | |
| 2184 | + * button lives in the card, after all that. | |
| 2185 | + */ | |
| 2186 | + ?> | |
| 2187 | + <a class="button button-primary button-small" href="<?php echo esc_url( $link ); ?>"> | |
| 2188 | + <?php esc_html_e( 'See what to do', 'vigilante' ); ?> | |
| 2189 | + </a> | |
| 2190 | + </p> | |
| 2191 | + </div> | |
| 2192 | + <?php | |
| 2193 | + } | |
| 2194 | + | |
| 1766 | 2195 | public function show_admin_notices() { |
| 2196 | + $this->maybe_show_self_protection_notice(); | |
| 2197 | + | |
| 1767 | 2198 | // Activation notice |
| 1768 | 2199 | if ( get_transient( 'vigilante_activated' ) ) { |
| 1769 | 2200 | ?> |
| 1770 | 2201 | <div class="notice notice-success is-dismissible vigilante-activation-notice"> |
| @@ -2115,10 +2546,46 @@ | ||
| 2115 | 2546 | * |
| 2116 | 2547 | * @since 2.10.4 |
| 2117 | 2548 | * @return bool |
| 2118 | 2549 | */ |
| 2550 | + private function forwarded_chain_readings() { | |
| 2551 | + // Shown, not decided on: the firewall resolves the address elsewhere. | |
| 2552 | + $chain = Vigilante_IP_Utils::trusted_forwarded_for(); | |
| 2553 | + | |
| 2554 | + if ( '' === $chain ) { | |
| 2555 | + return array(); | |
| 2556 | + } | |
| 2557 | + | |
| 2558 | + $public = array(); | |
| 2559 | + | |
| 2560 | + foreach ( explode( ',', $chain ) as $entry ) { | |
| 2561 | + $address = Vigilante_IP_Utils::unmap_ipv4( trim( $entry ) ); | |
| 2562 | + | |
| 2563 | + if ( filter_var( $address, FILTER_VALIDATE_IP ) && ! Vigilante_IP_Utils::is_own_network( $address ) ) { | |
| 2564 | + $public[] = $address; | |
| 2565 | + } | |
| 2566 | + } | |
| 2567 | + | |
| 2568 | + if ( count( $public ) < 2 ) { | |
| 2569 | + return array(); | |
| 2570 | + } | |
| 2571 | + | |
| 2572 | + return array( | |
| 2573 | + 'now' => Vigilante_IP_Utils::client_from_chain( $chain ), | |
| 2574 | + 'before' => $public[0], | |
| 2575 | + ); | |
| 2576 | + } | |
| 2577 | + | |
| 2578 | + /** | |
| 2579 | + * Whether the user tools of this screen are out of reach for this user | |
| 2580 | + * | |
| 2581 | + * @return bool | |
| 2582 | + */ | |
| 2119 | 2583 | private function user_actions_locked() { |
| 2120 | - return is_multisite() && ! current_user_can( 'manage_network_users' ); | |
| 2584 | + // On a single site edit_user maps to edit_users, which a custom role with | |
| 2585 | + // manage_options may lack: since 2.11.8 approving and rejecting a pending | |
| 2586 | + // registration ask for it, so the buttons have to say so there too. | |
| 2587 | + return is_multisite() ? ! current_user_can( 'manage_network_users' ) : ! current_user_can( 'edit_users' ); | |
| 2121 | 2588 | } |
| 2122 | 2589 | |
| 2123 | 2590 | /** |
| 2124 | 2591 | * Print the notice for user tools that cannot be used from this site |
| @@ -2130,9 +2597,13 @@ | ||
| 2130 | 2597 | return; |
| 2131 | 2598 | } |
| 2132 | 2599 | ?> |
| 2133 | 2600 | <div class="notice notice-info inline" style="margin:10px 0 16px;padding:8px 12px;"> |
| 2601 | + <?php if ( is_multisite() ) : ?> | |
| 2134 | 2602 | <p style="margin:0;"><?php esc_html_e( 'These tools act on user accounts, which on a network belong to the whole network rather than to one site. WordPress reserves that to network administrators, so they are managed from the network admin.', 'vigilante' ); ?></p> |
| 2603 | + <?php else : ?> | |
| 2604 | + <p style="margin:0;"><?php esc_html_e( 'These tools act on other user accounts, and your role cannot edit users, so they are not available to you.', 'vigilante' ); ?></p> | |
| 2605 | + <?php endif; ?> | |
| 2135 | 2606 | </div> |
| 2136 | 2607 | <?php |
| 2137 | 2608 | } |
| 2138 | 2609 | |
| @@ -2227,8 +2698,22 @@ | ||
| 2227 | 2698 | $categories = isset( $last_scan['categories'] ) && is_array( $last_scan['categories'] ) ? $last_scan['categories'] : array(); |
| 2228 | 2699 | $weekly_enabled = ! isset( $analyzer_settings['weekly_scan_enabled'] ) || ! empty( $analyzer_settings['weekly_scan_enabled'] ); |
| 2229 | 2700 | $email_enabled = ! empty( $analyzer_settings['email_on_regression'] ); |
| 2230 | 2701 | |
| 2702 | + /* | |
| 2703 | + * Self-protection caps the score, and it does so here and not only in | |
| 2704 | + * the stored report: the report is reused until the next Security | |
| 2705 | + * Check, so tampering found after it ran would otherwise be shown next | |
| 2706 | + * to the score the site earned before it happened. | |
| 2707 | + */ | |
| 2708 | + $self_summary = $this->self_integrity_summary(); | |
| 2709 | + $self_capped = in_array( $self_summary['tone'], array( 'critical', 'off' ), true ) | |
| 2710 | + || ( 'self_integrity' === ( isset( $last_scan['capped_by'] ) ? $last_scan['capped_by'] : '' ) ); | |
| 2711 | + if ( $self_capped && $has_data && $score > Vigilante_Security_Analyzer::SCORE_CAP_ON_TAMPER ) { | |
| 2712 | + $score = Vigilante_Security_Analyzer::SCORE_CAP_ON_TAMPER; | |
| 2713 | + $grade = 'E'; | |
| 2714 | + } | |
| 2715 | + | |
| 2231 | 2716 | $quality = self::analyzer_quality_tag( $score ); |
| 2232 | 2717 | ?> |
| 2233 | 2718 | <div class="vigilante-analyzer" id="vigilante-analyzer" |
| 2234 | 2719 | data-has-data="<?php echo $has_data ? '1' : '0'; ?>"> |
| @@ -2238,9 +2723,9 @@ | ||
| 2238 | 2723 | <span class="dashicons dashicons-shield-alt" aria-hidden="true"></span> |
| 2239 | 2724 | <?php esc_html_e( 'Security Check', 'vigilante' ); ?> |
| 2240 | 2725 | </h2> |
| 2241 | 2726 | <p class="description"> |
| 2242 | - <?php esc_html_e( 'On-demand audit of what an attacker would see right now, plus 13 internal checks impossible from the outside.', 'vigilante' ); ?> | |
| 2727 | + <?php esc_html_e( 'On-demand audit of what an attacker would see right now, plus internal checks impossible from the outside.', 'vigilante' ); ?> | |
| 2243 | 2728 | </p> |
| 2244 | 2729 | <p class="vigilante-analyzer-last-scan" data-role="ran-at"> |
| 2245 | 2730 | <span class="dashicons dashicons-clock" aria-hidden="true"></span> |
| 2246 | 2731 | <?php echo esc_html( $ran_at_human ); ?> |
| @@ -2253,8 +2738,19 @@ | ||
| 2253 | 2738 | </button> |
| 2254 | 2739 | </div> |
| 2255 | 2740 | </div> |
| 2256 | 2741 | |
| 2742 | + <?php if ( $self_capped ) : ?> | |
| 2743 | + <p class="vigilante-analyzer-capped"> | |
| 2744 | + <span class="dashicons dashicons-shield" aria-hidden="true"></span> | |
| 2745 | + <strong><?php esc_html_e( 'This score is not reliable right now.', 'vigilante' ); ?></strong> | |
| 2746 | + <?php esc_html_e( 'Vigilant own files have been changed, and every other result on this page is produced by that same code. The score is held at the bottom of the scale until the files verify clean again.', 'vigilante' ); ?> | |
| 2747 | + <a href="<?php echo esc_url( admin_url( 'admin.php?page=vigilante&tab=file-integrity#vigilante-section-fi-self' ) ); ?>"> | |
| 2748 | + <?php esc_html_e( 'See what to do', 'vigilante' ); ?> | |
| 2749 | + </a> | |
| 2750 | + </p> | |
| 2751 | + <?php endif; ?> | |
| 2752 | + | |
| 2257 | 2753 | <div class="vigilante-analyzer-summary"> |
| 2258 | 2754 | <div class="vigilante-analyzer-score-card"> |
| 2259 | 2755 | <?php if ( $has_data && $grade ) : ?> |
| 2260 | 2756 | <div class="vigilante-score-circle vigilante-grade-<?php echo esc_attr( strtolower( $grade ) ); ?>"> |
| @@ -2628,8 +3124,58 @@ | ||
| 2628 | 3124 | |
| 2629 | 3125 | /** |
| 2630 | 3126 | * Render dashboard tab |
| 2631 | 3127 | */ |
| 3128 | + /** | |
| 3129 | + * One line strip at the top of the Dashboard tab: the state of Vigilant own | |
| 3130 | + * files, above the Configuration Score and the Security Check, because | |
| 3131 | + * nothing else on this screen means much while it is red. | |
| 3132 | + */ | |
| 3133 | + private function render_self_protection_strip() { | |
| 3134 | + $summary = $this->self_integrity_summary(); | |
| 3135 | + $tone = $summary['tone']; | |
| 3136 | + $state = $summary['state']; | |
| 3137 | + $count = count( $summary['findings'] ); | |
| 3138 | + $link = admin_url( 'admin.php?page=vigilante&tab=file-integrity#vigilante-section-fi-self' ); | |
| 3139 | + ?> | |
| 3140 | + <div class="vigilante-self-strip vigilante-self-strip--<?php echo esc_attr( $tone ); ?>"> | |
| 3141 | + <span class="dashicons dashicons-shield" aria-hidden="true"></span> | |
| 3142 | + <strong><?php esc_html_e( 'Vigilant self-protection', 'vigilante' ); ?></strong> | |
| 3143 | + <span class="vigilante-self-strip-state"><?php echo esc_html( $this->self_integrity_headline( $tone, $state ) ); ?></span> | |
| 3144 | + <?php if ( $count > 0 ) : ?> | |
| 3145 | + <span class="vigilante-self-strip-count"> | |
| 3146 | + <?php | |
| 3147 | + printf( | |
| 3148 | + /* translators: %d: number of findings about Vigilant own files */ | |
| 3149 | + esc_html( _n( '%d finding', '%d findings', $count, 'vigilante' ) ), | |
| 3150 | + (int) $count | |
| 3151 | + ); | |
| 3152 | + ?> | |
| 3153 | + </span> | |
| 3154 | + <?php elseif ( ! empty( $state['last_check'] ) && 'off' !== $tone ) : ?> | |
| 3155 | + <span class="vigilante-self-strip-count"> | |
| 3156 | + <?php | |
| 3157 | + printf( | |
| 3158 | + /* translators: %s: human time difference, like "2 hours" */ | |
| 3159 | + esc_html__( 'checked %s ago', 'vigilante' ), | |
| 3160 | + esc_html( human_time_diff( (int) $state['last_check'], time() ) ) | |
| 3161 | + ); | |
| 3162 | + ?> | |
| 3163 | + </span> | |
| 3164 | + <?php endif; ?> | |
| 3165 | + <a href="<?php echo esc_url( $link ); ?>"> | |
| 3166 | + <?php | |
| 3167 | + if ( in_array( $tone, array( 'critical', 'off', 'warning' ), true ) ) { | |
| 3168 | + esc_html_e( 'See what to do', 'vigilante' ); | |
| 3169 | + } else { | |
| 3170 | + esc_html_e( 'See details', 'vigilante' ); | |
| 3171 | + } | |
| 3172 | + ?> | |
| 3173 | + </a> | |
| 3174 | + </div> | |
| 3175 | + <?php | |
| 3176 | + } | |
| 3177 | + | |
| 2632 | 3178 | private function render_tab_dashboard() { |
| 2633 | 3179 | $options = $this->settings->get_all_options(); |
| 2634 | 3180 | $module_labels = $this->settings->get_module_labels(); |
| 2635 | 3181 | $module_descriptions = $this->settings->get_module_descriptions(); |
| @@ -2649,8 +3195,9 @@ | ||
| 2649 | 3195 | $analyzer_categories_def = Vigilante_Security_Analyzer::get_categories(); |
| 2650 | 3196 | $analyzer_settings = isset( $options['security_analyzer'] ) ? $options['security_analyzer'] : array(); |
| 2651 | 3197 | ?> |
| 2652 | 3198 | <div class="vigilante-dashboard"> |
| 3199 | + <?php $this->render_self_protection_strip(); ?> | |
| 2653 | 3200 | <div class="vigilante-status-card"> |
| 2654 | 3201 | <h2><?php esc_html_e( 'Configuration Score', 'vigilante' ); ?></h2> |
| 2655 | 3202 | <p class="vigilante-score-kind description"> |
| 2656 | 3203 | <?php esc_html_e( 'How well Vigilante is configured right now. Pair it with the Security Check below to see the real-world result.', 'vigilante' ); ?> |
| @@ -3307,8 +3854,29 @@ | ||
| 3307 | 3854 | </table> |
| 3308 | 3855 | </div> |
| 3309 | 3856 | <?php endif; ?> |
| 3310 | 3857 | |
| 3858 | + <?php | |
| 3859 | + // Since 2.11.8 X-Forwarded-For is read from its end, where the proxy | |
| 3860 | + // writes. The administrator's own request shows whether that end is | |
| 3861 | + // a CDN or a balancer for everybody here. Cross review of 2.11.8. | |
| 3862 | + $xff_readings = $this->forwarded_chain_readings(); | |
| 3863 | + if ( $xff_readings ) : | |
| 3864 | + ?> | |
| 3865 | + <div id="vigilante-xff-chain-notice" class="notice notice-warning inline" style="margin:10px 0 16px;padding:8px 12px;"> | |
| 3866 | + <p style="margin:0;"> | |
| 3867 | + <?php | |
| 3868 | + printf( | |
| 3869 | + /* translators: 1: last address in the header, the one Vigilant reads, 2: first address in the header, which a visitor can write */ | |
| 3870 | + esc_html__( 'Your own request reaches the site with more than one public address in X-Forwarded-For. Vigilant reads the last one, %1$s, which is the one your proxy added, and not the first one, %2$s, which a visitor can write. If %1$s belongs to a CDN or a load balancer rather than to you, every visitor shares it for rate limiting, login lockouts and the IP lists: choose the header of that CDN in Visitor IP detection, such as CF-Connecting-IP for Cloudflare.', 'vigilante' ), | |
| 3871 | + esc_html( $xff_readings['now'] ), | |
| 3872 | + esc_html( $xff_readings['before'] ) | |
| 3873 | + ); | |
| 3874 | + ?> | |
| 3875 | + </p> | |
| 3876 | + </div> | |
| 3877 | + <?php endif; ?> | |
| 3878 | + | |
| 3311 | 3879 | <h3><?php esc_html_e( 'IP Lists', 'vigilante' ); ?></h3> |
| 3312 | 3880 | <p class="description"> |
| 3313 | 3881 | <?php |
| 3314 | 3882 | printf( |
| @@ -3334,8 +3902,20 @@ | ||
| 3334 | 3902 | </p> |
| 3335 | 3903 | </td> |
| 3336 | 3904 | </tr> |
| 3337 | 3905 | <tr> |
| 3906 | + <th scope="row"><label for="vigilante-f-firewall-trusted-proxies"><?php esc_html_e( 'Trusted proxy IPs', 'vigilante' ); ?></label></th> | |
| 3907 | + <td> | |
| 3908 | + <textarea id="vigilante-f-firewall-trusted-proxies" name="firewall[trusted_proxies]" rows="3" class="large-text code" placeholder="10.0.0.0/8 192.168.1.1" <?php disabled( $vg_main_locked ); ?>><?php echo esc_textarea( implode( "\n", $options['trusted_proxies'] ?? array() ) ); ?></textarea> | |
| 3909 | + <p class="description"> | |
| 3910 | + <?php esc_html_e( 'Only used with a forwarded header selected above. One IP or CIDR range per line: the addresses your proxy or load balancer connects from. The forwarded header is accepted only from these. Left empty, Vigilant accepts it from your own private network, and for Cloudflare from Cloudflare\'s own ranges automatically.', 'vigilante' ); ?> | |
| 3911 | + <?php if ( in_array( $proxy_header, array( 'x-forwarded-for', 'x-real-ip' ), true ) && empty( $options['trusted_proxies'] ) ) : ?> | |
| 3912 | + <br><strong><?php esc_html_e( 'The header above is trusted but no proxy IPs are set. If your proxy or load balancer connects from a public address, add it here, or the header is ignored for safety and every visitor is seen as that proxy.', 'vigilante' ); ?></strong> | |
| 3913 | + <?php endif; ?> | |
| 3914 | + </p> | |
| 3915 | + </td> | |
| 3916 | + </tr> | |
| 3917 | + <tr> | |
| 3338 | 3918 | <th scope="row"><label for="vigilante-f-firewall-ip-whitelist"><?php esc_html_e( 'IP Whitelist', 'vigilante' ); ?></label></th> |
| 3339 | 3919 | <td> |
| 3340 | 3920 | <textarea id="vigilante-f-firewall-ip-whitelist" name="firewall[ip_whitelist]" <?php disabled( $vg_main_locked ); ?> rows="4" class="large-text code" placeholder="192.168.1.50 192.168.1.0/24 192.168.1.*"><?php echo esc_textarea( implode( "\n", $options['ip_whitelist'] ?? array() ) ); ?></textarea> |
| 3341 | 3921 | <p class="description"> |
| @@ -3877,8 +4457,9 @@ | ||
| 3877 | 4457 | <tr> |
| 3878 | 4458 | <th scope="row"><?php esc_html_e( 'Enforce for roles', 'vigilante' ); ?></th> |
| 3879 | 4459 | <td> |
| 3880 | 4460 | <div class="vigilante-2fa-roles"> |
| 4461 | + <?php $this->list_sentinel( 'login_security[two_factor][enforced_roles]' ); ?> | |
| 3881 | 4462 | <?php foreach ( $all_roles as $role_slug => $role_data ) : |
| 3882 | 4463 | $user_count = count( get_users( array( 'role' => $role_slug, 'fields' => 'ID' ) ) ); |
| 3883 | 4464 | ?> |
| 3884 | 4465 | <label> |
| @@ -3906,8 +4487,9 @@ | ||
| 3906 | 4487 | autocomplete="off"> |
| 3907 | 4488 | <div class="vigilante-2fa-search-results"></div> |
| 3908 | 4489 | </div> |
| 3909 | 4490 | <div class="vigilante-2fa-excluded-users"> |
| 4491 | + <?php $this->list_sentinel( 'login_security[two_factor][excluded_users]' ); ?> | |
| 3910 | 4492 | <?php |
| 3911 | 4493 | foreach ( $excluded as $user_id ) : |
| 3912 | 4494 | $user = get_user_by( 'ID', $user_id ); |
| 3913 | 4495 | if ( ! $user ) continue; |
| @@ -4088,9 +4670,9 @@ | ||
| 4088 | 4670 | ?> |
| 4089 | 4671 | <div class="vigilante-settings-section" id="vigilante-headers-recovery"> |
| 4090 | 4672 | <h2><?php esc_html_e( 'Recover your previous header settings', 'vigilante' ); ?></h2> |
| 4091 | 4673 | <p> |
| 4092 | - <?php esc_html_e( 'Updating to 2.9.8 reset this tab to factory values: the migration replaced the whole section instead of merging into it. Your server kept sending the right headers, because the .htaccess had not been rewritten yet, so Vigilant saved a copy of that file before touching it. These are the settings it found in that copy.', 'vigilante' ); ?> | |
| 4674 | + <?php esc_html_e( 'An earlier update reset this tab to factory values: the migration replaced the whole section instead of merging into it. Your server kept sending the right headers, because the .htaccess had not been rewritten yet, so Vigilant saved a copy of that file before touching it. These are the settings it found in that copy.', 'vigilante' ); ?> | |
| 4093 | 4675 | </p> |
| 4094 | 4676 | <?php if ( $taken ) : ?> |
| 4095 | 4677 | <p class="description"> |
| 4096 | 4678 | <?php |
| @@ -4211,8 +4793,9 @@ | ||
| 4211 | 4793 | <label> |
| 4212 | 4794 | <input type="checkbox" name="security_headers[csp][enabled]" value="1" <?php checked( ! empty( $options['csp']['enabled'] ) ); ?>> |
| 4213 | 4795 | <?php esc_html_e( 'Enable Content Security Policy', 'vigilante' ); ?> |
| 4214 | 4796 | </label> |
| 4797 | + <p class="description"><?php esc_html_e( 'The default policy includes upgrade-insecure-requests, which asks browsers to request every http:// resource over https. Vigilant writes it only when the site address starts with https://, because on a site served over http it would stop every stylesheet, script and image from loading. If your site is served over https through a proxy or CDN that terminates TLS, set the site address to https:// in Settings > General; the rules follow the next time this tab is saved or Vigilant is updated.', 'vigilante' ); ?></p> | |
| 4215 | 4798 | </td> |
| 4216 | 4799 | </tr> |
| 4217 | 4800 | <tr> |
| 4218 | 4801 | <th scope="row"><?php esc_html_e( 'Report Only Mode', 'vigilante' ); ?></th> |
| @@ -4563,8 +5146,9 @@ | ||
| 4563 | 5146 | </tr> |
| 4564 | 5147 | <tr> |
| 4565 | 5148 | <th scope="row"><?php esc_html_e( 'Apply Password Rules To', 'vigilante' ); ?></th> |
| 4566 | 5149 | <td> |
| 5150 | + <?php $this->list_sentinel( 'user_security[password_policy][affected_roles]' ); ?> | |
| 4567 | 5151 | <?php foreach ( wp_roles()->get_names() as $role_slug => $role_name ) : ?> |
| 4568 | 5152 | <label style="display:block;margin-bottom:5px;"> |
| 4569 | 5153 | <input type="checkbox" name="user_security[password_policy][affected_roles][]" value="<?php echo esc_attr( $role_slug ); ?>" <?php checked( empty( $pw_policy_roles ) || in_array( $role_slug, $pw_policy_roles, true ) ); ?>> |
| 4570 | 5154 | <?php echo esc_html( translate_user_role( $role_name ) ); ?> |
| @@ -4699,8 +5283,16 @@ | ||
| 4699 | 5283 | <span class="vigilante-method-badge php"><?php esc_html_e( 'PHP', 'vigilante' ); ?></span> |
| 4700 | 5284 | </h2> |
| 4701 | 5285 | <p><?php esc_html_e( 'Limit the number of simultaneous sessions per user.', 'vigilante' ); ?></p> |
| 4702 | 5286 | |
| 5287 | + <?php if ( Vigilante_User_Security::session_limit_is_network_wide() ) : ?> | |
| 5288 | + <div class="notice notice-warning inline"> | |
| 5289 | + <p> | |
| 5290 | + <?php esc_html_e( 'This limit does not apply on a network. WordPress keeps the sessions of an account for the whole network, not per site, so a limit set here would count and close the sessions that person opened on other sites, including an administrator session elsewhere. A network-wide session policy is planned; until then these settings are saved but not enforced.', 'vigilante' ); ?> | |
| 5291 | + </p> | |
| 5292 | + </div> | |
| 5293 | + <?php endif; ?> | |
| 5294 | + | |
| 4703 | 5295 | <table class="form-table"> |
| 4704 | 5296 | <tr> |
| 4705 | 5297 | <th scope="row"><?php esc_html_e( 'Enable Session Limits', 'vigilante' ); ?></th> |
| 4706 | 5298 | <td> |
| @@ -4796,8 +5388,9 @@ | ||
| 4796 | 5388 | <td> |
| 4797 | 5389 | <?php |
| 4798 | 5390 | $affected_roles = $password_exp['affected_roles'] ?? array( 'administrator', 'editor' ); |
| 4799 | 5391 | $all_roles = wp_roles()->get_names(); |
| 5392 | + $this->list_sentinel( 'user_security[password_expiration][affected_roles]' ); | |
| 4800 | 5393 | foreach ( $all_roles as $role_slug => $role_name ) : |
| 4801 | 5394 | ?> |
| 4802 | 5395 | <label style="display: block; margin-bottom: 5px;"> |
| 4803 | 5396 | <input type="checkbox" name="user_security[password_expiration][affected_roles][]" value="<?php echo esc_attr( $role_slug ); ?>" <?php checked( in_array( $role_slug, $affected_roles, true ) ); ?>> |
| @@ -4819,8 +5412,9 @@ | ||
| 4819 | 5412 | autocomplete="off"> |
| 4820 | 5413 | <div class="vigilante-pwexp-search-results"></div> |
| 4821 | 5414 | </div> |
| 4822 | 5415 | <div class="vigilante-pwexp-excluded-users"> |
| 5416 | + <?php $this->list_sentinel( 'user_security[password_expiration][excluded_users]' ); ?> | |
| 4823 | 5417 | <?php |
| 4824 | 5418 | foreach ( $pwexp_excluded as $pwexp_excluded_id ) : |
| 4825 | 5419 | $excluded_user = get_user_by( 'ID', $pwexp_excluded_id ); |
| 4826 | 5420 | if ( ! $excluded_user ) { |
| @@ -5040,9 +5634,17 @@ | ||
| 5040 | 5634 | </div> |
| 5041 | 5635 | |
| 5042 | 5636 | <!-- Pending Registrations --> |
| 5043 | 5637 | <?php |
| 5044 | - $user_security = new Vigilante_User_Security( $this->settings, $this->activity_log ); | |
| 5638 | + // Enforcement-only: this instance exists to read the queue, and the | |
| 5639 | + // flag keeps it from registering the module's own hooks a second | |
| 5640 | + // time. It is not inert, and saying it was would be a false comment: | |
| 5641 | + // init_enforcement_hooks() does add its three filters again, on top | |
| 5642 | + // of the ones already registered. They are idempotent (the same | |
| 5643 | + // methods of an equivalent instance, deciding on the same user meta), | |
| 5644 | + // so running them twice in an admin request changes nothing, which is | |
| 5645 | + // why this is accepted rather than worked around. | |
| 5646 | + $user_security = new Vigilante_User_Security( $this->settings, $this->activity_log, true ); | |
| 5045 | 5647 | $pending_users = $user_security->get_pending_users(); |
| 5046 | 5648 | ?> |
| 5047 | 5649 | <div id="vigilante-section-users-pending" class="vigilante-tool-box vigilante-pending-users-section"> |
| 5048 | 5650 | <h3> |
| @@ -5051,9 +5653,20 @@ | ||
| 5051 | 5653 | <span class="vigilante-badge vigilante-badge-warning"><?php echo esc_html( count( $pending_users ) ); ?></span> |
| 5052 | 5654 | <?php endif; ?> |
| 5053 | 5655 | </h3> |
| 5054 | 5656 | |
| 5055 | - <?php if ( empty( $registration['enabled'] ) ) : ?> | |
| 5657 | + <?php | |
| 5658 | + /* | |
| 5659 | + * The queue is shown whenever there is somebody in it, even with | |
| 5660 | + * the feature off. Since 2.11.10 an account already waiting stays | |
| 5661 | + * blocked when the feature is switched off, which is the point: | |
| 5662 | + * turning a setting off must not quietly let in people an | |
| 5663 | + * administrator decided not to approve. But hiding the table then | |
| 5664 | + * left them locked out with no button anywhere to approve or | |
| 5665 | + * reject them. Found by the cross review of 2.11.10. | |
| 5666 | + */ | |
| 5667 | + ?> | |
| 5668 | + <?php if ( empty( $registration['enabled'] ) && empty( $pending_users ) ) : ?> | |
| 5056 | 5669 | <p class="description"> |
| 5057 | 5670 | <span class="dashicons dashicons-info" style="color: #72aee6;"></span> |
| 5058 | 5671 | <?php esc_html_e( 'Registration approval is disabled. Enable it in the settings above to require manual approval for new users.', 'vigilante' ); ?> |
| 5059 | 5672 | </p> |
| @@ -5062,8 +5675,9 @@ | ||
| 5062 | 5675 | <span class="dashicons dashicons-yes-alt"></span> |
| 5063 | 5676 | <p><?php esc_html_e( 'No pending registrations.', 'vigilante' ); ?></p> |
| 5064 | 5677 | </div> |
| 5065 | 5678 | <?php else : ?> |
| 5679 | + <?php $this->render_user_actions_notice(); ?> | |
| 5066 | 5680 | <table class="wp-list-table widefat fixed striped vigilante-pending-users-table"> |
| 5067 | 5681 | <thead> |
| 5068 | 5682 | <tr> |
| 5069 | 5683 | <th><?php esc_html_e( 'User', 'vigilante' ); ?></th> |
| @@ -5073,9 +5687,9 @@ | ||
| 5073 | 5687 | </tr> |
| 5074 | 5688 | </thead> |
| 5075 | 5689 | <tbody> |
| 5076 | 5690 | <?php foreach ( $pending_users as $pending_user ) : |
| 5077 | - $pending_since = get_user_meta( $pending_user->ID, 'vigilante_pending_since', true ); | |
| 5691 | + $pending_since = get_user_meta( $pending_user->ID, Vigilante_User_Security::site_user_meta_key( 'vigilante_pending_since' ), true ); | |
| 5078 | 5692 | ?> |
| 5079 | 5693 | <tr data-user-id="<?php echo esc_attr( $pending_user->ID ); ?>"> |
| 5080 | 5694 | <td> |
| 5081 | 5695 | <?php echo get_avatar( $pending_user->ID, 32 ); ?> |
| @@ -5092,12 +5706,12 @@ | ||
| 5092 | 5706 | } |
| 5093 | 5707 | ?> |
| 5094 | 5708 | </td> |
| 5095 | 5709 | <td> |
| 5096 | - <button type="button" class="button button-small vigilante-approve-user" data-user-id="<?php echo esc_attr( $pending_user->ID ); ?>"> | |
| 5710 | + <button type="button" class="button button-small vigilante-approve-user" data-user-id="<?php echo esc_attr( $pending_user->ID ); ?>" <?php disabled( $this->user_actions_locked() ); ?>> | |
| 5097 | 5711 | <?php esc_html_e( 'Approve', 'vigilante' ); ?> |
| 5098 | 5712 | </button> |
| 5099 | - <button type="button" class="button button-small vigilante-reject-user" data-user-id="<?php echo esc_attr( $pending_user->ID ); ?>" style="color: #d63638;"> | |
| 5713 | + <button type="button" class="button button-small vigilante-reject-user" data-user-id="<?php echo esc_attr( $pending_user->ID ); ?>" style="color: #d63638;" <?php disabled( $this->user_actions_locked() ); ?>> | |
| 5100 | 5714 | <?php esc_html_e( 'Reject', 'vigilante' ); ?> |
| 5101 | 5715 | </button> |
| 5102 | 5716 | </td> |
| 5103 | 5717 | </tr> |
| @@ -5944,8 +6558,19 @@ | ||
| 5944 | 6558 | 'is_ip_blacklisted' => ( '' !== $ip_val && in_array( $ip_val, $ip_blacklist, true ) ), |
| 5945 | 6559 | 'is_ua_whitelisted' => ( '' !== $ua_val && in_array( $ua_val, $ua_whitelist, true ) ), |
| 5946 | 6560 | 'is_ua_blacklisted' => ( '' !== $ua_val && in_array( $ua_val, $ua_blacklist, true ) ), |
| 5947 | 6561 | ); |
| 6562 | + // Self-protection entries carry what happened, what | |
| 6563 | + // it means and what to do, from the same catalogue | |
| 6564 | + // the File Integrity box uses. | |
| 6565 | + $vg_self_event = Vigilante_Self_Integrity_Guidance::for_log_event( | |
| 6566 | + (string) ( $log->event_action ?? '' ), | |
| 6567 | + $log->extra_data ?? '', | |
| 6568 | + (string) ( $log->severity ?? 'info' ) | |
| 6569 | + ); | |
| 6570 | + if ( null !== $vg_self_event ) { | |
| 6571 | + $details['self'] = $vg_self_event; | |
| 6572 | + } | |
| 5948 | 6573 | $display_type = isset( $type_labels[ $log->event_type ] ) ? $type_labels[ $log->event_type ] : $log->event_type; |
| 5949 | 6574 | $display_severity = isset( $severity_labels[ $log->severity ] ) ? $severity_labels[ $log->severity ] : $log->severity; |
| 5950 | 6575 | ?> |
| 5951 | 6576 | <tr class="vigilante-severity-<?php echo esc_attr( $log->severity ); ?>"> |
| @@ -5988,15 +6613,439 @@ | ||
| 5988 | 6613 | |
| 5989 | 6614 | /** |
| 5990 | 6615 | * Render File Integrity tab |
| 5991 | 6616 | */ |
| 6617 | + /** | |
| 6618 | + * Findings of the self-check grouped by the case that explains them, worst | |
| 6619 | + * first: ten modified files are one case with ten paths, not ten copies of | |
| 6620 | + * the same explanation. | |
| 6621 | + * | |
| 6622 | + * @param array $findings Findings from the state. | |
| 6623 | + * @return array | |
| 6624 | + */ | |
| 6625 | + private function self_findings_by_case( $findings ) { | |
| 6626 | + $groups = array(); | |
| 6627 | + foreach ( (array) $findings as $finding ) { | |
| 6628 | + if ( ! is_array( $finding ) || 'info' === ( $finding['severity'] ?? '' ) ) { | |
| 6629 | + continue; | |
| 6630 | + } | |
| 6631 | + $guidance = Vigilante_Self_Integrity_Guidance::for_finding( $finding ); | |
| 6632 | + $key = $guidance['key']; | |
| 6633 | + if ( ! isset( $groups[ $key ] ) ) { | |
| 6634 | + $guidance['files'] = array(); | |
| 6635 | + $guidance['severity'] = 'warning'; | |
| 6636 | + $groups[ $key ] = $guidance; | |
| 6637 | + } | |
| 6638 | + $file = isset( $finding['file'] ) ? (string) $finding['file'] : ''; | |
| 6639 | + if ( '' !== $file && ! in_array( $file, $groups[ $key ]['files'], true ) ) { | |
| 6640 | + $groups[ $key ]['files'][] = $file; | |
| 6641 | + } | |
| 6642 | + if ( 'critical' === ( $finding['severity'] ?? '' ) ) { | |
| 6643 | + $groups[ $key ]['severity'] = 'critical'; | |
| 6644 | + } | |
| 6645 | + } | |
| 6646 | + uasort( | |
| 6647 | + $groups, | |
| 6648 | + function ( $a, $b ) { | |
| 6649 | + $rank = array( 'critical' => 0, 'warning' => 1 ); | |
| 6650 | + $ra = isset( $rank[ $a['severity'] ] ) ? $rank[ $a['severity'] ] : 2; | |
| 6651 | + $rb = isset( $rank[ $b['severity'] ] ) ? $rank[ $b['severity'] ] : 2; | |
| 6652 | + return $ra - $rb; | |
| 6653 | + } | |
| 6654 | + ); | |
| 6655 | + return $groups; | |
| 6656 | + } | |
| 6657 | + | |
| 6658 | + /** | |
| 6659 | + * Human label for the context that ran the last self-check. | |
| 6660 | + * | |
| 6661 | + * @param string $context Stored context. | |
| 6662 | + * @return string | |
| 6663 | + */ | |
| 6664 | + private function self_context_label( $context ) { | |
| 6665 | + switch ( (string) $context ) { | |
| 6666 | + case 'scan': | |
| 6667 | + return __( 'during a file integrity scan', 'vigilante' ); | |
| 6668 | + case 'upgrader': | |
| 6669 | + return __( 'right after updating Vigilant', 'vigilante' ); | |
| 6670 | + case 'version_change': | |
| 6671 | + return __( 'after a version change made outside the updater', 'vigilante' ); | |
| 6672 | + case 'migration': | |
| 6673 | + return __( 'while updating to this version', 'vigilante' ); | |
| 6674 | + case 'activation': | |
| 6675 | + return __( 'when Vigilant was activated', 'vigilante' ); | |
| 6676 | + case 'watchdog': | |
| 6677 | + return __( 'from the scheduled task watchdog', 'vigilante' ); | |
| 6678 | + } | |
| 6679 | + return ''; | |
| 6680 | + } | |
| 6681 | + | |
| 6682 | + /** | |
| 6683 | + * Short line for the badge of the box, the notices and the Dashboard strip. | |
| 6684 | + * | |
| 6685 | + * @param string $tone Tone from Vigilante_Self_Integrity::tone(). | |
| 6686 | + * @param array $state State. | |
| 6687 | + * @return string | |
| 6688 | + */ | |
| 6689 | + private function self_integrity_headline( $tone, $state ) { | |
| 6690 | + $files = isset( $state['files_checked'] ) ? (int) $state['files_checked'] : 0; | |
| 6691 | + $anchors = ( isset( $state['anchors'] ) && is_array( $state['anchors'] ) ) ? $state['anchors'] : array(); | |
| 6692 | + switch ( $tone ) { | |
| 6693 | + case 'critical': | |
| 6694 | + return __( 'Changes detected in Vigilant own files', 'vigilante' ); | |
| 6695 | + case 'warning': | |
| 6696 | + return ( $files < 1 ) | |
| 6697 | + ? __( 'Vigilant could not check its own files', 'vigilante' ) | |
| 6698 | + : __( 'Vigilant self-protection needs your attention', 'vigilante' ); | |
| 6699 | + case 'off': | |
| 6700 | + return __( 'Self-protection is switched off by code', 'vigilante' ); | |
| 6701 | + case 'none': | |
| 6702 | + return __( 'Vigilant has not checked its own files yet', 'vigilante' ); | |
| 6703 | + } | |
| 6704 | + return sprintf( | |
| 6705 | + /* translators: 1: number of files verified, 2: number of references available, out of three */ | |
| 6706 | + __( 'Verified: %1$d files, %2$d of 3 references', 'vigilante' ), | |
| 6707 | + $files, | |
| 6708 | + count( array_filter( $anchors ) ) | |
| 6709 | + ); | |
| 6710 | + } | |
| 6711 | + | |
| 6712 | + /** | |
| 6713 | + * Vigilant self-protection box: the first block of the File Integrity | |
| 6714 | + * results, with its own colour by severity, what each finding means and | |
| 6715 | + * how to fix it. | |
| 6716 | + * | |
| 6717 | + * It renders whether or not a scan has been stored, because the self-check | |
| 6718 | + * also runs after every update and once a day: before 3.0.0 this lived in | |
| 6719 | + * a line above the numeric cards of the last scan, where it was invisible | |
| 6720 | + * and, without a stored scan, absent. | |
| 6721 | + * | |
| 6722 | + * @param array $fi_options File Integrity settings section. | |
| 6723 | + */ | |
| 6724 | + /** | |
| 6725 | + * Everything the screens need to say about self-protection, read once: | |
| 6726 | + * the state, its findings grouped by case, and the tone that colours the | |
| 6727 | + * box, the menu counter and the notices. | |
| 6728 | + * | |
| 6729 | + * @param array|null $fi_options File Integrity settings, read if not given. | |
| 6730 | + * @return array { state, findings, groups, tone, enabled } | |
| 6731 | + */ | |
| 6732 | + private function self_integrity_summary( $fi_options = null ) { | |
| 6733 | + // Four to six screens ask for this in the same page load (menu, notice, | |
| 6734 | + // box, strip, both scores). The option is cached by the core options | |
| 6735 | + // layer, but the grouping and the tone are not: memoize per request. | |
| 6736 | + static $cached = null; | |
| 6737 | + if ( null !== $cached && ! is_array( $fi_options ) ) { | |
| 6738 | + return $cached; | |
| 6739 | + } | |
| 6740 | + if ( ! is_array( $fi_options ) ) { | |
| 6741 | + $fi_options = (array) $this->settings->get_section( 'file_integrity' ); | |
| 6742 | + } | |
| 6743 | + $enabled = Vigilante_Self_Integrity::is_on(); | |
| 6744 | + $state = Vigilante_Self_Integrity::display_state(); | |
| 6745 | + $findings = Vigilante_Self_Integrity::state_findings( $state, $enabled ); | |
| 6746 | + $summary = array( | |
| 6747 | + 'state' => $state, | |
| 6748 | + 'findings' => $findings, | |
| 6749 | + 'groups' => $this->self_findings_by_case( $findings ), | |
| 6750 | + 'tone' => Vigilante_Self_Integrity::tone( $state, $enabled ), | |
| 6751 | + 'enabled' => $enabled, | |
| 6752 | + ); | |
| 6753 | + $cached = $summary; | |
| 6754 | + return $summary; | |
| 6755 | + } | |
| 6756 | + | |
| 6757 | + private function render_self_protection_box( $fi_options ) { | |
| 6758 | + $summary = $this->self_integrity_summary( $fi_options ); | |
| 6759 | + $enabled = $summary['enabled']; | |
| 6760 | + $state = $summary['state']; | |
| 6761 | + $findings = $summary['findings']; | |
| 6762 | + $groups = $summary['groups']; | |
| 6763 | + $tone = $summary['tone']; | |
| 6764 | + $total = isset( $state['last_findings_total'] ) ? (int) $state['last_findings_total'] : count( $findings ); | |
| 6765 | + $status = array( | |
| 6766 | + 'status' => isset( $state['last_status'] ) ? (string) $state['last_status'] : '', | |
| 6767 | + 'files' => isset( $state['files_checked'] ) ? (int) $state['files_checked'] : 0, | |
| 6768 | + 'anchors' => ( isset( $state['anchors'] ) && is_array( $state['anchors'] ) ) ? $state['anchors'] : array(), | |
| 6769 | + 'enabled' => $enabled, | |
| 6770 | + 'has_run' => ! empty( $state['last_check'] ), | |
| 6771 | + ); | |
| 6772 | + | |
| 6773 | + /* | |
| 6774 | + * Nothing to do, nothing to open: one line. A card with a big icon and | |
| 6775 | + * folded sections for "everything is fine" is furniture, and furniture | |
| 6776 | + * is what made the previous version of this invisible. | |
| 6777 | + */ | |
| 6778 | + if ( empty( $groups ) ) { | |
| 6779 | + $this->render_self_line( $tone, $state, $status ); | |
| 6780 | + return; | |
| 6781 | + } | |
| 6782 | + | |
| 6783 | + $datetime_format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' ); | |
| 6784 | + $context_label = $this->self_context_label( isset( $state['last_context'] ) ? $state['last_context'] : '' ); | |
| 6785 | + $icon = ( 'critical' === $tone ) ? 'dashicons-shield' : 'dashicons-warning'; | |
| 6786 | + ?> | |
| 6787 | + <div id="vigilante-section-fi-self" class="vigilante-settings-section vigilante-self-box vigilante-self-box--<?php echo esc_attr( $tone ); ?>"> | |
| 6788 | + <div class="vigilante-self-card"> | |
| 6789 | + <div class="vigilante-self-head"> | |
| 6790 | + <span class="vigilante-self-icon"><span class="dashicons <?php echo esc_attr( $icon ); ?>" aria-hidden="true"></span></span> | |
| 6791 | + <div class="vigilante-self-head-text"> | |
| 6792 | + <h2><?php echo esc_html( $this->self_integrity_headline( $tone, $state ) ); ?></h2> | |
| 6793 | + <p class="vigilante-self-meta"> | |
| 6794 | + <?php | |
| 6795 | + printf( | |
| 6796 | + /* translators: %s: date and time of the last self-check */ | |
| 6797 | + esc_html__( 'Checked on %s', 'vigilante' ), | |
| 6798 | + esc_html( wp_date( $datetime_format, (int) $state['last_check'] ) ) | |
| 6799 | + ); | |
| 6800 | + if ( '' !== $context_label ) { | |
| 6801 | + echo ', ' . esc_html( $context_label ); | |
| 6802 | + } | |
| 6803 | + if ( $status['files'] > 0 ) { | |
| 6804 | + echo ', '; | |
| 6805 | + printf( | |
| 6806 | + /* translators: 1: number of files checked, 2: number of references available, out of three */ | |
| 6807 | + esc_html__( '%1$d files against %2$d of 3 references', 'vigilante' ), | |
| 6808 | + (int) $status['files'], | |
| 6809 | + (int) count( array_filter( $status['anchors'] ) ) | |
| 6810 | + ); | |
| 6811 | + } | |
| 6812 | + ?> | |
| 6813 | + </p> | |
| 6814 | + </div> | |
| 6815 | + </div> | |
| 6816 | + | |
| 6817 | + <div class="vigilante-self-cases"> | |
| 6818 | + <?php | |
| 6819 | + $first = true; | |
| 6820 | + foreach ( $groups as $group ) { | |
| 6821 | + $this->render_self_case( $group, $group['files'], $group['severity'], $first ); | |
| 6822 | + $first = false; | |
| 6823 | + } | |
| 6824 | + | |
| 6825 | + if ( in_array( $tone, array( 'critical', 'warning' ), true ) ) { | |
| 6826 | + $can_repair = class_exists( 'Vigilante_Self_Repair' ) && Vigilante_Self_Repair::can_repair(); | |
| 6827 | + if ( ! $can_repair ) { | |
| 6828 | + if ( class_exists( 'Vigilante_Self_Repair' ) && ! Vigilante_Self_Repair::folder_is_the_distributed_one() ) { | |
| 6829 | + $vg_reason = 'renamed'; | |
| 6830 | + } elseif ( ! wp_is_file_mod_allowed( 'capability_update_core' ) ) { | |
| 6831 | + // With DISALLOW_FILE_MODS nobody can do it from the admin, | |
| 6832 | + // not even a network administrator: telling a subsite admin | |
| 6833 | + // to ask theirs would send them to someone equally blocked. | |
| 6834 | + $vg_reason = 'no_caps'; | |
| 6835 | + } elseif ( is_multisite() && ! current_user_can( 'update_plugins' ) ) { | |
| 6836 | + $vg_reason = 'network'; | |
| 6837 | + } else { | |
| 6838 | + $vg_reason = 'no_caps'; | |
| 6839 | + } | |
| 6840 | + $this->render_self_case( | |
| 6841 | + array( | |
| 6842 | + 'title' => __( 'How to repair it here', 'vigilante' ), | |
| 6843 | + 'meaning' => __( 'This site does not let Vigilant replace its own files from this screen.', 'vigilante' ), | |
| 6844 | + 'steps' => Vigilante_Self_Integrity_Guidance::manual_steps( $vg_reason ), | |
| 6845 | + ), | |
| 6846 | + array(), | |
| 6847 | + '', | |
| 6848 | + false | |
| 6849 | + ); | |
| 6850 | + } | |
| 6851 | + } | |
| 6852 | + ?> | |
| 6853 | + </div> | |
| 6854 | + | |
| 6855 | + <?php if ( $total > count( $findings ) ) : ?> | |
| 6856 | + <p class="description"> | |
| 6857 | + <?php | |
| 6858 | + printf( | |
| 6859 | + /* translators: 1: findings shown, 2: findings found in total */ | |
| 6860 | + esc_html__( 'Showing %1$d of %2$d findings: the rest are of the same kind.', 'vigilante' ), | |
| 6861 | + (int) count( $findings ), | |
| 6862 | + (int) $total | |
| 6863 | + ); | |
| 6864 | + ?> | |
| 6865 | + </p> | |
| 6866 | + <?php endif; ?> | |
| 6867 | + | |
| 6868 | + <?php | |
| 6869 | + /* | |
| 6870 | + * Reinstalling fixes files, not a filter someone wrote or a hook | |
| 6871 | + * someone removed: the button only appears when at least one of the | |
| 6872 | + * cases on screen is one a clean copy solves. Offering it next to | |
| 6873 | + * "switched off by code" was telling the person to fix something | |
| 6874 | + * else. | |
| 6875 | + */ | |
| 6876 | + $vg_offer_repair = false; | |
| 6877 | + foreach ( $groups as $vg_group ) { | |
| 6878 | + if ( ! empty( $vg_group['repair'] ) ) { | |
| 6879 | + $vg_offer_repair = true; | |
| 6880 | + break; | |
| 6881 | + } | |
| 6882 | + } | |
| 6883 | + ?> | |
| 6884 | + <p class="vigilante-self-actions"> | |
| 6885 | + <?php if ( $vg_offer_repair && class_exists( 'Vigilante_Self_Repair' ) && Vigilante_Self_Repair::can_repair() ) : ?> | |
| 6886 | + <a class="button button-primary" href="<?php echo esc_url( Vigilante_Self_Repair::action_url() ); ?>"> | |
| 6887 | + <?php esc_html_e( 'Repair Vigilant', 'vigilante' ); ?> | |
| 6888 | + </a> | |
| 6889 | + <span class="description"> | |
| 6890 | + <?php esc_html_e( 'It downloads a clean copy from WordPress.org, asks before changing anything, and keeps your settings and log.', 'vigilante' ); ?> | |
| 6891 | + </span> | |
| 6892 | + <?php else : ?> | |
| 6893 | + <span class="description"> | |
| 6894 | + <?php esc_html_e( 'After fixing it, run a new scan with the Run Scan Now button above.', 'vigilante' ); ?> | |
| 6895 | + </span> | |
| 6896 | + <?php endif; ?> | |
| 6897 | + </p> | |
| 6898 | + </div> | |
| 6899 | + </div> | |
| 6900 | + <?php | |
| 6901 | + } | |
| 6902 | + | |
| 6903 | + /** | |
| 6904 | + * The same state when there is nothing to act on: one line inside the same | |
| 6905 | + * card, so the first block of the results is always the same object. | |
| 6906 | + * | |
| 6907 | + * @param string $tone Tone from Vigilante_Self_Integrity::tone(). | |
| 6908 | + * @param array $state State. | |
| 6909 | + * @param array $status Arguments for the guidance catalogue. | |
| 6910 | + */ | |
| 6911 | + private function render_self_line( $tone, $state, $status ) { | |
| 6912 | + $guidance = Vigilante_Self_Integrity_Guidance::for_status( $status ); | |
| 6913 | + $icon = ( 'ok' === $tone ) ? 'dashicons-yes-alt' : 'dashicons-shield'; | |
| 6914 | + ?> | |
| 6915 | + <div id="vigilante-section-fi-self" class="vigilante-settings-section vigilante-self-box vigilante-self-box--<?php echo esc_attr( $tone ); ?> vigilante-self-box--quiet"> | |
| 6916 | + <div class="vigilante-self-card vigilante-self-card--quiet"> | |
| 6917 | + <p class="vigilante-self-line"> | |
| 6918 | + <span class="dashicons <?php echo esc_attr( $icon ); ?>" aria-hidden="true"></span> | |
| 6919 | + <strong><?php esc_html_e( 'Vigilant self-protection:', 'vigilante' ); ?></strong> | |
| 6920 | + <span class="vigilante-self-line-state"><?php echo esc_html( $this->self_integrity_headline( $tone, $state ) ); ?></span> | |
| 6921 | + <?php if ( ! empty( $state['last_check'] ) ) : ?> | |
| 6922 | + <span class="vigilante-self-line-meta"> | |
| 6923 | + <?php | |
| 6924 | + printf( | |
| 6925 | + /* translators: %s: human time difference, like "2 hours" */ | |
| 6926 | + esc_html__( 'checked %s ago', 'vigilante' ), | |
| 6927 | + esc_html( human_time_diff( (int) $state['last_check'], time() ) ) | |
| 6928 | + ); | |
| 6929 | + ?> | |
| 6930 | + </span> | |
| 6931 | + <?php endif; ?> | |
| 6932 | + </p> | |
| 6933 | + <?php if ( ! empty( $guidance['steps'] ) && 'none' === $tone ) : ?> | |
| 6934 | + <p class="description vigilante-self-line-help"><?php echo esc_html( $guidance['steps'][0] ); ?></p> | |
| 6935 | + <?php endif; ?> | |
| 6936 | + </div> | |
| 6937 | + </div> | |
| 6938 | + <?php | |
| 6939 | + } | |
| 6940 | + | |
| 6941 | + /** | |
| 6942 | + * One case of the self-protection box, as a row that opens: what it is, how | |
| 6943 | + * many files, its severity, and inside, the files, what it means and what to | |
| 6944 | + * do. Plain HTML details, so there is no JavaScript between a finding about | |
| 6945 | + * the security plugin and the person reading it. | |
| 6946 | + * | |
| 6947 | + * @param array $guidance Guidance entry (title, meaning, steps). | |
| 6948 | + * @param array $files Paths this case was found in. | |
| 6949 | + * @param string $severity critical|warning, empty for the how-to-repair row. | |
| 6950 | + * @param bool $open Whether the row starts open. | |
| 6951 | + */ | |
| 6952 | + private function render_self_case( $guidance, $files = array(), $severity = '', $open = false ) { | |
| 6953 | + $shown = array_slice( (array) $files, 0, 20 ); | |
| 6954 | + $hidden = count( (array) $files ) - count( $shown ); | |
| 6955 | + ?> | |
| 6956 | + <details class="vigilante-self-case vigilante-self-case--<?php echo esc_attr( '' !== $severity ? $severity : 'plain' ); ?>"<?php echo $open ? ' open' : ''; ?>> | |
| 6957 | + <summary> | |
| 6958 | + <span class="vigilante-self-case-title"><?php echo esc_html( $guidance['title'] ); ?></span> | |
| 6959 | + <?php if ( ! empty( $files ) ) : ?> | |
| 6960 | + <span class="vigilante-self-case-count"> | |
| 6961 | + <?php | |
| 6962 | + printf( | |
| 6963 | + /* translators: %d: number of files of this finding */ | |
| 6964 | + esc_html( _n( '%d file', '%d files', count( (array) $files ), 'vigilante' ) ), | |
| 6965 | + (int) count( (array) $files ) | |
| 6966 | + ); | |
| 6967 | + ?> | |
| 6968 | + </span> | |
| 6969 | + <?php endif; ?> | |
| 6970 | + <?php if ( '' !== $severity ) : ?> | |
| 6971 | + <span class="vigilante-self-case-severity"> | |
| 6972 | + <?php echo esc_html( 'critical' === $severity ? __( 'critical', 'vigilante' ) : __( 'warning', 'vigilante' ) ); ?> | |
| 6973 | + </span> | |
| 6974 | + <?php endif; ?> | |
| 6975 | + </summary> | |
| 6976 | + <div class="vigilante-self-case-body"> | |
| 6977 | + <?php if ( ! empty( $shown ) ) : ?> | |
| 6978 | + <ul class="vigilante-self-paths"> | |
| 6979 | + <?php foreach ( $shown as $file ) : ?> | |
| 6980 | + <li><code><?php echo esc_html( $file ); ?></code></li> | |
| 6981 | + <?php endforeach; ?> | |
| 6982 | + <?php if ( $hidden > 0 ) : ?> | |
| 6983 | + <li> | |
| 6984 | + <?php | |
| 6985 | + printf( | |
| 6986 | + /* translators: %d: number of additional files */ | |
| 6987 | + esc_html__( 'and %d more', 'vigilante' ), | |
| 6988 | + (int) $hidden | |
| 6989 | + ); | |
| 6990 | + ?> | |
| 6991 | + </li> | |
| 6992 | + <?php endif; ?> | |
| 6993 | + </ul> | |
| 6994 | + <?php endif; ?> | |
| 6995 | + <p class="vigilante-self-meaning"> | |
| 6996 | + <strong><?php esc_html_e( 'What it means:', 'vigilante' ); ?></strong> | |
| 6997 | + <?php echo esc_html( $guidance['meaning'] ); ?> | |
| 6998 | + </p> | |
| 6999 | + <?php if ( ! empty( $guidance['steps'] ) ) : ?> | |
| 7000 | + <p class="vigilante-self-todo"><strong><?php esc_html_e( 'What to do:', 'vigilante' ); ?></strong></p> | |
| 7001 | + <ol class="vigilante-self-steps"> | |
| 7002 | + <?php foreach ( $guidance['steps'] as $step ) : ?> | |
| 7003 | + <li><?php echo esc_html( $step ); ?></li> | |
| 7004 | + <?php endforeach; ?> | |
| 7005 | + </ol> | |
| 7006 | + <?php endif; ?> | |
| 7007 | + </div> | |
| 7008 | + </details> | |
| 7009 | + <?php | |
| 7010 | + } | |
| 7011 | + | |
| 5992 | 7012 | private function render_tab_file_integrity() { |
| 5993 | 7013 | $is_disabled = $this->render_module_disabled_notice( 'file_integrity' ); |
| 5994 | 7014 | $options = $this->settings->get_section( 'file_integrity' ); |
| 7015 | + // On the main site of a network the critical-file scan is the network's | |
| 7016 | + // canary for a change to wp-config.php or the root .htaccess, so a | |
| 7017 | + // main-site admin without network rights cannot turn it off. Since | |
| 7018 | + // 2.11.8; see Vigilante_Settings::get_main_site_file_settings(). | |
| 7019 | + $vg_main_locked = $this->main_site_files_locked(); | |
| 5995 | 7020 | $last_scan = get_option( 'vigilante_last_integrity_scan' ); |
| 5996 | 7021 | $last_results = get_option( 'vigilante_last_integrity_results' ); |
| 5997 | 7022 | $ignored_files = get_option( 'vigilante_ignored_files', array() ); |
| 5998 | 7023 | |
| 7024 | + /* | |
| 7025 | + * Vigilant own findings are shown in their own box, the first of the | |
| 7026 | + * results, with what each one means and how to fix it. They are taken | |
| 7027 | + * out of the generic tables here (and out of the counters above them) | |
| 7028 | + * so the same finding is not reported twice and so no row of the | |
| 7029 | + * security plugin's own files offers an Ignore button. The stored | |
| 7030 | + * results keep them: the scan email reads its own section from there. | |
| 7031 | + */ | |
| 7032 | + if ( is_array( $last_results ) ) { | |
| 7033 | + foreach ( array( 'modified', 'suspicious', 'extra', 'missing' ) as $vg_bucket ) { | |
| 7034 | + if ( empty( $last_results[ $vg_bucket ] ) || ! is_array( $last_results[ $vg_bucket ] ) ) { | |
| 7035 | + continue; | |
| 7036 | + } | |
| 7037 | + $last_results[ $vg_bucket ] = array_values( | |
| 7038 | + array_filter( | |
| 7039 | + $last_results[ $vg_bucket ], | |
| 7040 | + function ( $vg_item ) { | |
| 7041 | + return ! ( is_array( $vg_item ) && 'vigilante_self' === ( $vg_item['type'] ?? '' ) ); | |
| 7042 | + } | |
| 7043 | + ) | |
| 7044 | + ); | |
| 7045 | + } | |
| 7046 | + } | |
| 7047 | + | |
| 5999 | 7048 | // Backward compat: convert old notify_on_changes to notify_level |
| 6000 | 7049 | $notify_level = $options['notify_level'] ?? ''; |
| 6001 | 7050 | if ( empty( $notify_level ) ) { |
| 6002 | 7051 | $notify_level = ! empty( $options['notify_on_changes'] ) ? 'all' : 'disabled'; |
| @@ -6118,10 +7167,13 @@ | ||
| 6118 | 7167 | <?php esc_html_e( 'Uploads directory (detect PHP files, double extensions, .htaccess)', 'vigilante' ); ?> |
| 6119 | 7168 | </label> |
| 6120 | 7169 | <br> |
| 6121 | 7170 | <label> |
| 6122 | - <input type="checkbox" name="file_integrity[scan_critical_config]" value="1" <?php checked( $options['scan_critical_config'] ?? true ); ?>> | |
| 7171 | + <input type="checkbox" name="file_integrity[scan_critical_config]" value="1" <?php disabled( $vg_main_locked ); ?> <?php checked( $options['scan_critical_config'] ?? true ); ?>> | |
| 6123 | 7172 | <?php esc_html_e( 'Critical config files (wp-config.php, .htaccess baseline monitoring)', 'vigilante' ); ?> |
| 7173 | + <?php if ( $vg_main_locked ) : ?> | |
| 7174 | + <span class="description" style="display:block;margin-left:24px;"><?php echo esc_html( Vigilante_Settings::get_shared_files_notice() ); ?></span> | |
| 7175 | + <?php endif; ?> | |
| 6124 | 7176 | </label> |
| 6125 | 7177 | <br> |
| 6126 | 7178 | <label> |
| 6127 | 7179 | <input type="checkbox" name="file_integrity[check_closed_plugins]" value="1" <?php checked( $options['check_closed_plugins'] ?? true ); ?>> |
| @@ -6176,8 +7228,10 @@ | ||
| 6176 | 7228 | </form> |
| 6177 | 7229 | |
| 6178 | 7230 | <div id="vigilante-scan-results" class="vigilante-settings-section" style="display:none;"></div> |
| 6179 | 7231 | |
| 7232 | + <?php $this->render_self_protection_box( $options ); ?> | |
| 7233 | + | |
| 6180 | 7234 | <?php if ( $last_scan || $has_closed || $closed_last_check > 0 ) : ?> |
| 6181 | 7235 | <div id="vigilante-section-fi-last-scan" class="vigilante-settings-section"> |
| 6182 | 7236 | <h2><?php esc_html_e( 'Last Scan Results', 'vigilante' ); ?></h2> |
| 6183 | 7237 | <?php if ( $last_scan ) : ?> |
| @@ -6302,8 +7356,11 @@ | ||
| 6302 | 7356 | } |
| 6303 | 7357 | } else { |
| 6304 | 7358 | $file_path = (string) $item; |
| 6305 | 7359 | } |
| 7360 | + if ( 'vigilante_self' === $file_type ) { | |
| 7361 | + $file_type = __( 'Vigilant (self)', 'vigilante' ); | |
| 7362 | + } | |
| 6306 | 7363 | ?> |
| 6307 | 7364 | <tr> |
| 6308 | 7365 | <th scope="row" class="check-column"><input type="checkbox" class="vigilante-fi-cb" value="<?php echo esc_attr( $file_path ); ?>"></th> |
| 6309 | 7366 | <td><code style="color: #d63638;"><?php echo esc_html( $file_path ); ?></code></td> |
| @@ -6343,8 +7400,11 @@ | ||
| 6343 | 7400 | foreach ( $last_results['extra'] as $item ) { |
| 6344 | 7401 | $file_path = is_array( $item ) ? ( $item['file'] ?? '' ) : (string) $item; |
| 6345 | 7402 | $file_reason = is_array( $item ) ? ( $item['reason'] ?? __( 'Unknown', 'vigilante' ) ) : __( 'Unknown', 'vigilante' ); |
| 6346 | 7403 | $file_type = is_array( $item ) ? ( $item['type'] ?? 'unknown' ) : 'unknown'; |
| 7404 | + if ( 'vigilante_self' === $file_type ) { | |
| 7405 | + $file_type = __( 'Vigilant (self)', 'vigilante' ); | |
| 7406 | + } | |
| 6347 | 7407 | ?> |
| 6348 | 7408 | <tr> |
| 6349 | 7409 | <th scope="row" class="check-column"><input type="checkbox" class="vigilante-fi-cb" value="<?php echo esc_attr( $file_path ); ?>"></th> |
| 6350 | 7410 | <td><code style="color: #b32d2e;"><?php echo esc_html( $file_path ); ?></code></td> |
| @@ -6375,8 +7435,19 @@ | ||
| 6375 | 7435 | $regular_modified[] = $item; |
| 6376 | 7436 | } |
| 6377 | 7437 | } |
| 6378 | 7438 | } |
| 7439 | + // A missing file of Vigilant is critical, and the missing | |
| 7440 | + // files of the generic scan have no table: it is listed with | |
| 7441 | + // the modified files, or the tab said "All files passed" with | |
| 7442 | + // a module deleted. | |
| 7443 | + if ( $last_results && ! empty( $last_results['missing'] ) && is_array( $last_results['missing'] ) ) { | |
| 7444 | + foreach ( $last_results['missing'] as $item ) { | |
| 7445 | + if ( is_array( $item ) && 'vigilante_self' === ( $item['type'] ?? '' ) ) { | |
| 7446 | + $regular_modified[] = $item; | |
| 7447 | + } | |
| 7448 | + } | |
| 7449 | + } | |
| 6379 | 7450 | ?> |
| 6380 | 7451 | |
| 6381 | 7452 | <?php if ( ! empty( $critical_modified ) ) : ?> |
| 6382 | 7453 | <div class="vigilante-file-list vigilante-critical-config-files"> |
| @@ -6400,9 +7471,15 @@ | ||
| 6400 | 7471 | $crit_diff = $crit_item['diff'] ?? array(); |
| 6401 | 7472 | $crit_id = sanitize_html_class( $crit_file ); |
| 6402 | 7473 | $added_count = is_array( $crit_diff ) ? count( $crit_diff['added'] ?? array() ) : 0; |
| 6403 | 7474 | $removed_count = is_array( $crit_diff ) ? count( $crit_diff['removed'] ?? array() ) : 0; |
| 6404 | - $diff_unavailable = is_array( $crit_diff ) && ! empty( $crit_diff['unavailable'] ); | |
| 7475 | + // The lines of a shared file are for whoever approves it. Results | |
| 7476 | + // stored before 2.11.8 on the main site still carry them, so the | |
| 7477 | + // screen asks too, not only the scan that wrote them. | |
| 7478 | + $diff_network = ( is_array( $crit_diff ) && ! empty( $crit_diff['network'] ) ) || $this->critical_approval_locked(); | |
| 7479 | + $diff_rescan = is_array( $crit_diff ) && ! empty( $crit_diff['rescan'] ); | |
| 7480 | + $diff_redaction = is_array( $crit_diff ) && ! empty( $crit_diff['redaction'] ); | |
| 7481 | + $diff_unavailable = $diff_network || ( is_array( $crit_diff ) && ! empty( $crit_diff['unavailable'] ) ); | |
| 6405 | 7482 | ?> |
| 6406 | 7483 | <tr> |
| 6407 | 7484 | <td><code style="color: #e36210;"><?php echo esc_html( $crit_file ); ?></code></td> |
| 6408 | 7485 | <td> |
| @@ -6439,10 +7516,22 @@ | ||
| 6439 | 7516 | </tr> |
| 6440 | 7517 | <tr id="vigilante-critical-content-<?php echo esc_attr( $crit_id ); ?>" class="vigilante-critical-content-row" style="display:none;"> |
| 6441 | 7518 | <td colspan="3" style="padding: 0;"> |
| 6442 | 7519 | <div class="vigilante-critical-content" style="max-height: 400px; overflow: auto; background: #fff; padding: 10px; font-size: 12px; line-height: 1.5; font-family: Consolas, Monaco, monospace; border-top: 1px solid #c3c4c7;"> |
| 6443 | - <?php if ( $diff_unavailable ) : ?> | |
| 7520 | + <?php if ( $diff_network ) : ?> | |
| 6444 | 7521 | <p style="color: #50575e; font-style: italic; margin: 0;"> |
| 7522 | + <?php esc_html_e( 'This file belongs to the whole network, so its line changes are only shown to network administrators, on the main site.', 'vigilante' ); ?> | |
| 7523 | + </p> | |
| 7524 | + <?php elseif ( $diff_rescan ) : ?> | |
| 7525 | + <p style="color: #50575e; font-style: italic; margin: 0;"> | |
| 7526 | + <?php esc_html_e( 'Run a new scan to see the line changes of this file.', 'vigilante' ); ?> | |
| 7527 | + </p> | |
| 7528 | + <?php elseif ( $diff_redaction ) : ?> | |
| 7529 | + <p style="color: #50575e; font-style: italic; margin: 0;"> | |
| 7530 | + <?php esc_html_e( 'The line changes of this file are not shown because a value in it could not be hidden safely. The change itself is still detected.', 'vigilante' ); ?> | |
| 7531 | + </p> | |
| 7532 | + <?php elseif ( $diff_unavailable ) : ?> | |
| 7533 | + <p style="color: #50575e; font-style: italic; margin: 0;"> | |
| 6445 | 7534 | <?php esc_html_e( 'Diff not available for this file (baseline was created before diff tracking was added). Approve to enable diff on future changes.', 'vigilante' ); ?> |
| 6446 | 7535 | </p> |
| 6447 | 7536 | <?php elseif ( empty( $crit_diff['added'] ) && empty( $crit_diff['removed'] ) ) : ?> |
| 6448 | 7537 | <p style="color: #50575e; font-style: italic; margin: 0;"> |
| @@ -6557,8 +7646,11 @@ | ||
| 6557 | 7646 | } |
| 6558 | 7647 | } else { |
| 6559 | 7648 | $file_path = (string) $item; |
| 6560 | 7649 | } |
| 7650 | + if ( 'vigilante_self' === $file_type ) { | |
| 7651 | + $file_type = __( 'Vigilant (self)', 'vigilante' ); | |
| 7652 | + } | |
| 6561 | 7653 | ?> |
| 6562 | 7654 | <tr> |
| 6563 | 7655 | <th scope="row" class="check-column"><input type="checkbox" class="vigilante-fi-cb" value="<?php echo esc_attr( $file_path ); ?>"></th> |
| 6564 | 7656 | <td><code><?php echo esc_html( $file_path ); ?></code></td> |
| @@ -6572,9 +7664,16 @@ | ||
| 6572 | 7664 | </table> |
| 6573 | 7665 | </div> |
| 6574 | 7666 | <?php endif; ?> |
| 6575 | 7667 | |
| 6576 | - <?php if ( $last_results && empty( $last_results['modified'] ) && empty( $last_results['suspicious'] ) && empty( $last_results['extra'] ) && ! $has_closed ) : ?> | |
| 7668 | + <?php | |
| 7669 | + // "All files passed" is about every file, and Vigilant's own | |
| 7670 | + // are files too: with the self-protection box in red or amber | |
| 7671 | + // above, this line contradicted it (its findings no longer | |
| 7672 | + // travel in the tables below). | |
| 7673 | + $vg_self_alarm = in_array( $this->self_integrity_summary( $options )['tone'], array( 'critical', 'off', 'warning' ), true ); | |
| 7674 | + ?> | |
| 7675 | + <?php if ( $last_results && ! $vg_self_alarm && empty( $critical_modified ) && empty( $regular_modified ) && empty( $last_results['suspicious'] ) && empty( $last_results['extra'] ) && ! $has_closed ) : ?> | |
| 6577 | 7676 | <p class="vigilante-all-clear" style="color: #00a32a; font-weight: bold;"> |
| 6578 | 7677 | <?php esc_html_e( 'Good Job! All files passed integrity check. No issues found.', 'vigilante' ); ?> |
| 6579 | 7678 | </p> |
| 6580 | 7679 | <?php endif; ?> |
| @@ -6716,9 +7815,9 @@ | ||
| 6716 | 7815 | } elseif ( isset( $_POST['data'] ) ) { |
| 6717 | 7816 | // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized |
| 6718 | 7817 | $raw_data = wp_unslash( $_POST['data'] ); |
| 6719 | 7818 | parse_str( $raw_data, $data ); |
| 6720 | - $data = map_deep( $data, 'sanitize_textarea_field' ); | |
| 7819 | + $data = $this->sanitize_posted_settings( $data ); | |
| 6721 | 7820 | } else { |
| 6722 | 7821 | $data = array(); |
| 6723 | 7822 | } |
| 6724 | 7823 | |
| @@ -6797,9 +7896,10 @@ | ||
| 6797 | 7896 | } |
| 6798 | 7897 | } |
| 6799 | 7898 | } |
| 6800 | 7899 | |
| 6801 | - $rejected_ips = array(); | |
| 7900 | + $rejected_ips = array(); | |
| 7901 | + $rejected_proxies = array(); | |
| 6802 | 7902 | |
| 6803 | 7903 | // Handle modules |
| 6804 | 7904 | if ( 'modules' === $section && isset( $data['modules'] ) ) { |
| 6805 | 7905 | if ( ! isset( $saved_options['modules'] ) ) { |
| @@ -6824,9 +7924,9 @@ | ||
| 6824 | 7924 | // went straight into the option. An entry the matcher can never |
| 6825 | 7925 | // match still sits in a security list looking like protection, |
| 6826 | 7926 | // so the ones that cannot match are dropped and reported back |
| 6827 | 7927 | // instead of being stored in silence. |
| 6828 | - $rejected_ips = $this->filter_ip_lists( $section, $processed ); | |
| 7928 | + $rejected_ips = $this->filter_ip_lists( $section, $processed, $rejected_proxies ); | |
| 6829 | 7929 | |
| 6830 | 7930 | // Save the processed section |
| 6831 | 7931 | $saved_options[ $section ] = $processed; |
| 6832 | 7932 | |
| @@ -6902,8 +8002,21 @@ | ||
| 6902 | 8002 | implode( ', ', array_map( 'esc_html', $rejected_ips ) ) |
| 6903 | 8003 | ); |
| 6904 | 8004 | } |
| 6905 | 8005 | |
| 8006 | + if ( ! empty( $rejected_proxies ) ) { | |
| 8007 | + $message .= ' ' . sprintf( | |
| 8008 | + /* translators: %s: comma separated list of the trusted proxy entries that were not saved. */ | |
| 8009 | + _n( | |
| 8010 | + 'A trusted proxy must be an exact IP or a CIDR range, not a wildcard, so this entry was not saved: %s', | |
| 8011 | + 'A trusted proxy must be an exact IP or a CIDR range, not a wildcard, so these entries were not saved: %s', | |
| 8012 | + count( $rejected_proxies ), | |
| 8013 | + 'vigilante' | |
| 8014 | + ), | |
| 8015 | + implode( ', ', array_map( 'esc_html', $rejected_proxies ) ) | |
| 8016 | + ); | |
| 8017 | + } | |
| 8018 | + | |
| 6906 | 8019 | wp_send_json_success( $message ); |
| 6907 | 8020 | } |
| 6908 | 8021 | |
| 6909 | 8022 | /** |
| @@ -6914,9 +8027,21 @@ | ||
| 6914 | 8027 | * @param string $section Section being saved. |
| 6915 | 8028 | * @param array $processed Section data, edited in place. |
| 6916 | 8029 | * @return array Entries that were dropped, for the message back to the user. |
| 6917 | 8030 | */ |
| 6918 | - private function filter_ip_lists( $section, &$processed ) { | |
| 8031 | + private function filter_ip_lists( $section, &$processed, &$rejected_proxies = array() ) { | |
| 8032 | + $rejected_proxies = array(); | |
| 8033 | + | |
| 8034 | + // Trusted proxies feed an identity decision, so only exact addresses and | |
| 8035 | + // CIDR ranges belong there: a wildcard is stripped with its own message, | |
| 8036 | + // never stored looking effective. The matcher ignores it anyway (see | |
| 8037 | + // Vigilante_IP_Utils::in_list_ip_or_cidr), this stops it persisting. | |
| 8038 | + if ( 'firewall' === $section && isset( $processed['trusted_proxies'] ) && is_array( $processed['trusted_proxies'] ) ) { | |
| 8039 | + $split = Vigilante_IP_Utils::split_list_ip_or_cidr( $processed['trusted_proxies'] ); | |
| 8040 | + $processed['trusted_proxies'] = $split['valid']; | |
| 8041 | + $rejected_proxies = $split['rejected']; | |
| 8042 | + } | |
| 8043 | + | |
| 6919 | 8044 | $lists = array( |
| 6920 | 8045 | 'firewall' => array( 'ip_whitelist', 'ip_blacklist' ), |
| 6921 | 8046 | 'login_security' => array( 'ip_whitelist' ), |
| 6922 | 8047 | ); |
| @@ -7082,8 +8207,48 @@ | ||
| 7082 | 8207 | return array( 'sent' => $sent, 'failed' => $failed ); |
| 7083 | 8208 | } |
| 7084 | 8209 | |
| 7085 | 8210 | /** |
| 8211 | + * Sanitize the settings a tab posted, once the serialized form is parsed | |
| 8212 | + * | |
| 8213 | + * Every value goes through sanitize_textarea_field() except the lists of | |
| 8214 | + * file paths (Vigilante_Settings::path_list_keys()). That one deletes every | |
| 8215 | + * %XX octet and, when it finds one, collapses repeated spaces, so an | |
| 8216 | + * exclusion for a folder called foto%20x was saved as fotox and excluded | |
| 8217 | + * nothing (measured on 1 oct 2026 against 3.0.1). The paths are read as | |
| 8218 | + * paths before the generic sanitizer runs and put back after it. | |
| 8219 | + * | |
| 8220 | + * @since 3.0.2 | |
| 8221 | + * | |
| 8222 | + * @param array $data Parsed form: section => key => value. | |
| 8223 | + * @return array | |
| 8224 | + */ | |
| 8225 | + private function sanitize_posted_settings( $data ) { | |
| 8226 | + $paths = Vigilante_Settings::take_path_lists( $data ); | |
| 8227 | + $data = map_deep( $data, 'sanitize_textarea_field' ); | |
| 8228 | + | |
| 8229 | + return Vigilante_Settings::restore_path_lists( $data, $paths ); | |
| 8230 | + } | |
| 8231 | + | |
| 8232 | + /** | |
| 8233 | + * Sanitize an imported settings file, once it is decoded | |
| 8234 | + * | |
| 8235 | + * Same rule as sanitize_posted_settings(): the lists of paths keep what the | |
| 8236 | + * export wrote, so an exclusion survives an export and an import. | |
| 8237 | + * | |
| 8238 | + * @since 3.0.2 | |
| 8239 | + * | |
| 8240 | + * @param array $imported Decoded export. | |
| 8241 | + * @return array | |
| 8242 | + */ | |
| 8243 | + private function sanitize_imported_settings( $imported ) { | |
| 8244 | + $paths = Vigilante_Settings::take_path_lists( $imported ); | |
| 8245 | + $imported = map_deep( $imported, 'sanitize_text_field' ); | |
| 8246 | + | |
| 8247 | + return Vigilante_Settings::restore_path_lists( $imported, $paths ); | |
| 8248 | + } | |
| 8249 | + | |
| 8250 | + /** | |
| 7086 | 8251 | * Process section data maintaining proper types from defaults |
| 7087 | 8252 | * |
| 7088 | 8253 | * @param array $submitted_data Data submitted from form. |
| 7089 | 8254 | * @param array $defaults Default values for this section. |
| @@ -7091,16 +8256,51 @@ | ||
| 7091 | 8256 | * @param string $section_name Section name for special handling. |
| 7092 | 8257 | * @return array Processed data. |
| 7093 | 8258 | */ |
| 7094 | 8259 | private function process_section_data( $submitted_data, $defaults, $current, $section_name = '' ) { |
| 7095 | - // Start with defaults, then merge current saved values | |
| 8260 | + // Start with defaults, then merge current saved values. Lists are put | |
| 8261 | + // back whole afterwards: array_replace_recursive() merges them index by | |
| 8262 | + // index, so a saved list shorter than the default kept the default's | |
| 8263 | + // tail (see below, and Vigilante_Settings::array_merge_deep()). | |
| 7096 | 8264 | $result = array_replace_recursive( $defaults, $current ); |
| 7097 | - | |
| 8265 | + $result = $this->restore_lists( $result, $current ); | |
| 8266 | + | |
| 7098 | 8267 | // Process each submitted value |
| 7099 | 8268 | foreach ( $submitted_data as $key => $value ) { |
| 7100 | 8269 | $key = sanitize_key( $key ); |
| 7101 | - | |
| 7102 | - if ( is_array( $value ) ) { | |
| 8270 | + | |
| 8271 | + if ( is_array( $value ) && $this->is_list_field( $key, $value, $defaults, $current ) ) { | |
| 8272 | + /* | |
| 8273 | + * A list of values, not a group of settings: the roles of a | |
| 8274 | + * checkbox group, the excluded user ids. What the form sent IS | |
| 8275 | + * the list, so it replaces the stored one outright. | |
| 8276 | + * | |
| 8277 | + * Until 3.0.1 this went through the recursion below, which | |
| 8278 | + * writes position by position and left every stored entry the | |
| 8279 | + * new list was too short to overwrite. Unchecking Editor in | |
| 8280 | + * "Enforce for roles" saved administrator over position 0 and | |
| 8281 | + * kept editor in position 1, so the box came back ticked | |
| 8282 | + * (reported on the support forum for 3.0.0, and the same bug | |
| 8283 | + * merge_preset() was fixed for in 2.9.8). | |
| 8284 | + * | |
| 8285 | + * Keys are dropped on purpose: a list is data, so anything the | |
| 8286 | + * request tried to name is not carried over. The empty string | |
| 8287 | + * is dropped too, which is what the hidden field that marks an | |
| 8288 | + * empty group sends. | |
| 8289 | + */ | |
| 8290 | + $list = array(); | |
| 8291 | + foreach ( $value as $entry ) { | |
| 8292 | + if ( ! is_scalar( $entry ) ) { | |
| 8293 | + continue; | |
| 8294 | + } | |
| 8295 | + $entry = sanitize_text_field( (string) $entry ); | |
| 8296 | + if ( '' === $entry ) { | |
| 8297 | + continue; | |
| 8298 | + } | |
| 8299 | + $list[] = $entry; | |
| 8300 | + } | |
| 8301 | + $result[ $key ] = $list; | |
| 8302 | + } elseif ( is_array( $value ) ) { | |
| 7103 | 8303 | // Nested array (like rate_limiting) |
| 7104 | 8304 | $nested_defaults = isset( $defaults[ $key ] ) && is_array( $defaults[ $key ] ) ? $defaults[ $key ] : array(); |
| 7105 | 8305 | $nested_current = isset( $result[ $key ] ) && is_array( $result[ $key ] ) ? $result[ $key ] : array(); |
| 7106 | 8306 | $result[ $key ] = $this->process_section_data( $value, $nested_defaults, $nested_current, $key ); |
| @@ -7186,10 +8386,26 @@ | ||
| 7186 | 8386 | } |
| 7187 | 8387 | } |
| 7188 | 8388 | |
| 7189 | 8389 | if ( $is_value_list ) { |
| 7190 | - // All items removed - reset to empty array | |
| 7191 | - $result[ $key ] = array(); | |
| 8390 | + /* | |
| 8391 | + * A list whose key did not travel is left as it was. Until | |
| 8392 | + * 3.0.1 it was blanked here, which read "the user unticked | |
| 8393 | + * everything" into something the form never asked about: | |
| 8394 | + * saving the Firewall tab blanked allowed_http_methods, | |
| 8395 | + * which has no field on any screen, and saving Users blanked | |
| 8396 | + * insecure_usernames. Both survived only because reading the | |
| 8397 | + * option put the defaults back on top, and that is exactly | |
| 8398 | + * the merge being removed in this release: with lists | |
| 8399 | + * replaced whole, blanking here would have left a site | |
| 8400 | + * answering 403 to every HTTP method. | |
| 8401 | + * | |
| 8402 | + * Emptying a group is still possible, and is now said out | |
| 8403 | + * loud: each checkbox group prints a hidden field with an | |
| 8404 | + * empty value, so an empty group arrives as an empty list | |
| 8405 | + * instead of as silence. See list_sentinel(). | |
| 8406 | + */ | |
| 8407 | + continue; | |
| 7192 | 8408 | } else { |
| 7193 | 8409 | // Nested settings group - handle boolean children |
| 7194 | 8410 | foreach ( $default_value as $nested_key => $nested_default ) { |
| 7195 | 8411 | if ( is_bool( $nested_default ) && isset( $result[ $key ] ) && is_array( $result[ $key ] ) ) { |
| @@ -7208,8 +8424,106 @@ | ||
| 7208 | 8424 | return $result; |
| 7209 | 8425 | } |
| 7210 | 8426 | |
| 7211 | 8427 | /** |
| 8428 | + * Whether a submitted value is a list of values rather than a group of settings | |
| 8429 | + * | |
| 8430 | + * The difference decides whether what arrived replaces the stored value or | |
| 8431 | + * is merged into it key by key, so it is answered from what the setting is | |
| 8432 | + * (its default, or what is stored today), not from the shape of the | |
| 8433 | + * request. A request that sends named keys where a list belongs gets them | |
| 8434 | + * dropped, which is one way this is narrower than what it replaces. | |
| 8435 | + * | |
| 8436 | + * @since 3.0.1 | |
| 8437 | + * | |
| 8438 | + * @param string $key Setting key, already through sanitize_key(). | |
| 8439 | + * @param array $value Value as submitted. | |
| 8440 | + * @param array $defaults Defaults of the section being processed. | |
| 8441 | + * @param array $current Stored values of the section being processed. | |
| 8442 | + * @return bool | |
| 8443 | + */ | |
| 8444 | + private function is_list_field( $key, $value, $defaults, $current ) { | |
| 8445 | + $default_known = array_key_exists( $key, $defaults ) && is_array( $defaults[ $key ] ); | |
| 8446 | + | |
| 8447 | + // The default has the first and the last word, the same rule that | |
| 8448 | + // array_merge_deep() and restore_lists() follow. Letting the stored | |
| 8449 | + // value decide, as this did until the fourth cross review of 3.0.1, | |
| 8450 | + // disagrees with them where it matters: an option corrupted into | |
| 8451 | + // two_factor = array( 'a', 'b' ) would have been treated as a list and | |
| 8452 | + // saving the tab would have replaced the whole group of settings with | |
| 8453 | + // the two values that arrived. | |
| 8454 | + if ( $default_known && array() !== $defaults[ $key ] ) { | |
| 8455 | + return Vigilante_Settings::is_list( $defaults[ $key ] ); | |
| 8456 | + } | |
| 8457 | + | |
| 8458 | + // Nothing declares it either way (an empty default, or a key with no | |
| 8459 | + // default at all), so what is stored, and then what was submitted, is | |
| 8460 | + // all there is to go on. | |
| 8461 | + if ( isset( $current[ $key ] ) && is_array( $current[ $key ] ) && array() !== $current[ $key ] && Vigilante_Settings::is_list( $current[ $key ] ) ) { | |
| 8462 | + return true; | |
| 8463 | + } | |
| 8464 | + | |
| 8465 | + return Vigilante_Settings::is_list( $value ); | |
| 8466 | + } | |
| 8467 | + | |
| 8468 | + /** | |
| 8469 | + * Put stored lists back after array_replace_recursive() | |
| 8470 | + * | |
| 8471 | + * array_replace_recursive() merges a list by position, so a stored list | |
| 8472 | + * shorter than the default comes out with the default's tail attached: | |
| 8473 | + * ['administrator'] over ['administrator','editor'] gives both back. Every | |
| 8474 | + * list that is stored is therefore restored whole before anything else is | |
| 8475 | + * processed, and only associative arrays are walked into. | |
| 8476 | + * | |
| 8477 | + * @since 3.0.1 | |
| 8478 | + * | |
| 8479 | + * @param array $result Defaults with the stored values merged over them. | |
| 8480 | + * @param array $current Stored values. | |
| 8481 | + * @return array | |
| 8482 | + */ | |
| 8483 | + private function restore_lists( $result, $current ) { | |
| 8484 | + if ( ! is_array( $current ) ) { | |
| 8485 | + return $result; | |
| 8486 | + } | |
| 8487 | + | |
| 8488 | + foreach ( $current as $key => $value ) { | |
| 8489 | + if ( ! is_array( $value ) || ! isset( $result[ $key ] ) || ! is_array( $result[ $key ] ) ) { | |
| 8490 | + continue; | |
| 8491 | + } | |
| 8492 | + | |
| 8493 | + // Decided by what is in $result, which comes from the defaults, and | |
| 8494 | + // never by the stored value: array() is a list by any definition, so | |
| 8495 | + // a section stored empty would have replaced a whole group of | |
| 8496 | + // settings with nothing. Same reasoning as in array_merge_deep(). | |
| 8497 | + if ( Vigilante_Settings::is_list( $result[ $key ] ) ) { | |
| 8498 | + $result[ $key ] = $value; | |
| 8499 | + continue; | |
| 8500 | + } | |
| 8501 | + | |
| 8502 | + $result[ $key ] = $this->restore_lists( $result[ $key ], $value ); | |
| 8503 | + } | |
| 8504 | + | |
| 8505 | + return $result; | |
| 8506 | + } | |
| 8507 | + | |
| 8508 | + /** | |
| 8509 | + * Print the hidden field that lets a checkbox group arrive empty | |
| 8510 | + * | |
| 8511 | + * A checkbox group sends nothing at all when every box is unticked, which | |
| 8512 | + * is indistinguishable from a form that never had that field. Since 3.0.1 | |
| 8513 | + * the save path leaves an absent list alone, so the difference has to be | |
| 8514 | + * stated: this empty entry always travels, and the save path drops empty | |
| 8515 | + * strings, so an untouched group arrives as an empty list. | |
| 8516 | + * | |
| 8517 | + * @since 3.0.1 | |
| 8518 | + * | |
| 8519 | + * @param string $name Field name without the trailing []. | |
| 8520 | + */ | |
| 8521 | + private function list_sentinel( $name ) { | |
| 8522 | + printf( '<input type="hidden" name="%s[]" value="">', esc_attr( $name ) ); | |
| 8523 | + } | |
| 8524 | + | |
| 8525 | + /** | |
| 7212 | 8526 | * AJAX: Export settings |
| 7213 | 8527 | */ |
| 7214 | 8528 | public function ajax_export_settings() { |
| 7215 | 8529 | check_ajax_referer( 'vigilante_admin_nonce', 'nonce' ); |
| @@ -7261,9 +8575,9 @@ | ||
| 7261 | 8575 | wp_send_json_error( __( 'Invalid JSON format.', 'vigilante' ) ); |
| 7262 | 8576 | } |
| 7263 | 8577 | |
| 7264 | 8578 | // Sanitize imported data recursively |
| 7265 | - $imported = map_deep( $imported, 'sanitize_text_field' ); | |
| 8579 | + $imported = $this->sanitize_imported_settings( $imported ); | |
| 7266 | 8580 | |
| 7267 | 8581 | // Validate structure: only sections and keys of the schema survive, and |
| 7268 | 8582 | // every value takes the type of its default. Until 2.11.0 this was an |
| 7269 | 8583 | // array_replace_recursive() of the file over the defaults, so any key in |
| @@ -7594,8 +8908,19 @@ | ||
| 7594 | 8908 | // Save new results |
| 7595 | 8909 | update_option( 'vigilante_last_integrity_scan', time() ); |
| 7596 | 8910 | update_option( 'vigilante_last_integrity_results', $results ); |
| 7597 | 8911 | |
| 8912 | + // On the main site the scan does compute the lines of wp-config.php and | |
| 8913 | + // .htaccess, for the network administrator. Somebody without network | |
| 8914 | + // rights gets the change and its sizes, not the lines. | |
| 8915 | + if ( $this->critical_approval_locked() && ! empty( $results['modified'] ) && is_array( $results['modified'] ) ) { | |
| 8916 | + foreach ( $results['modified'] as $index => $item ) { | |
| 8917 | + if ( is_array( $item ) && 'critical_config' === ( $item['type'] ?? '' ) ) { | |
| 8918 | + $results['modified'][ $index ]['diff'] = Vigilante_File_Integrity::network_only_diff(); | |
| 8919 | + } | |
| 8920 | + } | |
| 8921 | + } | |
| 8922 | + | |
| 7598 | 8923 | wp_send_json_success( array( |
| 7599 | 8924 | 'message' => __( 'Scan completed.', 'vigilante' ), |
| 7600 | 8925 | 'results' => $results, |
| 7601 | 8926 | 'ignored_count' => count( get_option( 'vigilante_ignored_files', array() ) ), |
| @@ -7629,11 +8954,46 @@ | ||
| 7629 | 8954 | if ( ! current_user_can( 'manage_options' ) ) { |
| 7630 | 8955 | wp_send_json_error( __( 'Permission denied.', 'vigilante' ) ); |
| 7631 | 8956 | } |
| 7632 | 8957 | |
| 8958 | + $results = get_option( 'vigilante_last_integrity_results' ); | |
| 8959 | + $scanned_at = get_option( 'vigilante_last_integrity_scan' ); | |
| 8960 | + | |
| 7633 | 8961 | delete_option( 'vigilante_last_integrity_results' ); |
| 7634 | 8962 | delete_option( 'vigilante_last_integrity_scan' ); |
| 7635 | 8963 | |
| 8964 | + /* | |
| 8965 | + * A pending change to wp-config.php or the root .htaccess is closed by | |
| 8966 | + * approving it, which takes the network. Clearing the results was one | |
| 8967 | + * more way to close it without, until the next scan: the ignore list was | |
| 8968 | + * shut in 2.11.8 and this button was left open, found by the cross | |
| 8969 | + * review of 2.11.8. So for somebody who cannot approve, those entries | |
| 8970 | + * stay and everything else goes. | |
| 8971 | + */ | |
| 8972 | + // The findings about Vigilant's own files stay too: they report for the | |
| 8973 | + // whole network, and ignoring them already takes network rights. | |
| 8974 | + if ( $this->critical_approval_locked() && is_array( $results ) ) { | |
| 8975 | + $kept = array(); | |
| 8976 | + $found = false; | |
| 8977 | + foreach ( array( 'modified', 'missing', 'suspicious', 'extra' ) as $bucket ) { | |
| 8978 | + $kept[ $bucket ] = array_values( | |
| 8979 | + array_filter( | |
| 8980 | + isset( $results[ $bucket ] ) && is_array( $results[ $bucket ] ) ? $results[ $bucket ] : array(), | |
| 8981 | + function ( $item ) { | |
| 8982 | + return is_array( $item ) && in_array( $item['type'] ?? '', array( 'critical_config', 'vigilante_self' ), true ); | |
| 8983 | + } | |
| 8984 | + ) | |
| 8985 | + ); | |
| 8986 | + $found = $found || ! empty( $kept[ $bucket ] ); | |
| 8987 | + } | |
| 8988 | + | |
| 8989 | + if ( $found ) { | |
| 8990 | + $results = array_merge( $results, $kept ); | |
| 8991 | + update_option( 'vigilante_last_integrity_results', $results ); | |
| 8992 | + update_option( 'vigilante_last_integrity_scan', $scanned_at ? $scanned_at : time() ); | |
| 8993 | + } | |
| 8994 | + } | |
| 8995 | + | |
| 7636 | 8996 | if ( $this->database ) { |
| 7637 | 8997 | $this->database->clear_file_hashes(); |
| 7638 | 8998 | } |
| 7639 | 8999 | |
| @@ -7653,14 +9013,49 @@ | ||
| 7653 | 9013 | if ( ! current_user_can( 'manage_options' ) ) { |
| 7654 | 9014 | wp_send_json_error( __( 'Permission denied.', 'vigilante' ) ); |
| 7655 | 9015 | } |
| 7656 | 9016 | |
| 7657 | - $file = isset( $_POST['file'] ) ? sanitize_text_field( wp_unslash( $_POST['file'] ) ) : ''; | |
| 9017 | + /* | |
| 9018 | + * The path as the scan reported it, which is what the interface sends | |
| 9019 | + * back. sanitize_text_field() is the wrong reader for it: it deletes | |
| 9020 | + * every %XX octet and collapses repeated spaces, so a file named | |
| 9021 | + * foto%20nueva.php was stored as fotonueva.php, the scan compared the | |
| 9022 | + * list with the paths it finds one by one, never matched, and the | |
| 9023 | + * warning came back (measured on 1 oct 2026 against 3.0.1). The four | |
| 9024 | + * handlers of the ignore list read the path the same way. | |
| 9025 | + * | |
| 9026 | + * Known limits, found by the cross review, that only a file name with a | |
| 9027 | + * stray < in it reaches. wp_strip_all_tags() shortens such a name at the | |
| 9028 | + * < instead of refusing it, so the stored entry can match another file | |
| 9029 | + * (a.php<b is stored as a.php), and the value ignore_file() returns is | |
| 9030 | + * not read, so a refusal of its own is answered as success. The fix, if | |
| 9031 | + * a site ever needs it, is to answer with an error when | |
| 9032 | + * wp_strip_all_tags() changes what was sent and to check that return | |
| 9033 | + * value. An entry the old reader stored for such a name (it wrote the | |
| 9034 | + * < as <) is listed but "Stop ignoring" cannot remove it; "Clear all | |
| 9035 | + * ignored files" does. | |
| 9036 | + */ | |
| 9037 | + $file = ( isset( $_POST['file'] ) && is_string( $_POST['file'] ) ) ? wp_strip_all_tags( wp_unslash( $_POST['file'] ) ) : ''; | |
| 7658 | 9038 | |
| 7659 | 9039 | if ( empty( $file ) ) { |
| 7660 | 9040 | wp_send_json_error( __( 'No file specified.', 'vigilante' ) ); |
| 7661 | 9041 | } |
| 7662 | 9042 | |
| 9043 | + // A change to a shared file is closed by approving it, and approving it | |
| 9044 | + // takes the network. Ignoring it would close the same warning without. | |
| 9045 | + if ( $this->critical_approval_locked() && in_array( $file, array( 'wp-config.php', '.htaccess' ), true ) ) { | |
| 9046 | + wp_send_json_error( $this->critical_approval_notice() ); | |
| 9047 | + } | |
| 9048 | + | |
| 9049 | + // Vigilant's own files are never ignored, on any site: silencing the | |
| 9050 | + // check that says the security plugin was changed is the one button | |
| 9051 | + // an attacker would want on this screen. Since 3.0.0 those findings | |
| 9052 | + // are not rows of these tables either, so nothing in the interface | |
| 9053 | + // sends them here; this is the door, not the label. | |
| 9054 | + if ( Vigilante_Self_Integrity::is_own_file_path( $file ) ) { | |
| 9055 | + wp_send_json_error( __( 'Findings about Vigilant own files cannot be ignored. File Integrity explains what each one means and how to repair it.', 'vigilante' ) ); | |
| 9056 | + } | |
| 9057 | + | |
| 7663 | 9058 | $file_integrity = new Vigilante_File_Integrity( $this->settings, $this->database ); |
| 7664 | 9059 | $file_integrity->ignore_file( $file ); |
| 7665 | 9060 | |
| 7666 | 9061 | // Also remove the file from stored scan results so UI updates |
| @@ -7693,9 +9088,9 @@ | ||
| 7693 | 9088 | if ( ! current_user_can( 'manage_options' ) ) { |
| 7694 | 9089 | wp_send_json_error( __( 'Permission denied.', 'vigilante' ) ); |
| 7695 | 9090 | } |
| 7696 | 9091 | |
| 7697 | - $file = isset( $_POST['file'] ) ? sanitize_text_field( wp_unslash( $_POST['file'] ) ) : ''; | |
| 9092 | + $file = ( isset( $_POST['file'] ) && is_string( $_POST['file'] ) ) ? wp_strip_all_tags( wp_unslash( $_POST['file'] ) ) : ''; | |
| 7698 | 9093 | |
| 7699 | 9094 | if ( empty( $file ) ) { |
| 7700 | 9095 | wp_send_json_error( __( 'No file specified.', 'vigilante' ) ); |
| 7701 | 9096 | } |
| @@ -7724,12 +9119,16 @@ | ||
| 7724 | 9119 | if ( ! is_array( $raw_files ) ) { |
| 7725 | 9120 | wp_send_json_error( __( 'Invalid request.', 'vigilante' ) ); |
| 7726 | 9121 | } |
| 7727 | 9122 | |
| 7728 | - $files = array(); | |
| 9123 | + $files = array(); | |
| 9124 | + $locked = $this->critical_approval_locked(); | |
| 9125 | + $shared = $locked ? array( 'wp-config.php', '.htaccess' ) : array(); | |
| 7729 | 9126 | foreach ( $raw_files as $f ) { |
| 7730 | - $clean = sanitize_text_field( $f ); | |
| 7731 | - if ( '' !== $clean ) { | |
| 9127 | + $clean = is_string( $f ) ? wp_strip_all_tags( $f ) : ''; | |
| 9128 | + // Same rule as ajax_ignore_file(): the two shared files when the | |
| 9129 | + // network locks them, and Vigilant's own files always. | |
| 9130 | + if ( '' !== $clean && ! in_array( $clean, $shared, true ) && ! Vigilante_Self_Integrity::is_own_file_path( $clean ) ) { | |
| 7732 | 9131 | $files[] = $clean; |
| 7733 | 9132 | } |
| 7734 | 9133 | } |
| 7735 | 9134 | |
| @@ -7793,9 +9192,9 @@ | ||
| 7793 | 9192 | } |
| 7794 | 9193 | |
| 7795 | 9194 | $files = array(); |
| 7796 | 9195 | foreach ( $raw_files as $f ) { |
| 7797 | - $clean = sanitize_text_field( $f ); | |
| 9196 | + $clean = is_string( $f ) ? wp_strip_all_tags( $f ) : ''; | |
| 7798 | 9197 | if ( '' !== $clean ) { |
| 7799 | 9198 | $files[] = $clean; |
| 7800 | 9199 | } |
| 7801 | 9200 | } |
