X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/ffd50ec73c2d9582ef782bae84aa38af5c8a514a..81180509ead024b0b46beb4a356bf8d7887b5d51:/src/plugins/apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index ec41103..c97b9a3 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -1,5 +1,6 @@
 (* HCoop Domtool (http://hcoop.sourceforge.net/)
- * Copyright (c) 2006-2007, Adam Chlipala
+ * Copyright (c) 2006-2009, Adam Chlipala
+ * Copyright (c) 2013 Clinton Ebadi
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -61,28 +62,34 @@ val _ = Env.type_one "proxy_port"
 	Env.int
 	(fn n => n > 1024)
 
+fun validProxyTarget default s =
+    case String.fields (fn ch => ch = #":") s of
+	"http" :: host :: rest =>
+	let
+	    val rest = String.concatWith ":" rest
+	in
+	    if List.exists (fn h' => host = h') (map (fn h => String.concat ["//", h]) Config.Apache.proxyHosts)
+	    then
+		CharVector.all (fn ch => Char.isPrint ch andalso not (Char.isSpace ch)
+					 andalso ch <> #"\"" andalso ch <> #"'") rest
+		andalso case String.fields (fn ch => ch = #"/") rest of
+			    port :: _ =>
+			    (case Int.fromString port of
+				 NONE => default s
+			       | SOME n => n > 1024 orelse default s)
+			  | _ => default s
+	    else
+		default s
+	end
+      | _ => default s
+
 val _ = Env.type_one "proxy_target"
 	Env.string
-	(fn s =>
-	    let
-		fun default () = List.exists (fn s' => s = s') Config.Apache.proxyTargets
-	    in
-		case String.fields (fn ch => ch = #":") s of
-		    "http" :: "//localhost" :: rest =>
-		    let
-			val rest = String.concatWith ":" rest
-		    in
-			CharVector.all (fn ch => Char.isPrint ch andalso not (Char.isSpace ch)
-						 andalso ch <> #"\"" andalso ch <> #"'") rest
-			andalso case String.fields (fn ch => ch = #"/") rest of
-				    port :: _ =>
-				    (case Int.fromString port of
-					 NONE => default ()
-				       | SOME n => n > 1024 orelse default ())
-				  | _ => default ()
-		    end
-		  | _ => default ()
-	    end)
+	(validProxyTarget (fn s => List.exists (fn s' => s = s') (Config.Apache.proxyTargets @ ["!"])))
+
+val _ = Env.type_one "proxy_reverse_target"
+	Env.string
+	(validProxyTarget (fn s => List.exists (fn s' => s = s') Config.Apache.proxyTargets))
 
 val _ = Env.type_one "rewrite_arg"
 	Env.string
@@ -113,10 +120,18 @@ fun validCert s = Acl.query {user = Domain.getUser (),
 			     class = "cert",
 			     value = s}
 
+fun validCaCert s = Acl.query {user = Domain.getUser (),
+			       class = "cacert",
+			       value = s}
+
 val _ = Env.type_one "ssl_cert_path"
 	Env.string
 	validCert
 
+val _ = Env.type_one "ssl_cacert_path"
+	Env.string
+	validCaCert
+
 fun ssl e = case e of
 		(EVar "no_ssl", _) => SOME NONE
 	      | (EApp ((EVar "use_cert", _), s), _) => Option.map SOME (Env.string s)
@@ -131,32 +146,9 @@ val _ = Env.type_one "file_extension"
 	Env.string
 	validExtension
 
-val defaults = [("WebPlaces",
-		 (TList (TBase "web_place", dl), dl),
-		 (fn () => (EList (map webPlaceDefault Config.Apache.webNodes_default), dl))),
-		("SSL",
-		 (TBase "ssl", dl),
-		 (fn () => (EVar "no_ssl", dl))),
-		("User",
-		 (TBase "your_user", dl),
-		 (fn () => (EString (Domain.getUser ()), dl))),
-		("Group",
-		 (TBase "your_group", dl),
-		 (fn () => (EString "nogroup", dl))),
-		("DocumentRoot",
-		 (TBase "your_path", dl),
-		 (fn () => (EString (Domain.homedir () ^ "/" ^ Config.Apache.public_html), dl))),
-		("ServerAdmin",
-		 (TBase "email", dl),
-		 (fn () => (EString (Domain.getUser () ^ "@" ^ Config.defaultDomain), dl))),
-		("SuExec",
-		 (TBase "suexec_flag", dl),
-		 (fn () => (EVar "true", dl))),
-		("PhpVersion",
-		 (TBase "php_version", dl),
-		 (fn () => (EVar "php4", dl)))]
-
-val () = app Defaults.registerDefault defaults
+val _ = Env.registerFunction ("defaultServerAdmin",
+			      fn [] => SOME (EString (Domain.getUser () ^ "@" ^ Config.defaultDomain), dl)
+			      | _ => NONE)
 
 val redirect_code = fn (EVar "temp", _) => SOME "temp"
 		     | (EVar "permanent", _) => SOME "permanent"
@@ -168,6 +160,7 @@ val redirect_code = fn (EVar "temp", _) => SOME "temp"
 		     | (EVar "redir304", _) => SOME "304"
 		     | (EVar "redir305", _) => SOME "305"
 		     | (EVar "redir307", _) => SOME "307"
+		     | (EVar "notfound", _) => SOME "404"
 		     | _ => NONE
 
 val flag = fn (EVar "redirect", _) => SOME "R"
@@ -202,6 +195,7 @@ val apache_option = fn (EVar "execCGI", _) => SOME "ExecCGI"
 		     | (EVar "includesNOEXEC", _) => SOME "IncludesNOEXEC"
 		     | (EVar "indexes", _) => SOME "Indexes"
 		     | (EVar "followSymLinks", _) => SOME "FollowSymLinks"
+		     | (EVar "multiViews", _) => SOME "MultiViews"
 		     | _ => NONE
 
 val autoindex_width = fn (EVar "autofit", _) => SOME "*"
@@ -241,6 +235,19 @@ val autoindex_option = fn (EApp ((EVar "descriptionWidth", _), w), _) =>
 
 			| _ => NONE
 
+val interval_base = fn (EVar "access", _) => SOME "access"
+		     | (EVar "modification", _) => SOME "modification"
+		     | _ => NONE
+
+val interval = fn (EVar "years", _) => SOME "years"
+		| (EVar "months", _) => SOME "months"
+		| (EVar "weeks", _) => SOME "weeks"
+		| (EVar "days", _) => SOME "days"
+		| (EVar "hours", _) => SOME "hours"
+		| (EVar "minutes", _) => SOME "minutes"
+		| (EVar "seconds", _) => SOME "seconds"
+		| _ => NONE
+
 val vhostsChanged = ref false
 val logDeleted = ref false
 val delayedLogMoves = ref (fn () => ())
@@ -422,6 +429,8 @@ fun write s = app (fn (_, file) => TextIO.output (file, s)) (!vhostFiles)
 
 val rewriteEnabled = ref false
 val localRewriteEnabled = ref false
+val expiresEnabled = ref false
+val localExpiresEnabled = ref false
 val currentVhost = ref ""
 val currentVhostId = ref ""
 val sslEnabled = ref false
@@ -457,9 +466,9 @@ fun vhostPost () = (!post ();
 		    write "</VirtualHost>\n";
 		    app (TextIO.closeOut o #2) (!vhostFiles))
 
-val php_version = fn (EVar "php4", _) => SOME 4
-		   | (EVar "php5", _) => SOME 5
-		   | _ => NONE
+val php_version = fn (EVar "php5", _) => SOME 5
+                   | (EVar "fast_php", _) => SOME 6
+                   | _ => NONE
 
 fun vhostBody (env, makeFullHost) =
     let
@@ -483,6 +492,8 @@ fun vhostBody (env, makeFullHost) =
 
 	rewriteEnabled := false;
 	localRewriteEnabled := false;
+	expiresEnabled := false;
+	localExpiresEnabled := false;
 	vhostFiles := map (fn (node, ip) =>
 			      let
 				  val file = Domain.domainFile {node = node,
@@ -521,7 +532,15 @@ fun vhostBody (env, makeFullHost) =
 					  (TextIO.output (file, "\n\tSuexecUserGroup ");
 					   TextIO.output (file, user);
 					   TextIO.output (file, " ");
-					   TextIO.output (file, group))
+					   TextIO.output (file, group);
+					   (* suPHP is no longer used for fastcgi php and php 7.x *)
+					   (if php < 6 then
+					       (TextIO.output (file, "\n\tsuPHP_UserGroup ");
+						TextIO.output (file, user);
+						TextIO.output (file, " ");
+						TextIO.output (file, group))
+					    else
+						()))
 				  else
 				      ();
 
@@ -537,14 +556,27 @@ fun vhostBody (env, makeFullHost) =
 				  TextIO.output (file, user);
 				  TextIO.output (file, "/DAVLock");
 
-				  if php <> Config.Apache.defaultPhpVersion then
+				  if php = Config.Apache.defaultPhpVersion
+				  then
+				      ()
+				  else if php = 6
+				  then
+				      (* fastcgi php 5.6 since 6 doesn't exist *)
+				      (TextIO.output (file, "\n\tAddHandler fcgid-script .php .phtml");
+				       (* FIXME: only set kerberos wrapper of waklog is on *)
+				       map (fn ext => (TextIO.output (file, "\n\tFcgidWrapper \"");
+						       TextIO.output (file, Config.Apache.fastCgiWrapperOf user);
+						       TextIO.output (file, " ");
+						       TextIO.output (file, Config.Apache.phpFastCgiWrapper);
+						       TextIO.output (file, "\" ");
+						       TextIO.output (file, ext)))
+					   [".php", ".phtml"];
+				       ())
+				  else
 				      (TextIO.output (file, "\n\tAddHandler x-httpd-php");
 				       TextIO.output (file, Int.toString php);
-				       TextIO.output (file, " .php .phtml"))
-				  else
-				      ();
-
-				  (ld, file)
+				       TextIO.output (file, " .php .phtml"));
+			  (ld, file)
 			      end)
 			  places;
 	write "\n\tDocumentRoot ";
@@ -581,7 +613,8 @@ val () = Env.container_one "location"
 	      inLocal := true),
 	  fn () => (write "\t</Location>\n";
 		    inLocal := false;
-		    localRewriteEnabled := false))
+		    localRewriteEnabled := false;
+		    localExpiresEnabled := false))
 
 val () = Env.container_one "directory"
 	 ("directory", Env.string)
@@ -592,7 +625,18 @@ val () = Env.container_one "directory"
 	      inLocal := true),
 	  fn () => (write "\t</Directory>\n";
 		    inLocal := false;
-		    localRewriteEnabled := false))
+		    localRewriteEnabled := false;
+		    localExpiresEnabled := false))
+
+val () = Env.container_one "filesMatch"
+	 ("regexp", Env.string)
+	 (fn prefix =>
+	     (write "\t<FilesMatch \"";
+	      write prefix;
+	      write "\">\n"),
+	  fn () => (write "\t</FilesMatch>\n";
+		    localRewriteEnabled := false;
+		    localExpiresEnabled := false))
 
 fun checkRewrite () =
     if !inLocal then
@@ -607,6 +651,19 @@ fun checkRewrite () =
 	(write "\tRewriteEngine on\n";
 	 rewriteEnabled := true)
 
+fun checkExpires () =
+    if !inLocal then
+	if !localExpiresEnabled then
+	    ()
+	else
+	    (write "\tExpiresActive on\n";
+	     localExpiresEnabled := true)
+    else if !expiresEnabled then
+	()
+    else
+	(write "\tExpiresActive on\n";
+	 expiresEnabled := true)
+
 val () = Env.action_three "localProxyRewrite"
 	 ("from", Env.string, "to", Env.string, "port", Env.int)
 	 (fn (from, to, port) =>
@@ -619,6 +676,24 @@ val () = Env.action_three "localProxyRewrite"
 	      write to;
 	      write " [P]\n"))
 
+val () = Env.action_four "expiresByType"
+	 ("mime", Env.string, "base", interval_base, "num", Env.int, "inter", interval)
+	 (fn (mime, base, num, inter) =>
+	     (checkExpires ();
+	      write "\tExpiresByType\t\"";
+	      write mime;
+	      write "\"\t\"";
+	      write base;
+	      write " plus ";
+	      if num < 0 then
+		  (write "-";
+		   write (Int.toString (~num)))
+	      else
+		  write (Int.toString num);
+	      write " ";
+	      write inter;
+	      write "\"\n"))
+
 val () = Env.action_two "proxyPass"
 	 ("from", Env.string, "to", Env.string)
 	 (fn (from, to) =>
@@ -626,7 +701,7 @@ val () = Env.action_two "proxyPass"
 		  write from;
 		  write "\t";
 		  write to;
-		  write "\n"))
+		  write "\tretry=0\n"))
 
 val () = Env.action_two "proxyPassReverse"
 	 ("from", Env.string, "to", Env.string)
