[#10] MetricsAndOptions #10
21 changed files with 642 additions and 191 deletions
FrostFS.SDK.sln
src
FrostFS.SDK.ClientV2
FrostFS.SDK.Cryptography
FrostFS.SDK.ModelsV2
FrostFS.SDK.ProtosV2
|
@ -29,9 +29,8 @@ Global
|
|||
{5012EF96-9C9E-4E77-BC78-B4111EE54107}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5012EF96-9C9E-4E77-BC78-B4111EE54107}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5012EF96-9C9E-4E77-BC78-B4111EE54107}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B738F3E1-654D-41A3-B068-58ED122BB688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B738F3E1-654D-41A3-B068-58ED122BB688}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B738F3E1-654D-41A3-B068-58ED122BB688}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B738F3E1-654D-41A3-B068-58ED122BB688}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Security.Cryptography;
|
||||
using System.Threading.Tasks;
|
||||
using FrostFS.Container;
|
||||
using FrostFS.Netmap;
|
||||
using FrostFS.Object;
|
||||
|
@ -25,7 +26,12 @@ public partial class Client: IFrostFSClient
|
|||
private ObjectService.ObjectServiceClient? _objectServiceClient;
|
||||
private SessionService.SessionServiceClient? _sessionServiceClient;
|
||||
|
||||
public Client(string key, string host)
|
||||
public static IFrostFSClient GetInstance(string key, string host)
|
||||
{
|
||||
return new Client(key, host);
|
||||
}
|
||||
|
||||
private Client(string key, string host)
|
||||
{
|
||||
// TODO: Развязать клиент и реализацию GRPC
|
||||
_key = key.LoadWif();
|
||||
|
|
44
src/FrostFS.SDK.ClientV2/Extensions/Object.cs
Normal file
44
src/FrostFS.SDK.ClientV2/Extensions/Object.cs
Normal file
|
@ -0,0 +1,44 @@
|
|||
|
||||
using System.Collections.Generic;
|
||||
using FrostFS.SDK.ModelsV2;
|
||||
|
||||
namespace FrostFS.SDK.ClientV2.Extensions;
|
||||
|
||||
public static class Extensions
|
||||
{
|
||||
public static ModelsV2.Object SetPayloadLength(this ModelsV2.Object obj, ulong length)
|
||||
{
|
||||
obj.Header.PayloadLength = length;
|
||||
return obj;
|
||||
}
|
||||
|
||||
public static ModelsV2.Object AddAttribute(this ModelsV2.Object obj, string key, string value)
|
||||
{
|
||||
obj.AddAttribute(new ObjectAttribute(key, value));
|
||||
return obj;
|
||||
}
|
||||
|
||||
public static ModelsV2.Object AddAttribute(this ModelsV2.Object obj, ObjectAttribute attribute)
|
||||
{
|
||||
obj.Header.Attributes.Add(attribute);
|
||||
return obj;
|
||||
}
|
||||
|
||||
public static ModelsV2.Object AddAttributes(this ModelsV2.Object obj, IEnumerable<ObjectAttribute> attributes)
|
||||
{
|
||||
obj.Header.Attributes.AddRange(attributes);
|
||||
return obj;
|
||||
}
|
||||
|
||||
public static ModelsV2.Object SetSplit(this ModelsV2.Object obj, Split split)
|
||||
{
|
||||
obj.Header.Split = split;
|
||||
return obj;
|
||||
}
|
||||
|
||||
public static LinkObject AddChildren(this LinkObject linkObject, IEnumerable<ObjectId> objectIds)
|
||||
{
|
||||
linkObject.Header.Split.Children.AddRange(objectIds);
|
||||
return linkObject;
|
||||
}
|
||||
}
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
|
||||
<PackageReference Include="Moq.AutoMock" Version="3.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -9,13 +9,24 @@ namespace FrostFS.SDK.ClientV2.Interfaces;
|
|||
public interface IFrostFSClient
|
||||
{
|
||||
Task<ModelsV2.Container> GetContainerAsync(ContainerId containerId);
|
||||
|
||||
IAsyncEnumerable<ContainerId> ListContainersAsync();
|
||||
|
||||
Task<ContainerId> CreateContainerAsync(ModelsV2.Container container);
|
||||
|
||||
Task DeleteContainerAsync(ContainerId containerId);
|
||||
|
||||
Task<ObjectHeader> GetObjectHeadAsync(ContainerId containerId, ObjectId objectId);
|
||||
|
||||
Task<ModelsV2.Object> GetObjectAsync(ContainerId containerId, ObjectId objectId);
|
||||
|
||||
Task<ObjectId> PutObjectAsync(ObjectHeader header, Stream payload);
|
||||
|
||||
Task<ObjectId> PutObjectAsync(ObjectHeader header, byte[] payload);
|
||||
|
||||
Task<ObjectId> PutSingleObjectAsync(ModelsV2.Object obj);
|
||||
|
||||
Task DeleteObjectAsync(ContainerId containerId, ObjectId objectId);
|
||||
|
||||
IAsyncEnumerable<ObjectId> SearchObjectsAsync(ContainerId cid, params ObjectFilter[] filters);
|
||||
}
|
|
@ -1,4 +1,5 @@
|
|||
using FrostFS.Refs;
|
||||
using FrostFS.SDK.Cryptography;
|
||||
using FrostFS.SDK.ModelsV2;
|
||||
using Google.Protobuf;
|
||||
|
||||
|
@ -10,7 +11,7 @@ public static class ContainerIdMapper
|
|||
{
|
||||
return new ContainerID
|
||||
{
|
||||
Value = ByteString.CopyFrom(containerId.ToHash())
|
||||
Value = ByteString.CopyFrom(Base58.Decode(containerId.Value))
|
||||
};
|
||||
}
|
||||
}
|
|
@ -1,8 +1,9 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
|
||||
using FrostFS.Object;
|
||||
using FrostFS.SDK.Cryptography;
|
||||
using FrostFS.SDK.ModelsV2;
|
||||
using Google.Protobuf;
|
||||
using MatchType = FrostFS.Object.MatchType;
|
||||
using ObjectType = FrostFS.Object.ObjectType;
|
||||
|
||||
|
@ -29,11 +30,20 @@ public static class ObjectFilterMapper
|
|||
{
|
||||
public static SearchRequest.Types.Body.Types.Filter ToGrpcMessage(this ObjectFilter filter)
|
||||
{
|
||||
var objMatchTypeName = Enum.GetName(typeof(MatchType), filter.MatchType)
|
||||
?? throw new ArgumentException($"Unknown MatchType. Value: '{filter.MatchType}'.");
|
||||
var objMatchTypeName = filter.MatchType switch
|
||||
{
|
||||
ModelsV2.Enums.ObjectMatchType.Unspecified => MatchType.Unspecified,
|
||||
ModelsV2.Enums.ObjectMatchType.Equals => MatchType.StringEqual,
|
||||
ModelsV2.Enums.ObjectMatchType.NotEquals => MatchType.StringNotEqual,
|
||||
ModelsV2.Enums.ObjectMatchType.KeyAbsent => MatchType.NotPresent,
|
||||
ModelsV2.Enums.ObjectMatchType.StartsWith => MatchType.CommonPrefix,
|
||||
|
||||
_ => throw new ArgumentException($"Unknown MatchType. Value: '{filter.MatchType}'.")
|
||||
};
|
||||
|
||||
return new SearchRequest.Types.Body.Types.Filter
|
||||
{
|
||||
MatchType = (MatchType)Enum.Parse(typeof(MatchType), objMatchTypeName),
|
||||
MatchType = objMatchTypeName,
|
||||
Key = filter.Key,
|
||||
Value = filter.Value
|
||||
};
|
||||
|
@ -44,13 +54,19 @@ public static class ObjectHeaderMapper
|
|||
{
|
||||
public static Header ToGrpcMessage(this ObjectHeader header)
|
||||
{
|
||||
var objTypeName = Enum.GetName(typeof(ObjectType), header.ObjectType)
|
||||
?? throw new ArgumentException($"Unknown ObjectType. Value: '{header.ObjectType}'.");
|
||||
var objTypeName = header.ObjectType switch
|
||||
{
|
||||
ModelsV2.Enums.ObjectType.Regular => ObjectType.Regular,
|
||||
ModelsV2.Enums.ObjectType.Lock => ObjectType.Lock,
|
||||
ModelsV2.Enums.ObjectType.Tombstone => ObjectType.Tombstone,
|
||||
_ => throw new ArgumentException($"Unknown ObjectType. Value: '{header.ObjectType}'.")
|
||||
};
|
||||
|
||||
var head = new Header
|
||||
{
|
||||
Attributes = { },
|
||||
ContainerId = header.ContainerId.ToGrpcMessage(),
|
||||
ObjectType = (ObjectType)Enum.Parse(typeof(ObjectType), objTypeName)
|
||||
ObjectType = objTypeName,
|
||||
PayloadLength = header.PayloadLength
|
||||
};
|
||||
|
||||
foreach (var attribute in header.Attributes)
|
||||
|
@ -58,20 +74,42 @@ public static class ObjectHeaderMapper
|
|||
head.Attributes.Add(attribute.ToGrpcMessage());
|
||||
}
|
||||
|
||||
var split = header.Split;
|
||||
if (split != null)
|
||||
{
|
||||
head.Split = new Header.Types.Split
|
||||
{
|
||||
Parent = split.Parent?.ToGrpcMessage(),
|
||||
ParentSignature = split.ParentSignature?.ToGrpcMessage(),
|
||||
ParentHeader = split.ParentHeader?.ToGrpcMessage(),
|
||||
Previous = split.Previous?.ToGrpcMessage(),
|
||||
SplitId = split.SplitId != null ? ByteString.CopyFrom(split.SplitId.ToBinary()) : null
|
||||
};
|
||||
|
||||
if (split.Children != null && split.Children.Any())
|
||||
head.Split.Children.AddRange(split.Children.Select(id => id.ToGrpcMessage()));
|
||||
}
|
||||
|
||||
return head;
|
||||
}
|
||||
|
||||
public static ObjectHeader ToModel(this Header header)
|
||||
{
|
||||
var objTypeName = Enum.GetName(typeof(ModelsV2.Enums.ObjectType), header.ObjectType)
|
||||
?? throw new ArgumentException($"Unknown ObjectType. Value: '{header.ObjectType}'.");
|
||||
var objTypeName = header.ObjectType switch
|
||||
{
|
||||
ObjectType.Regular => ModelsV2.Enums.ObjectType.Regular,
|
||||
ObjectType.Lock => ModelsV2.Enums.ObjectType.Lock,
|
||||
ObjectType.Tombstone => ModelsV2.Enums.ObjectType.Tombstone,
|
||||
_ => throw new ArgumentException($"Unknown ObjectType. Value: '{header.ObjectType}'.")
|
||||
};
|
||||
|
||||
return new ObjectHeader(
|
||||
ContainerId.FromHash(header.ContainerId.Value.ToByteArray()),
|
||||
(ModelsV2.Enums.ObjectType)Enum.Parse(typeof(ModelsV2.Enums.ObjectType), objTypeName),
|
||||
new ContainerId(Base58.Encode(header.ContainerId.Value.ToByteArray())),
|
||||
objTypeName,
|
||||
header.Attributes.Select(attribute => attribute.ToModel()).ToArray()
|
||||
)
|
||||
{
|
||||
Size = (long)header.PayloadLength,
|
||||
PayloadLength = header.PayloadLength,
|
||||
Version = header.Version.ToModel()
|
||||
};
|
||||
}
|
||||
|
@ -81,7 +119,7 @@ public static class ObjectMapper
|
|||
{
|
||||
public static ModelsV2.Object ToModel(this Object.Object obj)
|
||||
{
|
||||
return new ModelsV2.Object
|
||||
return new ModelsV2.Object()
|
||||
{
|
||||
Header = obj.Header.ToModel(),
|
||||
ObjectId = ObjectId.FromHash(obj.ObjectId.Value.ToByteArray()),
|
||||
|
@ -89,3 +127,25 @@ public static class ObjectMapper
|
|||
};
|
||||
}
|
||||
}
|
||||
|
||||
public static class SignatureMapper
|
||||
{
|
||||
public static Refs.Signature ToGrpcMessage(this Signature signature)
|
||||
{
|
||||
var scheme = signature.Scheme switch
|
||||
{
|
||||
SignatureScheme.EcdsaRfc6979Sha256 => Refs.SignatureScheme.EcdsaRfc6979Sha256,
|
||||
SignatureScheme.EcdsaRfc6979Sha256WalletConnect => Refs.SignatureScheme.EcdsaRfc6979Sha256WalletConnect,
|
||||
SignatureScheme.EcdsaSha512 => Refs.SignatureScheme.EcdsaSha512,
|
||||
_ => throw new ArgumentException(message: $"Unexpected enum value: {signature.Scheme}", paramName: nameof(signature.Scheme))
|
||||
};
|
||||
|
||||
return new Refs.Signature
|
||||
{
|
||||
Key = ByteString.CopyFrom(signature.Key),
|
||||
Scheme = scheme,
|
||||
Sign = ByteString.CopyFrom(signature.Sign)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -13,4 +13,9 @@ public static class ObjectIdMapper
|
|||
Value = ByteString.CopyFrom(objectId.ToHash())
|
||||
};
|
||||
}
|
||||
|
||||
public static ObjectId ToModel(this ObjectID objectId)
|
||||
{
|
||||
return ObjectId.FromHash(objectId.Value.ToByteArray());
|
||||
}
|
||||
}
|
|
@ -91,7 +91,7 @@ public static class RequestSigner
|
|||
{
|
||||
IRequest => new RequestVerificationHeader(),
|
||||
IResponse => new ResponseVerificationHeader(),
|
||||
_ => throw new InvalidOperationException("Unsopported message type")
|
||||
_ => throw new InvalidOperationException("Unsupported message type")
|
||||
};
|
||||
|
||||
var verifyOrigin = message.GetVerificationHeader();
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
using FrostFS.Container;
|
||||
using FrostFS.SDK.ClientV2.Mappers.GRPC;
|
||||
using FrostFS.SDK.Cryptography;
|
||||
using FrostFS.SDK.ModelsV2;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
|
@ -17,6 +18,7 @@ public partial class Client
|
|||
ContainerId = cid.ToGrpcMessage()
|
||||
},
|
||||
};
|
||||
|
||||
request.AddMetaHeader();
|
||||
request.Sign(_key);
|
||||
var response = await _containerServiceClient.GetAsync(request);
|
||||
|
@ -33,13 +35,14 @@ public partial class Client
|
|||
OwnerId = OwnerId.ToGrpcMessage()
|
||||
}
|
||||
};
|
||||
|
||||
request.AddMetaHeader();
|
||||
request.Sign(_key);
|
||||
var response = await _containerServiceClient.ListAsync(request);
|
||||
Verifier.CheckResponse(response);
|
||||
foreach (var cid in response.Body.ContainerIds)
|
||||
{
|
||||
yield return ContainerId.FromHash(cid.Value.ToByteArray());
|
||||
yield return new ContainerId(Base58.Encode(cid.Value.ToByteArray()));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -48,6 +51,7 @@ public partial class Client
|
|||
var cntnr = container.ToGrpcMessage();
|
||||
cntnr.OwnerId = OwnerId.ToGrpcMessage();
|
||||
cntnr.Version = Version.ToGrpcMessage();
|
||||
|
||||
var request = new PutRequest
|
||||
{
|
||||
Body = new PutRequest.Types.Body
|
||||
|
@ -60,7 +64,7 @@ public partial class Client
|
|||
request.Sign(_key);
|
||||
var response = await _containerServiceClient.PutAsync(request);
|
||||
Verifier.CheckResponse(response);
|
||||
return ContainerId.FromHash(response.Body.ContainerId.Value.ToByteArray());
|
||||
return new ContainerId(Base58.Encode(response.Body.ContainerId.Value.ToByteArray()));
|
||||
}
|
||||
|
||||
public async Task DeleteContainerAsync(ContainerId cid)
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using Google.Protobuf;
|
||||
|
@ -9,9 +10,10 @@ using FrostFS.Object;
|
|||
using FrostFS.Refs;
|
||||
using FrostFS.SDK.ClientV2.Mappers.GRPC;
|
||||
using FrostFS.SDK.Cryptography;
|
||||
using FrostFS.SDK.ModelsV2;
|
||||
using FrostFS.Session;
|
||||
|
||||
using FrostFS.SDK.ModelsV2;
|
||||
|
||||
namespace FrostFS.SDK.ClientV2;
|
||||
|
||||
public partial class Client
|
||||
|
@ -32,7 +34,7 @@ public partial class Client
|
|||
|
||||
request.AddMetaHeader();
|
||||
request.Sign(_key);
|
||||
var response = await _objectServiceClient.HeadAsync(request);
|
||||
var response = await _objectServiceClient!.HeadAsync(request);
|
||||
Verifier.CheckResponse(response);
|
||||
|
||||
return response.Body.Header.Header.ToModel();
|
||||
|
@ -45,7 +47,6 @@ public partial class Client
|
|||
{
|
||||
Body = new GetRequest.Types.Body
|
||||
{
|
||||
Raw = false,
|
||||
Address = new Address
|
||||
{
|
||||
ContainerId = cid.ToGrpcMessage(),
|
||||
|
@ -76,7 +77,176 @@ public partial class Client
|
|||
|
||||
public async Task<ObjectId> PutObjectAsync(ObjectHeader header, byte[] payload)
|
||||
{
|
||||
return await PutObject(header, new MemoryStream(payload));
|
||||
using var stream = new MemoryStream(payload);
|
||||
return await PutObject(header, stream);
|
||||
}
|
||||
|
||||
private async Task<ObjectId> PutObject(ObjectHeader header, Stream payload)
|
||||
{
|
||||
var sessionToken = await CreateSessionAsync(uint.MaxValue);
|
||||
var hdr = header.ToGrpcMessage();
|
||||
hdr.OwnerId = OwnerId.ToGrpcMessage();
|
||||
hdr.Version = Version.ToGrpcMessage();
|
||||
|
||||
var oid = new ObjectID
|
||||
{
|
||||
Value = hdr.Sha256()
|
||||
};
|
||||
|
||||
var request = new PutRequest
|
||||
{
|
||||
Body = new PutRequest.Types.Body
|
||||
{
|
||||
Init = new PutRequest.Types.Body.Types.Init
|
||||
{
|
||||
Header = hdr
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
request.AddMetaHeader();
|
||||
request.AddObjectSessionToken(
|
||||
sessionToken,
|
||||
hdr.ContainerId,
|
||||
oid,
|
||||
ObjectSessionContext.Types.Verb.Put,
|
||||
_key
|
||||
);
|
||||
|
||||
request.Sign(_key);
|
||||
|
||||
using var stream = await PutObjectInit(request);
|
||||
var buffer = new byte[Constants.ObjectChunkSize];
|
||||
|
||||
while (true)
|
||||
{
|
||||
var bufferLength = await payload.ReadAsync(buffer, 0, Constants.ObjectChunkSize);
|
||||
|
||||
if (bufferLength == 0)
|
||||
break;
|
||||
|
||||
request.Body = new PutRequest.Types.Body
|
||||
{
|
||||
Chunk = ByteString.CopyFrom(buffer[..bufferLength]),
|
||||
};
|
||||
|
||||
request.VerifyHeader = null;
|
||||
request.Sign(_key);
|
||||
await stream.Write(request);
|
||||
}
|
||||
|
||||
var response = await stream.Close();
|
||||
Verifier.CheckResponse(response);
|
||||
|
||||
return ObjectId.FromHash(response.Body.ObjectId.Value.ToByteArray());
|
||||
}
|
||||
|
||||
public async Task<ObjectId> PutSingleObjectAsync(ModelsV2.Object @object)
|
||||
{
|
||||
var sessionToken = await CreateSessionAsync(uint.MaxValue);
|
||||
|
||||
var obj = CreateObject(@object);
|
||||
|
||||
var request = new PutSingleRequest
|
||||
{
|
||||
Body = new () { Object = obj }
|
||||
};
|
||||
|
||||
request.AddMetaHeader();
|
||||
request.AddObjectSessionToken(
|
||||
sessionToken,
|
||||
obj.Header.ContainerId,
|
||||
obj.ObjectId,
|
||||
ObjectSessionContext.Types.Verb.Put,
|
||||
_key
|
||||
);
|
||||
|
||||
request.Sign(_key);
|
||||
|
||||
var response = await _objectServiceClient!.PutSingleAsync(request);
|
||||
Verifier.CheckResponse(response);
|
||||
|
||||
return ObjectId.FromHash(obj.ObjectId.Value.ToByteArray());
|
||||
}
|
||||
|
||||
public Object.Object CreateObject(ModelsV2.Object @object)
|
||||
{
|
||||
var grpcHeader = @object.Header.ToGrpcMessage();
|
||||
|
||||
grpcHeader.OwnerId = OwnerId.ToGrpcMessage();
|
||||
grpcHeader.Version = Version.ToGrpcMessage();
|
||||
|
||||
if (@object.Payload != null)
|
||||
{
|
||||
grpcHeader.PayloadLength = (ulong)@object.Payload.Length;
|
||||
grpcHeader.PayloadHash = Sha256Checksum(@object.Payload);
|
||||
}
|
||||
|
||||
var split = @object.Header.Split;
|
||||
if (split != null)
|
||||
{
|
||||
grpcHeader.Split = new Header.Types.Split
|
||||
{
|
||||
SplitId = split.SplitId != null ? ByteString.CopyFrom(split.SplitId.ToBinary()) : null
|
||||
};
|
||||
|
||||
if (split.Children != null && split.Children.Any())
|
||||
grpcHeader.Split.Children.AddRange(split.Children.Select(id => id.ToGrpcMessage()));
|
||||
|
||||
if (split.ParentHeader is not null)
|
||||
{
|
||||
var grpcParentHeader = CreateHeader(split.ParentHeader, []);
|
||||
|
||||
grpcHeader.Split.Parent = new ObjectID { Value = grpcParentHeader.Sha256() };
|
||||
grpcHeader.Split.ParentHeader = grpcParentHeader;
|
||||
grpcHeader.Split.ParentSignature = new Refs.Signature
|
||||
{
|
||||
Key = ByteString.CopyFrom(_key.PublicKey()),
|
||||
Sign = ByteString.CopyFrom(_key.SignData(grpcHeader.Split.Parent.ToByteArray())),
|
||||
};
|
||||
|
||||
split.Parent = grpcHeader.Split.Parent.ToModel();
|
||||
}
|
||||
}
|
||||
|
||||
var obj = new Object.Object
|
||||
{
|
||||
Header = grpcHeader,
|
||||
ObjectId = new ObjectID { Value = grpcHeader.Sha256() },
|
||||
Payload = ByteString.CopyFrom(@object.Payload)
|
||||
};
|
||||
|
||||
obj.Signature = new Refs.Signature
|
||||
{
|
||||
Key = ByteString.CopyFrom(_key.PublicKey()),
|
||||
Sign = ByteString.CopyFrom(_key.SignData(obj.ObjectId.ToByteArray())),
|
||||
};
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
||||
public Header CreateHeader(ObjectHeader header, byte[]? payload)
|
||||
{
|
||||
var grpcHeader = header.ToGrpcMessage();
|
||||
|
||||
grpcHeader.OwnerId = OwnerId.ToGrpcMessage();
|
||||
grpcHeader.Version = Version.ToGrpcMessage();
|
||||
|
||||
if (header.PayloadCheckSum != null)
|
||||
{
|
||||
grpcHeader.PayloadHash = new Checksum
|
||||
{
|
||||
Type = ChecksumType.Sha256,
|
||||
Sum = ByteString.CopyFrom(header.PayloadCheckSum)
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
if (payload != null)
|
||||
grpcHeader.PayloadHash = Sha256Checksum(payload);
|
||||
}
|
||||
|
||||
return grpcHeader;
|
||||
}
|
||||
|
||||
public async Task DeleteObjectAsync(ContainerId cid, ObjectId oid)
|
||||
|
@ -95,7 +265,7 @@ public partial class Client
|
|||
|
||||
request.AddMetaHeader();
|
||||
request.Sign(_key);
|
||||
var response = await _objectServiceClient.DeleteAsync(request);
|
||||
var response = await _objectServiceClient!.DeleteAsync(request);
|
||||
Verifier.CheckResponse(response);
|
||||
}
|
||||
|
||||
|
@ -153,66 +323,10 @@ public partial class Client
|
|||
|
||||
return new ObjectReader
|
||||
{
|
||||
Call = _objectServiceClient.Get(initRequest)
|
||||
Call = _objectServiceClient!.Get(initRequest)
|
||||
};
|
||||
}
|
||||
|
||||
private async Task<ObjectId> PutObject(ObjectHeader header, Stream payload)
|
||||
{
|
||||
var sessionToken = await CreateSessionAsync(uint.MaxValue);
|
||||
var hdr = header.ToGrpcMessage();
|
||||
hdr.OwnerId = OwnerId.ToGrpcMessage();
|
||||
hdr.Version = Version.ToGrpcMessage();
|
||||
|
||||
var oid = new ObjectID
|
||||
{
|
||||
Value = hdr.Sha256()
|
||||
};
|
||||
|
||||
var request = new PutRequest
|
||||
{
|
||||
Body = new PutRequest.Types.Body
|
||||
{
|
||||
Init = new PutRequest.Types.Body.Types.Init
|
||||
{
|
||||
Header = hdr
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
request.AddMetaHeader();
|
||||
request.AddObjectSessionToken(
|
||||
sessionToken,
|
||||
hdr.ContainerId,
|
||||
oid,
|
||||
ObjectSessionContext.Types.Verb.Put,
|
||||
_key
|
||||
);
|
||||
|
||||
request.Sign(_key);
|
||||
|
||||
using var stream = await PutObjectInit(request);
|
||||
var buffer = new byte[Constants.ObjectChunkSize];
|
||||
var bufferLength = await payload.ReadAsync(buffer, 0, Constants.ObjectChunkSize);
|
||||
|
||||
while (bufferLength > 0)
|
||||
{
|
||||
request.Body = new PutRequest.Types.Body
|
||||
{
|
||||
Chunk = ByteString.CopyFrom(buffer[..bufferLength]),
|
||||
};
|
||||
request.VerifyHeader = null;
|
||||
request.Sign(_key);
|
||||
await stream.Write(request);
|
||||
bufferLength = await payload.ReadAsync(buffer, 0, Constants.ObjectChunkSize);
|
||||
}
|
||||
|
||||
var response = await stream.Close();
|
||||
Verifier.CheckResponse(response);
|
||||
|
||||
return ObjectId.FromHash(response.Body.ObjectId.Value.ToByteArray());
|
||||
}
|
||||
|
||||
private async Task<ObjectStreamer> PutObjectInit(PutRequest initRequest)
|
||||
{
|
||||
if (initRequest is null)
|
||||
|
@ -220,7 +334,7 @@ public partial class Client
|
|||
throw new ArgumentNullException(nameof(initRequest));
|
||||
}
|
||||
|
||||
var call = _objectServiceClient.Put();
|
||||
var call = _objectServiceClient!.Put();
|
||||
await call.RequestStream.WriteAsync(initRequest);
|
||||
|
||||
return new ObjectStreamer(call);
|
||||
|
@ -248,6 +362,17 @@ public partial class Client
|
|||
throw new ArgumentNullException(nameof(initRequest));
|
||||
}
|
||||
|
||||
return new SearchReader(_objectServiceClient.Search(initRequest));
|
||||
return new SearchReader(_objectServiceClient!.Search(initRequest));
|
||||
}
|
||||
|
||||
public Checksum Sha256Checksum(byte[] data)
|
||||
{
|
||||
return new Checksum
|
||||
{
|
||||
Type = ChecksumType.Sha256,
|
||||
Sum = ByteString.CopyFrom(data.Sha256())
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -3,8 +3,6 @@ using System.Linq;
|
|||
using System.Numerics;
|
||||
using System.Text;
|
||||
|
||||
using Org.BouncyCastle.Security.Certificates;
|
||||
|
||||
namespace FrostFS.SDK.Cryptography;
|
||||
|
||||
public static class Base58
|
||||
|
|
|
@ -45,7 +45,6 @@ public static class Helper
|
|||
return ByteString.CopyFrom(data.ToByteArray().Sha256());
|
||||
}
|
||||
|
||||
|
||||
public static ulong Murmur64(this byte[] value, uint seed)
|
||||
{
|
||||
using var murmur = new Murmur3_128(seed);
|
||||
|
|
|
@ -1,30 +1,8 @@
|
|||
using System;
|
||||
namespace FrostFS.SDK.ModelsV2;
|
||||
|
||||
using FrostFS.SDK.Cryptography;
|
||||
|
||||
namespace FrostFS.SDK.ModelsV2;
|
||||
|
||||
public class ContainerId
|
||||
public class ContainerId(string id)
|
||||
{
|
||||
public string Value { get; set; }
|
||||
|
||||
public ContainerId(string id)
|
||||
{
|
||||
Value = id;
|
||||
}
|
||||
|
||||
public static ContainerId FromHash(byte[] hash)
|
||||
{
|
||||
if (hash.Length != Constants.Sha256HashLength)
|
||||
throw new FormatException("ContainerID must be a sha256 hash.");
|
||||
|
||||
return new ContainerId(Base58.Encode(hash));
|
||||
}
|
||||
|
||||
public byte[] ToHash()
|
||||
{
|
||||
return Base58.Decode(Value);
|
||||
}
|
||||
public string Value { get; set; } = id;
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
|
|
65
src/FrostFS.SDK.ModelsV2/Object/Object.cs
Normal file
65
src/FrostFS.SDK.ModelsV2/Object/Object.cs
Normal file
|
@ -0,0 +1,65 @@
|
|||
using System.Security.Cryptography;
|
||||
using FrostFS.SDK.ModelsV2.Enums;
|
||||
|
||||
namespace FrostFS.SDK.ModelsV2;
|
||||
|
||||
public class Object
|
||||
{
|
||||
public Object()
|
||||
{
|
||||
}
|
||||
|
||||
public Object(ContainerId container, byte[] payload, ObjectType objectType = ObjectType.Regular)
|
||||
{
|
||||
Payload = payload;
|
||||
Header = new ObjectHeader(containerId: container, type: objectType, attributes: []);
|
||||
}
|
||||
|
||||
public ObjectHeader Header { get; set; }
|
||||
public ObjectId ObjectId { get; set; }
|
||||
public byte[] Payload { get; set; }
|
||||
public Signature Signature { get; set; }
|
||||
|
||||
public void SetParent(LargeObject largeObject)
|
||||
{
|
||||
Header.Split!.ParentHeader = largeObject.Header;
|
||||
}
|
||||
|
||||
public ObjectId? GetParentId()
|
||||
{
|
||||
return Header.Split?.Parent;
|
||||
}
|
||||
}
|
||||
|
||||
public class LargeObject(ContainerId container) : Object(container, [])
|
||||
{
|
||||
private SHA256 payloadHash = SHA256.Create();
|
||||
|
||||
public void AppendBlock(byte[] bytes, int count)
|
||||
{
|
||||
Header.PayloadLength += (ulong)count;
|
||||
this.payloadHash.TransformBlock(bytes, 0, count, bytes, 0);
|
||||
}
|
||||
|
||||
public void CalculateHash()
|
||||
{
|
||||
this.payloadHash.TransformFinalBlock([], 0, 0);
|
||||
Header.PayloadCheckSum = this.payloadHash.Hash;
|
||||
}
|
||||
|
||||
public ulong PayloadLength
|
||||
{
|
||||
get { return Header.PayloadLength; }
|
||||
}
|
||||
}
|
||||
|
||||
public class LinkObject : Object
|
||||
{
|
||||
public LinkObject(ContainerId containerId, SplitId splitId, LargeObject largeObject) : base (containerId, [])
|
||||
{
|
||||
Header.Split = new Split(splitId)
|
||||
{
|
||||
ParentHeader = largeObject.Header
|
||||
};
|
||||
}
|
||||
}
|
13
src/FrostFS.SDK.ModelsV2/Object/ObjectAttribute.cs
Normal file
13
src/FrostFS.SDK.ModelsV2/Object/ObjectAttribute.cs
Normal file
|
@ -0,0 +1,13 @@
|
|||
namespace FrostFS.SDK.ModelsV2;
|
||||
|
||||
public class ObjectAttribute
|
||||
{
|
||||
public string Key { get; set; }
|
||||
public string Value { get; set; }
|
||||
|
||||
public ObjectAttribute(string key, string value)
|
||||
{
|
||||
Key = key;
|
||||
Value = value;
|
||||
}
|
||||
}
|
|
@ -2,18 +2,6 @@ using FrostFS.SDK.ModelsV2.Enums;
|
|||
|
||||
namespace FrostFS.SDK.ModelsV2;
|
||||
|
||||
public class ObjectAttribute
|
||||
{
|
||||
public string Key { get; set; }
|
||||
public string Value { get; set; }
|
||||
|
||||
public ObjectAttribute(string key, string value)
|
||||
{
|
||||
Key = key;
|
||||
Value = value;
|
||||
}
|
||||
}
|
||||
|
||||
public class ObjectFilter
|
||||
{
|
||||
private const string HeaderPrefix = "$Object:";
|
||||
|
@ -48,30 +36,3 @@ public class ObjectFilter
|
|||
return new ObjectFilter(matchType, HeaderPrefix + "version", version.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
public class ObjectHeader
|
||||
{
|
||||
public ObjectAttribute[] Attributes { get; set; }
|
||||
public ContainerId ContainerId { get; set; }
|
||||
public long Size { get; set; }
|
||||
public ObjectType ObjectType { get; set; }
|
||||
public Version Version { get; set; }
|
||||
|
||||
public ObjectHeader(
|
||||
ContainerId containerId,
|
||||
ObjectType type = ObjectType.Regular,
|
||||
params ObjectAttribute[] attributes
|
||||
)
|
||||
{
|
||||
Attributes = attributes;
|
||||
ContainerId = containerId;
|
||||
ObjectType = type;
|
||||
}
|
||||
}
|
||||
|
||||
public class Object
|
||||
{
|
||||
public ObjectHeader Header { get; set; }
|
||||
public ObjectId ObjectId { get; set; }
|
||||
public byte[] Payload { get; set; }
|
||||
}
|
37
src/FrostFS.SDK.ModelsV2/Object/ObjectHeader.cs
Normal file
37
src/FrostFS.SDK.ModelsV2/Object/ObjectHeader.cs
Normal file
|
@ -0,0 +1,37 @@
|
|||
using System.Collections.Generic;
|
||||
|
||||
using FrostFS.SDK.ModelsV2.Enums;
|
||||
|
||||
namespace FrostFS.SDK.ModelsV2;
|
||||
|
||||
public class ObjectHeader
|
||||
{
|
||||
public OwnerId OwnerId { get; set; }
|
||||
|
||||
public List<ObjectAttribute> Attributes { get; set; }
|
||||
|
||||
public ContainerId ContainerId { get; set; }
|
||||
|
||||
public ulong PayloadLength { get; set; }
|
||||
|
||||
public byte[]? PayloadCheckSum { get; set; }
|
||||
|
||||
public ObjectType ObjectType { get; set; }
|
||||
|
||||
public Version Version { get; set; }
|
||||
|
||||
public Split? Split { get; set; }
|
||||
|
||||
public bool ClientCut { get; set; }
|
||||
|
||||
public ObjectHeader(
|
||||
ContainerId containerId,
|
||||
ObjectType type = ObjectType.Regular,
|
||||
params ObjectAttribute[] attributes
|
||||
)
|
||||
{
|
||||
Attributes = [.. attributes];
|
||||
ContainerId = containerId;
|
||||
ObjectType = type;
|
||||
}
|
||||
}
|
88
src/FrostFS.SDK.ModelsV2/Splitter.cs
Normal file
88
src/FrostFS.SDK.ModelsV2/Splitter.cs
Normal file
|
@ -0,0 +1,88 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace FrostFS.SDK.ModelsV2;
|
||||
|
||||
public class Split
|
||||
{
|
||||
public Split() : this(new SplitId())
|
||||
{
|
||||
}
|
||||
|
||||
public Split(SplitId splitId)
|
||||
{
|
||||
SplitId = splitId;
|
||||
}
|
||||
|
||||
public SplitId SplitId { get; private set; }
|
||||
|
||||
public ObjectId? Parent { get; set; }
|
||||
|
||||
public ObjectId? Previous { get; set; }
|
||||
|
||||
public Signature? ParentSignature { get; set; }
|
||||
|
||||
public ObjectHeader? ParentHeader { get; set; }
|
||||
|
||||
public List<ObjectId> Children { get; } = [];
|
||||
}
|
||||
|
||||
public enum SignatureScheme {
|
||||
EcdsaSha512,
|
||||
EcdsaRfc6979Sha256,
|
||||
EcdsaRfc6979Sha256WalletConnect
|
||||
}
|
||||
|
||||
public class Signature
|
||||
{
|
||||
public byte[] Key { get; set; }
|
||||
public byte[] Sign { get; set; }
|
||||
public SignatureScheme Scheme { get; set; }
|
||||
}
|
||||
|
||||
public class SplitId
|
||||
{
|
||||
private Guid id;
|
||||
|
||||
public SplitId()
|
||||
{
|
||||
this.id = Guid.NewGuid();
|
||||
}
|
||||
public SplitId(Guid guid)
|
||||
{
|
||||
this.id = guid;
|
||||
}
|
||||
|
||||
private SplitId(byte[] binary)
|
||||
{
|
||||
this.id = new Guid(binary);
|
||||
}
|
||||
|
||||
private SplitId(string str)
|
||||
{
|
||||
this.id = new Guid(str);
|
||||
}
|
||||
|
||||
public static SplitId CrateFromBinary(byte[] binaryData)
|
||||
{
|
||||
return new SplitId(binaryData);
|
||||
}
|
||||
|
||||
public static SplitId CrateFromString(string stringData)
|
||||
{
|
||||
return new SplitId(stringData);
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return this.id.ToString();
|
||||
}
|
||||
|
||||
public byte[]? ToBinary()
|
||||
{
|
||||
if (this.id == Guid.Empty)
|
||||
return null;
|
||||
|
||||
return this.id.ToByteArray();
|
||||
}
|
||||
}
|
|
@ -115,6 +115,62 @@ namespace FrostFS.Object
|
|||
}
|
||||
}
|
||||
|
||||
public partial class PutSingleRequest : IRequest
|
||||
{
|
||||
IMetaHeader IVerificableMessage.GetMetaHeader()
|
||||
{
|
||||
return MetaHeader;
|
||||
}
|
||||
|
||||
IVerificationHeader IVerificableMessage.GetVerificationHeader()
|
||||
{
|
||||
return VerifyHeader;
|
||||
}
|
||||
|
||||
void IVerificableMessage.SetMetaHeader(IMetaHeader metaHeader)
|
||||
{
|
||||
MetaHeader = (RequestMetaHeader)metaHeader;
|
||||
}
|
||||
|
||||
void IVerificableMessage.SetVerificationHeader(IVerificationHeader verificationHeader)
|
||||
{
|
||||
VerifyHeader = (RequestVerificationHeader)verificationHeader;
|
||||
}
|
||||
|
||||
public IMessage GetBody()
|
||||
{
|
||||
return Body;
|
||||
}
|
||||
}
|
||||
|
||||
public partial class PutSingleResponse : IResponse
|
||||
{
|
||||
IMetaHeader IVerificableMessage.GetMetaHeader()
|
||||
{
|
||||
return MetaHeader;
|
||||
}
|
||||
|
||||
IVerificationHeader IVerificableMessage.GetVerificationHeader()
|
||||
{
|
||||
return VerifyHeader;
|
||||
}
|
||||
|
||||
void IVerificableMessage.SetMetaHeader(IMetaHeader metaHeader)
|
||||
{
|
||||
MetaHeader = (ResponseMetaHeader)metaHeader;
|
||||
}
|
||||
|
||||
void IVerificableMessage.SetVerificationHeader(IVerificationHeader verificationHeader)
|
||||
{
|
||||
VerifyHeader = (ResponseVerificationHeader)verificationHeader;
|
||||
}
|
||||
|
||||
public IMessage GetBody()
|
||||
{
|
||||
return Body;
|
||||
}
|
||||
}
|
||||
|
||||
public partial class DeleteRequest : IRequest
|
||||
{
|
||||
IMetaHeader IVerificableMessage.GetMetaHeader()
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
public partial class XHeader
|
||||
{
|
||||
public const string ReservedXHeaderPrefix = "__NEOFS__";
|
||||
public const string ReservedXHeaderPrefix = "__SYSTEM__";
|
||||
public const string XHeaderNetmapEpoch = ReservedXHeaderPrefix + "NETMAP_EPOCH";
|
||||
public const string XHeaderNetmapLookupDepth = ReservedXHeaderPrefix + "NETMAP_LOOKUP_DEPTH";
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue