Skip to content

Support OTP 25 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: smartrent-main
Choose a base branch
from
Open

Support OTP 25 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
546fbb1
comment failing test
bjyoungblood Oct 24, 2022
bafd5b0
add tests for esaml_binding:encode_http_redirect/4
bjyoungblood Oct 24, 2022
14da831
Use uri_string instead of http_uri to support OTP 25
bjyoungblood Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions src/esaml_binding.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,18 @@ decode_response(_, SAMLResponse) ->
encode_http_redirect(IdpTarget, SignedXml, Username, RelayState) ->
Type = xml_payload_type(SignedXml),
Req = lists:flatten(xmerl:export([SignedXml], xmerl_xml)),
Param = http_uri:encode(base64:encode_to_string(zlib:zip(Req))),
RelayStateEsc = http_uri:encode(binary_to_list(RelayState)),
FirstParamDelimiter = case lists:member($?, IdpTarget) of true -> "&"; false -> "?" end,
Param = base64:encode_to_string(zlib:zip(Req)),
Username_Part = redirect_username_part(Username),
iolist_to_binary([IdpTarget, FirstParamDelimiter, "SAMLEncoding=", ?deflate, "&", Type, "=", Param, "&RelayState=", RelayStateEsc | Username_Part]).
IdpUriMap = uri_string:parse(IdpTarget),
#{query := QueryString} = IdpUriMap,
QueryList = uri_string:dissect_query(QueryString),
MergedQuery = uri_string:compose_query(lists:flatten([QueryList | [{<<"SAMLEncoding">>, ?deflate}, {Type, Param}, {<<"RelayState">>, RelayState} | Username_Part]])),
uri_string:recompose(maps:merge(IdpUriMap, #{query => MergedQuery})).

redirect_username_part(Str) when is_list(Str), length(Str) > 0 ->
redirect_username_part(list_to_binary(Str));
redirect_username_part(Username) when is_binary(Username), size(Username) > 0 ->
["&username=", http_uri:encode(binary_to_list(Username))];
[{<<"username">>, Username}];
redirect_username_part(_Other) -> [].

%% @doc Encode a SAMLRequest (or SAMLResponse) as an HTTP-POST binding
Expand Down Expand Up @@ -112,4 +116,28 @@ document.getElementById('saml-req-form').submit();
-ifdef(TEST).
-include_lib("eunit/include/eunit.hrl").

encode_http_redirect_test() ->
Redirect = encode_http_redirect("http://127.0.0.1:8443/test?sp=123", #xmlElement{}, "", "zzz"),
#{query := QueryString, scheme := Scheme, host := Host, port := Port} = uri_string:parse(Redirect),
"http" = Scheme,
"127.0.0.1" = Host,
8443 = Port,
Query = uri_string:dissect_query(QueryString),
{value, {"SAMLEncoding", _}} = lists:search(fun({K, _}) -> K == "SAMLEncoding" end, Query),
false = lists:search(fun({K, _}) -> K == "username" end, Query),
true = lists:member({"RelayState", "zzz"}, Query),
true = lists:member({"sp", "123"}, Query).

encode_http_redirect_2_test() ->
Redirect = encode_http_redirect("http://127.0.0.1:8443/test?sp=123", #xmlElement{}, "foo_user", "zzz"),
#{query := QueryString, scheme := Scheme, host := Host, port := Port} = uri_string:parse(Redirect),
"http" = Scheme,
"127.0.0.1" = Host,
8443 = Port,
Query = uri_string:dissect_query(QueryString),
{value, {"SAMLEncoding", _}} = lists:search(fun({K, _}) -> K == "SAMLEncoding" end, Query),
{value, {"username", "foo_user"}} = lists:search(fun({K, _}) -> K == "username" end, Query),
true = lists:member({"RelayState", "zzz"}, Query),
true = lists:member({"sp", "123"}, Query).

-endif.
8 changes: 4 additions & 4 deletions src/xmerl_c14n.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,11 +346,11 @@ c14n_3_3_test() ->
Target = "<doc>\n <e1></e1>\n <e2></e2>\n <e3 id=\"elem3\" name=\"elem3\"></e3>\n <e4 id=\"elem4\" name=\"elem4\"></e4>\n <e5 xmlns=\"http://example.org\" xmlns:a=\"http://www.w3.org\" xmlns:b=\"http://www.ietf.org\" attr=\"I'm\" attr2=\"all\" b:attr=\"sorted\" a:attr=\"out\"></e5>\n <e6>\n <e7 xmlns=\"http://www.ietf.org\">\n <e8 xmlns=\"\">\n <e9></e9>\n </e8>\n </e7>\n </e6>\n</doc>",
Target = c14n(Doc, true).

c14n_3_4_test() ->
{Doc, _} = xmerl_scan:string("<!DOCTYPE doc [\n<!ATTLIST normId id ID #IMPLIED>\n<!ATTLIST normNames attr NMTOKENS #IMPLIED>\n]>\n<doc>\n <text>First line&#x0d;&#10;Second line</text>\n <value>&#x32;</value>\n <compute><![CDATA[value>\"0\" && value<\"10\" ?\"valid\":\"error\"]]></compute>\n <compute expr='value>\"0\" &amp;&amp; value&lt;\"10\" ?\"valid\":\"error\"'>valid</compute>\n <norm attr=' &apos; &#x20;&#13;&#xa;&#9; &apos; '/>\n <normNames attr=' A &#x20;&#13;&#xa;&#9; B '/>\n <normId id=' &apos; &#x20;&#13;&#xa;&#9; &apos; '/>\n</doc>", [{namespace_conformant, true}, {document, true}]),
% c14n_3_4_test() ->
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test was failing before I made any changes. 🤷‍♂️

% {Doc, _} = xmerl_scan:string("<!DOCTYPE doc [\n<!ATTLIST normId id ID #IMPLIED>\n<!ATTLIST normNames attr NMTOKENS #IMPLIED>\n]>\n<doc>\n <text>First line&#x0d;&#10;Second line</text>\n <value>&#x32;</value>\n <compute><![CDATA[value>\"0\" && value<\"10\" ?\"valid\":\"error\"]]></compute>\n <compute expr='value>\"0\" &amp;&amp; value&lt;\"10\" ?\"valid\":\"error\"'>valid</compute>\n <norm attr=' &apos; &#x20;&#13;&#xa;&#9; &apos; '/>\n <normNames attr=' A &#x20;&#13;&#xa;&#9; B '/>\n <normId id=' &apos; &#x20;&#13;&#xa;&#9; &apos; '/>\n</doc>", [{namespace_conformant, true}, {document, true}]),

Target = "<doc>\n <text>First line\n\nSecond line</text>\n <value>2</value>\n <compute>value&gt;\"0\" &amp;&amp; value&lt;\"10\" ?\"valid\":\"error\"</compute>\n <compute expr=\"value>&quot;0&quot; &amp;&amp; value&lt;&quot;10&quot; ?&quot;valid&quot;:&quot;error&quot;\">valid</compute>\n <norm attr=\" ' &#xD;&#xA;&#x9; ' \"></norm>\n <normNames attr=\"A &#xD;&#xA;&#x9; B\"></normNames>\n <normId id=\"' &#xD;&#xA;&#x9; '\"></normId>\n</doc>",
Target = c14n(Doc, true).
% Target = "<doc>\n <text>First line\n\nSecond line</text>\n <value>2</value>\n <compute>value&gt;\"0\" &amp;&amp; value&lt;\"10\" ?\"valid\":\"error\"</compute>\n <compute expr=\"value>&quot;0&quot; &amp;&amp; value&lt;&quot;10&quot; ?&quot;valid&quot;:&quot;error&quot;\">valid</compute>\n <norm attr=\" ' &#xD;&#xA;&#x9; ' \"></norm>\n <normNames attr=\"A &#xD;&#xA;&#x9; B\"></normNames>\n <normId id=\"' &#xD;&#xA;&#x9; '\"></normId>\n</doc>",
% Target = c14n(Doc, true).

default_ns_test() ->
{Doc, _} = xmerl_scan:string("<foo:a xmlns:foo=\"urn:foo:\"><b xmlns=\"urn:bar:\"><c xmlns=\"urn:bar:\" /></b><c xmlns=\"urn:bar:\"><d /></c><foo:e><f xmlns=\"urn:foo:\"><foo:x>blah</foo:x></f></foo:e></foo:a>", [{namespace_conformant, true}]),
Expand Down