revert all changes to ocdav

services/ocdav/pkg/command/server.go

@@ -77,6 +77,7 @@ func Server(cfg *config.Config) *cli.Command {
 					ocdav.Version(cfg.Status.Version),
 					ocdav.VersionString(cfg.Status.VersionString),
 					ocdav.Edition(cfg.Status.Edition),
+					ocdav.MachineAuthAPIKey(cfg.MachineAuthAPIKey),
 					ocdav.Broker(broker.NoOp{}),
 					// ocdav.FavoriteManager() // FIXME needs a proper persistence implementation https://github.com/owncloud/ocis/issues/1228
 					// ocdav.LockSystem(), // will default to the CS3 lock system

services/ocdav/pkg/config/config.go

@@ -31,6 +31,8 @@ type Config struct {
 	// Timeout in seconds when making requests to the gateway
 	Timeout int64 `yaml:"gateway_request_timeout" env:"OCDAV_GATEWAY_REQUEST_TIMEOUT" desc:"Request timeout in seconds for requests from the oCDAV service to the GATEWAY service."`
 
+	MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;OCDAV_MACHINE_AUTH_API_KEY" desc:"Machine auth API key used to validate internal requests necessary for the access to resources from other services."`
+
 	Context context.Context `yaml:"-"`
 	Status  Status          `yaml:"-"`
 

services/ocdav/pkg/config/defaults/defaultconfig.go

@@ -77,13 +77,14 @@ func DefaultConfig() *config.Config {
 		Service: config.Service{
 			Name: "ocdav",
 		},
-		Reva:            shared.DefaultRevaConfig(),
-		WebdavNamespace: "/users/{{.Id.OpaqueId}}",
-		FilesNamespace:  "/users/{{.Id.OpaqueId}}",
-		SharesNamespace: "/Shares",
-		PublicURL:       "https://localhost:9200",
-		Insecure:        false,
-		Timeout:         84300,
+		Reva:              shared.DefaultRevaConfig(),
+		WebdavNamespace:   "/users/{{.Id.OpaqueId}}",
+		FilesNamespace:    "/users/{{.Id.OpaqueId}}",
+		SharesNamespace:   "/Shares",
+		PublicURL:         "https://localhost:9200",
+		Insecure:          false,
+		Timeout:           84300,
+		MachineAuthAPIKey: "",
 		Status: config.Status{
 			Version:        version.Legacy,
 			VersionString:  version.LegacyString,
@@ -131,6 +132,10 @@ func EnsureDefaults(cfg *config.Config) {
 	} else if cfg.TokenManager == nil {
 		cfg.TokenManager = &config.TokenManager{}
 	}
+
+	if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
+		cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
+	}
 }
 
 // Sanitize sanitizes the configuration

services/ocdav/pkg/config/parser/parse.go

@@ -37,5 +37,9 @@ func Validate(cfg *config.Config) error {
 	if cfg.TokenManager.JWTSecret == "" {
 		return shared.MissingJWTTokenError(cfg.Service.Name)
 	}
+	if cfg.MachineAuthAPIKey == "" {
+		return shared.MissingMachineAuthApiKeyError(cfg.Service.Name)
+	}
+
 	return nil
 }