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

Add disable sign out field to SAMLP connection options #204

Merged
merged 4 commits into from
Jul 6, 2022
Merged

Add disable sign out field to SAMLP connection options #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41d6a21
Adding disable sign out field to samlp connections
Jun 28, 2022
6e0bfb6
Removing extraneous period
Jun 28, 2022
87b3bcb
Adding metadata_xml and metadata_url to connection schema
Jun 28, 2022
a88f0b8
Adding to tests and documentation
Jun 29, 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
15 changes: 15 additions & 0 deletions auth0/resource_auth0_connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,21 @@ var connectionSchema = map[string]*schema.Schema{
Optional: true,
Description: "SAML single logout URL for the connection.",
},
"disable_sign_out": {
Type: schema.TypeBool,
Optional: true,
Description: "When enabled, will disable sign out.",
},
"metadata_xml": {
Type: schema.TypeString,
Optional: true,
Description: "The XML content for the SAML metadata document.",
},
"metadata_url": {
Type: schema.TypeString,
Optional: true,
Description: "The URL of the SAML metadata document.",
},
"fields_map": {
Type: schema.TypeString,
Optional: true,
Expand Down
12 changes: 12 additions & 0 deletions auth0/resource_auth0_connection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,9 +1337,12 @@ func TestAccConnectionSAML(t *testing.T) {
resource.TestCheckResourceAttr("auth0_connection.my_connection", "show_as_button", "false"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.#", "1"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.sign_out_endpoint", "https://saml.provider/sign_out"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.disable_sign_out", "false"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.entity_id", ""),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.idp_initiated.0.client_authorize_query", "type=code&timeout=30"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.fields_map", "{\"email\":[\"emailaddress\",\"nameidentifier\"],\"family_name\":\"surname\",\"name\":[\"name\",\"nameidentifier\"]}"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.metadata_url", ""),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.metadata_xml", "<?xml version=\"1.0\" encoding=\"utf-8\"?><EntityDescriptor ID=\"_391f377b-78d8-54132-1d47-a130e933bb1c\" entityID=\"https://example.com\" xmlns=\"urn:oasis:names:tc:SAML:2.0:metadata\"></EntityDescriptor>"),
),
},
{
Expand All @@ -1349,8 +1352,11 @@ func TestAccConnectionSAML(t *testing.T) {
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.#", "1"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.idp_initiated.0.client_authorize_query", "type=code&timeout=60"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.sign_out_endpoint", ""),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.disable_sign_out", "true"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.entity_id", "example"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.fields_map", "{\"email\":[\"emailaddress\",\"nameidentifier\"],\"family_name\":\"appelido\",\"name\":[\"name\"]}"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.metadata_url", "https://saml.provider/imi/ns/FederationMetadata.xml"),
resource.TestCheckResourceAttr("auth0_connection.my_connection", "options.0.metadata_xml", ""),
),
},
},
Expand Down Expand Up @@ -1391,6 +1397,7 @@ ZsUkLw2I7zI/dNlWdB8Xp7v+3w9sX5N3J/WuJ1KOO5m26kRlHQo7EzT3974g
EOF
sign_in_endpoint = "https://saml.provider/sign_in"
sign_out_endpoint = "https://saml.provider/sign_out"
disable_sign_out = false
user_id_attribute = "https://saml.provider/imi/ns/identity-200810"
tenant_domain = "example.com"
domain_aliases = ["example.com", "example.coz"]
Expand All @@ -1409,6 +1416,8 @@ EOF
client_protocol = "samlp"
client_authorize_query = "type=code&timeout=30"
}
metadata_xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?><EntityDescriptor ID=\"_391f377b-78d8-54132-1d47-a130e933bb1c\" entityID=\"https://example.com\" xmlns=\"urn:oasis:names:tc:SAML:2.0:metadata\"></EntityDescriptor>"
metadata_url = ""
}
}
`
Expand Down Expand Up @@ -1447,6 +1456,7 @@ ZsUkLw2I7zI/dNlWdB8Xp7v+3w9sX5N3J/WuJ1KOO5m26kRlHQo7EzT3974g
EOF
sign_in_endpoint = "https://saml.provider/sign_in"
sign_out_endpoint = ""
disable_sign_out = true
tenant_domain = "example.com"
domain_aliases = ["example.com", "example.coz"]
protocol_binding = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
Expand All @@ -1463,6 +1473,8 @@ EOF
client_protocol = "samlp"
client_authorize_query = "type=code&timeout=60"
}
metadata_xml = ""
metadata_url = "https://saml.provider/imi/ns/FederationMetadata.xml"
}
}
`
6 changes: 6 additions & 0 deletions auth0/structure_auth0_connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ func flattenConnectionOptionsSAML(options *management.ConnectionOptionsSAML) (in
"domain_aliases": options.DomainAliases,
"sign_in_endpoint": options.GetSignInEndpoint(),
"sign_out_endpoint": options.GetSignOutEndpoint(),
"disable_sign_out": options.GetDisableSignOut(),
"signature_algorithm": options.GetSignatureAlgorithm(),
"digest_algorithm": options.GetDigestAglorithm(),
"sign_saml_request": options.GetSignSAMLRequest(),
Expand All @@ -356,6 +357,8 @@ func flattenConnectionOptionsSAML(options *management.ConnectionOptionsSAML) (in
"set_user_root_attributes": options.GetSetUserAttributes(),
"non_persistent_attrs": options.GetNonPersistentAttrs(),
"entity_id": options.GetEntityID(),
"metadata_url": options.GetMetadataURL(),
"metadata_xml": options.GetMetadataXML(),
}

fieldsMap, err := structure.FlattenJsonToString(options.FieldsMap)
Expand Down Expand Up @@ -782,6 +785,7 @@ func expandConnectionOptionsSAML(d ResourceData) (*management.ConnectionOptionsS
DomainAliases: Set(d, "domain_aliases").List(),
SignInEndpoint: String(d, "sign_in_endpoint"),
SignOutEndpoint: String(d, "sign_out_endpoint"),
DisableSignOut: Bool(d, "disable_sign_out"),
SignatureAlgorithm: String(d, "signature_algorithm"),
DigestAglorithm: String(d, "digest_algorithm"),
SignSAMLRequest: Bool(d, "sign_saml_request"),
Expand All @@ -791,6 +795,8 @@ func expandConnectionOptionsSAML(d ResourceData) (*management.ConnectionOptionsS
SetUserAttributes: String(d, "set_user_root_attributes"),
NonPersistentAttrs: castToListOfStrings(Set(d, "non_persistent_attrs").List()),
EntityID: String(d, "entity_id"),
MetadataXML: String(d, "metadata_xml"),
MetadataURL: String(d, "metadata_url"),
}

var err error
Expand Down
Loading