smeserver-freepbx/contribs10/smeserver-freepbx-13.bz10268.updatetktauth.patch

diff -Nur smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/19AuthTKT smeserver-freepbx-13/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/19AuthTKT
--- smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/19AuthTKT        2008-08-04 09:17:11.000000000 -0400
+++ smeserver-freepbx-13/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/19AuthTKT    2017-05-03 15:56:50.158000000 -0400
@@ -3,4 +3,5 @@
 
     my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245";
     $OUT .= "TKTAuthSecret \"$secret\"\n";
+    $OUT .= "TKTAuthDigestType SHA256\n";
 }
diff -Nur smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin smeserver-freepbx-13/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin
--- smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin 2016-06-13 08:03:08.000000000 -0400
+++ smeserver-freepbx-13/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin     2017-05-03 15:57:52.432000000 -0400
@@ -18,7 +18,14 @@
         AuthType Basic
         TKTAuthLoginURL /server-common/cgi-bin/login
         require user admin {getUsersList('freepbx');}
-        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	jpp	1.1	diff -Nur smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/19AuthTKT smeserver-freepbx-13/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/19AuthTKT
2			--- smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/19AuthTKT 2008-08-04 09:17:11.000000000 -0400
3			+++ smeserver-freepbx-13/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/19AuthTKT 2017-05-03 15:56:50.158000000 -0400
4			@@ -3,4 +3,5 @@
5
6			my $secret = ${'httpd-admin'}{TKTAuthSecret} \|\| "34322500-7330-4400-423A-3A00434F5245";
7			$OUT .= "TKTAuthSecret \"$secret\"\n";
8			+ $OUT .= "TKTAuthDigestType SHA256\n";
9			}
10			diff -Nur smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin smeserver-freepbx-13/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin
11			--- smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin 2016-06-13 08:03:08.000000000 -0400
12			+++ smeserver-freepbx-13/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin 2017-05-03 15:57:52.432000000 -0400
13			@@ -18,7 +18,14 @@
14			AuthType Basic
15			TKTAuthLoginURL /server-common/cgi-bin/login
16			require user admin {getUsersList('freepbx');}
17			- SetEnv IMGHDR_SRC "/server-common/server-manager.jpg"
18			+{
19			+ my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} \|\| "30m";
20			+ $OUT = " TKTAuthTimeout $ManagerTimeout\n";
21			+ my $Cookie = ${'httpd-admin'}{Cookie} \|\| "disabled";
22			+ $OUT .= " TKTAuthCookieExpires $ManagerTimeout\n" if "$Cookie" eq "enabled";
23			+ my $ManagerTimeoutReset = ${'httpd-admin'}{ManagerTimeoutReset} \|\| "0.66";
24			+ $OUT .= " TKTAuthTimeoutRefresh $ManagerTimeoutReset\n";
25			+}
26			Satisfy all
27			</Location>
28