engage forbidden apis

Author: rmuir

pom.xml

@@ -41,14 +41,12 @@
  <groupId>org.hamcrest</groupId>
  <artifactId>hamcrest-all</artifactId>
  </dependency>
- <dependency>
- <groupId>com.carrotsearch.randomizedtesting</groupId>
- <artifactId>randomizedtesting-runner</artifactId>
- </dependency>
+
  <dependency>
  <groupId>org.apache.lucene</groupId>
  <artifactId>lucene-test-framework</artifactId>
  </dependency>
+
  <dependency>
  <groupId>org.elasticsearch</groupId>
  <artifactId>elasticsearch</artifactId>
@@ -88,47 +86,10 @@
  </dependencies>
 
  <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
  <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.carrotsearch.randomizedtesting</groupId>
- <artifactId>junit4-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <outputDirectory>${project.build.directory}/releases/</outputDirectory>
- <descriptors>
- <descriptor>${basedir}/src/main/assemblies/plugin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
  </plugin>
  </plugins>
  </build>

src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java

@@ -19,12 +19,15 @@
 
 package org.elasticsearch.cloud.aws;
 
+import java.util.Locale;
+
 import com.amazonaws.ClientConfiguration;
 import com.amazonaws.Protocol;
 import com.amazonaws.auth.*;
 import com.amazonaws.internal.StaticCredentialsProvider;
 import com.amazonaws.services.ec2.AmazonEC2;
 import com.amazonaws.services.ec2.AmazonEC2Client;
+
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.cloud.aws.network.Ec2NameResolver;
 import org.elasticsearch.cloud.aws.node.Ec2CustomNodeAttributes;
@@ -65,8 +68,8 @@ public synchronized AmazonEC2 client() {
  // the response metadata cache is only there for diagnostics purposes,
  // but can force objects from every response to the old generation.
  clientConfiguration.setResponseMetadataCacheSize(0);
- String protocol = settings.get("cloud.aws.protocol", "https").toLowerCase();
- protocol = settings.get("cloud.aws.ec2.protocol", protocol).toLowerCase();
+ String protocol = settings.get("cloud.aws.protocol", "https").toLowerCase(Locale.ROOT);
+ protocol = settings.get("cloud.aws.ec2.protocol", protocol).toLowerCase(Locale.ROOT);
  if ("http".equals(protocol)) {
  clientConfiguration.setProtocol(Protocol.HTTP);
  } else if ("https".equals(protocol)) {
@@ -123,7 +126,7 @@ public synchronized AmazonEC2 client() {
  logger.debug("using explicit ec2 endpoint [{}]", endpoint);
  client.setEndpoint(endpoint);
  } else if (settings.get("cloud.aws.region") != null) {
- String region = settings.get("cloud.aws.region").toLowerCase();
+ String region = settings.get("cloud.aws.region").toLowerCase(Locale.ROOT);
  String endpoint;
  if (region.equals("us-east-1") || region.equals("us-east")) {
  endpoint = "ec2.us-east-1.amazonaws.com";

src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java

@@ -26,13 +26,15 @@
 import com.amazonaws.internal.StaticCredentialsProvider;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3Client;
+
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -93,8 +95,8 @@ private synchronized AmazonS3 getClient(String endpoint, String protocol, String
  // but can force objects from every response to the old generation.
  clientConfiguration.setResponseMetadataCacheSize(0);
  if (protocol == null) {
- protocol = settings.get("cloud.aws.protocol", "https").toLowerCase();
- protocol = settings.get("cloud.aws.s3.protocol", protocol).toLowerCase();
+ protocol = settings.get("cloud.aws.protocol", "https").toLowerCase(Locale.ROOT);
+ protocol = settings.get("cloud.aws.s3.protocol", protocol).toLowerCase(Locale.ROOT);
  }
 
  if ("http".equals(protocol)) {
@@ -163,7 +165,7 @@ private String getDefaultEndpoint() {
  endpoint = settings.get("cloud.aws.s3.endpoint");
  logger.debug("using explicit s3 endpoint [{}]", endpoint);
  } else if (settings.get("cloud.aws.region") != null) {
- String region = settings.get("cloud.aws.region").toLowerCase();
+ String region = settings.get("cloud.aws.region").toLowerCase(Locale.ROOT);
  endpoint = getEndpoint(region);
  logger.debug("using s3 region [{}], with endpoint [{}]", region, endpoint);
  }

src/main/java/org/elasticsearch/cloud/aws/network/Ec2NameResolver.java

@@ -33,6 +33,7 @@
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Resolves certain ec2 related 'meta' hostnames into an actual hostname
@@ -101,7 +102,7 @@ public InetAddress resolve(Ec2HostnameType type, boolean warnOnFailure) {
  urlConnection = url.openConnection();
  urlConnection.setConnectTimeout(2000);
  in = urlConnection.getInputStream();
- BufferedReader urlReader = new BufferedReader(new InputStreamReader(in));
+ BufferedReader urlReader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
 
  String metadataResult = urlReader.readLine();
  if (metadataResult == null || metadataResult.length() == 0) {

src/main/java/org/elasticsearch/cloud/aws/node/Ec2CustomNodeAttributes.java

@@ -33,6 +33,7 @@
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 /**
@@ -58,7 +59,7 @@ public Map<String, String> buildAttributes() {
  urlConnection = url.openConnection();
  urlConnection.setConnectTimeout(2000);
  in = urlConnection.getInputStream();
- BufferedReader urlReader = new BufferedReader(new InputStreamReader(in));
+ BufferedReader urlReader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
 
  String metadataResult = urlReader.readLine();
  if (metadataResult == null || metadataResult.length() == 0) {

src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java

@@ -75,7 +75,7 @@ public AwsEc2UnicastHostsProvider(Settings settings, TransportService transportS
  this.client = awsEc2Service.client();
  this.version = version;
 
- this.hostType = HostType.valueOf(settings.get("discovery.ec2.host_type", "private_ip").toUpperCase());
+ this.hostType = HostType.valueOf(settings.get("discovery.ec2.host_type", "private_ip").toUpperCase(Locale.ROOT));
 
  this.bindAnyGroup = settings.getAsBoolean("discovery.ec2.any_group", true);
  this.groups = ImmutableSet.copyOf(settings.getAsArray("discovery.ec2.groups"));

src/test/java/org/elasticsearch/cloud/aws/AmazonS3Wrapper.java

@@ -35,9 +35,12 @@
 import java.util.Date;
 import java.util.List;
 
+import org.elasticsearch.common.SuppressForbidden;
+
 /**
  *
  */
+@SuppressForbidden(reason = "implements AWS api that uses java.io.File!")
 public class AmazonS3Wrapper implements AmazonS3 {
 
  protected AmazonS3 delegate;