Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Dec 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}


Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}

}