@@ -637,6 +712,13 @@ val () = Env.action_two "proxyPassReverse"
 		  write to;
 		  write "\n"))
 
+val () = Env.action_one "proxyPreserveHost"
+ 	 ("enable", Env.bool)
+	 (fn (enable) =>
+	     (write "\tProxyPreserveHost\t";
+	      if enable then write "On" else write "Off";
+	      write "\n"))
+
 val () = Env.action_three "rewriteRule"
 	 ("from", Env.string, "to", Env.string, "flags", Env.list flag)
 	 (fn (from, to, flags) =>
@@ -709,6 +791,41 @@ val () = Env.action_two "scriptAlias"
 	      write to;
 	      write "\n"))
 
+val () = Env.action_two "fastScriptAlias"
+	 ("from", Env.string, "to", Env.string)
+	 (fn (from, to) =>
+	     let
+		 (* mod_fcgid + kerberos limit this to working with
+		 individual fcgi programs. assume the target path is a
+		 file and any trailing `/' is just aliasing
+		 syntax. Directory+File on the script is used to
+		 activate fcgid instead of Location on the alias to
+		 limit effects (alias+location also match in inverse
+		 order causing pernicious side-effects *)
+		 val fcgi_path = if String.sub (to, size to - 1) = #"/"
+				 then
+				     String.substring (to, 0, size to - 1)
+				 else
+				     to
+		 val fcgi_dir = OS.Path.dir fcgi_path
+		 val fcgi_file = OS.Path.file fcgi_path
+	     in
+		 write "\tAlias\t"; write from; write " "; write to;  write "\n";
+
+		 write "\t<Directory "; write fcgi_dir;  write ">\n";
+		 write "\t<Files "; write fcgi_file;  write ">\n";
+		 write "\tSetHandler fcgid-script\n";
+
+		 (* FIXME: only set kerberos wrapper of waklog is on *)
+		 write "\tFcgidWrapper \"";
+		 write (Config.Apache.fastCgiWrapperOf (Domain.getUser ()));
+		 write " ";
+		 write fcgi_path;
+		 write "\"\n";
+
+		 write "\t</Files>\n\t</Directory>\n"
+	     end)
+
 val () = Env.action_two "errorDocument"
 	 ("code", Env.string, "handler", Env.string)
 	 (fn (code, handler) =>
@@ -820,7 +937,7 @@ val () = Env.action_one "authType"
 		  write "\n";
 		  case ty of
 		      "kerberos" => 
-		      write "\tKrbMethodNegotiate off\n\tKrbMethodK5Passwd on\n\tKrbVerifyKDC off\n\tKrbAuthRealms HCOOP.NET\n\tKrbSaveCredentials on\n"
+		      write "\tKrbServiceName apache2\n\tKrb5Keytab /etc/keytabs/service/apache\n\tKrbMethodNegotiate on\n\tKrbMethodK5Passwd on\n\tKrbVerifyKDC on\n\tKrbAuthRealms HCOOP.NET\n\tKrbSaveCredentials on\n"
 		    | _ => ())
 	     else
 		 print "WARNING: Skipped Kerberos authType because this isn't an SSL vhost.\n")
@@ -839,6 +956,13 @@ val () = Env.action_one "authUserFile"
 	      write name;
 	      write "\n"))
 
+val () = Env.action_one "authGroupFile"
+	 ("file", Env.string)
+	 (fn name =>
+	     (write "\tAuthGroupFile ";
+	      write name;
+	      write "\n"))
+
 val () = Env.action_none "requireValidUser"
 	 (fn () => write "\tRequire valid-user\n")
 
@@ -1031,9 +1155,20 @@ val () = Env.action_one "diskCache"
 
 val () = Env.action_one "phpVersion"
 	 ("version", php_version)
-	 (fn version => (write "\tAddHandler x-httpd-php";
-			 write (Int.toString version);
-			 write " .php .phtml\n"))
+	 (fn version => (if version = 6
+			 then
+			     (* fastcgi php 5.6 since 6 doesn't exist *)
+			     (write "\tAddHandler fcgid-script .php .phtml\n";
+			      (* FIXME: only set kerberos wrapper of waklog is on *)
+			      write "\n\tFcgidWrapper \"";
+			      write (Config.Apache.fastCgiWrapperOf (Domain.getUser ()));
+			      write " ";
+			      write Config.Apache.phpFastCgiWrapper;
+			      write "\" .php .phtml\n")
+			 else
+			     (write "\tAddHandler x-httpd-php";
+			      write (Int.toString version);
+			      write " .php .phtml\n")))
 
 val () = Env.action_two "addType"
 	 ("mime type", Env.string, "extension", Env.string)
@@ -1057,8 +1192,18 @@ val () = Env.action_two "addOutputFilter"
 	      write "\n")
 	   | _ => ())
 
+val () = Env.action_one "sslCertificateChainFile"
+	 ("ssl_cacert_path", Env.string)
+	 (fn cacert =>
+	     if !sslEnabled then
+		 (write "\tSSLCertificateChainFile \"";
+		  write cacert;
+		  write "\"\n")
+	     else
+		 print "WARNING: Skipped sslCertificateChainFile because this isn't an SSL vhost.\n")
+
 val () = Domain.registerResetLocal (fn () =>
-				       ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))
+				       ignore (OS.Process.system (Config.rm ^ " -rf " ^ Config.Apache.confDir ^ "/*")))
 
 val () = Domain.registerDescriber (Domain.considerAll
 				   [Domain.Extension {extension = "vhost",
@@ -1066,7 +1211,32 @@ val () = Domain.registerDescriber (Domain.considerAll
 				    Domain.Extension {extension = "vhost_ssl",
 						      heading = fn host => "SSL web vhost " ^ host ^ ":"}])
 
+val () = Env.action_one "allowEncodedSlashes"
+	 ("enable", Env.bool)
+	 (fn enable => (write "\tAllowEncodedSlashes ";
+		      write (if enable then "NoDecode" else "Off");
+		      write "\n"))
 val () = Env.action_none "testNoHtaccess"
 	 (fn path => write "\tAllowOverride None\n")
 
+fun writeWaklogUserFile () =
+    let
+	val users = Acl.users ()
+	val outf = TextIO.openOut Config.Apache.waklogUserFile
+    in
+	app (fn user => if String.isSuffix "_admin" user then
+			    ()
+			else
+			    (TextIO.output (outf, "<Location /~");
+			     TextIO.output (outf, user);
+			     TextIO.output (outf, ">\n\tWaklogEnabled on\n\tWaklogLocationPrincipal ");
+			     TextIO.output (outf, user);
+			     TextIO.output (outf, "/daemon@HCOOP.NET /etc/keytabs/user.daemon/");
+			     TextIO.output (outf, user);
+			     TextIO.output (outf, "\n</Location>\n\n"))) users;
+	TextIO.closeOut outf
+    end
+
+val () = Domain.registerOnUsersChange writeWaklogUserFile
+
 end