mirror of
https://github.com/bitwarden/server.git
synced 2024-12-25 17:27:45 +01:00
ae280a313c
* [EC-343] Added column 'UseCustomPermissions' to Organization table
* [EC-343] Added 'UseCustomPermissions' to Api responses
* [EC-343] Added 'UseCustomPermissions' to Admin view
* [EC-343] Add constraint to Organization table to have default UseCustomPermissions value
* [EC-343] Recreate OrganizationView to include UseCustomPermissions column
* [EC-343] Add MySql EF migrations
* [EC-343] Add Postgres EF migrations
* Revert "[EC-343] Add Postgres EF migrations"
This reverts commit 8f1654cb7d.
* [EC-343] Add Postgres migrations and script
* [EC-343] dotnet format
* [EC-343] Set 'Custom Permissions' feature as unchecked for teams plan
* [EC-343] Add CustomPermissions to plan upgrades
* [EC-343] Update CURRENT_LICENSE_FILE_VERSION
* [EC-343] Enable 'Custom Permissions' on Enterprise 2019 plan
* [EC-343] Updated migration script to include Enterprise 2019 plan
* [EC-343] Update CURRENT_LICENSE_FILE_VERSION to 10
* [EC-343] Move logic checking if Organization can use custom permissions to OrganizationService
* [EC-343] Add unit tests to validate UseCustomPermissions check
* [EC-343] Revert UseCustomPermissionsFlag migration
* [EC-343] Fix typo in OrganizationUserOrganizationDetailsViewQuery
* [EC-343] Add Postgres migrations without affecting other datetime column
* [EC-343] Create ValidateOrganizationCustomPermissionsEnabledAsync. Add more unit tests around CustomPermissions check
* [EC-343] Add curly brackets to if condition
* [EC-343] Rename unit tests
413 lines
10 KiB
Transact-SQL
413 lines
10 KiB
Transact-SQL
IF COL_LENGTH('[dbo].[Organization]', 'UseCustomPermissions') IS NULL
|
|
BEGIN
|
|
ALTER TABLE
|
|
[dbo].[Organization]
|
|
ADD
|
|
[UseCustomPermissions] BIT NOT NULL CONSTRAINT [DF_Organization_UseCustomPermissions] DEFAULT (0);
|
|
END
|
|
GO
|
|
|
|
-- Recreate OrganizationView so that it includes the UseCustomPermissions column
|
|
IF OBJECT_ID('[dbo].[OrganizationView]') IS NOT NULL
|
|
BEGIN
|
|
DROP VIEW [dbo].[OrganizationView]
|
|
END
|
|
GO
|
|
|
|
CREATE VIEW [dbo].[OrganizationView]
|
|
AS
|
|
SELECT
|
|
*
|
|
FROM
|
|
[dbo].[Organization]
|
|
GO
|
|
|
|
CREATE OR ALTER VIEW [dbo].[OrganizationUserOrganizationDetailsView]
|
|
AS
|
|
SELECT
|
|
OU.[UserId],
|
|
OU.[OrganizationId],
|
|
O.[Name],
|
|
O.[Enabled],
|
|
O.[PlanType],
|
|
O.[UsePolicies],
|
|
O.[UseSso],
|
|
O.[UseKeyConnector],
|
|
O.[UseScim],
|
|
O.[UseGroups],
|
|
O.[UseDirectory],
|
|
O.[UseEvents],
|
|
O.[UseTotp],
|
|
O.[Use2fa],
|
|
O.[UseApi],
|
|
O.[UseResetPassword],
|
|
O.[SelfHost],
|
|
O.[UsersGetPremium],
|
|
O.[UseCustomPermissions],
|
|
O.[Seats],
|
|
O.[MaxCollections],
|
|
O.[MaxStorageGb],
|
|
O.[Identifier],
|
|
OU.[Key],
|
|
OU.[ResetPasswordKey],
|
|
O.[PublicKey],
|
|
O.[PrivateKey],
|
|
OU.[Status],
|
|
OU.[Type],
|
|
SU.[ExternalId] SsoExternalId,
|
|
OU.[Permissions],
|
|
PO.[ProviderId],
|
|
P.[Name] ProviderName,
|
|
SS.[Data] SsoConfig,
|
|
OS.[FriendlyName] FamilySponsorshipFriendlyName,
|
|
OS.[LastSyncDate] FamilySponsorshipLastSyncDate,
|
|
OS.[ToDelete] FamilySponsorshipToDelete,
|
|
OS.[ValidUntil] FamilySponsorshipValidUntil
|
|
FROM
|
|
[dbo].[OrganizationUser] OU
|
|
LEFT JOIN
|
|
[dbo].[Organization] O ON O.[Id] = OU.[OrganizationId]
|
|
LEFT JOIN
|
|
[dbo].[SsoUser] SU ON SU.[UserId] = OU.[UserId] AND SU.[OrganizationId] = OU.[OrganizationId]
|
|
LEFT JOIN
|
|
[dbo].[ProviderOrganization] PO ON PO.[OrganizationId] = O.[Id]
|
|
LEFT JOIN
|
|
[dbo].[Provider] P ON P.[Id] = PO.[ProviderId]
|
|
LEFT JOIN
|
|
[dbo].[SsoConfig] SS ON SS.[OrganizationId] = OU.[OrganizationId]
|
|
LEFT JOIN
|
|
[dbo].[OrganizationSponsorship] OS ON OS.[SponsoringOrganizationUserID] = OU.[Id]
|
|
GO
|
|
|
|
CREATE OR ALTER VIEW [dbo].[ProviderUserProviderOrganizationDetailsView]
|
|
AS
|
|
SELECT
|
|
PU.[UserId],
|
|
PO.[OrganizationId],
|
|
O.[Name],
|
|
O.[Enabled],
|
|
O.[UsePolicies],
|
|
O.[UseSso],
|
|
O.[UseKeyConnector],
|
|
O.[UseScim],
|
|
O.[UseGroups],
|
|
O.[UseDirectory],
|
|
O.[UseEvents],
|
|
O.[UseTotp],
|
|
O.[Use2fa],
|
|
O.[UseApi],
|
|
O.[UseResetPassword],
|
|
O.[SelfHost],
|
|
O.[UsersGetPremium],
|
|
O.[UseCustomPermissions],
|
|
O.[Seats],
|
|
O.[MaxCollections],
|
|
O.[MaxStorageGb],
|
|
O.[Identifier],
|
|
PO.[Key],
|
|
O.[PublicKey],
|
|
O.[PrivateKey],
|
|
PU.[Status],
|
|
PU.[Type],
|
|
PO.[ProviderId],
|
|
PU.[Id] ProviderUserId,
|
|
P.[Name] ProviderName
|
|
FROM
|
|
[dbo].[ProviderUser] PU
|
|
INNER JOIN
|
|
[dbo].[ProviderOrganization] PO ON PO.[ProviderId] = PU.[ProviderId]
|
|
INNER JOIN
|
|
[dbo].[Organization] O ON O.[Id] = PO.[OrganizationId]
|
|
INNER JOIN
|
|
[dbo].[Provider] P ON P.[Id] = PU.[ProviderId]
|
|
GO
|
|
|
|
CREATE OR ALTER PROCEDURE [dbo].[Organization_Create]
|
|
@Id UNIQUEIDENTIFIER OUTPUT,
|
|
@Identifier NVARCHAR(50),
|
|
@Name NVARCHAR(50),
|
|
@BusinessName NVARCHAR(50),
|
|
@BusinessAddress1 NVARCHAR(50),
|
|
@BusinessAddress2 NVARCHAR(50),
|
|
@BusinessAddress3 NVARCHAR(50),
|
|
@BusinessCountry VARCHAR(2),
|
|
@BusinessTaxNumber NVARCHAR(30),
|
|
@BillingEmail NVARCHAR(256),
|
|
@Plan NVARCHAR(50),
|
|
@PlanType TINYINT,
|
|
@Seats INT,
|
|
@MaxCollections SMALLINT,
|
|
@UsePolicies BIT,
|
|
@UseSso BIT,
|
|
@UseGroups BIT,
|
|
@UseDirectory BIT,
|
|
@UseEvents BIT,
|
|
@UseTotp BIT,
|
|
@Use2fa BIT,
|
|
@UseApi BIT,
|
|
@UseResetPassword BIT,
|
|
@SelfHost BIT,
|
|
@UsersGetPremium BIT,
|
|
@Storage BIGINT,
|
|
@MaxStorageGb SMALLINT,
|
|
@Gateway TINYINT,
|
|
@GatewayCustomerId VARCHAR(50),
|
|
@GatewaySubscriptionId VARCHAR(50),
|
|
@ReferenceData VARCHAR(MAX),
|
|
@Enabled BIT,
|
|
@LicenseKey VARCHAR(100),
|
|
@PublicKey VARCHAR(MAX),
|
|
@PrivateKey VARCHAR(MAX),
|
|
@TwoFactorProviders NVARCHAR(MAX),
|
|
@ExpirationDate DATETIME2(7),
|
|
@CreationDate DATETIME2(7),
|
|
@RevisionDate DATETIME2(7),
|
|
@OwnersNotifiedOfAutoscaling DATETIME2(7),
|
|
@MaxAutoscaleSeats INT,
|
|
@UseKeyConnector BIT = 0,
|
|
@UseScim BIT = 0,
|
|
@UseCustomPermissions BIT = 0
|
|
AS
|
|
BEGIN
|
|
SET NOCOUNT ON
|
|
|
|
INSERT INTO [dbo].[Organization]
|
|
(
|
|
[Id],
|
|
[Identifier],
|
|
[Name],
|
|
[BusinessName],
|
|
[BusinessAddress1],
|
|
[BusinessAddress2],
|
|
[BusinessAddress3],
|
|
[BusinessCountry],
|
|
[BusinessTaxNumber],
|
|
[BillingEmail],
|
|
[Plan],
|
|
[PlanType],
|
|
[Seats],
|
|
[MaxCollections],
|
|
[UsePolicies],
|
|
[UseSso],
|
|
[UseGroups],
|
|
[UseDirectory],
|
|
[UseEvents],
|
|
[UseTotp],
|
|
[Use2fa],
|
|
[UseApi],
|
|
[UseResetPassword],
|
|
[SelfHost],
|
|
[UsersGetPremium],
|
|
[Storage],
|
|
[MaxStorageGb],
|
|
[Gateway],
|
|
[GatewayCustomerId],
|
|
[GatewaySubscriptionId],
|
|
[ReferenceData],
|
|
[Enabled],
|
|
[LicenseKey],
|
|
[PublicKey],
|
|
[PrivateKey],
|
|
[TwoFactorProviders],
|
|
[ExpirationDate],
|
|
[CreationDate],
|
|
[RevisionDate],
|
|
[OwnersNotifiedOfAutoscaling],
|
|
[MaxAutoscaleSeats],
|
|
[UseKeyConnector],
|
|
[UseScim],
|
|
[UseCustomPermissions]
|
|
)
|
|
VALUES
|
|
(
|
|
@Id,
|
|
@Identifier,
|
|
@Name,
|
|
@BusinessName,
|
|
@BusinessAddress1,
|
|
@BusinessAddress2,
|
|
@BusinessAddress3,
|
|
@BusinessCountry,
|
|
@BusinessTaxNumber,
|
|
@BillingEmail,
|
|
@Plan,
|
|
@PlanType,
|
|
@Seats,
|
|
@MaxCollections,
|
|
@UsePolicies,
|
|
@UseSso,
|
|
@UseGroups,
|
|
@UseDirectory,
|
|
@UseEvents,
|
|
@UseTotp,
|
|
@Use2fa,
|
|
@UseApi,
|
|
@UseResetPassword,
|
|
@SelfHost,
|
|
@UsersGetPremium,
|
|
@Storage,
|
|
@MaxStorageGb,
|
|
@Gateway,
|
|
@GatewayCustomerId,
|
|
@GatewaySubscriptionId,
|
|
@ReferenceData,
|
|
@Enabled,
|
|
@LicenseKey,
|
|
@PublicKey,
|
|
@PrivateKey,
|
|
@TwoFactorProviders,
|
|
@ExpirationDate,
|
|
@CreationDate,
|
|
@RevisionDate,
|
|
@OwnersNotifiedOfAutoscaling,
|
|
@MaxAutoscaleSeats,
|
|
@UseKeyConnector,
|
|
@UseScim,
|
|
@UseCustomPermissions
|
|
)
|
|
END
|
|
GO
|
|
|
|
CREATE OR ALTER PROCEDURE [dbo].[Organization_Update]
|
|
@Id UNIQUEIDENTIFIER,
|
|
@Identifier NVARCHAR(50),
|
|
@Name NVARCHAR(50),
|
|
@BusinessName NVARCHAR(50),
|
|
@BusinessAddress1 NVARCHAR(50),
|
|
@BusinessAddress2 NVARCHAR(50),
|
|
@BusinessAddress3 NVARCHAR(50),
|
|
@BusinessCountry VARCHAR(2),
|
|
@BusinessTaxNumber NVARCHAR(30),
|
|
@BillingEmail NVARCHAR(256),
|
|
@Plan NVARCHAR(50),
|
|
@PlanType TINYINT,
|
|
@Seats INT,
|
|
@MaxCollections SMALLINT,
|
|
@UsePolicies BIT,
|
|
@UseSso BIT,
|
|
@UseGroups BIT,
|
|
@UseDirectory BIT,
|
|
@UseEvents BIT,
|
|
@UseTotp BIT,
|
|
@Use2fa BIT,
|
|
@UseApi BIT,
|
|
@UseResetPassword BIT,
|
|
@SelfHost BIT,
|
|
@UsersGetPremium BIT,
|
|
@Storage BIGINT,
|
|
@MaxStorageGb SMALLINT,
|
|
@Gateway TINYINT,
|
|
@GatewayCustomerId VARCHAR(50),
|
|
@GatewaySubscriptionId VARCHAR(50),
|
|
@ReferenceData VARCHAR(MAX),
|
|
@Enabled BIT,
|
|
@LicenseKey VARCHAR(100),
|
|
@PublicKey VARCHAR(MAX),
|
|
@PrivateKey VARCHAR(MAX),
|
|
@TwoFactorProviders NVARCHAR(MAX),
|
|
@ExpirationDate DATETIME2(7),
|
|
@CreationDate DATETIME2(7),
|
|
@RevisionDate DATETIME2(7),
|
|
@OwnersNotifiedOfAutoscaling DATETIME2(7),
|
|
@MaxAutoscaleSeats INT,
|
|
@UseKeyConnector BIT = 0,
|
|
@UseScim BIT = 0,
|
|
@UseCustomPermissions BIT = 0
|
|
AS
|
|
BEGIN
|
|
SET NOCOUNT ON
|
|
|
|
UPDATE
|
|
[dbo].[Organization]
|
|
SET
|
|
[Identifier] = @Identifier,
|
|
[Name] = @Name,
|
|
[BusinessName] = @BusinessName,
|
|
[BusinessAddress1] = @BusinessAddress1,
|
|
[BusinessAddress2] = @BusinessAddress2,
|
|
[BusinessAddress3] = @BusinessAddress3,
|
|
[BusinessCountry] = @BusinessCountry,
|
|
[BusinessTaxNumber] = @BusinessTaxNumber,
|
|
[BillingEmail] = @BillingEmail,
|
|
[Plan] = @Plan,
|
|
[PlanType] = @PlanType,
|
|
[Seats] = @Seats,
|
|
[MaxCollections] = @MaxCollections,
|
|
[UsePolicies] = @UsePolicies,
|
|
[UseSso] = @UseSso,
|
|
[UseGroups] = @UseGroups,
|
|
[UseDirectory] = @UseDirectory,
|
|
[UseEvents] = @UseEvents,
|
|
[UseTotp] = @UseTotp,
|
|
[Use2fa] = @Use2fa,
|
|
[UseApi] = @UseApi,
|
|
[UseResetPassword] = @UseResetPassword,
|
|
[SelfHost] = @SelfHost,
|
|
[UsersGetPremium] = @UsersGetPremium,
|
|
[Storage] = @Storage,
|
|
[MaxStorageGb] = @MaxStorageGb,
|
|
[Gateway] = @Gateway,
|
|
[GatewayCustomerId] = @GatewayCustomerId,
|
|
[GatewaySubscriptionId] = @GatewaySubscriptionId,
|
|
[ReferenceData] = @ReferenceData,
|
|
[Enabled] = @Enabled,
|
|
[LicenseKey] = @LicenseKey,
|
|
[PublicKey] = @PublicKey,
|
|
[PrivateKey] = @PrivateKey,
|
|
[TwoFactorProviders] = @TwoFactorProviders,
|
|
[ExpirationDate] = @ExpirationDate,
|
|
[CreationDate] = @CreationDate,
|
|
[RevisionDate] = @RevisionDate,
|
|
[OwnersNotifiedOfAutoscaling] = @OwnersNotifiedOfAutoscaling,
|
|
[MaxAutoscaleSeats] = @MaxAutoscaleSeats,
|
|
[UseKeyConnector] = @UseKeyConnector,
|
|
[UseScim] = @UseScim,
|
|
[UseCustomPermissions] = @UseCustomPermissions
|
|
WHERE
|
|
[Id] = @Id
|
|
END
|
|
GO
|
|
|
|
CREATE OR ALTER PROCEDURE [dbo].[Organization_ReadAbilities]
|
|
AS
|
|
BEGIN
|
|
SET NOCOUNT ON
|
|
|
|
SELECT
|
|
[Id],
|
|
[UseEvents],
|
|
[Use2fa],
|
|
CASE
|
|
WHEN [Use2fa] = 1 AND [TwoFactorProviders] IS NOT NULL AND [TwoFactorProviders] != '{}' THEN
|
|
1
|
|
ELSE
|
|
0
|
|
END AS [Using2fa],
|
|
[UsersGetPremium],
|
|
[UseCustomPermissions],
|
|
[UseSso],
|
|
[UseKeyConnector],
|
|
[UseScim],
|
|
[UseResetPassword],
|
|
[Enabled]
|
|
FROM
|
|
[dbo].[Organization]
|
|
END
|
|
GO
|
|
|
|
-- Enable Existing Enterprise Customers to use Custom Permissions
|
|
UPDATE [dbo].[Organization]
|
|
SET [UseCustomPermissions] = 1
|
|
WHERE [PlanType] IN (4, 5, 10, 11) -- Enterprise Annual/Monthly (2019 and 2020)
|
|
AND [UseCustomPermissions] = 0;
|
|
GO
|
|
|
|
-- Update non Enterprise Customers using Custom Permissions role to a Manager role
|
|
UPDATE [OU]
|
|
SET [OU].[Type] = 3, [OU].Permissions = NULL
|
|
FROM [dbo].[OrganizationUser] as OU
|
|
LEFT JOIN
|
|
[dbo].[Organization] O ON O.[Id] = OU.[OrganizationId]
|
|
WHERE O.[PlanType] NOT IN (4, 5, 10, 11) AND OU.[Type] = 4
|
|
GO
|