smeserver-phpki/contribs10/smeserver-phpki-0.2.bz10267.updatetktauth.patch

diff -Nur smeserver-phpki-0.2.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/19AuthTKT smeserver-phpki-0.2/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/19AuthTKT
--- smeserver-phpki-0.2.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/19AuthTKT  2008-08-15 12:12:15.000000000 -0400
+++ smeserver-phpki-0.2/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/19AuthTKT      2017-05-03 15:45:39.928000000 -0400
@@ -3,5 +3,6 @@
 
     my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245";
     $OUT .= "TKTAuthSecret \"$secret\"\n";
+    $OUT .= "TKTAuthDigestType SHA256\n";
 }
 
diff -Nur smeserver-phpki-0.2.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki smeserver-phpki-0.2/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki
--- smeserver-phpki-0.2.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki    2013-11-11 12:05:11.000000000 -0500
+++ smeserver-phpki-0.2/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki        2017-05-03 15:46:41.142000000 -0400
@@ -24,7 +24,14 @@
         AuthType Basic
         TKTAuthLoginURL /server-common/cgi-bin/login
         require user admin {getUsersList("phpki");}
-        SetEnv IMGHDR_SRC "/server-common/server-manager.jpg"
+{
+        my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} || "30m";
+        $OUT = "    TKTAuthTimeout $ManagerTimeout\n";
+        my $Cookie = ${'httpd-admin'}{Cookie} || "disabled";
+        $OUT .= "    TKTAuthCookieExpires $ManagerTimeout\n" if "$Cookie" eq "enabled";
+        my $ManagerTimeoutReset = ${'httpd-admin'}{ManagerTimeoutReset} || "0.66";
+        $OUT .= "    TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
+}
         Satisfy all
 </Location>
 
1	brianr	1.1	diff -Nur smeserver-phpki-0.2.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/19AuthTKT smeserver-phpki-0.2/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/19AuthTKT
2			--- smeserver-phpki-0.2.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/19AuthTKT 2008-08-15 12:12:15.000000000 -0400
3			+++ smeserver-phpki-0.2/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/19AuthTKT 2017-05-03 15:45:39.928000000 -0400
4			@@ -3,5 +3,6 @@
5
6			my $secret = ${'httpd-admin'}{TKTAuthSecret} \|\| "34322500-7330-4400-423A-3A00434F5245";
7			$OUT .= "TKTAuthSecret \"$secret\"\n";
8			+ $OUT .= "TKTAuthDigestType SHA256\n";
9			}
10
11			diff -Nur smeserver-phpki-0.2.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki smeserver-phpki-0.2/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki
12			--- smeserver-phpki-0.2.old/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki 2013-11-11 12:05:11.000000000 -0500
13			+++ smeserver-phpki-0.2/root/etc/e-smith/templates/etc/httpd/pki-conf/httpd.conf/90phpki 2017-05-03 15:46:41.142000000 -0400
14			@@ -24,7 +24,14 @@
15			AuthType Basic
16			TKTAuthLoginURL /server-common/cgi-bin/login
17			require user admin {getUsersList("phpki");}
18			- SetEnv IMGHDR_SRC "/server-common/server-manager.jpg"
19			+{
20			+ my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} \|\| "30m";
21			+ $OUT = " TKTAuthTimeout $ManagerTimeout\n";
22			+ my $Cookie = ${'httpd-admin'}{Cookie} \|\| "disabled";
23			+ $OUT .= " TKTAuthCookieExpires $ManagerTimeout\n" if "$Cookie" eq "enabled";
24			+ my $ManagerTimeoutReset = ${'httpd-admin'}{ManagerTimeoutReset} \|\| "0.66";
25			+ $OUT .= " TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
26			+}
27			Satisfy all
28			</Location>
29