Skip to content
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

feat: add cacertfile option #272

Merged
merged 1 commit into from
Nov 26, 2024
Merged

feat: add cacertfile option #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Usage: emqtt_bench conn [--help <help>] [-d <dist>] [-h [<host>]]
[-n [<startnumber>]] [--load-qst <nst_dets_file>]
[-Q [<qoe>]] [-i [<interval>]] [-u <username>]
[-P <password>] [-k [<keepalive>]] [-C [<clean>]]
[-x [<expiry>]] [-S [<ssl>]]
[-x [<expiry>]] [-S [<ssl>]] [--cacertfile <cacertfile>]
[--certfile <certfile>] [--keyfile <keyfile>]
[--quic [<quic>]] [--ifaddr <ifaddr>]
[--prefix <prefix>] [-s [<shortids>]]
Expand Down Expand Up @@ -78,6 +78,7 @@ Usage: emqtt_bench conn [--help <help>] [-d <dist>] [-h [<host>]]
(seconds) [default: 0]
-S, --ssl ssl socoket for connecting to server
[default: false]
--cacertfile CA certificate for server verification
--certfile client certificate for authentication, if
required by server
--keyfile client private key for authentication, if
Expand Down Expand Up @@ -123,7 +124,8 @@ $ ./emqtt_bench sub --help
Usage: emqtt_bench sub [--help <help>] [-d <dist>] [-h [<host>]] [-p [<port>]] [-V [<version>]] [-c [<count>]]
[-n [<startnumber>]] [-i [<interval>]] [-t <topic>] [--payload-hdrs [<payload_hdrs>]] [-q [<qos>]]
[-Q [<qoe>]] [-u <username>] [-P <password>] [-k [<keepalive>]] [-C [<clean>]] [-x [<expiry>]]
[-S [<ssl>]] [--certfile <certfile>] [--keyfile <keyfile>] [--ws [<ws>]] [--quic [<quic>]]
[-S [<ssl>]] [--cacertfile <cacertfile>] [--certfile <certfile>] [--keyfile <keyfile>]
[--ws [<ws>]] [--quic [<quic>]]
[--load-qst <nst_dets_file>] [--ifaddr <ifaddr>] [--prefix <prefix>] [-s [<shortids>]] [-l <lowmem>]
[--num-retry-connect [<num_retry_connect>]] [-R [<conn_rate>]]
[--force-major-gc-interval [<force_major_gc_interval>]] [--log_to [<log_to>]]
Expand Down Expand Up @@ -152,6 +154,7 @@ Usage: emqtt_bench sub [--help <help>] [-d <dist>] [-h [<host>]] [-p [<port>]] [
-C, --clean clean start [default: true]
-x, --session-expiry Set 'Session-Expiry' for persistent sessions (seconds) [default: 0]
-S, --ssl ssl socoket for connecting to server [default: false]
--cacertfile CA certificate for server verification
--certfile client certificate for authentication, if required by server
--keyfile client private key for authentication, if required by server
--ws websocket transport [default: false]
Expand Down Expand Up @@ -195,7 +198,8 @@ Usage: emqtt_bench pub [--help <help>] [-d <dist>] [-h [<host>]] [-p [<port>]] [
[-n [<startnumber>]] [-i [<interval>]] [-I [<interval_of_msg>]] [-u <username>] [-P <password>]
[-t <topic>] [--payload-hdrs [<payload_hdrs>]] [-s [<size>]] [-m <message>] [-q [<qos>]]
[-Q [<qoe>]] [-r [<retain>]] [-k [<keepalive>]] [-C [<clean>]] [-x [<expiry>]] [-L [<limit>]]
[-S [<ssl>]] [--certfile <certfile>] [--keyfile <keyfile>] [--ws [<ws>]] [--quic [<quic>]]
[-S [<ssl>]] [--cacertfile <cacertfile>] [--certfile <certfile>] [--keyfile <keyfile>]
[--ws [<ws>]] [--quic [<quic>]]
[--load-qst <nst_dets_file>] [--ifaddr <ifaddr>] [--prefix <prefix>] [-s [<shortids>]] [-l <lowmem>]
[-F [<inflight>]] [-w [<wait_before_publishing>]] [--max-random-wait [<max_random_wait>]]
[--min-random-wait [<min_random_wait>]] [--num-retry-connect [<num_retry_connect>]]
Expand Down Expand Up @@ -229,6 +233,7 @@ Usage: emqtt_bench pub [--help <help>] [-d <dist>] [-h [<host>]] [-p [<port>]] [
-x, --session-expiry Set 'Session-Expiry' for persistent sessions (seconds) [default: 0]
-L, --limit The max message count to publish, 0 means unlimited [default: 0]
-S, --ssl ssl socoket for connecting to server [default: false]
--cacertfile CA certificate for server verification
--certfile client certificate for authentication, if required by server
--keyfile client private key for authentication, if required by server
--ws websocket transport [default: false]
Expand Down
8 changes: 8 additions & 0 deletions src/emqtt_bench.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@
"The max message count to publish, 0 means unlimited"},
{ssl, $S, "ssl", {boolean, false},
"ssl socoket for connecting to server"},
{cacertfile, undefined, "cacertfile", string,
"CA certificate for server verification"},
{certfile, undefined, "certfile", string,
"client certificate for authentication, if required by server"},
{keyfile, undefined, "keyfile", string,
Expand Down Expand Up @@ -200,6 +202,8 @@
"Set 'Session-Expiry' for persistent sessions (seconds)"},
{ssl, $S, "ssl", {boolean, false},
"ssl socoket for connecting to server"},
{cacertfile, undefined, "cacertfile", string,
"CA certificate for server verification"},
{certfile, undefined, "certfile", string,
"client certificate for authentication, if required by server"},
{keyfile, undefined, "keyfile", string,
Expand Down Expand Up @@ -268,6 +272,8 @@
"Set 'Session-Expiry' for persistent sessions (seconds)"},
{ssl, $S, "ssl", {boolean, false},
"ssl socoket for connecting to server"},
{cacertfile, undefined, "cacertfile", string,
"CA certificate for server verification"},
{certfile, undefined, "certfile", string,
"client certificate for authentication, if required by server"},
{keyfile, undefined, "keyfile", string,
Expand Down Expand Up @@ -1091,6 +1097,8 @@ ssl_opts([{keyfile, KeyFile} | Opts], Acc) ->
ssl_opts(Opts, [{keyfile, KeyFile}|Acc]);
ssl_opts([{certfile, CertFile} | Opts], Acc) ->
ssl_opts(Opts, [{certfile, CertFile}|Acc]);
ssl_opts([{cacertfile, CaCertFile} | Opts], Acc) ->
ssl_opts(Opts, [{cacertfile, CaCertFile}|Acc]);
ssl_opts([_|Opts], Acc) ->
ssl_opts(Opts, Acc).

Expand Down
Loading