Public Access
jaap-jan
8d2416a602
Three new client projects, and the wire-contract fix they needed. DodoSSH.Client.Domain holds the decrypted item model and the three-way merge, with no I/O at all — so the suite that decides whether a credential can be lost runs in milliseconds with nothing to mock. Scalars defer to the server on a genuine clash so every replica resolves the same triple identically and two clients cannot ping-pong; directives merge per name so two people each adding one both keep theirs; the jump chain merges as a whole value because its order is the route. Whatever loses is returned rather than dropped. DodoSSH.Client.Storage is EF Core on SQLite, no SQLCipher: the rows are already ciphertext, so an encrypted file would protect protected bytes at the cost of a native dependency. It keeps the server's state and the outbox in separate tables, which is what preserves the common ancestor a merge needs. One pending operation per item, enforced by a unique index. DodoSSH.Client.Sync is the pull/apply/push loop. Pulling never decrypts — a change with no local work pending is plumbed as ciphertext — so a first sync of thousands of items does not run twice as many AEAD operations for nothing. Contracts: EncryptedPayload gains WrappedDataKey and DataKeyId. The specification has required a per-item data key since crypto.md §3, the columns have existed since the first migration and DshAad.ItemPayload binds the id, but this record had nowhere to put either — so a spec-compliant item could not be transmitted at all. Found by writing the client that has to produce one. Also closes a hole in AadResourceType, which had no value for the HostTag and HostCredential that SyncEntityType has always listed. Four bugs the tests found, not review: - SQLite refuses to order or compare its own DateTimeOffset mapping, and throws at execution rather than model build. Collecting tombstones and listing conflicts are both that shape, so this was a crash waiting for the first user with a deleted host. Timestamps are integers now, by convention so a later field cannot be the one left unconverted. - SQLitePCLRaw 2.1.11, which EF resolves, is covered by GHSA-2m69-gcr7-jv3q. Pinned forward as a family. - Resurrecting content from a remote deletion cleared the original before queueing the copy. Two transactions, so a crash between them lost the work; reversed, and the rescued id is derived from the tombstone so a replay coalesces instead of duplicating. - Several equality assertions went through Shouldly's ShouldBe, which compares IEnumerable element-wise and so tested nothing about the Equals these types exist to provide. Corrected; the falsification that caught it went from 2 failures to 6. The push response's cursor is deliberately ignored. It sits after this client's own writes, so adopting it skips anything another client committed at a lower sequence in the window between a pull and a push — permanently. Re-reading one's own writes is idempotent and costs a page. The Contracts doc that invited the shortcut now says so. 593 tests, up from 448. The delete-versus-edit rules, the ancestor retention, the fresh operation id on coalesce and the cursor safeguard were each verified by breaking them and watching the right test fail.
409 lines
15 KiB
C#
409 lines
15 KiB
C#
// <auto-generated />
|
|
using System;
|
|
using DodoSSH.Client.Storage;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
|
using Microsoft.EntityFrameworkCore.Migrations;
|
|
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
|
|
|
#nullable disable
|
|
|
|
namespace DodoSSH.Client.Storage.Migrations
|
|
{
|
|
[DbContext(typeof(ClientCacheContext))]
|
|
[Migration("20260729080003_InitialCache")]
|
|
partial class InitialCache
|
|
{
|
|
/// <inheritdoc />
|
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
|
{
|
|
#pragma warning disable 612, 618
|
|
modelBuilder.HasAnnotation("ProductVersion", "10.0.10");
|
|
|
|
modelBuilder.Entity("DodoSSH.Client.Storage.CachedItemRow", b =>
|
|
{
|
|
b.Property<Guid>("VaultId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("vault_id");
|
|
|
|
b.Property<int>("EntityType")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("entity_type");
|
|
|
|
b.Property<Guid>("EntityId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("entity_id");
|
|
|
|
b.Property<byte>("AadVersion")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("aad_version");
|
|
|
|
b.Property<long>("ChangeSequence")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("change_sequence");
|
|
|
|
b.Property<Guid?>("DataKeyId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("data_key_id");
|
|
|
|
b.Property<bool>("IsDeleted")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("is_deleted");
|
|
|
|
b.Property<uint>("KeyGeneration")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("key_generation");
|
|
|
|
b.Property<byte[]>("Payload")
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("payload");
|
|
|
|
b.Property<byte[]>("ProtectedFields")
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("protected_fields");
|
|
|
|
b.Property<long>("UpdatedAtUtc")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("updated_at_utc");
|
|
|
|
b.Property<int>("Version")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("version");
|
|
|
|
b.Property<byte[]>("WrappedDataKey")
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("wrapped_data_key");
|
|
|
|
b.HasKey("VaultId", "EntityType", "EntityId")
|
|
.HasName("pk_item");
|
|
|
|
b.HasIndex("VaultId", "ChangeSequence")
|
|
.HasDatabaseName("ix_item_vault_id_change_sequence");
|
|
|
|
b.HasIndex("VaultId", "EntityType")
|
|
.HasDatabaseName("ix_item_vault_id_entity_type");
|
|
|
|
b.ToTable("item", (string)null);
|
|
});
|
|
|
|
modelBuilder.Entity("DodoSSH.Client.Storage.CachedVaultRow", b =>
|
|
{
|
|
b.Property<Guid>("VaultId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("vault_id");
|
|
|
|
b.Property<bool>("IsPersonal")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("is_personal");
|
|
|
|
b.Property<uint>("KeyGeneration")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("key_generation");
|
|
|
|
b.Property<string>("Name")
|
|
.IsRequired()
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("name");
|
|
|
|
b.Property<int>("Permissions")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("permissions");
|
|
|
|
b.Property<bool>("RekeyRequired")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("rekey_required");
|
|
|
|
b.Property<Guid?>("TeamId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("team_id");
|
|
|
|
b.Property<long>("UpdatedAtUtc")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("updated_at_utc");
|
|
|
|
b.Property<byte[]>("WrappedVaultKey")
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("wrapped_vault_key");
|
|
|
|
b.HasKey("VaultId")
|
|
.HasName("pk_vault");
|
|
|
|
b.ToTable("vault", (string)null);
|
|
});
|
|
|
|
modelBuilder.Entity("DodoSSH.Client.Storage.ConflictRow", b =>
|
|
{
|
|
b.Property<Guid>("Id")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("id");
|
|
|
|
b.Property<bool>("Acknowledged")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("acknowledged");
|
|
|
|
b.Property<byte[]>("Detail")
|
|
.IsRequired()
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("detail");
|
|
|
|
b.Property<long>("DetectedAtUtc")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("detected_at_utc");
|
|
|
|
b.Property<Guid>("EntityId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("entity_id");
|
|
|
|
b.Property<int>("EntityType")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("entity_type");
|
|
|
|
b.Property<int>("Kind")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("kind");
|
|
|
|
b.Property<Guid>("VaultId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("vault_id");
|
|
|
|
b.HasKey("Id")
|
|
.HasName("pk_conflict");
|
|
|
|
b.HasIndex("VaultId", "Acknowledged")
|
|
.HasDatabaseName("ix_conflict_vault_id_acknowledged");
|
|
|
|
b.HasIndex("VaultId", "EntityType", "EntityId")
|
|
.HasDatabaseName("ix_conflict_vault_id_entity_type_entity_id");
|
|
|
|
b.ToTable("conflict", (string)null);
|
|
});
|
|
|
|
modelBuilder.Entity("DodoSSH.Client.Storage.OutboxRow", b =>
|
|
{
|
|
b.Property<long>("Sequence")
|
|
.ValueGeneratedOnAdd()
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("sequence");
|
|
|
|
b.Property<byte>("AadVersion")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("aad_version");
|
|
|
|
b.Property<byte?>("AncestorAadVersion")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("ancestor_aad_version");
|
|
|
|
b.Property<Guid?>("AncestorDataKeyId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("ancestor_data_key_id");
|
|
|
|
b.Property<uint?>("AncestorKeyGeneration")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("ancestor_key_generation");
|
|
|
|
b.Property<byte[]>("AncestorPayload")
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("ancestor_payload");
|
|
|
|
b.Property<byte[]>("AncestorProtectedFields")
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("ancestor_protected_fields");
|
|
|
|
b.Property<int?>("AncestorVersion")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("ancestor_version");
|
|
|
|
b.Property<byte[]>("AncestorWrappedDataKey")
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("ancestor_wrapped_data_key");
|
|
|
|
b.Property<int>("Attempts")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("attempts");
|
|
|
|
b.Property<Guid?>("DataKeyId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("data_key_id");
|
|
|
|
b.Property<Guid>("EntityId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("entity_id");
|
|
|
|
b.Property<int>("EntityType")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("entity_type");
|
|
|
|
b.Property<int?>("ExpectedVersion")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("expected_version");
|
|
|
|
b.Property<bool>("IsParked")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("is_parked");
|
|
|
|
b.Property<uint>("KeyGeneration")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("key_generation");
|
|
|
|
b.Property<string>("LastError")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("last_error");
|
|
|
|
b.Property<int>("Operation")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("operation");
|
|
|
|
b.Property<Guid>("OperationId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("operation_id");
|
|
|
|
b.Property<byte[]>("Payload")
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("payload");
|
|
|
|
b.Property<byte[]>("ProtectedFields")
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("protected_fields");
|
|
|
|
b.Property<long>("QueuedAtUtc")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("queued_at_utc");
|
|
|
|
b.Property<Guid>("VaultId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("vault_id");
|
|
|
|
b.Property<byte[]>("WrappedDataKey")
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("wrapped_data_key");
|
|
|
|
b.HasKey("Sequence")
|
|
.HasName("pk_outbox");
|
|
|
|
b.HasIndex("OperationId")
|
|
.IsUnique()
|
|
.HasDatabaseName("ix_outbox_operation_id");
|
|
|
|
b.HasIndex("VaultId", "EntityType", "EntityId")
|
|
.IsUnique()
|
|
.HasDatabaseName("ix_outbox_vault_id_entity_type_entity_id");
|
|
|
|
b.HasIndex("VaultId", "IsParked", "Sequence")
|
|
.HasDatabaseName("ix_outbox_vault_id_is_parked_sequence");
|
|
|
|
b.ToTable("outbox", (string)null);
|
|
});
|
|
|
|
modelBuilder.Entity("DodoSSH.Client.Storage.SyncStateRow", b =>
|
|
{
|
|
b.Property<Guid>("VaultId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("vault_id");
|
|
|
|
b.Property<string>("Cursor")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("cursor");
|
|
|
|
b.Property<uint>("KeyGeneration")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("key_generation");
|
|
|
|
b.Property<long?>("LastPulledAtUtc")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("last_pulled_at_utc");
|
|
|
|
b.Property<long?>("LastPushedAtUtc")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("last_pushed_at_utc");
|
|
|
|
b.Property<long>("ServerTimeSkewMs")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("server_time_skew_ms");
|
|
|
|
b.HasKey("VaultId")
|
|
.HasName("pk_sync_state");
|
|
|
|
b.ToTable("sync_state", (string)null);
|
|
});
|
|
|
|
modelBuilder.Entity("DodoSSH.Client.Storage.UnlockMaterialRow", b =>
|
|
{
|
|
b.Property<int>("Id")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("id");
|
|
|
|
b.Property<string>("DisplayName")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("display_name");
|
|
|
|
b.Property<string>("Email")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("email");
|
|
|
|
b.Property<string>("Issuer")
|
|
.IsRequired()
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("issuer");
|
|
|
|
b.Property<string>("KdfAlgorithm")
|
|
.IsRequired()
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("kdf_algorithm");
|
|
|
|
b.Property<int>("KdfMemoryKibibytes")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("kdf_memory_kibibytes");
|
|
|
|
b.Property<int>("KdfParallelism")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("kdf_parallelism");
|
|
|
|
b.Property<int>("KdfPasses")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("kdf_passes");
|
|
|
|
b.Property<byte[]>("KdfSalt")
|
|
.IsRequired()
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("kdf_salt");
|
|
|
|
b.Property<uint>("KeyGeneration")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("key_generation");
|
|
|
|
b.Property<string>("ServerUrl")
|
|
.IsRequired()
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("server_url");
|
|
|
|
b.Property<string>("Subject")
|
|
.IsRequired()
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("subject");
|
|
|
|
b.Property<long>("UpdatedAtUtc")
|
|
.HasColumnType("INTEGER")
|
|
.HasColumnName("updated_at_utc");
|
|
|
|
b.Property<Guid>("UserId")
|
|
.HasColumnType("TEXT")
|
|
.HasColumnName("user_id");
|
|
|
|
b.Property<byte[]>("WrappedPrivateKey")
|
|
.IsRequired()
|
|
.HasColumnType("BLOB")
|
|
.HasColumnName("wrapped_private_key");
|
|
|
|
b.HasKey("Id")
|
|
.HasName("pk_unlock_material");
|
|
|
|
b.ToTable("unlock_material", null, t =>
|
|
{
|
|
t.HasCheckConstraint("ck_unlock_material_singleton", "id = 1");
|
|
});
|
|
});
|
|
#pragma warning restore 612, 618
|
|
}
|
|
}
|
|
}
|