Group membership change requests

diff --git a/domain.sml b/domain.sml
index cec1eb6..4a7cc87 100644 (file)
--- a/domain.sml
+++ b/domain.sml
@@ -5,7 +5,6 @@ structure Domain = Request(struct
                           val template = "domain"
                           val descr = "domain"
                           fun body (mail, dom) =
-                              (Mail.mwrite (mail, "Domain: ");
-                               Mail.mwrite (mail, dom);
+                              (Mail.mwrite (mail, dom);
                                Mail.mwrite (mail, "\n"))
                           end)

diff --git a/exn.mlt b/exn.mlt
index 31b13bf..8e534a4 100644 (file)
--- a/exn.mlt
+++ b/exn.mlt
@@ -7,6 +7,10 @@
 <% switch Web.getExn () of
      Fail msg => %>
 <b>Fail</b>: <% Web.htmlNl msg %>
+<% | OS.SysErr (name, NONE) => %>
+<b>System error</b>: <% Web.html name %>
+<% | OS.SysErr (name, SOME syserr) => %>
+<b>System error</b>: <% Web.html name %>: <% Web.html (OS.errorName syserr) %>: <% Web.htmlNl (OS.errorMsg syserr) %>
 <% | Init.C.Sql msg => %>
 <b>SQL</b>: <% Web.htmlNl msg %>
 <% | Init.Access msg => %>

diff --git a/sec.mlt b/sec.mlt
new file mode 100644 (file)
index 0000000..c8bdfba
--- /dev/null
+++ b/sec.mlt
@@ -0,0 +1,181 @@
+<% val you = Init.getUserId ();
+val yourname = Init.getUserName ();
+
+val uname = case $"uname" of
+         "" => yourname
+       | uname => uname;
+
+val socks = Sec.socketPerms uname;
+val tpe = Sec.isTpe uname;
+
+ref showNormal = true;
+
+@header [("title", ["Security settings"])];
+
+if $"cmd" = "socks" then
+       showNormal := false;
+       val socks = $"socks";
+       %>Are you sure you want to request that socket permissions for <b><% Web.html uname %></b> be changed to <b><% Web.html socks %></b>?<br>
+       <a href="sec?cmd=socks2&uname=<% Web.urlEncode uname %>&socks=<% Web.urlEncode socks %>&msg=<% Web.urlEncode ($"msg") %>">Yes, place the request!</a><%
+elseif $"cmd" = "socks2" then
+       val id = Sec.Req.add (you, String.concat [uname, ": change socket permissions to ", $"socks"], $"msg");
+       if not (Sec.Req.notifyNew id) then
+               %><h3><b>Error sending e-mail notification</b></h3><%
+       end
+       %><h3><b>Request added</b></h3><%
+
+elseif $"cmd" = "tpe" then
+       showNormal := false;
+       val tpe = iff $"tpe" = "yes" then "on" else "off";
+       %>Are you sure you want to request that trusted-path-executables-only for <b><% Web.html uname %></b> be turned <b><% tpe %></b>?<br>
+       <a href="sec?cmd=tpe2&uname=<% Web.urlEncode uname %>&tpe=<% tpe %>&msg=<% Web.urlEncode ($"msg") %>">Yes, place the request!</a><%
+elseif $"cmd" = "tpe2" then
+       val id = Sec.Req.add (you, String.concat [uname, ": turn tpe ", $"tpe"], $"msg");
+       if not (Sec.Req.notifyNew id) then
+               %><h3><b>Error sending e-mail notification</b></h3><%
+       end
+       %><h3><b>Request added</b></h3><%
+
+elseif $"cmd" = "open" then
+       showNormal := false;
+       Group.requireGroupName "server";
+       %><h3><b>Open requests</b></h3>
+       <a href="sec?cmd=list">List all requests</a><%
+
+       foreach (name, req) in Sec.Req.listOpen () do %>
+<br><hr><br>
+<table>
+<tr> <td align="right"><b>By</b>:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
+<tr> <td align="right"><b>Time</b>:</td> <td><% #stamp req %></td> </tr>
+<tr> <td align="right"><b>Request</b>:</td> <td><% #data req %></td> </tr>
+<tr> <td align="right" valign="top"><b>Msg</b>:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
+</table>
+
+<br>
+<a href="sec?mod=<% #id req %>">[Modify]</a>
+<a href="sec?del=<% #id req %>">[Delete]</a><br>
+
+<%     end
+
+elseif $"cmd" = "list" then
+       showNormal := false;
+       Group.requireGroupName "server"
+       %><h3><b>All requests</b></h3><%
+
+       foreach (name, req) in Sec.Req.list () do %>
+<br><hr><br>
+<table>
+<tr> <td align="right"><b>By</b>:</td> <td colspan="2"><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
+<tr> <td align="right"><b>Time</b>:</td> <td colspan="2"><% #stamp req %></td> </tr>
+<tr> <td align="right"><b>Request</b>:</td> <td><% #data req %></td> </tr>
+<tr> <td align="right" valign="top"><b>Reason</b>:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
+</table>
+
+<br>
+<a href="sec?mod=<% #id req %>">[Modify]</a>
+<a href="sec?del=<% #id req %>">[Delete]</a>
+
+<%     end
+
+elseif $"mod" <> "" then
+       showNormal := false;
+       Group.requireGroupName "server";
+       val id = Web.stoi ($"mod");
+       val req = Sec.Req.lookup id;
+       val user = Init.lookupUser (#usr req) %>
+<h3><b>Handle request</b></h3>
+
+<form action="sec" method="post">
+<input type="hidden" name="save" value="<% id %>">
+<table>
+<tr> <td align="right"><b>Requestor</b>:</td> <td><a href="user?id=<% #usr req %>"><% #name user %></a></td> </tr>
+<tr> <td align="right"><b>Time</b>:</td> <td><% #stamp req %></td> </tr>
+<tr> <td align="right"><b>Status</b>:</td> <td><select name="status">
+       <option value="0"<% if #status req = Sec.Req.NEW then %> selected<% end %>>New</option>
+       <option value="1"<% if #status req = Sec.Req.INSTALLED then %> selected<% end %>>Installed</option>
+       <option value="2"<% if #status req = Sec.Req.REJECTED then %> selected<% end %>>Rejected</option>
+</select></td> </tr>
+<tr> <td align="right"><b>Request</b>:</td> <td><input name="req" value="<% #data req %>"></td> </tr>
+<tr> <td align="right" valign="top"><b>Message</b>:</td> <td><textarea name="msg" rows="10" cols="80" wrap="soft"><% Web.html (#msg req) %></textarea></td> </tr>
+<tr> <td><input type="submit" value="Save"></td> </tr>
+</table>
+</form>
+
+<% elseif $"save" <> "" then
+       showNormal := false;
+       Group.requireGroupName "server";
+       val id = Web.stoi ($"save");
+       val req = Sec.Req.lookup id;
+       val oldStatus = #status req;
+       val newStatus = Sec.Req.statusFromInt (Web.stoi ($"status"));
+       Sec.Req.modify {req with data = $"req", msg = $"msg", status = newStatus};
+       if oldStatus <> newStatus then
+               if not (Sec.Req.notifyMod (oldStatus, newStatus, Init.getUserName(), id)) then
+                       %><h3><b>Error sending e-mail notification</b></h3><%
+               end
+       end
+       %><h3><b>Request modified</b></h3>
+       Back to: <a href="sec?cmd=open">open requests</a>, <a href="sec?cmd=list">all requests</a>
+
+<% elseif $"del" <> "" then
+       showNormal := false;
+       Group.requireGroupName "server";
+       val id = Web.stoi ($"del");
+       val req = Sec.Req.lookup id;
+       val user = Init.lookupUser (#usr req)
+       %><h3><b>Are you sure you want to delete request by <% #name user %> for "<% #data req %>"?</b></h3>
+       <a href="sec?del2=<% id %>">Yes, I'm sure!</a>
+
+<% elseif $"del2" <> "" then
+       showNormal := false;
+       Group.requireGroupName "server";
+       val id = Web.stoi ($"del2");
+       Sec.Req.delete id
+       %><h3><b>Request deleted</b><h3>
+       Back to: <a href="sec?cmd=open">open requests</a>, <a href="sec?cmd=list">all requests</a>
+
+<% end;
+
+if showNormal then %>
+
+<form action="sec" method="post">
+<b>Your users:</b> <select name="uname">
+<% foreach name in (yourname :: Sec.findSubusers yourname) do %>
+       <option value="<% name %>"<% if uname = name then %> selected<% end %>><% name %></option>
+<% end %></select> <input type="submit" value="Switch"> </form>
+
+<h3><b>Request socket permissions change</b></h3>
+
+<form action="sec" method="post">
+<input type="hidden" name="uname" value="<% uname %>">
+<input type="hidden" name="cmd" value="socks">
+<table>
+<tr> <td align="right"><b>New permissions:</b></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 align="right" valign="top"><b>Reason:</b></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><b>Request change to your execute permissions</b></h3>
+
+<form action="sec" method="post">
+<input type="hidden" name="uname" value="<% uname %>">
+<input type="hidden" name="cmd" value="tpe">
+<table>
+<tr> <td align="right"><b>Trusted path executables only?</b></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 align="right" valign="top"><b>Reason:</b></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 %>
+
+<% @footer[] %>
\ No newline at end of file

diff --git a/sec.sig b/sec.sig
new file mode 100644 (file)
index 0000000..947e601
--- /dev/null
+++ b/sec.sig
@@ -0,0 +1,15 @@
+signature SEC = sig
+    structure Req : REQUEST_OUT
+
+    val findSubusers : string -> string list
+
+    datatype socket_perms =
+            ANY
+          | CLIENT_ONLY
+          | SERVER_ONLY
+          | NADA
+
+    val inGroup : string * string -> bool
+    val socketPerms : string -> socket_perms
+    val isTpe : string -> bool
+end

diff --git a/sec.sml b/sec.sml
new file mode 100644 (file)
index 0000000..5974bc2
--- /dev/null
+++ b/sec.sml
@@ -0,0 +1,80 @@
+structure Sec :> SEC = struct
+
+open Init Util Sql
+
+structure Req = Request(struct
+                       val table = "Sec"
+                       val adminGroup = "server"
+                       fun subject _ = "Security permissions change request"
+                       val template = "sec"
+                       val descr = "change"
+                       fun body (mail, req) =
+                           (Mail.mwrite (mail, req);
+                            Mail.mwrite (mail, "\n"))
+                       end)
+
+fun findSubusers uname =
+    let
+       val uname_under = uname ^ "_"
+       val inf = TextIO.openIn "/etc/passwd"
+
+       fun loop subs =
+           case TextIO.inputLine inf of
+               NONE => ListMergeSort.sort (fn (x, y) => String.compare (x, y) = GREATER) subs
+             | SOME line =>
+               case String.fields (fn ch => ch = #":") line of
+                   uname'::_ =>
+                   if size uname' >= size uname_under
+                      andalso String.substring (uname', 0, size uname_under) = uname_under then
+                       loop (uname' :: subs)
+                   else
+                       loop subs
+                 | _ => loop subs
+    in
+       loop []
+       before TextIO.closeIn inf
+    end
+
+datatype socket_perms =
+        ANY
+       | CLIENT_ONLY
+       | SERVER_ONLY
+       | NADA
+
+fun inGroup (uname, grp) =
+    let
+       val uname_under = uname ^ "_"
+       val inf = TextIO.openIn "/etc/group"
+
+       fun loop () =
+           case TextIO.inputLine inf of
+               NONE => false
+             | SOME line =>
+               case String.fields (fn ch => ch = #":") line of
+                   [gname, _, _, members]  =>
+                   if gname = grp then
+                       mem (uname, String.fields (fn ch => ch = #",") members)
+                   else
+                       loop ()
+                 | _ => loop ()
+    in
+       loop ()
+       before TextIO.closeIn inf
+    end    
+
+fun socketPerms uname =
+    if inGroup (uname, "no-sockets") then
+       NADA
+    else if inGroup (uname, "no-cli-sockets") then
+       if inGroup (uname, "no-serv-sockets") then
+           NADA
+       else
+           SERVER_ONLY
+    else if inGroup (uname, "no-serv-sockets") then
+       CLIENT_ONLY
+    else
+       ANY
+
+fun isTpe uname = inGroup (uname, "only-tpe")
+
+end

diff --git a/tables.sql b/tables.sql
index 555d81b..97a890c 100644 (file)
--- a/tables.sql
+++ b/tables.sql
@@ -271,3 +271,14 @@ CREATE TABLE RollCallEntry(
        PRIMARY KEY (rol, usr),
        FOREIGN KEY (rol) REFERENCES RollCall(id) ON DELETE CASCADE,
        FOREIGN KEY (usr) REFERENCES WebUser(id) ON DELETE CASCADE);
+
+CREATE TABLE Sec(
+       id INTEGER PRIMARY KEY,
+       usr INTEGER NOT NULL,
+       data TEXT NOT NULL,
+       msg TEXT NOT NULL,
+       status INTEGER NOT NULL,
+       stamp TIMESTAMP NOT NULL,
+       FOREIGN KEY (usr) REFERENCES WebUser(id) ON DELETE CASCADE);
+
+CREATE SEQUENCE SecSeq START 1;

diff --git a/util.sig b/util.sig
index 46a86b1..c82c869 100644 (file)
--- a/util.sig
+++ b/util.sig
@@ -26,4 +26,6 @@ sig
     val domainDir : string -> string
 
     val readFile : string -> string
+
+    val mem : ''a * ''a list -> bool
 end

diff --git a/util.sml b/util.sml
index 9ac38d0..7da69eb 100644 (file)
--- a/util.sml
+++ b/util.sml
@@ -78,4 +78,6 @@ fun readFile fname =
        before TextIO.closeIn inf
     end
 
+fun mem (x, ls) = List.exists (fn y => y = x) ls
+
 end