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

Add memory optimization for message signature #49

Merged
PavelGrossSpb merged 4 commits from PavelGrossSpb/frostfs-sdk-csharp:hashOptimization into master 2025-03-12 08:51:05 +00:00
Conversation 0 Commits 4 Files changed 26 +175 -343
26 changed files with 175 additions and 343 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -49,7 +49,7 @@ var createContainerParam = new PrmContainerCreate(
var containerId = await client.PutContainerAsync(createContainerParam);
using var fileStream = File.OpenRead(@"C:\Users\Paul\Pictures\cat.jpeg");
using var fileStream = File.OpenRead(@"cat.jpeg");
var param = new PrmObjectPut
{

2
src/FrostFS.SDK.Client/AssemblyInfo.cs
View file

@ -5,4 +5,4 @@ using System.Reflection;
[assembly: AssemblyInformationalVersion("1.0.0+d6fe0344538a223303c9295452f0ad73681ca376")]
[assembly: AssemblyProduct("FrostFS.SDK.Client")]
[assembly: AssemblyTitle("FrostFS.SDK.Client")]
[assembly: AssemblyVersion("1.0.2")]
[assembly: AssemblyVersion("1.0.3")]

6
src/FrostFS.SDK.Client/FrostFS.SDK.Client.csproj
View file

@ -24,11 +24,7 @@
</PropertyGroup>
<PropertyGroup>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup>
<GeneratedAssemblyInfoFile>Assemblyinfo.cs</GeneratedAssemblyInfoFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>

2
src/FrostFS.SDK.Client/Models/Netmap/FrostFsNetmapSnapshot.cs
View file

@ -87,7 +87,7 @@ public class FrostFsNetmapSnapshot(ulong epoch, IReadOnlyList<FrostFsNodeInfo> n
if (expr.Selector == null)
{
var lastFilter = expr.Filters[^1];
var lastFilter = expr.Filters.Last();
var subCollestion = new List<FrostFsNodeInfo>();
ret.Add(subCollestion);

4
src/FrostFS.SDK.Client/Models/Netmap/Placement/Context.cs
View file

@ -271,7 +271,7 @@ internal struct Context
var ns = buckets[i].nodes;
if (ns.Length >= maxNodesInBucket)
{
res.Add(new List<FrostFsNodeInfo>(ns[..maxNodesInBucket]));
res.Add(ns.Take(maxNodesInBucket).ToList());
}
else if (ns.Length >= nodesInBucket)
{
@ -353,7 +353,7 @@ internal struct Context
var start = hasPrefix ? likeWildcard.Length : 0;
var end = hasSuffix ? f.Value.Length - likeWildcard.Length : f.Value.Length;
var str = f.Value[start..end];
var str = f.Value.Substring(start, end-start);
if (hasPrefix && hasSuffix)
return nodeInfo.Attributes[f.Key].Contains(str);

4
src/FrostFS.SDK.Client/Models/Session/FrostFsSessionToken.cs
View file

@ -81,7 +81,7 @@ public class FrostFsSessionToken
}
sessionToken.Body.SessionKey = key.PublicKeyProto;
sessionToken.Signature = key.ECDsaKey.SignMessagePart(sessionToken.Body);
sessionToken.Signature = key.SignMessagePart(sessionToken.Body);
return sessionToken;
}
@ -116,7 +116,7 @@ public class FrostFsSessionToken
Verb = verb
};
sessionToken.Signature = key.ECDsaKey.SignMessagePart(sessionToken.Body);
sessionToken.Signature = key.SignMessagePart(sessionToken.Body);
return sessionToken;
}

2
src/FrostFS.SDK.Client/ObjectWriter.cs
View file

@ -34,7 +34,7 @@ namespace FrostFS.SDK.Client
chunkRequest.AddMetaHeader(args.XHeaders);
chunkRequest.Sign(this.ctx.Key.ECDsaKey);
chunkRequest.Sign(this.ctx.Key);
await streamer.Write(chunkRequest).ConfigureAwait(false);
}

