Skip to content
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
1 change: 1 addition & 0 deletions api/src/org/labkey/api/premium/AntiVirusService.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public interface AntiVirusService
{
// NOTE purposefully this is not the same as the standard test file: ...EICAR-STANDARD-ANTIVIRUS-TEST-FILE...
String TEST_VIRUS_CONTENT="X5O!P%@AP[4\\PZX54(P^)7CC)7}$LABKEY-ANTIVIRUS-TEST-FILE!$H+H*";
String MALICIOUS_FILE_ERROR_MESSAGE = "For security reasons, we did not upload this file. Please contact your internal IT or Information Security department for assistance in dealing with this potentially harmful file.";

static @Nullable AntiVirusService get()
{
Expand Down
2 changes: 1 addition & 1 deletion core/src/org/labkey/core/webdav/DavController.java
Original file line number Diff line number Diff line change
Expand Up @@ -3002,7 +3002,7 @@ public void closeInputStream() throws IOException
if (result.result == AntiVirusService.Result.CONFIGURATION_ERROR)
throw new ConfigurationException(result.message);
else
throw new DavException(WebdavStatus.SC_BAD_REQUEST, result.message);
throw new DavException(WebdavStatus.SC_BAD_REQUEST, result.message + ". " + AntiVirusService.MALICIOUS_FILE_ERROR_MESSAGE);
}
}

Expand Down