mirror of
https://github.com/bitwarden/android.git
synced 2024-10-31 15:15:34 +03:00
bfcfd367dd
* [PM-1208] Add Device approval options screen. View model waiting for additional logic to be added. * [PM-1208] Add device related api endpoint. Add AccoundDecryptOptions model and property to user Account. * [PM-1208] Add continue button and not you option * [PM-1379] add DeviceTrustCryptoService with establish trust logic (#2535) * [PM-1379] add DeviceCryptoService with establish trust logic * PM-1379 update api location and other minor refactors * pm-1379 fix encoding * update trusted device keys api call to Put * [PM-1379] rename DeviceCryptoService to DeviceTrustCryptoService - refactors to prevent side effects * [PM-1379] rearrange methods in DeviceTrustCryptoService * [PM-1379] rearrange methods in abstraction * [PM-1379] deconstruct tuples * [PM-1379] remove extra tasks * [PM-2583] Answer auth request with mp field as null if doesn't have it. (#2609) * [PM-2287][PM-2289][PM-2293] Approval Options (#2608) * [PM-2293] Add AuthRequestType to PasswordlessLoginPage. * [PM-2293] Add Actions to ApproveWithDevicePage * [PM-2293] Change screen text based on AuthRequestType * [PM-2293] Refactor AuthRequestType enum. Add label. Remove unnecessary actions. * [PM-2293] Change boolean variable expression. * [PM-2293] Trust device after admin request login. * code format * [PM-2287] Add trust device to master password unlock. Change trust device method. Remove email from SSO login page. * [PM-2293] Fix state variable get set. * [PM-2287][PM-2289][PM-2293] Rename method * [PM-1201] Change timeout actions available based on hasMasterPassword (#2610) * [PM-1201] Change timeout actions available based on hasMasterPassword * [PM-2731] add user key and master key types * [PM-2713] add new state for new keys and obsolete old ones - UserKey - MasterKey - UserKeyMasterKey (enc UserKey from User Table) * [PM-271] add UserKey and MasterKey support to crypto service * [PM-2713] rename key hash to password hash & begin add methods to crypto service * [PM-2713] continue organizing crypto service * [PM-2713] more updates to crypto service * [PM-2713] add new pin methods to state service * [PM-2713] fix signature of GetUserKeyPin * [PM-2713] add make user key method to crypto service * [PM-2713] refresh pin key when setting user key * [PM-2713] use new MakeMasterKey method * [PM-2713] add toggle method to crypto service for keys * [PM-2713] converting calls to new crypto service api * [PM-2713] add migration for pin on lock screens * [PM-2713] more conversions to new crypto service api * [PM-2713] convert cipher service and others to crypto service api * [PM-2713] More conversions to crypto api * [PM-2713] use new crypto service api in auth service * [PM-2713] remove unused cached values in crypto service * [PM-2713] set decrypt and set user key in login helper * fix bad merge * Update crypto service api call to fix build * [PM-1208] Fix app resource file * [PM-1208] Fix merge * [PM-1208] Fix merge * [PM-2713] optimize async code in crypto service * [PM-2713] rename password hash to master key hash * [PM-2713] fix casting issues and pin * [PM-2713] remove extra comment * [PM-2713] remove broken casting * [PM-2297] Login with trusted device (Flow 2) (#2623) * [PM-2297] Add DecryptUserKeyWithDeviceKey method * [PM-2297] Add methods to DeviceTrustCryptoService update decryption options model * [PM-2297] Update account decryption options model * [PM-2297] Fix TrustedDeviceOption and DeviceResponse model. Change StateService device key get set to have default user id * [PM-2297] Update navigation to decryption options * [PM-2297] Add missing action navigations to iOS extensions * [PM-2297] Fix trust device bug/typo * [PM-2297] Fix model bug * [PM-2297] Fix state var crash * [PM-2297] Add trust device login logic to auth service * [PM-2297] Refactor auth service key connector code * [PM-2297] Remove reconciledOptions for deviceKey in state service * [PM-2297] Remove unnecessary user id params * [PM-2289] [PM-2293] TDE Login with device Admin Request (#2642) * [PM-2713] deconstruct new key pair * [PM-2713] rename PrivateKey methods to UserPrivateKey on crypto service * [PM-2713] rename PinLockEnum to PinLockType * [PM-2713] don't pass user key as param when encrypting * [PM-2713] rename toggle method, don't reset enc user key * [PM-2713] pr feedback * [PM-2713] PR feedback * [PM-2713] rename get pin lock type method * [PM-2713] revert feedback for build * [PM-2713] rename state methods * [PM-2713] combine makeDataEncKey methods * [PM-2713] consolidate attachment key creation - also fix ios files missed during symbol rename * [PM-2713] replace generic with inherited class * rename account keys to be more descriptive * [PM-2713] add auto unlock key to mobile * [PM-1208] Add TDE flows for new users (#2655) * [PM-1208] Create new user on SSO. Logout if not password is setup or has pending admin auth request. * [PM-1208] Fix new user UserKey decryption. * [PM-1208] Add new user continue to vault logic. Auto enrol user on continue. * [PM-1208] Trust device only if needed * [PM-1208] Add logic for New User SSO. * [PM-1208] Add logic for New User SSO (missing file). * [PM-2713] set user key on set password page * [PM-2713] set enc user key during kc onboarding * fix formatting * [PM-2713] make method async again - returning null from a task thats not async throws * [PM-2713] clear service cache when adding new account * Fix build after merge * [PM-3313] Fix Android SSO Login (#2663) * [PM-3313] Catch exception on AuthPendingRequest * [PM-3313] Fix lock timeout action if user doesn't have a master password. * code format * [PM-3313] Null email in Approval Options screen (#2664) * [PM-3313] Fix null email in approval options screen * [PM-3320][PM-3321] Fix labels and UI tweaks (#2666) * [PM-3320] Fix UI copy and remember me default ON. * [PM-3321] Fix UI on Log in with device screen. * [PM-3337] Fix admin request deny error (#2669) * [PM-3342] Not you button logs user out. (#2672) * [PM-3319] Check for admin request in Lock page (#2668) * [PM-3319] Ignore admin auth request when choosing mp as decryption option. * [PM-2289] Change header title based on auth request type (#2670) * [PM-2289] Change header title based on auth request type * [PM-3333] Check for purged admin auth requests (#2671) * [PM-3333] Check for purged admin auth requests Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> --------- Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> * [PM-3341] Vault Timeout Action not persisted correctly (#2673) * [PM-3341] Fix timeout action change when navigating * [PM-3357] Fix copy for Login Initiated (#2674) * [PM-3362] Fix auth request approval (#2675) * [PM-3362] Fix auth request approval * [PM-3362] Add new exception type * [PM-3102] Update Master password reprompt to be based on MP instead of Key Connector (#2653) * PM-3102 Added check to see if a user has master password set replacing previous usage of key connector. * PM-3102 Fix formatting * [PM-2713] Final merge from Key Migration branch to TDE Feature branch (#2667) * [PM-2713] add async to key connector service methods * [PM-2713] rename ephemeral pin key * add state for biometric key and accept UserKey instead of string for auto key * Get UserKey from bio state on unlock * PM-2713 Fix auto-migrating EncKeyEncrypted into MasterKey encrypted UserKey when requesting DecryptUserKeyWithMasterKeyAsync is called * renaming bio key and fix build * PM-3194 Fix biometrics button to be shown on upgrade when no UserKey is present yet * revert removal of key connector service from auth service * PM-2713 set user key when using KC * clear enc user key after migration * use is true for nullable bool * PR feedback, refactor kc service --------- Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> * Fix app fresh install user login with master password. (#2676) * [PM-3303] Fix biometric login after key migration (#2679) * [PM-3303] Add condition to biometric unlock * [PM-3381] Fix TDE login 2FA flow (#2678) * [PM-3381] Check for vault lock on 2FA screen * [PM-3381] Move logic to ViewModel * [PM-3381] Fix null vm error * [PM-3379] Fix key rotation on trusted device. (#2680) * [PM-3381] Update login flows (#2683) * [PM-3381] Update login flows * [PM-3381] Remove _authingWithSso parameter * PM-3385 Fix MP reprompt item level when no MP hash is stored like logging in with TDE. Also refactor code to be more maintainable (#2687) * PM-3386 Fix MP reprompt / OTP decision to be also based on the master key hash. (#2688) * PM-3450 Fix has master password with mp key hash check (#2689) * [PM-3394] Fix login with device for passwordless approvals (#2686) * set activeUserId to null when logging in a new account - Also stop the user key from being set in inactive accounts * get token for login with device if approving device doesn't have master key * add comment * simplify logic * check for route instead of using isAuthenticated - we don't clear the user id when logging in new account - this means we can't trust the state service, so we have to base our logic off the route in login with device * use authenticated auth request for tde login with device * [PM-3394] Add authingWithSso parameter to LoginPasswordlessRequestPage. * pr feedback * [PM-3394] Refactor condition Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> --------- Co-authored-by: André Bispo <abispo@bitwarden.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> * [PM-3462] Handle force password reset on mobile with TDE (#2694) * [PM-3462] Handle force password reset on mobile with TDE * [PM-3462] update references to refactored crypto method - fix kc bug, we were sending private key instead of user key to server - rename kc service method to be correct * [PM-3462] Update TwoFactorPage login logic * [PM-3462] Added pending admin request check to TwoFactorPage * [PM-3462] Added new exception types for null keys --------- Co-authored-by: André Bispo <abispo@bitwarden.com> * [PM-1029] Fix Async suffix in ApiService. Add UserKeyNullExceptions. * [PM 3513] Fix passwordless 2fa login with device on mobile (#2700) * [PM-3513] Fix 2FA for normal login with device with users without mp * move _userKey --------- Co-authored-by: André Bispo <abispo@bitwarden.com> * clear encrypted pin on logout (#2699) --------- Co-authored-by: André Bispo <abispo@bitwarden.com> Co-authored-by: Jake Fink <jfink@bitwarden.com> Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>
383 lines
20 KiB
C#
383 lines
20 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Linq.Expressions;
|
|
using System.Net.Http;
|
|
using System.Text;
|
|
using System.Threading.Tasks;
|
|
using Bit.Core.Abstractions;
|
|
using Bit.Core.Enums;
|
|
using Bit.Core.Exceptions;
|
|
using Bit.Core.Models.Data;
|
|
using Bit.Core.Models.Domain;
|
|
using Bit.Core.Models.Request;
|
|
using Bit.Core.Models.Response;
|
|
using Bit.Core.Models.View;
|
|
using Bit.Core.Services;
|
|
using Bit.Core.Test.AutoFixture;
|
|
using Bit.Core.Utilities;
|
|
using Bit.Test.Common;
|
|
using Bit.Test.Common.AutoFixture;
|
|
using Bit.Test.Common.AutoFixture.Attributes;
|
|
using Newtonsoft.Json;
|
|
using NSubstitute;
|
|
using NSubstitute.ExceptionExtensions;
|
|
using Xunit;
|
|
|
|
namespace Bit.Core.Test.Services
|
|
{
|
|
public class SendServiceTests
|
|
{
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) })]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(FileSendCustomization) })]
|
|
public async Task ReplaceAsync_Success(SutProvider<SendService> sutProvider, string userId, IEnumerable<SendData> sendDatas)
|
|
{
|
|
var actualSendDataDict = sendDatas.ToDictionary(d => d.Id, d => d);
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
|
|
await sutProvider.Sut.ReplaceAsync(actualSendDataDict);
|
|
|
|
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(actualSendDataDict);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) }, 0)]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) }, 1)]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) }, 2)]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) }, 3)]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) }, 4)]
|
|
public async Task DeleteAsync_Success(int numberToDelete, SutProvider<SendService> sutProvider, string userId, IEnumerable<SendData> sendDatas)
|
|
{
|
|
var actualSendDataDict = sendDatas.ToDictionary(d => d.Id, d => d);
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(actualSendDataDict);
|
|
|
|
var idsToDelete = actualSendDataDict.Take(numberToDelete).Select(kvp => kvp.Key).ToArray();
|
|
var expectedSends = actualSendDataDict.Skip(numberToDelete).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
|
|
|
|
await sutProvider.Sut.DeleteAsync(idsToDelete);
|
|
|
|
|
|
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(
|
|
Arg.Is<Dictionary<string, SendData>>(s => TestHelper.AssertEqualExpectedPredicate(expectedSends)(s)));
|
|
}
|
|
|
|
[Theory, SutAutoData]
|
|
public async Task ClearAsync_Success(SutProvider<SendService> sutProvider, string userId)
|
|
{
|
|
await sutProvider.Sut.ClearAsync(userId);
|
|
|
|
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(null, userId);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) })]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(FileSendCustomization) })]
|
|
public async Task DeleteWithServerAsync_Success(SutProvider<SendService> sutProvider, string userId, IEnumerable<SendData> sendDatas)
|
|
{
|
|
var initialSendDatas = sendDatas.ToDictionary(d => d.Id, d => d);
|
|
var idToDelete = initialSendDatas.First().Key;
|
|
var expectedSends = initialSendDatas.Skip(1).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
sutProvider.GetDependency<IStateService>()
|
|
.GetEncryptedSendsAsync(Arg.Any<string>()).Returns(initialSendDatas);
|
|
|
|
await sutProvider.Sut.DeleteWithServerAsync(idToDelete);
|
|
|
|
await sutProvider.GetDependency<IApiService>().Received(1).DeleteSendAsync(idToDelete);
|
|
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(
|
|
Arg.Is<Dictionary<string, SendData>>(s => TestHelper.AssertEqualExpectedPredicate(expectedSends)(s)));
|
|
}
|
|
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) })]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(FileSendCustomization) })]
|
|
public async Task GetAsync_Success(SutProvider<SendService> sutProvider, string userId, IEnumerable<SendData> sendDatas)
|
|
{
|
|
var sendDataDict = sendDatas.ToDictionary(d => d.Id, d => d);
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(sendDataDict);
|
|
|
|
foreach (var dataKvp in sendDataDict)
|
|
{
|
|
var expected = new Send(dataKvp.Value);
|
|
var actual = await sutProvider.Sut.GetAsync(dataKvp.Key);
|
|
TestHelper.AssertPropertyEqual(expected, actual);
|
|
}
|
|
}
|
|
|
|
[Theory, SutAutoData]
|
|
public async Task GetAsync_NonExistingId_ReturnsNull(SutProvider<SendService> sutProvider, string userId, IEnumerable<SendData> sendDatas)
|
|
{
|
|
var sendDataDict = sendDatas.ToDictionary(d => d.Id, d => d);
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(sendDataDict);
|
|
|
|
var actual = await sutProvider.Sut.GetAsync(Guid.NewGuid().ToString());
|
|
|
|
Assert.Null(actual);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) })]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(FileSendCustomization) })]
|
|
public async Task GetAllAsync_Success(SutProvider<SendService> sutProvider, string userId, IEnumerable<SendData> sendDatas)
|
|
{
|
|
var sendDataDict = sendDatas.ToDictionary(d => d.Id, d => d);
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(sendDataDict);
|
|
|
|
var allExpected = sendDataDict.Select(kvp => new Send(kvp.Value));
|
|
var allActual = await sutProvider.Sut.GetAllAsync();
|
|
foreach (var (actual, expected) in allActual.Zip(allExpected))
|
|
{
|
|
TestHelper.AssertPropertyEqual(expected, actual);
|
|
}
|
|
}
|
|
|
|
[Theory, SutAutoData]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) })]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(FileSendCustomization) })]
|
|
public async Task GetAllDecryptedAsync_Success(SutProvider<SendService> sutProvider, string userId, IEnumerable<SendData> sendDatas)
|
|
{
|
|
// TODO restore this once race condition is fixed or GHA can re-run jobs on individual platforms
|
|
return;
|
|
|
|
var sendDataDict = sendDatas.ToDictionary(d => d.Id, d => d);
|
|
sutProvider.GetDependency<ICryptoService>().HasUserKeyAsync().Returns(true);
|
|
ServiceContainer.Register("cryptoService", sutProvider.GetDependency<ICryptoService>());
|
|
sutProvider.GetDependency<II18nService>().StringComparer.Returns(StringComparer.CurrentCulture);
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(sendDataDict);
|
|
|
|
var actual = await sutProvider.Sut.GetAllDecryptedAsync();
|
|
|
|
Assert.Equal(sendDataDict.Count, actual.Count);
|
|
foreach (var (actualView, expectedId) in actual.Zip(sendDataDict.Select(s => s.Key)))
|
|
{
|
|
// Note Send -> SendView is tested in SendTests
|
|
Assert.Equal(expectedId, actualView.Id);
|
|
}
|
|
|
|
ServiceContainer.Reset();
|
|
}
|
|
|
|
// SaveWithServer()
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) })]
|
|
public async Task SaveWithServerAsync_NewTextSend_Success(SutProvider<SendService> sutProvider, string userId, SendResponse response, Send send)
|
|
{
|
|
send.Id = null;
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
sutProvider.GetDependency<IApiService>().PostSendAsync(Arg.Any<SendRequest>()).Returns(response);
|
|
|
|
var fileContentBytes = new EncByteArray(Encoding.UTF8.GetBytes("This is the file content"));
|
|
|
|
await sutProvider.Sut.SaveWithServerAsync(send, fileContentBytes);
|
|
|
|
Predicate<SendRequest> sendRequestPredicate = r =>
|
|
{
|
|
// Note Send -> SendRequest tested in SendRequestTests
|
|
TestHelper.AssertPropertyEqual(new SendRequest(send, fileContentBytes.Buffer?.LongLength), r);
|
|
return true;
|
|
};
|
|
|
|
switch (send.Type)
|
|
{
|
|
case SendType.Text:
|
|
await sutProvider.GetDependency<IApiService>().Received(1)
|
|
.PostSendAsync(Arg.Is<SendRequest>(r => sendRequestPredicate(r)));
|
|
break;
|
|
case SendType.File:
|
|
default:
|
|
throw new Exception("Untested send type");
|
|
}
|
|
}
|
|
|
|
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(FileSendCustomization) })]
|
|
public async Task SaveWithServerAsync_NewFileSend_AzureUpload_Success(SutProvider<SendService> sutProvider, string userId, SendFileUploadDataResponse response, Send send)
|
|
{
|
|
send.Id = null;
|
|
response.FileUploadType = FileUploadType.Azure;
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
sutProvider.GetDependency<IApiService>().PostFileTypeSendAsync(Arg.Any<SendRequest>()).Returns(response);
|
|
|
|
var fileContentBytes = new EncByteArray(Encoding.UTF8.GetBytes("This is the file content"));
|
|
|
|
await sutProvider.Sut.SaveWithServerAsync(send, fileContentBytes);
|
|
|
|
switch (send.Type)
|
|
{
|
|
case SendType.File:
|
|
await sutProvider.GetDependency<IFileUploadService>().Received(1).UploadSendFileAsync(response, send.File.FileName, fileContentBytes);
|
|
break;
|
|
case SendType.Text:
|
|
default:
|
|
throw new Exception("Untested send type");
|
|
}
|
|
}
|
|
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(FileSendCustomization) })]
|
|
public async Task SaveWithServerAsync_NewFileSend_LegacyFallback_Success(SutProvider<SendService> sutProvider, string userId, Send send, SendResponse response)
|
|
{
|
|
send.Id = null;
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
var error = new ErrorResponse(null, System.Net.HttpStatusCode.NotFound);
|
|
sutProvider.GetDependency<IApiService>().PostFileTypeSendAsync(Arg.Any<SendRequest>()).Throws(new ApiException(error));
|
|
sutProvider.GetDependency<IApiService>().PostSendFileAsync(Arg.Any<MultipartFormDataContent>()).Returns(response);
|
|
|
|
var fileContentBytes = new EncByteArray(Encoding.UTF8.GetBytes("This is the file content"));
|
|
|
|
await sutProvider.Sut.SaveWithServerAsync(send, fileContentBytes);
|
|
|
|
await sutProvider.GetDependency<IApiService>().Received(1).PostSendFileAsync(Arg.Any<MultipartFormDataContent>());
|
|
}
|
|
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) })]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(FileSendCustomization) })]
|
|
public async Task SaveWithServerAsync_PutSend_Success(SutProvider<SendService> sutProvider, string userId, SendResponse response, Send send)
|
|
{
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
sutProvider.GetDependency<IApiService>().PutSendAsync(send.Id, Arg.Any<SendRequest>()).Returns(response);
|
|
|
|
await sutProvider.Sut.SaveWithServerAsync(send, null);
|
|
|
|
Predicate<SendRequest> sendRequestPredicate = r =>
|
|
{
|
|
// Note Send -> SendRequest tested in SendRequestTests
|
|
TestHelper.AssertPropertyEqual(new SendRequest(send, null), r);
|
|
return true;
|
|
};
|
|
|
|
await sutProvider.GetDependency<IApiService>().Received(1)
|
|
.PutSendAsync(send.Id, Arg.Is<SendRequest>(r => sendRequestPredicate(r)));
|
|
}
|
|
|
|
[Theory, SutAutoData]
|
|
public async Task RemovePasswordWithServerAsync_Success(SutProvider<SendService> sutProvider, SendResponse response, string sendId)
|
|
{
|
|
sutProvider.GetDependency<IApiService>().PutSendRemovePasswordAsync(sendId).Returns(response);
|
|
|
|
await sutProvider.Sut.RemovePasswordWithServerAsync(sendId);
|
|
|
|
await sutProvider.GetDependency<IApiService>().Received(1).PutSendRemovePasswordAsync(sendId);
|
|
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(default, default);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) })]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(FileSendCustomization) })]
|
|
public async Task UpsertAsync_Update_Success(SutProvider<SendService> sutProvider, string userId, IEnumerable<SendData> initialSends)
|
|
{
|
|
var initialSendDict = initialSends.ToDictionary(s => s.Id, s => s);
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(initialSendDict);
|
|
|
|
var updatedSends = CoreHelpers.Clone(initialSendDict);
|
|
foreach (var kvp in updatedSends)
|
|
{
|
|
kvp.Value.Disabled = !kvp.Value.Disabled;
|
|
}
|
|
|
|
await sutProvider.Sut.UpsertAsync(updatedSends.Values.ToArray());
|
|
|
|
Predicate<Dictionary<string, SendData>> matchSendsPredicate = actual =>
|
|
{
|
|
Assert.Equal(updatedSends.Count, actual.Count);
|
|
foreach (var (expectedKvp, actualKvp) in updatedSends.Zip(actual))
|
|
{
|
|
Assert.Equal(expectedKvp.Key, actualKvp.Key);
|
|
TestHelper.AssertPropertyEqual(expectedKvp.Value, actualKvp.Value);
|
|
}
|
|
return true;
|
|
};
|
|
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(
|
|
Arg.Is<Dictionary<string, SendData>>(d => matchSendsPredicate(d)));
|
|
}
|
|
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(TextSendCustomization) })]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(FileSendCustomization) })]
|
|
public async Task UpsertAsync_NewSends_Success(SutProvider<SendService> sutProvider, string userId, IEnumerable<SendData> initialSends, IEnumerable<SendData> newSends)
|
|
{
|
|
var initialSendDict = initialSends.ToDictionary(s => s.Id, s => s);
|
|
sutProvider.GetDependency<IStateService>().GetActiveUserIdAsync().Returns(userId);
|
|
sutProvider.GetDependency<IStateService>().GetEncryptedSendsAsync().Returns(initialSendDict);
|
|
|
|
var expectedDict = CoreHelpers.Clone(initialSendDict).Concat(newSends.Select(s => new KeyValuePair<string, SendData>(s.Id, s)));
|
|
|
|
await sutProvider.Sut.UpsertAsync(newSends.ToArray());
|
|
|
|
Predicate<Dictionary<string, SendData>> matchSendsPredicate = actual =>
|
|
{
|
|
Assert.Equal(expectedDict.Count(), actual.Count);
|
|
foreach (var (expectedKvp, actualKvp) in expectedDict.Zip(actual))
|
|
{
|
|
Assert.Equal(expectedKvp.Key, actualKvp.Key);
|
|
TestHelper.AssertPropertyEqual(expectedKvp.Value, actualKvp.Value);
|
|
}
|
|
return true;
|
|
};
|
|
await sutProvider.GetDependency<IStateService>().SetEncryptedSendsAsync(
|
|
Arg.Is<Dictionary<string, SendData>>(d => matchSendsPredicate(d)));
|
|
}
|
|
|
|
[Theory]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(SymmetricCryptoKeyCustomization), typeof(TextSendCustomization) })]
|
|
[InlineCustomAutoData(new[] { typeof(SutProviderCustomization), typeof(SymmetricCryptoKeyCustomization), typeof(FileSendCustomization) })]
|
|
public async Task EncryptAsync_Success(SutProvider<SendService> sutProvider, SendView view, byte[] fileData, SymmetricCryptoKey privateKey)
|
|
{
|
|
var prefix = "encrypted_";
|
|
var prefixBytes = Encoding.UTF8.GetBytes(prefix);
|
|
|
|
|
|
byte[] getPbkdf(string password, byte[] key) =>
|
|
prefixBytes.Concat(Encoding.UTF8.GetBytes(password)).Concat(key).ToArray();
|
|
EncString encryptBytes(byte[] secret, SymmetricCryptoKey key) =>
|
|
new EncString($"{prefix}{Convert.ToBase64String(secret)}{Convert.ToBase64String(key.Key)}");
|
|
EncString encrypt(string secret, SymmetricCryptoKey key) =>
|
|
new EncString($"{prefix}{secret}{Convert.ToBase64String(key.Key)}");
|
|
EncByteArray encryptFileBytes(byte[] secret, SymmetricCryptoKey key) =>
|
|
new EncByteArray(secret.Concat(key.Key).ToArray());
|
|
|
|
sutProvider.GetDependency<ICryptoFunctionService>().Pbkdf2Async(Arg.Any<string>(), Arg.Any<byte[]>(), Arg.Any<CryptoHashAlgorithm>(), Arg.Any<int>())
|
|
.Returns(info => getPbkdf((string)info[0], (byte[])info[1]));
|
|
sutProvider.GetDependency<ICryptoService>().EncryptAsync(Arg.Any<byte[]>(), Arg.Any<SymmetricCryptoKey>())
|
|
.Returns(info => encryptBytes((byte[])info[0], (SymmetricCryptoKey)info[1]));
|
|
sutProvider.GetDependency<ICryptoService>().EncryptAsync(Arg.Any<string>(), Arg.Any<SymmetricCryptoKey>())
|
|
.Returns(info => encrypt((string)info[0], (SymmetricCryptoKey)info[1]));
|
|
sutProvider.GetDependency<ICryptoService>().EncryptToBytesAsync(Arg.Any<byte[]>(), Arg.Any<SymmetricCryptoKey>())
|
|
.Returns(info => encryptFileBytes((byte[])info[0], (SymmetricCryptoKey)info[1]));
|
|
|
|
var (send, encryptedFileData) = await sutProvider.Sut.EncryptAsync(view, fileData, view.Password, privateKey);
|
|
|
|
TestHelper.AssertPropertyEqual(view, send, "Password", "Key", "Name", "Notes", "Text", "File",
|
|
"AccessCount", "AccessId", "CryptoKey", "RevisionDate", "DeletionDate", "ExpirationDate", "UrlB64Key",
|
|
"MaxAccessCountReached", "Expired", "PendingDelete", "HasPassword", "DisplayDate");
|
|
Assert.Equal(Convert.ToBase64String(getPbkdf(view.Password, view.Key)), send.Password);
|
|
TestHelper.AssertPropertyEqual(encryptBytes(view.Key, privateKey), send.Key);
|
|
TestHelper.AssertPropertyEqual(encrypt(view.Name, view.CryptoKey), send.Name);
|
|
TestHelper.AssertPropertyEqual(encrypt(view.Notes, view.CryptoKey), send.Notes);
|
|
|
|
switch (view.Type)
|
|
{
|
|
case SendType.Text:
|
|
TestHelper.AssertPropertyEqual(view.Text, send.Text, "Text", "MaskedText");
|
|
TestHelper.AssertPropertyEqual(encrypt(view.Text.Text, view.CryptoKey), send.Text.Text);
|
|
break;
|
|
case SendType.File:
|
|
// Only set filename
|
|
TestHelper.AssertPropertyEqual(encrypt(view.File.FileName, view.CryptoKey), send.File.FileName);
|
|
Assert.Equal(encryptFileBytes(fileData, view.CryptoKey).Buffer, encryptedFileData.Buffer);
|
|
break;
|
|
default:
|
|
throw new Exception("Untested send type");
|
|
}
|
|
}
|
|
}
|
|
}
|