2
src/FrostFS.SDK.Client/Services/AccountingServiceProvider.cs
View file

@ -27,7 +27,7 @@ internal sealed class AccountingServiceProvider : ContextAccessor
};
request.AddMetaHeader([]);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await _accountingServiceClient!.BalanceAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);

6
src/FrostFS.SDK.Client/Services/ApeManagerServiceProvider.cs
View file

@ -32,7 +32,7 @@ internal sealed class ApeManagerServiceProvider : ContextAccessor
};
request.AddMetaHeader(args.XHeaders);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await _apeManagerServiceClient!.AddChainAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);
@ -53,7 +53,7 @@ internal sealed class ApeManagerServiceProvider : ContextAccessor
};
request.AddMetaHeader(args.XHeaders);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await _apeManagerServiceClient!.RemoveChainAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);
@ -71,7 +71,7 @@ internal sealed class ApeManagerServiceProvider : ContextAccessor
};
request.AddMetaHeader(args.XHeaders);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await _apeManagerServiceClient!.ListChainsAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);

12
src/FrostFS.SDK.Client/Services/ContainerServiceProvider.cs
View file

@ -39,7 +39,7 @@ internal sealed class ContainerServiceProvider(ContainerService.ContainerService
internal async Task<FrostFsContainerInfo> GetContainerAsync(PrmContainerGet args, CallContext ctx)
{
GetRequest request = GetContainerRequest(args.Container.GetContainerID(), args.XHeaders, ClientContext.Key.ECDsaKey);
GetRequest request = GetContainerRequest(args.Container.GetContainerID(), args.XHeaders, ClientContext.Key);
var response = await service.GetAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);
@ -59,7 +59,7 @@ internal sealed class ContainerServiceProvider(ContainerService.ContainerService
};
request.AddMetaHeader(args.XHeaders);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await service.ListAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);
@ -96,7 +96,7 @@ internal sealed class ContainerServiceProvider(ContainerService.ContainerService
request.AddMetaHeader(args.XHeaders, protoToken);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await service.PutAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);
@ -127,7 +127,7 @@ internal sealed class ContainerServiceProvider(ContainerService.ContainerService
request.AddMetaHeader(args.XHeaders, protoToken);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await service.DeleteAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);
@ -139,7 +139,7 @@ internal sealed class ContainerServiceProvider(ContainerService.ContainerService
Verifier.CheckResponse(response);
}
private static GetRequest GetContainerRequest(ContainerID id, string[] xHeaders, ECDsa key)
private static GetRequest GetContainerRequest(ContainerID id, string[] xHeaders, ClientKey key)
{
var request = new GetRequest
{
@ -163,7 +163,7 @@ internal sealed class ContainerServiceProvider(ContainerService.ContainerService
private async Task WaitForContainer(WaitExpects expect, ContainerID id, PrmWait waitParams, CallContext ctx)
{
var request = GetContainerRequest(id, [], ClientContext.Key.ECDsaKey);
var request = GetContainerRequest(id, [], ClientContext.Key);
async Task action()
{

6
src/FrostFS.SDK.Client/Services/NetmapServiceProvider.cs
View file

@ -50,7 +50,7 @@ internal sealed class NetmapServiceProvider : ContextAccessor
};
request.AddMetaHeader([]);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await netmapServiceClient.LocalNodeInfoAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);
@ -64,7 +64,7 @@ internal sealed class NetmapServiceProvider : ContextAccessor
var request = new NetworkInfoRequest();
request.AddMetaHeader([]);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await netmapServiceClient.NetworkInfoAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken)
.ConfigureAwait(false);
@ -79,7 +79,7 @@ internal sealed class NetmapServiceProvider : ContextAccessor
var request = new NetmapSnapshotRequest();
request.AddMetaHeader([]);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await netmapServiceClient.NetmapSnapshotAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);

29
src/FrostFS.SDK.Client/Services/ObjectServiceProvider.cs
View file

@ -67,7 +67,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
request.AddMetaHeader(args.XHeaders, protoToken);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await client!.HeadAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken).ConfigureAwait(false);
@ -111,7 +111,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
request.AddMetaHeader(args.XHeaders, protoToken);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
return await GetObject(request, ctx).ConfigureAwait(false);
}
@ -145,7 +145,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
request.AddMetaHeader(args.XHeaders, protoToken);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var call = client.GetRange(request, null, ctx.GetDeadline(), ctx.CancellationToken);
return new RangeReader(call);
@ -185,7 +185,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
request.AddMetaHeader(args.XHeaders, protoToken);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await client.GetRangeHashAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);
@ -218,7 +218,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
ClientContext.Key);
request.AddMetaHeader(args.XHeaders, protoToken);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await client.DeleteAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken);
@ -247,7 +247,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
request.AddMetaHeader(args.XHeaders, protoToken);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
using var stream = GetSearchReader(request, ctx);
@ -283,7 +283,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
request.AddMetaHeader(args.XHeaders, protoToken);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
var response = await client.PutSingleAsync(request, null, ctx.GetDeadline(), ctx.CancellationToken).ConfigureAwait(false);
@ -363,7 +363,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
request.AddMetaHeader(args.XHeaders);
}
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
await call.RequestStream.WriteAsync(request).ConfigureAwait(false);
@ -402,11 +402,11 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
throw new ArgumentException("The stream has zero length");
var networkSettings = await ClientContext.Client.GetNetworkSettingsAsync(ctx).ConfigureAwait(false);
args.PutObjectContext.MaxObjectSizeCache = (int)networkSettings.MaxObjectSize;
var partSize = (int)networkSettings.MaxObjectSize;
var restBytes = args.PutObjectContext.FullLength;
var objectSize = (int)Math.Min((ulong)args.PutObjectContext.MaxObjectSizeCache, restBytes);
var objectSize = (int)Math.Min((ulong)partSize, restBytes);
// define collection capacity
var objectsCount = (int)(restBytes / (ulong)objectSize) + ((restBytes % (ulong)objectSize) > 0 ? 1 : 0);
@ -414,6 +414,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
// if the object fits one part, it can be loaded as non-complex object
if (objectsCount == 1)
{
args.PutObjectContext.MaxObjectSizeCache = partSize;
var singlePartResult = await PutMultipartStreamObjectAsync(args, default).ConfigureAwait(false);
return singlePartResult.ObjectId;
}
@ -422,8 +423,6 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
SplitId splitId = new();
var partSize = args.PutObjectContext.MaxObjectSizeCache;
// keep attributes for the large object
var attributes = args.Header!.Attributes.ToArray();
header.Attributes = null;
@ -573,12 +572,12 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
{
Body = new PutRequest.Types.Body
{
Chunk = UnsafeByteOperations.UnsafeWrap(chunkBuffer.AsMemory()[..bytesCount])
Chunk = UnsafeByteOperations.UnsafeWrap(chunkBuffer.AsMemory(0, bytesCount))
}
};
chunkRequest.AddMetaHeader(args.XHeaders);
chunkRequest.Sign(ClientContext.Key.ECDsaKey);
chunkRequest.Sign(ClientContext.Key);
await stream.Write(chunkRequest).ConfigureAwait(false);
}
@ -640,7 +639,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
initRequest.AddMetaHeader(args.XHeaders, protoToken);
initRequest.Sign(ClientContext.Key.ECDsaKey);
initRequest.Sign(ClientContext.Key);
return await PutObjectInit(initRequest, ctx).ConfigureAwait(false);
}

