* [PATCH v2 1/2] mail.cgi: add support for implicit TLS usage @ 2020-02-03 18:35 Peter Müller 2020-02-03 18:35 ` [PATCH v2 2/2] update language files for mail.cgi changes Peter Müller 2020-02-04 10:22 ` [PATCH v2 1/2] mail.cgi: add support for implicit TLS usage Michael Tremer 0 siblings, 2 replies; 4+ messages in thread From: Peter Müller @ 2020-02-03 18:35 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 3321 bytes --] The second version of this patchset fixes reading empty configuration files and superseds the first version (duh!). Fixes #12161 Reported-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- html/cgi-bin/mail.cgi | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi index 25589046e..7865a1da6 100755 --- a/html/cgi-bin/mail.cgi +++ b/html/cgi-bin/mail.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team <alexander.marx(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -110,8 +110,8 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ #SaveButton on configsite $dma{'SMARTHOST'} = $cgiparams{'txt_mailserver'}; $dma{'PORT'} = $cgiparams{'txt_mailport'}; - $dma{'STARTTLS'} = '' if ($cgiparams{'mail_tls'}); - $dma{'SECURETRANSFER'} = '' if exists $dma{'STARTTLS'}; + $dma{'STARTTLS'} = '' if ($cgiparams{'mail_tls'} eq 'explicit'); + $dma{'SECURETRANSFER'} = '' if ($cgiparams{'mail_tls'} eq 'explicit' || $cgiparams{'mail_tls'} eq 'implicit'); $dma{'SPOOLDIR'} = "/var/spool/dma"; $dma{'FULLBOUNCE'} = ''; $dma{'MAILNAME'} = "$mainsettings{'HOSTNAME'}.$mainsettings{DOMAINNAME}"; @@ -140,8 +140,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'email testmail'}"){ #Testmail button on #FUNCTIONS sub configsite{ - - #If update set fieldvalues new if($cgiparams{'update'} eq 'on'){ $mail{'USEMAIL'} = 'on'; @@ -156,7 +154,9 @@ sub configsite{ } #find preselections $checked{'usemail'}{$mail{'USEMAIL'}} = 'CHECKED'; - $checked{'mail_tls'}{'on'} = 'CHECKED' if exists $dma{'STARTTLS'}; + $selected{'mail_tls'}{'explicit'} = 'selected' if exists $dma{'STARTTLS'}; + $selected{'mail_tls'}{'implicit'} = 'selected' if (exists $dma{'SECURETRANSFER'}) and (not exists $dma{'STARTTLS'}); + $selected{'mail_tls'}{'disabled'} = 'selected' if (not exists $dma{'SECURETRANSFER'}) and (not exists $dma{'STARTTLS'}); #Open site &Header::openpage($Lang::tr{'email settings'}, 1, ''); @@ -226,7 +226,13 @@ END </tr> <tr> <td>$Lang::tr{'email tls'}</td> - <td><input type='checkbox' name='mail_tls' $checked{'mail_tls'}{'on'}></td> + <td> + <select name='mail_tls'> + <option value='implicit' $selected{'mail_tls'}{'implicit'}>$Lang::tr{'email tls implicit'}</option> + <option value='explicit' $selected{'mail_tls'}{'explicit'}>$Lang::tr{'email tls explicit'}</option> + <option value='disabled' $selected{'mail_tls'}{'disabled'}>$Lang::tr{'disabled'}</option> + </select> + </td> </tr> END if (! -z $dmafile && $mail{'USEMAIL'} eq 'on' && !$errormessage){ -- 2.16.4 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] update language files for mail.cgi changes 2020-02-03 18:35 [PATCH v2 1/2] mail.cgi: add support for implicit TLS usage Peter Müller @ 2020-02-03 18:35 ` Peter Müller 2020-02-04 10:22 ` Michael Tremer 2020-02-04 10:22 ` [PATCH v2 1/2] mail.cgi: add support for implicit TLS usage Michael Tremer 1 sibling, 1 reply; 4+ messages in thread From: Peter Müller @ 2020-02-03 18:35 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 1558 bytes --] Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- langs/de/cgi-bin/de.pl | 6 ++++-- langs/en/cgi-bin/en.pl | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 80579e7cc..2ef7b673b 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -933,8 +933,10 @@ 'email subject' => 'IPFire Test-E-Mail', 'email success' => 'Test-E-Mail erfolgreich versendet', 'email testmail' => 'Testnachricht senden', -'email text' => 'Testnachricht vom IPFire Mailversand.', -'email tls' => 'TLS aktivieren', +'email text' => 'Testnachricht vom IPFire-Mailversandsystem.', +'email tls' => 'Transportverschlüsselungsmodus', +'email tls explicit' => 'explizit (STARTTLS)', +'email tls implicit' => 'implizit (TLS)', 'email usemail' => 'Mailversand aktivieren', 'emailreportlevel' => 'E-Mail-Reportlevel', 'empty' => 'Dieses Feld kann leer bleiben', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 1f81108f1..24790d689 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -975,7 +975,9 @@ 'email success' => 'Test message successfully sent', 'email testmail' => 'Send test mail', 'email text' => 'Test mail from IPFire Mail Service', -'email tls' => 'Use TLS', +'email tls' => 'TLS mode', +'email tls explicit' => 'explicit (STARTTLS)', +'email tls implicit' => 'implicit (TLS)', 'email usemail' => 'Activate Mail Service', 'emailreportlevel' => 'E-mailreportlevel', 'emerging pro rules' => 'Emergingthreats.net Pro Rules', -- 2.16.4 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] update language files for mail.cgi changes 2020-02-03 18:35 ` [PATCH v2 2/2] update language files for mail.cgi changes Peter Müller @ 2020-02-04 10:22 ` Michael Tremer 0 siblings, 0 replies; 4+ messages in thread From: Michael Tremer @ 2020-02-04 10:22 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 1763 bytes --] Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> > On 3 Feb 2020, at 18:35, Peter Müller <peter.mueller(a)ipfire.org> wrote: > > Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> > --- > langs/de/cgi-bin/de.pl | 6 ++++-- > langs/en/cgi-bin/en.pl | 4 +++- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl > index 80579e7cc..2ef7b673b 100644 > --- a/langs/de/cgi-bin/de.pl > +++ b/langs/de/cgi-bin/de.pl > @@ -933,8 +933,10 @@ > 'email subject' => 'IPFire Test-E-Mail', > 'email success' => 'Test-E-Mail erfolgreich versendet', > 'email testmail' => 'Testnachricht senden', > -'email text' => 'Testnachricht vom IPFire Mailversand.', > -'email tls' => 'TLS aktivieren', > +'email text' => 'Testnachricht vom IPFire-Mailversandsystem.', > +'email tls' => 'Transportverschlüsselungsmodus', > +'email tls explicit' => 'explizit (STARTTLS)', > +'email tls implicit' => 'implizit (TLS)', > 'email usemail' => 'Mailversand aktivieren', > 'emailreportlevel' => 'E-Mail-Reportlevel', > 'empty' => 'Dieses Feld kann leer bleiben', > diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl > index 1f81108f1..24790d689 100644 > --- a/langs/en/cgi-bin/en.pl > +++ b/langs/en/cgi-bin/en.pl > @@ -975,7 +975,9 @@ > 'email success' => 'Test message successfully sent', > 'email testmail' => 'Send test mail', > 'email text' => 'Test mail from IPFire Mail Service', > -'email tls' => 'Use TLS', > +'email tls' => 'TLS mode', > +'email tls explicit' => 'explicit (STARTTLS)', > +'email tls implicit' => 'implicit (TLS)', > 'email usemail' => 'Activate Mail Service', > 'emailreportlevel' => 'E-mailreportlevel', > 'emerging pro rules' => 'Emergingthreats.net Pro Rules', > -- > 2.16.4 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] mail.cgi: add support for implicit TLS usage 2020-02-03 18:35 [PATCH v2 1/2] mail.cgi: add support for implicit TLS usage Peter Müller 2020-02-03 18:35 ` [PATCH v2 2/2] update language files for mail.cgi changes Peter Müller @ 2020-02-04 10:22 ` Michael Tremer 1 sibling, 0 replies; 4+ messages in thread From: Michael Tremer @ 2020-02-04 10:22 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 3644 bytes --] Hello Peter, This works now. Thank you very much. -Michael Tested-by: Michael Tremer <michael.tremer(a)ipfire.org> > On 3 Feb 2020, at 18:35, Peter Müller <peter.mueller(a)ipfire.org> wrote: > > The second version of this patchset fixes reading empty configuration > files and superseds the first version (duh!). > > Fixes #12161 > > Reported-by: Michael Tremer <michael.tremer(a)ipfire.org> > Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> > --- > html/cgi-bin/mail.cgi | 20 +++++++++++++------- > 1 file changed, 13 insertions(+), 7 deletions(-) > > diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi > index 25589046e..7865a1da6 100755 > --- a/html/cgi-bin/mail.cgi > +++ b/html/cgi-bin/mail.cgi > @@ -2,7 +2,7 @@ > ############################################################################### > # # > # IPFire.org - A linux based firewall # > -# Copyright (C) 2015 IPFire Team <alexander.marx(a)ipfire.org> # > +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # > # # > # This program is free software: you can redistribute it and/or modify # > # it under the terms of the GNU General Public License as published by # > @@ -110,8 +110,8 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ #SaveButton on configsite > > $dma{'SMARTHOST'} = $cgiparams{'txt_mailserver'}; > $dma{'PORT'} = $cgiparams{'txt_mailport'}; > - $dma{'STARTTLS'} = '' if ($cgiparams{'mail_tls'}); > - $dma{'SECURETRANSFER'} = '' if exists $dma{'STARTTLS'}; > + $dma{'STARTTLS'} = '' if ($cgiparams{'mail_tls'} eq 'explicit'); > + $dma{'SECURETRANSFER'} = '' if ($cgiparams{'mail_tls'} eq 'explicit' || $cgiparams{'mail_tls'} eq 'implicit'); > $dma{'SPOOLDIR'} = "/var/spool/dma"; > $dma{'FULLBOUNCE'} = ''; > $dma{'MAILNAME'} = "$mainsettings{'HOSTNAME'}.$mainsettings{DOMAINNAME}"; > @@ -140,8 +140,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'email testmail'}"){ #Testmail button on > > #FUNCTIONS > sub configsite{ > - > - > #If update set fieldvalues new > if($cgiparams{'update'} eq 'on'){ > $mail{'USEMAIL'} = 'on'; > @@ -156,7 +154,9 @@ sub configsite{ > } > #find preselections > $checked{'usemail'}{$mail{'USEMAIL'}} = 'CHECKED'; > - $checked{'mail_tls'}{'on'} = 'CHECKED' if exists $dma{'STARTTLS'}; > + $selected{'mail_tls'}{'explicit'} = 'selected' if exists $dma{'STARTTLS'}; > + $selected{'mail_tls'}{'implicit'} = 'selected' if (exists $dma{'SECURETRANSFER'}) and (not exists $dma{'STARTTLS'}); > + $selected{'mail_tls'}{'disabled'} = 'selected' if (not exists $dma{'SECURETRANSFER'}) and (not exists $dma{'STARTTLS'}); > > #Open site > &Header::openpage($Lang::tr{'email settings'}, 1, ''); > @@ -226,7 +226,13 @@ END > </tr> > <tr> > <td>$Lang::tr{'email tls'}</td> > - <td><input type='checkbox' name='mail_tls' $checked{'mail_tls'}{'on'}></td> > + <td> > + <select name='mail_tls'> > + <option value='implicit' $selected{'mail_tls'}{'implicit'}>$Lang::tr{'email tls implicit'}</option> > + <option value='explicit' $selected{'mail_tls'}{'explicit'}>$Lang::tr{'email tls explicit'}</option> > + <option value='disabled' $selected{'mail_tls'}{'disabled'}>$Lang::tr{'disabled'}</option> > + </select> > + </td> > </tr> > END > if (! -z $dmafile && $mail{'USEMAIL'} eq 'on' && !$errormessage){ > -- > 2.16.4 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-04 10:22 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-02-03 18:35 [PATCH v2 1/2] mail.cgi: add support for implicit TLS usage Peter Müller 2020-02-03 18:35 ` [PATCH v2 2/2] update language files for mail.cgi changes Peter Müller 2020-02-04 10:22 ` Michael Tremer 2020-02-04 10:22 ` [PATCH v2 1/2] mail.cgi: add support for implicit TLS usage Michael Tremer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox