Skip to content

Agent Mesh

address review

Antonio Ojea580bcb8aa9c5
diff --git a/cmd/sam-console/public/app.js b/cmd/sam-console/public/app.js
index 0265272e..3449af28 100644
--- a/cmd/sam-console/public/app.js
+++ b/cmd/sam-console/public/app.js
@@ -77,9 +77,8 @@ window.saveAdminToken = function() {
}
function getAuthHeaders() {
- return {
- 'Authorization': 'Bearer ' + getAdminToken()
- };
+ const token = getAdminToken();
+ return token ? { 'Authorization': 'Bearer ' + token } : {};
}
async function loadData() {
@@ -166,10 +165,10 @@ function renderUsersTable(users) {
tbody.innerHTML = users.map(user => `
<tr>
- <td><code>${user.ID || '-'}</code></td>
- <td>${user.Role || '-'}</td>
- <td>${user.Name || '-'}</td>
- <td>${user.Email || '-'}</td>
+ <td><code>${escapeHTML(user.ID)}</code></td>
+ <td>${escapeHTML(user.Role)}</td>
+ <td>${escapeHTML(user.Name)}</td>
+ <td>${escapeHTML(user.Email)}</td>
</tr>
`).join('');
}
@@ -183,12 +182,12 @@ function renderNodesTable(nodes) {
tbody.innerHTML = nodes.map(node => `
<tr>
- <td><code>${node.PeerID || '-'}</code></td>
- <td>${node.Role || '-'}</td>
- <td>${node.OwnerID || '-'}</td>
+ <td><code>${escapeHTML(node.PeerID)}</code></td>
+ <td>${escapeHTML(node.Role)}</td>
+ <td>${escapeHTML(node.OwnerID)}</td>
<td>
<div class="actions-cell">
- <button class="btn btn-sm btn-danger" onclick="revokeDevice('${node.PeerID}')">Revoke</button>
+ <button class="btn btn-sm btn-danger" onclick="revokeDevice('${escapeHTML(node.PeerID)}')">Revoke</button>
</div>
</td>
</tr>
@@ -219,16 +218,16 @@ function renderEnrollmentsTable(reqs) {
if (isPending) {
actions = `
<div class="actions-cell">
- <button class="btn btn-sm btn-success" onclick="approveEnrollment('${req.ID}')">Approve</button>
- <button class="btn btn-sm btn-danger" onclick="rejectEnrollment('${req.ID}')">Reject</button>
+ <button class="btn btn-sm btn-success" onclick="approveEnrollment('${escapeHTML(req.ID)}')">Approve</button>
+ <button class="btn btn-sm btn-danger" onclick="rejectEnrollment('${escapeHTML(req.ID)}')">Reject</button>
</div>
`;
}
return `
<tr>
- <td><code>${req.ID || '-'}</code></td>
+ <td><code>${escapeHTML(req.ID)}</code></td>
<td>${getStatusBadge(req.Status)}</td>
- <td>${req.CreatedAt || '-'}</td>
+ <td>${escapeHTML(req.CreatedAt)}</td>
<td>${actions}</td>
</tr>
`;
@@ -244,9 +243,9 @@ function renderRoutersTable(routers) {
tbody.innerHTML = routers.map(router => `
<tr>
- <td><code>${router.PeerID || '-'}</code></td>
- <td>${router.Addresses ? router.Addresses.join('<br>') : '-'}</td>
- <td>${router.ExpiresAt || '-'}</td>
+ <td><code>${escapeHTML(router.PeerID)}</code></td>
+ <td>${router.Addresses ? router.Addresses.map(addr => escapeHTML(addr)).join('<br>') : '-'}</td>
+ <td>${escapeHTML(router.ExpiresAt)}</td>
</tr>
`).join('');
}
@@ -514,3 +513,10 @@ window.savePolicy = async function() {
alert('Network error: ' + err.message);
}
};
+
+function escapeHTML(str) {
+ if (!str) return '-';
+ return String(str).replace(/[&<>'"]/g,
+ tag => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', "'": '&#39;', '"': '&quot;' }[tag] || tag)
+ );
+}
diff --git a/development/kind/13-dex.yaml b/development/kind/13-dex.yaml
index 04bc703c..203a41ba 100644
--- a/development/kind/13-dex.yaml
+++ b/development/kind/13-dex.yaml
@@ -16,6 +16,7 @@ data:
- id: sam-console
redirectURIs:
- http://localhost:9092/auth/callback
+ - http://127.0.0.1:9092/auth/callback
name: 'SAM Console'
public: true
enablePasswordDB: true
diff --git a/internal/console/server.go b/internal/console/server.go
index 918999fb..77a4b596 100644
--- a/internal/console/server.go
+++ b/internal/console/server.go
@@ -13,6 +13,7 @@ import (
"net/url"
"os"
"path/filepath"
+ "time"
"github.com/coreos/go-oidc/v3/oidc"
"github.com/google/sam/api"
@@ -46,7 +47,8 @@ func NewServer(cfg Config) (*Server, error) {
var provider *oidc.Provider
var clientID string
- resp, err := http.Get(cfg.HubURL + "/info")
+ client := &http.Client{Timeout: 10 * time.Second}
+ resp, err := client.Get(cfg.HubURL + "/info")
if err != nil {
return nil, fmt.Errorf("failed to query control-plane info for OIDC discovery: %w", err)
}
diff --git a/internal/controlplane/server.go b/internal/controlplane/server.go
index 5d2fc0b5..bad3999e 100644
--- a/internal/controlplane/server.go
+++ b/internal/controlplane/server.go
@@ -1100,6 +1100,7 @@ func (s *Server) authenticateUser(r *http.Request) (*storage.User, error) {
ctx := r.Context()
claims, _, err := identity.VerifyJWT(ctx, tokenStr, s.config.AllowedAudiences, s.getProviders())
if err != nil {
+ logger.Errorf("OIDC token verification failed: %v", err)
return nil, fmt.Errorf("failed to verify OIDC token: %w", err)
}
diff --git a/tests/e2e/console.bats b/tests/e2e/console.bats
index 4dff52df..43056a3a 100644
--- a/tests/e2e/console.bats
+++ b/tests/e2e/console.bats
@@ -37,7 +37,7 @@ teardown() {
# Test static index.html is served
run docker run --rm --network "${MESH_NETWORK}" curlimages/curl -s "http://${console_name}:8081/"
[[ "$status" -eq 0 ]]
- [[ "$output" == *"SAM Console Loading..."* ]]
+ [[ "$output" == *"<title>SAM Console</title>"* ]]
# Test proxy to control plane /admin/status (mapped under /api/)
run docker run --rm --network "${MESH_NETWORK}" curlimages/curl -s -f "http://${console_name}:8081/api/admin/status"