2
src/FrostFS.SDK.Client/Services/SessionServiceProvider.cs
View file

@ -26,7 +26,7 @@ internal sealed class SessionServiceProvider : ContextAccessor
};
request.AddMetaHeader(args.XHeaders);
request.Sign(ClientContext.Key.ECDsaKey);
request.Sign(ClientContext.Key);
return await CreateSession(request, ctx).ConfigureAwait(false);
}

248
src/FrostFS.SDK.Client/Tools/Range.cs
View file

@ -1,248 +0,0 @@
using System.Runtime.CompilerServices;
namespace System
{
/// <summary>Represent a type can be used to index a collection either from the start or the end.</summary>
/// <remarks>
/// Index is used by the C# compiler to support the new index syntax
/// <code>
/// int[] someArray = new int[5] { 1, 2, 3, 4, 5 } ;
/// int lastElement = someArray[^1]; // lastElement = 5
/// </code>
/// </remarks>
internal readonly struct Index : IEquatable<Index>
{
private readonly int _value;
/// <summary>Construct an Index using a value and indicating if the index is from the start or from the end.</summary>
/// <param name="value">The index value. it has to be zero or positive number.</param>
/// <param name="fromEnd">Indicating if the index is from the start or from the end.</param>
/// <remarks>
/// If the Index constructed from the end, index value 1 means pointing at the last element and index value 0 means pointing at beyond last element.
/// </remarks>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Index(int value, bool fromEnd = false)
{
if (value < 0)
throw new ArgumentOutOfRangeException(nameof(value), "value must be non-negative");
if (fromEnd)
_value = ~value;
else
_value = value;
}
// The following private constructors mainly created for perf reason to avoid the checks
private Index(int value)
{
_value = value;
}
/// <summary>Create an Index pointing at first element.</summary>
public static Index Start => new(0);
/// <summary>Create an Index pointing at beyond last element.</summary>
public static Index End => new(~0);
/// <summary>Create an Index from the start at the position indicated by the value.</summary>
/// <param name="value">The index value from the start.</param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Index FromStart(int value)
{
if (value < 0)
throw new ArgumentOutOfRangeException(nameof(value), "value must be non-negative");
return new Index(value);
}
/// <summary>Create an Index from the end at the position indicated by the value.</summary>
/// <param name="value">The index value from the end.</param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Index FromEnd(int value)
{
if (value < 0)
throw new ArgumentOutOfRangeException(nameof(value), "value must be non-negative");
return new Index(~value);
}
/// <summary>Returns the index value.</summary>
public int Value
{
get
{
return _value < 0 ? ~_value : _value;
}
}
/// <summary>Indicates whether the index is from the start or the end.</summary>
public bool IsFromEnd => _value < 0;
/// <summary>Calculate the offset from the start using the giving collection length.</summary>
/// <param name="length">The length of the collection that the Index will be used with. length has to be a positive value</param>
/// <remarks>
/// For performance reason, we don't validate the input length parameter and the returned offset value against negative values.
/// we don't validate either the returned offset is greater than the input length.
/// It is expected Index will be used with collections which always have non negative length/count. If the returned offset is negative and
/// then used to index a collection will get out of range exception which will be same affect as the validation.
/// </remarks>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int GetOffset(int length)
{
var offset = _value;
if (IsFromEnd)
{
// offset = length - (~value)
// offset = length + (~(~value) + 1)
// offset = length + value + 1
offset += length + 1;
}
return offset;
}
/// <summary>Indicates whether the current Index object is equal to another object of the same type.</summary>
/// <param name="value">An object to compare with this object</param>
public override bool Equals(object? value) => value is Index index && _value == index._value;
/// <summary>Indicates whether the current Index object is equal to another Index object.</summary>
/// <param name="other">An object to compare with this object</param>
public bool Equals(Index other) => _value == other._value;
/// <summary>Returns the hash code for this instance.</summary>
public override int GetHashCode() => _value;
/// <summary>Converts integer number to an Index.</summary>
public static implicit operator Index(int value) => FromStart(value);
/// <summary>Converts the value of the current Index object to its equivalent string representation.</summary>
public override string ToString()
{
if (IsFromEnd)
return $"^{(uint)Value}";
return $"{(uint)Value}";
}
}
/// <summary>Represent a range has start and end indexes.</summary>
/// <remarks>
/// Range is used by the C# compiler to support the range syntax.
/// <code>
/// int[] someArray = new int[5] { 1, 2, 3, 4, 5 };
/// int[] subArray1 = someArray[0..2]; // { 1, 2 }
/// int[] subArray2 = someArray[1..^0]; // { 2, 3, 4, 5 }
/// </code>
/// </remarks>
/// <remarks>Construct a Range object using the start and end indexes.</remarks>
/// <param name="start">Represent the inclusive start index of the range.</param>
/// <param name="end">Represent the exclusive end index of the range.</param>
internal readonly struct Range(Index start, Index end) : IEquatable<Range>
{
/// <summary>Represent the inclusive start index of the Range.</summary>
public Index Start { get; } = start;
/// <summary>Represent the exclusive end index of the Range.</summary>
public Index End { get; } = end;
/// <summary>Indicates whether the current Range object is equal to another object of the same type.</summary>
/// <param name="value">An object to compare with this object</param>
public override bool Equals(object? value) =>
value is Range r &&
r.Start.Equals(Start) &&
r.End.Equals(End);
/// <summary>Indicates whether the current Range object is equal to another Range object.</summary>
/// <param name="other">An object to compare with this object</param>
public bool Equals(Range other) => other.Start.Equals(Start) && other.End.Equals(End);
/// <summary>Returns the hash code for this instance.</summary>
public override int GetHashCode()
{
return Start.GetHashCode() * 31 + End.GetHashCode();
}
/// <summary>Converts the value of the current Range object to its equivalent string representation.</summary>
public override string ToString()
{
return Start + ".." + End;
}
/// <summary>Create a Range object starting from start index to the end of the collection.</summary>
public static Range StartAt(Index start) => new(start, Index.End);
/// <summary>Create a Range object starting from first element in the collection to the end Index.</summary>
public static Range EndAt(Index end) => new(Index.Start, end);
/// <summary>Create a Range object starting from first element to the end.</summary>
public static Range All => new(Index.Start, Index.End);
/// <summary>Calculate the start offset and length of range object using a collection length.</summary>
/// <param name="length">The length of the collection that the range will be used with. length has to be a positive value.</param>
/// <remarks>
/// For performance reason, we don't validate the input length parameter against negative values.
/// It is expected Range will be used with collections which always have non negative length/count.
/// We validate the range is inside the length scope though.
/// </remarks>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public (int Offset, int Length) GetOffsetAndLength(int length)
{
int start;
var startIndex = Start;
if (startIndex.IsFromEnd)
start = length - startIndex.Value;
else
start = startIndex.Value;
int end;
var endIndex = End;
if (endIndex.IsFromEnd)
end = length - endIndex.Value;
else
end = endIndex.Value;
if ((uint)end > (uint)length || (uint)start > (uint)end)
throw new ArgumentOutOfRangeException(nameof(length));
return (start, end - start);
}
}
}
namespace System.Runtime.CompilerServices
{
internal static class RuntimeHelpers
{
/// <summary>
/// Slices the specified array using the specified range.
/// </summary>
public static T[] GetSubArray<T>(T[] array, Range range)
{
if (array == null)
throw new ArgumentNullException(nameof(array));
(int offset, int length) = range.GetOffsetAndLength(array.Length);
if (default(T) != null || typeof(T[]) == array.GetType())
{
// We know the type of the array to be exactly T[].
if (length == 0)
return [];
var dest = new T[length];
Array.Copy(array, offset, dest, 0, length);
return dest;
}
else
{
// The array is actually a U[] where U:T.
var dest = (T[])Array.CreateInstance(array.GetType().GetElementType(), length);
Array.Copy(array, offset, dest, 0, length);
return dest;
}
}
}
}

