X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/094877b11a71011cc7af7dc1b5a6b853b4985c6d..cd04086681583dd3fcc95b6e12ba312054dc590e:/src/acl.sml

diff --git a/src/acl.sml b/src/acl.sml
index e57f186..f7307b0 100644
--- a/src/acl.sml
+++ b/src/acl.sml
@@ -44,6 +44,8 @@ fun queryAll user =
 				      (class, SS.foldr (op::) [] values) :: out)
 				  [] classes
 
+fun users () = SM.foldri (fn (user, _, ls) => user :: ls) [] (!acl)
+
 fun whoHas {class, value} =
     SM.foldri (fn (user, classes, users) =>
 		  case SM.find (classes, class) of
@@ -62,6 +64,10 @@ fun class {user, class} =
 	    NONE => SS.empty
 	  | SOME values => values
 
+fun rmuser user =
+    (acl := #1 (SM.remove (!acl, user)))
+    handle NotFound => ()
+
 fun grant {user, class, value} =
     let
 	val classes = Option.getOpt (SM.find (!acl, user), SM.empty)
@@ -81,12 +87,28 @@ fun revoke {user, class, value} =
 			 SS.delete (values, value)
 		     else
 			 values
+
+	val classes = if SS.isEmpty values then
+			  (#1 (SM.remove (classes, class)))
+			  handle NotFound => classes
+		      else
+			  SM.insert (classes, class, values)
     in
-	acl := SM.insert (!acl, user,
-			  SM.insert (classes, class,
-				     values))
+	if SM.numItems classes = 0 then
+	    (acl := #1 (SM.remove (!acl, user)))
+	    handle NotFound => ()
+	else
+	    acl := SM.insert (!acl, user, classes)
     end
 
+fun revokeFromAll {class, value} =
+    acl := SM.map (fn classes =>
+		      case SM.find (classes, class) of
+			  NONE => classes
+			| SOME values =>
+			  ((SM.insert (classes, class, SS.delete (values, value)))
+			   handle NotFound => classes)) (!acl)
+
 fun read fname =
     let
 	val inf = TextIO.openIn fname
@@ -125,15 +147,21 @@ fun write fname =
 				      TextIO.output (outf, value)))
 
 	val writeClasses = SM.appi (fn (class, values) =>
-				       (TextIO.output (outf, class);
-					writeValues values;
-					TextIO.output (outf, "\n")))
+				       if SS.isEmpty values then
+					   ()
+				       else
+					   (TextIO.output (outf, class);
+					    writeValues values;
+					    TextIO.output (outf, "\n")))
 
 	val writeUsers = SM.appi (fn (user, classes) =>
-				     (TextIO.output (outf, user);
-				      TextIO.output (outf, "\n");
-				      writeClasses classes;
-				      TextIO.output (outf, "\n")))
+				     if SM.numItems classes = 0 then
+					 ()
+				     else
+					 (TextIO.output (outf, user);
+					  TextIO.output (outf, "\n");
+					  writeClasses classes;
+					  TextIO.output (outf, "\n")))
     in
 	writeUsers (!acl);
 	TextIO.closeOut outf