SH/PHP_SMART_HOME_V3
SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

auth fix

Browse Source
This commit is contained in:
xinatorus 2020-05-25 21:21:38 +02:00
parent 254a2cf97a
commit c961bc2c88
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.htaccess
View File

@ -5,7 +5,7 @@ RewriteCond %{HTTPS} off
RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
#token to HTTP_AUTHORIZATION #token to HTTP_AUTHORIZATION
RewriteCond %{HTTP:Authorization} ^(.) RewriteCond %{HTTP:Authorization} ^(.*)
RewriteRule . - [e=HTTP_AUTHORIZATION:%1] RewriteRule . - [e=HTTP_AUTHORIZATION:%1]
# serve all files from public subfolder # serve all files from public subfolder

5
app/models/managers/AuthManager.php
View File

@ -52,8 +52,9 @@ class AuthManager {
} }
public function validateToken($token){ public function validateToken($token){
$tokens = Db::loadAll('SELECT * FROM tokens WHERE token = ? AND expire >= CURRENT_TIMESTAMP AND blocked = 0;', array($token)); list($type, $hash) = explode(' ', $token);
if (count($tokens) == 1) { $tokens = Db::loadAll('SELECT * FROM tokens WHERE token = ? AND expire >= CURRENT_TIMESTAMP AND blocked = 0;', array($hash));
if ($type == 'Bearer' && count($tokens) == 1) {
return true; return true;
} else if (count($tokens) == 0) { } else if (count($tokens) == 0) {
return false; return false;

2
library/ApiController.php
View File

@ -20,7 +20,7 @@ class ApiController {
if (isset($_SERVER['HTTP_AUTHORIZATION'])) { if (isset($_SERVER['HTTP_AUTHORIZATION'])) {
// TODO: call appropriate class/method // TODO: call appropriate class/method
$authManager = new AuthManager(); $authManager = new AuthManager();
$this->authenticated = $authManager>validateToken($_SERVER['HTTP_AUTHORIZATION']); $this->authenticated = $authManager->validateToken($_SERVER['HTTP_AUTHORIZATION']);
if(!$this->authenticated){ if(!$this->authenticated){
throw new Exception("Authorization required", 401); throw new Exception("Authorization required", 401);
} }

4
public/.htaccess
View File

@ -7,6 +7,10 @@ RewriteCond %{REQUEST_FILENAME} !.css
RewriteCond %{REQUEST_FILENAME} !.js RewriteCond %{REQUEST_FILENAME} !.js
RewriteRule (.*) ./index.php?url=$1 [QSA,L] RewriteRule (.*) ./index.php?url=$1 [QSA,L]
#token to HTTP_AUTHORIZATION
RewriteCond %{HTTP:Authorization} ^(.*)
RewriteRule . - [e=HTTP_AUTHORIZATION:%1]
RewriteCond %{HTTPS} off RewriteCond %{HTTPS} off
RewriteCond %{REQUEST_FILENAME} !api.php RewriteCond %{REQUEST_FILENAME} !api.php
RewriteCond %{REQUEST_FILENAME} !apiFront.php RewriteCond %{REQUEST_FILENAME} !apiFront.php