Skip to content

Action should be optional #9

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

Open
lionzeye wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Action should be optional #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0621f50
Action is optional in evaluation
lionzeye Apr 11, 2017
0afd3db
Action is optional in authorization check
lionzeye 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
4 changes: 2 additions & 2 deletions src/Xacmlphp/Decider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function getSubjectAttributes()
*
* @return bool
*/
public function evaluate(Subject $subject, PolicySet $policySet, Action $action)
public function evaluate(Subject $subject, PolicySet $policySet, Action $action = null)
{
// get the subject's attributes
$this->setSubjectAttributes($subject->getAttributes());
Expand Down Expand Up @@ -147,4 +147,4 @@ public function handleMatches(array $matches)
}
return $results;
}
}
}
4 changes: 2 additions & 2 deletions src/Xacmlphp/Enforcer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function getDecider()
*
* @return bool Allowed/not allowed status
*/
public function isAuthorized(Subject $subject, Resource $resource, Action $action)
public function isAuthorized(Subject $subject, Resource $resource, Action $action = null)
{
$decider = $this->getDecider();
if ($decider === null) {
Expand All @@ -71,4 +71,4 @@ public function isAuthorized(Subject $subject, Resource $resource, Action $actio

return $decider->evaluate($subject, $policies, $action);
}
}
}