Skip to content
Draft
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
26 changes: 15 additions & 11 deletions src/main/java/com/github/_1c_syntax/utils/Absolute.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;

/**
Expand All @@ -47,16 +44,23 @@ public final class Absolute {
*/
public static URI uri(String uri) {
try {
var url = new URL(uri.replace("+", "%2B").replace("%%", "%25%"));
var decodedPath = URLDecoder.decode(url.getPath(), StandardCharsets.UTF_8);
var preprocessed = uri
.replace("+", "%2B")
.replace("%%", "%25%")
.replace("[", "%5B")
.replace("]", "%5D")
.replace("^", "%5E");
var parsedUri = new URI(preprocessed);
parsedUri.toURL();
var decodedPath = parsedUri.getPath();
var decodedUri = new URI(
url.getProtocol(),
url.getUserInfo(),
url.getHost(),
url.getPort(),
parsedUri.getScheme(),
parsedUri.getUserInfo(),
parsedUri.getHost(),
parsedUri.getPort(),
decodedPath,
url.getQuery(),
url.getRef()
parsedUri.getQuery(),
parsedUri.getFragment()
);

return checkFileAuthorityAndReturnURI(decodedUri);
Expand Down