Site accounts update

.drone.env

@@ -1,3 +1,3 @@
 # The test runner source for API tests
-CORE_COMMITID=afae230f67daf971cda4a10d1b20cd846e87060b
+CORE_COMMITID=8fc353d79e7c0de1e137220c2422efcfe2ac5b89
 CORE_BRANCH=master

Dockerfile.revad-ceph

@@ -16,7 +16,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-FROM ceph/daemon-base
+FROM quay.ceph.io/ceph-ci/ceph:pacific
 
 RUN dnf update -y && dnf install -y \
   git \

changelog/unreleased/cephfs-fix-base.md

@@ -0,0 +1,6 @@
+Bugfix: Dockerfile.revad-ceph to use the right base image
+
+In Aug2021 https://hub.docker.com/r/ceph/daemon-base was moved to quay.ceph.io
+and the builds for this image were failing for some weeks after January.
+
+https://github.com/cs3org/reva/pull/2588

changelog/unreleased/change-public-link-hash.md

@@ -0,0 +1,7 @@
+Change: Remove hash from public link urls
+
+Public link urls do not contain the hash anymore, this is needed to support the ocis and web history mode.
+
+https://github.com/cs3org/reva/pull/2596
+https://github.com/owncloud/ocis/pull/3109
+https://github.com/owncloud/web/pull/6363

changelog/unreleased/eos-sys-acl-files.md

@@ -0,0 +1,3 @@
+Enhancement: Use sys ACLs for file permissions
+
+https://github.com/cs3org/reva/pull/2494

changelog/unreleased/fix-ocmd-tutorial.md

