Skip to content

Commit

Permalink
[NOISSUE]
Browse files Browse the repository at this point in the history 
add tests
add clear
  • Loading branch information
@jj
jj committed Feb 26, 2019
1 parent adc19bf commit 2338269
Show file tree
Hide file tree
Showing 2 changed files with 316 additions and 1 deletion.
2 changes: 2 additions & 0 deletions ...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -322,6 +323,7 @@ void setupSPSSODescriptor(EntityDescriptor ed, EntityDescriptorRepresentation re
if (representation.getServiceProviderSsoDescriptor() != null) {
SPSSODescriptor spssoDescriptor = getSPSSODescriptorFromEntityDescriptor(ed);

spssoDescriptor.setSupportedProtocols(Collections.EMPTY_LIST);
if (!Strings.isNullOrEmpty(representation.getServiceProviderSsoDescriptor().getProtocolSupportEnum())) {
spssoDescriptor.setSupportedProtocols(
Arrays.stream(representation.getServiceProviderSsoDescriptor().getProtocolSupportEnum().split(",")).map(p -> MDDCConstants.PROTOCOL_BINDINGS.get(p.trim())).collect(Collectors.toList())
Expand Down
315 changes: 314 additions & 1 deletion ...net2/tier/shibboleth/admin/ui/service/AuxiliaryJPAEntityDescriptorServiceImplTests.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
package edu.internet2.tier.shibboleth.admin.ui.service

import edu.internet2.tier.shibboleth.admin.ui.domain.ContactPerson
import edu.internet2.tier.shibboleth.admin.ui.domain.EmailAddress
import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor
import edu.internet2.tier.shibboleth.admin.ui.domain.GivenName
import edu.internet2.tier.shibboleth.admin.ui.domain.NameIDFormat
import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor
import edu.internet2.tier.shibboleth.admin.ui.domain.SingleLogoutService
import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation
import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation
import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.LogoutEndpointRepresentation
import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ServiceProviderSsoDescriptorRepresentation
import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
import org.opensaml.saml.common.xml.SAMLConstants
import org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration
import spock.lang.Shared
import spock.lang.Specification
import spock.lang.Unroll
Expand Down Expand Up @@ -38,7 +46,7 @@ class AuxiliaryJPAEntityDescriptorServiceImplTests extends Specification {
assert starter == expected

where:
[method, description, representation, starter, expected] << Data.getData(openSAMLObjects)
[method, description, representation, starter, expected] << Data.getData(openSAMLObjects)
}

static class Data {
Expand Down Expand Up @@ -138,6 +146,311 @@ class AuxiliaryJPAEntityDescriptorServiceImplTests extends Specification {
it
},
)
data << new DataField(
method: 'setupContacts',
description: 'add contact to empty descriptor',
representation: new EntityDescriptorRepresentation().with {
it.contacts = [new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test', displayName: 'displayName', url: 'http://url')]
it
},
starter: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class),
expected: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.contactPersons = [openSAMLObjects.buildDefaultInstanceOfType(ContactPerson.class).with {
it.type = ContactPersonTypeEnumeration.ADMINISTRATIVE
it.givenName = openSAMLObjects.buildDefaultInstanceOfType(GivenName.class).with {
it.name = 'name'
it
}
it.emailAddresses.add(openSAMLObjects.buildDefaultInstanceOfType(EmailAddress.class).with {
it.address = 'test@test'
it
})
it
}]
it
}
)
data << new DataField(
method: 'setupContacts',
description: 'add contant to non-empty descriptor',
representation: new EntityDescriptorRepresentation().with {
it.contacts = [
new ContactRepresentation(type: 'administrative', name: 'name', emailAddress: 'test@test', displayName: 'displayName', url: 'http://url'),
new ContactRepresentation(type: 'technical', name: 'name2', emailAddress: 'test2@test', displayName: 'displayName2', url: 'http://url2')
]
it
},
starter: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.contactPersons = [openSAMLObjects.buildDefaultInstanceOfType(ContactPerson.class).with {
it.type = ContactPersonTypeEnumeration.ADMINISTRATIVE
it.givenName = openSAMLObjects.buildDefaultInstanceOfType(GivenName.class).with {
it.name = 'name'
it
}
it.emailAddresses.add(openSAMLObjects.buildDefaultInstanceOfType(EmailAddress.class).with {
it.address = 'test@test'
it
})
it
}]
it
},
expected: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.contactPersons = [
openSAMLObjects.buildDefaultInstanceOfType(ContactPerson.class).with {
it.type = ContactPersonTypeEnumeration.ADMINISTRATIVE
it.givenName = openSAMLObjects.buildDefaultInstanceOfType(GivenName.class).with {
it.name = 'name'
it
}
it.emailAddresses.add(openSAMLObjects.buildDefaultInstanceOfType(EmailAddress.class).with {
it.address = 'test@test'
it
})
it
},
openSAMLObjects.buildDefaultInstanceOfType(ContactPerson.class).with {
it.type = ContactPersonTypeEnumeration.TECHNICAL
it.givenName = openSAMLObjects.buildDefaultInstanceOfType(GivenName.class).with {
it.name = 'name2'
it
}
it.emailAddresses.add(openSAMLObjects.buildDefaultInstanceOfType(EmailAddress.class).with {
it.address = 'test2@test'
it
})
it
}]
it
}
)
data << new DataField(
method: 'setupContacts',
description: 'update contact',
representation: new EntityDescriptorRepresentation().with {
it.contacts = [new ContactRepresentation(type: 'technical', name: 'name2', emailAddress: 'test2@test', displayName: 'displayName', url: 'http://url')]
it
},
starter: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.contactPersons = [openSAMLObjects.buildDefaultInstanceOfType(ContactPerson.class).with {
it.type = ContactPersonTypeEnumeration.ADMINISTRATIVE
it.givenName = openSAMLObjects.buildDefaultInstanceOfType(GivenName.class).with {
it.name = 'name'
it
}
it.emailAddresses.add(openSAMLObjects.buildDefaultInstanceOfType(EmailAddress.class).with {
it.address = 'test@test'
it
})
it
}]
it
},
expected: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.contactPersons = [openSAMLObjects.buildDefaultInstanceOfType(ContactPerson.class).with {
it.type = ContactPersonTypeEnumeration.TECHNICAL
it.givenName = openSAMLObjects.buildDefaultInstanceOfType(GivenName.class).with {
it.name = 'name2'
it
}
it.emailAddresses.add(openSAMLObjects.buildDefaultInstanceOfType(EmailAddress.class).with {
it.address = 'test2@test'
it
})
it
}]
it
}
)
data << new DataField(
method: 'setupContacts',
description: 'delete contacts',
representation: new EntityDescriptorRepresentation(),
starter: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.contactPersons = [openSAMLObjects.buildDefaultInstanceOfType(ContactPerson.class).with {
it.type = ContactPersonTypeEnumeration.ADMINISTRATIVE
it.givenName = openSAMLObjects.buildDefaultInstanceOfType(GivenName.class).with {
it.name = 'name'
it
}
it.emailAddresses.add(openSAMLObjects.buildDefaultInstanceOfType(EmailAddress.class).with {
it.address = 'test@test'
it
})
it
}]
it
},
expected: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class)
)
data << new DataField(
method: 'setupSPSSODescriptor',
description: 'set SPSSODescriptor protocol support',
representation: new EntityDescriptorRepresentation().with {
it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with {
it.protocolSupportEnum = 'SAML 2'
it
}
it
},
starter: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class),
expected: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.getRoleDescriptors().add(
openSAMLObjects.buildDefaultInstanceOfType(SPSSODescriptor.class).with {
it.supportedProtocols = [SAMLConstants.SAML20P_NS]
it
}
)
it
}
)
data << new DataField(
method: 'setupSPSSODescriptor',
description: 'add SPSSODescriptor protocol support',
representation: new EntityDescriptorRepresentation().with {
it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with {
it.protocolSupportEnum = 'SAML 1.1,SAML 2'
it
}
it
},
starter: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.getRoleDescriptors().add(
openSAMLObjects.buildDefaultInstanceOfType(SPSSODescriptor.class).with {
it.supportedProtocols = [SAMLConstants.SAML20P_NS]
it
}
)
it
},
expected: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.getRoleDescriptors().add(
openSAMLObjects.buildDefaultInstanceOfType(SPSSODescriptor.class).with {
it.supportedProtocols = [SAMLConstants.SAML11P_NS, SAMLConstants.SAML20P_NS]
it
}
)
it
}
)
data << new DataField(
method: 'setupSPSSODescriptor',
description: 'remove SPSSODescriptor',
representation: new EntityDescriptorRepresentation(),
starter: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.getRoleDescriptors().add(
openSAMLObjects.buildDefaultInstanceOfType(SPSSODescriptor.class).with {
it.supportedProtocols = [SAMLConstants.SAML20P_NS]
it
}
)
it
},
expected: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class)
)
data << new DataField(
method: 'setupSPSSODescriptor',
description: 'set nameid formats',
representation: new EntityDescriptorRepresentation().with {
it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with {
it.nameIdFormats = ['testformat']
it
}
it
},
starter: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class),
expected: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.getRoleDescriptors().add(
openSAMLObjects.buildDefaultInstanceOfType(SPSSODescriptor.class).with {
it.nameIDFormats.add(openSAMLObjects.buildDefaultInstanceOfType(NameIDFormat.class).with {
it.format = 'testformat'
it
})
it
}
)
it
}
)
data << new DataField(
method: 'setupSPSSODescriptor',
description: 'add nameid formats',
representation: new EntityDescriptorRepresentation().with {
it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with {
it.nameIdFormats = ['testformat', 'anotherformat']
it
}
it
},
starter: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.getRoleDescriptors().add(
openSAMLObjects.buildDefaultInstanceOfType(SPSSODescriptor.class).with {
it.nameIDFormats.add(openSAMLObjects.buildDefaultInstanceOfType(NameIDFormat.class).with {
it.format = 'testformat'
it
})
it
}
)
it
},
expected: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.getRoleDescriptors().add(
openSAMLObjects.buildDefaultInstanceOfType(SPSSODescriptor.class).with {
it.nameIDFormats.add(openSAMLObjects.buildDefaultInstanceOfType(NameIDFormat.class).with {
it.format = 'testformat'
it
})
it.nameIDFormats.add(openSAMLObjects.buildDefaultInstanceOfType(NameIDFormat.class).with {
it.format = 'anotherformat'
it
})
it
}
)
it
}
)
data << new DataField(
method: 'setupSPSSODescriptor',
description: 'remove nameid format',
representation: new EntityDescriptorRepresentation().with {
it.serviceProviderSsoDescriptor = new ServiceProviderSsoDescriptorRepresentation().with {
it.nameIdFormats = ['anotherformat']
it
}
it
},
starter: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.getRoleDescriptors().add(
openSAMLObjects.buildDefaultInstanceOfType(SPSSODescriptor.class).with {
it.nameIDFormats.add(openSAMLObjects.buildDefaultInstanceOfType(NameIDFormat.class).with {
it.format = 'testformat'
it
})
it.nameIDFormats.add(openSAMLObjects.buildDefaultInstanceOfType(NameIDFormat.class).with {
it.format = 'anotherformat'
it
})
it
}
)
it
},
expected: openSAMLObjects.buildDefaultInstanceOfType(EntityDescriptor.class).with {
it.getRoleDescriptors().add(
openSAMLObjects.buildDefaultInstanceOfType(SPSSODescriptor.class).with {
it.nameIDFormats.add(openSAMLObjects.buildDefaultInstanceOfType(NameIDFormat.class).with {
it.format = 'anotherformat'
it
})
it
}
)
it
}
)


return data
}
Expand Down

0 comments on commit 2338269

Please sign in to comment.