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

reference OrganizationMembership instead

Browse Source
This commit is contained in:
Kyle Spearrin 2018-08-31 17:05:27 -04:00
parent b2d63b2383
commit 2562d5a40d
8 changed files with 54 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controllers/CiphersController.cs
View File

@ -88,7 +88,7 @@ namespace Bit.Api.Controllers
public async Task<ListResponseModel<CipherDetailsResponseModel>> Get() public async Task<ListResponseModel<CipherDetailsResponseModel>> Get()
{ {
var userId = _userService.GetProperUserId(User).Value; var userId = _userService.GetProperUserId(User).Value;
var hasOrgs = _currentContext.Organizations.Any(); var hasOrgs = _currentContext.Organizations?.Any() ?? false;
// TODO: Use hasOrgs proper for cipher listing here? // TODO: Use hasOrgs proper for cipher listing here?
var ciphers = await _cipherRepository.GetManyByUserIdAsync(userId, true || hasOrgs); var ciphers = await _cipherRepository.GetManyByUserIdAsync(userId, true || hasOrgs);
Dictionary<Guid, IGrouping<Guid, CollectionCipher>> collectionCiphersGroupDict = null; Dictionary<Guid, IGrouping<Guid, CollectionCipher>> collectionCiphersGroupDict = null;

35
src/Core/CurrentContext.cs
View File

@ -15,8 +15,6 @@ namespace Bit.Core
private bool _builtHttpContext; private bool _builtHttpContext;
private bool _builtClaimsPrincipal; private bool _builtClaimsPrincipal;
private string _ip; private string _ip;
private Dictionary<Guid, ICollection<OrganizationUser>> _orgUsers =
new Dictionary<Guid, ICollection<OrganizationUser>>();
public virtual HttpContext HttpContext { get; set; } public virtual HttpContext HttpContext { get; set; }
public virtual Guid? UserId { get; set; } public virtual Guid? UserId { get; set; }
@ -24,8 +22,7 @@ namespace Bit.Core
public virtual string DeviceIdentifier { get; set; } public virtual string DeviceIdentifier { get; set; }
public virtual DeviceType? DeviceType { get; set; } public virtual DeviceType? DeviceType { get; set; }
public virtual string IpAddress => GetRequestIp(); public virtual string IpAddress => GetRequestIp();
public virtual List<CurrentContentOrganization> Organizations { get; set; } = public virtual List<CurrentContentOrganization> Organizations { get; set; }
new List<CurrentContentOrganization>();
public virtual Guid? InstallationId { get; set; } public virtual Guid? InstallationId { get; set; }
public void Build(HttpContext httpContext) public void Build(HttpContext httpContext)
@ -84,6 +81,7 @@ namespace Bit.Core
DeviceIdentifier = GetClaimValue(claimsDict, "device"); DeviceIdentifier = GetClaimValue(claimsDict, "device");
Organizations = new List<CurrentContentOrganization>();
if(claimsDict.ContainsKey("orgowner")) if(claimsDict.ContainsKey("orgowner"))
{ {
Organizations.AddRange(claimsDict["orgowner"].Select(c => Organizations.AddRange(claimsDict["orgowner"].Select(c =>
@ -117,27 +115,30 @@ namespace Bit.Core
public bool OrganizationUser(Guid orgId) public bool OrganizationUser(Guid orgId)
{ {
return Organizations.Any(o => o.Id == orgId); return Organizations?.Any(o => o.Id == orgId) ?? false;
} }
public bool OrganizationAdmin(Guid orgId) public bool OrganizationAdmin(Guid orgId)
{ {
return Organizations.Any(o => o.Id == orgId && return Organizations?.Any(o => o.Id == orgId &&
(o.Type == OrganizationUserType.Owner || o.Type == OrganizationUserType.Admin)); (o.Type == OrganizationUserType.Owner || o.Type == OrganizationUserType.Admin)) ?? false;
} }
public bool OrganizationOwner(Guid orgId) public bool OrganizationOwner(Guid orgId)
{ {
return Organizations.Any(o => o.Id == orgId && o.Type == OrganizationUserType.Owner); return Organizations?.Any(o => o.Id == orgId && o.Type == OrganizationUserType.Owner) ?? false;
} }
public async Task<ICollection<OrganizationUser>> OrganizationMembershipAsync( public async Task<ICollection<CurrentContentOrganization>> OrganizationMembershipAsync(
IOrganizationUserRepository organizationUserRepository, Guid userId) IOrganizationUserRepository organizationUserRepository, Guid userId)
{ {
if(!_orgUsers.ContainsKey(userId)) if(Organizations == null)
{ {
_orgUsers.Add(userId, await organizationUserRepository.GetManyByUserAsync(userId)); var userOrgs = await organizationUserRepository.GetManyByUserAsync(userId);
Organizations = userOrgs.Where(ou => ou.Status == OrganizationUserStatusType.Confirmed)
.Select(ou => new CurrentContentOrganization(ou)).ToList();
} }
return Organizations;
return _orgUsers[userId];
} }
private string GetRequestIp() private string GetRequestIp()
@ -172,6 +173,14 @@ namespace Bit.Core
public class CurrentContentOrganization public class CurrentContentOrganization
{ {
public CurrentContentOrganization() { }
public CurrentContentOrganization(OrganizationUser orgUser)
{
Id = orgUser.OrganizationId;
Type = orgUser.Type;
}
public Guid Id { get; set; } public Guid Id { get; set; }
public OrganizationUserType Type { get; set; } public OrganizationUserType Type { get; set; }
} }

2
src/Core/Identity/AuthenticatorTokenProvider.cs
View File

@ -21,7 +21,7 @@ namespace Bit.Core.Identity
public async Task<bool> CanGenerateTwoFactorTokenAsync(UserManager<User> manager, User user) public async Task<bool> CanGenerateTwoFactorTokenAsync(UserManager<User> manager, User user)
{ {
var provider = user.GetTwoFactorProvider(TwoFactorProviderType.Authenticator); var provider = user.GetTwoFactorProvider(TwoFactorProviderType.Authenticator);
if(string.IsNullOrWhiteSpace((string)provider.MetaData["Key"])) if(string.IsNullOrWhiteSpace((string)provider?.MetaData["Key"]))
{ {
return false; return false;
} }

11
src/Core/IdentityServer/ProfileService.cs
View File

@ -59,29 +59,26 @@ namespace Bit.Core.IdentityServer
var orgs = await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, user.Id); var orgs = await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, user.Id);
if(orgs.Any()) if(orgs.Any())
{ {
var groupedOrgs = orgs.Where(o => o.Status == Enums.OrganizationUserStatusType.Confirmed) foreach(var group in orgs.GroupBy(o => o.Type))
.GroupBy(o => o.Type);
foreach(var group in groupedOrgs)
{ {
switch(group.Key) switch(group.Key)
{ {
case Enums.OrganizationUserType.Owner: case Enums.OrganizationUserType.Owner:
foreach(var org in group) foreach(var org in group)
{ {
newClaims.Add(new Claim("orgowner", org.OrganizationId.ToString())); newClaims.Add(new Claim("orgowner", org.Id.ToString()));
} }
break; break;
case Enums.OrganizationUserType.Admin: case Enums.OrganizationUserType.Admin:
foreach(var org in group) foreach(var org in group)
{ {
newClaims.Add(new Claim("orgadmin", org.OrganizationId.ToString())); newClaims.Add(new Claim("orgadmin", org.Id.ToString()));
} }
break; break;
case Enums.OrganizationUserType.User: case Enums.OrganizationUserType.User:
foreach(var org in group) foreach(var org in group)
{ {
newClaims.Add(new Claim("orguser", org.OrganizationId.ToString())); newClaims.Add(new Claim("orguser", org.Id.ToString()));
} }
break; break;
default: default:

6
src/Core/IdentityServer/ResourceOwnerPasswordValidator.cs
View File

@ -224,16 +224,16 @@ namespace Bit.Core.IdentityServer
Organization firstEnabledOrg = null; Organization firstEnabledOrg = null;
var orgs = (await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, user.Id)) var orgs = (await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, user.Id))
.Where(o => o.Status == OrganizationUserStatusType.Confirmed).ToList(); .ToList();
if(orgs.Any()) if(orgs.Any())
{ {
var orgAbilities = await _applicationCacheService.GetOrganizationAbilitiesAsync(); var orgAbilities = await _applicationCacheService.GetOrganizationAbilitiesAsync();
var twoFactorOrgs = orgs.Where(o => OrgUsing2fa(orgAbilities, o.OrganizationId)); var twoFactorOrgs = orgs.Where(o => OrgUsing2fa(orgAbilities, o.Id));
if(twoFactorOrgs.Any()) if(twoFactorOrgs.Any())
{ {
var userOrgs = await _organizationRepository.GetManyByUserIdAsync(user.Id); var userOrgs = await _organizationRepository.GetManyByUserIdAsync(user.Id);
firstEnabledOrg = userOrgs.FirstOrDefault( firstEnabledOrg = userOrgs.FirstOrDefault(
o => orgs.Any(om => om.OrganizationId == o.Id) && o.TwoFactorIsEnabled()); o => orgs.Any(om => om.Id == o.Id) && o.TwoFactorIsEnabled());
} }
} }

23
src/Core/Services/Implementations/EventService.cs
View File

@ -46,11 +46,8 @@ namespace Bit.Core.Services
}; };
var orgAbilities = await _applicationCacheService.GetOrganizationAbilitiesAsync(); var orgAbilities = await _applicationCacheService.GetOrganizationAbilitiesAsync();
IEnumerable<IEvent> orgEvents; var orgs = await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, userId);
if(_currentContext.UserId.HasValue) var orgEvents = orgs.Where(o => CanUseEvents(orgAbilities, o.Id))
{
orgEvents = _currentContext.Organizations
.Where(o => CanUseEvents(orgAbilities, o.Id))
.Select(o => new EventMessage(_currentContext) .Select(o => new EventMessage(_currentContext)
{ {
OrganizationId = o.Id, OrganizationId = o.Id,
@ -59,22 +56,6 @@ namespace Bit.Core.Services
Type = type, Type = type,
Date = DateTime.UtcNow Date = DateTime.UtcNow
}); });
}
else
{
var orgs = await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, userId);
orgEvents = orgs
.Where(o => o.Status == OrganizationUserStatusType.Confirmed &&
CanUseEvents(orgAbilities, o.OrganizationId))
.Select(o => new EventMessage(_currentContext)
{
OrganizationId = o.OrganizationId,
UserId = userId,
ActingUserId = userId,
Type = type,
Date = DateTime.UtcNow
});
}
if(orgEvents.Any()) if(orgEvents.Any())
{ {

6
src/Core/Services/Implementations/UserService.cs
View File

@ -831,13 +831,13 @@ namespace Bit.Core.Services
{ {
return true; return true;
} }
if(!_currentContext?.Organizations?.Any() ?? true) var orgs = await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, user.Id);
if(!orgs.Any())
{ {
return false; return false;
} }
var orgAbilities = await _applicationCacheService.GetOrganizationAbilitiesAsync(); var orgAbilities = await _applicationCacheService.GetOrganizationAbilitiesAsync();
return _currentContext.Organizations.Any(o => orgAbilities.ContainsKey(o.Id) && return orgs.Any(o => orgAbilities.ContainsKey(o.Id) &&
orgAbilities[o.Id].UsersGetPremium && orgAbilities[o.Id].Enabled); orgAbilities[o.Id].UsersGetPremium && orgAbilities[o.Id].Enabled);
} }

6
src/Notifications/NotificationsHub.cs
View File

@ -19,10 +19,13 @@ namespace Bit.Notifications
{ {
var currentContext = new CurrentContext(); var currentContext = new CurrentContext();
currentContext.Build(Context.User); currentContext.Build(Context.User);
if(currentContext.Organizations != null)
{
foreach(var org in currentContext.Organizations) foreach(var org in currentContext.Organizations)
{ {
await Groups.AddToGroupAsync(Context.ConnectionId, $"Organization_{org.Id}"); await Groups.AddToGroupAsync(Context.ConnectionId, $"Organization_{org.Id}");
} }
}
_connectionCounter.Increment(); _connectionCounter.Increment();
await base.OnConnectedAsync(); await base.OnConnectedAsync();
} }
@ -31,10 +34,13 @@ namespace Bit.Notifications
{ {
var currentContext = new CurrentContext(); var currentContext = new CurrentContext();
currentContext.Build(Context.User); currentContext.Build(Context.User);
if(currentContext.Organizations != null)
{
foreach(var org in currentContext.Organizations) foreach(var org in currentContext.Organizations)
{ {
await Groups.RemoveFromGroupAsync(Context.ConnectionId, $"Organization_{org.Id}"); await Groups.RemoveFromGroupAsync(Context.ConnectionId, $"Organization_{org.Id}");
} }
}
_connectionCounter.Decrement(); _connectionCounter.Decrement();
await base.OnDisconnectedAsync(exception); await base.OnDisconnectedAsync(exception);
} }