Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WWSympa: Suppress verbose log on cookie #464

Merged
merged 3 commits into from
Nov 11, 2018
Merged

WWSympa: Suppress verbose log on cookie #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7904ad3
If cookie_domain is not set, "Does NOT match HTTP_HOST" is logged eve…
ikedas Nov 4, 2018
60c73d7
Small refactoring.
ikedas Nov 4, 2018
6de3eb8
typo.
ikedas Nov 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 8 additions & 26 deletions src/cgi/wwsympa.fcgi.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ our $session;
our $plugins;

my $robot;
my $cookie_domain;
my $ip;
my $rss;
my $ajax;
Expand Down Expand Up @@ -1043,6 +1044,7 @@ while ($query = CGI::Fast->new) {
undef $param;
undef $list;
undef $robot;
undef $cookie_domain;
undef $ip;
undef $rss;
undef $ajax;
Expand Down Expand Up @@ -1114,22 +1116,7 @@ while ($query = CGI::Fast->new) {

$ip = $ENV{'REMOTE_HOST'} || $ENV{'REMOTE_ADDR'} || 'undef';

# Determin cookie domain.
# In case HTTP_HOST does not match cookie_domain, use former.
# N.B. As of 6.2.15, the cookie domain will match with the host name
# locally detected by server. If remotely detected name should be differ,
# the proxy must adjust it.
my $cookie_domain = Conf::get_robot_conf($robot, 'cookie_domain');
my $http_host = Sympa::WWW::Tools::get_http_host() || '';
$http_host =~ s/:\d+$//; # Suppress port.
unless (substr($http_host, -length($cookie_domain)) eq lc $cookie_domain
or $cookie_domain eq 'localhost') {
wwslog('notice',
'(%s) Does NOT match HTTP_HOST; setting cookie_domain to %s',
$cookie_domain, $http_host);
$cookie_domain = $http_host;
}
$param->{'cookie_domain'} = $cookie_domain;
$cookie_domain = Sympa::WWW::Tools::get_cookie_domain($robot);

$log->{level} = Conf::get_robot_conf($robot, 'log_level');

Expand Down Expand Up @@ -1664,14 +1651,10 @@ while ($query = CGI::Fast->new) {
or $ajax) {
$session->renew unless $param->{'use_ssl'};

$session->set_cookie(
$param->{'cookie_domain'},
$param->{'user'}{'cookie_delay'},
$param->{'use_ssl'}
);
# Set/delete cookie for alt_emails.
$session->set_cookie_extern($param->{'cookie_domain'},
$session->set_cookie($cookie_domain, $param->{'user'}{'cookie_delay'},
$param->{'use_ssl'});
# Set/delete cookie for alt_emails.
$session->set_cookie_extern($cookie_domain, $param->{'use_ssl'});

if ($param->{'user'}{'email'}) {
$session->{'auth'} ||= 'classic';
Expand Down Expand Up @@ -3288,7 +3271,7 @@ sub _clean_referer {

# Allow referer within scope of cookie domain.
my $host = lc(URI->new($referer)->host);
my $mydom = lc($param->{'cookie_domain'} || 'localhost');
my $mydom = lc($cookie_domain || 'localhost');
if ($mydom eq 'localhost') {
my $myhost = Sympa::WWW::Tools::get_http_host() || '';
$myhost =~ s/:\d+\z//;
Expand Down Expand Up @@ -3924,8 +3907,7 @@ sub do_redirect {
sub _redirect {
my $redirect_to = shift;

$session->set_cookie($param->{'cookie_domain'},
'session', $param->{'use_ssl'});
$session->set_cookie($cookie_domain, 'session', $param->{'use_ssl'});
print "Status: 302 Moved\n";
print "Location: $redirect_to\n\n";
$param->{'bypass'} = 'extreme';
Expand Down
26 changes: 26 additions & 0 deletions src/lib/Sympa/WWW/Tools.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,32 @@ sub get_http_host {
return lc $host;
}

# Determin cookie domain.
sub get_cookie_domain {
my $robot = shift;

# In case HTTP_HOST does not match cookie_domain, use former.
# N.B. As of 6.2.15, the cookie domain will match with the host name
# locally detected by server. If remotely detected name should be differ,
# the proxy must adjust it.
my $cookie_domain = Conf::get_robot_conf($robot, 'cookie_domain');
my $http_host = Sympa::WWW::Tools::get_http_host() || '';
$http_host =~ s/:\d+\z//; # Suppress port.
my $dotdom = lc $cookie_domain;
$dotdom =~ s/\A(?![.])/./;

unless (substr($http_host, -length($dotdom)) eq $dotdom
or ".$http_host" eq $dotdom
or $cookie_domain eq 'localhost') {
$log->syslog('debug',
'(%s) Does NOT match HTTP_HOST; setting cookie_domain to %s',
$cookie_domain, $http_host);
return $http_host;
}

return $cookie_domain;
}

# Uploade source file to the destination on the server
# DEPRECATED. No longer used.
#sub upload_file_to_server;
Expand Down