X-Git-Url: https://git.hcoop.net/hcoop/portal.git/blobdiff_plain/d5cb549c4142a5952e259caa202764cc2f53c12e..47ea7c948ab73a626681f1f75f42a67921c0ca9f:/sec.mlt

diff --git a/sec.mlt b/sec.mlt
index f29c9fd..020c0f9 100644
--- a/sec.mlt
+++ b/sec.mlt
@@ -13,7 +13,6 @@ val uname = case $"uname" of
 val socks = Sec.socketPerms {node = nodeNum, uname = uname};
 val tpe = Sec.isTpe {node = nodeNum, uname = uname};
 val cron = Sec.cronAllowed {node = nodeNum, uname = uname};
-val ftp = Sec.ftpAllowed {node = nodeNum, uname = uname};
 
 ref showNormal = true;
 
@@ -55,20 +54,6 @@ elseif $"cmd" = "cron2" then
 		%><h3>Error sending e-mail notification</h3><%
 	end
 	%><h3>Request added</h3><%
-
-elseif $"cmd" = "ftp" then
-	showNormal := false;
-	val ftp = iff $"ftp" = "yes" then "enabled" else "disabled";
-	%>Are you sure you want to request that FTP permissions for <b><% Web.html uname %></b> on <b><% Web.html nodeName %></b> be <b><% ftp %></b>?<br>
-	<a href="sec?cmd=ftp2&node=<% nodeNum %>&uname=<% Web.urlEncode uname %>&ftp=<% ftp %>&msg=<% Web.urlEncode ($"msg") %>">Yes, place the request!</a><%
-elseif $"cmd" = "ftp2" then
-	val ftp = iff $"ftp" = "enabled" then "enable" else "disable";
-	val id = Sec.Req.add {usr = you, node = nodeNum, data = String.concat [uname, ": ", ftp, " FTP access"], msg = $"msg"};
-	if not (Sec.Req.notifyNew id) then
-		%><h3>Error sending e-mail notification</h3><%
-	end
-	%><h3>Request added</h3><%
-
 elseif $"cmd" = "rule" then
 	showNormal := false;
 	val rule = $"rule";
@@ -226,135 +211,9 @@ elseif $"mod" <> "" then
 
 <% end;
 
-if showNormal then %>
-
-<table class="blanks">
-<form action="sec" method="post">
-<input type="hidden" name="uname" value="<% Web.html uname %>">
-<tr> <td>Machines:</td> <td><select name="node">
-<% foreach node in Init.listNodes () do %>
-	<option value="<% #id node %>"<% if nodeNum = #id node then %> selected<% end %>><% Web.html (#name node) %> (<% Web.html (#descr node) %>)</option>
-<% end %></select></td>
-<td><input type="submit" value="Switch"></td> </tr>
-</form>
-<form action="sec" method="post">
-<input type="hidden" name="node" value="<% nodeNum %>">
-<tr> <td>Your users:</td> <td><select name="uname">
-<% foreach name in (yourname :: Sec.findSubusers yourname) do %>
-	<option value="<% name %>"<% if uname = name then %> selected<% end %>><% name %></option>
-<% end %></select></td>
-<td><input type="submit" value="Switch"></td> </tr>
-</form>
-</table>
-
-<!--h3>Request socket permissions change</h3>
-
-<p>You need to request socket permissions before you are able to open any network connections. While you will be limited by firewall rules even then, any requests for firewall rules you enter in the "Reason" blank here <b>will be ignored</b>. Please use the separate form at the bottom of this page for that. There is no need to wait until a request for socket permissions has been granted before starting to request firewall rules.</p>
-
-<p>Keep in mind that, if your request is granted, it will never apply to existing log-in sessions. Close them and re-connect to take advantage of your new privileges.</p>
-
-<form action="sec" method="post">
-<input type="hidden" name="node" value="<% nodeNum %>">
-<input type="hidden" name="uname" value="<% uname %>">
-<input type="hidden" name="cmd" value="socks">
-<table class="blanks">
-<tr> <td>New permissions:</td> <td><select name="socks">
-	<option value="none"<% if socks = Sec.NADA then %> selected<% end %>>None</option>
-	<option value="any"<% if socks = Sec.ANY then %> selected<% end %>>Any</option>
-	<option value="client"<% if socks = Sec.CLIENT_ONLY then %> selected<% end %>>Client only</option>
-	<option value="server"<% if socks = Sec.SERVER_ONLY then %> selected<% end %>>Server only</option>
-</select></td> </tr>
-<tr> <td>Reason:</td> <td><textarea name="msg" wrap="soft" rows="3" cols="80"></textarea></td> </tr>
-<tr> <td><input type="submit" value="Request"></td> </tr>
-</table>
-</form>
-
-<h3>Request change to your execute permissions</h3>
-
-<form action="sec" method="post">
-<input type="hidden" name="node" value="<% nodeNum %>">
-<input type="hidden" name="uname" value="<% uname %>">
-<input type="hidden" name="cmd" value="tpe">
-<table class="blanks">
-<tr> <td>Trusted path executables only?</td> <td><select name="tpe">
-	<option value="no"<% if not tpe then %> selected<% end %>>No</option>
-	<option value="yes"<% if tpe then %> selected<% end %>>Yes</option>
-</select></td> </tr>
-<tr> <td>Reason:</td> <td><textarea name="msg" wrap="soft" rows="3" cols="80"></textarea></td> </tr>
-<tr> <td><input type="submit" value="Request"></td> </tr>
-</table>
-</form-->
-
-<h3>Request change to your <tt>cron</tt> permissions</h3>
-
-<form action="sec" method="post">
-<input type="hidden" name="node" value="<% nodeNum %>">
-<input type="hidden" name="uname" value="<% uname %>">
-<input type="hidden" name="cmd" value="cron">
-<table class="blanks">
-<tr> <td>Allowed to use cron?</td> <td><select name="cron">
-	<option value="no"<% if not cron then %> selected<% end %>>No</option>
-	<option value="yes"<% if cron then %> selected<% end %>>Yes</option>
-</select></td> </tr>
-<tr> <td>Reason:</td> <td><textarea name="msg" wrap="soft" rows="3" cols="80"></textarea></td> </tr>
-<tr> <td><input type="submit" value="Request"></td> </tr>
-</table>
-</form>
-
-<h3>Request change to your FTP permissions</h3>
-
-<p>Please read <a href="http://wiki.hcoop.net/wiki/FileTransfer">our wiki instructions on file transfer</a> before requesting FTP access. Almost everyone should use alternative protocols to FTP that provide superior security benefits.</p>
-
-<form action="sec" method="post">
-<input type="hidden" name="node" value="<% nodeNum %>">
-<input type="hidden" name="uname" value="<% uname %>">
-<input type="hidden" name="cmd" value="ftp">
-<table class="blanks">
-<tr> <td>Allowed to use FTP?</td> <td><select name="ftp">
-	<option value="no"<% if not ftp then %> selected<% end %>>No</option>
-	<option value="yes"<% if ftp then %> selected<% end %>>Yes</option>
-</select></td> </tr>
-<tr> <td>Reason:</td> <td><textarea name="msg" wrap="soft" rows="3" cols="80"></textarea></td> </tr>
-<tr> <td><input type="submit" value="Request"></td> </tr>
-</table>
-</form>
-
-<% val rules = Sec.findFirewallRules {node = nodeNum, uname = uname};
-switch rules of
-  _::_ => %>
-<h3>Your firewall rules</h3>
-
-<% foreach rule in rules do %>
-<form action="sec" method="post">
-<input type="hidden" name="node" value="<% nodeNum %>">
-<input type="hidden" name="uname" value="<% uname %>">
-<input type="hidden" name="modRule" value="<% Web.html rule %>">
-<label>Node: <% nodeName %> <input name="rule" value="<% Web.html rule %>"></label>
-<a href="sec?delRule=<% Web.urlEncode rule %>">[Request deletion]</a>
-<input type="submit" value="Request change">
-</form><br>
-<% end
-end%>
-
-<h3>Request a new firewall rule</h3>
-
-<p>You can find a description of rule formats <a href="http://wiki.hcoop.net/FirewallRules">on our wiki</a>. Enter here the rule you want, without the initial <tt>user</tt> portion. We also <a href="http://wiki.hcoop.net/FirewallRules#Common_Rules">allow all members access to some services</a> if they are commonly requested.</p>
-
-<p>When requesting a <tt>Server</tt> or <tt>ProxiedServer</tt> rule, use a port above <tt>50000</tt> (there is a list of <a href="http://wiki.hcoop.net/AllocatedFirewallPorts">allocated ports</a>). We may grant <tt>Server</tt> requests for ports under <tt>50000</tt> if it can be justified, but never for a <tt>ProxiedServer</tt>.</p>
-
-<p>We very rarely grant requests for Client rules that don't include remote host whitelists. For example, important security concerns make it a bad idea for us to give anybody blanket IRC permissions. Instead, request specific servers. We will refuse such requests that include networks that are popularly considered fronts for illegal activity.</p>
-
-<form action="sec" method="post">
-<input type="hidden" name="node" value="<% nodeNum %>">
-<input type="hidden" name="uname" value="<% uname %>">
-<input type="hidden" name="cmd" value="rule">
-<table class="blanks">
-<tr> <td>Rule</td> <td><input name="rule" size="80"></td> </tr>
-<tr> <td>Reason:</td> <td><textarea name="msg" wrap="soft" rows="3" cols="80"></textarea></td> </tr>
-<tr> <td><input type="submit" value="Request"></td> </tr>
-</table>
-</form>
-
-<% end %>
+if showNormal then
+  @secnormal [("uname", [uname]),
+              ("nodeNum", [Int.toString nodeNum])];
+end %>
 
 <% @footer[] %>
\ No newline at end of file