diff options
| -rw-r--r-- | dansguardian-edit-html.lsp | 3 | ||||
| -rw-r--r-- | dansguardian-general-html.lsp | 64 | ||||
| -rw-r--r-- | dansguardian-plain-html.lsp | 5 | ||||
| -rw-r--r-- | squid-advanced-html.lsp | 44 | ||||
| -rw-r--r-- | squid-authentication-html.lsp | 55 | ||||
| -rw-r--r-- | squid-controller.lua | 42 |
6 files changed, 105 insertions, 108 deletions
diff --git a/dansguardian-edit-html.lsp b/dansguardian-edit-html.lsp index 43aac93..fe6205c 100644 --- a/dansguardian-edit-html.lsp +++ b/dansguardian-edit-html.lsp @@ -29,6 +29,7 @@ These parameters define the interface and port that Dansguardian uses to accept </table><br> <input class="text" type="hidden" name="name" value="<? io.write( service.name ) ?>"> -<input class="submit" type="submit" name="cmd" value="save" style="width:100px"><br> +<h3>Save Changes</h3> +<dt>Save the content of the above box</dt><dd><input class="submit" type="submit" name="cmd" value="save" style="width:100px"></dd> </form> diff --git a/dansguardian-general-html.lsp b/dansguardian-general-html.lsp index 6a146d2..0d286ac 100644 --- a/dansguardian-general-html.lsp +++ b/dansguardian-general-html.lsp @@ -19,59 +19,65 @@ ?> <h1>Content Filter</h1> +<p> DansGuardian is web content filtering software. It works as a web proxy, making web requests in behalf of the client, and inspecting the returned content before passing on to the client. DansGuardian uses phraselists to identify harmful content. This means that updated "blacklists" are generally not necessary. DansGuardian must be used in combination with a "smart proxy", such as squid. -<b>This page defines the basic network configuration settings for DansGuardian.</b><br><br> +</p><p> +<b>This page defines the basic network configuration settings for DansGuardian.</b> +</p> -<h1>Status</h1> +<h2>Status</h2> <form action="" method="POST"> -<table><tr> -<td>dansguardian is: <b><? io.write( service.status ) ?> </b> </td> -<td><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?> style="width:100px"></td> -<td><input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?> style="width:100px"></td> -<td><input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?> style="width:100px"></td> -</tr></table> +<dt>dansguardian is: <? io.write( service.status ) ?> </dt> +<dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?> style="width:100px"> +<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?> style="width:100px"> +<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?> style="width:100px"></dd> </form> -<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre><br> +<p> +<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre> +</p> +<p> This process runs as a service. When you make and save changes, the configuration files for the service are changed. However, the changes will not be <i>applied</i> -until you restart the service.<br><br><br> +until you restart the service. +</p> <form action="" method="POST"> -<h1>Configuration</h1> +<h2>Configuration</h2> <pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre><br> <h2>Listener service</h2> -These parameters define the interface and port that Dansguardian uses to accept connections.<br><br> +<p> +These parameters define the interface and port that Dansguardian uses to accept connections. +</p> -<table> -<tr><dt>filterip</dt><dd><input class="text" type="text" name="filterip" value="<? io.write( config.filterip.value ) ?>" style="width:100px"></dd></tr> -<tr><dt>filterport</dt><dd><input class="text" type="text" name="filterport" value="<? io.write( config.filterport.value ) ?>" style="width:100px"></dd></tr> -</table></p> +<dt>filterip</dt><dd><input class="text" type="text" name="filterip" value="<? io.write( config.filterip.value ) ?>" style="width:100px"></dd> +<dt>filterport</dt><dd><input class="text" type="text" name="filterport" value="<? io.write( config.filterport.value ) ?>" style="width:100px"></dd> -<h2>Proxy service</h2> -These parameters define the ip address and port that Dansguardian should forward requests on to.<br><br> +<h3>Proxy service</h3> +<p> +These parameters define the ip address and port that Dansguardian should forward requests on to. +</p> -<table> -<tr><dt>proxyip</dt><dd><input class="text" type="text" name="proxyip" value="<? io.write( config.proxyip.value ) ?>" style="width:100px"></dd></tr> -<tr><dt>proxyport</dt><dd><input class="text" type="text" name="proxyport" value="<? io.write( config.proxyport.value ) ?>" style="width:100px"></dd></tr> -</table><br><br> +<dt>proxyip</dt><dd><input class="text" type="text" name="proxyip" value="<? io.write( config.proxyip.value ) ?>" style="width:100px"></dd> +<dt>proxyport</dt><dd><input class="text" type="text" name="proxyport" value="<? io.write( config.proxyport.value ) ?>" style="width:100px"></dd> -<h2>Filter Actions</h2> +<h3>Filter Actions</h3> +<p> These parameters define how sensitive the filter is, and where to redirect requests if the content filter determines that the content is inappropriate. The "naughtynesslimit" is more sensitive the lower it is set. -The author recommends 50 for "young children", 100 for "older children" and 160 for "young adults".<br><br> +The author recommends 50 for "young children", 100 for "older children" and 160 for "young adults". +</p> -<table> -<tr><dt>accessdeniedaddress</dt><dd><input class="text" type="text" name="accessdeniedaddress" value="<? io.write( config.accessdeniedaddress.value ) ?>" style="width:350px"></dd></tr> -<tr><dt>naughtynesslimit</dt><dd><input class="text" type="text" name="naughtynesslimit" value="<? io.write( config.naughtynesslimit.value ) ?>" style="width:100px"></dd></tr> -</table><br><br> +<dt>accessdeniedaddress</dt><dd><input class="text" type="text" name="accessdeniedaddress" value="<? io.write( config.accessdeniedaddress.value ) ?>" style="width:350px"></dd> +<dt>naughtynesslimit</dt><dd><input class="text" type="text" name="naughtynesslimit" value="<? io.write( config.naughtynesslimit.value ) ?>" style="width:100px"></dd> -<input class="submit" type="submit" name="cmd" value="save" style="width:100px"><br> +<h3>Save Changes</h3> +<dt>Save the above changes?</dt><dd><input class="submit" type="submit" name="cmd" value="save" style="width:100px"></dd> </form> diff --git a/dansguardian-plain-html.lsp b/dansguardian-plain-html.lsp index 184efaf..2e24fd0 100644 --- a/dansguardian-plain-html.lsp +++ b/dansguardian-plain-html.lsp @@ -47,7 +47,7 @@ until you restart the service. </p> <form action="" method="POST"> -<h1>Configuration</h1> +<h2>Configuration</h2> <pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre><br> These parameters define the interface and port that Dansguardian uses to accept connections.<br><br> @@ -55,6 +55,7 @@ These parameters define the interface and port that Dansguardian uses to accept <tr><td><textarea name="config" style="width:100%"><? io.write( service.config ) ?></textarea></td></tr> </table><br> -<input class="submit" type="submit" name="cmd" value="save" style="width:100px"><br> +<h3>Save Changes</h3> +<dt>Save the contents of the above box</dt><dd><input class="submit" type="submit" name="cmd" value="save" style="width:100px"></dd> </form> diff --git a/squid-advanced-html.lsp b/squid-advanced-html.lsp index 108f3f1..f65a19b 100644 --- a/squid-advanced-html.lsp +++ b/squid-advanced-html.lsp @@ -12,38 +12,36 @@ ?> <h1>Web Proxy Configuration</h1> -<table border="2"> - <tr> - <td style="width:80%"> - <center> - <div style="color: #ff2020; font-weight: bold;">WARNING:</div><br> - Modifying the web proxy configuration file is generally not necessary. - You must be familiar with the configuration file before proceeding. - </center> - </td> - </tr> -</table> +<p> +<dt> + <div style="color: #ff2020; font-weight: bold;">WARNING:</div><br> + Modifying the web proxy configuration file is generally not necessary. + You must be familiar with the configuration file before proceeding. +</dt> +</p> <h2>Status</h2> <form action="" method="POST"> -<table><tr> -<td>squid is: <b><? io.write( service.status ) ?> </b> </td> -<td><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?> style="width:100px"></td> -<td><input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?> style="width:100px"></td> -<td><input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?> style="width:100px"></td> -</tr></table> +<dt>squid is: <? io.write( service.status ) ?> </dt> +<dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?> style="width:100px"> +<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?> style="width:100px"> +<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?> style="width:100px"></dd> </form> -<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre><br> +<p> +<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre> +</p> +<p> This process runs as a service. When you make and save changes, the configuration files for the service are changed. However, the changes will not be <i>applied</i> -until you restart the service.<br><br> +until you restart the service. +</p> <h2>Configuration</h2> <form action="" method="POST"> -<table> -<tr><td><textarea name="config" style="width:100%;"><? io.write( service.config ) ?></textarea></td></tr> -<tr><td><input class="submit" type="submit" name="cmd" value="save" style="width:100%;"></td></tr> -</table> +<textarea name="config" style="width:100%;"><? io.write( service.config ) ?></textarea> + +<h3>Save Changes</h3> +<dt>Save the contents of the box above</dt><dd><input class="submit" type="submit" name="cmd" value="save"></dd> </form> diff --git a/squid-authentication-html.lsp b/squid-authentication-html.lsp index 1c693f0..6f5cbd5 100644 --- a/squid-authentication-html.lsp +++ b/squid-authentication-html.lsp @@ -19,46 +19,54 @@ ?> <h1>Web Proxy</h1> +<p> Squid is a web proxy server. It makes web requests in behalf of the client, and inspecting the returned and optionally caches that content so that the next time a client request is made, the content can be served from local disk. This can make web surfing faster. Squid can also forward its requests on to a content filter, -such as DansGuardian.<br><br> -This page lets you modify the authentication scheme of squid.<br><br> +such as DansGuardian. +</p> +<p> +This page lets you modify the authentication scheme of squid. +</p> -<h1>Status</h1> +<h2>Status</h2> <form action="" method="POST"> -<table><tr> -<td>squid is: <b><? io.write( service.status ) ?> </b> </td> -<td><input type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?> style="width:100px"></td> -<td><input type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?> style="width:100px"></td> -<td><input type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?> style="width:100px"></td> -</tr></table> +<dt>squid is: <? io.write( service.status ) ?></dt> +<dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?>> +<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?>> +<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?>></dd> </form> -<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre><br> +<p> +<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre> +</p> +<p> This process runs as a service. When you make and save changes, the configuration files for the service are changed. However, the changes will not be <i>applied</i> -until you restart the service.<br><br> +until you restart the service. +</p> <form action="" method="POST"> -<h1>Configuration</h1> +<h2>Configuration</h2> -<h2>Authentication Scheme</h2> -Choose the desired authentication mechanisms and their order.<br><br> +<h3>Authentication Scheme</h3> +<p> +Choose the desired authentication mechanisms and their order. +</p> <input type="hidden" name="authmethod" value="<? io.write( config.authmethod.value ) ?>"> -<table> +<table style="width: 50px"> <tr><td> <table><tr><td> - <input type="submit" value="^"> + <input class="submit" type="submit" value="^"> </td></tr><tr><td> - <input type="submit" value="v"> + <input class="submit" type="submit" value="v"> </td></tr></table> </td><td> <b>Active</b><br> - <select name="tmpauth" size="5" style="width:150px;"> + <select class="select" name="tmpauth" size="5" style="width:150px;"> <? local lap = 1 local method = config.authmethod.value @@ -77,10 +85,10 @@ Choose the desired authentication mechanisms and their order.<br><br> ?> </select> </td><td> - <table border="0"><tr><td> - <input type="submit" value=" << "> + <table><tr><td> + <input class="submit" type="submit" name="inout" value=" << "> </td></tr><tr><td> - <input type="submit" value=" >> "> + <input class="submit" type="submit" name="inout" value=" >> "> </td></tr></table> </td><td> <b>Selectable</b><br> @@ -100,6 +108,7 @@ Choose the desired authentication mechanisms and their order.<br><br> </td></tr> </table><br> -<input type="submit" name="cmd" value="save" style="width:100px"><br> -</form><br> +<h3>Save Changes</h3> +<dt>Save Authentication Scheme</dt><dd><input class="submit" type="submit" name="cmd" value="save"></dd> +</form> diff --git a/squid-controller.lua b/squid-controller.lua index 84e60dd..03c6f7b 100644 --- a/squid-controller.lua +++ b/squid-controller.lua @@ -88,6 +88,18 @@ authentication = function( self ) end end + if self.clientdata.inout then + if self.clientdata.inout == " << " then + local newauth = self.clientdata.authmethod + if #self.clientdata.tmpempty > 0 then + newauth = newauth .. self.clientdata.tmpempty + end + else + + end + self.model.upd_authmethod(newauth) + end + service.status = self.model.get_status() service.config, service.error = self.model.get_basic_config() @@ -200,33 +212,3 @@ saccess = function( self ) return ( cfe ({ option = option, service = service }) ) end -cfilter = function( self ) - - local option = { script = ENV["SCRIPT_NAME"], - prefix = self.conf.prefix, - controller = self.conf.controller, - action = self.conf.action, - extra = "" - } - - local service = { message="", status="", config="" } - - if self.clientdata.cmd then - if self.clientdata.cmd == "save" then - local conf = self.clientdata - local config = { filterip = conf.filterip, filterport = conf.filterport, - proxyip = conf.proxyip, proxyport = conf.proxyport, - accessdeniedaddress = conf.accessdeniedaddress, - naughtynesslimit = conf.naughtynesslimit - } - - self.model.update_filter_config( config ) - end - end - - service.status = self.model.get_dansguardian_status() - service.config, service.cfgerr = self.model.get_filter_config() - - return ( cfe ({ option = option, service = service }) ) -end - |