Commit Graph

36 Commits

Author SHA1 Message Date
zhongwencool a8b9b6f27f chore: use put instead of post to update setting 2023-07-12 14:56:24 +08:00
zhongwencool f40d8318b7 fix: license validations is not working 2023-07-12 14:40:38 +08:00
zhongwencool 43866b8e55 test(license): test setting HTTP API 2023-07-12 14:21:51 +08:00
某文 f4549d280b test: earse license after cli ct test 2023-05-29 22:01:46 +08:00
Zhongwen Deng e065904583 test: add license cli test 2023-05-29 18:19:59 +08:00
Zaiming (Stone) Shi 798fa8c2c2 refactor: delete module emqx_license_installer
after the previous refactoring, emqx_license app is now restarted
after join/rejoin the cluster, so there is no longer a need for the
installer process which monitors the 'emqx' name registration changes
and then issue license reloading and hook re-adding etc.
2023-05-24 10:55:16 +02:00
Zaiming (Stone) Shi 492a591298 refactor: do not emit debug logs on periodic license checks 2023-05-24 10:53:16 +02:00
Zaiming (Stone) Shi 40e8d5d039 refactor: rename lib-ee/emqx_ee_conf to apps/emqx_enterprise 2023-05-22 14:51:27 +02:00
Stefan Strigler f8e9e54393 refactor: move emqx_json to emqx_utils_json 2023-04-14 13:31:27 +02:00
Zaiming (Stone) Shi dbc10c2eed chore: update copyright year 2023 2023-01-02 09:22:27 +01:00
Shawn 4135910b42 chore: merge master into dev/ee5.0 2022-09-26 09:52:33 +08:00
Thales Macedo Garitezi deff429579 chore: unify default license references in fn 2022-09-14 17:26:48 -03:00
Thales Macedo Garitezi 21f89fd83e chore(license): delete default config and add info to i18n 2022-09-14 17:00:21 -03:00
Thales Macedo Garitezi d4416dc581 chore: drop support for license files (ee5.0)
Related issue: EMQX-7247

EMQX ee5.0 is to drop support for both the old license format (x509)
and for files containing the new format.
2022-09-14 09:44:59 -03:00
Shawn b3162fe5ff fix: conflicts between master and ee5.0 2022-08-14 22:24:09 +08:00
Thales Macedo Garitezi e76682d368 test: apply review comments 2022-08-04 15:27:45 -03:00
Thales Macedo Garitezi 68592373e3 test: add a couple more tests 2022-08-04 14:01:27 -03:00
Thales Macedo Garitezi 7e6b94fc12 test: avoid stopping cover and using meck 2022-08-04 10:23:49 -03:00
Thales Macedo Garitezi 69ec76f586 chore(license): treat license file API as an upload (5.0)
Improving the HTTP API for license after PR feedback.
2022-08-02 17:25:33 -03:00
Thales Macedo Garitezi 1a66e53c49 chore(license): change api responses after review 2022-08-02 09:31:59 -03:00
Thales Macedo Garitezi b19e8fb3cd feat(license): add HTTP API for license 2022-08-02 09:31:59 -03:00
JimMoen 10b19acd35 chore: module and fun call rename 2022-08-02 16:59:56 +08:00
Thales Macedo Garitezi f8a1bd0715 feat(license): copy license file to cluster when updating it 2022-07-28 17:29:59 -03:00
Thales Macedo Garitezi 80d35feb33 fix(license): change schema to allow updating license to different type
Before this change, if a license in `emqx.conf` was of type
`key`/`file` and then changed to the opposite type, such change would
be saved to `{cluster,local}-overrides.conf`.  When the node restarts
after that, the configs are merged naively and becomes invalid, as it
contains both the `key` and `file` keys, and crashes.
2022-07-28 17:29:59 -03:00
Zaiming (Stone) Shi 123e456287 feat: change default trial license
* Changed number of connections limit from 10 to 1000
* Added a 'deployment' field, so we know which is which when
  a customer has multiple licenses
* Default expiration is 5 years
2022-04-21 08:48:37 +02:00
Thales Macedo Garitezi d12229700a
feat(license): port 4.4 parser to 5.0 2022-04-11 09:25:06 -03:00
Zaiming (Stone) Shi 4f396cceb8 style(emqx_license): erlfmt refomrat apps/emqx_license 2022-03-25 07:13:08 +01:00
Zaiming (Stone) Shi fa9300e875 feat(emqx_license): allow comma in integer numbers in license body 2022-02-16 15:37:24 +01:00
Zaiming (Stone) Shi bc67ede384 chore: update to use official pub key for 5.0 license 2022-02-15 14:22:14 +01:00
Zaiming (Stone) Shi 7494c47919 test: change to use ec keys for testing 2022-02-15 13:51:56 +01:00
Zaiming (Stone) Shi c8c7ad896e refactor(emqx_license): test with pem format input
no need to perform der encode/decode for pub key
2022-02-15 10:39:30 +01:00
Zaiming (Stone) Shi 0f09e7bbd2 test(emqx_license): no need to meck public key for tests 2022-02-15 00:39:10 +01:00
Zaiming (Stone) Shi cd3565d357 refactor(emqx_license): simplify parser errors
prior to this change, badmatch exception may cause the license key
to be dumped in logs
2022-02-10 12:40:46 +01:00
Zaiming (Stone) Shi ae9c8098ba test: ensure coverage for the `no_license` case 2022-02-08 17:28:40 +01:00
Zaiming (Stone) Shi c936706a1f refactor(emqx_license): log a different msg when license is not loaded 2022-02-08 17:28:40 +01:00
Ilya Averyanov 17599432d1 feat(license): add license application 2022-02-07 19:05:47 +03:00