/[smeserver]/rpms/e-smith-ibays/sme10/e-smith-ibays-2.6.0-bz8150-SSLproperty2SSLRequireSSL.patch
ViewVC logotype

Annotation of /rpms/e-smith-ibays/sme10/e-smith-ibays-2.6.0-bz8150-SSLproperty2SSLRequireSSL.patch

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


Revision 1.3 - (hide annotations) (download)
Wed Mar 10 06:00:27 2021 UTC (3 years, 7 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-ibays-2_6_0-17_el7_sme, e-smith-ibays-2_6_0-20_el7_sme, e-smith-ibays-2_6_0-18_el7_sme, e-smith-ibays-2_6_0-19_el7_sme, HEAD
Changes since 1.2: +19 -0 lines
* Wed Mar 10 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-17.sme
- fix patch for SSLRequireSSL [SME: 8150]

1 jpp 1.1 diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays
2     --- e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2021-03-08 15:10:26.507000000 -0500
3     +++ e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2021-03-09 18:20:58.028000000 -0500
4     @@ -93,7 +93,6 @@
5     my $followSymLinks = $properties{'FollowSymLinks'} || "disabled";
6     my $indexes = $properties{'Indexes'} || "enabled";
7     my $sslRequireSSL = $properties{'SSLRequireSSL'} || "disabled";
8     - my $ssldb = $properties{'SSL'} || 'disabled';
9    
10     $OUT .= "\n";
11     $OUT .= "#------------------------------------------------------------\n";
12     @@ -102,7 +101,7 @@
13    
14     $OUT .= "\n";
15     $OUT .= "<Directory /home/e-smith/files/ibays/$key/html>\n";
16     - if (($sslRequireSSL eq 'enabled') || ($ssldb eq 'enabled'))
17     + if ($sslRequireSSL eq 'enabled')
18     {
19     $OUT .=" SSLRequireSSL\n";
20     }
21     diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent
22     --- e-smith-ibays-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2021-03-08 15:10:26.500000000 -0500
23     +++ e-smith-ibays-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent 2021-03-09 18:20:57.789000000 -0500
24     @@ -10,7 +10,7 @@
25     my $ibay = $virtualHostContent;
26     my $basedir = "/home/e-smith/files/ibays/$ibay";
27     my $cgiBin = $accounts->get_prop($ibay, "CgiBin") || "";
28     - my $ssl_domain = $accounts->get_prop($ibay, "SSL") || "disabled";
29     + my $ssl_domain = $accounts->get_prop($ibay, "SSLRequireSSL") || "disabled";
30    
31     $OUT .= " DocumentRoot $basedir/html\n";
32    
33     @@ -51,7 +51,7 @@
34     $OUT .= " # $key ibay ($name)\n";
35     $OUT .= "\n";
36    
37     - if (( $port ne $httpsPort ) && (($ibay->prop('SSL') || 'disabled') eq 'enabled')){
38     + if (( $port ne $httpsPort ) && (($ibay->prop('SSLRequireSSL') || 'disabled') eq 'enabled')){
39     my $portspec = ($httpsPort eq 443) ? "" : ":$httpsPort";
40     $OUT .= " RewriteEngine on\n";
41     $OUT .= " RewriteRule ^/$key(/.*|\$) https://%{HTTP_HOST}${portspec}/$key\$1 \[L,R\]\n";
42     diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/web/functions/ibays e-smith-ibays-2.6.0/root/etc/e-smith/web/functions/ibays
43     --- e-smith-ibays-2.6.0.old/root/etc/e-smith/web/functions/ibays 2016-02-05 17:52:35.000000000 -0500
44     +++ e-smith-ibays-2.6.0/root/etc/e-smith/web/functions/ibays 2021-03-09 18:20:57.557000000 -0500
45     @@ -120,7 +120,7 @@
46     <field type="select" id="CgiBin" options="'disabled' => 'DISABLED', 'enabled' => 'ENABLED'">
47     <label>ALLOW_DYNAMIC_CONTENT</label>
48     </field>
49     - <field type="select" id="SSL" options="'disabled' => 'DISABLED', 'enabled' => 'ENABLED'">
50     + <field type="select" id="SSLRequireSSL" options="'disabled' => 'DISABLED', 'enabled' => 'ENABLED'">
51     <label>HTTPS_Only</label>
52     </field>
53     <subroutine src="print_save_or_add_button()" />
54     diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm e-smith-ibays-2.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm
55     --- e-smith-ibays-2.6.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm 2016-02-05 17:52:35.000000000 -0500
56     +++ e-smith-ibays-2.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/ibays.pm 2021-03-09 18:20:57.342000000 -0500
57     @@ -248,8 +248,8 @@
58     $rec->prop('PublicAccess'));
59     $q->param(-name=>'CgiBin',-value=>
60     $rec->prop('CgiBin'));
61     - $q->param(-name=>'SSL',-value=>
62     - $rec->prop('SSL'));
63     + $q->param(-name=>'SSLRequireSSL',-value=>
64     + $rec->prop('SSLRequireSSL'));
65     }
66     } else {
67     print qq(
68     @@ -510,16 +510,16 @@
69    
70     my $uid = $accountdb->get_next_uid();
71     if (my $acct = $accountdb->new_record($name, {
72     - Name => $self->cgi->param('description'),
73     - CgiBin => $self->cgi->param('CgiBin'),
74     - Group => $self->cgi->param('group'),
75     - PublicAccess => $self->cgi->param('publicAccess'),
76     - SSL => $self->cgi->param('SSL'),
77     - UserAccess => $self->cgi->param('userAccess'),
78     - Uid => $uid,
79     - Gid => $uid,
80     - PasswordSet => 'no',
81     - type => 'ibay',
82     + Name => $self->cgi->param('description'),
83     + CgiBin => $self->cgi->param('CgiBin'),
84     + Group => $self->cgi->param('group'),
85     + PublicAccess => $self->cgi->param('publicAccess'),
86     + SSLRequireSSL => $self->cgi->param('SSLRequireSSL'),
87     + UserAccess => $self->cgi->param('userAccess'),
88     + Uid => $uid,
89     + Gid => $uid,
90     + PasswordSet => 'no',
91     + type => 'ibay',
92     }) )
93     {
94     # Untaint $name before use in system()
95     @@ -540,12 +540,12 @@
96     if (my $acct = $accountdb->get($name)) {
97     if ($acct->prop('type') eq 'ibay') {
98     $acct->merge_props(
99     - Name => $self->cgi->param('description'),
100     - CgiBin => $self->cgi->param('CgiBin'),
101     - Group => $self->cgi->param('group'),
102     - PublicAccess => $self->cgi->param('publicAccess'),
103     - SSL => $self->cgi->param('SSL'),
104     - UserAccess => $self->cgi->param('userAccess'),
105     + Name => $self->cgi->param('description'),
106     + CgiBin => $self->cgi->param('CgiBin'),
107     + Group => $self->cgi->param('group'),
108     + PublicAccess => $self->cgi->param('publicAccess'),
109     + SSLRequireSSL => $self->cgi->param('SSLRequireSSL'),
110     + UserAccess => $self->cgi->param('userAccess'),
111     );
112    
113     # Untaint $name before use in system()
114 jpp 1.3 diff -Nur --no-dereference e-smith-ibays-2.6.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-accounts e-smith-ibays-2.6.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts
115     --- e-smith-ibays-2.6.0.old/root/etc/e-smith/db/accounts/migrate/20ibay-accounts 2016-02-05 17:52:36.000000000 -0500
116     +++ e-smith-ibays-2.6.0/root/etc/e-smith/db/accounts/migrate/20ibay-accounts 2021-03-10 00:58:57.504000000 -0500
117     @@ -4,5 +4,15 @@
118     # SME9 introduced SSLRequireSSL with enabled/disabled.
119     # This replaces local customisation, so migrate 'on' to 'enabled'
120     $ibay->set_prop ('SSLRequireSSL', 'enabled') if (($ibay->prop ('SSLRequireSSL') || '') eq 'on');
121     +
122     + # SME10 merge SSL property (setting to redirect to https) with SSLRequireSSL (setting to force SSL in a directory)
123     + # while they have two different purpose, most admin will want to protect one directory with SSL and ease access to their
124     + # client to gently redirect them to https, hence the merge.
125     + my $SSL = $DB->get_prop_and_delete($ibay->key, 'SSL') || 'disabled';
126     +
127     + # if SSL is enabled or SSLRequireSSL is enabled we want the new one enabled
128     + # default remains empty for disabled for the moment
129     + $ibay->set_prop('SSLRequireSSL','enabled') if ($SSL eq 'enabled');
130     +
131     }
132     }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed