nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

fix ef query joins (#2386)

Browse Source
This commit is contained in:
Kyle Spearrin 2022-11-07 12:08:30 -05:00 committed by GitHub
parent 8a6f780d55
commit 3e092be55c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 85 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Infrastructure.EntityFramework/Repositories/Queries/CipherReadCanEditByIdUserIdQuery.cs
View File

@ -17,37 +17,50 @@ public class CipherReadCanEditByIdUserIdQuery : IQuery<Cipher>
public virtual IQueryable<Cipher> Run(DatabaseContext dbContext) public virtual IQueryable<Cipher> Run(DatabaseContext dbContext)
{ {
var query = from c in dbContext.Ciphers var query = from c in dbContext.Ciphers
join o in dbContext.Organizations join o in dbContext.Organizations
on c.OrganizationId equals o.Id into o_g on new { c.UserId, c.OrganizationId } equals
new { UserId = (Guid?)null, OrganizationId = (Guid?)o.Id } into o_g
from o in o_g.DefaultIfEmpty() from o in o_g.DefaultIfEmpty()
where !c.UserId.HasValue
join ou in dbContext.OrganizationUsers join ou in dbContext.OrganizationUsers
on o.Id equals ou.OrganizationId into ou_g on new { OrganizationId = o.Id, UserId = (Guid?)_userId } equals
new { ou.OrganizationId, ou.UserId } into ou_g
from ou in ou_g.DefaultIfEmpty() from ou in ou_g.DefaultIfEmpty()
where ou.UserId == _userId
join cc in dbContext.CollectionCiphers join cc in dbContext.CollectionCiphers
on c.Id equals cc.CipherId into cc_g on new { c.UserId, ou.AccessAll, CipherId = c.Id } equals
new { UserId = (Guid?)null, AccessAll = false, cc.CipherId } into cc_g
from cc in cc_g.DefaultIfEmpty() from cc in cc_g.DefaultIfEmpty()
where !c.UserId.HasValue && !ou.AccessAll
join cu in dbContext.CollectionUsers join cu in dbContext.CollectionUsers
on cc.CollectionId equals cu.CollectionId into cu_g on new { cc.CollectionId, OrganizationUserId = ou.Id } equals
new { cu.CollectionId, cu.OrganizationUserId } into cu_g
from cu in cu_g.DefaultIfEmpty() from cu in cu_g.DefaultIfEmpty()
where ou.Id == cu.OrganizationUserId
join gu in dbContext.GroupUsers join gu in dbContext.GroupUsers
on ou.Id equals gu.OrganizationUserId into gu_g on new { c.UserId, CollectionId = (Guid?)cu.CollectionId, ou.AccessAll, OrganizationUserId = ou.Id } equals
new { UserId = (Guid?)null, CollectionId = (Guid?)null, AccessAll = false, gu.OrganizationUserId } into gu_g
from gu in gu_g.DefaultIfEmpty() from gu in gu_g.DefaultIfEmpty()
where !c.UserId.HasValue && cu.CollectionId == null && !ou.AccessAll
join g in dbContext.Groups join g in dbContext.Groups
on gu.GroupId equals g.Id into g_g on gu.GroupId equals g.Id into g_g
from g in g_g.DefaultIfEmpty() from g in g_g.DefaultIfEmpty()
join cg in dbContext.CollectionGroups join cg in dbContext.CollectionGroups
on gu.GroupId equals cg.GroupId into cg_g on new { g.AccessAll, cc.CollectionId, gu.GroupId } equals
new { AccessAll = false, cg.CollectionId, cg.GroupId } into cg_g
from cg in cg_g.DefaultIfEmpty() from cg in cg_g.DefaultIfEmpty()
where !g.AccessAll && cg.CollectionId == cc.CollectionId &&
(c.Id == _cipherId && where
(c.UserId == _userId || c.Id == _cipherId &&
(!c.UserId.HasValue && ou.Status == OrganizationUserStatusType.Confirmed && o.Enabled && (
(ou.AccessAll || cu.CollectionId != null || g.AccessAll || cg.CollectionId != null)))) && c.UserId == _userId ||
(
!c.UserId.HasValue && ou.Status == OrganizationUserStatusType.Confirmed && o.Enabled &&
(ou.AccessAll || cu.CollectionId != null || g.AccessAll || cg.CollectionId != null)
)
) &&
(c.UserId.HasValue || ou.AccessAll || !cu.ReadOnly || g.AccessAll || !cg.ReadOnly) (c.UserId.HasValue || ou.AccessAll || !cu.ReadOnly || g.AccessAll || !cg.ReadOnly)
select c; select c;
return query; return query;

33
src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdQuery.cs
View File

@ -15,27 +15,34 @@ public class CollectionCipherReadByUserIdQuery : IQuery<CollectionCipher>
public virtual IQueryable<CollectionCipher> Run(DatabaseContext dbContext) public virtual IQueryable<CollectionCipher> Run(DatabaseContext dbContext)
{ {
var query = from cc in dbContext.CollectionCiphers var query = from cc in dbContext.CollectionCiphers
join c in dbContext.Collections join c in dbContext.Collections
on cc.CollectionId equals c.Id on cc.CollectionId equals c.Id
join ou in dbContext.OrganizationUsers join ou in dbContext.OrganizationUsers
on c.OrganizationId equals ou.OrganizationId on new { c.OrganizationId, UserId = (Guid?)_userId } equals
where ou.UserId == _userId new { ou.OrganizationId, ou.UserId }
join cu in dbContext.CollectionUsers join cu in dbContext.CollectionUsers
on c.Id equals cu.CollectionId into cu_g on new { ou.AccessAll, CollectionId = c.Id, OrganizationUserId = ou.Id } equals
from cu in cu_g new { AccessAll = false, cu.CollectionId, cu.OrganizationUserId } into cu_g
where ou.AccessAll && cu.OrganizationUserId == ou.Id from cu in cu_g.DefaultIfEmpty()
join gu in dbContext.GroupUsers join gu in dbContext.GroupUsers
on ou.Id equals gu.OrganizationUserId into gu_g on new { CollectionId = (Guid?)cu.CollectionId, ou.AccessAll, OrganizationUserId = ou.Id } equals
from gu in gu_g new { CollectionId = (Guid?)null, AccessAll = false, gu.OrganizationUserId } into gu_g
where cu.CollectionId == null && !ou.AccessAll from gu in gu_g.DefaultIfEmpty()
join g in dbContext.Groups join g in dbContext.Groups
on gu.GroupId equals g.Id into g_g on gu.GroupId equals g.Id into g_g
from g in g_g from g in g_g.DefaultIfEmpty()
join cg in dbContext.CollectionGroups join cg in dbContext.CollectionGroups
on cc.CollectionId equals cg.CollectionId into cg_g on new { g.AccessAll, CollectionId = c.Id, gu.GroupId } equals
from cg in cg_g new { AccessAll = false, cg.CollectionId, cg.GroupId } into cg_g
where g.AccessAll && cg.GroupId == gu.GroupId && from cg in cg_g.DefaultIfEmpty()
ou.Status == OrganizationUserStatusType.Confirmed &&
where ou.Status == OrganizationUserStatusType.Confirmed &&
(ou.AccessAll || cu.CollectionId != null || g.AccessAll || cg.CollectionId != null) (ou.AccessAll || cu.CollectionId != null || g.AccessAll || cg.CollectionId != null)
select cc; select cc;
return query; return query;

36
src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs
View File

@ -14,33 +14,41 @@ public class UserCipherDetailsQuery : IQuery<CipherDetails>
public virtual IQueryable<CipherDetails> Run(DatabaseContext dbContext) public virtual IQueryable<CipherDetails> Run(DatabaseContext dbContext)
{ {
var query = from c in dbContext.Ciphers var query = from c in dbContext.Ciphers
join ou in dbContext.OrganizationUsers join ou in dbContext.OrganizationUsers
on c.OrganizationId equals ou.OrganizationId on new { CipherUserId = c.UserId, c.OrganizationId, UserId = _userId, Status = OrganizationUserStatusType.Confirmed } equals
where ou.UserId == _userId && new { CipherUserId = (Guid?)null, OrganizationId = (Guid?)ou.OrganizationId, ou.UserId, ou.Status }
ou.Status == OrganizationUserStatusType.Confirmed
join o in dbContext.Organizations join o in dbContext.Organizations
on c.OrganizationId equals o.Id on new { c.OrganizationId, OuOrganizationId = ou.OrganizationId, Enabled = true } equals
where o.Id == ou.OrganizationId && o.Enabled new { OrganizationId = (Guid?)o.Id, OuOrganizationId = o.Id, o.Enabled }
join cc in dbContext.CollectionCiphers join cc in dbContext.CollectionCiphers
on c.Id equals cc.CipherId into cc_g on new { ou.AccessAll, CipherId = c.Id } equals
new { AccessAll = false, cc.CipherId } into cc_g
from cc in cc_g.DefaultIfEmpty() from cc in cc_g.DefaultIfEmpty()
where ou.AccessAll
join cu in dbContext.CollectionUsers join cu in dbContext.CollectionUsers
on cc.CollectionId equals cu.CollectionId into cu_g on new { cc.CollectionId, OrganizationUserId = ou.Id } equals
new { cu.CollectionId, cu.OrganizationUserId } into cu_g
from cu in cu_g.DefaultIfEmpty() from cu in cu_g.DefaultIfEmpty()
where cu.OrganizationUserId == ou.Id
join gu in dbContext.GroupUsers join gu in dbContext.GroupUsers
on ou.Id equals gu.OrganizationUserId into gu_g on new { CollectionId = (Guid?)cu.CollectionId, ou.AccessAll, OrganizationUserId = ou.Id } equals
new { CollectionId = (Guid?)null, AccessAll = false, gu.OrganizationUserId } into gu_g
from gu in gu_g.DefaultIfEmpty() from gu in gu_g.DefaultIfEmpty()
where cu.CollectionId == null && !ou.AccessAll
join g in dbContext.Groups join g in dbContext.Groups
on gu.GroupId equals g.Id into g_g on gu.GroupId equals g.Id into g_g
from g in g_g.DefaultIfEmpty() from g in g_g.DefaultIfEmpty()
join cg in dbContext.CollectionGroups join cg in dbContext.CollectionGroups
on cc.CollectionId equals cg.CollectionId into cg_g on new { g.AccessAll, cc.CollectionId, gu.GroupId } equals
new { AccessAll = false, cg.CollectionId, cg.GroupId } into cg_g
from cg in cg_g.DefaultIfEmpty() from cg in cg_g.DefaultIfEmpty()
where !g.AccessAll && cg.GroupId == gu.GroupId &&
ou.AccessAll || cu.CollectionId != null || g.AccessAll || cg.CollectionId != null where ou.AccessAll || cu.CollectionId != null || g.AccessAll || cg.CollectionId != null
select new { c, ou, o, cc, cu, gu, g, cg }.c; select new { c, ou, o, cc, cu, gu, g, cg }.c;
var query2 = from c in dbContext.Ciphers var query2 = from c in dbContext.Ciphers

21
src/Infrastructure.EntityFramework/Repositories/Queries/UserCollectionDetailsQuery.cs
View File

@ -13,26 +13,33 @@ public class UserCollectionDetailsQuery : IQuery<CollectionDetails>
public virtual IQueryable<CollectionDetails> Run(DatabaseContext dbContext) public virtual IQueryable<CollectionDetails> Run(DatabaseContext dbContext)
{ {
var query = from c in dbContext.Collections var query = from c in dbContext.Collections
join ou in dbContext.OrganizationUsers join ou in dbContext.OrganizationUsers
on c.OrganizationId equals ou.OrganizationId on c.OrganizationId equals ou.OrganizationId
join o in dbContext.Organizations join o in dbContext.Organizations
on c.OrganizationId equals o.Id on c.OrganizationId equals o.Id
join cu in dbContext.CollectionUsers join cu in dbContext.CollectionUsers
on c.Id equals cu.CollectionId into cu_g on new { ou.AccessAll, CollectionId = c.Id, OrganizationUserId = ou.Id } equals
new { AccessAll = false, cu.CollectionId, cu.OrganizationUserId } into cu_g
from cu in cu_g.DefaultIfEmpty() from cu in cu_g.DefaultIfEmpty()
where ou.AccessAll && cu.OrganizationUserId == ou.Id
join gu in dbContext.GroupUsers join gu in dbContext.GroupUsers
on ou.Id equals gu.OrganizationUserId into gu_g on new { CollectionId = (Guid?)cu.CollectionId, ou.AccessAll, OrganizationUserId = ou.Id } equals
new { CollectionId = (Guid?)null, AccessAll = false, gu.OrganizationUserId } into gu_g
from gu in gu_g.DefaultIfEmpty() from gu in gu_g.DefaultIfEmpty()
where cu.CollectionId == null && !ou.AccessAll
join g in dbContext.Groups join g in dbContext.Groups
on gu.GroupId equals g.Id into g_g on gu.GroupId equals g.Id into g_g
from g in g_g.DefaultIfEmpty() from g in g_g.DefaultIfEmpty()
join cg in dbContext.CollectionGroups join cg in dbContext.CollectionGroups
on gu.GroupId equals cg.GroupId into cg_g on new { g.AccessAll, CollectionId = c.Id, gu.GroupId } equals
new { AccessAll = false, cg.CollectionId, cg.GroupId } into cg_g
from cg in cg_g.DefaultIfEmpty() from cg in cg_g.DefaultIfEmpty()
where !g.AccessAll && cg.CollectionId == c.Id &&
ou.UserId == _userId && where ou.UserId == _userId &&
ou.Status == OrganizationUserStatusType.Confirmed && ou.Status == OrganizationUserStatusType.Confirmed &&
o.Enabled && o.Enabled &&
(ou.AccessAll || cu.CollectionId != null || g.AccessAll || cg.CollectionId != null) (ou.AccessAll || cu.CollectionId != null || g.AccessAll || cg.CollectionId != null)