From f9242f3adba6b6236e0a4e2b4586f4eb93b1e5e2 Mon Sep 17 00:00:00 2001
From: Shreyas Madake <madakeshreyas@gmail.com>
Date: Thu, 10 Sep 2026 16:29:37 +0530
Subject: [PATCH] Fix OpenSearch XML content-type and add moz:SearchForm
 (#27364)

Fixes #27210
---
 .../jenkins/model/Jenkins/opensearch.xml.jelly    |  5 +++--
 test/src/test/java/hudson/search/SearchTest.java  | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/jenkins/model/Jenkins/opensearch.xml.jelly b/core/src/main/resources/jenkins/model/Jenkins/opensearch.xml.jelly
index 902e4bcbb1..1bb76bf95c 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/opensearch.xml.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/opensearch.xml.jelly
@@ -27,14 +27,15 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
-  <l:view contentType="application/xml;charset=UTF-8">
-  <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+  <l:view contentType="application/opensearchdescription+xml;charset=UTF-8">
+  <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
   <j:set var="rootURL" value="${h.inferHudsonURL(request2)}"/>
   <ShortName>Jenkins</ShortName>
   <Description>Jenkins at ${rootURL}</Description>
   <InputEncoding>UTF-8</InputEncoding>
   <Url type="text/html" method="GET" template="${rootURL}search/?q={searchTerms}" />
   <Url type="application/x-suggestions+json" template="${rootURL}search/suggestOpenSearch?q={searchTerms}"/>
+  <moz:SearchForm>${rootURL}</moz:SearchForm>
 </OpenSearchDescription>
   </l:view>
 </j:jelly>
diff --git a/test/src/test/java/hudson/search/SearchTest.java b/test/src/test/java/hudson/search/SearchTest.java
index 5ded36f56f..2daa2500e5 100644
--- a/test/src/test/java/hudson/search/SearchTest.java
+++ b/test/src/test/java/hudson/search/SearchTest.java
@@ -501,4 +501,19 @@ public class SearchTest {
         assertNotNull(jsonArray);
         return jsonArray;
     }
+
+    @Issue("27210")
+    @Test
+    void testOpenSearchXml() throws Exception {
+        WebClient wc = j.createWebClient();
+        Page page = wc.goTo("opensearch.xml", "application/opensearchdescription+xml");
+        assertNotNull(page);
+        j.assertGoodStatus(page);
+
+        assertEquals("application/opensearchdescription+xml", page.getWebResponse().getContentType());
+
+        String content = page.getWebResponse().getContentAsString();
+        assertTrue(content.contains("xmlns:moz=\"http://www.mozilla.org/2006/browser/search/\""));
+        assertTrue(content.contains("<moz:SearchForm>"));
+    }
 }