From 0d9ca2589f7cfd13f8e89079efa52f899a264867 Mon Sep 17 00:00:00 2001
From: Aviv Eyal <avivey@gmail.com>
Date: Fri, 12 Apr 2024 19:27:54 +0300
Subject: [PATCH] Make sure `offset` is an integer

Summary:
Older git versions allowed the `--skip` to get empty string as value and interpreted that to an int.
We were sending `null` in some places where we wanted a `0`, so it all worked out.

Since https://git.kernel.org/pub/scm/git/git.git/commit/revision.c?id=71a1e94821666909b7b2bd62a36244c601f8430e git fails when provided empty string for an integer.

See Q124 and T15783.

Test Plan: Have recent git version (that fails with `--skip ''`, navigate to `/diffusion/1/history/master/`) - see history.

Reviewers: O1 Blessed Committers, valerio.bozzolan

Reviewed By: O1 Blessed Committers, valerio.bozzolan

Subscribers: aklapper, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Differential Revision: https://we.phorge.it/D25575
---
 src/applications/conduit/protocol/ConduitAPIRequest.php    | 7 +++++++
 .../conduit/DiffusionHistoryQueryConduitAPIMethod.php      | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/applications/conduit/protocol/ConduitAPIRequest.php b/src/applications/conduit/protocol/ConduitAPIRequest.php
index 78988f2b3b..4b924e378f 100644
--- a/src/applications/conduit/protocol/ConduitAPIRequest.php
+++ b/src/applications/conduit/protocol/ConduitAPIRequest.php
@@ -17,6 +17,13 @@ final class ConduitAPIRequest extends Phobject {
     return coalesce(idx($this->params, $key), $default);
   }
 
+  public function getIntValue($key, $default = 'undefined_magic_text') {
+    if ($default === 'undefined_magic_text' && !$this->getValueExists($key)) {
+      throw new Exception(pht('Required int param not provided: %s', $key));
+    }
+    return (int)$this->getValue($key, $default);
+  }
+
   public function getValueExists($key) {
     return array_key_exists($key, $this->params);
   }
diff --git a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
index ba0ee3bd0b..0c5e24e0e0 100644
--- a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
@@ -51,8 +51,8 @@ final class DiffusionHistoryQueryConduitAPIMethod
       $path = null;
     }
 
-    $offset = $request->getValue('offset');
-    $limit = $request->getValue('limit');
+    $offset = $request->getIntValue('offset');
+    $limit = $request->getIntValue('limit', 100);
 
     if (phutil_nonempty_string($against_hash)) {
       $commit_range = "{$against_hash}..{$commit_hash}";