X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/edd380241e9ba2b750eb9a1f82ffd6feeab6252f..77a8fca278b561808959fa1aa7d9f02c5cfe7720:/src/plugins/apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 4887043..65ba7fb 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -22,6 +22,17 @@ structure Apache :> APACHE = struct
 
 open Ast
 
+val _ = Env.type_one "web_node"
+	Env.string
+	(fn node =>
+	    List.exists (fn x => x = node) Config.Apache.webNodes_all
+	    orelse (Domain.hasPriv "www"
+		    andalso List.exists (fn x => x = node) Config.Apache.webNodes_admin))
+
+val _ = Env.registerFunction ("web_node_to_node",
+			      fn [e] => SOME e
+			       | _ => NONE)
+
 val _ = Env.type_one "proxy_port"
 	Env.int
 	(fn n => n > 1024)
@@ -61,29 +72,29 @@ val _ = Env.type_one "location"
 
 val dl = ErrorMsg.dummyLoc
 
-val _ = Main.registerDefault ("WebNodes",
-			      (TList (TBase "node", dl), dl),
-			      (fn () => (EList (map (fn s => (EString s, dl)) Config.Apache.webNodes), dl)))
+val _ = Defaults.registerDefault ("WebNodes",
+				  (TList (TBase "web_node", dl), dl),
+				  (fn () => (EList (map (fn s => (EString s, dl)) Config.Apache.webNodes_default), dl)))
 
-val _ = Main.registerDefault ("SSL",
-			      (TBase "bool", dl),
-			      (fn () => (EVar "false", dl)))
+val _ = Defaults.registerDefault ("SSL",
+				  (TBase "bool", dl),
+				  (fn () => (EVar "false", dl)))
 
-val _ = Main.registerDefault ("User",
-			      (TBase "your_user", dl),
-			      (fn () => (EString (Domain.getUser ()), dl)))
+val _ = Defaults.registerDefault ("User",
+				  (TBase "your_user", dl),
+				  (fn () => (EString (Domain.getUser ()), dl)))
 
-val _ = Main.registerDefault ("Group",
-			      (TBase "your_group", dl),
-			      (fn () => (EString (Domain.getUser ()), dl)))
+val _ = Defaults.registerDefault ("Group",
+				  (TBase "your_group", dl),
+				  (fn () => (EString (Domain.getUser ()), dl)))
 
-val _ = Main.registerDefault ("DocumentRoot",
-			      (TBase "your_path", dl),
-			      (fn () => (EString ("/home/" ^ Domain.getUser () ^ "/public_html"), dl)))
+val _ = Defaults.registerDefault ("DocumentRoot",
+				  (TBase "your_path", dl),
+				  (fn () => (EString (Config.homeBase ^ "/" ^ Domain.getUser () ^ "/" ^ Config.Apache.public_html), dl)))
 
-val _ = Main.registerDefault ("ServerAdmin",
-			      (TBase "email", dl),
-			      (fn () => (EString (Domain.getUser () ^ "@" ^ Config.defaultDomain), dl)))
+val _ = Defaults.registerDefault ("ServerAdmin",
+				  (TBase "email", dl),
+				  (fn () => (EString (Domain.getUser () ^ "@" ^ Config.defaultDomain), dl)))
 
 
 val redirect_code = fn (EVar "temp", _) => SOME "temp"
@@ -131,11 +142,65 @@ val apache_option = fn (EVar "execCGI", _) => SOME "ExecCGI"
 		     | (EVar "indexes", _) => SOME "Indexes"
 		     | _ => NONE
 
