Merge branch 'master' into unify-oidc

.drone.env

@@ -1,3 +1,3 @@
 # The test runner source for API tests
-CORE_COMMITID=a293d131eb9475542c72e048ddd44b8b6cbe2c01
+CORE_COMMITID=53a107c62f0e40bbfff0344ac3893ee40372a28e
 CORE_BRANCH=master

changelog/unreleased/app-editnew.md

@@ -0,0 +1,5 @@
+Bugfix: Support editnew actions from MS Office
+
+This fixes the incorrect behavior when creating new xlsx and pptx files, as MS Office supports the editnew action and it must be used for newly created files instead of the normal edit action.
+
+https://github.com/cs3org/reva/pull/2693

changelog/unreleased/capabilities-public.md

@@ -0,0 +1,3 @@
+Enhancement: Make capabilities endpoint public, authenticate users is present
+
+https://github.com/cs3org/reva/pull/2698

changelog/unreleased/enable-default-traces.md

@@ -0,0 +1,3 @@
+Enhancement: Enabling tracing by default if not explicitly disabled
+
+https://github.com/cs3org/reva/pull/2515

changelog/unreleased/eos-scope-devs.md

@@ -0,0 +1,3 @@
+Enhancement: Features for favorites xattrs in EOS, cache for scope expansion
+
+https://github.com/cs3org/reva/pull/2686

changelog/unreleased/preferences-refactor.md

@@ -0,0 +1,7 @@
+Enhancement: Preferences driver refactor and cbox sql implementation
+
+This PR uses the updated CS3APIs which accepts a namespace in addition to a
+single string key to recognize a user preference. It also refactors the GRPC
+service to support multiple drivers and adds the cbox SQL implementation.
+
+https://github.com/cs3org/reva/pull/2696

changelog/unreleased/siteacc-upd-2.md

@@ -0,0 +1,9 @@
+Enhancement: Further 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/2672

cmd/reva/preferences.go

