Skip to content

Fix SecurityException in repository-s3 plugin #25206

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

Closed
wants to merge 3 commits into from
Closed

Fix SecurityException in repository-s3 plugin #25206

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
429f22f
Use Apache commons IO to copy streams in repository S3 plugin to avoi…
joachimdraeger Jun 13, 2017
caccaa6
Revert "Use Apache commons IO to copy streams in repository S3 plugin…
joachimdraeger Jun 14, 2017
a3091d1
Using an own implementation to copy streams in repository-S3 plugin t…
joachimdraeger Jun 14, 2017
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
16 changes: 13 additions & 3 deletions plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

class S3BlobContainer extends AbstractBlobContainer {

public static final int BUF_SIZE = 8 * 1024;
protected final S3BlobStore blobStore;

protected final String keyPath;
Expand Down Expand Up @@ -91,9 +92,18 @@ public void writeBlob(String blobName, InputStream inputStream, long blobSize) t
if (blobExists(blobName)) {
throw new FileAlreadyExistsException("blob [" + blobName + "] already exists, cannot overwrite");
}
try (OutputStream stream = createOutput(blobName)) {
SocketAccess.doPrivilegedIOException(() -> Streams.copy(inputStream, stream));
}

SocketAccess.doPrivilegedIOException(() -> {
try (OutputStream os = createOutput(blobName);
InputStream is = inputStream) {
byte[] buf = new byte[BUF_SIZE];
int read;
while ((read = is.read(buf)) != -1) {
os.write(buf, 0, read);
}
}
return null;
});
}

@Override
Expand Down