Skip to content

Confine transport.vfs.ReplyFileName header value to the configured VFS reply folder #115

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
ThisaraWeerakoon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Confine transport.vfs.ReplyFileName header value to the configured VFS reply folder #115

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
22 changes: 22 additions & 0 deletions ...ransports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.axis2.transport.base.ManagementSupport;
import org.apache.commons.io.output.CountingOutputStream;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemManager;
Expand Down Expand Up @@ -160,6 +161,7 @@ public void sendMessage(MessageContext msgCtx, String targetAddress,

if (replyFile.exists()) {
if (replyFile.getType() == FileType.FOLDER) {
validateReplyFileNameFromTransportHeaders(replyFile, msgCtx);
if (isUseTempFile) {
tempTargetFileName = VFSUtils.generateTempFileName();
actualTargetFileName = VFSUtils.getFileName(msgCtx, vfsOutInfo);
Expand Down Expand Up @@ -256,6 +258,26 @@ public void sendMessage(MessageContext msgCtx, String targetAddress,
}
}

private void validateReplyFileNameFromTransportHeaders(FileObject replyFolder,
MessageContext msgCtx)
throws FileSystemException, AxisFault {

String fileName = VFSUtils.getReplyFileNameFromTransportHeaders(msgCtx);
if (fileName == null) {
return;
}

FileName replyFolderName = replyFolder.getName();
FileName resolvedName = fsManager.resolveFile(replyFolder, fileName).getName();
if (!replyFolderName.isDescendent(resolvedName)) {
handleException("The " + VFSConstants.REPLY_FILE_NAME + " transport header value : " +
VFSUtils.maskURLPassword(fileName) + " resolves to " +
VFSUtils.maskURLPassword(resolvedName.getURI()) +
" which is outside the reply folder : " +
VFSUtils.maskURLPassword(replyFolderName.getURI()));
}
}

private void populateResponseFile(FileObject responseFile, MessageContext msgContext,
boolean append, boolean lockingEnabled) throws AxisFault {

Expand Down
13 changes: 8 additions & 5 deletions modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,17 @@ public static String getProperty(FileContent message, String property) {
return null;
}

public static String getFileName(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) {
String fileName = null;

// first preference to a custom filename set on the current message context
public static String getReplyFileNameFromTransportHeaders(MessageContext msgCtx) {
Map transportHeaders = (Map) msgCtx.getProperty(MessageContext.TRANSPORT_HEADERS);
if (transportHeaders != null) {
fileName = (String) transportHeaders.get(VFSConstants.REPLY_FILE_NAME);
return (String) transportHeaders.get(VFSConstants.REPLY_FILE_NAME);
}
return null;
}

public static String getFileName(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) {
// first preference to a custom filename set on the current message context
String fileName = getReplyFileNameFromTransportHeaders(msgCtx);

// if not, does the service (in its service.xml) specify one?
if (fileName == null) {
Expand Down
Loading