Changes in Release 2.2.0
=============================================
+[SIDP-416] - MetadataProviderObserver leak, new one added on every login
[SIDP-415] - SAML name identifier value not logged in audit log
[SIDP-413] - Change link of example login page
[SIDP-411] - Check for loginContext != null at login.jsp
import org.opensaml.saml2.metadata.SSODescriptor;
import org.opensaml.saml2.metadata.provider.MetadataProvider;
import org.opensaml.saml2.metadata.provider.MetadataProviderException;
+import org.opensaml.security.MetadataCredentialResolver;
+import org.opensaml.security.MetadataCredentialResolverFactory;
import org.opensaml.ws.message.encoder.MessageEncodingException;
import org.opensaml.ws.security.SecurityPolicyResolver;
import org.opensaml.ws.transport.InTransport;
}
/**
+ * A convenience method for obtaining a metadata credential resolver for the current metadata provider.
+ *
+ * @return the metadata credential resolver or null
+ */
+ public MetadataCredentialResolver getMetadataCredentialResolver() {
+ MetadataCredentialResolverFactory mcrFactory = MetadataCredentialResolverFactory.getFactory();
+ MetadataProvider metadataProvider = getMetadataProvider();
+ return mcrFactory.getInstance(metadataProvider);
+ }
+
+ /**
* Gets the SAML message bindings that may be used by outbound messages.
*
* @return SAML message bindings that may be used by outbound messages
import org.opensaml.saml1.core.StatusMessage;
import org.opensaml.saml1.core.Subject;
import org.opensaml.saml1.core.SubjectConfirmation;
-import org.opensaml.saml1.core.SubjectStatement;
import org.opensaml.saml2.metadata.SPSSODescriptor;
import org.opensaml.ws.message.encoder.MessageEncodingException;
import org.opensaml.xml.XMLObjectBuilder;
+/*
+ * Copyright 2010 University Corporation for Advanced Internet Development, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package edu.internet2.middleware.shibboleth.idp.profile.saml1;
* @throws SecurityException thrown if there is a problem resolving the credential from the peer's metadata
*/
protected Credential getKeyEncryptionCredential(String peerEntityId) throws SecurityException {
- MetadataCredentialResolver kekCredentialResolver = new MetadataCredentialResolver(getMetadataProvider());
+ MetadataCredentialResolver kekCredentialResolver = getMetadataCredentialResolver();
CriteriaSet criteriaSet = new CriteriaSet();
criteriaSet.add(new EntityIDCriteria(peerEntityId));