feat(cli): ssl ALPN protocol support

emqx · Aug 30, 2023 · 2232731 · 2232731
1 parent f3ac723
commit 2232731
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/cli/src/index.ts b/cli/src/index.ts
@@ -59,6 +59,7 @@ export class Commander {
       .option('--cert <PATH>', 'path to the cert file')
       .option('--ca <PATH>', 'path to the ca certificate')
       .option('--insecure', 'do not verify the server certificate')
+      .option('--alpn <PROTO...>', 'set one or multiple ALPN (Application Layer Protocol Negotiation) protocols')
       .option(
         '-rp, --reconnect-period <MILLISECONDS>',
         'interval between two reconnections, disable auto reconnect by setting to 0',
@@ -152,6 +153,7 @@ export class Commander {
       .option('--cert <PATH>', 'path to the cert file')
       .option('--ca <PATH>', 'path to the ca certificate')
       .option('--insecure', 'do not verify the server certificate')
+      .option('--alpn <PROTO...>', 'set one or multiple ALPN (Application Layer Protocol Negotiation) protocols')
       .option(
         '-rp, --reconnect-period <MILLISECONDS>',
         'interval between two reconnections, disable auto reconnect by setting to 0',
@@ -249,6 +251,7 @@ export class Commander {
       .option('--cert <PATH>', 'path to the cert file')
       .option('--ca <PATH>', 'path to the ca certificate')
       .option('--insecure', 'do not verify the server certificate')
+      .option('--alpn <PROTO...>', 'set one or multiple ALPN (Application Layer Protocol Negotiation) protocols')
       .option(
         '-rp, --reconnect-period <MILLISECONDS>',
         'interval between two reconnections, disable auto reconnect by setting to 0',
@@ -325,6 +328,7 @@ export class Commander {
       .option('--cert <PATH>', 'path to the cert file')
       .option('--ca <PATH>', 'path to the ca certificate')
       .option('--insecure', 'do not verify the server certificate')
+      .option('--alpn <PROTO...>', 'set one or multiple ALPN (Application Layer Protocol Negotiation) protocols')
       .option(
         '-rp, --reconnect-period <MILLISECONDS>',
         'interval between two reconnections, disable auto reconnect by setting to 0',
@@ -423,6 +427,7 @@ export class Commander {
       .option('--cert <PATH>', 'path to the cert file')
       .option('--ca <PATH>', 'path to the ca certificate')
       .option('--insecure', 'do not verify the server certificate')
+      .option('--alpn <PROTO...>', 'set one or multiple ALPN (Application Layer Protocol Negotiation) protocols')
       .option(
         '-rp, --reconnect-period <MILLISECONDS>',
         'interval between two reconnections, disable auto reconnect by setting to 0',
@@ -510,6 +515,7 @@ export class Commander {
       .option('--cert <PATH>', 'path to the cert file')
       .option('--ca <PATH>', 'path to the ca certificate')
       .option('--insecure', 'do not verify the server certificate')
+      .option('--alpn <PROTO...>', 'set one or multiple ALPN (Application Layer Protocol Negotiation) protocols')
       .option(
         '-rp, --reconnect-period <MILLISECONDS>',
         'interval between two reconnections, disable auto reconnect by setting to 0',
@@ -610,6 +616,7 @@ export class Commander {
       .option('--cert <PATH>', 'path to the cert file')
       .option('--ca <PATH>', 'path to the ca certificate')
       .option('--insecure', 'do not verify the server certificate')
+      .option('--alpn <PROTO...>', 'set one or multiple ALPN (Application Layer Protocol Negotiation) protocols')
       .option(
         '-rp, --reconnect-period <MILLISECONDS>',
         'interval between two reconnections, disable auto reconnect by setting to 0',

diff --git a/cli/src/lib/pub.ts b/cli/src/lib/pub.ts
@@ -10,6 +10,7 @@ import delay from '../utils/delay'
 import { saveConfig, loadConfig } from '../utils/config'
 import { loadSimulator } from '../utils/simulate'
 import { serializeProtobufToBuffer } from '../utils/protobuf'
+
 const send = (
   config: boolean | string | undefined,
   connOpts: IClientOptions,

diff --git a/cli/src/types/global.d.ts b/cli/src/types/global.d.ts
@@ -28,6 +28,7 @@ declare global {
     cert?: string
     ca?: string
     insecure?: boolean
+    alpn?: string[]
     reconnectPeriod: number
     maximumReconnectTimes: number
     // properties of MQTT 5.0

diff --git a/cli/src/utils/parse.ts b/cli/src/utils/parse.ts
@@ -161,6 +161,7 @@ const parseConnectOptions = (
     cert,
     ca,
     insecure,
+    alpn,
     reconnectPeriod,
     sessionExpiryInterval,
     receiveMaximum,
@@ -215,6 +216,10 @@ const parseConnectOptions = (
     connectOptions.rejectUnauthorized = false
   }
 
+  if (alpn) {
+    connectOptions.ALPNProtocols = alpn
+  }
+
   if (willTopic) {
     const will = {
       topic: willTopic,