+val autoindex_width = fn (EVar "autofit", _) => SOME "*"
+		       | (EApp ((EVar "characters", _), n), _) =>
+			 Option.map Int.toString (Env.int n)
+		       | _ => NONE
+
+val autoindex_option = fn (EApp ((EVar "descriptionWidth", _), w), _) =>
+			  Option.map (fn w => ("DescriptionWidth", SOME w))
+			  (autoindex_width w)
+			| (EVar "fancyIndexing", _) => SOME ("FancyIndexing", NONE)
+			| (EVar "foldersFirst", _) => SOME ("FoldersFirst", NONE)
+			| (EVar "htmlTable", _) => SOME ("HTMLTable", NONE)
+			| (EVar "iconsAreLinks", _) => SOME ("IconsAreLinks", NONE)
+			| (EApp ((EVar "iconHeight", _), n), _) =>
+			  Option.map (fn w => ("IconHeight", SOME (Int.toString w)))
+				     (Env.int n)
+			| (EApp ((EVar "iconWidth", _), n), _) =>
+			  Option.map (fn w => ("IconWidth", SOME (Int.toString w)))
+				     (Env.int n)
+			| (EVar "ignoreCase", _) => SOME ("IgnoreCase", NONE)
+			| (EVar "ignoreClient", _) => SOME ("IgnoreClient", NONE)
+			| (EApp ((EVar "nameWidth", _), w), _) =>
+			  Option.map (fn w => ("NameWidth", SOME w))
+				     (autoindex_width w)
+			| (EVar "scanHtmlTitles", _) => SOME ("ScanHTMLTitles", NONE)
+			| (EVar "suppressColumnSorting", _) => SOME ("SuppressColumnSorting", NONE)
+			| (EVar "suppressDescription", _) => SOME ("SuppressDescription", NONE)
+			| (EVar "suppressHtmlPreamble", _) => SOME ("SuppressHTMLPreamble", NONE)
+			| (EVar "suppressIcon", _) => SOME ("SuppressIcon", NONE)
+			| (EVar "suppressLastModified", _) => SOME ("SuppressLastModified", NONE)
+			| (EVar "suppressRules", _) => SOME ("SuppressRules", NONE)
+			| (EVar "suppressSize", _) => SOME ("SuppressSize", NONE)
+			| (EVar "trackModified", _) => SOME ("TrackModified", NONE)
+			| (EVar "versionSort", _) => SOME ("VersionSort", NONE)
+			| (EVar "xhtml", _) => SOME ("XHTML", NONE)
+
+			| _ => NONE
 
 val vhostsChanged = ref false
+val logDeleted = ref false
 
 val () = Slave.registerPreHandler
