diff options
| author | Marcin Sikora <sircinek@gmail.com> | 2020-05-03 19:05:40 +0200 |
|---|---|---|
| committer | Marcin Sikora <sircinek@gmail.com> | 2020-05-03 19:11:35 +0200 |
| commit | ab8fa9c0da53e321da7706c9aba2f549f95df349 (patch) | |
| tree | 09c8fef32a824ea93586145329f309c7bf950e58 | |
| parent | a98e6becd3e0147281f0202331671a0bd44ae36f (diff) | |
| download | erlang-ab8fa9c0da53e321da7706c9aba2f549f95df349.tar.gz | |
Use user returned path validation error for selfsigned cert;
It allows user to trigger different TLS alerts than Bad Certificate for path validation erros
| -rw-r--r-- | lib/public_key/src/public_key.erl | 4 | ||||
| -rw-r--r-- | lib/public_key/test/public_key_SUITE.erl | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 996cf9db2c..a47b7148e7 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -928,8 +928,8 @@ pkix_path_validation(PathErr, [Cert | Chain], Options0) when is_atom(PathErr)-> Options = proplists:delete(verify_fun, Options0), pkix_path_validation(Otpcert, Chain, [{verify_fun, {VerifyFun, Userstate}}| Options]); - {fail, _} -> - {error, Reason} + {fail, UserReason} -> + {error, UserReason} catch _:_ -> {error, Reason} diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl index 97a1f14de9..1fd1d2fa76 100644 --- a/lib/public_key/test/public_key_SUITE.erl +++ b/lib/public_key/test/public_key_SUITE.erl @@ -586,6 +586,19 @@ pkix_path_validation(Config) when is_list(Config) -> {ok, _} = public_key:pkix_path_validation(unknown_ca, [Cert1], [{verify_fun, VerifyFunAndState1}]), + + VerifyFunAndState2 = + {fun(_, {bad_cert, selfsigned_peer}, _UserState) -> + {fail, custom_reason}; + (_,{extension, _}, UserState) -> + {unknown, UserState}; + (_, valid, UserState) -> + {valid, UserState} + end, []}, + + {error, custom_reason} = + public_key:pkix_path_validation(selfsigned_peer, [Trusted], [{verify_fun, + VerifyFunAndState2}]), ok. %%-------------------------------------------------------------------- |