From e07adbcd12b29fabd666f25aca694e59f9a5d1f8 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 15 Jan 2009 21:44:39 +0000 Subject: Modified html.lua and viewlibrary.lua and all html files to html_escape variables before displaying them. git-svn-id: svn://svn.alpinelinux.org/acf/openssh/trunk@1678 ab2d0c66-481e-0410-8bed-d214d4d58bed --- openssh-addauth-html.lsp | 2 +- openssh-config-html.lsp | 2 +- openssh-connectedpeers-html.lsp | 12 ++++++------ openssh-listauth-html.lsp | 6 +++--- openssh-listusers-html.lsp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/openssh-addauth-html.lsp b/openssh-addauth-html.lsp index 68ced32..f532b68 100644 --- a/openssh-addauth-html.lsp +++ b/openssh-addauth-html.lsp @@ -2,7 +2,7 @@ require("viewfunctions") %> -

<%= form.label %>

+

<%= html.html_escape(form.label) %>

<% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action form.value.user.type = "hidden" diff --git a/openssh-config-html.lsp b/openssh-config-html.lsp index 64b162c..9054e73 100644 --- a/openssh-config-html.lsp +++ b/openssh-config-html.lsp @@ -8,7 +8,7 @@ require("viewfunctions") viewlibrary.dispatch_component("status") end %> -

<%= form.label %>

+

<%= html.html_escape(form.label) %>

<% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action local order = {"Port", "ListenAddress", "PermitRootLogin", "PasswordAuthentication", "UseDNS"} diff --git a/openssh-connectedpeers-html.lsp b/openssh-connectedpeers-html.lsp index b49d26c..baa8077 100644 --- a/openssh-connectedpeers-html.lsp +++ b/openssh-connectedpeers-html.lsp @@ -15,8 +15,8 @@ if #data == 0 then end local col1="180px" for k,v in pairs(data) do - io.write("

" .. v.host) - if v.name and v.name ~= v.host then io.write(" - "..v.name) end + io.write("

" .. html.html_escape(v.host)) + if v.name and v.name ~= v.host then io.write(" - "..html.html_escape(v.name)) end io.write("

\n") io.write("") for i=1, v.cnt do @@ -25,10 +25,10 @@ for k,v in pairs(data) do io.write("") io.write("\n") diff --git a/openssh-listauth-html.lsp b/openssh-listauth-html.lsp index f54a08a..d93bc8b 100644 --- a/openssh-listauth-html.lsp +++ b/openssh-listauth-html.lsp @@ -4,7 +4,7 @@ <% displaycommandresults({"deleteauth"}, session) %> <% displaycommandresults({"addauth"}, session, true) %> -

Authorized Keys for <%= view.value.user.value %>

+

Authorized Keys for <%= html.html_escape(view.value.user.value) %>

\n") io.write("") - io.write("\n") - io.write("\n") - io.write("\n") - io.write("\n") + io.write("\n") + io.write("\n") + io.write("\n") + io.write("\n") io.write("
Session user:".. v.tty[i].user .. "
Session TTY:".. v.tty[i].tty .. "
Session Started:".. v.tty[i].time .. "
Session Idle:".. v.tty[i].idle .. "
Session user:".. html.html_escape(v.tty[i].user) .. "
Session TTY:".. html.html_escape(v.tty[i].tty) .. "
Session Started:".. html.html_escape(v.tty[i].time) .. "
Session Idle:".. html.html_escape(v.tty[i].idle) .. "
") io.write("
@@ -16,8 +16,8 @@ - - + + <% end %>
Action <%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/deleteauth?user="..view.value.user.value.."&auth="..auth.id, label="Delete "} %> <%= auth.id %><% if #auth.key>32 then io.write(string.sub(auth.key,0,16) .. " ... " .. string.sub(auth.key, -16)) else io.write(auth.key) end %><%= html.html_escape(auth.id) %><% if #auth.key>32 then io.write(html.html_escape(string.sub(auth.key,0,16)) .. " ... " .. html.html_escape(string.sub(auth.key, -16))) else io.write(html.html_escape(auth.key)) end %>
diff --git a/openssh-listusers-html.lsp b/openssh-listusers-html.lsp index f49eb58..df941b6 100644 --- a/openssh-listusers-html.lsp +++ b/openssh-listusers-html.lsp @@ -4,7 +4,7 @@

System User Accounts

<% for i,user in ipairs(view.value) do %> -
<%= user %>
-
Edit this account
+
<%= html.html_escape(user) %>
+
Edit this account
<% end %>
-- cgit v1.2.3