bring 425 status back

Signed-off-by: jkoberg <jkoberg@owncloud.com>
cs3org · Dec 8, 2022 · 6a88404 · 6a88404
1 parent 7f55677
commit 6a88404
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/internal/http/services/owncloud/ocdav/propfind/propfind.go b/internal/http/services/owncloud/ocdav/propfind/propfind.go
@@ -1476,6 +1476,14 @@ func mdToPropResponse(ctx context.Context, pf *XML, md *provider.ResourceInfo, p
 		}
 	}
 
+	if status := utils.ReadPlainFromOpaque(md.Opaque, "status"); status == "processing" {
+		response.Propstat = append(response.Propstat, PropstatXML{
+			Status: "HTTP/1.1 425 TOO EARLY",
+			Prop:   propstatOK.Prop,
+		})
+		return &response, nil
+	}
+
 	if len(propstatOK.Prop) > 0 {
 		response.Propstat = append(response.Propstat, propstatOK)
 	}

diff --git a/pkg/storage/utils/decomposedfs/decomposedfs.go b/pkg/storage/utils/decomposedfs/decomposedfs.go
@@ -155,7 +155,10 @@ func New(o *options.Options, lu *lookup.Lookup, p PermissionsChecker, tp Tree, p
 	var ev events.Stream
 	if o.Events.NatsAddress != "" {
 		evtsCfg := o.Events
-		var rootCAPool *x509.CertPool
+		var (
+			rootCAPool *x509.CertPool
+			tlsConf    *tls.Config
+		)
 		if evtsCfg.TLSRootCACertificate != "" {
 			rootCrtFile, err := os.Open(evtsCfg.TLSRootCACertificate)
 			if err != nil {
@@ -170,12 +173,13 @@ func New(o *options.Options, lu *lookup.Lookup, p PermissionsChecker, tp Tree, p
 			rootCAPool = x509.NewCertPool()
 			rootCAPool.AppendCertsFromPEM(certBytes.Bytes())
 			evtsCfg.TLSInsecure = false
-		}
 
-		tlsConf := &tls.Config{
-			InsecureSkipVerify: evtsCfg.TLSInsecure, //nolint:gosec
-			RootCAs:            rootCAPool,
+			tlsConf = &tls.Config{
+				InsecureSkipVerify: evtsCfg.TLSInsecure, //nolint:gosec
+				RootCAs:            rootCAPool,
+			}
 		}
+
 		ev, err = server.NewNatsStream(
 			natsjs.TLSConfig(tlsConf),
 			natsjs.Address(evtsCfg.NatsAddress),