Skip to content
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

Jump to bottom

Extract all bindings and support multiple certificates when decoding idp metadata #26

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Extract all bindings and support multiple certificates when decoding idp metadata #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c69bc57
extract all bindings in esaml:decode_idp_metadata/1
srenatus Jun 21, 2016
eddded6
extract multiple certificates from IdP metadata
srenatus Jun 21, 2016
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
6 changes: 4 additions & 2 deletions include/esaml.hrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@
org = #esaml_org{} :: esaml:org(),
tech = #esaml_contact{} :: esaml:contact(),
signed_requests = true :: boolean(),
certificate :: binary() | undefined,
certificates :: [binary()] | undefined,
entity_id = "" :: string(),
login_location = "" :: string(),
login_location_post :: string(),
login_location_redirect :: string(),
login_location_artifact :: string(),
logout_location :: string() | undefined,
name_format = unknown :: esaml:name_format()}).

Expand Down
40 changes: 36 additions & 4 deletions src/esaml.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,28 @@ decode_idp_metadata(Xml) ->
{"ds", 'http://www.w3.org/2000/09/xmldsig#'}],
esaml_util:threaduntil([
?xpath_attr_required("/md:EntityDescriptor/@entityID", esaml_idp_metadata, entity_id, bad_entity),
?xpath_attr_required("/md:EntityDescriptor/md:IDPSSODescriptor/md:SingleSignOnService[@Binding='urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST']/@Location",
esaml_idp_metadata, login_location, missing_sso_location),
?xpath_attr("/md:EntityDescriptor/md:IDPSSODescriptor/md:SingleSignOnService[@Binding='urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST']/@Location",
esaml_idp_metadata, login_location_post),
?xpath_attr("/md:EntityDescriptor/md:IDPSSODescriptor/md:SingleSignOnService[@Binding='urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect']/@Location",
esaml_idp_metadata, login_location_redirect),
?xpath_attr("/md:EntityDescriptor/md:IDPSSODescriptor/md:SingleSignOnService[@Binding='urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact']/@Location",
esaml_idp_metadata, login_location_artifact),
?xpath_attr("/md:EntityDescriptor/md:IDPSSODescriptor/md:SingleLogoutService[@Binding='urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST']/@Location",
esaml_idp_metadata, logout_location),
?xpath_text("/md:EntityDescriptor/md:IDPSSODescriptor/md:NameIDFormat/text()",
esaml_idp_metadata, name_format, fun nameid_map/1),
?xpath_text("/md:EntityDescriptor/md:IDPSSODescriptor/md:KeyDescriptor[@use='signing']/ds:KeyInfo/ds:X509Data/ds:X509Certificate/text()", esaml_idp_metadata, certificate, fun(X) -> base64:decode(list_to_binary(X)) end),
?xpath_text_multiple("/md:EntityDescriptor/md:IDPSSODescriptor/md:KeyDescriptor[@use='signing']/ds:KeyInfo/ds:X509Data/ds:X509Certificate/text()", esaml_idp_metadata, certificates, fun(X) -> base64:decode(erlang:list_to_binary(X)) end),
?xpath_recurse("/md:EntityDescriptor/md:ContactPerson[@contactType='technical']", esaml_idp_metadata, tech, decode_contact),
?xpath_recurse("/md:EntityDescriptor/md:Organization", esaml_idp_metadata, org, decode_org)
?xpath_recurse("/md:EntityDescriptor/md:Organization", esaml_idp_metadata, org, decode_org),
fun check_at_least_one_binding/1
], #esaml_idp_metadata{}).

check_at_least_one_binding(#esaml_idp_metadata{login_location_post = undefined,
login_location_redirect = undefined,
login_location_artifact = undefined}) ->
{error, missing_sso_location};
check_at_least_one_binding(M) -> M.

%% @private
-spec decode_org(Xml :: #xmlElement{}) -> {ok, #esaml_org{}} | {error, term()}.
decode_org(Xml) ->
Expand Down Expand Up @@ -636,4 +647,25 @@ validate_stale_assertion_test() ->
}),
{error, stale_assertion} = validate_assertion(E1, "foobar", "foo").

decode_idp_metadata_with_multiple_bindings_test() ->
{Doc, _} = xmerl_scan:file("../test/data/okta_metadata.xml"),
{ok, IdP} = decode_idp_metadata(Doc),
#esaml_idp_metadata{login_location_post = "https://dev-xxx.okta.com/somehash/sso/saml_post"} = IdP,
#esaml_idp_metadata{login_location_redirect = "https://dev-xxx.okta.com/somehash/sso/saml_redirect"} = IdP,
#esaml_idp_metadata{login_location_artifact = "https://dev-xxx.okta.com/somehash/sso/saml_artifact"} = IdP.

decode_idp_metadata_with_one_certificate_only_test() ->
{Doc, _} = xmerl_scan:file("../test/data/okta_metadata.xml"),
{ok, IdP} = decode_idp_metadata(Doc),
[Cert] = IdP#esaml_idp_metadata.certificates,
true = Cert =/= undefined.

decode_idp_metadata_with_multiple_certificates_test() ->
{Doc, _} = xmerl_scan:file("../test/data/azure_metadata.xml"),
{ok, IdP} = decode_idp_metadata(Doc),
[Cert, AnotherCert|_] = IdP#esaml_idp_metadata.certificates,
true = Cert =/= undefined,
true = AnotherCert =/= undefined,
true = Cert =/= AnotherCert.

-endif.
16 changes: 15 additions & 1 deletion src/xmerl_xpath_macros.hrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@
end
end).

-define(xpath_generic_multiple(XPath, Record, Field, TransFun, TargetType, NotFoundRet),
fun(Resp) ->
case xmerl_xpath:string(XPath, Xml, [{namespace, Ns}]) of
[_|_] = List ->
Resp#Record{Field = lists:map(TransFun, [V || #TargetType{value = V} <- List])};
_ -> NotFoundRet
end
end).

-define(xpath_generic(XPath, Record, Field, TargetType, NotFoundRet),
fun(Resp) ->
case xmerl_xpath:string(XPath, Xml, [{namespace, Ns}]) of
Expand All @@ -37,6 +46,11 @@
-define(xpath_text(XPath, Record, Field, TransFun),
?xpath_generic(XPath, Record, Field, TransFun, xmlText, Resp)).

-define(xpath_text_multiple(XPath, Record, Field),
?xpath_generic_multiple(XPath, Record, Field, xmlText, Resp)).
-define(xpath_text_multiple(XPath, Record, Field, TransFun),
?xpath_generic_multiple(XPath, Record, Field, TransFun, xmlText, Resp)).

-define(xpath_text_required(XPath, Record, Field, Error),
?xpath_generic(XPath, Record, Field, xmlText, {error, Error})).
-define(xpath_text_required(XPath, Record, Field, TransFun, Error),
Expand All @@ -60,4 +74,4 @@
end;
_ -> Resp
end
end).
end).
Loading