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

[SG-1082]-Defect-Update stored procedure to properly determine is SSO is available (#2715)

Browse Source 
* Fixed SsoAvailble bug by using the enabled column from SsoConfig table, updated the existing query for EF Core

* Added no tracking to ef query since it is read only
This commit is contained in:
SmithThe4th 2023-02-17 13:19:21 -05:00 committed by GitHub
parent 69511160cb
commit 34544f2292
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 54 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Models/Data/Organizations/OrganizationDomainSsoDetailsData.cs
View File

@ -10,7 +10,7 @@ public class OrganizationDomainSsoDetailsData
public bool SsoAvailable { get; set; }
public string OrganizationIdentifier { get; set; }
public bool SsoRequired { get; set; }
public PolicyType PolicyType { get; set; }
public PolicyType? PolicyType { get; set; }
public DateTime? VerifiedDate { get; set; }
public bool OrganizationEnabled { get; set; }
}

45
src/Infrastructure.EntityFramework/Repositories/OrganizationDomainRepository.cs
View File

@ -74,32 +74,25 @@ public class OrganizationDomainRepository : Repository<Core.Entities.Organizatio
using var scope = ServiceScopeFactory.CreateScope();
var dbContext = GetDatabaseContext(scope);
var ssoDetails = await dbContext.Organizations
.Join(dbContext.OrganizationDomains, o => o.Id, od => od.OrganizationId,
(organization, domain) => new { resOrganization = organization, resDomain = domain })
.Join(dbContext.Policies, o => o.resOrganization.Id, p => p.OrganizationId,
(combinedOrgDomain, policy)
=> new
{
Organization = combinedOrgDomain.resOrganization,
Domain = combinedOrgDomain.resDomain,
Policy = policy
})
.Select(x => new OrganizationDomainSsoDetailsData
{
OrganizationId = x.Organization.Id,
OrganizationName = x.Organization.Name,
SsoAvailable = x.Organization.UseSso,
OrganizationIdentifier = x.Organization.Identifier,
SsoRequired = x.Policy.Enabled,
VerifiedDate = x.Domain.VerifiedDate,
PolicyType = x.Policy.Type,
DomainName = x.Domain.DomainName,
OrganizationEnabled = x.Organization.Enabled
})
.Where(y => y.DomainName == domainName
&& y.OrganizationEnabled == true
&& y.PolicyType.Equals(PolicyType.RequireSso))
var ssoDetails = await (from o in dbContext.Organizations
from od in o.Domains
join s in dbContext.SsoConfigs on o.Id equals s.OrganizationId into sJoin
from s in sJoin.DefaultIfEmpty()
join p in dbContext.Policies.Where(p => p.Type == PolicyType.RequireSso) on o.Id
equals p.OrganizationId into pJoin
from p in pJoin.DefaultIfEmpty()
where od.DomainName == domainName && o.Enabled
select new OrganizationDomainSsoDetailsData
{
OrganizationId = o.Id,
OrganizationName = o.Name,
SsoAvailable = o.SsoConfigs.Any(sc => sc.Enabled),
SsoRequired = p != null && p.Enabled,
OrganizationIdentifier = o.Identifier,
VerifiedDate = od.VerifiedDate,
PolicyType = p.Type,
DomainName = od.DomainName
})
.AsNoTracking()
.SingleOrDefaultAsync();

4
src/Sql/dbo/Stored Procedures/OrganizationDomainSsoDetails_ReadByEmail.sql
View File

@ -11,7 +11,7 @@ BEGIN
SELECT
O.Id AS OrganizationId,
O.[Name] AS OrganizationName,
O.UseSso AS SsoAvailable,
S.Enabled AS SsoAvailable,
P.Enabled AS SsoRequired,
O.Identifier AS OrganizationIdentifier,
OD.VerifiedDate,
@ -23,6 +23,8 @@ BEGIN
ON O.Id = OD.OrganizationId
LEFT JOIN [dbo].[PolicyView] P
ON O.Id = P.OrganizationId
LEFT JOIN [dbo].[Ssoconfig] S
ON O.Id = S.OrganizationId
WHERE OD.DomainName = @Domain
AND O.Enabled = 1
AND (P.Id is NULL OR (P.Id IS NOT NULL AND P.[Type] = 4)) -- SSO Type

31
util/Migrator/DbScripts/2023-02-16_FixSsoAvailableOrganizationDomain.sql Normal file
View File

@ -0,0 +1,31 @@
CREATE OR ALTER PROCEDURE [dbo].[OrganizationDomainSsoDetails_ReadByEmail]
@Email NVARCHAR(256)
AS
BEGIN
SET NOCOUNT ON
DECLARE @Domain NVARCHAR(256)
SELECT @Domain = SUBSTRING(@Email, CHARINDEX( '@', @Email) + 1, LEN(@Email))
SELECT
O.Id AS OrganizationId,
O.[Name] AS OrganizationName,
S.Enabled AS SsoAvailable,
P.Enabled AS SsoRequired,
O.Identifier AS OrganizationIdentifier,
OD.VerifiedDate,
P.[Type] AS PolicyType,
OD.DomainName
FROM
[dbo].[OrganizationView] O
INNER JOIN [dbo].[OrganizationDomainView] OD
ON O.Id = OD.OrganizationId
LEFT JOIN [dbo].[PolicyView] P
ON O.Id = P.OrganizationId
LEFT JOIN [dbo].[Ssoconfig] S
ON O.Id = S.OrganizationId
WHERE OD.DomainName = @Domain
AND O.Enabled = 1
AND (P.Id is NULL OR (P.Id IS NOT NULL AND P.[Type] = 4)) -- SSO Type
END