You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2017/10/13 10:40:18 UTC

svn commit: r1812109 - /jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java

Author: amitj
Date: Fri Oct 13 10:40:18 2017
New Revision: 1812109

URL: http://svn.apache.org/viewvc?rev=1812109&view=rev
Log:
OAK-6802: Manage 'secret' property internally in S3/AzureDataStore

- S3 - Closing stream and rereading the stored value such that the only key associated with the actual stored value used

Modified:
    jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java

Modified: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java?rev=1812109&r1=1812108&r2=1812109&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java Fri Oct 13 10:40:18 2017
@@ -536,11 +536,12 @@ public class S3Backend extends AbstractS
                 byte[] key;
                 // Try reading from the metadata folder if it exists
                 if (metadataExists(REF_KEY)) {
-                    DataRecord rec = getMetadataRecord(REF_KEY);
-                    key = IOUtils.toByteArray(rec.getStream());
+                    key = readMetadataBytes(REF_KEY);
                 } else {
+                    // Create a new key and then retrieve it to use it
                     key = super.getOrCreateReferenceKey();
                     addMetadataRecord(new ByteArrayInputStream(key), REF_KEY);
+                    key = readMetadataBytes(REF_KEY);
                 }
                 secret = key;
                 return secret;
@@ -550,7 +551,18 @@ public class S3Backend extends AbstractS
         }
     }
 
-    public boolean metadataExists(String name) {
+    private byte[] readMetadataBytes(String name) throws IOException, DataStoreException {
+        DataRecord rec = getMetadataRecord(name);
+        InputStream stream = null;
+        try {
+            stream = rec.getStream();
+            return IOUtils.toByteArray(stream);
+        } finally {
+            IOUtils.closeQuietly(stream);
+        }
+    }
+
+    private boolean metadataExists(String name) {
         ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
         try {
             Thread.currentThread().setContextClassLoader(