mirror of
https://github.com/bitwarden/server.git
synced 2025-04-05 21:18:13 -05:00

* Families for enterprise/split up organization sponsorship service (#1829) * Split OrganizationSponsorshipService into commands * Use tokenable for token validation * Use interfaces to set up for DI * Use commands over services * Move service tests to command tests * Value types can't be null * Run dotnet format * Update src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CancelSponsorshipCommand.cs Co-authored-by: Justin Baur <admin@justinbaur.com> * Fix controller tests Co-authored-by: Justin Baur <admin@justinbaur.com> * Families for enterprise/split up organization sponsorship service (#1875) * Split OrganizationSponsorshipService into commands * Use tokenable for token validation * Use interfaces to set up for DI * Use commands over services * Move service tests to command tests * Value types can't be null * Run dotnet format * Update src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CancelSponsorshipCommand.cs Co-authored-by: Justin Baur <admin@justinbaur.com> * Fix controller tests * Split create and send sponsorships * Split up create sponsorship * Add self hosted commands to dependency injection * Add field to store cloud billing sync key on self host instances * Fix typo * Fix data protector purpose of sponsorship offers * Split cloud and selfhosted sponsorship offer tokenable * Generate offer from self hosted with all necessary auth data * Add Required properties to constructor * Split up cancel sponsorship command * Split revoke sponsorship command between cloud and self hosted * Fix/f4e multiple sponsorships (#1838) * Use sponosorship from validate to redeem * Update tests * Format * Remove sponsorship service * Run dotnet format * Fix self hosted only controller attribute * Clean up file structure and fixes * Remove unneeded tokenables * Remove obsolete commands * Do not require file/class prefix if unnecessary * Update Organizaiton sprocs * Remove unnecessary models * Fix tests * Generalize LicenseService path calculation Use async file read and deserialization * Use interfaces for testability * Remove unused usings * Correct test direction * Test license reading * remove unused usings * Format Co-authored-by: Justin Baur <admin@justinbaur.com> * Improve DataProtectorTokenFactory test coverage (#1884) * Add encstring to server * Test factory Co-authored-by: Carlos Muentes <cmuentes@bitwarden.com> * Format * Remove SymmetricKeyProtectedString Not needed * Set ForcInvalid Co-authored-by: Carlos Muentes <cmuentes@bitwarden.com> * Feature/self f4e/api keys (#1896) * Add in ApiKey * Work on API Key table * Work on apikey table * Fix response model * Work on information for UI * Work on last sync date * Work on sync status * Work on auth * Work on tokenable * Work on merge * Add custom requirement * Add policy * Run formatting * Work on EF Migrations * Work on OrganizationConnection * Work on database * Work on additional database table * Run formatting * Small fixes * More cleanup * Cleanup * Add RevisionDate * Add GO * Finish Sql project * Add newlines * Fix stored proc file * Fix sqlproj * Add newlines * Fix table * Add navigation property * Delete Connections when organization is deleted * Add connection validation * Start adding ID column * Work on ID column * Work on SQL migration * Work on migrations * Run formatting * Fix test build * Fix sprocs * Work on migrations * Fix Create table * Fix sproc * Add prints to migration * Add default value * Update EF migrations * Formatting * Add to integration tests * Minor fixes * Formatting * Cleanup * Address PR feedback * Address more PR feedback * Fix formatting * Fix formatting * Fix * Address PR feedback * Remove accidential change * Fix SQL build * Run formatting * Address PR feedback * Add sync data to OrganizationUserOrgDetails * Add comments * Remove OrganizationConnectionService interface * Remove unused using * Address PR feedback * Formatting * Minor fix * Feature/self f4e/update db (#1930) * Fix migration * Fix TimesRenewed * Add comments * Make two properties non-nullable * Remove need for SponsoredOrg on SH (#1934) * Remove need for SponsoredOrg on SH * Add Family prefix * Add check for enterprise org on BillingSync key (#1936) * [PS-10] Feature/sponsorships removed at end of term (#1938) * Rename commands to min unique names * Inject revoke command based on self hosting * WIP: Remove/Revoke marks to delete * Complete WIP * Improve remove/revoke tests * PR review * Fail validation if sponsorship has failed to sync for 6 months * Feature/do not accept old self host sponsorships (#1939) * Do not accept >6mo old self-hosted sponsorships * Give disabled grace period of 3 months * Fix issues of Sql.proj differing from migration outcome (#1942) * Fix issues of Sql.proj differing from migration outcome * Yoink int tests * Add missing assert helpers * Feature/org sponsorship sync (#1922) * Self-hosted side sync first pass TODO: * flush out org sponsorship model * implement cloud side * process cloud-side response and update self-hosted records * sync scaffolding second pass * remove list of Org User ids from sync and begin work on SelfHostedRevokeSponsorship * allow authenticated http calls from server to return a result * update models * add logic for sync and change offer email template * add billing sync key and hide CreateSponsorship without user * fix tests * add job scheduling * add authorize attributes to endpoints * separate models into data/model and request/response * batch sync more, add EnableCloudCommunication for testing * send emails in bulk * make userId and sponsorshipType non nullable * batch more on self hosted side of sync * remove TODOs and formatting * changed logic of cloud sync * let BaseIdentityClientService handle all logging * call sync from scheduled job on self host * create bulk db operations for OrganizationSponsorships * remove SponsoredOrgId from sync, return default from server http call * validate BillingSyncKey during sync revert changes to CreateSponsorshipCommand * revert changes to ICreateSponsorshipCommand * add some tests * add DeleteExpiredSponsorshipsJob * add cloud sync test * remove extra method * formatting * prevent new sponsorships from disabled orgs * update packages * - pulled out send sponsorship command dependency from sync on cloud - don't throw error when sponsorships are empty - formatting * formatting models * more formatting * remove licensingService dependency from selfhosted sync * use installation urls and formatting * create constructor for RequestModel and formatting * add date parameter to OrganizationSponsorship_DeleteExpired * add new migration * formatting * rename OrganizationCreateSponsorshipRequestModel to OrganizationSponsorshipCreateRequestModel * prevent whole sync from failing if one sponsorship type is unsupported * deserialize config and billingsynckey from org connection * alter log message when sync disabled * Add grace period to disabled orgs * return early on self hosted if there are no sponsorships in database * rename BillingSyncConfig * send sponsorship offers from controller * allow config to be a null object * better exception handling in sync scheduler * add ef migrations * formatting * fix tests * fix validate test Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Fix OrganizationApiKey issues (#1941) Co-authored-by: Justin Baur <admin@justinbaur.com> * Feature/org sponsorship self hosted tests (#1947) * Self-hosted side sync first pass TODO: * flush out org sponsorship model * implement cloud side * process cloud-side response and update self-hosted records * sync scaffolding second pass * remove list of Org User ids from sync and begin work on SelfHostedRevokeSponsorship * allow authenticated http calls from server to return a result * update models * add logic for sync and change offer email template * add billing sync key and hide CreateSponsorship without user * fix tests * add job scheduling * add authorize attributes to endpoints * separate models into data/model and request/response * batch sync more, add EnableCloudCommunication for testing * send emails in bulk * make userId and sponsorshipType non nullable * batch more on self hosted side of sync * remove TODOs and formatting * changed logic of cloud sync * let BaseIdentityClientService handle all logging * call sync from scheduled job on self host * create bulk db operations for OrganizationSponsorships * remove SponsoredOrgId from sync, return default from server http call * validate BillingSyncKey during sync revert changes to CreateSponsorshipCommand * revert changes to ICreateSponsorshipCommand * add some tests * add DeleteExpiredSponsorshipsJob * add cloud sync test * remove extra method * formatting * prevent new sponsorships from disabled orgs * update packages * - pulled out send sponsorship command dependency from sync on cloud - don't throw error when sponsorships are empty - formatting * formatting models * more formatting * remove licensingService dependency from selfhosted sync * use installation urls and formatting * create constructor for RequestModel and formatting * add date parameter to OrganizationSponsorship_DeleteExpired * add new migration * formatting * rename OrganizationCreateSponsorshipRequestModel to OrganizationSponsorshipCreateRequestModel * prevent whole sync from failing if one sponsorship type is unsupported * deserialize config and billingsynckey from org connection * add mockHttp nuget package and use httpclientfactory * fix current tests * WIP of creating tests * WIP of new self hosted tests * WIP self hosted tests * finish self hosted tests * formatting * format of interface * remove extra config file * added newlines Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Fix Organization_DeleteById (#1950) * Fix Organization_Delete * Fix L * [PS-4] block enterprise user from sponsoring itself (#1943) * [PS-248] Feature/add connections enabled endpoint (#1953) * Move Organization models to sub namespaces * Add Organization Connection api endpoints * Get all connections rather than just enabled ones * Add missing services to DI * pluralize private api endpoints * Add type protection to org connection request/response * Fix route * Use nullable Id to signify no connection * Test Get Connections enabled * Fix data discoverer * Also drop this sproc for rerunning * Id is the OUTPUT of create sprocs * Fix connection config parsing * Linter fixes * update sqlproj file name * Use param xdocs on methods * Simplify controller path attribute * Use JsonDocument to avoid escaped json in our response/request strings * Fix JsonDoc tests * Linter fixes * Fix ApiKey Command and add tests (#1949) * Fix ApiKey command * Formatting * Fix test failures introduced in #1943 (#1957) * Remove "Did you know?" copy from emails. (#1962) * Remove "Did you know" * Remove jsonIf helper * Feature/fix send single sponsorship offer email (#1956) * Fix sponsorship offer email * Do not sanitize org name * PR feedback * Feature/f4e sync event [PS-75] (#1963) * Create sponsorship sync event type * Add InstallationId to Event model * Add combinatorics-based test case generators * Log sponsorships sync event on sync * Linter and test fixes * Fix failing test * Migrate sprocs and view * Remove unused `using`s * [PS-190] Add manual sync trigger in self hosted (#1955) * WIP add button to admin project for billing sync * add connection table to view page * minor fixes for self hosted side of sync * fixes number of bugs for cloud side of sync * deserialize before returning for some reason * add json attributes to return models * list of sponsorships parameter is immutable, add secondary list * change sproc name * add error handling * Fix tests * modify call to connection * Update src/Admin/Controllers/OrganizationsController.cs Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * undo change to sproc name * simplify logic * Update src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/CloudSyncSponsorshipsCommand.cs Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * register services despite if self hosted or cloud * remove json properties * revert merge conflict Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Update OrganizationSponsorship valid until when updating org expirati… (#1966) * Update OrganizationSponsorship valid until when updating org expiration date * Linter fixes * [PS-7] change revert email copy and add ValidUntil to sponsorship (#1965) * change revert email copy and add ValidUntil to sponsorship * add 15 days if no ValidUntil * Chore/merge/self hosted families for enterprise (#1972) * Log swallowed HttpRequestExceptions (#1866) Co-authored-by: Hinton <oscar@oscarhinton.com> * Allow for utilization of readonly db connection (#1937) * Bump the pin of the download-artifacts action to bypass the broken GitHub api (#1952) * Bumped version to 1.48.0 (#1958) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-160] Give Provider Users access to all org ciphers and collections (#1959) * Bumped version to 1.48.1 (#1961) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Avoid sending "user need confirmation" emails when there are no org admins (#1960) * Remove noncompliant users for new policies (#1951) * [PS-284] Allow installation clients to not need a user. (#1968) * Allow installation clients to not need a user. * Run formatting Co-authored-by: Andrei <30410186+Manolachi@users.noreply.github.com> Co-authored-by: Hinton <oscar@oscarhinton.com> Co-authored-by: sneakernuts <671942+sneakernuts@users.noreply.github.com> Co-authored-by: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Justin Baur <136baur@gmail.com> * Fix/license file not found (#1974) * Handle null license * Throw hint message if license is not found by the admin project. * Use CloudOrganizationId from Connection config * Change test to support change * Fix test Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Feature/f4e selfhosted rename migration to .sql (#1971) * rename migration to .sql * format * Add unit tests to self host F4E (#1975) * Work on tests * Added more tests * Run linting * Address PR feedback * Fix AssertRecent * Linting * Fixed empty tests * Fix/misc self hosted f4e (#1973) * Allow setting of ApiUri * Return updates sponsorshipsData objects * Bind arguments by name * Greedy load sponsorships to email. When upsert was called, it creates Ids on _all_ records, which meant that the lazy-evaluation from this call always returned an empty list. * add scope for sync command DI in job. simplify error logic * update the sync job to get CloudOrgId from the BillingSyncKey Co-authored-by: Jacob Fink <jfink@bitwarden.com> * Chore/merge/self hosted families for enterprise (#1987) * Log swallowed HttpRequestExceptions (#1866) Co-authored-by: Hinton <oscar@oscarhinton.com> * Allow for utilization of readonly db connection (#1937) * Bump the pin of the download-artifacts action to bypass the broken GitHub api (#1952) * Bumped version to 1.48.0 (#1958) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [EC-160] Give Provider Users access to all org ciphers and collections (#1959) * Bumped version to 1.48.1 (#1961) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Avoid sending "user need confirmation" emails when there are no org admins (#1960) * Remove noncompliant users for new policies (#1951) * [PS-284] Allow installation clients to not need a user. (#1968) * Allow installation clients to not need a user. * Run formatting * Use accept flow for sponsorship offers (#1964) * PS-82 check send 2FA email for new devices on TwoFactorController send-email-login (#1977) * [Bug] Skip WebAuthn 2fa event logs during login flow (#1978) * [Bug] Supress WebAuthn 2fa event logs during login process * Formatting * Simplified method call with new paramter input * Update RealIps Description (#1980) Describe the syntax of the real_ips configuration key with an example, to prevent type errors in the `setup` container when parsing `config.yml` * add proper URI validation to duo host (#1984) * captcha scores (#1967) * captcha scores * some api fixes * check bot on captcha attribute * Update src/Core/Services/Implementations/HCaptchaValidationService.cs Co-authored-by: e271828- <e271828-@users.noreply.github.com> Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com> Co-authored-by: e271828- <e271828-@users.noreply.github.com> * ensure no path specific in duo host (#1985) Co-authored-by: Andrei <30410186+Manolachi@users.noreply.github.com> Co-authored-by: Hinton <oscar@oscarhinton.com> Co-authored-by: sneakernuts <671942+sneakernuts@users.noreply.github.com> Co-authored-by: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Justin Baur <136baur@gmail.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Co-authored-by: Jordan Cooks <notnamed@users.noreply.github.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com> Co-authored-by: e271828- <e271828-@users.noreply.github.com> * Address feedback (#1990) Co-authored-by: Justin Baur <admin@justinbaur.com> Co-authored-by: Carlos Muentes <cmuentes@bitwarden.com> Co-authored-by: Jake Fink <jfink@bitwarden.com> Co-authored-by: Justin Baur <136baur@gmail.com> Co-authored-by: Andrei <30410186+Manolachi@users.noreply.github.com> Co-authored-by: Hinton <oscar@oscarhinton.com> Co-authored-by: sneakernuts <671942+sneakernuts@users.noreply.github.com> Co-authored-by: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Co-authored-by: Jordan Cooks <notnamed@users.noreply.github.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com> Co-authored-by: e271828- <e271828-@users.noreply.github.com>
406 lines
15 KiB
C#
406 lines
15 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Diagnostics;
|
|
using System.Linq;
|
|
using AutoFixture;
|
|
using Bit.Core.Context;
|
|
using Bit.Core.Entities;
|
|
using Bit.Core.Enums;
|
|
using Bit.Core.Enums.Provider;
|
|
using Bit.Core.Test.AutoFixture.UserFixtures;
|
|
using Bit.Core.Utilities;
|
|
using Bit.Infrastructure.Dapper;
|
|
using Bit.Test.Common.AutoFixture;
|
|
using Bit.Test.Common.AutoFixture.Attributes;
|
|
using IdentityModel;
|
|
using Xunit;
|
|
|
|
namespace Bit.Core.Test.Utilities
|
|
{
|
|
public class CoreHelpersTests
|
|
{
|
|
public static IEnumerable<object[]> _epochTestCases = new[]
|
|
{
|
|
new object[] {new DateTime(2020, 12, 30, 11, 49, 12, DateTimeKind.Utc), 1609328952000L},
|
|
};
|
|
|
|
[Fact]
|
|
public void GenerateComb_Success()
|
|
{
|
|
// Arrange & Act
|
|
var comb = CoreHelpers.GenerateComb();
|
|
|
|
// Assert
|
|
Assert.NotEqual(Guid.Empty, comb);
|
|
// TODO: Add more asserts to make sure important aspects of
|
|
// the comb are working properly
|
|
}
|
|
|
|
public static IEnumerable<object[]> GenerateCombCases = new[]
|
|
{
|
|
new object[]
|
|
{
|
|
Guid.Parse("a58db474-43d8-42f1-b4ee-0c17647cd0c0"), // Input Guid
|
|
new DateTime(2022, 3, 12, 12, 12, 0, DateTimeKind.Utc), // Input Time
|
|
Guid.Parse("a58db474-43d8-42f1-b4ee-ae5600c90cc1"), // Expected Comb
|
|
},
|
|
new object[]
|
|
{
|
|
Guid.Parse("f776e6ee-511f-4352-bb28-88513002bdeb"),
|
|
new DateTime(2021, 5, 10, 10, 52, 0, DateTimeKind.Utc),
|
|
Guid.Parse("f776e6ee-511f-4352-bb28-ad2400b313c1"),
|
|
},
|
|
new object[]
|
|
{
|
|
Guid.Parse("51a25fc7-3cad-497d-8e2f-8d77011648a1"),
|
|
new DateTime(1999, 2, 26, 16, 53, 13, DateTimeKind.Utc),
|
|
Guid.Parse("51a25fc7-3cad-497d-8e2f-8d77011649cd"),
|
|
},
|
|
new object[]
|
|
{
|
|
Guid.Parse("bfb8f353-3b32-4a9e-bef6-24fe0b54bfb0"),
|
|
new DateTime(2024, 10, 20, 1, 32, 16, DateTimeKind.Utc),
|
|
Guid.Parse("bfb8f353-3b32-4a9e-bef6-b20f00195780"),
|
|
}
|
|
};
|
|
|
|
[Theory]
|
|
[MemberData(nameof(GenerateCombCases))]
|
|
public void GenerateComb_WithInputs_Success(Guid inputGuid, DateTime inputTime, Guid expectedComb)
|
|
{
|
|
var comb = CoreHelpers.GenerateComb(inputGuid, inputTime);
|
|
|
|
Assert.Equal(expectedComb, comb);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(2, 5, new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 })]
|
|
[InlineData(2, 3, new[] { 1, 2, 3, 4, 5 })]
|
|
[InlineData(2, 1, new[] { 1, 2 })]
|
|
[InlineData(1, 1, new[] { 1 })]
|
|
[InlineData(2, 2, new[] { 1, 2, 3 })]
|
|
public void Batch_Success(int batchSize, int totalBatches, int[] collection)
|
|
{
|
|
// Arrange
|
|
var remainder = collection.Length % batchSize;
|
|
|
|
// Act
|
|
var batches = collection.Batch(batchSize);
|
|
|
|
// Assert
|
|
Assert.Equal(totalBatches, batches.Count());
|
|
|
|
foreach (var batch in batches.Take(totalBatches - 1))
|
|
{
|
|
Assert.Equal(batchSize, batch.Count());
|
|
}
|
|
|
|
Assert.Equal(batches.Last().Count(), remainder == 0 ? batchSize : remainder);
|
|
}
|
|
|
|
[Fact]
|
|
public void ToGuidIdArrayTVP_Success()
|
|
{
|
|
// Arrange
|
|
var item0 = Guid.NewGuid();
|
|
var item1 = Guid.NewGuid();
|
|
|
|
var ids = new[] { item0, item1 };
|
|
|
|
// Act
|
|
var dt = ids.ToGuidIdArrayTVP();
|
|
|
|
// Assert
|
|
Assert.Single(dt.Columns);
|
|
Assert.Equal("GuidId", dt.Columns[0].ColumnName);
|
|
Assert.Equal(2, dt.Rows.Count);
|
|
Assert.Equal(item0, dt.Rows[0][0]);
|
|
Assert.Equal(item1, dt.Rows[1][0]);
|
|
}
|
|
|
|
// TODO: Test the other ToArrayTVP Methods
|
|
|
|
[Theory]
|
|
[InlineData("12345&6789", "123456789")]
|
|
[InlineData("abcdef", "ABCDEF")]
|
|
[InlineData("1!@#$%&*()_+", "1")]
|
|
[InlineData("\u00C6123abc\u00C7", "123ABC")]
|
|
[InlineData("123\u00C6ABC", "123ABC")]
|
|
[InlineData("\r\nHello", "E")]
|
|
[InlineData("\tdef", "DEF")]
|
|
[InlineData("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUV1234567890", "ABCDEFABCDEF1234567890")]
|
|
public void CleanCertificateThumbprint_Success(string input, string output)
|
|
{
|
|
// Arrange & Act
|
|
var sanitizedInput = CoreHelpers.CleanCertificateThumbprint(input);
|
|
|
|
// Assert
|
|
Assert.Equal(output, sanitizedInput);
|
|
}
|
|
|
|
// TODO: Add more tests
|
|
[Theory]
|
|
[MemberData(nameof(_epochTestCases))]
|
|
public void ToEpocMilliseconds_Success(DateTime date, long milliseconds)
|
|
{
|
|
// Act & Assert
|
|
Assert.Equal(milliseconds, CoreHelpers.ToEpocMilliseconds(date));
|
|
}
|
|
|
|
[Theory]
|
|
[MemberData(nameof(_epochTestCases))]
|
|
public void FromEpocMilliseconds(DateTime date, long milliseconds)
|
|
{
|
|
// Act & Assert
|
|
Assert.Equal(date, CoreHelpers.FromEpocMilliseconds(milliseconds));
|
|
}
|
|
|
|
[Fact]
|
|
public void SecureRandomString_Success()
|
|
{
|
|
// Arrange & Act
|
|
var @string = CoreHelpers.SecureRandomString(8);
|
|
|
|
// Assert
|
|
// TODO: Should probably add more Asserts down the line
|
|
Assert.Equal(8, @string.Length);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(1, "1 Bytes")]
|
|
[InlineData(-5L, "-5 Bytes")]
|
|
[InlineData(1023L, "1023 Bytes")]
|
|
[InlineData(1024L, "1 KB")]
|
|
[InlineData(1025L, "1 KB")]
|
|
[InlineData(-1023L, "-1023 Bytes")]
|
|
[InlineData(-1024L, "-1 KB")]
|
|
[InlineData(-1025L, "-1 KB")]
|
|
[InlineData(1048575L, "1024 KB")]
|
|
[InlineData(1048576L, "1 MB")]
|
|
[InlineData(1048577L, "1 MB")]
|
|
[InlineData(-1048575L, "-1024 KB")]
|
|
[InlineData(-1048576L, "-1 MB")]
|
|
[InlineData(-1048577L, "-1 MB")]
|
|
[InlineData(1073741823L, "1024 MB")]
|
|
[InlineData(1073741824L, "1 GB")]
|
|
[InlineData(1073741825L, "1 GB")]
|
|
[InlineData(-1073741823L, "-1024 MB")]
|
|
[InlineData(-1073741824L, "-1 GB")]
|
|
[InlineData(-1073741825L, "-1 GB")]
|
|
[InlineData(long.MaxValue, "8589934592 GB")]
|
|
public void ReadableBytesSize_Success(long size, string readable)
|
|
{
|
|
// Act & Assert
|
|
Assert.Equal(readable, CoreHelpers.ReadableBytesSize(size));
|
|
}
|
|
|
|
[Fact]
|
|
public void CloneObject_Success()
|
|
{
|
|
var original = new { Message = "Message" };
|
|
|
|
var copy = CoreHelpers.CloneObject(original);
|
|
|
|
Assert.Equal(original.Message, copy.Message);
|
|
}
|
|
|
|
[Fact]
|
|
public void ExtendQuery_AddNewParameter_Success()
|
|
{
|
|
// Arrange
|
|
var uri = new Uri("https://bitwarden.com/?param1=value1");
|
|
|
|
// Act
|
|
var newUri = CoreHelpers.ExtendQuery(uri,
|
|
new Dictionary<string, string> { { "param2", "value2" } });
|
|
|
|
// Assert
|
|
Assert.Equal("https://bitwarden.com/?param1=value1¶m2=value2", newUri.ToString());
|
|
}
|
|
|
|
[Fact]
|
|
public void ExtendQuery_AddTwoNewParameters_Success()
|
|
{
|
|
// Arrange
|
|
var uri = new Uri("https://bitwarden.com/?param1=value1");
|
|
|
|
// Act
|
|
var newUri = CoreHelpers.ExtendQuery(uri,
|
|
new Dictionary<string, string>
|
|
{
|
|
{ "param2", "value2" },
|
|
{ "param3", "value3" }
|
|
});
|
|
|
|
// Assert
|
|
Assert.Equal("https://bitwarden.com/?param1=value1¶m2=value2¶m3=value3", newUri.ToString());
|
|
}
|
|
|
|
[Fact]
|
|
public void ExtendQuery_AddExistingParameter_Success()
|
|
{
|
|
// Arrange
|
|
var uri = new Uri("https://bitwarden.com/?param1=value1¶m2=value2");
|
|
|
|
// Act
|
|
var newUri = CoreHelpers.ExtendQuery(uri,
|
|
new Dictionary<string, string> { { "param1", "test_value" } });
|
|
|
|
// Assert
|
|
Assert.Equal("https://bitwarden.com/?param1=test_value¶m2=value2", newUri.ToString());
|
|
}
|
|
|
|
[Fact]
|
|
public void ExtendQuery_AddNoParameters_Success()
|
|
{
|
|
// Arrange
|
|
const string startingUri = "https://bitwarden.com/?param1=value1";
|
|
|
|
var uri = new Uri(startingUri);
|
|
|
|
// Act
|
|
var newUri = CoreHelpers.ExtendQuery(uri, new Dictionary<string, string>());
|
|
|
|
// Assert
|
|
Assert.Equal(startingUri, newUri.ToString());
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("bücher.com", "xn--bcher-kva.com")]
|
|
[InlineData("bücher.cömé", "xn--bcher-kva.xn--cm-cja4c")]
|
|
[InlineData("hello@bücher.com", "hello@xn--bcher-kva.com")]
|
|
[InlineData("hello@world.cömé", "hello@world.xn--cm-cja4c")]
|
|
[InlineData("hello@bücher.cömé", "hello@xn--bcher-kva.xn--cm-cja4c")]
|
|
[InlineData("ascii.com", "ascii.com")]
|
|
[InlineData("", "")]
|
|
[InlineData(null, null)]
|
|
public void PunyEncode_Success(string text, string expected)
|
|
{
|
|
var actual = CoreHelpers.PunyEncode(text);
|
|
Assert.Equal(expected, actual);
|
|
}
|
|
|
|
[Fact]
|
|
public void GetEmbeddedResourceContentsAsync_Success()
|
|
{
|
|
var fileContents = CoreHelpers.GetEmbeddedResourceContentsAsync("data.embeddedResource.txt");
|
|
Assert.Equal("Contents of embeddedResource.txt\n", fileContents.Replace("\r\n", "\n"));
|
|
}
|
|
|
|
[Theory, CustomAutoData(typeof(UserFixture))]
|
|
public void BuildIdentityClaims_BaseClaims_Success(User user, bool isPremium)
|
|
{
|
|
var expected = new Dictionary<string, string>
|
|
{
|
|
{ "premium", isPremium ? "true" : "false" },
|
|
{ JwtClaimTypes.Email, user.Email },
|
|
{ JwtClaimTypes.EmailVerified, user.EmailVerified ? "true" : "false" },
|
|
{ JwtClaimTypes.Name, user.Name },
|
|
{ "sstamp", user.SecurityStamp },
|
|
}.ToList();
|
|
|
|
var actual = CoreHelpers.BuildIdentityClaims(user, Array.Empty<CurrentContentOrganization>(),
|
|
Array.Empty<CurrentContentProvider>(), isPremium);
|
|
|
|
foreach (var claim in expected)
|
|
{
|
|
Assert.Contains(claim, actual);
|
|
}
|
|
Assert.Equal(expected.Count, actual.Count);
|
|
}
|
|
|
|
[Theory, CustomAutoData(typeof(UserFixture))]
|
|
public void BuildIdentityClaims_NonCustomOrganizationUserType_Success(User user)
|
|
{
|
|
var fixture = new Fixture().WithAutoNSubstitutions();
|
|
foreach (var organizationUserType in Enum.GetValues<OrganizationUserType>().Except(new[] { OrganizationUserType.Custom }))
|
|
{
|
|
var org = fixture.Create<CurrentContentOrganization>();
|
|
org.Type = organizationUserType;
|
|
|
|
var expected = new KeyValuePair<string, string>($"org{organizationUserType.ToString().ToLower()}", org.Id.ToString());
|
|
var actual = CoreHelpers.BuildIdentityClaims(user, new[] { org }, Array.Empty<CurrentContentProvider>(), false);
|
|
|
|
Assert.Contains(expected, actual);
|
|
}
|
|
}
|
|
|
|
[Theory, CustomAutoData(typeof(UserFixture))]
|
|
public void BuildIdentityClaims_CustomOrganizationUserClaims_Success(User user, CurrentContentOrganization org)
|
|
{
|
|
var fixture = new Fixture().WithAutoNSubstitutions();
|
|
org.Type = OrganizationUserType.Custom;
|
|
|
|
var actual = CoreHelpers.BuildIdentityClaims(user, new[] { org }, Array.Empty<CurrentContentProvider>(), false);
|
|
foreach (var (permitted, claimName) in org.Permissions.ClaimsMap)
|
|
{
|
|
var claim = new KeyValuePair<string, string>(claimName, org.Id.ToString());
|
|
if (permitted)
|
|
{
|
|
|
|
Assert.Contains(claim, actual);
|
|
}
|
|
else
|
|
{
|
|
Assert.DoesNotContain(claim, actual);
|
|
}
|
|
}
|
|
}
|
|
|
|
[Theory, CustomAutoData(typeof(UserFixture))]
|
|
public void BuildIdentityClaims_ProviderClaims_Success(User user)
|
|
{
|
|
var fixture = new Fixture().WithAutoNSubstitutions();
|
|
var providers = new List<CurrentContentProvider>();
|
|
foreach (var providerUserType in Enum.GetValues<ProviderUserType>())
|
|
{
|
|
var provider = fixture.Create<CurrentContentProvider>();
|
|
provider.Type = providerUserType;
|
|
providers.Add(provider);
|
|
}
|
|
|
|
var claims = new List<KeyValuePair<string, string>>();
|
|
|
|
if (providers.Any())
|
|
{
|
|
foreach (var group in providers.GroupBy(o => o.Type))
|
|
{
|
|
switch (group.Key)
|
|
{
|
|
case ProviderUserType.ProviderAdmin:
|
|
foreach (var provider in group)
|
|
{
|
|
claims.Add(new KeyValuePair<string, string>("providerprovideradmin", provider.Id.ToString()));
|
|
}
|
|
break;
|
|
case ProviderUserType.ServiceUser:
|
|
foreach (var provider in group)
|
|
{
|
|
claims.Add(new KeyValuePair<string, string>("providerserviceuser", provider.Id.ToString()));
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
var actual = CoreHelpers.BuildIdentityClaims(user, Array.Empty<CurrentContentOrganization>(), providers, false);
|
|
foreach (var claim in claims)
|
|
{
|
|
Assert.Contains(claim, actual);
|
|
}
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("hi@email.com", "hi@email.com")] // Short email with no room to obfuscate
|
|
[InlineData("name@email.com", "na**@email.com")] // Can obfuscate
|
|
[InlineData("reallylongnamethatnooneshouldhave@email", "re*******************************@email")] // Really long email and no .com, .net, etc
|
|
[InlineData("name@", "name@")] // @ symbol but no domain
|
|
[InlineData("", "")] // Empty string
|
|
[InlineData(null, null)] // null
|
|
public void ObfuscateEmail_Success(string input, string expected)
|
|
{
|
|
Assert.Equal(expected, CoreHelpers.ObfuscateEmail(input));
|
|
}
|
|
}
|
|
}
|