/[smeserver]/rpms/e-smith-manager/sme9/e-smith-manager-2.4.0-newTKTsyntax.patch
ViewVC logotype

Annotation of /rpms/e-smith-manager/sme9/e-smith-manager-2.4.0-newTKTsyntax.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.2 - (hide annotations) (download)
Mon Jun 13 15:12:07 2016 UTC (8 years, 5 months ago) by unnilennium
Branch: MAIN
CVS Tags: e-smith-manager-2_6_0-8_el6_sme, e-smith-manager-2_6_0-13_el6_sme, e-smith-manager-2_6_0-10_el6_sme, e-smith-manager-2_6_0-15_el6_sme, e-smith-manager-2_6_0-23_el6_sme, e-smith-manager-2_6_0-9_el6_sme, e-smith-manager-2_6_0-11_el6_sme, e-smith-manager-2_6_0-22_el6_sme, e-smith-manager-2_6_0-21_el6_sme, e-smith-manager-2_6_0-24_el6_sme, e-smith-manager-2_6_0-17_el6_sme, e-smith-manager-2_6_0-14_el6_sme, e-smith-manager-2_6_0-20_el6_sme, e-smith-manager-2_6_0-25_el6_sme, e-smith-manager-2_6_0-7_el6_sme, e-smith-manager-2_6_0-16_el6_sme, e-smith-manager-2_6_0-19_el6_sme, e-smith-manager-2_6_0-12_el6_sme, e-smith-manager-2_6_0-18_el6_sme, HEAD
Changes since 1.1: +1 -1 lines 
* Sun Jun 12 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
- fix 307 redirection to http when https is used [SME: 8825]
- update syntaxe for TKT Auth
- bump 7 for typo
1 unnilennium 1.1 diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access
2     --- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access 2007-01-26 20:51:30.000000000 -0500
3     +++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/e-smith/web/common/cgi-bin/AuthTKT.cfg/manager_access 2016-06-13 03:22:49.254000000 -0400
4     @@ -1,5 +1,6 @@
5     {
6     my $secret = ${'httpd-admin'}{TKTAuthSecret} || "34322500-7330-4400-423A-3A00434F5245";
7     $OUT .= "TKTAuthSecret $secret\n";
8     - $OUT .= "TKTAuthTimeoutMin 5";
9     + $OUT .= "TKTAuthTimeout 5m\n";
10     + $OUT .= "TKTAuthCookieExpires 5m";
11     }
12     diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common
13     --- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common 2014-03-23 22:15:04.000000000 -0400
14     +++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess15common 2016-06-13 03:17:30.372000000 -0400
15     @@ -28,6 +28,8 @@
16     AuthType basic
17    
18     TKTAuthLoginURL /server-common/cgi-bin/login
19     + TKTAuthTimeout 5m
20     + TKTAuthCookieExpires 5m
21     require valid-user
22     Satisfy all
23     </Directory>
24     diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager
25     --- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager 2014-03-23 22:15:04.000000000 -0400
26     +++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/90e-smithAccess20manager 2016-06-13 03:16:57.027000000 -0400
27     @@ -11,6 +11,8 @@
28     allow from { $localAccess }
29     AuthType Basic
30     TKTAuthLoginURL /server-common/cgi-bin/login
31     + TKTAuthTimeout 5m
32     + TKTAuthCookieExpires 5m
33    
34     require user admin
35     Satisfy all
36     @@ -24,6 +26,8 @@
37     allow from { $localAccess }
38     AuthType Basic
39     TKTAuthLoginURL /server-common/cgi-bin/login
40     + TKTAuthTimeout 5m
41     + TKTAuthCookieExpires 5m
42    
43     require user admin
44     Satisfy all
45     diff -Nur e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass
46     --- e-smith-manager-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass 2016-06-13 04:18:01.130000000 -0400
47     +++ e-smith-manager-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass 2016-06-13 04:23:46.597000000 -0400
48     @@ -14,6 +14,11 @@
49     $OUT .= ' RewriteCond %{REMOTE_ADDR} !^127\.0\.0\.1$' . "\n";
50     $OUT .= " RewriteRule ^/$place(/.*|\$) https://%{HTTP_HOST}/$place\$1 [L,R]\n";
51     }
52     + if ($port eq $sslPort)
53     + {
54     + # mod_auth_tkt needs to know the protocol to write 307 redirection
55 unnilennium 1.2 + $OUT .= " RequestHeader set X-Forwarded-Proto \"https\"\n";
56 unnilennium 1.1 + }
57     $OUT .= " ProxyPass /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place\n";
58     $OUT .= " ProxyPassReverse /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place\n";
59    
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed