Skip to content

Improve cache clearing/GC/heap dump behavior #7655

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.

Sign up for GitHub

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

Open
labkey-jeckels wants to merge 1 commit into
base: release26.3-SNAPSHOT
Choose a base branch
from
Open

Improve cache clearing/GC/heap dump behavior #7655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion api/src/org/labkey/api/security/GroupManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@ private static void appendDotAttribute(StringBuilder sb, boolean prependComma, S
if (prependComma)
sb.append(", ");

sb.append(name).append("=\"").append(value).append("\"");
// Escape backslashes first, then quotes, to produce a valid DOT quoted string
String escaped = value.replace("\\", "\\\\").replace("\"", "\\\"");
sb.append(name).append("=\"").append(escaped).append("\"");
}

public static void exportGroupMembers(Group group, List<Group> memberGroups, List<User> memberUsers, GroupType xmlGroupType)
Expand Down
14 changes: 12 additions & 2 deletions core/src/org/labkey/core/CoreController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ else if (form.getSchemaName() != null && form.getQueryName() != null && form.get
{
throw new NotFoundException("The file '" + file.getName() + "' attached to the object '" + identifiable.getName() + "' cannot be found. It may have been deleted.");
}
throw new NotFoundException("File " + file.getPath() + " does not exist on the server file system. It may have been deleted.");
throw new NotFoundException("File " + file.getName() + " does not exist on the server file system. It may have been deleted.");
}

if (file.isDirectory())
Expand Down Expand Up @@ -654,6 +654,7 @@ private static byte[] compressCSS(String s)
catch (StackOverflowError e)
{
// replaceAll() can blow up
_log.error("StackOverflowError compressing CSS");
}
return Compress.compressGzip(c.trim());
}
Expand Down Expand Up @@ -935,6 +936,11 @@ public void validateForm(SimpleApiJsonForm form, Errors errors)
errors.reject(ERROR_MSG, "The container '" + parentIdentifier + "' is not a valid parent folder.");
return;
}

if (!target.hasPermission(getUser(), AdminPermission.class))
{
throw new UnauthorizedException("You must be an administrator for the target container");
}
}

@Override
Expand Down Expand Up @@ -2390,6 +2396,10 @@ public Object execute(Object o, BindException errors)
}
}

/**
* This action doesn't require any permissions, as the call to WarningService.getWarnings()
* only returns warnings appropriate for the user/guest
*/
@RequiresNoPermission
@AllowedDuringUpgrade
public static class DisplayWarningsAction extends MutatingApiAction<Object>
Expand Down Expand Up @@ -2721,7 +2731,7 @@ public void setToFormat(String toFormat)
}

@SuppressWarnings("unused") // Called from JavaScript: discuss.js, wikiEdit.js
@RequiresNoPermission
@RequiresPermission(ReadPermission.class)
public static class TransformWikiAction extends MutatingApiAction<TransformWikiForm>
{
@Override
Expand Down
Loading