Skip to content
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

Use SecurityInfo throughout instead of User directly (currently inconsistent) #10

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

Use SecurityInfo throughout instead of User directly (currently inconsistent) #10

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
9205280
use user SecurityInfo for permissions throughout (to aid with OnBehal…
formsoverdata Jan 17, 2012
e7a68a9
id instead of Id
formsoverdata Jan 17, 2012
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
2 changes: 1 addition & 1 deletion Rhino.Security/Services/AuthorizationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ private static ICriterion GetPermissionQueryInternal(IUser user, string operatio
.CreateAlias("entityGroup.Entities", "entityKey", JoinType.LeftOuterJoin)
.SetProjection(Projections.Property("Allow"))
.Add(Restrictions.In("op.Name", operationNames))
.Add(Restrictions.Eq("User", user)
.Add(Restrictions.Eq("User.id", user.SecurityInfo.Identifier)
|| Subqueries.PropertyIn("UsersGroup.Id",
SecurityCriterions.AllGroups(user).SetProjection(Projections.Id())))
.Add(
Expand Down
8 changes: 4 additions & 4 deletions Rhino.Security/Services/PermissionsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public PermissionsService(IAuthorizationRepository authorizationRepository,
public Permission[] GetPermissionsFor(IUser user)
{
DetachedCriteria criteria = DetachedCriteria.For<Permission>()
.Add(Expression.Eq("User", user)
.Add(Expression.Eq("User.id", user.SecurityInfo.Identifier)
|| Subqueries.PropertyIn("UsersGroup.Id",
SecurityCriterions.AllGroups(user).SetProjection(Projections.Id())));

Expand All @@ -58,7 +58,7 @@ public Permission[] GetGlobalPermissionsFor(IUser user, string operationName)
{
string[] operationNames = Strings.GetHierarchicalOperationNames(operationName);
DetachedCriteria criteria = DetachedCriteria.For<Permission>()
.Add(Expression.Eq("User", user)
.Add(Expression.Eq("User.id", user.SecurityInfo.Identifier)
|| Subqueries.PropertyIn("UsersGroup.Id",
SecurityCriterions.AllGroups(user).SetProjection(Projections.Id())))
.Add(Expression.IsNull("EntitiesGroup"))
Expand Down Expand Up @@ -97,7 +97,7 @@ public Permission[] GetPermissionsFor<TEntity>(IUser user, TEntity entity) where
EntitiesGroup[] entitiesGroups = authorizationRepository.GetAssociatedEntitiesGroupsFor(entity);

DetachedCriteria criteria = DetachedCriteria.For<Permission>()
.Add(Expression.Eq("User", user)
.Add(Expression.Eq("User.id", user.SecurityInfo.Identifier)
|| Subqueries.PropertyIn("UsersGroup.Id",
SecurityCriterions.AllGroups(user).SetProjection(Projections.Id())))
.Add(Expression.Eq("EntitySecurityKey", key) || Expression.In("EntitiesGroup", entitiesGroups));
Expand Down Expand Up @@ -125,7 +125,7 @@ public Permission[] GetPermissionsFor<TEntity>(IUser user, TEntity entity, strin
(Restrictions.Eq("EntitySecurityKey", key) || Restrictions.In("EntitiesGroup", entitiesGroups)) ||
(Restrictions.IsNull("EntitiesGroup") && Restrictions.IsNull("EntitySecurityKey"));
DetachedCriteria criteria = DetachedCriteria.For<Permission>()
.Add(Restrictions.Eq("User", user)
.Add(Restrictions.Eq("User.id", user.SecurityInfo.Identifier)
|| Subqueries.PropertyIn("UsersGroup.Id",
SecurityCriterions.AllGroups(user).SetProjection(Projections.Id())))
.Add(onCriteria)
Expand Down