(security/core#67) Port APIv3's escaping scheme to APIv4

diff --git a/Civi/Api4/Generic/Traits/DAOActionTrait.php b/Civi/Api4/Generic/Traits/DAOActionTrait.php
index 29e30f86ea93151725c0eb985f9975d426de7bbc..638c8fe83db98af7ec629cecc4fa2c83edfdfd4b 100644 (file)
--- a/Civi/Api4/Generic/Traits/DAOActionTrait.php
+++ b/Civi/Api4/Generic/Traits/DAOActionTrait.php
@@ -92,7 +92,11 @@ trait DAOActionTrait {
     $query->orderBy = $this->getOrderBy();
     $query->limit = $this->getLimit();
     $query->offset = $this->getOffset();
-    return $query->run();
+    $result = $query->run();
+    if (is_array($result)) {
+      \CRM_Utils_API_HTMLInputCoder::singleton()->decodeRows($result);
+    }
+    return $result;
   }
 
   /**

diff --git a/Civi/Api4/Utils/FormattingUtil.php b/Civi/Api4/Utils/FormattingUtil.php
index b845ea66084389cb26e253535a068077ef29f7f8..f848f5ba2650969b28d0fa09cbcc564fd198db33 100644 (file)
--- a/Civi/Api4/Utils/FormattingUtil.php
+++ b/Civi/Api4/Utils/FormattingUtil.php
@@ -81,6 +81,8 @@ class FormattingUtil {
         $params[$name] = 'null';
       }
     }
+
+    \CRM_Utils_API_HTMLInputCoder::singleton()->encodeRow($params);
   }
 
   /**
@@ -127,6 +129,11 @@ class FormattingUtil {
         $value = date('Ymd', strtotime($value));
         break;
     }
+
+    $hic = \CRM_Utils_API_HTMLInputCoder::singleton();
+    if (!$hic->isSkippedField($fieldSpec['name'])) {
+      $value = $hic->encodeValue($value);
+    }
   }
 
 }

diff --git a/tests/phpunit/api/v4/Entity/ContactInterchangeTest.php b/tests/phpunit/api/v4/Entity/ContactInterchangeTest.php
new file mode 100644 (file)
index 0000000..2c0b4ca
--- /dev/null
+++ b/tests/phpunit/api/v4/Entity/ContactInterchangeTest.php
@@ -0,0 +1,158 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 5                                                  |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC (c) 2004-2019
+ * $Id$
+ *
+ */
+
+namespace api\v4\Entity;
+
+use Civi\Api4\Contact;
+use api\v4\UnitTestCase;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * Assert that interchanging data between APIv3 and APIv4 yields consistent
+ * encodings.
+ *
+ * @group headless
+ */
+class ContactInterchangeTest extends UnitTestCase implements TransactionalInterface {
+
+  public function getExamples() {
+    $apiWriters = [
+      'create_3',
+      'create_4',
+    ];
+    $apiReaderSets = [
+      ['readNameById_3', 'readNameByValueEq_3'],
+      ['readNameById_4', 'readNameByValueEq_4', 'readNameByValueIn_4'],
+    ];
+    $strings = [
+      // Values chosen for backwards compatibility.
+      ['api' => 'Little Bobby :> & :<', 'db' => 'Little Bobby :&gt; & :&lt;'],
+      ['api' => 'Little Bobby &amp; Bob', 'db' => 'Little Bobby &amp; Bob'],
+      ['api' => 'It\'s', 'db' => 'It\'s'],
+    ];
+
+    $cases = \CRM_Utils_Array::product([
+      'w' => $apiWriters,
+      'r' => $apiReaderSets,
+      'strs' => $strings,
+    ]);
+    foreach ($cases as $case) {
+      yield [$case['w'], $case['r'], $case['strs']];
+    }
+  }
+
+  /**
+   * Use the given $writer to create a row with some funny data.
+   * Then use the given $reader to load the row.
+   * Assert that the funny data looks the same.
+   *
+   * @dataProvider getExamples
+   */
+  public function testReadWriteAPI($writer, $readers, $strs) {
+    $caseName = sprintf("writer=%s, readers=%s, strs.api=%s", $writer, implode(',', $readers), $strs['api']);
+
+    $cid = call_user_func([$this, $writer], $strs);
+
+    $dbGet = \CRM_Core_DAO::singleValueQuery('SELECT first_name FROM civicrm_contact WHERE id = %1', [
+      1 => [$cid, 'Positive'],
+    ]);
+    $this->assertEquals($strs['db'], $dbGet, "Check DB content ($caseName)");
+
+    $this->assertNotEmpty($readers);
+    foreach ($readers as $reader) {
+      $get = call_user_func([$this, $reader], $cid, $strs);
+      $this->assertEquals($strs['api'], $get, "Check API content ($caseName)");
+    }
+  }
+
+  public function create_3($strs) {
+    $contact = civicrm_api3('Contact', 'create', [
+      'contact_type' => 'Individual',
+      'first_name' => $strs['api'],
+    ]);
+    return $contact['id'];
+  }
+
+  public function create_4($strs) {
+    $contact = civicrm_api4('Contact', 'create', [
+      'values' => [
+        'contact_type' => 'Individual',
+        'first_name' => $strs['api'],
+      ],
+    ]);
+    return $contact->first()['id'];
+  }
+
+  public function readNameById_3($cid, $strs) {
+    $get = civicrm_api3('Contact', 'getsingle', [
+      'id' => $cid,
+      'return' => 'first_name',
+    ]);
+    return $get['first_name'];
+  }
+
+  public function readNameByValueEq_3($cid, $strs) {
+    $get = civicrm_api3('Contact', 'getsingle', [
+      'first_name' => $strs['api'],
+    ]);
+    return $get['first_name'];
+  }
+
+  public function readNameById_4($cid, $strs) {
+    $get = Contact::get()
+      ->addWhere('id', '=', $cid)
+      ->addSelect('first_name')
+      ->execute();
+    return $get->first()['first_name'];
+  }
+
+  public function readNameByValueEq_4($cid, $strs) {
+    $get = Contact::get()
+      ->addWhere('first_name', '=', $strs['api'])
+      ->addSelect('first_name')
+      ->execute();
+    return $get->first()['first_name'];
+  }
+
+  public function readNameByValueIn_4($cid, $strs) {
+    $get = Contact::get()
+      ->addWhere('first_name', 'IN', [$strs['api']])
+      ->addSelect('first_name')
+      ->execute();
+    return $get->first()['first_name'];
+  }
+
+}