1 |
unnilennium |
1.1 |
--- e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20ManagerAuthTKT 2007-01-27 02:51:30.000000000 +0100 |
2 |
|
|
+++ e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/20ManagerAuthTKT 2017-03-01 05:32:48.000000000 +0100 |
3 |
|
|
@@ -3,4 +3,5 @@ |
4 |
|
|
|
5 |
|
|
my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245"; |
6 |
|
|
$OUT .= "TKTAuthSecret \"$secret\"\n"; |
7 |
|
|
+ $OUT .= "TKTAuthDigestType SHA256\n"; |
8 |
|
|
} |
9 |
|
|
--- e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common 2017-01-23 17:52:35.000000000 +0100 |
10 |
|
|
+++ e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common 2017-03-26 05:02:57.000000000 +0200 |
11 |
|
|
@@ -32,8 +32,15 @@ |
12 |
|
|
AuthType basic |
13 |
|
|
|
14 |
|
|
TKTAuthLoginURL /server-common/cgi-bin/login |
15 |
|
|
- TKTAuthTimeout 5m |
16 |
|
|
- TKTAuthCookieExpires 5m |
17 |
|
|
+{ |
18 |
|
|
+ my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} || "30m"; |
19 |
|
|
+ $OUT = " TKTAuthTimeout $ManagerTimeout\n"; |
20 |
|
|
+ my $Cookie = ${'httpd-admin'}{Cookie} || "disabled"; |
21 |
|
|
+ $OUT .= " TKTAuthCookieExpires $ManagerTimeout\n" if "$Cookie" eq "enabled"; |
22 |
|
|
+ my $ManagerTimeoutReset = ${'httpd-admin'}{ManagerTimeoutReset} || "0.66"; |
23 |
|
|
+ $OUT .= " TKTAuthTimeoutRefresh $ManagerTimeoutReset\n"; |
24 |
|
|
+} |
25 |
|
|
+ TKTAuthUnauthURL /server-common/cgi-bin/logout |
26 |
|
|
require valid-user |
27 |
|
|
Satisfy all |
28 |
|
|
</Directory> |
29 |
|
|
--- e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager 2017-03-01 03:38:10.000000000 +0100 |
30 |
|
|
+++ e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager 2017-03-26 05:03:08.000000000 +0200 |
31 |
|
|
@@ -11,9 +11,13 @@ |
32 |
|
|
allow from { $localAccess } |
33 |
|
|
AuthType Basic |
34 |
|
|
TKTAuthLoginURL /server-common/cgi-bin/login |
35 |
|
|
- TKTAuthTimeout 5m |
36 |
|
|
- TKTAuthCookieExpires 5m |
37 |
|
|
- |
38 |
|
|
+{ |
39 |
|
|
+ my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} || "30m"; |
40 |
|
|
+ $OUT = " TKTAuthTimeout $ManagerTimeout\n"; |
41 |
|
|
+# $OUT .= " TKTAuthCookieExpires $ManagerTimeout"; |
42 |
|
|
+} |
43 |
|
|
+ TKTAuthTimeoutRefresh 0.66 |
44 |
|
|
+ TKTAuthUnauthURL /server-common/cgi-bin/logout |
45 |
|
|
require user admin |
46 |
|
|
Satisfy all |
47 |
|
|
</Directory> |
48 |
|
|
@@ -26,9 +30,15 @@ |
49 |
|
|
allow from { $localAccess } |
50 |
|
|
AuthType Basic |
51 |
|
|
TKTAuthLoginURL /server-common/cgi-bin/login |
52 |
|
|
- TKTAuthTimeout 5m |
53 |
|
|
- TKTAuthCookieExpires 5m |
54 |
|
|
- |
55 |
|
|
+{ |
56 |
|
|
+ my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} || "30m"; |
57 |
|
|
+ $OUT = " TKTAuthTimeout $ManagerTimeout\n"; |
58 |
|
|
+ my $Cookie = ${'httpd-admin'}{Cookie} || "disabled"; |
59 |
|
|
+ $OUT .= " TKTAuthCookieExpires $ManagerTimeout\n" if "$Cookie" eq "enabled"; |
60 |
|
|
+ my $ManagerTimeoutReset = ${'httpd-admin'}{ManagerTimeoutReset} || "0.66"; |
61 |
|
|
+ $OUT .= " TKTAuthTimeoutRefresh $ManagerTimeoutReset\n"; |
62 |
|
|
+} |
63 |
|
|
+ TKTAuthUnauthURL /server-common/cgi-bin/logout |
64 |
|
|
require user admin |
65 |
|
|
Satisfy all |
66 |
|
|
</Directory> |
67 |
|
|
--- e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access 2017-01-23 17:52:35.000000000 +0100 |
68 |
|
|
+++ e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access 2017-03-26 05:15:52.000000000 +0200 |
69 |
|
|
@@ -1,6 +1,9 @@ |
70 |
|
|
{ |
71 |
|
|
my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245"; |
72 |
|
|
+ my $ManagerTimeout = ${'httpd-admin'}{ManagerTimeout} || "30m"; |
73 |
|
|
$OUT .= "TKTAuthSecret $secret\n"; |
74 |
|
|
- $OUT .= "TKTAuthTimeout 5m\n"; |
75 |
|
|
- $OUT .= "TKTAuthCookieExpires 5m"; |
76 |
|
|
+ $OUT .= "TKTAuthTimeout $ManagerTimeout\n"; |
77 |
|
|
+ my $Cookie = ${'httpd-admin'}{Cookie} || "disabled"; |
78 |
|
|
+ $OUT .= "TKTAuthCookieExpires $ManagerTimeout\n" if "$Cookie" eq "enabled"; |
79 |
|
|
+ $OUT .= "TKTAuthDigestType SHA256"; |
80 |
|
|
} |