Changeset 1059828

Timestamp:

01/04/2015 10:04:44 PM (10 years ago)

Author:

tollmanz

Message:

Port updates from Github.

Location:

https-mixed-content-detector/trunk

Files:

• beacon.php (modified) (2 diffs)
• config.php (modified) (1 diff)
• helpers.php (added)
• https-mixed-content-detector.php (modified) (3 diffs)
• policy.php (modified) (3 diffs)
• readme.txt (modified) (3 diffs)
• wp-cli.php (added)

https-mixed-content-detector/trunk/beacon.php

@@ -155 +155 @@
 
             case 'original-policy' :
-                $v_directive = get_post_meta( $post_id , 'original-policy' , true );
-                echo ( ! empty( $v_directive ) ) ? esc_html( wp_strip_all_tags( $v_directive ) ) : __( 'N/A', 'zdt-mcd' );
+                $ = get_post_meta( $post_id , 'original-policy' , true );
+                echo ( ! empty( $ ) ) : __( 'N/A', 'zdt-mcd' );
                 break;
         }
@@ -229 +229 @@
         }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         exit();
     }

https-mixed-content-detector/trunk/config.php

@@ -6 +6 @@
  */
 define( 'MCD_REPORT_URI', site_url( '/?mcd=report&nonce=' . wp_create_nonce( 'mcd-report-uri' ) ) );
-
-/**
- * Define the policies to monitor for.
- *
- * @since 1.0.0.
- */
-if ( ! defined( 'MCD_POLICY' ) ) {
-    define( 'MCD_POLICY', "default-src 'unsafe-inline' 'unsafe-eval' data: https:; report-uri " . MCD_REPORT_URI );
-}
 
 /**

https-mixed-content-detector/trunk/https-mixed-content-detector.php

@@ -4 +4 @@
  * Plugin URI:     https://github.com/tollmanz/wordpress-https-mixed-content-detector
  * Description:    A tool for proactively detecting mixed content issues in TLS enabled WordPress websites.
- * Version:        1.0.2
+ * Version:        1.
  * Author:         Zack Tollman
  * Author URI:     https://www.tollmanz.com
@@ -25 +25 @@
      * @var   string    The semantically versioned plugin version number.
      */
-    var $version = '1.0.1';
+    var $version = '1.';
 
     /**
@@ -93 +93 @@
         // Include dependent files
         include $this->root_dir . '/config.php';
+
         include $this->root_dir . '/beacon.php';
         include $this->root_dir . '/policy.php';
+
+
+
+
     }
 }

https-mixed-content-detector/trunk/policy.php

@@ -83 +83 @@
      *
      * @since  1.0.0.
+
      *
      * @return string    The full policy
      */
     public function get_full_policy() {
-        return MCD_POLICY;
+        global $mcd_policies;
+
+        // Respect the global array of policies in version 1.1.x+
+        if ( isset( $mcd_policies ) ) {
+            $policy = $this->build_policy( $mcd_policies );
+
+            // Respect the MCD_POLICY constant used in version 1.0.x
+        } elseif ( defined( 'MCD_POLICY' ) ) {
+            $policy = MCD_POLICY;
+
+        // Default to the core list of policies
+        } else {
+            $policy = $this->build_policy( $this->get_default_policies() );
+        }
+
+        return $policy;
+    }
+
+    /**
+     * Get a list of policies set for the page load.
+     *
+     * Note that this function is intended to be used for breaking a CSP string into an array. It is primarily used for
+     * whitelisting policies sent to the beacon.
+     *
+     * @since  1.0.0.
+     * @since  1.1.0    Generate the list from the new default policies.
+     *
+     * @return array    A list of full policies.
+     */
+    public function get_policies() {
+        return explode( '; ', $this->get_full_policy() );
     }
 
@@ -94 +125 @@
      *
      * @since  1.0.0.
+
      *
      * @return array    Array of CSP policies.
      */
-    public function get_policies() {
-        return explode( '; ', MCD_POLICY );
+    public function ) {
+        return );
     }
 
@@ -110 +142 @@
     public function get_report_url() {
         return MCD_REPORT_URI;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 }

https-mixed-content-detector/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.0.1
 Tested up to: trunk
-Stable tag: 1.0.2
+Stable tag: 1.
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -38 +38 @@
 == Changelog ==
 
+
+
+
+
+
 = 1.0.2 =
 * Remove false positives from the log
@@ -49 +54 @@
 == Upgrade Notice ==
 
+
+
+
 = 1.0.2 =
 Remove false positives from the log