mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-04-23 04:28:48 -05:00
[full-ci] Bump reva (#7675)
* Bump reva * Adapt expected failures * update MOVE files between shares tests --------- Co-authored-by: Saw-jan <saw.jan.grg3e@gmail.com>
This commit is contained in:
Generated
Vendored
+3
-2
@@ -643,9 +643,10 @@ func (s *service) Move(ctx context.Context, req *provider.MoveRequest) (*provide
|
||||
Status: rpcStatus,
|
||||
}, nil
|
||||
}
|
||||
if srcReceivedShare.Share.ResourceId.SpaceId != dstReceivedShare.Share.ResourceId.SpaceId {
|
||||
|
||||
if dstReceivedShare.Share.Id.OpaqueId != srcReceivedShare.Share.Id.OpaqueId {
|
||||
return &provider.MoveResponse{
|
||||
Status: status.NewInvalid(ctx, "sharesstorageprovider: can not move between shares on different storages"),
|
||||
Status: status.NewUnimplemented(ctx, nil, "sharesstorageprovider: can not move between shares"),
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
Generated
Vendored
+1
-1
@@ -105,7 +105,7 @@ func (s *svc) routerInit() error {
|
||||
return err
|
||||
}
|
||||
|
||||
s.router.Get("/generate-invite", tokenHandler.Generate)
|
||||
s.router.Post("/generate-invite", tokenHandler.Generate)
|
||||
s.router.Get("/list-invite", tokenHandler.ListInvite)
|
||||
s.router.Post("/accept-invite", tokenHandler.AcceptInvite)
|
||||
s.router.Get("/find-accepted-users", tokenHandler.FindAccepted)
|
||||
|
||||
+5
-1
@@ -163,7 +163,11 @@ func (a *authorizer) IsProviderAllowed(ctx context.Context, pi *ocmprovider.Prov
|
||||
if hostIPs, ok := a.providerIPs.Load(ocmHost); ok {
|
||||
ipList = hostIPs.([]string)
|
||||
} else {
|
||||
addr, err := net.LookupIP(ocmHost)
|
||||
host, _, err := net.SplitHostPort(ocmHost)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "json: error looking up client IP")
|
||||
}
|
||||
addr, err := net.LookupIP(host)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "json: error looking up client IP")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user