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

Jump to bottom

new feature: scram for tcp dialer is supported #1029

Merged
merged 28 commits into from
Jul 31, 2024
Merged

new feature: scram for tcp dialer is supported #1029

merged 28 commits into from
Jul 31, 2024

Conversation

wanghaEMQ
Copy link
Member

@wanghaEMQ wanghaEMQ commented Jul 26, 2024 •
edited
Loading

  • Integered mqtt tcp dialer part of sdk with scram
  • Move scram.h to internal source folder.
  • Add encode/decode for msg of auth.
  • Support to parse property in auth msg.

wanghaEMQ added 24 commits July 24, 2024 03:58
@wanghaEMQ
* NEW [codec] Add encoder/decoder for auth type msg.
9699061 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [scram] Remove the warnings of unused function in scram.c
df63d90 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* NEW [sdk/trans] Add some default value for scram in mqtt transport …
bc2d231 
…layer.

Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [scram] Move scram.h to internal src.
0009c37 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [scram] Fix the cmake build failed.
d9d7492 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* NEW [sdk/trans] Add scram_ctx to ep and send scram property when sc…
a0ab990 
…ram is enabled.

Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* NEW [codec] Support to get/set auth property and reason code.
5c6574b 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* NEW [sdk/trans] Send client final msg when recved server first msg.
c0b16f0 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* NEW [sdk/trans] Closed the connection when handle scram server fina…
2a694f6 
…l msg failed.

Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [sdk/trans] Fix the error in building.
2b0e02e 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* NEW [mqtt_codec] Add API to get length of username/password in conn…
77d17d2 
…ect msg.

Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [scram] Fix the buf overflow.
4d642f7 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [sdk/trans] Fix the null property in connect msg.
9a74cb2 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [sdk/trans] Fix the unmatched packet type of auth.
85e4598 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [scram] Fix the buffer/stack overflow due to long nonce.
33faf31 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [scram] Copy a server_first_msg for internal usage in future.
e06dac3 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [sdk/trans] Fix the block problem that pipe stop recving msgs.
1a9964a 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [sdk/trans] Fix all the memory leaks in mqtt_tcp layer.
ce2b441 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* NEW [codec] Add free/dup interface for msg of auth.
38662b7 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [scram] Fix the memleaks in internal of scram and scram test.
a558399 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* NEW [mqtt_tcp] Add some debug log for all auth msgs.
3484d6e 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* NEW [mqtt/tcp] Fix logs when enhanced authencation passed.
500ac14 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* FIX [scram] Fix the memleaks when no username or password inputed.
e27fd3f 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* NEW [cmake] Add defination SUPP_SCRAM when SCRAM is enabled.
a2767f1 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ wanghaEMQ requested a review from a team July 26, 2024 06:19
@wanghaEMQ
* NEW [mqtt_tcp] Add option to enable/disable scram.
3a8d7b8 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@wanghaEMQ
* NEW [cmake] Add OpenSSL dependency for SCRAM.
0150363 
Signed-off-by: wanghaemq <wangwei@emqx.io>
xinyi-xs
xinyi-xs reviewed Jul 29, 2024
View reviewed changes
Copy link
Contributor

@xinyi-xs xinyi-xs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job!

JaylinYu
JaylinYu approved these changes Jul 29, 2024
View reviewed changes
Copy link
Member

@JaylinYu JaylinYu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to have a deeper test on compatibility with MQTT-TCP
make it draft first

@wanghaEMQ
Copy link
Member Author

need to have a deeper test on compatibility with MQTT-TCP make it draft first

You could easily disable it by -DNNG_ENABLE_SCRAM=OFF

@wanghaEMQ
* NEW [sdk/tls] Add scram support to tls transport layer in sdk.
6f14b65 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@JaylinYu
Copy link
Member

I mean, would it affect normal TCP by enabling SCRAM

@wanghaEMQ
Copy link
Member Author

I mean, would it affect normal TCP by enabling SCRAM

okay. it needs more tests.

@wanghaEMQ
* FIX [trans] Fix the double free on property in connect msg.
802480f 
Signed-off-by: wanghaemq <wangwei@emqx.io>
@JaylinYu JaylinYu merged commit 431f9a9 into main Jul 31, 2024
12 of 15 checks passed
@JaylinYu JaylinYu deleted the wangha/dev4 branch July 31, 2024 07:35
@JaylinYu
Copy link
Member

we need more test before next release

@JaylinYu
Copy link
Member

And make it available on bridging

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xinyi-xs xinyi-xs xinyi-xs left review comments

@JaylinYu JaylinYu JaylinYu approved these changes

@RanMaoyi RanMaoyi Awaiting requested review from RanMaoyi

@StargazerWayne StargazerWayne Awaiting requested review from StargazerWayne

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wanghaEMQ @JaylinYu @xinyi-xs