Merge pull request #1 from zzhxiaofeng/https

update for adding HTTPS support

README.md

@@ -353,7 +353,7 @@ Or customize multi storage accounts and each has 2 keys:
 set AZURITE_ACCOUNTS="account1:key1:key2;account2:key1:key2"
 ```
 
-### HTTP Setup
+### HTTPS Setup
 
 You can generate a local certificate for 127.0.0.1 with `mkcert`. See the mkcert GitHub repo for [installation instructions](https://github.com/FiloSottile/mkcert), and then run the following commands.
 
@@ -427,9 +427,9 @@ unable to verify the first certificate.
 Follow these steps to add the HTTPS endpoints to Storage Explorer:
 
 1. Right click on Local & Attached->Storage Accounts and select "Connect to Azure Storage...".
-1. Select "Use a connection string" and click Next.
-1. Enter a name, i.e https.
-1. Enter the HTTPS connection string from the previous section of this document and click Next.
+2. Select "Use a connection string" and click Next.
+3. Enter a name, i.e https.
+4. Enter the HTTPS connection string from the previous section of this document and click Next.
 
 You can now explore the Azurite HTTPS endpoints with Storage Explorer.
 

package.json

@@ -146,6 +146,16 @@
             "default": false,
             "description": "Enable loose mode which ignores unsupported headers and parameters"
           },
+          "azurite.cert": {
+            "type": "string",
+            "default": "",
+            "description": "Locally-trusted certificate"
+          },
+          "azurite.key": {
+            "type": "string",
+            "default": "",
+            "description": "Locally-trusted key file"
+          },
           "azurite.location": {
             "type": "string",
             "description": "Workspace location folder path, by default Visual Studio Code current opened folder"
@@ -228,4 +238,4 @@
     "url": "https://github.com/azure/azurite/issues"
   },
   "homepage": "https://github.com/azure/azurite#readme"
-}
+}

src/blob/BlobRequestListenerFactory.ts

@@ -48,8 +48,10 @@ export default class BlobRequestListenerFactory
     private readonly accountDataStore: IAccountDataStore,
     private readonly enableAccessLog: boolean,
     private readonly accessLogWriteStream?: NodeJS.WritableStream,
-    private readonly loose?: boolean
-  ) {}
+    private readonly loose?: boolean,
+    private readonly cert?: string,
+    private readonly key?: string
+  ) { }
 
   public createRequestListener(): RequestListener {
     const app = express().disable("x-powered-by");

src/blob/SqlBlobConfiguration.ts

@@ -29,7 +29,9 @@ export default class SqlBlobConfiguration extends ConfigurationBase {
     accessLogWriteStream?: NodeJS.WritableStream,
     enableDebugLog: boolean = DEFAULT_ENABLE_DEBUG_LOG,
     debugLogFilePath?: string,
-    loose: boolean = false
+    loose: boolean = false,
+    cert: string = "",
+    key: string = ""
   ) {
     super(
       host,
@@ -38,7 +40,9 @@ export default class SqlBlobConfiguration extends ConfigurationBase {
       accessLogWriteStream,
       enableDebugLog,
       debugLogFilePath,
-      loose
+      loose,
+      cert,
+      key
     );
   }
 }

src/blob/SqlBlobServer.ts

@@ -82,7 +82,9 @@ export default class SqlBlobServer extends ServerBase {
       accountDataStore,
       configuration.enableAccessLog, // Access log includes every handled HTTP request
       configuration.accessLogWriteStream,
-      configuration.loose
+      configuration.loose,
+      configuration.cert,
+      configuration.key
     );
 
     super(host, port, httpServer, requestListenerFactory, configuration);

src/common/ServerBase.ts

@@ -64,7 +64,7 @@ export default abstract class ServerBase implements ICleaner {
     const address = this.httpServer.address();
     const protocol = `http${this.config.hasCert() ? "s" : ""}://`;
 
-    if (typeof address === "string" || address === null) {
+    if (typeof address === "string") {
       return protocol + address;
     } else if (address === null) {
       return "";