yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Zaiming (Stone) Shi 2022-04-19 13:04:57 +02:00
parent 0986a1c8c4
commit 123e456287
9 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib-ee/emqx_license/etc/emqx_license.conf
View File

@ -1,5 +1,6 @@
license { license {
key = "MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KMjAyMjAxMDEKMzY1MDAKMTAK.MEUCIFc9EUjqB3SjpRqWjqmAzI4Tg4LwhCRet9scEoxMRt8fAiEAk6vfYUiPOTzBC+3EjNF3WmLTiA3B0TN5ZNwuTKbTXJQ=" # The default license has 1000 connections limit, it is issued on 20220419 and valid for 5 years (1825 days)
key = "MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KZGVmYXVsdAoyMDIyMDQxOQoxODI1CjEwMDAK.MEQCICbgRVijCQov2hrvZXR1mk9Oa+tyV1F5oJ6iOZeSHjnQAiB9dUiVeaZekDOjztk+NCWjhk4PG8tWfw2uFZWruSzD6g=="
connection_low_watermark = 75%, connection_low_watermark = 75%,
connection_high_watermark = 80% connection_high_watermark = 80%
} }

6
lib-ee/emqx_license/include/emqx_license.hrl
View File

@ -9,11 +9,11 @@
-define(EVALUATION_LOG, -define(EVALUATION_LOG,
"\n" "\n"
"===============================================================================\n" "================================================================================\n"
"This is an evaluation license that is restricted to 10 concurrent connections.\n" "This is an evaluation license that is restricted to 1000 concurrent connections.\n"
"If you already have a paid license, please apply it now.\n" "If you already have a paid license, please apply it now.\n"
"Or you could visit https://emqx.com/apply-licenses/emqx to get a trial license.\n" "Or you could visit https://emqx.com/apply-licenses/emqx to get a trial license.\n"
"===============================================================================\n" "================================================================================\n"
). ).
-define(EXPIRY_LOG, -define(EXPIRY_LOG,

1
lib-ee/emqx_license/src/emqx_license_parser_legacy.erl
View File

@ -89,6 +89,7 @@ dump(#{
[ [
{customer, Customer}, {customer, Customer},
{email, Email}, {email, Email},
{deployment, "default"},
{max_connections, MaxConnections}, {max_connections, MaxConnections},
{start_at, format_date(StartAtDate)}, {start_at, format_date(StartAtDate)},
{expiry_at, format_date(ExpiryAtDate)}, {expiry_at, format_date(ExpiryAtDate)},

9
lib-ee/emqx_license/src/emqx_license_parser_v20220101.erl
View File

@ -48,6 +48,7 @@ dump(
customer_type := CType, customer_type := CType,
customer := Customer, customer := Customer,
email := Email, email := Email,
deployment := Deployment,
date_start := DateStart, date_start := DateStart,
max_connections := MaxConns max_connections := MaxConns
} = License } = License
@ -59,6 +60,7 @@ dump(
[ [
{customer, Customer}, {customer, Customer},
{email, Email}, {email, Email},
{deployment, Deployment},
{max_connections, MaxConns}, {max_connections, MaxConns},
{start_at, format_date(DateStart)}, {start_at, format_date(DateStart)},
{expiry_at, format_date(DateExpiry)}, {expiry_at, format_date(DateExpiry)},
@ -103,20 +105,21 @@ parse_payload(Payload) ->
string:split(string:trim(Payload), <<"\n">>, all) string:split(string:trim(Payload), <<"\n">>, all)
), ),
case Lines of case Lines of
[?LICENSE_VERSION, Type, CType, Customer, Email, DateStart, Days, MaxConns] -> [?LICENSE_VERSION, Type, CType, Customer, Email, Deployment, DateStart, Days, MaxConns] ->
collect_fields([ collect_fields([
{type, parse_type(Type)}, {type, parse_type(Type)},
{customer_type, parse_customer_type(CType)}, {customer_type, parse_customer_type(CType)},
{customer, {ok, Customer}}, {customer, {ok, Customer}},
{email, {ok, Email}}, {email, {ok, Email}},
{deployment, {ok, Deployment}},
{date_start, parse_date_start(DateStart)}, {date_start, parse_date_start(DateStart)},
{days, parse_days(Days)}, {days, parse_days(Days)},
{max_connections, parse_max_connections(MaxConns)} {max_connections, parse_max_connections(MaxConns)}
]); ]);
[_Version, _Type, _CType, _Customer, _Email, _DateStart, _Days, _MaxConns] -> [_Version, _Type, _CType, _Customer, _Email, _Deployment, _DateStart, _Days, _MaxConns] ->
{error, invalid_version}; {error, invalid_version};
_ -> _ ->
{error, invalid_field_number} {error, unexpected_number_of_fields}
end. end.
parse_type(TypeStr) -> parse_type(TypeStr) ->

3
lib-ee/emqx_license/test/emqx_license_SUITE.erl
View File

@ -102,6 +102,7 @@ t_check_exceeded(_Config) ->
"10", "10",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"bar",
"20220111", "20220111",
"100000", "100000",
"10" "10"
@ -130,6 +131,7 @@ t_check_ok(_Config) ->
"10", "10",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"bar",
"20220111", "20220111",
"100000", "100000",
"10" "10"
@ -160,6 +162,7 @@ t_check_expired(_Config) ->
"0", "0",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"bar",
%% Expired long ago %% Expired long ago
"20211101", "20211101",
"10", "10",

7
lib-ee/emqx_license/test/emqx_license_checker_SUITE.erl
View File

@ -55,6 +55,7 @@ t_dump(_Config) ->
"10", "10",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"bar",
"20220111", "20220111",
"100000", "100000",
"10" "10"
@ -67,6 +68,7 @@ t_dump(_Config) ->
[ [
{customer, <<"Foo">>}, {customer, <<"Foo">>},
{email, <<"contact@foo.com">>}, {email, <<"contact@foo.com">>},
{deployment, <<"bar">>},
{max_connections, 10}, {max_connections, 10},
{start_at, <<"2022-01-11">>}, {start_at, <<"2022-01-11">>},
{expiry_at, <<"2295-10-27">>}, {expiry_at, <<"2295-10-27">>},
@ -85,6 +87,7 @@ t_update(_Config) ->
"10", "10",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"bar",
"20220111", "20220111",
"100000", "100000",
"123" "123"
@ -129,6 +132,7 @@ t_expired_trial(_Config) ->
"10", "10",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"bar",
format_date(Date10DaysAgo), format_date(Date10DaysAgo),
"1", "1",
"123" "123"
@ -154,6 +158,7 @@ t_overexpired_small_client(_Config) ->
"0", "0",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"bar",
format_date(Date100DaysAgo), format_date(Date100DaysAgo),
"1", "1",
"123" "123"
@ -179,6 +184,7 @@ t_overexpired_medium_client(_Config) ->
"1", "1",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"bar",
format_date(Date100DaysAgo), format_date(Date100DaysAgo),
"1", "1",
"123" "123"
@ -204,6 +210,7 @@ t_recently_expired_small_client(_Config) ->
"0", "0",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"bar",
format_date(Date10DaysAgo), format_date(Date10DaysAgo),
"1", "1",
"123" "123"

12
lib-ee/emqx_license/test/emqx_license_parser_SUITE.erl
View File

@ -51,6 +51,7 @@ t_parse(_Config) ->
"10", "10",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"bar-deployment",
"20220111", "20220111",
"100000", "100000",
"10" "10"
@ -73,8 +74,10 @@ t_parse(_Config) ->
"0", "0",
"10", "10",
"Foo", "Foo",
% one extra field
"Bar", "Bar",
"contact@foo.com", "contact@foo.com",
"default-deployment",
"20220111", "20220111",
"100000", "100000",
"10" "10"
@ -85,7 +88,7 @@ t_parse(_Config) ->
?assertMatch({error, _}, Res2), ?assertMatch({error, _}, Res2),
{error, Err2} = Res2, {error, Err2} = Res2,
?assertEqual( ?assertEqual(
invalid_field_number, unexpected_number_of_fields,
proplists:get_value(emqx_license_parser_v20220101, Err2) proplists:get_value(emqx_license_parser_v20220101, Err2)
), ),
@ -97,6 +100,7 @@ t_parse(_Config) ->
"ten", "ten",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"default-deployment",
"20220231", "20220231",
"-10", "-10",
"10" "10"
@ -124,6 +128,7 @@ t_parse(_Config) ->
"ten", "ten",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"default-deployment",
"2022-02-1st", "2022-02-1st",
"-10", "-10",
"10" "10"
@ -133,6 +138,7 @@ t_parse(_Config) ->
), ),
?assertMatch({error, _}, Res4), ?assertMatch({error, _}, Res4),
{error, Err4} = Res4, {error, Err4} = Res4,
?assertEqual( ?assertEqual(
[ [
{type, invalid_license_type}, {type, invalid_license_type},
@ -152,6 +158,7 @@ t_parse(_Config) ->
"10", "10",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"default-deployment",
"20220111", "20220111",
"100000", "100000",
"10" "10"
@ -167,6 +174,7 @@ t_parse(_Config) ->
"10", "10",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"default-deployment",
"20220111", "20220111",
"100000", "100000",
"10" "10"
@ -210,6 +218,7 @@ t_dump(_Config) ->
[ [
{customer, <<"Foo">>}, {customer, <<"Foo">>},
{email, <<"contact@foo.com">>}, {email, <<"contact@foo.com">>},
{deployment, <<"default-deployment">>},
{max_connections, 10}, {max_connections, 10},
{start_at, <<"2022-01-11">>}, {start_at, <<"2022-01-11">>},
{expiry_at, <<"2295-10-27">>}, {expiry_at, <<"2295-10-27">>},
@ -255,6 +264,7 @@ sample_license() ->
"10", "10",
"Foo", "Foo",
"contact@foo.com", "contact@foo.com",
"default-deployment",
"20220111", "20220111",
"100,000", "100,000",
"10" "10"

1
lib-ee/emqx_license/test/emqx_license_parser_legacy_SUITE.erl
View File

@ -58,6 +58,7 @@ t_dump(_Config) ->
[ [
{customer, <<"EMQ X Evaluation">>}, {customer, <<"EMQ X Evaluation">>},
{email, "contact@emqx.io"}, {email, "contact@emqx.io"},
{deployment, "default"},
{max_connections, 10}, {max_connections, 10},
{start_at, <<"2020-06-20">>}, {start_at, <<"2020-06-20">>},
{expiry_at, <<"2049-01-01">>}, {expiry_at, <<"2049-01-01">>},

4
lib-ee/emqx_license/test/emqx_license_test_lib.erl
View File

@ -58,7 +58,7 @@ make_license(Values) ->
default_license() -> default_license() ->
%% keep it the same as in etc/emqx_license.conf %% keep it the same as in etc/emqx_license.conf
License = License =
"MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KMjAyMjAxMDEKMzY1MDAKMTAK." "MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KZGVmYXVsdAoyMDIyMDQxOQoxODI1CjEwMDAK."
"MEUCIFc9EUjqB3SjpRqWjqmAzI4Tg4LwhCRet9scEoxMRt8fAiEAk6vfYUiPOTzBC+3EjNF3WmLTiA3B0TN5ZNwuTKbTXJQ=", "MEQCICbgRVijCQov2hrvZXR1mk9Oa+tyV1F5oJ6iOZeSHjnQAiB9dUiVeaZekDOjztk+NCWjhk4PG8tWfw2uFZWruSzD6g==",
ok = file:write_file(?DEFAULT_LICENSE_FILE, License), ok = file:write_file(?DEFAULT_LICENSE_FILE, License),
?DEFAULT_LICENSE_FILE. ?DEFAULT_LICENSE_FILE.