clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13614 from HankG/oauth-redirect-fix 

Fix OAuth Redirect Url Scrubbing
This commit is contained in:
Hypolite Petovan 2023-11-06 10:12:55 -08:00 committed by GitHub
parent 89e105afbe 4ae78e7ed6
commit 9d93eaf810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Module/OAuth/Token.php
View File

@ -90,10 +90,10 @@ class Token extends BaseApi
$me = null; $me = null;
} elseif ($request['grant_type'] == 'authorization_code') { } elseif ($request['grant_type'] == 'authorization_code') {
// For security reasons only allow freshly created tokens // For security reasons only allow freshly created tokens
$uri = new Uri($request['redirect_uri']); $redirect_uri = strtok($request['redirect_uri'],'?');
$condition = [ $condition = [
"`redirect_uri` LIKE ? AND `id` = ? AND `code` = ? AND `created_at` > ?", "`redirect_uri` LIKE ? AND `id` = ? AND `code` = ? AND `created_at` > ?",
'%' . $uri->getScheme() . '://' . $uri->getHost() . $uri->getPath() . '%', $application['id'], $request['code'], DateTimeFormat::utc('now - 5 minutes') $redirect_uri, $application['id'], $request['code'], DateTimeFormat::utc('now - 5 minutes')
]; ];
$token = DBA::selectFirst('application-view', ['access_token', 'created_at', 'uid'], $condition); $token = DBA::selectFirst('application-view', ['access_token', 'created_at', 'uid'], $condition);

3
src/Security/OAuth.php
View File

@ -131,8 +131,7 @@ class OAuth
} }
if (!empty($redirect_uri)) { if (!empty($redirect_uri)) {
$uri = new Uri($redirect_uri); $redirect_uri = strtok($redirect_uri, '?');
$redirect_uri = $uri->getScheme() . '://' . $uri->getHost() . $uri->getPath();
$condition = DBA::mergeConditions($condition, ["`redirect_uri` LIKE ?", '%' . $redirect_uri . '%']); $condition = DBA::mergeConditions($condition, ["`redirect_uri` LIKE ?", '%' . $redirect_uri . '%']);
} }