Skip to content

WIP:Access token anon #990

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

Closed
alvar0hurtad0 wants to merge 4 commits into from
Closed

WIP:Access token anon #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05d55c8
Prevent access token for anonymous users
amitaibu Apr 6, 2017
4598cde
Log-in user if needed
alvar0hurtad0 Apr 10, 2017
911f785
More explanatory feedback messages on tests.
alvar0hurtad0 Apr 11, 2017
41daaea
Revert previous commit
alvar0hurtad0 Apr 11, 2017
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
7 changes: 7 additions & 0 deletions ...restful_token_auth/token_auth/access_token/1.0/RestfulAccessTokenAuthentication.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ public static function controllersInfo() {
public function getOrCreateToken() {
$entity_type = $this->getEntityType();
$account = $this->getAccount();

if (!$account->uid) {
// If this handler was called programmatically we want to make sure the
// account is of an authenticated user.
throw new RestfulBadRequestException('Only authenticated users can have an access token.');
}

// Check if there is a token that did not expire yet.
$query = new EntityFieldQuery();
$result = $query
Expand Down
11 changes: 8 additions & 3 deletions tests/RestfulCsrfTokenTestCase.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ class RestfulCsrfTokenTestCase extends RestfulCurlBaseTestCase {
'edit any article content',
'delete any article content',
);
$account = $this->drupalCreateUser($permissions);
$this->drupalLogin($account);
$user = $account;
$this->account = $this->drupalCreateUser($permissions);
$user = $this->account;

// Check CSRF is not checked for read operations.
$this->checkCsrfRequest(array(\RestfulInterface::GET), FALSE);
Expand Down Expand Up @@ -74,6 +73,7 @@ class RestfulCsrfTokenTestCase extends RestfulCurlBaseTestCase {
\RestfulInterface::PATCH,
\RestfulInterface::DELETE
);

$this->checkCsrfRequest($write_operations, FALSE, FALSE);
}

Expand All @@ -89,6 +89,11 @@ class RestfulCsrfTokenTestCase extends RestfulCurlBaseTestCase {
* Determine if a user should be created and logged in. Defaults to TRUE.
*/
protected function checkCsrfRequest($methods = array(), $csrf_required, $auth_user = TRUE) {
// Log-in user if needed.
if ($auth_user) {
$this->drupalLogin($this->account);
}

$params['@role'] = $auth_user ? 'authenticated' : 'anonymous';

foreach ($methods as $method) {
Expand Down