From 88105042ad6ceaac5797b7ad3a150cc9c9adfaf4 Mon Sep 17 00:00:00 2001
From: Christian Schilling <christian.schilling.de@gmail.com>
Date: Wed, 20 Mar 2024 10:21:02 +0100
Subject: [PATCH] Fix sha based request in combination with hbs (#1320)

The case where a sha was passed instead of a ref was not
handled in the code for rendering hbs files.

Change: fix-sha-hbs
---
 josh-proxy/src/bin/josh-proxy.rs | 10 +++++++---
 tests/proxy/query.t              | 11 +++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/josh-proxy/src/bin/josh-proxy.rs b/josh-proxy/src/bin/josh-proxy.rs
index cac2cb49..c290cb58 100644
--- a/josh-proxy/src/bin/josh-proxy.rs
+++ b/josh-proxy/src/bin/josh-proxy.rs
@@ -1402,9 +1402,13 @@ async fn serve_query(
                 .unwrap(),
         )?;
 
-        let commit_id = transaction_mirror
-            .repo()
-            .refname_to_id(&transaction_mirror.refname(&head_ref))?;
+        let commit_id = if let Ok(oid) = git2::Oid::from_str(&head_ref) {
+            oid
+        } else {
+            transaction_mirror
+                .repo()
+                .refname_to_id(&transaction_mirror.refname(&head_ref))?
+        };
         let commit_id =
             josh::filter_commit(&transaction, filter, commit_id, josh::filter::empty())?;
 
diff --git a/tests/proxy/query.t b/tests/proxy/query.t
index 114976a0..067f911e 100644
--- a/tests/proxy/query.t
+++ b/tests/proxy/query.t
@@ -69,6 +69,7 @@ Now render still works (used to fail if filtered previously)
   param: 12345
   sha: 890148bbaa6a797bac8aef672a437f2b08635f15
   filter_sha: ffe8d082c1034053534ea8068f4205ac72a1098e
+
   $ curl -s -i http://localhost:8002/real_repo.git?render=tmpl_file\&param_val=12345 | grep -v date:
   HTTP/1.1 200 OK\r (esc)
   content-type: text/plain\r (esc)
@@ -78,6 +79,16 @@ Now render still works (used to fail if filtered previously)
   sha: 890148bbaa6a797bac8aef672a437f2b08635f15
   filter_sha: ffe8d082c1034053534ea8068f4205ac72a1098e
 
+  $ curl -s http://localhost:8002/real_repo.git@refs/heads/master?render=tmpl_file\&param_val=12345 | grep -v date:
+  param: 12345
+  sha: 890148bbaa6a797bac8aef672a437f2b08635f15
+  filter_sha: ffe8d082c1034053534ea8068f4205ac72a1098e
+
+  $ curl -s http://localhost:8002/real_repo.git@890148bbaa6a797bac8aef672a437f2b08635f15?render=tmpl_file\&param_val=12345 | grep -v date:
+  param: 12345
+  sha: 890148bbaa6a797bac8aef672a437f2b08635f15
+  filter_sha: ffe8d082c1034053534ea8068f4205ac72a1098e
+
 Graphql works
   $ curl -s http://localhost:8002/real_repo.git?graphql=x.graphql
   {