mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-26 16:26:24 +01:00
Add new-authz, refactor the http requests that all used the same code
This commit is contained in:
Konstantinos Kallas
parent
911b8188d2
commit
c25aa8378f
@ -3,9 +3,14 @@
|
||||
-export([ scenario/3
|
||||
, scenario0/1
|
||||
, directory/1
|
||||
|
||||
, get_account/3
|
||||
, new_account/4
|
||||
, update_account/4
|
||||
, delete_account/3
|
||||
% , key_roll_over/5
|
||||
|
||||
, new_authz/4
|
||||
]).
|
||||
|
||||
-include("ejabberd.hrl").
|
||||
@ -28,7 +33,6 @@ directory(Url) ->
|
||||
HttpOptions = [{timeout, ?REQUEST_TIMEOUT}],
|
||||
case httpc:request(get, {Url, []}, HttpOptions, Options) of
|
||||
{ok, {{_, Code, _}, Head, Body}} when Code >= 200, Code =< 299 ->
|
||||
%% Decode the json string
|
||||
case decode(Body) of
|
||||
{error, Reason} ->
|
||||
?ERROR_MSG("Problem decoding: ~s", [Body]),
|
||||
@ -45,6 +49,13 @@ directory(Url) ->
|
||||
failed_http_request(Error, Url)
|
||||
end.
|
||||
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%%
|
||||
%% Account Handling
|
||||
%%
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
-spec new_account(url(), jose_jwk:key(), proplist(), nonce()) ->
|
||||
{ok, {url(), proplist()}, nonce()} | {error, _}.
|
||||
new_account(Url, PrivateKey, Req, Nonce) ->
|
||||
@ -53,22 +64,13 @@ new_account(Url, PrivateKey, Req, Nonce) ->
|
||||
{_, SignedBody} = sign_json_jose(PrivateKey, ReqBody, Nonce),
|
||||
%% Encode the Signed body with jiffy
|
||||
FinalBody = jiffy:encode(SignedBody),
|
||||
Options = [],
|
||||
HttpOptions = [{timeout, ?REQUEST_TIMEOUT}],
|
||||
case httpc:request(post,
|
||||
{Url, [], "application/jose+json", FinalBody}, HttpOptions, Options) of
|
||||
{ok, {{_, Code, _}, Head, Body}} when Code >= 200, Code =< 299 ->
|
||||
case decode(Body) of
|
||||
{error, Reason} ->
|
||||
?ERROR_MSG("Problem decoding: ~s", [Body]),
|
||||
{error, Reason};
|
||||
Return ->
|
||||
case make_post_request(Url, FinalBody) of
|
||||
{ok, Head, Return} ->
|
||||
TOSUrl = get_tos(Head),
|
||||
NewNonce = get_nonce(Head),
|
||||
{ok, {TOSUrl, Return}, NewNonce}
|
||||
end;
|
||||
{ok, {TOSUrl, Return}, NewNonce};
|
||||
Error ->
|
||||
failed_http_request(Error, Url)
|
||||
Error
|
||||
end.
|
||||
|
||||
-spec update_account(url(), jose_jwk:key(), proplist(), nonce()) ->
|
||||
@ -79,21 +81,12 @@ update_account(Url, PrivateKey, Req, Nonce) ->
|
||||
{_, SignedBody} = sign_json_jose(PrivateKey, ReqBody, Nonce),
|
||||
%% Encode the Signed body with jiffy
|
||||
FinalBody = jiffy:encode(SignedBody),
|
||||
Options = [],
|
||||
HttpOptions = [{timeout, ?REQUEST_TIMEOUT}],
|
||||
case httpc:request(post,
|
||||
{Url, [], "application/jose+json", FinalBody}, HttpOptions, Options) of
|
||||
{ok, {{_, Code, _}, Head, Body}} when Code >= 200, Code =< 299 ->
|
||||
case decode(Body) of
|
||||
{error, Reason} ->
|
||||
?ERROR_MSG("Problem decoding: ~s", [Body]),
|
||||
{error, Reason};
|
||||
Return ->
|
||||
case make_post_request(Url, FinalBody) of
|
||||
{ok, Head, Return} ->
|
||||
NewNonce = get_nonce(Head),
|
||||
{ok, Return, NewNonce}
|
||||
end;
|
||||
{ok, Return, NewNonce};
|
||||
Error ->
|
||||
failed_http_request(Error, Url)
|
||||
Error
|
||||
end.
|
||||
|
||||
-spec get_account(url(), jose_jwk:key(), nonce()) ->
|
||||
@ -105,25 +98,63 @@ get_account(Url, PrivateKey, Nonce) ->
|
||||
{_, SignedBody} = sign_json_jose(PrivateKey, ReqBody, Nonce),
|
||||
%% Encode the Signed body with jiffy
|
||||
FinalBody = jiffy:encode(SignedBody),
|
||||
Options = [],
|
||||
HttpOptions = [{timeout, ?REQUEST_TIMEOUT}],
|
||||
case httpc:request(post,
|
||||
{Url, [], "application/jose+json", FinalBody}, HttpOptions, Options) of
|
||||
{ok, {{_, Code, _}, Head, Body}} when Code >= 200, Code =< 299 ->
|
||||
case decode(Body) of
|
||||
{error, Reason} ->
|
||||
?ERROR_MSG("Problem decoding: ~s", [Body]),
|
||||
{error, Reason};
|
||||
Return ->
|
||||
case make_post_request(Url, FinalBody) of
|
||||
{ok, Head, Return} ->
|
||||
TOSUrl = get_tos(Head),
|
||||
NewNonce = get_nonce(Head),
|
||||
{ok, {TOSUrl, Return}, NewNonce}
|
||||
end;
|
||||
{ok, {TOSUrl, Return}, NewNonce};
|
||||
Error ->
|
||||
failed_http_request(Error, Url)
|
||||
Error
|
||||
end.
|
||||
|
||||
|
||||
-spec delete_account(url(), jose_jwk:key(), nonce()) ->
|
||||
{ok, proplist(), nonce()} | {error, _}.
|
||||
delete_account(Url, PrivateKey, Nonce) ->
|
||||
%% Make the request body
|
||||
ReqBody = jiffy:encode({
|
||||
[ {<<"resource">>, <<"reg">>}
|
||||
, {<<"status">>, <<"deactivated">>}
|
||||
]}),
|
||||
%% Jose Sign
|
||||
{_, SignedBody} = sign_json_jose(PrivateKey, ReqBody, Nonce),
|
||||
%% Encode the Signed body with jiffy
|
||||
FinalBody = jiffy:encode(SignedBody),
|
||||
case make_post_request(Url, FinalBody) of
|
||||
{ok, Head, Return} ->
|
||||
NewNonce = get_nonce(Head),
|
||||
{ok, Return, NewNonce};
|
||||
Error ->
|
||||
Error
|
||||
end.
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
%%
|
||||
%% Authorization Handling
|
||||
%%
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
-spec new_authz(url(), jose_jwk:key(), proplist(), nonce()) ->
|
||||
{ok, proplist(), nonce()} | {error, _}.
|
||||
new_authz(Url, PrivateKey, Req, Nonce) ->
|
||||
%% Make the request body
|
||||
ReqBody = jiffy:encode({
|
||||
[ { <<"resource">>, <<"new-authz">>}] ++ Req}),
|
||||
{_, SignedBody} = sign_json_jose(PrivateKey, ReqBody, Nonce),
|
||||
%% Encode the Signed body with jiffy
|
||||
FinalBody = jiffy:encode(SignedBody),
|
||||
case make_post_request(Url, FinalBody) of
|
||||
{ok, Head, Return} ->
|
||||
NewNonce = get_nonce(Head),
|
||||
{ok, Return, NewNonce};
|
||||
Error ->
|
||||
Error
|
||||
end.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
%%
|
||||
%% Useful funs
|
||||
%%
|
||||
@ -149,11 +180,45 @@ get_tos(Head) ->
|
||||
none
|
||||
end.
|
||||
|
||||
make_post_request(Url, ReqBody) ->
|
||||
Options = [],
|
||||
HttpOptions = [{timeout, ?REQUEST_TIMEOUT}],
|
||||
case httpc:request(post,
|
||||
{Url, [], "application/jose+json", ReqBody}, HttpOptions, Options) of
|
||||
{ok, {{_, Code, _}, Head, Body}} when Code >= 200, Code =< 299 ->
|
||||
case decode(Body) of
|
||||
{error, Reason} ->
|
||||
?ERROR_MSG("Problem decoding: ~s", [Body]),
|
||||
{error, Reason};
|
||||
Return ->
|
||||
{ok, Head, Return}
|
||||
end;
|
||||
Error ->
|
||||
failed_http_request(Error, Url)
|
||||
end.
|
||||
|
||||
-spec sign_json_jose(jose_jwk:key(), string()) -> jws().
|
||||
sign_json_jose(Key, Json) ->
|
||||
PubKey = jose_jwk:to_public(Key),
|
||||
{_, BinaryPubKey} = jose_jwk:to_binary(PubKey),
|
||||
PubKeyJson = jiffy:decode(BinaryPubKey),
|
||||
% Jws object containing the algorithm
|
||||
%% TODO: Dont hardcode the alg
|
||||
JwsObj = jose_jws:from(
|
||||
#{ <<"alg">> => <<"ES256">>
|
||||
% , <<"b64">> => true
|
||||
, <<"jwk">> => PubKeyJson
|
||||
}),
|
||||
%% Signed Message
|
||||
jose_jws:sign(Key, Json, JwsObj).
|
||||
|
||||
-spec sign_json_jose(jose_jwk:key(), string(), nonce()) -> jws().
|
||||
sign_json_jose(Key, Json, Nonce) ->
|
||||
% Generate a public key
|
||||
PubKey = jose_jwk:to_public(Key),
|
||||
% ?INFO_MSG("Key: ~p", [Key]),
|
||||
{_, BinaryPubKey} = jose_jwk:to_binary(PubKey),
|
||||
% ?INFO_MSG("Key Record: ~p", [jose_jwk:to_map(Key)]),
|
||||
PubKeyJson = jiffy:decode(BinaryPubKey),
|
||||
% Jws object containing the algorithm
|
||||
%% TODO: Dont hardcode the alg
|
||||
@ -197,13 +262,27 @@ scenario(CAUrl, AccId, PrivateKey) ->
|
||||
{ok, Dirs, Nonce0} = directory(DirURL),
|
||||
|
||||
AccURL = CAUrl ++ "/acme/reg/" ++ AccId,
|
||||
{ok, {_TOS, Account}, Nonce1} = get_account(AccURL, PrivateKey, Nonce0).
|
||||
{ok, {_TOS, Account}, Nonce1} = get_account(AccURL, PrivateKey, Nonce0),
|
||||
|
||||
#{"new-authz" := NewAuthz} = Dirs,
|
||||
Req =
|
||||
[ { <<"identifier">>, {
|
||||
[ {<<"type">>, <<"dns">>}
|
||||
, {<<"value">>, <<"my-acme-test.com">>}
|
||||
] }}
|
||||
, {<<"existing">>, <<"accept">>}
|
||||
],
|
||||
{ok, Authz, Nonce2} = new_authz(NewAuthz, PrivateKey, Req, Nonce1),
|
||||
|
||||
{Account, Authz, PrivateKey}.
|
||||
|
||||
|
||||
new_user_scenario(CAUrl) ->
|
||||
PrivateKey = generate_key(),
|
||||
|
||||
DirURL = CAUrl ++ "/directory",
|
||||
{ok, Dirs, Nonce0} = directory(DirURL),
|
||||
?INFO_MSG("Directories: ~p", [Dirs]),
|
||||
|
||||
#{"new-reg" := NewAccURL} = Dirs,
|
||||
Req0 = [{ <<"contact">>, [<<"mailto:cert-example-admin@example2.com">>]}],
|
||||
@ -211,10 +290,29 @@ new_user_scenario(CAUrl) ->
|
||||
|
||||
{_, AccId} = proplists:lookup(<<"id">>, Account),
|
||||
AccURL = CAUrl ++ "/acme/reg/" ++ integer_to_list(AccId),
|
||||
Req1 = [{ <<"agreement">>, list_to_bitstring(TOS)}],
|
||||
{ok, Account1, Nonce2} = update_account(AccURL, PrivateKey, Req1, Nonce1),
|
||||
{ok, {_TOS, Account1}, Nonce2} = get_account(AccURL, PrivateKey, Nonce1),
|
||||
?INFO_MSG("Old account: ~p~n", [Account1]),
|
||||
|
||||
{Account1, PrivateKey}.
|
||||
Req1 = [{ <<"agreement">>, list_to_bitstring(TOS)}],
|
||||
{ok, Account2, Nonce3} = update_account(AccURL, PrivateKey, Req1, Nonce2),
|
||||
|
||||
%%
|
||||
%% Delete account
|
||||
%%
|
||||
|
||||
{ok, Account3, Nonce4} = delete_account(AccURL, PrivateKey, Nonce3),
|
||||
{ok, {_TOS, Account4}, Nonce5} = get_account(AccURL, PrivateKey, Nonce4),
|
||||
?INFO_MSG("New account: ~p~n", [Account4]),
|
||||
|
||||
% NewKey = generate_key(),
|
||||
% KeyChangeUrl = CAUrl ++ "/acme/key-change/",
|
||||
% {ok, Account3, Nonce4} = key_roll_over(KeyChangeUrl, AccURL, PrivateKey, NewKey, Nonce3),
|
||||
% ?INFO_MSG("Changed key: ~p~n", [Account3]),
|
||||
|
||||
% {ok, {_TOS, Account4}, Nonce5} = get_account(AccURL, NewKey, Nonce4),
|
||||
% ?INFO_MSG("New account:~p~n", [Account4]),
|
||||
|
||||
{Account4, PrivateKey}.
|
||||
|
||||
generate_key() ->
|
||||
jose_jwk:generate_key({ec, secp256r1}).
|
||||
@ -222,5 +320,7 @@ generate_key() ->
|
||||
%% Just a test
|
||||
scenario0(KeyFile) ->
|
||||
PrivateKey = jose_jwk:from_file(KeyFile),
|
||||
scenario("http://localhost:4000", "2", PrivateKey).
|
||||
% new_user_scenario("http://localhost:4000").
|
||||
% scenario("http://localhost:4000", "2", PrivateKey).
|
||||
new_user_scenario("http://localhost:4000").
|
||||
|
||||
% ejabberd_acme:scenario0("/home/konstantinos/Desktop/Programming/ejabberd/private_key_temporary").
|
||||
|
||||
Loading…
Reference in New Issue
Block a user