Skip to content

Handle boundaries in multipart request #940

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

Merged
iroqueta merged 3 commits into from
Feb 21, 2025
Merged

Handle boundaries in multipart request #940

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5bd740
Remove extra line break
tomas-sexenian Feb 17, 2025
707572d
Handle boundaries in multipart request
iroqueta Feb 19, 2025
9b44b46
Handle boundaries in multipart request
iroqueta Feb 20, 2025
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
12 changes: 11 additions & 1 deletion common/src/main/java/com/genexus/internet/GXHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,15 +568,22 @@ protected String setPathUrl(String url) {
return url;
}

boolean firstMultiPart;
@SuppressWarnings("unchecked")
protected byte[] getData()
{
byte[] out = new byte[0];

firstMultiPart = false;
int variablesCount = getVariablesToSend().size();
int count = 1;
for (Object key: getVariablesToSend().keySet())
{
if (count == variablesCount)
firstMultiPart = true;
String value = getMultipartTemplate().getFormDataTemplate((String)key, (String)getVariablesToSend().get(key));
getContentToSend().add(0, value); //Variables al principio
count++;
}

for (int idx = 0; idx < getContentToSend().size(); idx++)
Expand Down Expand Up @@ -792,7 +799,10 @@ String getHeaderTemplate(String name, String fileName, String mimeType){
}
String getFormDataTemplate(String varName, String value){
String contentType = getContentTypeFromString(value);
return "\r\n--" + boundary + "\r\nContent-Disposition: form-data; name=\"" + varName + "\"\r\n" + ((contentType != null)? "Content-Type: " + contentType + "\r\n" : "") + "\r\n" + value;
String beginformDataTemplate = "\r\n--";
if (firstMultiPart)
beginformDataTemplate = "--";
return beginformDataTemplate + boundary + "\r\nContent-Disposition: form-data; name=\"" + varName + "\"\r\n" + ((contentType != null)? "Content-Type: " + contentType + "\r\n" : "") + "\r\n" + value;
}

private String getContentTypeFromString(String value){
Expand Down