Merge remote-tracking branch 'origin/master' into spaces

Author: jessegeens

changelog/unreleased/app-notify.md

@@ -0,0 +1,3 @@
+Enhancement: extend app /notify endpoint to allow reporting errors
+
+https://github.com/cs3org/reva/pull/5085

changelog/unreleased/broken-quota.md

@@ -0,0 +1,5 @@
+Bugfix: wrong quota total reported
+
+The EOS `QuotaInfo` struct had fields for `AvailableBytes` and `AvailableInodes`, but these were used to mean the total. This is fixed now.
+
+https://github.com/cs3org/reva/pull/5082

changelog/unreleased/quota-logical.md

@@ -0,0 +1,5 @@
+Bugfix: use logicalbytes instead of bytes
+
+EOS gRPC used `usedbytes` instead of `usedlogicalbytes` for calculating quota, resulting in a wrong view
+
+https://github.com/cs3org/reva/pull/5084

internal/http/services/appprovider/appprovider.go

@@ -22,6 +22,7 @@ import (
 	"context"
 	"crypto/tls"
 	"encoding/json"
+	"io"
 	"net/http"
 	"path"
 
@@ -468,10 +469,17 @@ func (s *svc) handleNotify(w http.ResponseWriter, r *http.Request) {
 		fileRef.ResourceId = resourceID
 	}
 
+	// the body of the request may contain any error the client got when attempting to open the app
+	failure, _ := io.ReadAll(r.Body)
+
 	// log the fileid for later correlation / monitoring
 	ctx := r.Context()
 	log := appctx.GetLogger(ctx)
-	log.Info().Interface("resource", &fileRef).Msg("file successfully opened in app")
+	if len(failure) == 0 {
+		log.Info().Interface("resource", fileRef).Msg("file successfully opened in app")
+	} else {
+		log.Info().Interface("resource", fileRef).Str("failure", string(failure)).Msg("failed to open file in app")
+	}
 
 	w.WriteHeader(http.StatusOK)
 }

pkg/eosclient/eosbinary/eosbinary.go

@@ -1073,10 +1073,10 @@ func (c *Client) parseQuota(path, raw string) (*eosclient.QuotaInfo, error) {
 			usedInodes, _ := strconv.ParseUint(usedInodesString, 10, 64)
 
 			qi := &eosclient.QuotaInfo{
-				AvailableBytes:  maxBytes,
-				UsedBytes:       usedBytes,
-				AvailableInodes: maxInodes,
-				UsedInodes:      usedInodes,
+				TotalBytes:  maxBytes,
+				UsedBytes:   usedBytes,
+				TotalInodes: maxInodes,
+				UsedInodes:  usedInodes,
 			}
 			return qi, nil
 		}

pkg/eosclient/eosclient.go

@@ -110,11 +110,11 @@ type Checksum struct {
 	XSType string
 }
 
-// QuotaInfo reports the available bytes and inodes for a particular user.
+// QuotaInfo reports the total and used bytes and inodes for a particular user.
 // eos reports all quota values are unsigned long, see https://github.com/cern-eos/eos/blob/93515df8c0d5a858982853d960bec98f983c1285/mgm/Quota.hh#L135
 type QuotaInfo struct {
-	AvailableBytes, UsedBytes   uint64
-	AvailableInodes, UsedInodes uint64
+	TotalBytes, UsedBytes   uint64
+	TotalInodes, UsedInodes uint64
 }
 
 // SetQuotaInfo encapsulates the information needed to

pkg/eosclient/eosgrpc/eosgrpc.go

@@ -852,18 +852,10 @@ func (c *Client) GetQuota(ctx context.Context, username string, rootAuth eosclie
 	for i := 0; i < len(resp.Quota.Quotanode); i++ {
 		log.Debug().Str("func", "GetQuota").Str("quotanode:", fmt.Sprintf("%d: %#v", i, resp.Quota.Quotanode[i])).Msg("")
 
-		mx := int64(resp.Quota.Quotanode[i].Maxlogicalbytes) - int64(resp.Quota.Quotanode[i].Usedbytes)
-		if mx < 0 {
-			mx = 0
-		}
-		qi.AvailableBytes += uint64(mx)
-		qi.UsedBytes += resp.Quota.Quotanode[i].Usedbytes
+		qi.TotalBytes += max(uint64(resp.Quota.Quotanode[i].Maxlogicalbytes), 0)
+		qi.UsedBytes += resp.Quota.Quotanode[i].Usedlogicalbytes
 
-		mx = int64(resp.Quota.Quotanode[i].Maxfiles) - int64(resp.Quota.Quotanode[i].Usedfiles)
-		if mx < 0 {
-			mx = 0
-		}
-		qi.AvailableInodes += uint64(mx)
+		qi.TotalInodes += max(uint64(resp.Quota.Quotanode[i].Maxfiles), 0)
 		qi.UsedInodes += resp.Quota.Quotanode[i].Usedfiles
 	}
 

pkg/storage/utils/eosfs/eosfs.go

@@ -1202,7 +1202,7 @@ func (fs *eosfs) CreateStorageSpace(ctx context.Context, req *provider.CreateSto
 	return nil, fmt.Errorf("unimplemented: CreateStorageSpace")
 }
 
-func (fs *eosfs) GetQuota(ctx context.Context, ref *provider.Reference) (uint64, uint64, error) {
+func (fs *eosfs) GetQuota(ctx context.Context, ref *provider.Reference) (totalbytes, usedbytes uint64, err error) {
 	u, err := utils.GetUser(ctx)
 	if err != nil {
 		return 0, 0, errors.Wrap(err, "eosfs: no user in ctx")
@@ -1221,7 +1221,7 @@ func (fs *eosfs) GetQuota(ctx context.Context, ref *provider.Reference) (uint64,
 		return 0, 0, err
 	}
 
-	return qi.AvailableBytes, qi.UsedBytes, nil
+	return qi.TotalBytes, qi.UsedBytes, nil
 }
 
 func (fs *eosfs) GetHome(ctx context.Context) (string, error) {