49
src/FrostFS.SDK.Client/Tools/RequestSigner.cs
View file

@ -13,7 +13,6 @@ using Org.BouncyCastle.Crypto.Digests;
using Org.BouncyCastle.Crypto.Parameters;
using Org.BouncyCastle.Crypto.Signers;
using Org.BouncyCastle.Math;
using Signature = FrostFS.Refs.Signature;
namespace FrostFS.SDK.Client;
@ -48,14 +47,13 @@ public static class RequestSigner
var sbytes = rs[1].ToByteArrayUnsigned();
var index = RFC6979SignatureSize / 2 - rbytes.Length;
rbytes.AsSpan().CopyTo(signature[index..]);
rbytes.AsSpan().CopyTo(signature.Slice(index));
index = RFC6979SignatureSize - sbytes.Length;
sbytes.AsSpan().CopyTo(signature[index..]);
sbytes.AsSpan().CopyTo(signature.Slice(index));
return ByteString.CopyFrom(signature);
}
internal static SignatureRFC6979 SignRFC6979(this ECDsa key, IMessage message)
{
return new SignatureRFC6979
@ -74,7 +72,7 @@ public static class RequestSigner
};
}
public static ByteString SignData(this ECDsa key, byte[] data)
public static ByteString SignData(this ECDsa key, ReadOnlyMemory<byte> data)
{
if (key is null)
{
@ -84,27 +82,50 @@ public static class RequestSigner
Span<byte> result = stackalloc byte[65];
result[0] = 0x04;
//var hash = new byte[65];
//hash[0] = 0x04;
key.SignHash(data.Sha512()).AsSpan().CopyTo(result[1..]);
key.SignHash(data.Sha512()).AsSpan().CopyTo(result.Slice(1));
return ByteString.CopyFrom(result);
}
internal static Signature SignMessagePart(this ECDsa key, IMessage? data)
public static ByteString SignDataByHash(this ECDsa key, byte[] hash)
{
var data2Sign = data is null ? [] : data.ToByteArray();
if (key is null)
{
throw new ArgumentNullException(nameof(key));
}
Span<byte> result = stackalloc byte[65];
result[0] = 0x04;
key.SignHash(hash).AsSpan().CopyTo(result.Slice(1));
return ByteString.CopyFrom(result);
}
internal static Signature SignMessagePart(this ClientKey key, IMessage? data)
{
if (data is null || data.CalculateSize() == 0)
{
return new Signature
{
Key = key.PublicKeyProto,
Sign = key.ECDsaKey.SignData(ReadOnlyMemory<byte>.Empty),
};
}
using HashStream stream = new();
data.WriteTo(stream);
var sig = new Signature
{
Key = ByteString.CopyFrom(key.PublicKey()),
Sign = key.SignData(data2Sign),
Key = key.PublicKeyProto,
Sign = key.ECDsaKey.SignDataByHash(stream.Hash())
};
return sig;
}
internal static void Sign(this IVerifiableMessage message, ECDsa key)
internal static void Sign(this IVerifiableMessage message, ClientKey key)
{
var meta = message.GetMetaHeader();
IVerificationHeader verify = message switch

11
src/FrostFS.SDK.Client/Tools/Verifier.cs
View file

@ -27,8 +27,8 @@ public static class Verifier
throw new FormatException($"Wrong signature size, expect={RFC6979SignatureSize}, actual={sig.Length}");
var rs = new BigInteger[2];
rs[0] = new BigInteger(1, sig[..32]);
rs[1] = new BigInteger(1, sig[32..]);
rs[0] = new BigInteger(1, sig.AsSpan(0, 32).ToArray());
rs[1] = new BigInteger(1, sig.AsSpan(32).ToArray());
return rs;
}
@ -63,18 +63,15 @@ public static class Verifier
return signature.Key.ToByteArray().VerifyRFC6979(message.ToByteArray(), signature.Sign.ToByteArray());
}
public static bool VerifyData(this ECDsa key, byte[] data, byte[] sig)
public static bool VerifyData(this ECDsa key, ReadOnlyMemory<byte> data, byte[] sig)
{
if (key is null)
throw new ArgumentNullException(nameof(key));
if (data is null)
throw new ArgumentNullException(nameof(data));
if (sig is null)
throw new ArgumentNullException(nameof(sig));
return key.VerifyHash(data.Sha512(), sig[1..]);
return key.VerifyHash(data.Sha512(), sig.AsSpan(1).ToArray());
}
public static bool VerifyMessagePart(this Signature sig, IMessage data)

