X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/7ad80c2038b827f5f47a2768b790967cc9e12b7d..42782c7938b390dacda93c64ff4850b1a49f3c11:/src/plugins/apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index d4f7fc8..c4b47af 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -62,32 +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" :: 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 ()
-					   | SOME n => n > 1024 orelse default ())
-				      | _ => default ()
-			else
-			    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
@@ -158,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"
@@ -464,7 +467,8 @@ fun vhostPost () = (!post ();
 		    app (TextIO.closeOut o #2) (!vhostFiles))
 
 val php_version = fn (EVar "php5", _) => SOME 5
-		   | _ => NONE
+                   | (EVar "fast_php", _) => SOME 6
+                   | _ => NONE
 
 fun vhostBody (env, makeFullHost) =
     let
@@ -548,14 +552,23 @@ 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");
+				       TextIO.output (file, "\n\tFcgidWrapper \"");
+				       TextIO.output (file, Config.Apache.fastCgiWrapperOf user);
+				       TextIO.output (file, " ");
+				       TextIO.output (file, Config.Apache.phpFastCgiWrapper);
+				       TextIO.output (file, "\""))
+				  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 ";
@@ -680,7 +693,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)
@@ -691,6 +704,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) =>
@@ -874,7 +894,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")
@@ -1137,6 +1157,11 @@ 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")