Changeset 6339

Timestamp:

11/17/2007 11:21:34 AM (17 years ago)

Author:

westi

Message:

Ensure that we offer https access to atom if it is available. Fixes #5298 props rubys.

Location:

trunk

Files:

• wp-app.php (modified) (9 diffs)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• xmlrpc.php (modified) (2 diffs)

trunk/wp-app.php

@@ -69 +69 @@
 
     var $params = array();
-    var $script_name = "wp-app.php";
     var $media_content_types = array('image/*','audio/*','video/*');
     var $atom_content_types = array('application/atom+xml');
@@ -81 +80 @@
 
         $this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME']));
+        $this->app_base = get_bloginfo('url') . '/' . $this->script_name . '/';
+        if ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) {
+            $this->app_base = preg_replace( '/^http:\/\//', 'https://', $this->app_base );
+        }
 
         $this->selectors = array(
@@ -595 +598 @@
             $path = $this->ENTRIES_PATH;
         }
-        $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $path;
+        $url = $this->app_base . $path;
         if(isset($page) && is_int($page)) {
             $url .= "/$page";
@@ -608 +611 @@
 
     function get_categories_url($page = NULL) {
-        return get_bloginfo('url') . '/' . $this->script_name . '/' . $this->CATEGORIES_PATH;
+        return $this->app_base . $this->CATEGORIES_PATH;
     }
 
@@ -617 +620 @@
 
     function get_attachments_url($page = NULL) {
-        $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->MEDIA_PATH;
+        $url = $this->app_base . $this->MEDIA_PATH;
         if(isset($page) && is_int($page)) {
             $url .= "/$page";
@@ -630 +633 @@
 
     function get_service_url() {
-        return get_bloginfo('url') . '/' . $this->script_name . '/' . $this->SERVICE_PATH;
+        return $this->app_base . $this->SERVICE_PATH;
     }
 
@@ -639 +642 @@
         }
 
-        $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->ENTRY_PATH . "/$postID";
+        $url = $this->app_base . $this->ENTRY_PATH . "/$postID";
 
         log_app('function',"get_entry_url() = $url");
@@ -656 +659 @@
         }
 
-        $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->MEDIA_SINGLE_PATH ."/file/$postID";
+        $url = $this->app_base . $this->MEDIA_SINGLE_PATH ."/file/$postID";
 
         log_app('function',"get_media_url() = $url");
@@ -920 +923 @@
                 break;
             case 'attachment':
-                $edit = get_bloginfo('url') . '/' . $this->script_name . "/attachments/$post_ID";
+                $edit = $this->app_base . "attachments/$post_ID";
                 break;
         }

trunk/wp-includes/default-filters.php

@@ -135 +135 @@
 add_filter('comment_email', 'antispambot');
 
+//Atom SSL support
+add_filter('atom_service_url','atom_service_url_filter');
+
 // Actions
 add_action('wp_head', 'rsd_link');

trunk/wp-includes/functions.php

@@ -1485 +1485 @@
 }
 
+/**
+ * Determines if the blog can be accessed over SSL
+ * @return bool whether of not SSL access is available
+ */
+function url_is_accessable_via_ssl($url)
+{
+    if (in_array('curl', get_loaded_extensions())) {
+         $ssl = preg_replace( '/^http:\/\//', 'https://',  $url );
+
+         $ch = curl_init();
+         curl_setopt($ch, CURLOPT_URL, $ssl);
+         curl_setopt($ch, CURLOPT_FAILONERROR, true);
+         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+
+         $data = curl_exec ($ch);
+
+         $status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+         curl_close ($ch);
+
+         if ($status == 200 || $status == 401) {
+             return true;
+         }
+    }
+    return false;
+}
+
+function atom_service_url_filter($url)
+{
+    if ( url_is_accessable_via_ssl($url) )
+        return  preg_replace( '/^http:\/\//', 'https://',  $url );
+}
 ?>

trunk/xmlrpc.php

@@ -20 +20 @@
 if ( isset( $_GET['rsd'] ) ) { // http://archipelago.phrasewise.com/rsd
 header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
-
 ?>
 <?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
@@ -33 +32 @@
       <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
       <api name="Blogger" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
-      <api name="Atom" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/wp-app.php/service" /> 
+      <api name="Atom" blogID="" preferred="false" apiLink="<?php echo apply_filters('atom_service_url', (get_bloginfo('url')."/wp-app.php/service"))?>" /> 
     </apis>
   </service>