[aur-dev] [PATCH v2 2/2] Expose name-only search through the RPC interface

[Johannes Löthberg]

Fixes FS#37317.

Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
---
Changes since v1:
* Renamed name_and_desc to name-desc
* Use isset() instead of !== null
* The previous patch passes the http_data array to all functions instead 
  of having to add another argument just to the search function for the 
  search_by field.

 web/lib/aurjson.class.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php
index 6f95406..b926d46 100644
--- a/web/lib/aurjson.class.php
+++ b/web/lib/aurjson.class.php
@@ -16,6 +16,9 @@ class AurJSON {
 		'search', 'info', 'multiinfo', 'msearch', 'suggest',
 		'suggest-pkgbase'
 	);
+	private static $exposed_fields = array(
+		'name', 'name-desc'
+	);
 	private static $fields_v1 = array(
 		'Packages.ID', 'Packages.Name',
 		'PackageBases.ID AS PackageBaseID',
@@ -80,6 +83,9 @@ class AurJSON {
 		if (!in_array($http_data['type'], self::$exposed_methods)) {
 			return $this->json_error('Incorrect request type specified.');
 		}
+		if (isset($http_data['search_by']) && !in_array($http_data['search_by'], self::$exposed_fields)) {
+			return $this->json_error('Incorrect search_by field specified.');
+		}
 
 		$this->dbh = DB::connect();
 
@@ -322,6 +328,11 @@ class AurJSON {
 	 */
 	private function search($http_data) {
 		$keyword_string = $http_data['arg'];
+		if (isset($http_data['search_by'])) {
+			$search_by = $http_data['search_by'];
+		} else {
+			$search_by = 'name-desc';
+		}
 
 		if (strlen($keyword_string) < 2) {
 			return $this->json_error('Query arg too small');
@@ -329,8 +340,12 @@ class AurJSON {
 
 		$keyword_string = $this->dbh->quote("%" . addcslashes($keyword_string, '%_') . "%");
 
-		$where_condition = "(Packages.Name LIKE $keyword_string OR ";
-		$where_condition .= "Description LIKE $keyword_string)";
+		if ($search_by === 'name') {
+			$where_condition = "(Packages.Name LIKE $keyword_string)";
+		} else if ($search_by === 'name-desc') {
+			$where_condition = "(Packages.Name LIKE $keyword_string OR ";
+			$where_condition .= "Description LIKE $keyword_string)";
+		}
 
 		return $this->process_query('search', $where_condition);
 	}
-- 
2.4.4