From efa3dadcd63abdb6014afb5ea0fb8478f348aee6 Mon Sep 17 00:00:00 2001
From: Barnabas Busa <busa.barnabas@gmail.com>
Date: Wed, 19 Aug 2026 10:36:03 +0200
Subject: [PATCH 1/2] extend execution clients search to enode, ENR, IP and
 peers

The search box on the EL clients page only matched the client name.
Bring it in line with the CL page search and extend it: matches now
include the node's peer ID, version, enode, ENR, IP and listen address,
plus the enode/ENR/peer ID/name of its connected peers - so searching
for an IP address, enode or ENR also finds the clients connected to
that peer. Sensitive fields are empty when ShowSensitivePeerInfos is
disabled and simply never match.
---
 templates/clients/clients_el.html | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/templates/clients/clients_el.html b/templates/clients/clients_el.html
index b10bbc77..9ff5a074 100644
--- a/templates/clients/clients_el.html
+++ b/templates/clients/clients_el.html
@@ -44,7 +44,7 @@ <h2 class="accordion-header">
           <div style="margin-bottom: 15px; padding: 0 15px;">
             <div class="input-group">
               <span class="input-group-text"><i class="fas fa-search"></i></span>
-              <input type="text" class="form-control" id="clientSearchInput" placeholder="Search clients by name...">
+              <input type="text" class="form-control" id="clientSearchInput" placeholder="Search by name, peer ID, enode, ENR, or IP...">
               <button class="btn btn-outline-secondary" type="button" id="clearClientSearch">Clear</button>
             </div>
           </div>
@@ -547,6 +547,25 @@ <h5 class="modal-title" id="statusMessageModalTitle">
     $('#peerInfo-' + peerId).collapse('show');
   });
 
+  // Match a node's own identity fields (name, enode, ENR, IPs) and those of
+  // its connected peers, so searching for an enode, ENR, or IP address also
+  // finds the clients connected to that peer. Sensitive fields are empty
+  // when ShowSensitivePeerInfos is disabled, so they simply never match.
+  function nodeMatchesSearch(node, searchText) {
+    var fields = [node.name, node.peer_name, node.version, node.enode, node.enr, node.ip_addr, node.listen_addr];
+    for (var i = 0; i < fields.length; i++) {
+      if (fields[i] && fields[i].toLowerCase().includes(searchText)) return true;
+    }
+    var peers = node.peers || [];
+    for (var i = 0; i < peers.length; i++) {
+      var peerFields = [peers[i].id, peers[i].enode, peers[i].enr, peers[i].name];
+      for (var j = 0; j < peerFields.length; j++) {
+        if (peerFields[j] && peerFields[j].toLowerCase().includes(searchText)) return true;
+      }
+    }
+    return false;
+  }
+
   // Client search functionality
   $('#clientSearchInput').on('input', function() {
     var searchText = $(this).val().trim().toLowerCase();
@@ -554,9 +573,16 @@ <h5 class="modal-title" id="statusMessageModalTitle">
     $('#clients tbody tr').each(function() {
       if (!$(this).hasClass('peerInfo')) {
         var clientName = $(this).find('.client-row a').text().toLowerCase();
+        var peerId = ($(this).find('.client-row').data('peerid') || '') + '';
         var peerInfoRow = $(this).next('.peerInfo');
+        var node = nodes[peerId] || {};
+
+        var matches = searchText === '' ||
+          clientName.includes(searchText) ||
+          peerId.toLowerCase().includes(searchText) ||
+          nodeMatchesSearch(node, searchText);
 
-        if (searchText === '' || clientName.includes(searchText)) {
+        if (matches) {
           $(this).show();
           peerInfoRow.css('display', '');
         } else {

From 293adf7adc64764a360715c4125da1e76813c605 Mon Sep 17 00:00:00 2001
From: Barnabas Busa <busa.barnabas@gmail.com>
Date: Wed, 19 Aug 2026 13:00:48 +0200
Subject: [PATCH 2/2] gate peer details server-side behind
 ShowSensitivePeerInfos

Peer enode, name, caps and protocols were sent in the page data
unconditionally and only hidden client-side, so the extended search
could still match a peer's enode/IP with ShowSensitivePeerInfos
disabled. Only populate them (together with the already-gated ENR)
when the flag is on, matching the gating of the node's own
enode/ENR/IPs.
---
 handlers/clients_el.go | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/handlers/clients_el.go b/handlers/clients_el.go
index c4f4a849..4af51e86 100644
--- a/handlers/clients_el.go
+++ b/handlers/clients_el.go
@@ -269,19 +269,24 @@ func buildELClientsPageData(sortOrder string) (*models.ClientsELPageData, time.D
 
 			resPeer := &models.ClientELPageDataNodePeers{
 				ID:        peerID,
-				State:     peer.Name,
 				Direction: direction,
 				Alias:     peerAlias,
-				Name:      peer.Name,
-				Enode:     enoderaw,
-				Caps:      peer.Caps,
-				Protocols: buildPeerProtocols(peer.Protocols),
 				Type:      peerType,
 			}
 
-			if pageData.ShowSensitivePeerInfos && strings.HasPrefix(peer.ENR, "enr:") {
-				resPeer.ENR = peer.ENR
-				resPeer.ENRKeyValues = getEnrValues(peer.ENR)
+			// The peer details (enode, name, caps, protocols, ENR) are only rendered
+			// when ShowSensitivePeerInfos is enabled, so gate them server-side like
+			// the node's own enode/ENR/IPs to keep them out of the page data.
+			if pageData.ShowSensitivePeerInfos {
+				resPeer.State = peer.Name
+				resPeer.Name = peer.Name
+				resPeer.Enode = enoderaw
+				resPeer.Caps = peer.Caps
+				resPeer.Protocols = buildPeerProtocols(peer.Protocols)
+				if strings.HasPrefix(peer.ENR, "enr:") {
+					resPeer.ENR = peer.ENR
+					resPeer.ENRKeyValues = getEnrValues(peer.ENR)
+				}
 			}
 
 			resPeers = append(resPeers, resPeer)