Skip to content
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

[WIP] s3Opener: add query params for mixed and non-aws s3 resources #99

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] s3Opener: add query params for mixed and non-aws s3 resources #99

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
61 changes: 59 additions & 2 deletions render-app/src/main/java/org/janelia/alignment/protocol/s3/S3Opener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import com.amazonaws.AmazonServiceException;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
import com.amazonaws.auth.profile.ProfileCredentialsProvider;
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.google.common.net.MediaType;
Expand All @@ -14,9 +16,14 @@
import java.awt.Toolkit;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLDecoder;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;

import javax.imageio.ImageIO;

Expand Down Expand Up @@ -53,10 +60,13 @@ public ImagePlus openURL(final String url) {
try {

if (handler == null) {
buildS3Handler();
final URI uri = new URI(url);
buildS3HandlerUri(uri);
}
final URI uri = new URI(url);
final String newurl = new URI(uri.getScheme(), uri.getAuthority(), uri.getPath(), null, uri.getFragment()).toString();

final URL u = new URL(null, url, handler);
final URL u = new URL(null, newurl, handler);
final URLConnection uc = u.openConnection();

// assumes content type is always available, should be ok
Expand Down Expand Up @@ -109,6 +119,53 @@ private ImagePlus openPngUsingURL(final String title,
return new ImagePlus(title, img);
}

public static Map<String, String> splitQuery(URI url) throws UnsupportedEncodingException {
Map<String, String> query_pairs = new LinkedHashMap<String, String>();
String query = url.getQuery();
String[] pairs = query.split("&");
for (String pair : pairs) {
int idx = pair.indexOf("=");
query_pairs.put(URLDecoder.decode(pair.substring(0, idx), "UTF-8"), URLDecoder.decode(pair.substring(idx + 1), "UTF-8"));
}
return query_pairs;
}

private synchronized void buildS3HandlerUri(URI uri) throws IOException {
if (handler == null) {
Map<String, String> qparams = splitQuery(uri);
if (qparams.isEmpty()) {
buildS3Handler();
} else {
buildS3HandlerParams(qparams);
}
}
}

private synchronized void buildS3HandlerParams(Map<String, String> qparams) throws IOException {
if (handler == null) {
final AmazonS3ClientBuilder clientBuilder = AmazonS3ClientBuilder.standard();
if (qparams.containsKey("profile")) {
final AWSCredentialsProvider credentialsProvider = new ProfileCredentialsProvider(qparams.get("profile"));
clientBuilder.setCredentials(credentialsProvider);
} else {
final AWSCredentialsProvider credentialsProvider = new DefaultAWSCredentialsProviderChain();
clientBuilder.setCredentials(credentialsProvider);
}

String region = (String) qparams.getOrDefault("region", clientBuilder.getRegion());

if (qparams.containsKey("endpoint_url")) {
String endpointUrl = (String) qparams.get("endpoint_url");
final EndpointConfiguration endpointConfig = new EndpointConfiguration(endpointUrl, region);
final AmazonS3 s3Client = clientBuilder.withEndpointConfiguration(endpointConfig).build();
handler = new S3Handler(s3Client);
} else {
final AmazonS3 s3Client = clientBuilder.withRegion(region).build();
handler = new S3Handler(s3Client);
}
}
}

private synchronized void buildS3Handler() throws IOException {
if (handler == null) {
try {
Expand Down