-
Notifications
You must be signed in to change notification settings - Fork 429
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/instrument
- Loading branch information
Showing
53 changed files
with
788 additions
and
367 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 6.2.0 | ||
| 6.2.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| -module(ca_certificate_helper). | ||
|
|
||
| -compile([export_all, nowarn_export_all]). | ||
|
|
||
| -include_lib("common_test/include/ct.hrl"). | ||
|
|
||
| generate_cert(Config, #{cn := User} = CertSpec, BasicTemplateValues) -> | ||
| ConfigTemplate = filename:join(?config(mim_data_dir, Config), "openssl-user.cnf"), | ||
| {ok, Template} = file:read_file(ConfigTemplate), | ||
| XMPPAddrs = maps:get(xmpp_addrs, CertSpec, undefined), | ||
| TemplateValues = maps:merge(BasicTemplateValues, prepare_template_values(User, XMPPAddrs)), | ||
| OpenSSLConfig = bbmustache:render(Template, TemplateValues), | ||
| UserConfig = filename:join(?config(priv_dir, Config), User ++ ".cfg"), | ||
| ct:log("OpenSSL config: ~ts~n~ts", [UserConfig, OpenSSLConfig]), | ||
| file:write_file(UserConfig, OpenSSLConfig), | ||
| UserKey = filename:join(?config(priv_dir, Config), User ++ "_key.pem"), | ||
| case maps:get(signed, CertSpec, ca) of | ||
| ca -> generate_ca_signed_cert(Config, User, UserConfig, UserKey); | ||
| self -> generate_self_signed_cert(Config, User, UserConfig, UserKey) | ||
| end. | ||
|
|
||
| prepare_template_values(User, XMPPAddrsIn) -> | ||
| XMPPAddrs = maybe_prepare_xmpp_addresses(XMPPAddrsIn), | ||
| #{"cn" => User, "xmppAddrs" => XMPPAddrs}. | ||
|
|
||
| maybe_prepare_xmpp_addresses(undefined) -> | ||
| ""; | ||
| maybe_prepare_xmpp_addresses(Addrs) when is_list(Addrs) -> | ||
| AddrsWithSeq = lists:enumerate(Addrs), | ||
| Entries = [make_xmpp_addr_entry(I, Addr) || {I, Addr} <- AddrsWithSeq], | ||
| string:join(Entries, "\n"). | ||
|
|
||
| make_xmpp_addr_entry(I, Addr) -> | ||
| % id-on-xmppAddr OID is specified in the openssl-user.cnf config file | ||
| "otherName." ++ integer_to_list(I) ++ " = id-on-xmppAddr;UTF8:" ++ Addr. | ||
|
|
||
|
|
||
| generate_ca_signed_cert(Config, Filename, ConfigCfg, KeyFilename) -> | ||
| Csr = filename:join(?config(priv_dir, Config), Filename ++ ".csr"), | ||
| Cmd = ["openssl req -config ", ConfigCfg, " -newkey rsa:2048 -sha256 -nodes -out ", | ||
| Csr, " -keyout ", KeyFilename, " -outform PEM"], | ||
| Out = os:cmd(Cmd), | ||
| ct:log("generate_ca_signed_cert 1:~nCmd ~p~nOut ~ts", [Cmd, Out]), | ||
| Cert = filename:join(?config(priv_dir, Config), Filename ++ "_cert.pem"), | ||
| SignCmd = filename:join(?config(mim_data_dir, Config), "sign_cert.sh"), | ||
| Cmd2 = [SignCmd, " --req ", Csr, " --out ", Cert], | ||
| SSLDir = filename:join([path_helper:repo_dir(Config), "tools", "ssl"]), | ||
| OutLog = os:cmd("cd " ++ SSLDir ++ " && " ++ Cmd2), | ||
| ct:log("generate_ca_signed_cert 2:~nCmd ~p~nOut ~ts", [Cmd2, OutLog]), | ||
| #{key => KeyFilename, | ||
| cert => Cert}. | ||
|
|
||
| generate_self_signed_cert(Config, Filename, ConfigCfg, KeyFilename) -> | ||
| Cert = filename:join(?config(priv_dir, Config), Filename ++ "_self_signed_cert.pem"), | ||
| Cmd = ["openssl req -config ", ConfigCfg, " -newkey rsa:2048 -sha256 -nodes -out ", | ||
| Cert, " -keyout ", KeyFilename, " -x509 -outform PEM -extensions client_req_extensions"], | ||
| OutLog = os:cmd(Cmd), | ||
| ct:log("generate_self_signed_cert:~nCmd ~p~nOut ~ts", [Cmd, OutLog]), | ||
| #{key => KeyFilename, | ||
| cert => Cert}. |
Oops, something went wrong.