From 916b2bbdc06345a6cbc1c910675b616faa2c009c Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <rhaferkamp@owncloud.com>
Date: Wed, 13 Apr 2022 17:04:48 +0200
Subject: [PATCH] return proper errors when ocs/cloud/users is using the cs3
 backend

The ocs API was just exiting with a fatal error on any update request,
when configured for the cs3 backend. Now it returns a proper error.

Closes: #3483
---
 changelog/unreleased/ocs-cs3-fatal.md  |  6 ++++++
 extensions/ocs/pkg/service/v0/users.go | 24 ++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 changelog/unreleased/ocs-cs3-fatal.md

diff --git a/changelog/unreleased/ocs-cs3-fatal.md b/changelog/unreleased/ocs-cs3-fatal.md
new file mode 100644
index 00000000000..2b51751e5cb
--- /dev/null
+++ b/changelog/unreleased/ocs-cs3-fatal.md
@@ -0,0 +1,6 @@
+Bugfix: return proper errors when ocs/cloud/users is using the cs3 backend
+
+The ocs API was just exiting with a fatal error on any update request,
+when configured for the cs3 backend. Now it returns a proper error.
+
+https://github.com/owncloud/ocis/issues/3483
diff --git a/extensions/ocs/pkg/service/v0/users.go b/extensions/ocs/pkg/service/v0/users.go
index 605ac8632ad..35aeadb7737 100644
--- a/extensions/ocs/pkg/service/v0/users.go
+++ b/extensions/ocs/pkg/service/v0/users.go
@@ -230,7 +230,8 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) {
 			Account: newAccount,
 		})
 	case "cs3":
-		o.logger.Fatal().Msg("cs3 backend doesn't support adding users")
+		o.cs3WriteNotSupported(w, r)
+		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
@@ -293,7 +294,8 @@ func (o Ocs) EditUser(w http.ResponseWriter, r *http.Request) {
 	case "accounts":
 		account, err = o.fetchAccountByUsername(r.Context(), userid)
 	case "cs3":
-		o.logger.Fatal().Msg("cs3 backend doesn't support editing users")
+		o.cs3WriteNotSupported(w, r)
+		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
@@ -374,7 +376,8 @@ func (o Ocs) DeleteUser(w http.ResponseWriter, r *http.Request) {
 	case "accounts":
 		account, err = o.fetchAccountByUsername(r.Context(), userid)
 	case "cs3":
-		o.logger.Fatal().Msg("cs3 backend doesn't support deleting users")
+		o.cs3WriteNotSupported(w, r)
+		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
@@ -546,7 +549,8 @@ func (o Ocs) EnableUser(w http.ResponseWriter, r *http.Request) {
 	case "accounts":
 		account, err = o.fetchAccountByUsername(r.Context(), userid)
 	case "cs3":
-		o.logger.Fatal().Msg("cs3 backend doesn't support enabling users")
+		o.cs3WriteNotSupported(w, r)
+		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
@@ -600,7 +604,8 @@ func (o Ocs) DisableUser(w http.ResponseWriter, r *http.Request) {
 	case "accounts":
 		account, err = o.fetchAccountByUsername(r.Context(), userid)
 	case "cs3":
-		o.logger.Fatal().Msg("cs3 backend doesn't support disabling users")
+		o.cs3WriteNotSupported(w, r)
+		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
@@ -730,7 +735,8 @@ func (o Ocs) ListUsers(w http.ResponseWriter, r *http.Request) {
 		})
 	case "cs3":
 		// TODO
-		o.logger.Fatal().Msg("cs3 backend doesn't support listing users")
+		o.cs3WriteNotSupported(w, r)
+		return
 	default:
 		o.logger.Fatal().Msgf("Invalid accounts backend type '%s'", o.config.AccountBackend)
 	}
@@ -782,3 +788,9 @@ func (o Ocs) fetchAccountFromCS3Backend(ctx context.Context, name string) (*acco
 		GidNumber:                u.GidNumber,
 	}, nil
 }
+
+func (o Ocs) cs3WriteNotSupported(w http.ResponseWriter, r *http.Request) {
+	o.logger.Warn().Msg("the CS3 backend does not support adding or updating users")
+	o.NotImplementedStub(w, r)
+	return
+}