@@ -0,0 +1,7 @@
+Bugfix: Accept new userid idp format
+
+The format for userid idp [changed](https://github.com/cs3org/cs3apis/pull/159)
+and this broke [the ocmd tutorial](https://reva.link/docs/tutorials/share-tutorial/#5-1-4-create-the-share)
+This PR makes the provider authorizer interceptor accept both the old and the new string format.
+
+See https://github.com/cs3org/reva/issues/2285 and https://github.com/cs3org/reva/issues/2285

changelog/unreleased/honour-tracing-service-name.md

@@ -0,0 +1,3 @@
+Bugfix: respect the tracing_service_name config variable
+
+https://github.com/cs3org/reva/pull/2608

changelog/unreleased/mimetypes-config.md

@@ -0,0 +1,5 @@
+Enhancement: Externalize custom mime types configuration for storage providers
+
+Added ability to configure custom mime types in an external JSON file, such that it can be reused when many storage providers are deployed at the same time.
+
+https://github.com/cs3org/reva/pull/2613

changelog/unreleased/nextcloud-ocm-share-manager.md

@@ -0,0 +1,7 @@
+Enhancement: Nextcloud-based share manager for pkg/ocm/share
+
+Note that pkg/ocm/share is very similar to pkg/share,
+but it deals with cs3/sharing/ocm
+whereas pkg/share deals with cs3/sharing/collaboration
+
+https://github.com/cs3org/reva/pull/2163

changelog/unreleased/pull-transfer.md

@@ -0,0 +1,6 @@
+Enhancement: New CS3API datatx methods
+
+CS3 datatx pull model methods: PullTransfer, RetryTransfer, ListTransfers
+Method CreateTransfer removed.
+
+https://github.com/cs3org/reva/pull/2052

changelog/unreleased/siteacc-upd-2.md

@@ -0,0 +1,9 @@
+Enhancement: Site accounts improvements
+
+Yet another PR to update the site accounts (and Mentix):
+New default site ID;
+Include service type in alerts;
+Naming unified;
+Remove obsolete stuff.
+
+https://github.com/cs3org/reva/pull/2599

changelog/unreleased/waitForNats.md

@@ -0,0 +1,5 @@
+Bugfix: wait for nats server on middleware start
+
+Use a retry mechanism to connect to the nats server when it is not ready yet
+
+https://github.com/cs3org/reva/pull/2572

cmd/reva/main.go

@@ -82,6 +82,8 @@ var (
 		transferCreateCommand(),
 		transferGetStatusCommand(),
 		transferCancelCommand(),
+		transferListCommand(),
+		transferRetryCommand(),
 		appTokensListCommand(),
 		appTokensRemoveCommand(),
 		appTokensCreateCommand(),

cmd/reva/transfer-cancel.go

@@ -19,23 +19,27 @@
 package main
 
 import (
+	"encoding/gob"
 	"errors"
 	"io"
+	"os"
+	"time"
 
 	rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	datatx "github.com/cs3org/go-cs3apis/cs3/tx/v1beta1"
+	"github.com/jedib0t/go-pretty/table"
 )
 
 func transferCancelCommand() *command {
 	cmd := newCommand("transfer-cancel")
 	cmd.Description = func() string { return "cancel a running transfer" }
 	cmd.Usage = func() string { return "Usage: transfer-cancel [-flags]" }
-	txID := cmd.String("txID", "", "the transfer identifier")
+	txID := cmd.String("txId", "", "the transfer identifier")
 
 	cmd.Action = func(w ...io.Writer) error {
 		// validate flags
 		if *txID == "" {
-			return errors.New("txID must be specified: use -txID flag\n" + cmd.Usage())
+			return errors.New("txId must be specified: use -txId flag\n" + cmd.Usage())
 		}
 
 		ctx := getAuthContext()
@@ -44,7 +48,9 @@ func transferCancelCommand() *command {
 			return err
 		}
 
-		cancelRequest := &datatx.CancelTransferRequest{}
+		cancelRequest := &datatx.CancelTransferRequest{
+			TxId: &datatx.TxId{OpaqueId: *txID},
+		}
 
 		cancelResponse, err := client.CancelTransfer(ctx, cancelRequest)
 		if err != nil {
@@ -54,6 +60,22 @@ func transferCancelCommand() *command {
 			return formatError(cancelResponse.Status)
 		}
 
+		if len(w) == 0 {
+			t := table.NewWriter()
+			t.SetOutputMirror(os.Stdout)
+			t.AppendHeader(table.Row{"ShareId.OpaqueId", "Id.OpaqueId", "Status", "Ctime"})
+			cTime := time.Unix(int64(cancelResponse.TxInfo.Ctime.Seconds), int64(cancelResponse.TxInfo.Ctime.Nanos))
+			t.AppendRows([]table.Row{
+				{cancelResponse.TxInfo.ShareId.OpaqueId, cancelResponse.TxInfo.Id.OpaqueId, cancelResponse.TxInfo.Status, cTime.Format("Mon Jan 2 15:04:05 -0700 MST 2006")},
+			})
+			t.Render()
+		} else {
+			enc := gob.NewEncoder(w[0])
+			if err := enc.Encode(cancelResponse.TxInfo); err != nil {
+				return err
+			}
+		}
+
 		return nil
 	}
 	return cmd

cmd/reva/transfer-create.go

@@ -42,8 +42,8 @@ func transferCreateCommand() *command {
 	cmd.Description = func() string { return "create transfer between 2 sites" }
 	cmd.Usage = func() string { return "Usage: transfer-create [-flags] <path>" }
 	grantee := cmd.String("grantee", "", "the grantee, receiver of the transfer")
-	granteeType := cmd.String("granteeType", "user", "the grantee type, one of: user, group")
-	idp := cmd.String("idp", "", "the idp of the grantee, default to same idp as the user triggering the action")
+	granteeType := cmd.String("granteeType", "user", "the grantee type, one of: user, group (defaults to user)")
+	idp := cmd.String("idp", "", "the idp of the grantee")
 	userType := cmd.String("user-type", "primary", "the type of user account, defaults to primary")
 
 	cmd.Action = func(w ...io.Writer) error {

cmd/reva/transfer-get-status.go

@@ -19,23 +19,27 @@
 package main
 
 import (
+	"encoding/gob"
 	"errors"
 	"io"
+	"os"
+	"time"
 
 	rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	datatx "github.com/cs3org/go-cs3apis/cs3/tx/v1beta1"
+	"github.com/jedib0t/go-pretty/table"
 )
 
 func transferGetStatusCommand() *command {
 	cmd := newCommand("transfer-get-status")
 	cmd.Description = func() string { return "get the status of a transfer" }
 	cmd.Usage = func() string { return "Usage: transfer-get-status [-flags]" }
-	txID := cmd.String("txID", "", "the transfer identifier")
+	txID := cmd.String("txId", "", "the transfer identifier")
 
 	cmd.Action = func(w ...io.Writer) error {
 		// validate flags
 		if *txID == "" {
-			return errors.New("txID must be specified: use -txID flag\n" + cmd.Usage())
+			return errors.New("txId must be specified: use -txId flag\n" + cmd.Usage())
 		}
 
 		ctx := getAuthContext()
@@ -44,7 +48,9 @@ func transferGetStatusCommand() *command {
 			return err
 		}
 
-		getStatusRequest := &datatx.GetTransferStatusRequest{}
+		getStatusRequest := &datatx.GetTransferStatusRequest{
+			TxId: &datatx.TxId{OpaqueId: *txID},
+		}
 
 		getStatusResponse, err := client.GetTransferStatus(ctx, getStatusRequest)
 		if err != nil {
@@ -54,6 +60,22 @@ func transferGetStatusCommand() *command {
 			return formatError(getStatusResponse.Status)
 		}
 
+		if len(w) == 0 {
+			t := table.NewWriter()
+			t.SetOutputMirror(os.Stdout)
+			t.AppendHeader(table.Row{"ShareId.OpaqueId", "Id.OpaqueId", "Status", "Ctime"})
+			cTime := time.Unix(int64(getStatusResponse.TxInfo.Ctime.Seconds), int64(getStatusResponse.TxInfo.Ctime.Nanos))
+			t.AppendRows([]table.Row{
+				{getStatusResponse.TxInfo.ShareId.OpaqueId, getStatusResponse.TxInfo.Id.OpaqueId, getStatusResponse.TxInfo.Status, cTime.Format("Mon Jan 2 15:04:05 -0700 MST 2006")},
+			})
+			t.Render()
+		} else {
+			enc := gob.NewEncoder(w[0])
+			if err := enc.Encode(getStatusResponse.TxInfo); err != nil {
+				return err
+			}
+		}
+
 		return nil
 	}
 	return cmd

cmd/reva/transfer-list.go

@@ -0,0 +1,91 @@
+// Copyright 2018-2021 CERN
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// In applying this license, CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+package main
+
+import (
+	"encoding/gob"
+	"io"
+	"os"
+
+	rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
+	ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1"
+	datatx "github.com/cs3org/go-cs3apis/cs3/tx/v1beta1"
+	"github.com/jedib0t/go-pretty/table"
+)
+
+func transferListCommand() *command {
+	cmd := newCommand("transfer-list")
+	cmd.Description = func() string { return "get a list of transfers" }
+	cmd.Usage = func() string { return "Usage: transfer-list [-flags]" }
+	filterShareID := cmd.String("shareId", "", "share ID filter (optional)")
+
+	cmd.Action = func(w ...io.Writer) error {
+		ctx := getAuthContext()
+		client, err := getClient()
+		if err != nil {
+			return err
+		}
+
+		// validate flags
+		var filters []*datatx.ListTransfersRequest_Filter
+		if *filterShareID != "" {
+			filters = append(filters, &datatx.ListTransfersRequest_Filter{
+				Type: datatx.ListTransfersRequest_Filter_TYPE_SHARE_ID,
+				Term: &datatx.ListTransfersRequest_Filter_ShareId{
+					ShareId: &ocm.ShareId{
+						OpaqueId: *filterShareID,
+					},
+				},
+			})
+		}
+
+		transferslistRequest := &datatx.ListTransfersRequest{
+			Filters: filters,
+		}
+
+		listTransfersResponse, err := client.ListTransfers(ctx, transferslistRequest)
+		if err != nil {
+			return err
+		}
+		if listTransfersResponse.Status.Code != rpc.Code_CODE_OK {
+			return formatError(listTransfersResponse.Status)
+		}
+
+		if len(w) == 0 {
+			t := table.NewWriter()
+			t.SetOutputMirror(os.Stdout)
+			t.AppendHeader(table.Row{"ShareId.OpaqueId", "Id.OpaqueId"})
+
+			for _, s := range listTransfersResponse.Transfers {
+				t.AppendRows([]table.Row{
+					{s.ShareId.OpaqueId, s.Id.OpaqueId},
+				})
+			}
+			t.Render()
+		} else {
+			enc := gob.NewEncoder(w[0])
+			if err := enc.Encode(listTransfersResponse.Transfers); err != nil {
+				return err
+			}
+		}
+
+		return nil
+	}
+	return cmd
+}