Preliminary support for Memcache SASL authentication

Author: xisi

include/admin_checks.php

@@ -34,6 +34,10 @@
     }
     if (class_exists('Memcached')) {
       $memcache_test = @new Memcached();
+      if ($config['memcache']['sasl']) {
+        $memcache_test->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
+        $memcache_test->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']);
+      }
       $memcache_test_add = @$memcache_test->addServer($config['memcache']['host'], $config['memcache']['port']);
       $randmctv = rand(5,10);
       $memcache_test_set = @$memcache_test->set('test_mpos_setval', $randmctv);

include/classes/statscache.class.php

@@ -19,6 +19,10 @@ public function __construct($config, $debug) {
         require_once(CLASS_DIR . '/memcached.class.php');
       }
       $this->cache = new Memcached();
+      if ($config['memcache']['sasl']) {
+        $this->cache->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
+        $this->cache->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']) or die("failed!");
+      }
     }
   }
 

include/config/global.inc.dist.php

@@ -268,6 +268,9 @@
 $config['memcache']['expiration'] = 90;
 $config['memcache']['splay'] = 15;
 $config['memcache']['force']['contrib_shares'] = false;
+$config['memcache']['sasl'] = false;
+$config['memcache']['sasl']['username'] = '';
+$config['memcache']['sasl']['password'] = '';
 
 /**
  * Cookies