espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue with Basic Authorization for cgi/fastcgi

Browse Source
This commit is contained in:
Taras Machyshyn
2014-07-01 17:41:26 +03:00
parent 0a2469aaa4
commit 30b246f67c
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.htaccess
+2
View File
@@ -4,5 +4,7 @@ RedirectMatch 403 \.config$
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine On RewriteEngine On
RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
RewriteRule reset/?$ reset.html [QSA,L] RewriteRule reset/?$ reset.html [QSA,L]
</IfModule> </IfModule>
api/v1/.htaccess
+2
View File
@@ -6,5 +6,7 @@ RewriteEngine On
# #
# RewriteBase / # RewriteBase /
RewriteRule .* - [E=HTTP_ESPO_CGI_AUTH:%{HTTP:Authorization}]
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [QSA,L] RewriteRule ^ index.php [QSA,L]
application/Espo/Core/Utils/Api/Auth.php
+6 -3
View File
@@ -51,9 +51,12 @@ class Auth extends \Slim\Middleware
$espoAuth = $req->headers('HTTP_ESPO_AUTHORIZATION'); $espoAuth = $req->headers('HTTP_ESPO_AUTHORIZATION');
if (isset($espoAuth)) { if (isset($espoAuth)) {
$credentials = explode(':', base64_decode($espoAuth)); list($authUsername, $authPassword) = explode(':', base64_decode($espoAuth));
$authUsername = $credentials[0]; }
$authPassword = $credentials[1];
$espoCgiAuth = $req->headers('HTTP_ESPO_CGI_AUTH');
if ( !isset($authUsername) && !isset($authPassword) && isset($espoCgiAuth) ) {
list($authUsername, $authPassword) = explode(':' , base64_decode(substr($espoCgiAuth, 6)));
} }
if (is_null($this->authRequired)) { if (is_null($this->authRequired)) {