From e8f7ca6abc72024f29694ca8012a721d9cf840a7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 22 May 2026 15:44:34 +0200
Subject: [PATCH] Fix: parsing ambiguity in cib_ops_path format handling

The CibController#ops action expects the :id parameter in the
form <resource>,<node>. When Rails appends .json to the URL,
resource or node names containing dots become ambiguous and require
special route constraints.

The CibController#ops function expects and :id in the form <resource>,<node>
but there comes a concatenation of 3 values <resource>,<node><format>.
Commit 32c14714 enables correct parsing 3 values, but it breaks the parsing
in other controllers, when there is no <format> given. One could possibly
distinguish the regular expressions for each of the cases, but let's
better not glue too many values together, and just move the :format out,
as a separate argument.
---
 hawk/app/views/nodes/events.html.erb     | 2 +-
 hawk/app/views/resources/events.html.erb | 2 +-
 hawk/config/routes.rb                    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hawk/app/views/nodes/events.html.erb b/hawk/app/views/nodes/events.html.erb
index 83f31c52c..e7a647584 100644
--- a/hawk/app/views/nodes/events.html.erb
+++ b/hawk/app/views/nodes/events.html.erb
@@ -13,7 +13,7 @@
     </h3>
   </div>
   <div class="modal-body">
-    <table id="node-events" data-toggle="table" data-url="<%= cib_ops_path('*,'+@node.name, cib_id: current_cib, format: 'json') %>" data-sortable="true" data-sort-name="last_rc_change" data-sort-order="desc" data-row-style="eventsRowStyle">
+    <table id="node-events" data-toggle="table" data-url="<%= cib_ops_path('*,'+@node.name, cib_id: current_cib) %>?format=json" data-sortable="true" data-sort-name="last_rc_change" data-sort-order="desc" data-row-style="eventsRowStyle">
       <thead>
         <tr>
           <th data-field="rc" data-sortable="true" data-formatter="eventsRC">
diff --git a/hawk/app/views/resources/events.html.erb b/hawk/app/views/resources/events.html.erb
index 160456fd0..5b6f99b35 100644
--- a/hawk/app/views/resources/events.html.erb
+++ b/hawk/app/views/resources/events.html.erb
@@ -13,7 +13,7 @@
     </h3>
   </div>
   <div class="modal-body">
-    <table data-toggle="table" data-url='<%= cib_ops_path("#{@resource.id},*", cib_id: current_cib, format: "json") %>' data-sortable='true' data-sort-name='last_rc_change' data-sort-order='desc' data-row-style='eventsRowStyle' id="resource-events">
+    <table data-toggle="table" data-url='<%= cib_ops_path("#{@resource.id},*", cib_id: current_cib) %>?format=json' data-sortable='true' data-sort-name='last_rc_change' data-sort-order='desc' data-row-style='eventsRowStyle' id="resource-events">
       <thead>
         <tr>
           <th data-field="rc" data-sortable="true" data-formatter="eventsRC">
diff --git a/hawk/config/routes.rb b/hawk/config/routes.rb
index 3ea82d76c..89f699281 100644
--- a/hawk/config/routes.rb
+++ b/hawk/config/routes.rb
@@ -4,13 +4,13 @@
 Rails.application.routes.draw do
   root to: "pages#index"
 
-  regex_safe_id = /[^\^\/\[\]"<>#%{}|\\~`;?:@=&]+?/
+  regex_safe_id = /[^\^\/\[\]"<>#%{}|\\~`;?:@=&]+/
 
   resources :cib, only: [] do
     get "/", via: [:get, :post, :options], to: "cib#show", as: ""
     match "/", via: [:options], to: "cib#show"
     match "/apply", as: :apply, to: 'cib#apply', via: [:get, :post]
-    get "/ops/:id", to: "cib#ops", as: :ops, constraints: {id: regex_safe_id }
+    get "/ops/:id", to: "cib#ops", as: :ops, constraints: { id: regex_safe_id }
 
     get "/fencing", to: "fencing#index"
     get "/fencing/edit", to: "fencing#edit"