0d6b937127
Support proxy protocol of websocket ( #2372 )
...
Support proxy protocol of websocket
2019-03-28 10:34:48 +08:00
24f8c3a391
Fix drain the session process mailbox handling err
2019-03-28 10:32:03 +08:00
043f7d5473
Delete duplicated kubernates namespace config entry
2019-03-28 09:44:54 +08:00
6e3c4b0855
Fix conflict
2019-03-27 13:59:26 +08:00
fee94525db
Add etcd client certificate configuration ( #2367 )
...
* Add etcd client certificate
2019-03-27 13:53:40 +08:00
1decc087a9
Merge branch 'log_level' into develop
2019-03-27 13:52:46 +08:00
a3fd8846a5
Bin key map ( #2362 )
...
Suppport nested bin-key map
2019-03-27 11:12:28 +08:00
e6d90d5758
Improve mountpoint ( #2363 )
2019-03-27 11:10:51 +08:00
0fbf771543
Readjust log level into error when got unexpected message
2019-03-27 11:07:58 +08:00
c223f62c5a
Put cn/dn of client cert into credentials ( #2357 )
...
Put cn/dn of client cert into credentials
2019-03-27 10:20:12 +08:00
2534b8dc64
Support to pass ws compressing options ( #2356 )
...
Add new config entries about websocket
2019-03-27 10:19:35 +08:00
f5c426a2f2
Add missed case for monitors ( #2353 )
2019-03-27 10:18:51 +08:00
24b4d83c12
Merge remote-tracking branch 'origin/develop'
2019-03-27 04:31:41 +08:00
58e1b4d485
Readjust log level and unify log format
2019-03-26 22:18:31 +08:00
f0fa9a9252
Add a function converting message to binary-key map ( #2360 )
2019-03-26 10:35:10 +08:00
8d92d58b6c
Fix allow_anonymous behavoir error ( #2355 )
...
EMQ should allow the anonymous connection if the allow_anonymous option is true, although it has one or more auth plugins started.
2019-03-26 10:25:51 +08:00
3d45da8e03
Merge remote-tracking branch 'origin/develop'
2019-03-23 04:22:32 +08:00
9e7b3a9209
Update emqx_types.erl
2019-03-22 16:27:23 +08:00
bd304572c9
Delete acl_mod and auth_mod
2019-03-22 16:18:42 +08:00
c7a317afaf
Add one more connack reason code
2019-03-22 15:43:21 +08:00
fc2df9aff5
Adapt to new export style
2019-03-22 14:58:24 +08:00
e386778aca
Fix typo
2019-03-22 11:31:26 +08:00
dba16aeea5
Add 'remove_header/2', 'get_headers/1' functions
...
- Adopt new 'export' style
- Add 'remove_header/2', 'get_headers/1' functions
- Remove 'remove_topic_alias/1' function
2019-03-22 11:31:26 +08:00
ba719a896d
Call 'tokens/1' instead of 'words/1'
2019-03-22 11:31:26 +08:00
a4550a8fc4
Add emqx_topic:tokens/1 function
2019-03-22 11:31:26 +08:00
513d2bcaaa
Fix reload ACL failed ( #2344 )
...
The original `reload_acl` function only parse the ACL file, not compile and rehook to 'client.check_acl'
2019-03-22 10:21:16 +08:00
962fb0cec5
Merge remote-tracking branch 'origin/develop'
2019-03-22 04:16:15 +08:00
416bc75d5d
Sort plugin list
2019-03-22 01:02:30 +08:00
865ef864db
Get the plugins list through -emqx_plugin module attributes
2019-03-22 00:03:53 +08:00
b79bf13ae7
Rename result -> auth_result
2019-03-22 00:03:34 +08:00
998684fc4e
Fix badmatch error in the batch_process of session
2019-03-21 17:40:02 +08:00
36927f01e7
Add type definition for auth_result
2019-03-21 16:54:50 +08:00
e7320620c0
Fix alarm report bug ( #2332 )
2019-03-21 16:53:46 +08:00
3a2f6d5a6c
Fix badmatch bug for reload_acl
2019-03-21 16:51:57 +08:00
5a401c44fd
Clear dup flag if message published first ( #2337 )
2019-03-21 10:13:41 +08:00
dac1b92d8f
Merge remote-tracking branch 'origin/develop'
2019-03-21 04:14:44 +08:00
8a73c62f66
Fix followed packet parse failure ( #2333 )
...
To fix issue#2303(https://github.com/emqx/emqx/issues/2303 )
It will report the following error, when a connection sends a TCP frame contained many of MQTT packet and followed a split MQTT packet.
2019-03-20 10:14:52 +08:00
5fb4f23504
Merge remote-tracking branch 'origin/develop'
2019-03-19 09:51:37 +08:00
d020ac0390
Delay receive waiting time
2019-03-18 14:20:52 +08:00
a95ebcd7d6
Fix typo
2019-03-17 00:23:44 +08:00
7ff56b55f0
Force makefile to git clone deps
2019-03-16 23:05:15 +08:00
88c32b2c41
Fix emqx_rpc badargs bug
2019-03-16 21:27:41 +08:00
763115e149
Delegate serialize fun into sendfun
2019-03-16 21:15:10 +08:00
a72a914fb8
Fix issue #2312 ( #2313 )
...
* Fix SSL option parser
* Fix bridge disconnect log formatting
* Set no headers if new headers is undefined
2019-03-16 19:28:57 +08:00
29f4faa7dd
Add badtcp clause to handle gen_rpc ( #2314 )
2019-03-16 18:23:18 +08:00
901bbdedd6
Add some auth error codes
2019-03-16 16:30:25 +08:00
749494c277
Change default internal-rules to #{}
2019-03-16 13:08:11 +08:00
2912d9a41b
Rename is_super -> is_superuser
2019-03-16 12:51:45 +08:00
a7adb79f17
Allow empty zone in credentials
2019-03-16 12:25:39 +08:00
02fe8560e2
Improve emqx_hooks and credentials ( #2309 )
...
* Improve emqx_hooks and credentials
1. Modify the return modes of emqx hooks.
Change the return value of hook functions to:
- ok: stop the hook chain and return ok
- {error, Reason}: stop the hook chain and return error
- continue: continue the hook chain
And the return value of emqx_hooks:run/2 is changed to:
- ok
- {error, Reason}
And the return value of emqx_hooks:run/3:
- {ok, Acc}
- {error, Reason, Acc}
2. Treat password as a member of credentials.
Password should be wrapped in the `credentials` data-structure, as the
username/password pair together consists of an authentication method.
There can be some methods using some other credential data (e.g.
a JWT token), and these credential data should also be wrapped in the
the `credentials` data-structure.
An event `client.authenticate` is triggered when an user logs in:
```erlang
emqx_hooks:run('client.authenticate', [], Credentials)
```
A `default callback` that deny/allow any user (according to the
`allow_anonymous` config) should be appended to the end of the
callback chain.
The `credentails` is passed through all of the callbacks, and
can be changed over in this process.
* Refactor emqx hooks return mode
* Remove password from PState
2019-03-16 10:43:53 +08:00
Gilbert