Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions cmd/admin/static/js/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,23 @@ function confirmDeleteSavedQueries(_names, _url) {
$("#confirmModal").modal();
}

function queryResultLink(link, query, url) {
var external_link = '<a href="' + link + '" _target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt"></i></a>';
return '<span class="query-link"><a href="' + url + '">' + query + "</a> - " + external_link + "</span> ";
function escapeHTML(value) {
return String(value).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
}

function safeHref(href) {
const s = String(href || "").trim();
const lower = s.toLowerCase();
// Allow relative URLs (path, hash, or query only)
if (s.startsWith("/") || s.startsWith("#") || s.startsWith("?")) {
return s;
}
// Allow only http and https absolute URLs
if (lower.startsWith("http://") || lower.startsWith("https://")) {
return s;
}
// Fallback for disallowed or empty URLs
return "#";
}

function toggleSaveQuery() {
Expand Down
31 changes: 22 additions & 9 deletions cmd/admin/templates/queries.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
{{ $metadata := .Metadata }} {{ $leftmeta := .LeftMetadata }} {{ template "page-head" . }}

Expand All @@ -13,9 +13,11 @@
<div class="animated fadeIn">
<div class="card mt-2">
<div class="card-header">
<i class="nav-icon fab fa-searchengin"></i> On-demand queries in <b>{{ $leftmeta.EnvName }}</b>
<i class="nav-icon fab fa-searchengin"></i>
On-demand queries in
<b>{{ $leftmeta.EnvName }}</b>
<div class="card-header-actions">
<button class="btn btn-sm btn-outline-primary" data-tooltip="true" data-placement="bottom" title="Refresh table" onclick="refreshTableNow('tableQueries');">
<button class="btn btn-sm btn-outline-primary" data-tooltip="true" data-placement="bottom" title="Refresh table" onclick="refreshTableNow('tableQueries')">
<i class="fas fa-sync-alt"></i>
</button>
</div>
Expand Down Expand Up @@ -110,13 +112,24 @@
width: '40%',
data: 'query',
render: function (data, type, row, meta) {
if (type === 'display') {
return '<div style="max-width:400px; white-space:normal; word-break:break-word;">' +
queryResultLink(data.link, data.query, "/query/{{ $leftmeta.EnvUUID }}/logs/" + data.name) +
'</div>';
} else {
return data;
if (type !== "display") {
return data && data.query ? data.query : "";
}
const logUrl = "/query/{{ $leftmeta.EnvUUID }}/logs/" + encodeURIComponent(String(data.name || ""));
const wrapper = $("<div>", {
style: "max-width:400px; white-space:normal; word-break:break-word;"
});
const queryLink = $("<a>", {
href: safeHref(logUrl),
text: String(data.query || "")
});
const externalLink = $("<a>", {
href: safeHref(data.link),
target: "_blank",
rel: "noopener noreferrer"
}).append($("<i>", { class: "fas fa-external-link-alt" }));
wrapper.append($("<span>", { class: "query-link" }).append(queryLink).append(" - ").append(externalLink));
return wrapper.prop("outerHTML");
}
},{
targets: 2,
Expand Down
Loading