From 064c91dd5ce45553b6ed0c818247f7727b86e0e9 Mon Sep 17 00:00:00 2001 From: Gabriele Santomaggio Date: Wed, 25 Jan 2017 17:41:40 +0100 Subject: [PATCH 1/8] Change the calls that uses the rabbit_json module See :https://github.com/rabbitmq/rabbitmq-common/issues/164 --- src/rabbit_policy.erl | 2 +- src/rabbit_runtime_parameters.erl | 4 ++-- src/rabbit_vhost_limit.erl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index 4ab972872e..cf65665874 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -215,7 +215,7 @@ parse_set(Type, VHost, Name, Pattern, Definition, Priority, ApplyTo, ActingUser) end. parse_set0(Type, VHost, Name, Pattern, Defn, Priority, ApplyTo, ActingUser) -> - case rabbit_json:try_decode(Defn) of + case rabbit_json:try_decode(Defn, [return_maps]) of {ok, Term} -> set0(Type, VHost, Name, [{<<"pattern">>, Pattern}, diff --git a/src/rabbit_runtime_parameters.erl b/src/rabbit_runtime_parameters.erl index 7a320e108b..b29cddcc45 100644 --- a/src/rabbit_runtime_parameters.erl +++ b/src/rabbit_runtime_parameters.erl @@ -105,7 +105,7 @@ parse_set(_, <<"policy">>, _, _, _) -> {error_string, "policies may not be set using this method"}; parse_set(VHost, Component, Name, String, User) -> Definition = rabbit_data_coercion:to_binary(String), - case rabbit_json:try_decode(Definition) of + case rabbit_json:try_decode(Definition, [return_maps]) of {ok, Term} when is_map(Term) -> set(VHost, Component, Name, maps:to_list(Term), User); {ok, Term} -> set(VHost, Component, Name, Term, User); error -> {error_string, "JSON decoding error"} @@ -118,7 +118,7 @@ set(VHost, Component, Name, Term, User) -> parse_set_global(Name, String, ActingUser) -> Definition = rabbit_data_coercion:to_binary(String), - case rabbit_json:try_decode(Definition) of + case rabbit_json:try_decode(Definition, [return_maps]) of {ok, Term} when is_map(Term) -> set_global(Name, maps:to_list(Term), ActingUser); {ok, Term} -> set_global(Name, Term, ActingUser); error -> {error_string, "JSON decoding error"} diff --git a/src/rabbit_vhost_limit.erl b/src/rabbit_vhost_limit.erl index b948a94668..11446d3f20 100644 --- a/src/rabbit_vhost_limit.erl +++ b/src/rabbit_vhost_limit.erl @@ -134,7 +134,7 @@ is_over_queue_limit(VirtualHost) -> parse_set(VHost, Defn, ActingUser) -> Definition = rabbit_data_coercion:to_binary(Defn), - case rabbit_json:try_decode(Definition) of + case rabbit_json:try_decode(Definition, [return_maps]) of {ok, Term} -> set(VHost, maps:to_list(Term), ActingUser); error -> From 9983b0b6961cced4093934334c3ac4a7d33a84e0 Mon Sep 17 00:00:00 2001 From: Daniil Fedotov Date: Thu, 26 Jan 2017 14:09:08 +0000 Subject: [PATCH 2/8] Ignore pre-release version part in plugin version requirement validation --- src/rabbit_plugins.erl | 9 ++++++++- test/plugin_versioning_SUITE.erl | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl index 262f20913f..d5ef35fa62 100644 --- a/src/rabbit_plugins.erl +++ b/src/rabbit_plugins.erl @@ -340,7 +340,10 @@ check_plugins_versions(PluginName, AllPlugins, RequiredVersions) -> is_version_supported("", _) -> true; is_version_supported("0.0.0", _) -> true; is_version_supported(_Version, []) -> true; -is_version_supported(Version, ExpectedVersions) -> +is_version_supported(VersionFull, ExpectedVersions) -> + %% Pre-release version should be supported in plugins, + %% therefore alpha part should be removed + Version = remove_version_alpha_part(VersionFull), case lists:any(fun(ExpectedVersion) -> rabbit_misc:version_minor_equivalent(ExpectedVersion, Version) andalso @@ -351,6 +354,10 @@ is_version_supported(Version, ExpectedVersions) -> false -> false end. +remove_version_alpha_part(Version) -> + {Ver, _Alpha} = rabbit_semver:parse(Version), + iolist_to_binary(rabbit_semver:format({Ver, {[], []}})). + clean_plugins(Plugins) -> {ok, ExpandDir} = application:get_env(rabbit, plugins_expand_dir), [clean_plugin(Plugin, ExpandDir) || Plugin <- Plugins]. diff --git a/test/plugin_versioning_SUITE.erl b/test/plugin_versioning_SUITE.erl index 9c000557b8..e184aeac64 100644 --- a/test/plugin_versioning_SUITE.erl +++ b/test/plugin_versioning_SUITE.erl @@ -81,6 +81,8 @@ version_support(_Config) -> ,{["3.5.2", "3.6.1"], "3.6.2.999", true} %% x.y.z.p values are supported ,{["3.5.2", "3.6.2.333"], "3.6.2.999", true} %% x.y.z.p values are supported ,{["3.5.2", "3.6.2.333"], "3.6.2.222", false} %% x.y.z.p values are supported + ,{["3.6.0", "3.7.0"], "3.6.3-alpha.1", true} %% Pre-release versions handled like semver part + ,{["3.6.0", "3.7.0"], "3.7.0-alpha.89", true} ], lists:foreach( From a235f2c99c1aa545f5f760bab7f02a1815fd73a5 Mon Sep 17 00:00:00 2001 From: Daniil Fedotov Date: Thu, 26 Jan 2017 15:14:12 +0000 Subject: [PATCH 3/8] Rename "alpha" to "preview" in version comment --- src/rabbit_plugins.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl index d5ef35fa62..994e027eac 100644 --- a/src/rabbit_plugins.erl +++ b/src/rabbit_plugins.erl @@ -342,8 +342,8 @@ is_version_supported("0.0.0", _) -> true; is_version_supported(_Version, []) -> true; is_version_supported(VersionFull, ExpectedVersions) -> %% Pre-release version should be supported in plugins, - %% therefore alpha part should be removed - Version = remove_version_alpha_part(VersionFull), + %% therefore preview part should be removed + Version = remove_version_preview_part(VersionFull), case lists:any(fun(ExpectedVersion) -> rabbit_misc:version_minor_equivalent(ExpectedVersion, Version) andalso @@ -354,8 +354,8 @@ is_version_supported(VersionFull, ExpectedVersions) -> false -> false end. -remove_version_alpha_part(Version) -> - {Ver, _Alpha} = rabbit_semver:parse(Version), +remove_version_preview_part(Version) -> + {Ver, _Preview} = rabbit_semver:parse(Version), iolist_to_binary(rabbit_semver:format({Ver, {[], []}})). clean_plugins(Plugins) -> From d2be09c346b6745545496f45b54350bf616435c9 Mon Sep 17 00:00:00 2001 From: Gabriele Santomaggio Date: Fri, 27 Jan 2017 21:57:05 +0100 Subject: [PATCH 4/8] Add Reason to error handler --- src/rabbit_policy.erl | 5 +++-- src/rabbit_runtime_parameters.erl | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index cf65665874..3d8851369e 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -223,8 +223,9 @@ parse_set0(Type, VHost, Name, Pattern, Defn, Priority, ApplyTo, ActingUser) -> {<<"priority">>, Priority}, {<<"apply-to">>, ApplyTo}], ActingUser); - error -> - {error_string, "JSON decoding error"} + {error, Reason} -> + {error_string, + rabbit_misc:format("JSON decoding error. Reason: ~ts", [Reason])} end. set_op(VHost, Name, Pattern, Definition, Priority, ApplyTo, ActingUser) -> diff --git a/src/rabbit_runtime_parameters.erl b/src/rabbit_runtime_parameters.erl index b29cddcc45..4a3be9ffae 100644 --- a/src/rabbit_runtime_parameters.erl +++ b/src/rabbit_runtime_parameters.erl @@ -108,7 +108,9 @@ parse_set(VHost, Component, Name, String, User) -> case rabbit_json:try_decode(Definition, [return_maps]) of {ok, Term} when is_map(Term) -> set(VHost, Component, Name, maps:to_list(Term), User); {ok, Term} -> set(VHost, Component, Name, Term, User); - error -> {error_string, "JSON decoding error"} + {error, Reason} -> + {error_string, + rabbit_misc:format("JSON decoding error. Reason: ~ts", [Reason])} end. set(_, <<"policy">>, _, _, _) -> @@ -121,7 +123,9 @@ parse_set_global(Name, String, ActingUser) -> case rabbit_json:try_decode(Definition, [return_maps]) of {ok, Term} when is_map(Term) -> set_global(Name, maps:to_list(Term), ActingUser); {ok, Term} -> set_global(Name, Term, ActingUser); - error -> {error_string, "JSON decoding error"} + {error, Reason} -> + {error_string, + rabbit_misc:format("JSON decoding error. Reason: ~ts", [Reason])} end. set_global(Name, Term, ActingUser) -> From 40cdcf956c602666b476061e5d1621ccbdf342c3 Mon Sep 17 00:00:00 2001 From: Gabriele Santomaggio Date: Fri, 27 Jan 2017 21:59:43 +0100 Subject: [PATCH 5/8] Add Reason to error handler --- src/rabbit_vhost_limit.erl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rabbit_vhost_limit.erl b/src/rabbit_vhost_limit.erl index 11446d3f20..0181e300c3 100644 --- a/src/rabbit_vhost_limit.erl +++ b/src/rabbit_vhost_limit.erl @@ -137,8 +137,9 @@ parse_set(VHost, Defn, ActingUser) -> case rabbit_json:try_decode(Definition, [return_maps]) of {ok, Term} -> set(VHost, maps:to_list(Term), ActingUser); - error -> - {error_string, "JSON decoding error"} + {error, Reason} -> + {error_string, + rabbit_misc:format("JSON decoding error. Reason: ~ts", [Reason])} end. set(VHost, Defn, ActingUser) -> From 288ab084198212282d419eb78ccfd91c1c4108b6 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Wed, 1 Feb 2017 17:45:07 +0300 Subject: [PATCH 6/8] Switch to rabbit_json:try_decode/1 --- src/rabbit_policy.erl | 2 +- src/rabbit_runtime_parameters.erl | 4 ++-- src/rabbit_vhost_limit.erl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index 3d8851369e..c4fbf1c830 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -215,7 +215,7 @@ parse_set(Type, VHost, Name, Pattern, Definition, Priority, ApplyTo, ActingUser) end. parse_set0(Type, VHost, Name, Pattern, Defn, Priority, ApplyTo, ActingUser) -> - case rabbit_json:try_decode(Defn, [return_maps]) of + case rabbit_json:try_decode(Defn) of {ok, Term} -> set0(Type, VHost, Name, [{<<"pattern">>, Pattern}, diff --git a/src/rabbit_runtime_parameters.erl b/src/rabbit_runtime_parameters.erl index 4a3be9ffae..64442142da 100644 --- a/src/rabbit_runtime_parameters.erl +++ b/src/rabbit_runtime_parameters.erl @@ -105,7 +105,7 @@ parse_set(_, <<"policy">>, _, _, _) -> {error_string, "policies may not be set using this method"}; parse_set(VHost, Component, Name, String, User) -> Definition = rabbit_data_coercion:to_binary(String), - case rabbit_json:try_decode(Definition, [return_maps]) of + case rabbit_json:try_decode(Definition) of {ok, Term} when is_map(Term) -> set(VHost, Component, Name, maps:to_list(Term), User); {ok, Term} -> set(VHost, Component, Name, Term, User); {error, Reason} -> @@ -120,7 +120,7 @@ set(VHost, Component, Name, Term, User) -> parse_set_global(Name, String, ActingUser) -> Definition = rabbit_data_coercion:to_binary(String), - case rabbit_json:try_decode(Definition, [return_maps]) of + case rabbit_json:try_decode(Definition) of {ok, Term} when is_map(Term) -> set_global(Name, maps:to_list(Term), ActingUser); {ok, Term} -> set_global(Name, Term, ActingUser); {error, Reason} -> diff --git a/src/rabbit_vhost_limit.erl b/src/rabbit_vhost_limit.erl index 0181e300c3..d0c775f0bd 100644 --- a/src/rabbit_vhost_limit.erl +++ b/src/rabbit_vhost_limit.erl @@ -134,7 +134,7 @@ is_over_queue_limit(VirtualHost) -> parse_set(VHost, Defn, ActingUser) -> Definition = rabbit_data_coercion:to_binary(Defn), - case rabbit_json:try_decode(Definition, [return_maps]) of + case rabbit_json:try_decode(Definition) of {ok, Term} -> set(VHost, maps:to_list(Term), ActingUser); {error, Reason} -> From ff70e180a31c0c57304de9683c38c13fd7e49995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Thu, 2 Feb 2017 17:16:47 +0100 Subject: [PATCH 7/8] Update rabbitmq-components.mk --- rabbitmq-components.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 3dbd6af30d..fdabf1ac11 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -100,7 +100,7 @@ dep_rabbitmq_public_umbrella = git_rmq rabbitmq-public-umbrella $(curre # all projects use the same versions. It avoids conflicts and makes it # possible to work with rabbitmq-public-umbrella. -dep_cowboy_commit = 1.0.4 +dep_cowboy_commit = 1.1.0 dep_mochiweb = git git://github.com/basho/mochiweb.git v2.9.0p2 dep_ranch_commit = 1.3.1 dep_webmachine_commit = 1.10.8p2 From 8a5387ffed36c9b85e10574f11549c118df7b8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Fri, 3 Feb 2017 13:19:40 +0100 Subject: [PATCH 8/8] rabbit_ssl: Move most functions to `rabbit_cert_info` in rabbitmq-common Those functions do not depend on the broker itself, so they are safe to be moved to rabbitmq-common. Those functions are used by rabbitmq-erlang-client. So moving them resolves one more dependency of the client on the broker. [#118490793] --- src/rabbit_ssl.erl | 228 ++------------------------------------------- 1 file changed, 9 insertions(+), 219 deletions(-) diff --git a/src/rabbit_ssl.erl b/src/rabbit_ssl.erl index ac9fb204d0..6a87d93a29 100644 --- a/src/rabbit_ssl.erl +++ b/src/rabbit_ssl.erl @@ -11,13 +11,11 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_ssl). --include("rabbit.hrl"). - -include_lib("public_key/include/public_key.hrl"). -export([peer_cert_issuer/1, peer_cert_subject/1, peer_cert_validity/1]). @@ -27,15 +25,7 @@ -export_type([certificate/0]). --type certificate() :: binary(). - --spec peer_cert_issuer(certificate()) -> string(). --spec peer_cert_subject(certificate()) -> string(). --spec peer_cert_validity(certificate()) -> string(). --spec peer_cert_subject_items - (certificate(), tuple()) -> [string()] | 'not_found'. --spec peer_cert_auth_name - (certificate()) -> binary() | 'not_found' | 'unsafe'. +-type certificate() :: rabbit_cert_info:certificate(). %%-------------------------------------------------------------------------- %% High-level functions used by reader @@ -43,38 +33,24 @@ %% Return a string describing the certificate's issuer. peer_cert_issuer(Cert) -> - cert_info(fun(#'OTPCertificate' { - tbsCertificate = #'OTPTBSCertificate' { - issuer = Issuer }}) -> - format_rdn_sequence(Issuer) - end, Cert). + rabbit_cert_info:issuer(Cert). %% Return a string describing the certificate's subject, as per RFC4514. peer_cert_subject(Cert) -> - cert_info(fun(#'OTPCertificate' { - tbsCertificate = #'OTPTBSCertificate' { - subject = Subject }}) -> - format_rdn_sequence(Subject) - end, Cert). + rabbit_cert_info:subject(Cert). %% Return the parts of the certificate's subject. peer_cert_subject_items(Cert, Type) -> - cert_info(fun(#'OTPCertificate' { - tbsCertificate = #'OTPTBSCertificate' { - subject = Subject }}) -> - find_by_type(Type, Subject) - end, Cert). + rabbit_cert_info:subject_items(Cert, Type). %% Return a string describing the certificate's validity. peer_cert_validity(Cert) -> - cert_info(fun(#'OTPCertificate' { - tbsCertificate = #'OTPTBSCertificate' { - validity = {'Validity', Start, End} }}) -> - rabbit_misc:format("~s - ~s", [format_asn1_value(Start), - format_asn1_value(End)]) - end, Cert). + rabbit_cert_info:validity(Cert). %% Extract a username from the certificate +-spec peer_cert_auth_name + (certificate()) -> binary() | 'not_found' | 'unsafe'. + peer_cert_auth_name(Cert) -> {ok, Mode} = application:get_env(rabbit, ssl_cert_login_from), peer_cert_auth_name(Mode, Cert). @@ -106,189 +82,3 @@ auth_config_sane() -> "disabled, verify=~p~n", [V]), false end. - -%%-------------------------------------------------------------------------- - -cert_info(F, Cert) -> - F(case public_key:pkix_decode_cert(Cert, otp) of - {ok, DecCert} -> DecCert; %%pre R14B - DecCert -> DecCert %%R14B onwards - end). - -find_by_type(Type, {rdnSequence, RDNs}) -> - case [V || #'AttributeTypeAndValue'{type = T, value = V} - <- lists:flatten(RDNs), - T == Type] of - [] -> not_found; - L -> [format_asn1_value(V) || V <- L] - end. - -%%-------------------------------------------------------------------------- -%% Formatting functions -%%-------------------------------------------------------------------------- - -%% Format and rdnSequence as a RFC4514 subject string. -format_rdn_sequence({rdnSequence, Seq}) -> - string:join(lists:reverse([format_complex_rdn(RDN) || RDN <- Seq]), ","). - -%% Format an RDN set. -format_complex_rdn(RDNs) -> - string:join([format_rdn(RDN) || RDN <- RDNs], "+"). - -%% Format an RDN. If the type name is unknown, use the dotted decimal -%% representation. See RFC4514, section 2.3. -format_rdn(#'AttributeTypeAndValue'{type = T, value = V}) -> - FV = escape_rdn_value(format_asn1_value(V)), - Fmts = [{?'id-at-surname' , "SN"}, - {?'id-at-givenName' , "GIVENNAME"}, - {?'id-at-initials' , "INITIALS"}, - {?'id-at-generationQualifier' , "GENERATIONQUALIFIER"}, - {?'id-at-commonName' , "CN"}, - {?'id-at-localityName' , "L"}, - {?'id-at-stateOrProvinceName' , "ST"}, - {?'id-at-organizationName' , "O"}, - {?'id-at-organizationalUnitName' , "OU"}, - {?'id-at-title' , "TITLE"}, - {?'id-at-countryName' , "C"}, - {?'id-at-serialNumber' , "SERIALNUMBER"}, - {?'id-at-pseudonym' , "PSEUDONYM"}, - {?'id-domainComponent' , "DC"}, - {?'id-emailAddress' , "EMAILADDRESS"}, - {?'street-address' , "STREET"}, - {{0,9,2342,19200300,100,1,1} , "UID"}], %% Not in public_key.hrl - case proplists:lookup(T, Fmts) of - {_, Fmt} -> - rabbit_misc:format(Fmt ++ "=~s", [FV]); - none when is_tuple(T) -> - TypeL = [rabbit_misc:format("~w", [X]) || X <- tuple_to_list(T)], - rabbit_misc:format("~s=~s", [string:join(TypeL, "."), FV]); - none -> - rabbit_misc:format("~p=~s", [T, FV]) - end. - -%% Escape a string as per RFC4514. -escape_rdn_value(V) -> - escape_rdn_value(V, start). - -escape_rdn_value([], _) -> - []; -escape_rdn_value([C | S], start) when C =:= $ ; C =:= $# -> - [$\\, C | escape_rdn_value(S, middle)]; -escape_rdn_value(S, start) -> - escape_rdn_value(S, middle); -escape_rdn_value([$ ], middle) -> - [$\\, $ ]; -escape_rdn_value([C | S], middle) when C =:= $"; C =:= $+; C =:= $,; C =:= $;; - C =:= $<; C =:= $>; C =:= $\\ -> - [$\\, C | escape_rdn_value(S, middle)]; -escape_rdn_value([C | S], middle) when C < 32 ; C >= 126 -> - %% Of ASCII characters only U+0000 needs escaping, but for display - %% purposes it's handy to escape all non-printable chars. All non-ASCII - %% characters get converted to UTF-8 sequences and then escaped. We've - %% already got a UTF-8 sequence here, so just escape it. - rabbit_misc:format("\\~2.16.0B", [C]) ++ escape_rdn_value(S, middle); -escape_rdn_value([C | S], middle) -> - [C | escape_rdn_value(S, middle)]. - -%% Get the string representation of an OTPCertificate field. -format_asn1_value({ST, S}) when ST =:= teletexString; ST =:= printableString; - ST =:= universalString; ST =:= utf8String; - ST =:= bmpString -> - format_directory_string(ST, S); -format_asn1_value({utcTime, [Y1, Y2, M1, M2, D1, D2, H1, H2, - Min1, Min2, S1, S2, $Z]}) -> - rabbit_misc:format("20~c~c-~c~c-~c~cT~c~c:~c~c:~c~cZ", - [Y1, Y2, M1, M2, D1, D2, H1, H2, Min1, Min2, S1, S2]); -%% We appear to get an untagged value back for an ia5string -%% (e.g. domainComponent). -format_asn1_value(V) when is_list(V) -> - V; -format_asn1_value(V) when is_binary(V) -> - %% OTP does not decode some values when combined with an unknown - %% type. That's probably wrong, so as a last ditch effort let's - %% try manually decoding. 'DirectoryString' is semi-arbitrary - - %% but it is the type which covers the various string types we - %% handle below. - try - {ST, S} = public_key:der_decode('DirectoryString', V), - format_directory_string(ST, S) - catch _:_ -> - rabbit_misc:format("~p", [V]) - end; -format_asn1_value(V) -> - rabbit_misc:format("~p", [V]). - -%% DirectoryString { INTEGER : maxSize } ::= CHOICE { -%% teletexString TeletexString (SIZE (1..maxSize)), -%% printableString PrintableString (SIZE (1..maxSize)), -%% bmpString BMPString (SIZE (1..maxSize)), -%% universalString UniversalString (SIZE (1..maxSize)), -%% uTF8String UTF8String (SIZE (1..maxSize)) } -%% -%% Precise definitions of printable / teletexString are hard to come -%% by. This is what I reconstructed: -%% -%% printableString: -%% "intended to represent the limited character sets available to -%% mainframe input terminals" -%% A-Z a-z 0-9 ' ( ) + , - . / : = ? [space] -%% http://msdn.microsoft.com/en-us/library/bb540814(v=vs.85).aspx -%% -%% teletexString: -%% "a sizable volume of software in the world treats TeletexString -%% (T61String) as a simple 8-bit string with mostly Windows Latin 1 -%% (superset of iso-8859-1) encoding" -%% http://www.mail-archive.com/asn1@asn1.org/msg00460.html -%% -%% (However according to that link X.680 actually defines -%% TeletexString in some much more involved and crazy way. I suggest -%% we treat it as ISO-8859-1 since Erlang does not support Windows -%% Latin 1). -%% -%% bmpString: -%% UCS-2 according to RFC 3641. Hence cannot represent Unicode -%% characters above 65535 (outside the "Basic Multilingual Plane"). -%% -%% universalString: -%% UCS-4 according to RFC 3641. -%% -%% utf8String: -%% UTF-8 according to RFC 3641. -%% -%% Within Rabbit we assume UTF-8 encoding. Since printableString is a -%% subset of ASCII it is also a subset of UTF-8. The others need -%% converting. Fortunately since the Erlang SSL library does the -%% decoding for us (albeit into a weird format, see below), we just -%% need to handle encoding into UTF-8. Note also that utf8Strings come -%% back as binary. -%% -%% Note for testing: the default Ubuntu configuration for openssl will -%% only create printableString or teletexString types no matter what -%% you do. Edit string_mask in the [req] section of -%% /etc/ssl/openssl.cnf to change this (see comments there). You -%% probably also need to set utf8 = yes to get it to accept UTF-8 on -%% the command line. Also note I could not get openssl to generate a -%% universalString. - -format_directory_string(printableString, S) -> S; -format_directory_string(teletexString, S) -> utf8_list_from(S); -format_directory_string(bmpString, S) -> utf8_list_from(S); -format_directory_string(universalString, S) -> utf8_list_from(S); -format_directory_string(utf8String, S) -> binary_to_list(S). - -utf8_list_from(S) -> - binary_to_list( - unicode:characters_to_binary(flatten_ssl_list(S), utf32, utf8)). - -%% The Erlang SSL implementation invents its own representation for -%% non-ascii strings - looking like [97,{0,0,3,187}] (that's LATIN -%% SMALL LETTER A followed by GREEK SMALL LETTER LAMDA). We convert -%% this into a list of unicode characters, which we can tell -%% unicode:characters_to_binary is utf32. - -flatten_ssl_list(L) -> [flatten_ssl_list_item(I) || I <- L]. - -flatten_ssl_list_item({A, B, C, D}) -> - A * (1 bsl 24) + B * (1 bsl 16) + C * (1 bsl 8) + D; -flatten_ssl_list_item(N) when is_number (N) -> - N.