nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-24 02:24:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RFC compliant CGI AUTH_TYPE usage

Browse Source 
* Handle the content of the CGI AUTH_TYPE variable case-insensitively as defined
  by RFC 3875 Section 4.1.1.
This commit is contained in:
Christoph Anton Mitterer 2013-03-23 03:31:11 +01:00
parent e701961cf4
commit 2b68d1130f
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-03-23 Christoph Anton Mitterer <mail@christoph.anton.mitterer.name>
* Handle the content of the CGI AUTH_TYPE variable case-insensitively as
defined by RFC 3875 Section 4.1.1.
2013-03-21 Christoph Anton Mitterer <mail@christoph.anton.mitterer.name> 2013-03-21 Christoph Anton Mitterer <mail@christoph.anton.mitterer.name>
* Changed the pathnames of the debug files to be a bit more FHS * Changed the pathnames of the debug files to be a bit more FHS
compliant. compliant.

2
debian/changelog vendored
View File

@ -1,6 +1,6 @@
davical (1.1.2-1) unstable; urgency=low davical (1.1.2-1) unstable; urgency=low
* New upstream release (closes:#702403, #703290, #703387) * New upstream release (closes:#702403, #703290, #703383, #703387)
* Updated the control file Vcs-* fields to the new addresses of the * Updated the control file Vcs-* fields to the new addresses of the
canonical git upstream repository. canonical git upstream repository.

4
inc/HTTPAuthSession.php
View File

@ -114,10 +114,10 @@ class HTTPAuthSession {
else if ( isset($c->authenticate_hook['server_auth_type']) else if ( isset($c->authenticate_hook['server_auth_type'])
&& isset($_SERVER['REMOTE_USER']) && !empty($_SERVER['REMOTE_USER'])) { && isset($_SERVER['REMOTE_USER']) && !empty($_SERVER['REMOTE_USER'])) {
if ( ( is_array($c->authenticate_hook['server_auth_type']) if ( ( is_array($c->authenticate_hook['server_auth_type'])
&& in_array($_SERVER['AUTH_TYPE'], $c->authenticate_hook['server_auth_type']) ) && in_array( strtolower($_SERVER['AUTH_TYPE']), array_map('strtolower', $c->authenticate_hook['server_auth_type'])) )
|| ||
( !is_array($c->authenticate_hook['server_auth_type']) ( !is_array($c->authenticate_hook['server_auth_type'])
&& $c->authenticate_hook['server_auth_type'] == $_SERVER['AUTH_TYPE'] ) && strtolower($c->authenticate_hook['server_auth_type']) == strtolower($_SERVER['AUTH_TYPE']) )
) { ) {
/** /**
* The authentication has happened in the server, and we should accept it. * The authentication has happened in the server, and we should accept it.