Release 2.5.0

Change-Id: Iaf2358093b8330f1199d4619e2475eec8f61fce6
Reviewed-on: http://review.couchbase.org/96543
Tested-by: Build Bot <[email protected]>
Reviewed-by: Sergey Avseyev <[email protected]>

Author: avsej

api/couchbase.php

@@ -335,6 +335,7 @@ public function manager($username = null, $password = null) {}
          * @see \Couchbase\Authenticator
          * @see \Couchbase\ClassicAuthenticator
          * @see \Couchbase\PasswordAuthenticator
+         * @see \Couchbase\CertAuthenticator
          */
         public function authenticate($authenticator) {}
 
@@ -1432,6 +1433,7 @@ public function dropN1qlIndex($name, $ignoreIfNotExist = false) {}
      * @see \Couchbase\Cluster::authenticate()
      * @see \Couchbase\ClassicAuthenticator
      * @see \Couchbase\PasswordAuthenticator
+     * @see \Couchbase\CertAuthenticator
      */
     interface Authenticator {}
 
@@ -1492,6 +1494,18 @@ public function username($username) {}
         public function password($password) {}
     }
 
+    /**
+     * Authenticator for Client Certificate authentication feature of Couchbase Server 5+.
+     *
+     * This authenticator does not have any attributes, but ensures that
+     * "certpath" and "keypath" options specified in the connection string
+     *
+     * @see \Couchbase\Cluster::authenticate()
+     * @see \Couchbase\Authenticator
+     */
+    class CertAuthenticator implements Authenticator {
+    }
+
     /**
      * An object which contains meta information of the document needed to enforce query consistency.
      */

package.xml

@@ -18,9 +18,9 @@
         <active>yes</active>
     </lead>
 
-    <date>2018-06-07</date>
+    <date>2018-07-05</date>
     <version>
-        <release>2.4.7</release>
+        <release>2.5.0</release>
         <api>2.3.0</api>
     </version>
     <stability>
@@ -30,9 +30,12 @@
     <license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache V2
     </license>
     <notes>
-        * PCBC-534: Add profile N1QL query parameter.
-        * PCBC-538: do not dereference NULL values after encoding.
-        * PCBC-549, PCBC-541: Update crypto interfaces.
+        * PCBC-551: Do not complain about missing igbinary on start
+        * PCBC-552: Pass logger to lcb_create to catch all log messages
+        * PCBC-553: Check if crypto provider implements IV and signatures
+        * PCBC-554: Fix search query descending order to use "desc"
+        * PCBC-544: Implement CertAuthenticator for extra checks
+        * Fixes for PHP 7.3
     </notes>
     <contents>
         <dir name="/">
@@ -75,6 +78,7 @@
             <file role="src" name="src/couchbase/analytics_query.c" />
             <file role="src" name="src/couchbase/authenticator.c" />
             <file role="src" name="src/couchbase/crypto.c" />
+            <file role="src" name="src/couchbase/cert_authenticator.c" />
             <file role="src" name="src/couchbase/classic_authenticator.c" />
             <file role="src" name="src/couchbase/password_authenticator.c" />
             <file role="src" name="src/couchbase/base36.c" />
@@ -182,6 +186,24 @@
     <providesextension>couchbase</providesextension>
     <extsrcrelease/>
     <changelog>
+        <release>
+            <date>2018-06-07</date>
+            <version>
+                <release>2.4.7</release>
+                <api>2.3.0</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache V2
+            </license>
+            <notes>
+                * PCBC-534: Add profile N1QL query parameter.
+                * PCBC-538: do not dereference NULL values after encoding.
+                * PCBC-549, PCBC-541: Update crypto interfaces.
+            </notes>
+        </release>
         <release>
             <date>2018-04-13</date>
             <version>

php_couchbase.h

@@ -17,7 +17,7 @@
 #ifndef PHP_COUCHBASE_H_
 #define PHP_COUCHBASE_H_
 
-#define PHP_COUCHBASE_VERSION "2.4.7"
+#define PHP_COUCHBASE_VERSION "2.5.0"
 #define PHP_COUCHBASE_EXTNAME "couchbase"
 
 extern zend_module_entry couchbase_module_entry;

src/couchbase/bucket.c

@@ -1472,10 +1472,6 @@ static int is_cert_auth_good(pcbc_cluster_t *cluster, const char *password TSRML
             pcbc_log(LOGARGS_(DEBUG), "mixed-auth: keypath in connection string requires CertAuthenticator");
             return 0;
         }
-        if (strstr(cluster->connstr, "certpath") != NULL) {
-            pcbc_log(LOGARGS_(DEBUG), "mixed-auth: certpath in connection string requires CertAuthenticator");
-            return 0;
-        }
     }
     return 1;
 }