2
src/FrostFS.SDK.Cryptography/AssemblyInfo.cs
View file

@ -5,4 +5,4 @@ using System.Reflection;
[assembly: AssemblyInformationalVersion("1.0.0+d6fe0344538a223303c9295452f0ad73681ca376")]
[assembly: AssemblyProduct("FrostFS.SDK.Cryptography")]
[assembly: AssemblyTitle("FrostFS.SDK.Cryptography")]
[assembly: AssemblyVersion("1.0.2.0")]
[assembly: AssemblyVersion("1.0.3.0")]

21
src/FrostFS.SDK.Cryptography/Extentions.cs
View file

@ -1,4 +1,5 @@
using System;
using System.IO;
using System.Security.Cryptography;
using System.Threading;
using CommunityToolkit.HighPerformance;
@ -60,14 +61,30 @@ public static class Extentions
}
}
public static byte[] Sha512(this byte[] value)
public static byte[] Sha512(this ReadOnlyMemory<byte> value)
{
bool lockTaken = false;
try
{
_spinlockSha512.Enter(ref lockTaken);
return _sha512.ComputeHash(value);
return _sha512.ComputeHash(value.AsStream());
}
finally
{
if (lockTaken)
_spinlockSha512.Exit(false);
}
}
public static byte[] Sha512(this Stream stream)
{
bool lockTaken = false;
try
{
_spinlockSha512.Enter(ref lockTaken);
return _sha512.ComputeHash(stream);
}
finally
{

6
src/FrostFS.SDK.Cryptography/FrostFS.SDK.Cryptography.csproj
View file

@ -19,11 +19,7 @@
</PropertyGroup>
<PropertyGroup>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup>
<GeneratedAssemblyInfoFile>Assemblyinfo.cs</GeneratedAssemblyInfoFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>

58
src/FrostFS.SDK.Cryptography/HashStream.cs Normal file
View file

@ -0,0 +1,58 @@
using System.IO;
using System.Security.Cryptography;
namespace FrostFS.SDK.Cryptography;
public sealed class HashStream() : Stream
{
private long position;
private readonly SHA512 _hash = SHA512.Create();
public override bool CanRead => false;
public override bool CanSeek => false;
public override bool CanWrite => true;
public override long Length => long.MaxValue;
public override long Position
{
get { return position; }
set { position = value; }
}
public override void Flush()
{ }
public override int Read(byte[] buffer, int offset, int count)
{
return 0;
}
public override long Seek(long offset, SeekOrigin origin)
{
return 0;
}
public override void SetLength(long value)
{ }
public override void Write(byte[] buffer, int offset, int count)
{
_hash.TransformBlock(buffer, offset, count, buffer, offset);
}
public byte[] Hash()
{
_hash.TransformFinalBlock([], 0, 0);
return _hash.Hash;
}
protected override void Dispose(bool disposing)
{
_hash?.Dispose();
base.Dispose(disposing);
}
}

2
src/FrostFS.SDK.Protos/AssemblyInfo.cs
View file

@ -5,4 +5,4 @@ using System.Reflection;
[assembly: AssemblyInformationalVersion("1.0.0+d6fe0344538a223303c9295452f0ad73681ca376")]
[assembly: AssemblyProduct("FrostFS.SDK.Protos")]
[assembly: AssemblyTitle("FrostFS.SDK.Protos")]
[assembly: AssemblyVersion("1.0.2.0")]
[assembly: AssemblyVersion("1.0.3.0")]

6
src/FrostFS.SDK.Protos/FrostFS.SDK.Protos.csproj
View file

@ -19,11 +19,7 @@
</PropertyGroup>
<PropertyGroup>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup>
<GeneratedAssemblyInfoFile>Assemblyinfo.cs</GeneratedAssemblyInfoFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>

4
src/FrostFS.SDK.Tests/Mocks/AsyncStreamReaderMock.cs
View file

@ -42,8 +42,8 @@ public class AsyncStreamReaderMock(string key, FrostFsObjectHeader objectHeader)
ObjectId = new Refs.ObjectID { Value = ByteString.CopyFrom(SHA256.HashData(Array.Empty<byte>())) },
Signature = new Refs.Signature
{
Key = ByteString.CopyFrom(Key.PublicKey()),
Sign = Key.SignData(header.ToByteArray()),
Key = Key.PublicKeyProto,
Sign = Key.ECDsaKey. SignData(header.ToByteArray()),
}
}
},

