Author: amitj
Date: Fri Jul 7 03:30:18 2017
New Revision: 1801114
URL: http://svn.apache.org/viewvc?rev=1801114&view=rev
Log:
OAK-6388: Enable Azure shared access signature for blob store connector
Merged r1800269 from trunk
Added:
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/UtilsTest.java
- copied unchanged from r1800269,
jackrabbit/oak/trunk/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/UtilsTest.java
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureConstants.java
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/Utils.java
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreUtils.java
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/test/resources/azure.properties
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 7 03:30:18 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799924,1800606,1800613,1800974
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799924,1800269,1800606,1800613,1800974
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureConstants.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureConstants.java?rev=1801114&r1=1801113&r2=1801114&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureConstants.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureConstants.java
Fri Jul 7 03:30:18 2017
@@ -21,42 +21,52 @@ package org.apache.jackrabbit.oak.blob.c
public final class AzureConstants {
/**
- * Azure Stoage Account name
+ * Azure storage account name
*/
public static final String AZURE_STORAGE_ACCOUNT_NAME = "accessKey";
/**
- * Azure Stoage Account Key
+ * Azure storage account key
*/
public static final String AZURE_STORAGE_ACCOUNT_KEY = "secretKey";
/**
- * Azure Blob Storage container name
+ * Azure shared access signature token
+ */
+ public static final String AZURE_SAS = "azureSas";
+
+ /**
+ * Azure blob endpoint
+ */
+ public static final String AZURE_BLOB_ENDPOINT = "azureBlobEndpoint";
+
+ /**
+ * Azure blob storage container name
*/
public static final String AZURE_BLOB_CONTAINER_NAME = "container";
/**
- * Azure Blob Storage request timeout.
+ * Azure blob storage request timeout
*/
public static final String AZURE_BLOB_REQUEST_TIMEOUT = "socketTimeout";
/**
- * Azure Blob Storage maximum retries per request.
+ * Azure blob storage maximum retries per request
*/
public static final String AZURE_BLOB_MAX_REQUEST_RETRY = "maxErrorRetry";
/**
- * Azure Blob Storage maximum connections per operation (default 1)
+ * Azure blob storage maximum connections per operation (default 1)
*/
public static final String AZURE_BLOB_CONCURRENT_REQUESTS_PER_OPERATION =
"maxConnections";
/**
- * Constant to set proxy host.
+ * Proxy host
*/
public static final String PROXY_HOST = "proxyHost";
/**
- * Constant to set proxy port.
+ * Proxy port
*/
public static final String PROXY_PORT = "proxyPort";
Modified:
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/Utils.java?rev=1801114&r1=1801113&r2=1801114&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/Utils.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/Utils.java
Fri Jul 7 03:30:18 2017
@@ -101,11 +101,23 @@ public final class Utils {
public static String getConnectionStringFromProperties(Properties
properties) {
+
+ String sasUri = properties.getProperty(AzureConstants.AZURE_SAS, "");
+ String blobEndpoint =
properties.getProperty(AzureConstants.AZURE_BLOB_ENDPOINT, "");
+
+ if (!sasUri.isEmpty()) {
+ return getConnectionStringForSas(sasUri, blobEndpoint);
+ }
+
return getConnectionString(
properties.getProperty(AzureConstants.AZURE_STORAGE_ACCOUNT_NAME,
""),
properties.getProperty(AzureConstants.AZURE_STORAGE_ACCOUNT_KEY,
""));
}
+ private static String getConnectionStringForSas(String sasUri, String
blobEndpoint) {
+ return String.format("BlobEndpoint=%s;SharedAccessSignature=%s",
blobEndpoint, sasUri);
+ }
+
public static String getConnectionString(final String accountName, final
String accountKey) {
return String.format(
"DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s",
Modified:
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreUtils.java?rev=1801114&r1=1801113&r2=1801114&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreUtils.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreUtils.java
Fri Jul 7 03:30:18 2017
@@ -52,9 +52,13 @@ public class AzureDataStoreUtils extends
*/
public static boolean isAzureConfigured() {
Properties props = getAzureConfig();
+ //need either access keys or sas
if (!props.containsKey(AzureConstants.AZURE_STORAGE_ACCOUNT_KEY) ||
!props.containsKey(AzureConstants.AZURE_STORAGE_ACCOUNT_NAME)
- || !(props.containsKey(AzureConstants.AZURE_BLOB_CONTAINER_NAME)))
{
- return false;
+ ||
!(props.containsKey(AzureConstants.AZURE_BLOB_CONTAINER_NAME))) {
+ if (!props.containsKey(AzureConstants.AZURE_SAS) ||
!props.containsKey(AzureConstants.AZURE_BLOB_ENDPOINT)
+ ||
!(props.containsKey(AzureConstants.AZURE_BLOB_CONTAINER_NAME))) {
+ return false;
+ }
}
return true;
}
Modified:
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/test/resources/azure.properties
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/test/resources/azure.properties?rev=1801114&r1=1801113&r2=1801114&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/test/resources/azure.properties
(original)
+++
jackrabbit/oak/branches/1.6/oak-blob-cloud-azure/src/test/resources/azure.properties
Fri Jul 7 03:30:18 2017
@@ -26,9 +26,13 @@ secretKey=
# of blobs. https://msdn.microsoft.com/en-us/library/dd135715.aspx
container=
+azureSas=
+
+azureBlobEndpoint=
+
+
# The timeout interval, in milliseconds, to use for the request (default 5
minutes)
socketTimeout=120000
-
# Concurrent number of simultaneous requests per operation (default 1)
maxConnections=1
