diff options
| -rw-r--r-- | openldap-controller.lua | 4 | ||||
| -rw-r--r-- | openldap-listcerts-html.lsp | 41 | ||||
| -rw-r--r-- | openldap-viewconfig-html.lsp | 77 | ||||
| -rw-r--r-- | openldap.menu | 1 | ||||
| -rw-r--r-- | openldap.roles | 4 |
5 files changed, 7 insertions, 120 deletions
diff --git a/openldap-controller.lua b/openldap-controller.lua index 4ba9a0c..c5154d6 100644 --- a/openldap-controller.lua +++ b/openldap-controller.lua @@ -19,6 +19,10 @@ mymodule.expert = function(self) return self.handle_form(self, self.model.get_filecontent, self.model.update_filecontent, self.clientdata, "Save", "Edit Config File", "Config File Saved") end +mymodule.manage = function(self) + return self.handle_form(self, self.model.get_filecontent, self.model.update_filecontent, self.clientdata, "Save", "Edit Config File", "Config File Saved") +end + mymodule.viewconfig = function(self) return self.model.get_config() end diff --git a/openldap-listcerts-html.lsp b/openldap-listcerts-html.lsp deleted file mode 100644 index e0043c0..0000000 --- a/openldap-listcerts-html.lsp +++ /dev/null @@ -1,41 +0,0 @@ -<% local view, viewlibrary, page_info, session = ... %> -<% htmlviewfunctions = require("htmlviewfunctions") %> -<% html = require("acf.html") %> - -<% htmlviewfunctions.displaycommandresults({"deletecert", "generatedhparams"}, session) %> -<% htmlviewfunctions.displaycommandresults({"uploadcert"}, session, true) %> - -<H1><%= html.html_escape(view.label) %></H1> - -<DL> -<TABLE> - <TR style="background:#eee;font-weight:bold;"> - <TD style="padding-right:20px;white-space:nowrap;text-align:left;" class="header">Action</TD> - <TD style="white-space:nowrap;text-align:left;" class="header">Certificate</TD> - </TR> -<% for i,cert in ipairs(view.value) do %> - <TR> - <TD style="padding-right:20px;white-space:nowrap;"> - <%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/deletecert?submit=true&cert="..cert.."&redir="..page_info.orig_action, label="Delete "} %> - <% if not string.find(cert, "%-key") then %> - <%= html.link{value=page_info.script..page_info.prefix..page_info.controller.."/viewcert?cert="..cert.."&redir="..page_info.orig_action, label="View "} %> - <% end %> - </TD> - <TD style="white-space:nowrap;"><%= html.html_escape(cert) %></TD> - </TR> -<% end %> -</TABLE></DL> - -<% if viewlibrary.dispatch_component and viewlibrary.check_permission("uploadcert") then - viewlibrary.dispatch_component("uploadcert") -end %> - -<% if viewlibrary.check_permission("generatedhparams") then %> -<H1>Diffie Hellman Parameters</H1> -<DL> -<form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/generatedhparams") %>"> -<DT>Generate Diffie Hellman parameters</DT> -<DD><input class="submit" type="submit" name="submit" value="Generate"></DD> -</form> -</DL> -<% end %> diff --git a/openldap-viewconfig-html.lsp b/openldap-viewconfig-html.lsp deleted file mode 100644 index 5b76598..0000000 --- a/openldap-viewconfig-html.lsp +++ /dev/null @@ -1,77 +0,0 @@ -<% local view, viewlibrary, page_info, session = ... %> -<% format = require("acf.format") %> -<% html = require("acf.html") %> -<% local shortname = string.gsub(view.value.name, "^.*/", "") %> - -<h1><%= html.html_escape(format.cap_begin_word(view.value.type)) %> Config</h1> - -<h2><%= html.html_escape(format.cap_begin_word(view.value.type)) %> settings</h2> -<dl> -<dt>Mode</dt> -<dd><%= html.html_escape(view.value.type) %></dd> - -<dt>User device</dt> -<dd><%= html.html_escape(view.value.dev) %></dd> - -<% if view.value.type == "server" then %> -<dt>Listens on</dt> -<dd><%= html.html_escape(view.value["local"]) %>:<%= html.html_escape(view.value.port) %> (<%= html.html_escape(view.value.proto) %>)</dd> -<% end %> - -<% if view.value.type == "client" then %> -<dt>Remote server</dt> -<dd><% if string.find(view.value.remote, "%s") then io.write(html.html_escape(string.gsub(view.value.remote, "%s+", ":"))) else io.write(html.html_escape(view.value.remote .. (view.value.rport or view.value.port or "1194"))) end %> (<%= html.html_escape(view.value.proto) %>)</dd> -<% end %> - -<dt>Logfile</dt> -<dd><% if ( view.value.log ) then %><%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/logfile?name=" .. view.value.name, label=view.value.log } %><% else %>Syslog<% end %> (Verbosity level: <%= html.html_escape(view.value.verb) %>)</dd> -</dl> - -<% if view.value.type == "server" then %> -<h3>Connected clients status</h3> -<dl> -<dt>Last status was recorded</dt> -<dd><%= html.html_escape(view.value.client_lastupdate) %> (This was <b><%= html.html_escape(view.value.client_lastdatechangediff) %></b> ago)</dd> - -<dt>Maximum clients</dt> -<dd><%= html.html_escape(view.value["max-clients"]) %></dd> - -<dt>Connected clients</dt> -<dd><%= html.html_escape(view.value.client_count) %></dd> -</dl> -<% end %> - -<% if view.value.dh or view.value.ca or view.value.cert or view.value.key or view.value.tls or view.value.crl then %> -<h2>Certificate files</h2> -<dl> -<% if (view.value.dh) then %> -<dt>DH</dt> -<dd><%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/viewcert?cert=" .. view.value.dh, label=view.value.dh } %></dd> -<% end %> - -<% if (view.value.ca) then %> -<dt>CA Certificate</dt> -<dd><%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/viewcert?cert=" .. view.value.ca, label=view.value.ca } %></dd> -<% end %> - -<% if (view.value.cert) then %> -<dt>Certificate</dt> -<dd><%= html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/viewcert?cert=" .. view.value.cert, label=view.value.cert } %></dd> -<% end %> - -<% if (view.value.key) then %> -<dt>Private Key</dt> -<dd><%= html.html_escape(view.value.key) %></dd> -<% end %> - -<% if (view.value.tls) then %> -<dt>TLS Authentication</dt> -<dd><%= html.html_escape(view.value.tls) %><% -- html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/pem_info?name=" .. view.value.tls , label=view.value.tls } %></dd> -<% end %> - -<% if (view.value.crl) then %> -<dt>CRL Verify File</dt> -<dd><%= html.html_escape(view.value.crl) %><% -- html.link{value = page_info.script .. page_info.prefix .. page_info.controller .. "/pem_info?name=" .. view.value.crl , label=view.value.crl } %></dd> -<% end %> -</dl> -<% end %> diff --git a/openldap.menu b/openldap.menu index 4ebd263..55bf6db 100644 --- a/openldap.menu +++ b/openldap.menu @@ -2,3 +2,4 @@ Networking 65OpenLDAP Status status Networking 65OpenLDAP Expert expert Networking 65OpenLDAP Log_File logfile +#Networking 65OpenLDAP Manage manage diff --git a/openldap.roles b/openldap.roles index 6d275ce..7346a42 100644 --- a/openldap.roles +++ b/openldap.roles @@ -1,3 +1,3 @@ USER=openldap:status,openldap:logfile,openldap:viewconfig,openldap:startstop -EXPERT=openldap:expert,openldap:listcerts,openldap:deletecert,openldap:uploadcert,openldap:viewcert,openldap:generatedhparams -ADMIN=openldap:status,openldap:logfile,openldap:viewconfig,openldap:startstop,openldap:expert,openldap:listcerts,openldap:deletecert,openldap:uploadcert,openldap:viewcert,openldap:generatedhparams +EXPERT=openldap:status,openldap:logfile,openldap:viewconfig,openldap:startstop,openldap:expert +ADMIN=openldap:status,openldap:logfile,openldap:viewconfig,openldap:startstop,openldap:expert,openldap:manage |