TrueCloudLab/frostfs-sdk-csharp
16
0
Fork 3
Code Issues 5 Pull requests Projects Releases Packages Activity Actions

[22] Client: Container session #25

Merged
PavelGrossSpb merged 1 commit from PavelGrossSpb/frostfs-sdk-csharp:misc/container_session into master 2024-08-19 11:27:24 +00:00
Conversation 0 Commits 1 Files changed 16 +68 -27
16 changed files with 68 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1a02ac2ae7 - Show all commits

6
src/FrostFS.SDK.ClientV2/Parameters/PrmContainerCreate.cs
View file

@ -1,4 +1,5 @@
using FrostFS.SDK.ModelsV2;
using System.Security.Cryptography;
namespace FrostFS.SDK.ClientV2.Parameters;
@ -12,7 +13,8 @@ public sealed class PrmContainerCreate(ModelsV2.Container container) : PrmBase,
/// <value>Rules for polling the result</value>
public PrmWait? WaitParams { get; set; }
public string SessionKey { get; set; }
/// <summary>
/// Blank session token
/// </summary>
public SessionToken? SessionToken { get; set; }
}

4
src/FrostFS.SDK.ClientV2/Parameters/PrmContainerGetAll.cs
View file

@ -1,6 +1,4 @@
using System.Collections.Specialized;
namespace FrostFS.SDK.ClientV2.Parameters;
namespace FrostFS.SDK.ClientV2.Parameters;
public sealed class PrmContainerGetAll() : PrmBase()
{

4
src/FrostFS.SDK.ClientV2/Parameters/PrmNetmapSnapshot.cs
View file

@ -1,6 +1,4 @@
using System.Collections.Specialized;
namespace FrostFS.SDK.ClientV2.Parameters;
namespace FrostFS.SDK.ClientV2.Parameters;
public sealed class PrmNetmapSnapshot() : PrmBase
{

3
src/FrostFS.SDK.ClientV2/Parameters/PrmObjectDelete.cs
View file

@ -1,5 +1,4 @@
using System.Collections.Specialized;
using FrostFS.SDK.ModelsV2;
using FrostFS.SDK.ModelsV2;
namespace FrostFS.SDK.ClientV2.Parameters;

1
src/FrostFS.SDK.ClientV2/Parameters/PrmObjectPut.cs
View file

@ -1,4 +1,3 @@
using System.Collections.Specialized;
using System.IO;
using FrostFS.SDK.ModelsV2;

35
src/FrostFS.SDK.ClientV2/Services/ContainerServiceProvider.cs
View file

@ -10,11 +10,19 @@ using FrostFS.SDK.Cryptography;
using FrostFS.SDK.ModelsV2;
using FrostFS.SDK.ClientV2.Parameters;
using FrostFS.Refs;
using FrostFS.Session;
namespace FrostFS.SDK.ClientV2;
internal class ContainerServiceProvider(ContainerService.ContainerServiceClient service, ClientEnvironment context) : ContextAccessor(context)
internal class ContainerServiceProvider(ContainerService.ContainerServiceClient service, ClientEnvironment context) : ContextAccessor(context), ISessionProvider
{
readonly SessionProvider sessions = new(context);
public async ValueTask<Session.SessionToken> GetOrCreateSession(ISessionToken args, Context ctx)
{
return await sessions.GetOrCreateSession(args, ctx);
}
internal async Task<ModelsV2.Container> GetContainerAsync(PrmContainerGet args)
{
GetRequest request = GetContainerRequest(args.ContainerId.ToMessage(), args.XHeaders, args.Context!);
@ -67,7 +75,18 @@ internal class ContainerServiceProvider(ContainerService.ContainerServiceClient
}
};
request.AddMetaHeader(args.XHeaders);
var sessionToken = await GetOrCreateSession(args, ctx);
sessionToken.CreateContainerTokenContext(
null,
ContainerSessionContext.Types.Verb.Put,
ctx.Key,
ctx.PublicKeyCache);
var v = sessionToken.Body.OwnerId == grpcContainer.OwnerId;
request.AddMetaHeader(args.XHeaders, sessionToken);
request.Sign(ctx.Key);
var response = await service.PutAsync(request, null, ctx.Deadline, ctx.CancellationToken);
@ -91,12 +110,22 @@ internal class ContainerServiceProvider(ContainerService.ContainerServiceClient
}
};
request.AddMetaHeader(args.XHeaders);
var sessionToken = await GetOrCreateSession(args, ctx);
sessionToken.CreateContainerTokenContext(
request.Body.ContainerId,
ContainerSessionContext.Types.Verb.Delete,
ctx.Key,
ctx.PublicKeyCache);
request.AddMetaHeader(args.XHeaders, sessionToken);
request.Sign(ctx.Key);
var response = await service.DeleteAsync(request, null, ctx.Deadline, ctx.CancellationToken);
Verifier.CheckResponse(response);
await WaitForContainer(WaitExpects.Removed, request.Body.ContainerId, args.WaitParams, ctx);
Verifier.CheckResponse(response);

1
src/FrostFS.SDK.ClientV2/Tools/ClientEnvironment.cs
View file

@ -2,7 +2,6 @@ using FrostFS.SDK.ModelsV2;
using Grpc.Net.Client;
using System;
using System.Security.Cryptography;
using FrostFS.SDK.Cryptography;
using System.Buffers;
namespace FrostFS.SDK.ClientV2;

24
src/FrostFS.SDK.ClientV2/Tools/RequestConstructor.cs
View file

@ -4,6 +4,7 @@ using System.Security.Cryptography;
using FrostFS.Refs;
using FrostFS.SDK.ClientV2.Mappers.GRPC;
using FrostFS.SDK.Cryptography;
using FrostFS.SDK.ModelsV2;
using FrostFS.SDK.ProtosV2.Interfaces;
using FrostFS.Session;
@ -47,6 +48,29 @@ public static class RequestConstructor
Verb = verb
};
sessionToken.Body.SessionKey = Google.Protobuf.ByteString.CopyFrom(key.PublicKey());
sessionToken.Signature = key.SignMessagePart(sessionToken.Body);
}
public static void CreateContainerTokenContext(this Session.SessionToken sessionToken,
ContainerID? containerId,
ContainerSessionContext.Types.Verb verb,
ECDsa key,
Google.Protobuf.ByteString publicKey)
{
if (sessionToken.Body.Container?.ContainerId != null)
return;
sessionToken.Body.Container = new (){ Verb = verb };
if (containerId != null)
sessionToken.Body.Container.ContainerId = containerId;
else
sessionToken.Body.Container.Wildcard = true;
sessionToken.Body.SessionKey = publicKey;
sessionToken.Signature = key.SignMessagePart(sessionToken.Body);
}
}

