@@ -602,7 +602,7 @@ func (s *Server) Head(ctx context.Context, req *protoobject.HeadRequest) (*proto
602
602
}
603
603
604
604
var resp protoobject.HeadResponse
605
- p , err := convertHeadPrm (s . signer , req , & resp )
605
+ p , err := convertHeadPrm (req , & resp )
606
606
if err != nil {
607
607
return s .makeStatusHeadResponse (err ), nil
608
608
}
@@ -657,7 +657,7 @@ func (x *headResponse) WriteHeader(hdr *object.Object) error {
657
657
658
658
// converts original request into parameters accepted by the internal handler.
659
659
// Note that the response is untouched within this call.
660
- func convertHeadPrm (signer ecdsa. PrivateKey , req * protoobject.HeadRequest , resp * protoobject.HeadResponse ) (getsvc.HeadPrm , error ) {
660
+ func convertHeadPrm (req * protoobject.HeadRequest , resp * protoobject.HeadResponse ) (getsvc.HeadPrm , error ) {
661
661
body := req .GetBody ()
662
662
ma := body .GetAddress ()
663
663
if ma == nil { // includes nil body
@@ -686,25 +686,11 @@ func convertHeadPrm(signer ecdsa.PrivateKey, req *protoobject.HeadRequest, resp
686
686
return p , nil
687
687
}
688
688
689
- var onceResign sync.Once
690
689
meta := req .GetMetaHeader ()
691
690
if meta == nil {
692
691
return getsvc.HeadPrm {}, errors .New ("missing meta header" )
693
692
}
694
693
p .SetRequestForwarder (func (ctx context.Context , node client.NodeInfo , c client.MultiAddressClient ) (* object.Object , error ) {
695
- var err error
696
- onceResign .Do (func () {
697
- req .MetaHeader = & protosession.RequestMetaHeader {
698
- // TODO: #1165 think how to set the other fields
699
- Ttl : meta .GetTtl () - 1 ,
700
- Origin : meta ,
701
- }
702
- req .VerifyHeader , err = neofscrypto .SignRequestWithBuffer (neofsecdsa .Signer (signer ), req , nil )
703
- })
704
- if err != nil {
705
- return nil , err
706
- }
707
-
708
694
nodePub := node .PublicKey ()
709
695
var hdr * object.Object
710
696
return hdr , c .ForEachGRPCConn (ctx , func (ctx context.Context , conn * grpc.ClientConn ) error {
@@ -1051,7 +1037,7 @@ func (s *Server) Get(req *protoobject.GetRequest, gStream protoobject.ObjectServ
1051
1037
return s .sendStatusGetResponse (gStream , err )
1052
1038
}
1053
1039
1054
- p , err := convertGetPrm (s . signer , req , & getStream {
1040
+ p , err := convertGetPrm (req , & getStream {
1055
1041
base : gStream ,
1056
1042
srv : s ,
1057
1043
reqInfo : reqInfo ,
@@ -1069,7 +1055,7 @@ func (s *Server) Get(req *protoobject.GetRequest, gStream protoobject.ObjectServ
1069
1055
// converts original request into parameters accepted by the internal handler.
1070
1056
// Note that the stream is untouched within this call, errors are not reported
1071
1057
// into it.
1072
- func convertGetPrm (signer ecdsa. PrivateKey , req * protoobject.GetRequest , stream * getStream ) (getsvc.Prm , error ) {
1058
+ func convertGetPrm (req * protoobject.GetRequest , stream * getStream ) (getsvc.Prm , error ) {
1073
1059
body := req .GetBody ()
1074
1060
ma := body .GetAddress ()
1075
1061
if ma == nil { // includes nil body
@@ -1095,27 +1081,13 @@ func convertGetPrm(signer ecdsa.PrivateKey, req *protoobject.GetRequest, stream
1095
1081
return p , nil
1096
1082
}
1097
1083
1098
- var onceResign sync.Once
1099
1084
var onceHdr sync.Once
1100
1085
var respondedPayload int
1101
1086
meta := req .GetMetaHeader ()
1102
1087
if meta == nil {
1103
1088
return getsvc.Prm {}, errors .New ("missing meta header" )
1104
1089
}
1105
1090
p .SetRequestForwarder (func (ctx context.Context , node client.NodeInfo , c client.MultiAddressClient ) (* object.Object , error ) {
1106
- var err error
1107
- onceResign .Do (func () {
1108
- req .MetaHeader = & protosession.RequestMetaHeader {
1109
- // TODO: #1165 think how to set the other fields
1110
- Ttl : meta .GetTtl () - 1 ,
1111
- Origin : meta ,
1112
- }
1113
- req .VerifyHeader , err = neofscrypto .SignRequestWithBuffer (neofsecdsa .Signer (signer ), req , nil )
1114
- })
1115
- if err != nil {
1116
- return nil , err
1117
- }
1118
-
1119
1091
nodePub := node .PublicKey ()
1120
1092
return nil , c .ForEachGRPCConn (ctx , func (ctx context.Context , conn * grpc.ClientConn ) error {
1121
1093
err := continueGetFromRemoteNode (ctx , conn , nodePub , req , stream , & onceHdr , & respondedPayload )
@@ -1291,7 +1263,7 @@ func (s *Server) GetRange(req *protoobject.GetRangeRequest, gStream protoobject.
1291
1263
return s .sendStatusRangeResponse (gStream , err )
1292
1264
}
1293
1265
1294
- p , err := convertRangePrm (s . signer , req , & rangeStream {
1266
+ p , err := convertRangePrm (req , & rangeStream {
1295
1267
base : gStream ,
1296
1268
srv : s ,
1297
1269
reqInfo : reqInfo ,
@@ -1309,7 +1281,7 @@ func (s *Server) GetRange(req *protoobject.GetRangeRequest, gStream protoobject.
1309
1281
// converts original request into parameters accepted by the internal handler.
1310
1282
// Note that the stream is untouched within this call, errors are not reported
1311
1283
// into it.
1312
- func convertRangePrm (signer ecdsa. PrivateKey , req * protoobject.GetRangeRequest , stream * rangeStream ) (getsvc.RangePrm , error ) {
1284
+ func convertRangePrm (req * protoobject.GetRangeRequest , stream * rangeStream ) (getsvc.RangePrm , error ) {
1313
1285
body := req .GetBody ()
1314
1286
ma := body .GetAddress ()
1315
1287
if ma == nil { // includes nil body
@@ -1348,26 +1320,12 @@ func convertRangePrm(signer ecdsa.PrivateKey, req *protoobject.GetRangeRequest,
1348
1320
return p , nil
1349
1321
}
1350
1322
1351
- var onceResign sync.Once
1352
1323
var respondedPayload int
1353
1324
meta := req .GetMetaHeader ()
1354
1325
if meta == nil {
1355
1326
return getsvc.RangePrm {}, errors .New ("missing meta header" )
1356
1327
}
1357
1328
p .SetRequestForwarder (func (ctx context.Context , node client.NodeInfo , c client.MultiAddressClient ) (* object.Object , error ) {
1358
- var err error
1359
- onceResign .Do (func () {
1360
- req .MetaHeader = & protosession.RequestMetaHeader {
1361
- // TODO: #1165 think how to set the other fields
1362
- Ttl : meta .GetTtl () - 1 ,
1363
- Origin : meta ,
1364
- }
1365
- req .VerifyHeader , err = neofscrypto .SignRequestWithBuffer (neofsecdsa .Signer (signer ), req , nil )
1366
- })
1367
- if err != nil {
1368
- return nil , err
1369
- }
1370
-
1371
1329
nodePub := node .PublicKey ()
1372
1330
return nil , c .ForEachGRPCConn (ctx , func (ctx context.Context , conn * grpc.ClientConn ) error {
1373
1331
err := continueRangeFromRemoteNode (ctx , conn , nodePub , req , stream , & respondedPayload )
0 commit comments