14
src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/ContainerServiceBase.cs
View file

@ -18,7 +18,7 @@ namespace FrostFS.SDK.Tests;
public abstract class ServiceBase(string key)
{
public string StringKey { get; private set; } = key;
public ECDsa Key { get; private set; } = key.LoadWif();
public ClientKey Key { get; private set; } = new ClientKey(key.LoadWif());
public FrostFsVersion Version { get; set; } = DefaultVersion;
public FrostFsPlacementPolicy PlacementPolicy { get; set; } = DefaultPlacementPolicy;
@ -44,21 +44,21 @@ public abstract class ServiceBase(string key)
{
MetaSignature = new Refs.Signature
{
Key = ByteString.CopyFrom(Key.PublicKey()),
Key = Key.PublicKeyProto,
Scheme = Refs.SignatureScheme.EcdsaRfc6979Sha256,
Sign = Key.SignData(response.MetaHeader.ToByteArray())
Sign = Key.ECDsaKey.SignData(response.MetaHeader.ToByteArray())
},
BodySignature = new Refs.Signature
{
Key = ByteString.CopyFrom(Key.PublicKey()),
Key = Key.PublicKeyProto,
Scheme = Refs.SignatureScheme.EcdsaRfc6979Sha256,
Sign = Key.SignData(response.GetBody().ToByteArray())
Sign = Key.ECDsaKey.SignData(response.GetBody().ToByteArray())
},
OriginSignature = new Refs.Signature
{
Key = ByteString.CopyFrom(Key.PublicKey()),
Key = Key.PublicKeyProto,
Scheme = Refs.SignatureScheme.EcdsaRfc6979Sha256,
Sign = Key.SignData([])
Sign = Key.ECDsaKey.SignData(ReadOnlyMemory<byte>.Empty)
}
};

4
src/FrostFS.SDK.Tests/Mocks/ObjectMock.cs
View file

@ -92,8 +92,8 @@ public class ObjectMocker(string key) : ObjectServiceBase(key)
headResponse.Body.Header.Signature = new Refs.Signature
{
Key = ByteString.CopyFrom(Key.PublicKey()),
Sign = Key.SignData(headResponse.Body.Header.ToByteArray()),
Key = Key.PublicKeyProto,
Sign = Key.ECDsaKey.SignData(headResponse.Body.Header.ToByteArray()),
};
headResponse.VerifyHeader = GetResponseVerificationHeader(headResponse);

2
src/FrostFS.SDK.Tests/Smoke/Client/ObjectTests/ObjectTests.cs
View file

@ -55,7 +55,7 @@ public class ObjectTests(ITestOutputHelper testOutputHelper) : SmokeTestsBase
private async Task RunSuite(IFrostFSClient client, FrostFsContainerId containerId)
{
int[] objectSizes = [1, 257, 6 * 1024, 20 * 1024];
int[] objectSizes = [1, 257, 5 * 1024 * 1024, 20 * 1024 * 1024];
string[] objectTypes = [clientCut, serverCut, singleObject];