1
src/FrostFS.SDK.ModelsV2/Client/ClientSettings.cs
View file

@ -1,4 +1,3 @@
using Google.Protobuf;
using System;
using System.Collections.Generic;
using System.Text;

1
src/FrostFS.SDK.ModelsV2/Misc/CheckSum.cs
View file

@ -1,6 +1,5 @@
using FrostFS.SDK.Cryptography;
using System;
using System.Security.Cryptography;
namespace FrostFS.SDK.ModelsV2;

1
src/FrostFS.SDK.ModelsV2/Object/FrostFsObject.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Security.Cryptography;
using FrostFS.SDK.ModelsV2.Enums;
namespace FrostFS.SDK.ModelsV2;

2
src/FrostFS.SDK.Tests/Mocks/NetworkMocker.cs
View file

@ -1,9 +1,7 @@
using Moq;
using FrostFS.Netmap;
using Grpc.Core;
using FrostFS.SDK.ClientV2;
fyrchik commented 2024-08-19 11:29:18 +00:00
Review
Copy link

Do we have any linter in C# that can detect unused imports during PR validation?

Do we have any linter in C# that can detect unused imports during PR validation?
PavelGrossSpb commented 2024-08-19 11:32:04 +00:00
Review
Copy link

Not yet. I'm waiting for professinal IDE (JetBrains) to setup such tools.

Not yet. I'm waiting for professinal IDE (JetBrains) to setup such tools.
using Google.Protobuf;
using FrostFS.SDK.ModelsV2;
namespace FrostFS.SDK.Tests;

1
src/FrostFS.SDK.Tests/NetworkTest.cs
View file

@ -8,7 +8,6 @@ using FrostFS.SDK.ModelsV2.Enums;
using Google.Protobuf;
using Microsoft.Extensions.Options;
using System.Security.Cryptography;
using System.Threading;
namespace FrostFS.SDK.Tests;

1
src/FrostFS.SDK.Tests/ObjectTest.cs
View file

@ -7,7 +7,6 @@ using FrostFS.SDK.Cryptography;
using FrostFS.SDK.ModelsV2;
using FrostFS.SDK.ModelsV2.Enums;
using FrostFS.SDK.ModelsV2.Netmap;
using FrostFS.SDK.ProtosV2.Interfaces;
using Google.Protobuf;
using Microsoft.Extensions.Options;
using System.Security.Cryptography;