-	     (fn () => vhostsChanged := false)
+	     (fn () => (vhostsChanged := false;
+			logDeleted := false))
+
+fun findVhostUser fname =
+    let
+	val inf = TextIO.openIn fname
+
+	fun loop () =
+	    case TextIO.inputLine inf of
+		NONE => NONE
+	      | SOME line =>
+		case String.tokens Char.isSpace line of
+		    ["SuexecUserGroup", user, _] => SOME user
+		  | _ => loop ()
+    in
+	loop ()
+	before TextIO.closeIn inf
+    end
 
 val () = Slave.registerFileHandler (fn fs =>
 				       let
@@ -143,22 +208,63 @@ val () = Slave.registerFileHandler (fn fs =>
 				       in
 					   if String.isSuffix ".vhost" (#file spl)
 					      orelse String.isSuffix ".vhost_ssl" (#file spl) then
-					       (vhostsChanged := true;
-						case #action fs of
-						    Slave.Delete =>
-						    ignore (OS.Process.system (Config.rm
-									       ^ " -rf "
-									       ^ Config.Apache.confDir
-									       ^ "/"
-									       ^ #file spl))
-						  | _ =>
-						    ignore (OS.Process.system (Config.cp
-									       ^ " "
-									       ^ #file fs
-									       ^ " "
-									       ^ Config.Apache.confDir
-									       ^ "/"
-									       ^ #file spl)))
+					       case findVhostUser (#file fs) of
+						   NONE => print ("Can't find user in " ^ #file fs ^ "!  Taking no action.\n")
+						 | SOME user =>
+						   let
+						       val realVhostFile = OS.Path.joinDirFile
+									       {dir = Config.Apache.confDir,
+										file = #file spl}
+
+						       val realLogDir = OS.Path.joinDirFile
+									    {dir = Config.homeBase,
+									     file = user}
+						       val realLogDir = OS.Path.joinDirFile
+									    {dir = realLogDir,
+									     file = "apache"}
+						       val realLogDir = OS.Path.joinDirFile
+									    {dir = realLogDir,
+									     file = "log"}
+						       val realLogDir = OS.Path.joinDirFile
+									    {dir = realLogDir,
+									     file = Slave.hostname ()}
+						       val {base, ...} = OS.Path.splitBaseExt (#file spl)
+						       val realLogDir = OS.Path.joinDirFile
+									    {dir = realLogDir,
+									     file = base}
+						   in
+						       vhostsChanged := true;
+						       case #action fs of
+							   Slave.Delete =>
+							   (if !logDeleted then
+								()
+							    else
+								(ignore (OS.Process.system Config.Apache.down);
+								 logDeleted := true);
+							    ignore (OS.Process.system (Config.rm
+										       ^ " -rf "
+										       ^ realVhostFile));
+							    ignore (OS.Process.system (Config.rm
+										       ^ " -rf "
+										       ^ realLogDir)))
+							 | Slave.Add =>
+							   (ignore (OS.Process.system (Config.cp
+										       ^ " "
+										       ^ #file fs
+										       ^ " "
+										       ^ realVhostFile));
+							    if Posix.FileSys.access (realLogDir, []) then
+								()
+							    else
+								OS.FileSys.mkDir realLogDir)
+							   
+							 | _ =>
+							   ignore (OS.Process.system (Config.cp
+										      ^ " "
+										      ^ #file fs
+										      ^ " "
+										      ^ realVhostFile))
+						   end
 					   else
 					       ()
 				       end)
@@ -166,15 +272,43 @@ val () = Slave.registerFileHandler (fn fs =>
 val () = Slave.registerPostHandler
 	 (fn () =>
 	     (if !vhostsChanged then
-		  Slave.shellF ([Config.Apache.reload],
+		  Slave.shellF ([if !logDeleted then Config.Apache.undown else Config.Apache.reload],
 				fn cl => "Error reloading Apache with " ^ cl)
 	      else
 		  ()))
 
-val vhostFiles : TextIO.outstream list ref = ref []
-fun write s = app (fn file => TextIO.output (file, s)) (!vhostFiles)
+val vhostFiles : (string * TextIO.outstream) list ref = ref []
+fun write' s = app (fn (node, file) => TextIO.output (file, s node)) (!vhostFiles)
+fun write s = app (fn (_, file) => TextIO.output (file, s)) (!vhostFiles)
 
 val rewriteEnabled = ref false
+val localRewriteEnabled = ref false
+val currentVhost = ref ""
+val currentVhostId = ref ""
+
+val pre = ref (fn _ : {user : string, nodes : string list, id : string, hostname : string} => ())
+fun registerPre f =
+    let
+	val old = !pre
+    in
+	pre := (fn x => (old x; f x))
+    end
+
+val post = ref (fn () => ())
+fun registerPost f =
+    let
+	val old = !post
+    in
+	post := (fn () => (old (); f ()))
+    end
+
+val aliaser = ref (fn _ : string => ())
+fun registerAliaser f =
+    let
+	val old = !aliaser
+    in
+	aliaser := (fn x => (old x; f x))
+    end
 
 val () = Env.containerV_one "vhost"
 	 ("host", Env.string)
@@ -189,9 +323,14 @@ val () = Env.containerV_one "vhost"
 		 val sadmin = Env.env Env.string (env, "ServerAdmin")
 
 		 val fullHost = host ^ "." ^ Domain.currentDomain ()
+		 val vhostId = fullHost ^ (if ssl then ".ssl" else "")
 		 val confFile = fullHost ^ (if ssl then ".vhost_ssl" else ".vhost")
 	     in
+		 currentVhost := fullHost;
+		 currentVhostId := vhostId;
+
 		 rewriteEnabled := false;
+		 localRewriteEnabled := false;
 		 vhostFiles := map (fn node =>
 				       let
 					   val file = Domain.domainFile {node = node,
@@ -205,7 +344,25 @@ val () = Env.containerV_one "vhost"
 								else
 								    "80");
 					   TextIO.output (file, ">\n");
-					   file
+					   TextIO.output (file, "\tErrorLog ");
+					   TextIO.output (file, Config.homeBase);
+					   TextIO.output (file, "/");
+					   TextIO.output (file, user);
+					   TextIO.output (file, "/apache/log/");
+					   TextIO.output (file, node);
+					   TextIO.output (file, "/");
+					   TextIO.output (file, vhostId);
+					   TextIO.output (file, "/error.log\n\tCustomLog ");
+					   TextIO.output (file, Config.homeBase);
+					   TextIO.output (file, "/");
+					   TextIO.output (file, user);
+					   TextIO.output (file, "/apache/log/");
+					   TextIO.output (file, node);
+					   TextIO.output (file, "/");
+					   TextIO.output (file, vhostId);
+					   TextIO.output (file, "/access.log combined\n");
+					   (Config.homeBase ^ "/" ^ user ^ "/apache/log/"
+					    ^ node ^ "/" ^ vhostId, file)
 				       end)
 				   nodes;
 		 write "\tServerName ";
@@ -218,29 +375,45 @@ val () = Env.containerV_one "vhost"
 		 write docroot;
 		 write "\n\tServerAdmin ";
 		 write sadmin;
-		 write "\n"
+		 write "\n";
+		 !pre {user = user, nodes = nodes, id = vhostId, hostname = fullHost}
 	     end,
-	  fn () => (write "</VirtualHost>\n";
-		    app TextIO.closeOut (!vhostFiles)))
+	  fn () => (!post ();
+		    write "</VirtualHost>\n";
+		    app (TextIO.closeOut o #2) (!vhostFiles)))
+
+val inLocal = ref false
 
 val () = Env.container_one "location"
 	 ("prefix", Env.string)
 	 (fn prefix =>
 	     (write "\t<Location ";
 	      write prefix;
-	      write ">\n"),
-	  fn () => write "\t</Location>\n")
+	      write ">\n";
+	      inLocal := true),
+	  fn () => (write "\t</Location>\n";
+		    inLocal := false;
+		    localRewriteEnabled := false))
 
 val () = Env.container_one "directory"
 	 ("directory", Env.string)
 	 (fn directory =>
 	     (write "\t<Directory ";
 	      write directory;
-	      write ">\n"),
-	  fn () => write "\t</Directory>\n")
+	      write ">\n";
+	      inLocal := true),
+	  fn () => (write "\t</Directory>\n";
+		    inLocal := false;
+		    localRewriteEnabled := false))
 
 fun checkRewrite () =
-    if !rewriteEnabled then
+    if !inLocal then
+	if !rewriteEnabled orelse !localRewriteEnabled then
+	    ()
+	else
+	    (write "\tRewriteEngine on\n";
+	     localRewriteEnabled := true)
+    else if !rewriteEnabled then
 	()
     else
 	(write "\tRewriteEngine on\n";
@@ -310,6 +483,16 @@ val () = Env.action_three "rewriteCond"
 				 write "]");
 	      write "\n"))
 
+val () = Env.action_one "rewriteLogLevel"
+	 ("level", Env.int)
+	 (fn level =>
+	     (checkRewrite ();
+	      write "\tRewriteLog ";
+	      write' (fn x => x);
+	      write "/rewrite.log\n\tRewriteLogLevel ";
+	      write (Int.toString level);
+	      write "\n"))
+
 val () = Env.action_two "alias"
 	 ("from", Env.string, "to", Env.string)
 	 (fn (from, to) =>
@@ -376,6 +559,187 @@ val () = Env.action_one "serverAlias"
 	 (fn host =>
 	     (write "\tServerAlias ";
 	      write host;
+	      write "\n";
+	      !aliaser host))
+
+val authType = fn (EVar "basic", _) => SOME "basic"
+		| (EVar "digest", _) => SOME "digest"
+		| _ => NONE
+
+val () = Env.action_one "authType"
+	 ("type", authType)
+	 (fn ty =>
+	     (write "\tAuthType ";
+	      write ty;
+	      write "\n"))
+
+val () = Env.action_one "authName"
+	 ("name", Env.string)
+	 (fn name =>
+	     (write "\tAuthName \"";
+	      write name;
+	      write "\"\n"))
+
+val () = Env.action_one "authUserFile"
+	 ("file", Env.string)
+	 (fn name =>
+	     (write "\tAuthUserFile ";
+	      write name;
 	      write "\n"))
 
+val () = Env.action_none "requireValidUser"
+	 (fn () => write "\tRequire valid-user\n")
+
+val () = Env.action_one "requireUser"
+	 ("users", Env.list Env.string)
+	 (fn names =>
+	     case names of
+		 [] => ()
+	       | _ => (write "\tRequire user";
+		       app (fn name => (write " "; write name)) names;
+		       write "\n"))
+
+val () = Env.action_one "requireGroup"
+	 ("groups", Env.list Env.string)
+	 (fn names =>
+	     case names of
+		 [] => ()
+	       | _ => (write "\tRequire group";
+		       app (fn name => (write " "; write name)) names;
+		       write "\n"))
+
+val () = Env.action_none "orderAllowDeny"
+	 (fn () => write "\tOrder allow,deny\n")
+
+val () = Env.action_none "orderDenyAllow"
+	 (fn () => write "\tOrder deny,allow\n")
+
+val () = Env.action_none "allowFromAll"
+	 (fn () => write "\tAllow from all\n")
+
+val () = Env.action_one "allowFrom"
+	 ("entries", Env.list Env.string)
+	 (fn names =>
+	     case names of
+		 [] => ()
+	       | _ => (write "\tAllow from";
+		       app (fn name => (write " "; write name)) names;
+		       write "\n"))
+
+val () = Env.action_none "denyFromAll"
+	 (fn () => write "\tDeny from all\n")
+
+val () = Env.action_one "denyFrom"
+	 ("entries", Env.list Env.string)
+	 (fn names =>
+	     case names of
+		 [] => ()
+	       | _ => (write "\tDeny from";
+		       app (fn name => (write " "; write name)) names;
+		       write "\n"))
+
+val () = Env.action_none "satisfyAll"
+	 (fn () => write "\tSatisfy all\n")
+
+val () = Env.action_none "satisfyAny"
+	 (fn () => write "\tSatisfy any\n")
+
+val () = Env.action_one "forceType"
+	 ("type", Env.string)
+	 (fn ty => (write "\tForceType ";
+		    write ty;
+		    write "\n"))
+
+val () = Env.action_none "forceTypeOff"
+	 (fn () => write "\tForceType None\n")
+
+val () = Env.action_two "action"
+	 ("what", Env.string, "how", Env.string)
+	 (fn (what, how) => (write "\tAction ";
+			     write what;
+			     write " ";
+			     write how;
+			     write "\n"))
+
+val () = Env.action_one "addDefaultCharset"
+	 ("charset", Env.string)
+	 (fn ty => (write "\tAddDefaultCharset ";
+		    write ty;
+		    write "\n"))
+
+(*val () = Env.action_one "davSvn"
+	 ("path", Env.string)
+	 (fn path => (write "\tDAV svn\n\tSVNPath ";
+		      write path;
+		      write "\n"))
+
+val () = Env.action_one "authzSvnAccessFile"
+	 ("path", Env.string)
+	 (fn path => (write "\tAuthzSVNAccessFile ";
+		      write path;
+		      write "\n"))*)
+
+val () = Env.action_two "addDescription"
+	 ("description", Env.string, "patterns", Env.list Env.string)
+	 (fn (desc, pats) =>
+	     case pats of
+		 [] => ()
+	       | _ => (write "\tAddDescription \"";
+		       write (String.toString desc);
+		       write "\"";
+		       app (fn pat => (write " "; write pat)) pats;
+		       write "\n"))
+
+val () = Env.action_one "indexOptions"
+	 ("options", Env.list autoindex_option)
+	 (fn opts =>
+	     case opts of
+		 [] => ()
+	       | _ => (write "\tIndexOptions";
+		       app (fn (opt, arg) =>
+			       (write " ";
+				write opt;
+				Option.app (fn arg =>
+					       (write "="; write arg)) arg)) opts;
+		       write "\n"))
+
+val () = Env.action_one "set_indexOptions"
+	 ("options", Env.list autoindex_option)
+	 (fn opts =>
+	     case opts of
+		 [] => ()
+	       | _ => (write "\tIndexOptions";
+		       app (fn (opt, arg) =>
+			       (write " +";
+				write opt;
+				Option.app (fn arg =>
+					       (write "="; write arg)) arg)) opts;
+		       write "\n"))
+
+val () = Env.action_one "unset_indexOptions"
+	 ("options", Env.list autoindex_option)
+	 (fn opts =>
+	     case opts of
+		 [] => ()
+	       | _ => (write "\tIndexOptions";
+		       app (fn (opt, _) =>
+			       (write " -";
+				write opt)) opts;
+		       write "\n"))
+
+val () = Env.action_one "headerName"
+	 ("name", Env.string)
+	 (fn name => (write "\tHeaderName ";
+		      write name;
+		      write "\n"))
+
+val () = Env.action_one "readmeName"
+	 ("name", Env.string)
+	 (fn name => (write "\tReadmeName ";
+		      write name;
+		      write "\n"))
+
+val () = Domain.registerResetLocal (fn () =>
+				       ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))
+
 end