commit 9707668d8104b1870e02447b13ad87c63d3f24b9
author Jonathan Nieder <jrn@google.com> Mon Dec 12 15:54:33 2022 -0800
committer Jonathan Nieder <jrn@google.com> Mon Dec 12 15:58:15 2022 -0800
tree 3bf648c96aa092d90b90ad5becd6012c1e80447f
parent 34d50084e091513ce2f2a72cfd560eff99207ec5

Provide nonce as String, not Optional<String>, to Soy

Otherwise, when the nonce is available the index page fails to load,
with "500 Internal Server Error", due to the server-side exception
"IllegalArgumentException: Unable to convert param csp_nonce to a
SoyValue".

Noticed via a Google-internal integration test.  Tested by re-running
the same test with this change applied.

Google-Bug-Id: b/33429040
Change-Id: I98fc6ea267eff6a332e1345f79a4e7bbf51376a7

java/com/google/gitiles/Renderer.java

diff --git a/java/com/google/gitiles/Renderer.java b/java/com/google/gitiles/Renderer.java
index 3b85e3d..3bf9754 100644
--- a/java/com/google/gitiles/Renderer.java
+++ b/java/com/google/gitiles/Renderer.java
@@ -238,7 +238,7 @@
             .put("SITE_TITLE", siteTitle);
     Optional<String> nonce = req.map((r) -> (String) r.getAttribute("nonce"));
     if (nonce.isPresent() && nonce.get() != null) {
-      ij.put("csp_nonce", nonce);
+      ij.put("csp_nonce", nonce.get());
     }
     return getSauce().renderTemplate(templateName).setIj(ij.build());
   }