Add support for libmemcached encryption

Author: sodabrew

Diff for: config.m4

@@ -317,10 +317,29 @@ if test "$PHP_MEMCACHED" != "no"; then
     CFLAGS="$ORIG_CFLAGS"
     LIBS="$ORIG_LIBS"
 
+    CFLAGS="$CFLAGS $PHP_LIBMEMCACHED_INCLUDES"
+    LIBS="$LIBS $PHP_LIBMEMCACHED_LIBS"
+
     if test "$ac_cv_have_memcached_exist" = "yes"; then
       AC_DEFINE(HAVE_MEMCACHED_EXIST, [1], [Whether memcached_exist is defined])
     fi
 
+    AC_CACHE_CHECK([whether memcached_set_encoding_key is defined], ac_cv_have_memcached_set_encoding_key, [
+      AC_TRY_LINK(
+        [ #include <libmemcached/memcached.h> ],
+        [ memcached_set_encoding_key (NULL, NULL, 0); ],
+        [ ac_cv_have_memcached_set_encoding_key="yes" ],
+        [ ac_cv_have_memcached_set_encoding_key="no" ]
+      )
+    ])
+
+    CFLAGS="$ORIG_CFLAGS"
+    LIBS="$ORIG_LIBS"
+
+    if test "$ac_cv_have_memcached_set_encoding_key" = "yes"; then
+      AC_DEFINE(HAVE_MEMCACHED_SET_ENCODING_KEY, [1], [Whether memcached_set_encoding_key is defined])
+    fi
+
     PHP_MEMCACHED_FILES="php_memcached.c php_libmemcached_compat.c  g_fmt.c"
 
     if test "$PHP_SYSTEM_FASTLZ" != "no"; then

Diff for: memcached-api.php

@@ -96,6 +96,8 @@ class Memcached {
 
 	const HAVE_MSGPACK;
 
+	const HAVE_ENCODING;
+
 	/**
 	 * Feature support
 	 */
@@ -363,6 +365,8 @@ public function isPristine( ) {}
 
 	public function setSaslAuthData( $username, $password ) {}
 
+	public function setEncodingKey( $key ) {}
+
 }
 
 class MemcachedException extends Exception {

Diff for: package.xml

@@ -159,6 +159,7 @@ Fixes
     <file role='test' name='testdata.res'/>
     <file role='test' name='config.inc'/>
     <file role='test' name='sasl_basic.phpt'/>
+    <file role='test' name='set_encoding_key.phpt'/>
     <file role='test' name='getserverbykey.phpt'/>
     <file role='test' name='gh_155.phpt'/>
     <file role='test' name='get_flags.phpt'/>

Diff for: php_memcached.c

@@ -3265,6 +3265,32 @@ static PHP_METHOD(Memcached, setSaslAuthData)
 /* }}} */
 #endif /* HAVE_MEMCACHED_SASL */
 
+#ifdef HAVE_MEMCACHED_SET_ENCODING_KEY
+/* {{{ Memcached::setEncodingKey(string key)
+   Sets AES encryption key (libmemcached 1.0.6 and higher) */
+static PHP_METHOD(Memcached, setEncodingKey)
+{
+	MEMC_METHOD_INIT_VARS;
+	memcached_return status;
+	zend_string *key;
+
+	/* "S" */
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+	        Z_PARAM_STR(key)
+	ZEND_PARSE_PARAMETERS_END();
+
+	MEMC_METHOD_FETCH_OBJECT;
+
+	status = memcached_set_encoding_key(intern->memc, ZSTR_VAL(key), ZSTR_LEN(key));
+
+	if (s_memc_status_handle_result_code(intern, status) == FAILURE) {
+		RETURN_FALSE;
+	}
+	RETURN_TRUE;
+}
+/* }}} */
+#endif /* HAVE_MEMCACHED_SET_ENCODING_KEY */
+
 /* {{{ Memcached::getResultCode()
    Returns the result code from the last operation */
 static PHP_METHOD(Memcached, getResultCode)
@@ -4034,6 +4060,12 @@ ZEND_BEGIN_ARG_INFO(arginfo_setSaslAuthData, 0)
 ZEND_END_ARG_INFO()
 #endif
 
+#ifdef HAVE_MEMCACHED_SET_ENCODING_KEY
+ZEND_BEGIN_ARG_INFO(arginfo_setEncodingKey, 0)
+	ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO()
+#endif
+
 ZEND_BEGIN_ARG_INFO(arginfo_setOption, 0)
 	ZEND_ARG_INFO(0, option)
 	ZEND_ARG_INFO(0, value)
@@ -4133,6 +4165,9 @@ static zend_function_entry memcached_class_methods[] = {
 	MEMC_ME(setBucket,          arginfo_setBucket)
 #ifdef HAVE_MEMCACHED_SASL
 	MEMC_ME(setSaslAuthData,    arginfo_setSaslAuthData)
+#endif
+#ifdef HAVE_MEMCACHED_SET_ENCODING_KEY
+	MEMC_ME(setEncodingKey,     arginfo_setEncodingKey)
 #endif
 	MEMC_ME(isPersistent,       arginfo_isPersistent)
 	MEMC_ME(isPristine,         arginfo_isPristine)
@@ -4282,6 +4317,15 @@ static void php_memc_register_constants(INIT_FUNC_ARGS)
 	REGISTER_MEMC_CLASS_CONST_BOOL(HAVE_MSGPACK, 0);
 #endif
 
+	/*
+	 * Indicate whether set_encoding_key is available
+	 */
+#ifdef HAVE_MEMCACHED_SET_ENCODING_KEY
+	REGISTER_MEMC_CLASS_CONST_BOOL(HAVE_ENCODING, 1);
+#else
+	REGISTER_MEMC_CLASS_CONST_BOOL(HAVE_ENCODING, 0);
+#endif
+
 #ifdef HAVE_MEMCACHED_SESSION
 	REGISTER_MEMC_CLASS_CONST_BOOL(HAVE_SESSION, 1);
 #else

Diff for: tests/set_encoding_key.phpt

@@ -0,0 +1,44 @@
+--TEST--
+Test libmemcached encryption
+--SKIPIF--
+<?php
+include dirname (__FILE__) . '/config.inc';
+if (!extension_loaded("memcached")) die ("skip");
+if (!Memcached::HAVE_ENCODING) die ("skip no set_encoding_key support enabled");
+?>
+--FILE--
+<?php
+include dirname (__FILE__) . '/config.inc';
+$m = memc_get_instance ();
+
+var_dump ($m->setEncodingKey("Hello"));
+
+$key = uniqid ('encoding_test_');
+var_dump ($m->set ($key, 'set using encoding'));
+var_dump ($m->get ($key));
+
+echo "OK" . PHP_EOL;
+
+# Change the encryption key. The old value will be inaccessible.
+var_dump ($m->setEncodingKey("World"));
+var_dump ($m->get ($key));
+
+echo "OK" . PHP_EOL;
+
+var_dump ($m->set ($key, 'set using encoding'));
+var_dump ($m->get ($key));
+
+echo "OK" . PHP_EOL;
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
+string(18) "set using encoding"
+OK
+bool(true)
+bool(false)
+OK
+bool(true)
+string(18) "set using encoding"
+OK