Skip to content

Encode non UTF-8 characters only once #943

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

Encode non UTF-8 characters only once #943

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
31 changes: 31 additions & 0 deletions common/src/main/java/com/genexus/CommonUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.math.BigDecimal;
import java.io.*;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.text.*;
import java.util.*;

Expand Down Expand Up @@ -3490,4 +3491,34 @@ public static String Sanitize(String input, HashMap<Character, Character> whiteL
}
return sanitizedInput.toString();
}

public static String encodeUtf8Once(String input) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < input.length(); i++) {
char c = input.charAt(i);
if (c == '%' && i + 2 < input.length() &&
(((input.charAt(i+1) >= '0' && input.charAt(i+1) <= '9') ||
(input.charAt(i+1) >= 'A' && input.charAt(i+1) <= 'F') ||
(input.charAt(i+1) >= 'a' && input.charAt(i+1) <= 'f')) &&
((input.charAt(i+2) >= '0' && input.charAt(i+2) <= '9') ||
(input.charAt(i+2) >= 'A' && input.charAt(i+2) <= 'F') ||
(input.charAt(i+2) >= 'a' && input.charAt(i+2) <= 'f')))) {
sb.append('%').append(input.charAt(i+1)).append(input.charAt(i+2));
i += 2;
}
else if ((c >= 'A' && c <= 'Z') ||
(c >= 'a' && c <= 'z') ||
(c >= '0' && c <= '9') ||
c == '-' || c == '_' || c == '.' || c == '~') {
sb.append(c);
}
else {
byte[] bytes = String.valueOf(c).getBytes(StandardCharsets.UTF_8);
for (byte b : bytes) {
sb.append(String.format("%%%02X", b));
}
}
}
return sb.toString();
}
}
35 changes: 24 additions & 11 deletions gxcloudstorage-awss3-v2/src/main/java/com/genexus/db/driver/ExternalProviderS3V2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.genexus.db.driver;

import com.genexus.CommonUtil;
import software.amazon.awssdk.auth.credentials.*;
import software.amazon.awssdk.core.ResponseBytes;
import software.amazon.awssdk.core.ResponseInputStream;
Expand All @@ -25,7 +26,6 @@

import java.io.*;
import java.net.URI;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -251,13 +251,26 @@ public String upload(String externalFileName, InputStream input, ResourceAccessC
public String get(String externalFileName, ResourceAccessControlList acl, int expirationMinutes) {
// Send a request to AWS S3 to retrieve the metadata for the specified object to see if
// the object exists and is accessible under the provided credentials and permissions.
HeadObjectRequest headObjectRequest = HeadObjectRequest.builder()
.bucket(bucket)
.key(externalFileName)
.build();
client.headObject(headObjectRequest);

return getResourceUrl(externalFileName, acl, expirationMinutes);
try {
HeadObjectRequest headObjectRequest = HeadObjectRequest.builder()
.bucket(bucket)
.key(externalFileName)
.build();
client.headObject(headObjectRequest);
return getResourceUrl(externalFileName, acl, expirationMinutes);
} catch (Exception e) {
int lastIndex = Math.max(externalFileName.lastIndexOf('/'), externalFileName.lastIndexOf('\\'));
String path = lastIndex >= 0 ? externalFileName.substring(0, lastIndex + 1) : "";
String fileName = lastIndex >= 0 ? externalFileName.substring(lastIndex + 1) : externalFileName;
String encodedFileName = CommonUtil.encodeUtf8Once(fileName);
String encodedExternalFileName = path + encodedFileName;
HeadObjectRequest headObjectRequest = HeadObjectRequest.builder()
.bucket(bucket)
.key(encodedExternalFileName)
.build();
client.headObject(headObjectRequest);
return getResourceUrl(encodedExternalFileName, acl, expirationMinutes);
}
}

private String getResourceUrl(String externalFileName, ResourceAccessControlList acl, int expirationMinutes) {
Expand Down Expand Up @@ -645,7 +658,7 @@ private String getResourceUrlWithACL(String externalFileName, ResourceAccessCont
int lastIndex = Math.max(externalFileName.lastIndexOf('/'), externalFileName.lastIndexOf('\\'));
String path = externalFileName.substring(0, lastIndex + 1);
String fileName = externalFileName.substring(lastIndex + 1);
String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString());
String encodedFileName = CommonUtil.encodeUtf8Once(fileName);

String url = String.format(
"https://%s.s3.%s.amazonaws.com/%s%s",
Expand All @@ -656,8 +669,8 @@ private String getResourceUrlWithACL(String externalFileName, ResourceAccessCont
);

return url;
} catch (UnsupportedEncodingException uee) {
logger.error("Failed to encode resource URL for " + externalFileName, uee);
} catch (Exception e) {
logger.error("Failed to encode resource URL for " + externalFileName, e);
return "";
}
}
Expand Down
Loading