@@ -40,6 +40,7 @@ var preferencesCommand = func() *command {
 
 		subcommand := cmd.Args()[0]
 		key := cmd.Args()[1]
+		ns := cmd.Args()[2]
 
 		client, err := getClient()
 		if err != nil {
@@ -50,12 +51,15 @@ var preferencesCommand = func() *command {
 
 		switch subcommand {
 		case "set":
-			if cmd.NArg() < 3 {
+			if cmd.NArg() < 4 {
 				return errors.New("Invalid arguments: " + cmd.Usage())
 			}
-			value := cmd.Args()[2]
+			value := cmd.Args()[3]
 			req := &preferences.SetKeyRequest{
-				Key: key,
+				Key: &preferences.PreferenceKey{
+					Namespace: ns,
+					Key:       key,
+				},
 				Val: value,
 			}
 
@@ -70,7 +74,10 @@ var preferencesCommand = func() *command {
 
 		case "get":
 			req := &preferences.GetKeyRequest{
-				Key: key,
+				Key: &preferences.PreferenceKey{
+					Namespace: ns,
+					Key:       key,
+				},
 			}
 
 			res, err := client.GetKey(ctx, req)

cmd/revad/runtime/loader.go

@@ -40,6 +40,7 @@ import (
 	_ "github.com/cs3org/reva/pkg/ocm/provider/authorizer/loader"
 	_ "github.com/cs3org/reva/pkg/ocm/share/manager/loader"
 	_ "github.com/cs3org/reva/pkg/permission/manager/loader"
+	_ "github.com/cs3org/reva/pkg/preferences/loader"
 	_ "github.com/cs3org/reva/pkg/publicshare/manager/loader"
 	_ "github.com/cs3org/reva/pkg/rhttp/datatx/manager/loader"
 	_ "github.com/cs3org/reva/pkg/share/cache/loader"

cmd/revad/runtime/runtime.go

@@ -311,6 +311,15 @@ func parseCoreConfOrDie(v interface{}) *coreConf {
 		os.Exit(1)
 	}
 
+	// tracing defaults to enabled if not explicitly configured
+	if v == nil {
+		c.TracingEnabled = true
+		c.TracingEndpoint = "localhost:6831"
+	} else if _, ok := v.(map[string]interface{})["tracing_enabled"]; !ok {
+		c.TracingEnabled = true
+		c.TracingEndpoint = "localhost:6831"
+	}
+
 	return c
 }
 

composer.json

@@ -3,7 +3,8 @@
   "config" : {
     "platform": {
       "php": "7.4"
-    }
+    },
+    "vendor-dir": "./vendor-php"
   },
   "require": {
   },

examples/nextcloud-integration/revad.toml

@@ -66,10 +66,13 @@ providers = "/etc/revad/providers.json"
 driver = "memory"
 
 [grpc.services.appprovider]
-driver = "demo"
-iopsecret = "testsecret"
-wopiurl = "http://0.0.0.0:8880/"
-wopibridgeurl = "http://localhost:8000/wopib"
+driver = "wopi"
+
+[grpc.services.appprovider.drivers.wopi]
+iop_secret = "hello"
+wopi_url = "http://0.0.0.0:8880/"
+app_name = "Collabora"
+app_url = "https://your-collabora-server.org:9980"
 
 [grpc.services.appregistry]
 driver = "static"

examples/ocmd/ocmd-server-1.toml

@@ -80,7 +80,7 @@ driver = "memory"
 driver = "static"
 
 [grpc.services.appprovider]
-driver = "demo"
+driver = "wopi"
 app_provider_url = "localhost:19000"
 
 [grpc.services.appprovider.drivers.wopi]

go.mod

@@ -2,15 +2,14 @@ module github.com/cs3org/reva
 
 require (
 	bou.ke/monkey v1.0.2
-	contrib.go.opencensus.io/exporter/prometheus v0.4.0
+	contrib.go.opencensus.io/exporter/prometheus v0.4.1
 	github.com/BurntSushi/toml v1.0.0
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/sprig v2.22.0+incompatible
 	github.com/ReneKroon/ttlcache/v2 v2.11.0
-	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/asim/go-micro/plugins/events/nats/v4 v4.0.0-20220118152736-9e0be6c85d75
-	github.com/aws/aws-sdk-go v1.42.39
+	github.com/aws/aws-sdk-go v1.43.28
 	github.com/beevik/etree v1.1.0
 	github.com/bluele/gcache v0.0.2
 	github.com/c-bata/go-prompt v0.2.5
@@ -19,15 +18,13 @@ require (
 	github.com/cheggaaa/pb v1.0.29
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e
-	github.com/cs3org/go-cs3apis v0.0.0-20220214084335-d975ab5d6e65
+	github.com/cs3org/go-cs3apis v0.0.0-20220330081745-2ad58f5932b9
 	github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8
 	github.com/dgraph-io/ristretto v0.1.0
 	github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59
 	github.com/gdexlab/go-render v1.0.1
 	github.com/go-chi/chi/v5 v5.0.7
 	github.com/go-ldap/ldap/v3 v3.4.2
-	github.com/go-openapi/errors v0.20.1 // indirect
-	github.com/go-openapi/strfmt v0.20.2 // indirect
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/golang/protobuf v1.5.2
@@ -52,37 +49,36 @@ require (
 	github.com/nats-io/nats-server/v2 v2.7.4
 	github.com/nats-io/nats-streaming-server v0.24.3
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.18.1
+	github.com/onsi/gomega v1.19.0
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/xattr v0.4.5
 	github.com/pquerna/cachecontrol v0.1.0 // indirect
-	github.com/prometheus/alertmanager v0.23.0
+	github.com/prometheus/alertmanager v0.24.0
 	github.com/rs/cors v1.8.2
 	github.com/rs/zerolog v1.26.1
 	github.com/sciencemesh/meshdirectory-web v1.0.4
 	github.com/sethvargo/go-password v0.2.0
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.7.1
 	github.com/studio-b12/gowebdav v0.0.0-20210917133250-a3a86976a1df
 	github.com/thanhpk/randstr v1.0.4
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tus/tusd v1.8.0
 	github.com/wk8/go-ordered-map v0.2.0
 	go-micro.dev/v4 v4.3.1-0.20211108085239-0c2041e43908
-	go.mongodb.org/mongo-driver v1.7.2 // indirect
 	go.opencensus.io v0.23.0
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0
-	go.opentelemetry.io/otel v1.4.1
-	go.opentelemetry.io/otel/exporters/jaeger v1.4.1
-	go.opentelemetry.io/otel/sdk v1.4.1
-	go.opentelemetry.io/otel/trace v1.4.1
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.31.0
+	go.opentelemetry.io/otel v1.6.1
+	go.opentelemetry.io/otel/exporters/jaeger v1.6.1
+	go.opentelemetry.io/otel/sdk v1.6.1
+	go.opentelemetry.io/otel/trace v1.6.1
 	golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70
 	golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7
-	golang.org/x/term v0.0.0-20210916214954-140adaaadfaf
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
 	google.golang.org/genproto v0.0.0-20211021150943-2b146023228c
-	google.golang.org/grpc v1.44.0
-	google.golang.org/protobuf v1.27.1
+	google.golang.org/grpc v1.45.0
+	google.golang.org/protobuf v1.28.0
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gotest.tools v2.2.0+incompatible
 )