fix: Fix Huge Memory consumption in WebDav Access - EXO-68314 (#308)

Prior to this change, when accessing webdav and getting a property or check it, the jcr:data content is parsed as string and added in properties list. This change will make the property value lazily loaded only when really needed and not when building the Property object.
exoplatform · Dec 16, 2023 · 6132294 · 6132294
1 parent 28b1b54
commit 6132294
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 24 deletions.
diff --git a/...onent.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java b/...onent.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java
@@ -322,30 +322,9 @@ else if (name.equals(OWNER))
    /**
     * Returns node's property wrapped in {@link HierarchicalProperty}.
     */
-   private HierarchicalProperty getProperty(Node node, QName name) throws PathNotFoundException, RepositoryException
-   {
-      Property property = node.getProperty(WebDavNamespaceContext.createName(name));
-      String propertyValue;
-      if (property.getDefinition().isMultiple())
-      {
-         if (property.getValues().length >= 1)
-         {
-            propertyValue = property.getValues()[0].getString();
-         }
-         else
-         {
-            // this means that we return empty value, because according to WebDAV spec:
-            // this is a property whose semantics and syntax are not enforced by the server
-            // the server only records the value of a dead property;
-            // the client is responsible for maintaining the consistency of the syntax and semantics of a dead property. 
-            propertyValue = "";
-         }
-      }
-      else
-      {
-         propertyValue = property.getString();
-      }
-      return new HierarchicalProperty(name, propertyValue);
+   private HierarchicalProperty getProperty(Node node, QName name) throws RepositoryException {
+     Property property = node.getProperty(WebDavNamespaceContext.createName(name));
+     return new FileResourceProperty(name, property);
    }
 
 

diff --git a/...bdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResourceProperty.java b/...bdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResourceProperty.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2003-2023 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.services.jcr.webdav.resource;
+
+import javax.jcr.Property;
+import javax.jcr.RepositoryException;
+import javax.xml.namespace.QName;
+
+import org.exoplatform.common.util.HierarchicalProperty;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
+public class FileResourceProperty extends HierarchicalProperty {
+  private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.FileResourceProperty");
+
+  private Property         property;
+
+  public FileResourceProperty(QName name, Property property) {
+    super(name);
+    this.property = property;
+  }
+
+  @Override
+  public String getValue() {
+    if (property != null && value == null) {
+      try {
+        if (property.getDefinition().isMultiple()) {
+          if (property.getValues().length >= 1) {
+            value = property.getValues()[0].getString();
+          } else {
+            // this means that we return empty value, because according to
+            // WebDAV spec: this is a property whose semantics and syntax are
+            // not enforced
+            // by the server the server only records the value of a dead
+            // property.
+            // the client is responsible for maintaining the consistency of the
+            // syntax and semantics of a dead property.
+            value = "";
+          }
+        } else {
+          value = property.getString();
+        }
+      } catch (RepositoryException e) {
+        LOG.warn("Error getting property {} value. Returning the already retrieved value", name, e);
+      } finally {
+        property = null;
+      }
+    }
+    return value;
+  }
+
+}