From a1b0fe7c01cad7d88f1714367d7c1ebae13fe571 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Thu, 14 Mar 2019 20:24:04 -0500 Subject: [PATCH 01/10] URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * http://www.apache.org/licenses/ with 1 occurrences migrated to: https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200). * http://www.apache.org/licenses/LICENSE-2.0 with 132 occurrences migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200). --- CONTRIBUTING.md | 2 +- core/src/main/java/org/opensaml/PaosBootstrap.java | 2 +- .../opensaml/liberty/binding/decoding/HTTPPAOS11Decoder.java | 2 +- .../opensaml/liberty/binding/encoding/HTTPPAOS11Encoder.java | 2 +- core/src/main/java/org/opensaml/liberty/paos/Request.java | 2 +- core/src/main/java/org/opensaml/liberty/paos/Response.java | 2 +- .../java/org/opensaml/liberty/paos/impl/RequestBuilder.java | 2 +- .../main/java/org/opensaml/liberty/paos/impl/RequestImpl.java | 2 +- .../org/opensaml/liberty/paos/impl/RequestMarshaller.java | 2 +- .../org/opensaml/liberty/paos/impl/RequestUnmarshaller.java | 2 +- .../java/org/opensaml/liberty/paos/impl/ResponseBuilder.java | 2 +- .../java/org/opensaml/liberty/paos/impl/ResponseImpl.java | 2 +- .../org/opensaml/liberty/paos/impl/ResponseMarshaller.java | 2 +- .../org/opensaml/liberty/paos/impl/ResponseUnmarshaller.java | 2 +- .../saml2/binding/decoding/HTTPArtifactDecoderImpl.java | 2 +- .../saml2/binding/decoding/HTTPSOAP11DecoderImpl.java | 2 +- .../org/opensaml/ws/transport/http/HttpClientInTransport.java | 2 +- .../opensaml/ws/transport/http/HttpClientOutTransport.java | 2 +- .../transport/http/httpclient/OutputStreamRequestEntity.java | 2 +- .../providers/ExpiringUsernameAuthenticationToken.java | 2 +- .../security/saml/SAMLAuthenticationProvider.java | 2 +- .../security/saml/SAMLAuthenticationToken.java | 2 +- .../java/org/springframework/security/saml/SAMLBootstrap.java | 2 +- .../java/org/springframework/security/saml/SAMLConstants.java | 2 +- .../org/springframework/security/saml/SAMLCredential.java | 2 +- .../java/org/springframework/security/saml/SAMLDiscovery.java | 2 +- .../org/springframework/security/saml/SAMLEntryPoint.java | 2 +- .../org/springframework/security/saml/SAMLLogoutFilter.java | 2 +- .../security/saml/SAMLLogoutProcessingFilter.java | 2 +- .../springframework/security/saml/SAMLProcessingFilter.java | 2 +- .../security/saml/SAMLRelayStateSuccessHandler.java | 2 +- .../security/saml/SAMLWebSSOHoKProcessingFilter.java | 2 +- .../security/saml/context/SAMLContextProvider.java | 2 +- .../security/saml/context/SAMLContextProviderImpl.java | 2 +- .../security/saml/context/SAMLContextProviderLB.java | 2 +- .../security/saml/context/SAMLMessageContext.java | 2 +- .../springframework/security/saml/key/EmptyKeyManager.java | 2 +- .../org/springframework/security/saml/key/JKSKeyManager.java | 2 +- .../org/springframework/security/saml/key/KeyManager.java | 2 +- .../springframework/security/saml/log/SAMLDefaultLogger.java | 2 +- .../springframework/security/saml/log/SAMLEmptyLogger.java | 2 +- .../org/springframework/security/saml/log/SAMLLogger.java | 2 +- .../security/saml/metadata/AbstractMetadataDelegate.java | 2 +- .../security/saml/metadata/CachingMetadataManager.java | 2 +- .../security/saml/metadata/ExtendedMetadata.java | 2 +- .../security/saml/metadata/ExtendedMetadataDelegate.java | 2 +- .../security/saml/metadata/ExtendedMetadataProvider.java | 2 +- .../security/saml/metadata/MetadataDisplayFilter.java | 2 +- .../security/saml/metadata/MetadataGenerator.java | 2 +- .../security/saml/metadata/MetadataGeneratorFilter.java | 2 +- .../security/saml/metadata/MetadataManager.java | 2 +- .../security/saml/metadata/MetadataMemoryProvider.java | 2 +- .../security/saml/parser/ParserPoolHolder.java | 2 +- .../org/springframework/security/saml/parser/SAMLBase.java | 2 +- .../springframework/security/saml/parser/SAMLCollection.java | 2 +- .../org/springframework/security/saml/parser/SAMLObject.java | 2 +- .../security/saml/processor/HTTPArtifactBinding.java | 2 +- .../security/saml/processor/HTTPPAOS11Binding.java | 2 +- .../security/saml/processor/HTTPPostBinding.java | 2 +- .../security/saml/processor/HTTPRedirectDeflateBinding.java | 2 +- .../security/saml/processor/HTTPSOAP11Binding.java | 2 +- .../springframework/security/saml/processor/SAMLBinding.java | 2 +- .../security/saml/processor/SAMLBindingImpl.java | 2 +- .../security/saml/processor/SAMLProcessor.java | 2 +- .../security/saml/processor/SAMLProcessorImpl.java | 2 +- .../security/saml/storage/EmptyStorageFactory.java | 2 +- .../security/saml/storage/HttpSessionStorage.java | 2 +- .../security/saml/storage/HttpSessionStorageFactory.java | 2 +- .../security/saml/storage/SAMLMessageStorage.java | 2 +- .../security/saml/storage/SAMLMessageStorageFactory.java | 2 +- .../security/saml/trust/AllowAllSignatureTrustEngine.java | 2 +- .../security/saml/trust/CertPathPKIXTrustEvaluator.java | 2 +- .../security/saml/trust/MetadataCredentialResolver.java | 2 +- .../security/saml/trust/PKIXInformationResolver.java | 2 +- .../security/saml/trust/UntrustedCertificateException.java | 2 +- .../springframework/security/saml/trust/X509KeyManager.java | 2 +- .../springframework/security/saml/trust/X509TrustManager.java | 2 +- .../security/saml/userdetails/SAMLUserDetailsService.java | 2 +- .../java/org/springframework/security/saml/util/SAMLUtil.java | 2 +- .../springframework/security/saml/util/VelocityFactory.java | 2 +- .../security/saml/websso/AbstractProfileBase.java | 2 +- .../security/saml/websso/ArtifactResolutionProfile.java | 2 +- .../security/saml/websso/ArtifactResolutionProfileBase.java | 2 +- .../security/saml/websso/ArtifactResolutionProfileImpl.java | 2 +- .../security/saml/websso/SingleLogoutProfile.java | 2 +- .../security/saml/websso/SingleLogoutProfileImpl.java | 2 +- .../springframework/security/saml/websso/WebSSOProfile.java | 2 +- .../security/saml/websso/WebSSOProfileConsumer.java | 2 +- .../security/saml/websso/WebSSOProfileConsumerHoKImpl.java | 2 +- .../security/saml/websso/WebSSOProfileConsumerImpl.java | 2 +- .../security/saml/websso/WebSSOProfileECPImpl.java | 2 +- .../security/saml/websso/WebSSOProfileHoKImpl.java | 2 +- .../security/saml/websso/WebSSOProfileImpl.java | 2 +- .../security/saml/websso/WebSSOProfileOptions.java | 2 +- .../org/opensaml/common/BaseSAMLObjectProviderTestCase.java | 2 +- core/src/test/java/org/opensaml/common/BaseTestCase.java | 2 +- core/src/test/java/org/opensaml/common/BootstrapHelper.java | 2 +- .../liberty/binding/decoding/HTTPPAOS11DecoderTest.java | 2 +- .../test/java/org/opensaml/liberty/paos/impl/RequestTest.java | 2 +- .../java/org/opensaml/liberty/paos/impl/ResponseTest.java | 2 +- .../providers/ExpiringUsernameAuthenticationTokenTest.java | 2 +- .../security/saml/SAMLAuthenticationProviderTest.java | 2 +- .../security/saml/SAMLAuthenticationTokenTest.java | 2 +- .../org/springframework/security/saml/SAMLCredentialTest.java | 2 +- .../org/springframework/security/saml/SAMLEntryPointTest.java | 2 +- .../springframework/security/saml/SAMLLogoutFilterTest.java | 2 +- .../security/saml/SAMLLogoutProcessingFilterTest.java | 2 +- .../security/saml/SAMLProcessingFilterTest.java | 2 +- .../security/saml/SAMLRelayStateSuccessHandlerTest.java | 2 +- .../org/springframework/security/saml/SAMLTestHelper.java | 2 +- .../security/saml/context/SAMLContextProviderImplTest.java | 2 +- .../springframework/security/saml/key/JKSKeyManagerTest.java | 2 +- .../security/saml/metadata/MetadataGeneratorFilterTest.java | 2 +- .../security/saml/metadata/MetadataGeneratorTest.java | 2 +- .../security/saml/metadata/MetadataManagerSignaturesTest.java | 2 +- .../security/saml/metadata/MetadataManagerTest.java | 2 +- .../security/saml/parser/SAMLCollectionTest.java | 2 +- .../springframework/security/saml/parser/SAMLObjectTest.java | 2 +- .../security/saml/processor/SAMLProcessorImplTest.java | 2 +- .../security/saml/storage/HttpSessionStorageTest.java | 2 +- .../security/saml/storage/StorageFactoryTestImpl.java | 2 +- .../saml/trust/UntrustedCertificateExceptionTest.java | 2 +- .../saml/websso/ArtifactResolutionProfileImplTest.java | 2 +- .../security/saml/websso/WebSSOProfileConsumerImplTest.java | 2 +- .../security/saml/websso/WebSSOProfileHoKImplTest.java | 2 +- .../security/saml/websso/WebSSOProfileImplTest.java | 2 +- docs/dist/license.txt | 4 ++-- docs/reference/docbook/introduction.xml | 2 +- .../springframework/security/saml/web/MetadataController.java | 2 +- .../org/springframework/security/saml/web/MetadataForm.java | 2 +- .../springframework/security/saml/web/MetadataValidator.java | 2 +- 131 files changed, 132 insertions(+), 132 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 51c0f5fe7..915f31230 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -77,7 +77,7 @@ Whitespace management tips * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/PaosBootstrap.java b/core/src/main/java/org/opensaml/PaosBootstrap.java index b9256c918..46d5e09b5 100755 --- a/core/src/main/java/org/opensaml/PaosBootstrap.java +++ b/core/src/main/java/org/opensaml/PaosBootstrap.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/binding/decoding/HTTPPAOS11Decoder.java b/core/src/main/java/org/opensaml/liberty/binding/decoding/HTTPPAOS11Decoder.java index 183b97d7e..e8ad9dee6 100755 --- a/core/src/main/java/org/opensaml/liberty/binding/decoding/HTTPPAOS11Decoder.java +++ b/core/src/main/java/org/opensaml/liberty/binding/decoding/HTTPPAOS11Decoder.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/binding/encoding/HTTPPAOS11Encoder.java b/core/src/main/java/org/opensaml/liberty/binding/encoding/HTTPPAOS11Encoder.java index 2b2cc8d86..48c866f0e 100755 --- a/core/src/main/java/org/opensaml/liberty/binding/encoding/HTTPPAOS11Encoder.java +++ b/core/src/main/java/org/opensaml/liberty/binding/encoding/HTTPPAOS11Encoder.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/paos/Request.java b/core/src/main/java/org/opensaml/liberty/paos/Request.java index 7081dc2bf..850599696 100755 --- a/core/src/main/java/org/opensaml/liberty/paos/Request.java +++ b/core/src/main/java/org/opensaml/liberty/paos/Request.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/paos/Response.java b/core/src/main/java/org/opensaml/liberty/paos/Response.java index 5f9145f6f..dbb2c3475 100755 --- a/core/src/main/java/org/opensaml/liberty/paos/Response.java +++ b/core/src/main/java/org/opensaml/liberty/paos/Response.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/paos/impl/RequestBuilder.java b/core/src/main/java/org/opensaml/liberty/paos/impl/RequestBuilder.java index 2d7047ff8..12112cd0c 100755 --- a/core/src/main/java/org/opensaml/liberty/paos/impl/RequestBuilder.java +++ b/core/src/main/java/org/opensaml/liberty/paos/impl/RequestBuilder.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/paos/impl/RequestImpl.java b/core/src/main/java/org/opensaml/liberty/paos/impl/RequestImpl.java index 4ee8131db..761d9fdb5 100755 --- a/core/src/main/java/org/opensaml/liberty/paos/impl/RequestImpl.java +++ b/core/src/main/java/org/opensaml/liberty/paos/impl/RequestImpl.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/paos/impl/RequestMarshaller.java b/core/src/main/java/org/opensaml/liberty/paos/impl/RequestMarshaller.java index da497b2af..60129f3f0 100755 --- a/core/src/main/java/org/opensaml/liberty/paos/impl/RequestMarshaller.java +++ b/core/src/main/java/org/opensaml/liberty/paos/impl/RequestMarshaller.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/paos/impl/RequestUnmarshaller.java b/core/src/main/java/org/opensaml/liberty/paos/impl/RequestUnmarshaller.java index 71eb6ad23..ddbe42e3b 100755 --- a/core/src/main/java/org/opensaml/liberty/paos/impl/RequestUnmarshaller.java +++ b/core/src/main/java/org/opensaml/liberty/paos/impl/RequestUnmarshaller.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseBuilder.java b/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseBuilder.java index 3a9e6020d..01ca24387 100755 --- a/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseBuilder.java +++ b/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseBuilder.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseImpl.java b/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseImpl.java index 01e5ef1e6..0d86aced9 100755 --- a/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseImpl.java +++ b/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseImpl.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseMarshaller.java b/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseMarshaller.java index d9377b94c..6c9d582e4 100755 --- a/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseMarshaller.java +++ b/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseMarshaller.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseUnmarshaller.java b/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseUnmarshaller.java index 84419eca3..a349802b8 100755 --- a/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseUnmarshaller.java +++ b/core/src/main/java/org/opensaml/liberty/paos/impl/ResponseUnmarshaller.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/saml2/binding/decoding/HTTPArtifactDecoderImpl.java b/core/src/main/java/org/opensaml/saml2/binding/decoding/HTTPArtifactDecoderImpl.java index 13441e91a..2121ffce3 100755 --- a/core/src/main/java/org/opensaml/saml2/binding/decoding/HTTPArtifactDecoderImpl.java +++ b/core/src/main/java/org/opensaml/saml2/binding/decoding/HTTPArtifactDecoderImpl.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/saml2/binding/decoding/HTTPSOAP11DecoderImpl.java b/core/src/main/java/org/opensaml/saml2/binding/decoding/HTTPSOAP11DecoderImpl.java index fa6649882..0a81536f5 100755 --- a/core/src/main/java/org/opensaml/saml2/binding/decoding/HTTPSOAP11DecoderImpl.java +++ b/core/src/main/java/org/opensaml/saml2/binding/decoding/HTTPSOAP11DecoderImpl.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/ws/transport/http/HttpClientInTransport.java b/core/src/main/java/org/opensaml/ws/transport/http/HttpClientInTransport.java index 054f313a5..bfa579969 100755 --- a/core/src/main/java/org/opensaml/ws/transport/http/HttpClientInTransport.java +++ b/core/src/main/java/org/opensaml/ws/transport/http/HttpClientInTransport.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/ws/transport/http/HttpClientOutTransport.java b/core/src/main/java/org/opensaml/ws/transport/http/HttpClientOutTransport.java index c14947d2b..c8918624d 100755 --- a/core/src/main/java/org/opensaml/ws/transport/http/HttpClientOutTransport.java +++ b/core/src/main/java/org/opensaml/ws/transport/http/HttpClientOutTransport.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/opensaml/ws/transport/http/httpclient/OutputStreamRequestEntity.java b/core/src/main/java/org/opensaml/ws/transport/http/httpclient/OutputStreamRequestEntity.java index adb958c50..80d620abd 100755 --- a/core/src/main/java/org/opensaml/ws/transport/http/httpclient/OutputStreamRequestEntity.java +++ b/core/src/main/java/org/opensaml/ws/transport/http/httpclient/OutputStreamRequestEntity.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/providers/ExpiringUsernameAuthenticationToken.java b/core/src/main/java/org/springframework/security/providers/ExpiringUsernameAuthenticationToken.java index 606c2dd75..735d3b300 100644 --- a/core/src/main/java/org/springframework/security/providers/ExpiringUsernameAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/providers/ExpiringUsernameAuthenticationToken.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLAuthenticationProvider.java b/core/src/main/java/org/springframework/security/saml/SAMLAuthenticationProvider.java index 4c041af0b..d68adc8ba 100644 --- a/core/src/main/java/org/springframework/security/saml/SAMLAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLAuthenticationProvider.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLAuthenticationToken.java b/core/src/main/java/org/springframework/security/saml/SAMLAuthenticationToken.java index 5e2dfa161..a33cd64ee 100644 --- a/core/src/main/java/org/springframework/security/saml/SAMLAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLAuthenticationToken.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLBootstrap.java b/core/src/main/java/org/springframework/security/saml/SAMLBootstrap.java index fdcf34d08..f63f675cf 100755 --- a/core/src/main/java/org/springframework/security/saml/SAMLBootstrap.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLBootstrap.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLConstants.java b/core/src/main/java/org/springframework/security/saml/SAMLConstants.java index b0c634eef..d52e827e3 100755 --- a/core/src/main/java/org/springframework/security/saml/SAMLConstants.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLConstants.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLCredential.java b/core/src/main/java/org/springframework/security/saml/SAMLCredential.java index 45a113e09..68973b9f8 100644 --- a/core/src/main/java/org/springframework/security/saml/SAMLCredential.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLCredential.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLDiscovery.java b/core/src/main/java/org/springframework/security/saml/SAMLDiscovery.java index fc2cd84ea..c6c685bd8 100644 --- a/core/src/main/java/org/springframework/security/saml/SAMLDiscovery.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLDiscovery.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLEntryPoint.java b/core/src/main/java/org/springframework/security/saml/SAMLEntryPoint.java index f2c29f597..9e831e405 100644 --- a/core/src/main/java/org/springframework/security/saml/SAMLEntryPoint.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLEntryPoint.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLLogoutFilter.java b/core/src/main/java/org/springframework/security/saml/SAMLLogoutFilter.java index 721dbe5c4..3af00487e 100644 --- a/core/src/main/java/org/springframework/security/saml/SAMLLogoutFilter.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLLogoutFilter.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLLogoutProcessingFilter.java b/core/src/main/java/org/springframework/security/saml/SAMLLogoutProcessingFilter.java index 453889cb0..375ee553e 100644 --- a/core/src/main/java/org/springframework/security/saml/SAMLLogoutProcessingFilter.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLLogoutProcessingFilter.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLProcessingFilter.java b/core/src/main/java/org/springframework/security/saml/SAMLProcessingFilter.java index 29f52143f..f583d057e 100644 --- a/core/src/main/java/org/springframework/security/saml/SAMLProcessingFilter.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLProcessingFilter.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLRelayStateSuccessHandler.java b/core/src/main/java/org/springframework/security/saml/SAMLRelayStateSuccessHandler.java index 16eb7c52a..91540d4e3 100644 --- a/core/src/main/java/org/springframework/security/saml/SAMLRelayStateSuccessHandler.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLRelayStateSuccessHandler.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/SAMLWebSSOHoKProcessingFilter.java b/core/src/main/java/org/springframework/security/saml/SAMLWebSSOHoKProcessingFilter.java index 6cd39a59c..d85106343 100644 --- a/core/src/main/java/org/springframework/security/saml/SAMLWebSSOHoKProcessingFilter.java +++ b/core/src/main/java/org/springframework/security/saml/SAMLWebSSOHoKProcessingFilter.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/context/SAMLContextProvider.java b/core/src/main/java/org/springframework/security/saml/context/SAMLContextProvider.java index a6e85295e..c877bef6d 100755 --- a/core/src/main/java/org/springframework/security/saml/context/SAMLContextProvider.java +++ b/core/src/main/java/org/springframework/security/saml/context/SAMLContextProvider.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderImpl.java b/core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderImpl.java index e4806e329..74937d9aa 100755 --- a/core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderImpl.java +++ b/core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderImpl.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderLB.java b/core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderLB.java index 255d46924..cad33af3c 100644 --- a/core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderLB.java +++ b/core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderLB.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/context/SAMLMessageContext.java b/core/src/main/java/org/springframework/security/saml/context/SAMLMessageContext.java index 77f43d9e5..f10282c02 100755 --- a/core/src/main/java/org/springframework/security/saml/context/SAMLMessageContext.java +++ b/core/src/main/java/org/springframework/security/saml/context/SAMLMessageContext.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/key/EmptyKeyManager.java b/core/src/main/java/org/springframework/security/saml/key/EmptyKeyManager.java index a370309c4..f239785ad 100644 --- a/core/src/main/java/org/springframework/security/saml/key/EmptyKeyManager.java +++ b/core/src/main/java/org/springframework/security/saml/key/EmptyKeyManager.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/key/JKSKeyManager.java b/core/src/main/java/org/springframework/security/saml/key/JKSKeyManager.java index a7304075e..8394ec337 100644 --- a/core/src/main/java/org/springframework/security/saml/key/JKSKeyManager.java +++ b/core/src/main/java/org/springframework/security/saml/key/JKSKeyManager.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/key/KeyManager.java b/core/src/main/java/org/springframework/security/saml/key/KeyManager.java index 73dfe8109..c94a2e380 100755 --- a/core/src/main/java/org/springframework/security/saml/key/KeyManager.java +++ b/core/src/main/java/org/springframework/security/saml/key/KeyManager.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/log/SAMLDefaultLogger.java b/core/src/main/java/org/springframework/security/saml/log/SAMLDefaultLogger.java index aa96e8575..8114ee41e 100755 --- a/core/src/main/java/org/springframework/security/saml/log/SAMLDefaultLogger.java +++ b/core/src/main/java/org/springframework/security/saml/log/SAMLDefaultLogger.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/log/SAMLEmptyLogger.java b/core/src/main/java/org/springframework/security/saml/log/SAMLEmptyLogger.java index 6cb083444..bc586703a 100755 --- a/core/src/main/java/org/springframework/security/saml/log/SAMLEmptyLogger.java +++ b/core/src/main/java/org/springframework/security/saml/log/SAMLEmptyLogger.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/log/SAMLLogger.java b/core/src/main/java/org/springframework/security/saml/log/SAMLLogger.java index 57b8cdfdf..5d91dded8 100755 --- a/core/src/main/java/org/springframework/security/saml/log/SAMLLogger.java +++ b/core/src/main/java/org/springframework/security/saml/log/SAMLLogger.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/metadata/AbstractMetadataDelegate.java b/core/src/main/java/org/springframework/security/saml/metadata/AbstractMetadataDelegate.java index d42fcb578..35a9d7dd4 100755 --- a/core/src/main/java/org/springframework/security/saml/metadata/AbstractMetadataDelegate.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/AbstractMetadataDelegate.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/metadata/CachingMetadataManager.java b/core/src/main/java/org/springframework/security/saml/metadata/CachingMetadataManager.java index 5ee3ae5bd..da78f6193 100755 --- a/core/src/main/java/org/springframework/security/saml/metadata/CachingMetadataManager.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/CachingMetadataManager.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadata.java b/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadata.java index ffec8ae78..2c59fd2c5 100755 --- a/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadata.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadata.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadataDelegate.java b/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadataDelegate.java index 1b7266325..358abe0c2 100755 --- a/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadataDelegate.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadataDelegate.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadataProvider.java b/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadataProvider.java index 4cdae13ed..433ae68e4 100755 --- a/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadataProvider.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadataProvider.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/metadata/MetadataDisplayFilter.java b/core/src/main/java/org/springframework/security/saml/metadata/MetadataDisplayFilter.java index a7d1b4f8f..91a38f512 100644 --- a/core/src/main/java/org/springframework/security/saml/metadata/MetadataDisplayFilter.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/MetadataDisplayFilter.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/metadata/MetadataGenerator.java b/core/src/main/java/org/springframework/security/saml/metadata/MetadataGenerator.java index 0b29811e6..0b43a524a 100644 --- a/core/src/main/java/org/springframework/security/saml/metadata/MetadataGenerator.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/MetadataGenerator.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/metadata/MetadataGeneratorFilter.java b/core/src/main/java/org/springframework/security/saml/metadata/MetadataGeneratorFilter.java index bc1115fe5..05bc6e95e 100644 --- a/core/src/main/java/org/springframework/security/saml/metadata/MetadataGeneratorFilter.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/MetadataGeneratorFilter.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java index 23e31a13d..02899ab96 100644 --- a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/metadata/MetadataMemoryProvider.java b/core/src/main/java/org/springframework/security/saml/metadata/MetadataMemoryProvider.java index 1c7248b50..b1e20c56f 100644 --- a/core/src/main/java/org/springframework/security/saml/metadata/MetadataMemoryProvider.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/MetadataMemoryProvider.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/parser/ParserPoolHolder.java b/core/src/main/java/org/springframework/security/saml/parser/ParserPoolHolder.java index 0a8f0f612..5d99ae42a 100644 --- a/core/src/main/java/org/springframework/security/saml/parser/ParserPoolHolder.java +++ b/core/src/main/java/org/springframework/security/saml/parser/ParserPoolHolder.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/parser/SAMLBase.java b/core/src/main/java/org/springframework/security/saml/parser/SAMLBase.java index d2511986c..2a9c07f9d 100644 --- a/core/src/main/java/org/springframework/security/saml/parser/SAMLBase.java +++ b/core/src/main/java/org/springframework/security/saml/parser/SAMLBase.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/parser/SAMLCollection.java b/core/src/main/java/org/springframework/security/saml/parser/SAMLCollection.java index 5ec4fca3f..84561de01 100644 --- a/core/src/main/java/org/springframework/security/saml/parser/SAMLCollection.java +++ b/core/src/main/java/org/springframework/security/saml/parser/SAMLCollection.java @@ -3,7 +3,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/parser/SAMLObject.java b/core/src/main/java/org/springframework/security/saml/parser/SAMLObject.java index 44560d672..ee4fd0e8a 100644 --- a/core/src/main/java/org/springframework/security/saml/parser/SAMLObject.java +++ b/core/src/main/java/org/springframework/security/saml/parser/SAMLObject.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/processor/HTTPArtifactBinding.java b/core/src/main/java/org/springframework/security/saml/processor/HTTPArtifactBinding.java index 331a85690..b6d79d180 100755 --- a/core/src/main/java/org/springframework/security/saml/processor/HTTPArtifactBinding.java +++ b/core/src/main/java/org/springframework/security/saml/processor/HTTPArtifactBinding.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/processor/HTTPPAOS11Binding.java b/core/src/main/java/org/springframework/security/saml/processor/HTTPPAOS11Binding.java index 38985622a..eac85fbc7 100755 --- a/core/src/main/java/org/springframework/security/saml/processor/HTTPPAOS11Binding.java +++ b/core/src/main/java/org/springframework/security/saml/processor/HTTPPAOS11Binding.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/processor/HTTPPostBinding.java b/core/src/main/java/org/springframework/security/saml/processor/HTTPPostBinding.java index 1ce5b22dd..ec300ab6d 100755 --- a/core/src/main/java/org/springframework/security/saml/processor/HTTPPostBinding.java +++ b/core/src/main/java/org/springframework/security/saml/processor/HTTPPostBinding.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/processor/HTTPRedirectDeflateBinding.java b/core/src/main/java/org/springframework/security/saml/processor/HTTPRedirectDeflateBinding.java index 44f16a8de..dad593fd1 100755 --- a/core/src/main/java/org/springframework/security/saml/processor/HTTPRedirectDeflateBinding.java +++ b/core/src/main/java/org/springframework/security/saml/processor/HTTPRedirectDeflateBinding.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/processor/HTTPSOAP11Binding.java b/core/src/main/java/org/springframework/security/saml/processor/HTTPSOAP11Binding.java index 5b3e141c6..ba2f875c0 100755 --- a/core/src/main/java/org/springframework/security/saml/processor/HTTPSOAP11Binding.java +++ b/core/src/main/java/org/springframework/security/saml/processor/HTTPSOAP11Binding.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/processor/SAMLBinding.java b/core/src/main/java/org/springframework/security/saml/processor/SAMLBinding.java index f48fb7718..6ca2ff3a7 100755 --- a/core/src/main/java/org/springframework/security/saml/processor/SAMLBinding.java +++ b/core/src/main/java/org/springframework/security/saml/processor/SAMLBinding.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/processor/SAMLBindingImpl.java b/core/src/main/java/org/springframework/security/saml/processor/SAMLBindingImpl.java index ad025e372..668c57049c 100755 --- a/core/src/main/java/org/springframework/security/saml/processor/SAMLBindingImpl.java +++ b/core/src/main/java/org/springframework/security/saml/processor/SAMLBindingImpl.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/processor/SAMLProcessor.java b/core/src/main/java/org/springframework/security/saml/processor/SAMLProcessor.java index e0da2be11..394021455 100644 --- a/core/src/main/java/org/springframework/security/saml/processor/SAMLProcessor.java +++ b/core/src/main/java/org/springframework/security/saml/processor/SAMLProcessor.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/processor/SAMLProcessorImpl.java b/core/src/main/java/org/springframework/security/saml/processor/SAMLProcessorImpl.java index aace18b1f..5e1dbf4be 100644 --- a/core/src/main/java/org/springframework/security/saml/processor/SAMLProcessorImpl.java +++ b/core/src/main/java/org/springframework/security/saml/processor/SAMLProcessorImpl.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/storage/EmptyStorageFactory.java b/core/src/main/java/org/springframework/security/saml/storage/EmptyStorageFactory.java index 0e78caa26..ee1275871 100644 --- a/core/src/main/java/org/springframework/security/saml/storage/EmptyStorageFactory.java +++ b/core/src/main/java/org/springframework/security/saml/storage/EmptyStorageFactory.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/storage/HttpSessionStorage.java b/core/src/main/java/org/springframework/security/saml/storage/HttpSessionStorage.java index 2c7c9b5f0..7b7d4f542 100644 --- a/core/src/main/java/org/springframework/security/saml/storage/HttpSessionStorage.java +++ b/core/src/main/java/org/springframework/security/saml/storage/HttpSessionStorage.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/storage/HttpSessionStorageFactory.java b/core/src/main/java/org/springframework/security/saml/storage/HttpSessionStorageFactory.java index 9045687f3..ea0d89cdd 100644 --- a/core/src/main/java/org/springframework/security/saml/storage/HttpSessionStorageFactory.java +++ b/core/src/main/java/org/springframework/security/saml/storage/HttpSessionStorageFactory.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/storage/SAMLMessageStorage.java b/core/src/main/java/org/springframework/security/saml/storage/SAMLMessageStorage.java index 092f8fdd7..b1232119f 100644 --- a/core/src/main/java/org/springframework/security/saml/storage/SAMLMessageStorage.java +++ b/core/src/main/java/org/springframework/security/saml/storage/SAMLMessageStorage.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/storage/SAMLMessageStorageFactory.java b/core/src/main/java/org/springframework/security/saml/storage/SAMLMessageStorageFactory.java index f922f4463..eee3cc084 100644 --- a/core/src/main/java/org/springframework/security/saml/storage/SAMLMessageStorageFactory.java +++ b/core/src/main/java/org/springframework/security/saml/storage/SAMLMessageStorageFactory.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/trust/AllowAllSignatureTrustEngine.java b/core/src/main/java/org/springframework/security/saml/trust/AllowAllSignatureTrustEngine.java index 4ffc8417a..52b29c346 100644 --- a/core/src/main/java/org/springframework/security/saml/trust/AllowAllSignatureTrustEngine.java +++ b/core/src/main/java/org/springframework/security/saml/trust/AllowAllSignatureTrustEngine.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/trust/CertPathPKIXTrustEvaluator.java b/core/src/main/java/org/springframework/security/saml/trust/CertPathPKIXTrustEvaluator.java index fb2ceeb72..fe670c38b 100644 --- a/core/src/main/java/org/springframework/security/saml/trust/CertPathPKIXTrustEvaluator.java +++ b/core/src/main/java/org/springframework/security/saml/trust/CertPathPKIXTrustEvaluator.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/trust/MetadataCredentialResolver.java b/core/src/main/java/org/springframework/security/saml/trust/MetadataCredentialResolver.java index 70116d66c..1462b9d97 100644 --- a/core/src/main/java/org/springframework/security/saml/trust/MetadataCredentialResolver.java +++ b/core/src/main/java/org/springframework/security/saml/trust/MetadataCredentialResolver.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/trust/PKIXInformationResolver.java b/core/src/main/java/org/springframework/security/saml/trust/PKIXInformationResolver.java index 94d6f6746..13797a4eb 100644 --- a/core/src/main/java/org/springframework/security/saml/trust/PKIXInformationResolver.java +++ b/core/src/main/java/org/springframework/security/saml/trust/PKIXInformationResolver.java @@ -6,7 +6,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/trust/UntrustedCertificateException.java b/core/src/main/java/org/springframework/security/saml/trust/UntrustedCertificateException.java index 8e77b0373..7ce1cecdb 100644 --- a/core/src/main/java/org/springframework/security/saml/trust/UntrustedCertificateException.java +++ b/core/src/main/java/org/springframework/security/saml/trust/UntrustedCertificateException.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/trust/X509KeyManager.java b/core/src/main/java/org/springframework/security/saml/trust/X509KeyManager.java index 71f16c019..1c2a79b25 100644 --- a/core/src/main/java/org/springframework/security/saml/trust/X509KeyManager.java +++ b/core/src/main/java/org/springframework/security/saml/trust/X509KeyManager.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/trust/X509TrustManager.java b/core/src/main/java/org/springframework/security/saml/trust/X509TrustManager.java index 3add54289..37c95e277 100644 --- a/core/src/main/java/org/springframework/security/saml/trust/X509TrustManager.java +++ b/core/src/main/java/org/springframework/security/saml/trust/X509TrustManager.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/userdetails/SAMLUserDetailsService.java b/core/src/main/java/org/springframework/security/saml/userdetails/SAMLUserDetailsService.java index 666b9a5bc..4723e96b9 100644 --- a/core/src/main/java/org/springframework/security/saml/userdetails/SAMLUserDetailsService.java +++ b/core/src/main/java/org/springframework/security/saml/userdetails/SAMLUserDetailsService.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/util/SAMLUtil.java b/core/src/main/java/org/springframework/security/saml/util/SAMLUtil.java index da2a7de69..eb688b85a 100644 --- a/core/src/main/java/org/springframework/security/saml/util/SAMLUtil.java +++ b/core/src/main/java/org/springframework/security/saml/util/SAMLUtil.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/util/VelocityFactory.java b/core/src/main/java/org/springframework/security/saml/util/VelocityFactory.java index 83fb42077..18b346bee 100755 --- a/core/src/main/java/org/springframework/security/saml/util/VelocityFactory.java +++ b/core/src/main/java/org/springframework/security/saml/util/VelocityFactory.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/AbstractProfileBase.java b/core/src/main/java/org/springframework/security/saml/websso/AbstractProfileBase.java index 0bbc74909..c85bf2bbb 100644 --- a/core/src/main/java/org/springframework/security/saml/websso/AbstractProfileBase.java +++ b/core/src/main/java/org/springframework/security/saml/websso/AbstractProfileBase.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfile.java b/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfile.java index e94a0c9a5..0b0c4f6ad 100755 --- a/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfile.java +++ b/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfile.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfileBase.java b/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfileBase.java index 1c0456c93..934947192 100755 --- a/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfileBase.java +++ b/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfileBase.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfileImpl.java b/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfileImpl.java index 5bf3f1dd2..fd036a9e1 100755 --- a/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfileImpl.java +++ b/core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfileImpl.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/SingleLogoutProfile.java b/core/src/main/java/org/springframework/security/saml/websso/SingleLogoutProfile.java index 1f5abf1ac..f45247095 100644 --- a/core/src/main/java/org/springframework/security/saml/websso/SingleLogoutProfile.java +++ b/core/src/main/java/org/springframework/security/saml/websso/SingleLogoutProfile.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/SingleLogoutProfileImpl.java b/core/src/main/java/org/springframework/security/saml/websso/SingleLogoutProfileImpl.java index b0adedb33..6f86618ff 100644 --- a/core/src/main/java/org/springframework/security/saml/websso/SingleLogoutProfileImpl.java +++ b/core/src/main/java/org/springframework/security/saml/websso/SingleLogoutProfileImpl.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfile.java b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfile.java index 8df1c14ef..c485fc2e5 100644 --- a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfile.java +++ b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfile.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumer.java b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumer.java index 39e9506d2..62ba1df10 100644 --- a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumer.java +++ b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumer.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumerHoKImpl.java b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumerHoKImpl.java index 63ef7ed85..6f3f316f7 100644 --- a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumerHoKImpl.java +++ b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumerHoKImpl.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumerImpl.java b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumerImpl.java index 1c0a57b03..8b5a43423 100644 --- a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumerImpl.java +++ b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumerImpl.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileECPImpl.java b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileECPImpl.java index 506eb2cd2..c6e7eda4d 100755 --- a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileECPImpl.java +++ b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileECPImpl.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileHoKImpl.java b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileHoKImpl.java index 39128be4b..94e6bd5ce 100644 --- a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileHoKImpl.java +++ b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileHoKImpl.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileImpl.java b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileImpl.java index 0a87eb45b..ca7f57542 100644 --- a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileImpl.java +++ b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileImpl.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileOptions.java b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileOptions.java index 0f035afd0..1b4fe1ebb 100644 --- a/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileOptions.java +++ b/core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileOptions.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/opensaml/common/BaseSAMLObjectProviderTestCase.java b/core/src/test/java/org/opensaml/common/BaseSAMLObjectProviderTestCase.java index f6c126575..d267b2bed 100755 --- a/core/src/test/java/org/opensaml/common/BaseSAMLObjectProviderTestCase.java +++ b/core/src/test/java/org/opensaml/common/BaseSAMLObjectProviderTestCase.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/opensaml/common/BaseTestCase.java b/core/src/test/java/org/opensaml/common/BaseTestCase.java index 26c6dbe80..d30b78052 100755 --- a/core/src/test/java/org/opensaml/common/BaseTestCase.java +++ b/core/src/test/java/org/opensaml/common/BaseTestCase.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/opensaml/common/BootstrapHelper.java b/core/src/test/java/org/opensaml/common/BootstrapHelper.java index 77dc4d7b8..bffa37ac8 100755 --- a/core/src/test/java/org/opensaml/common/BootstrapHelper.java +++ b/core/src/test/java/org/opensaml/common/BootstrapHelper.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/opensaml/liberty/binding/decoding/HTTPPAOS11DecoderTest.java b/core/src/test/java/org/opensaml/liberty/binding/decoding/HTTPPAOS11DecoderTest.java index 79dfd1c80..3d14ce570 100755 --- a/core/src/test/java/org/opensaml/liberty/binding/decoding/HTTPPAOS11DecoderTest.java +++ b/core/src/test/java/org/opensaml/liberty/binding/decoding/HTTPPAOS11DecoderTest.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/opensaml/liberty/paos/impl/RequestTest.java b/core/src/test/java/org/opensaml/liberty/paos/impl/RequestTest.java index 061f6290c..622ebbbb7 100755 --- a/core/src/test/java/org/opensaml/liberty/paos/impl/RequestTest.java +++ b/core/src/test/java/org/opensaml/liberty/paos/impl/RequestTest.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/opensaml/liberty/paos/impl/ResponseTest.java b/core/src/test/java/org/opensaml/liberty/paos/impl/ResponseTest.java index 03feb4d5c..e23be8932 100755 --- a/core/src/test/java/org/opensaml/liberty/paos/impl/ResponseTest.java +++ b/core/src/test/java/org/opensaml/liberty/paos/impl/ResponseTest.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/providers/ExpiringUsernameAuthenticationTokenTest.java b/core/src/test/java/org/springframework/security/providers/ExpiringUsernameAuthenticationTokenTest.java index 85bc67b34..90bd43604 100644 --- a/core/src/test/java/org/springframework/security/providers/ExpiringUsernameAuthenticationTokenTest.java +++ b/core/src/test/java/org/springframework/security/providers/ExpiringUsernameAuthenticationTokenTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/SAMLAuthenticationProviderTest.java b/core/src/test/java/org/springframework/security/saml/SAMLAuthenticationProviderTest.java index 86edfc314..3e1616708 100644 --- a/core/src/test/java/org/springframework/security/saml/SAMLAuthenticationProviderTest.java +++ b/core/src/test/java/org/springframework/security/saml/SAMLAuthenticationProviderTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/SAMLAuthenticationTokenTest.java b/core/src/test/java/org/springframework/security/saml/SAMLAuthenticationTokenTest.java index 33210875a..4ba1cfb26 100644 --- a/core/src/test/java/org/springframework/security/saml/SAMLAuthenticationTokenTest.java +++ b/core/src/test/java/org/springframework/security/saml/SAMLAuthenticationTokenTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/SAMLCredentialTest.java b/core/src/test/java/org/springframework/security/saml/SAMLCredentialTest.java index 3f4a4f530..0910a3046 100644 --- a/core/src/test/java/org/springframework/security/saml/SAMLCredentialTest.java +++ b/core/src/test/java/org/springframework/security/saml/SAMLCredentialTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/SAMLEntryPointTest.java b/core/src/test/java/org/springframework/security/saml/SAMLEntryPointTest.java index 2bb6c4566..bbcc9c7a6 100644 --- a/core/src/test/java/org/springframework/security/saml/SAMLEntryPointTest.java +++ b/core/src/test/java/org/springframework/security/saml/SAMLEntryPointTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/SAMLLogoutFilterTest.java b/core/src/test/java/org/springframework/security/saml/SAMLLogoutFilterTest.java index a068a229c..c182cb92b 100644 --- a/core/src/test/java/org/springframework/security/saml/SAMLLogoutFilterTest.java +++ b/core/src/test/java/org/springframework/security/saml/SAMLLogoutFilterTest.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/SAMLLogoutProcessingFilterTest.java b/core/src/test/java/org/springframework/security/saml/SAMLLogoutProcessingFilterTest.java index 5eb79cce6..287bb4ea1 100644 --- a/core/src/test/java/org/springframework/security/saml/SAMLLogoutProcessingFilterTest.java +++ b/core/src/test/java/org/springframework/security/saml/SAMLLogoutProcessingFilterTest.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/SAMLProcessingFilterTest.java b/core/src/test/java/org/springframework/security/saml/SAMLProcessingFilterTest.java index 1ff36bfb1..0e94eaedd 100644 --- a/core/src/test/java/org/springframework/security/saml/SAMLProcessingFilterTest.java +++ b/core/src/test/java/org/springframework/security/saml/SAMLProcessingFilterTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/SAMLRelayStateSuccessHandlerTest.java b/core/src/test/java/org/springframework/security/saml/SAMLRelayStateSuccessHandlerTest.java index ccdabb3aa..09cec2dc3 100644 --- a/core/src/test/java/org/springframework/security/saml/SAMLRelayStateSuccessHandlerTest.java +++ b/core/src/test/java/org/springframework/security/saml/SAMLRelayStateSuccessHandlerTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/SAMLTestHelper.java b/core/src/test/java/org/springframework/security/saml/SAMLTestHelper.java index a182f1128..581fc7318 100644 --- a/core/src/test/java/org/springframework/security/saml/SAMLTestHelper.java +++ b/core/src/test/java/org/springframework/security/saml/SAMLTestHelper.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/context/SAMLContextProviderImplTest.java b/core/src/test/java/org/springframework/security/saml/context/SAMLContextProviderImplTest.java index a34b483f9..ee4e61e1f 100755 --- a/core/src/test/java/org/springframework/security/saml/context/SAMLContextProviderImplTest.java +++ b/core/src/test/java/org/springframework/security/saml/context/SAMLContextProviderImplTest.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/key/JKSKeyManagerTest.java b/core/src/test/java/org/springframework/security/saml/key/JKSKeyManagerTest.java index 94f98f2ff..7b62ae9d0 100644 --- a/core/src/test/java/org/springframework/security/saml/key/JKSKeyManagerTest.java +++ b/core/src/test/java/org/springframework/security/saml/key/JKSKeyManagerTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/metadata/MetadataGeneratorFilterTest.java b/core/src/test/java/org/springframework/security/saml/metadata/MetadataGeneratorFilterTest.java index d11056a08..09d175cf4 100644 --- a/core/src/test/java/org/springframework/security/saml/metadata/MetadataGeneratorFilterTest.java +++ b/core/src/test/java/org/springframework/security/saml/metadata/MetadataGeneratorFilterTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/metadata/MetadataGeneratorTest.java b/core/src/test/java/org/springframework/security/saml/metadata/MetadataGeneratorTest.java index 43ea162b2..30a3e59e2 100644 --- a/core/src/test/java/org/springframework/security/saml/metadata/MetadataGeneratorTest.java +++ b/core/src/test/java/org/springframework/security/saml/metadata/MetadataGeneratorTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerSignaturesTest.java b/core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerSignaturesTest.java index 9ef8542e6..41904f28d 100644 --- a/core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerSignaturesTest.java +++ b/core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerSignaturesTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerTest.java b/core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerTest.java index 2bb07b5c8..5ff52e1a2 100644 --- a/core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerTest.java +++ b/core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/parser/SAMLCollectionTest.java b/core/src/test/java/org/springframework/security/saml/parser/SAMLCollectionTest.java index 736b3af2a..666404422 100644 --- a/core/src/test/java/org/springframework/security/saml/parser/SAMLCollectionTest.java +++ b/core/src/test/java/org/springframework/security/saml/parser/SAMLCollectionTest.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/parser/SAMLObjectTest.java b/core/src/test/java/org/springframework/security/saml/parser/SAMLObjectTest.java index 099bf8dcd..ad3ed5dd5 100644 --- a/core/src/test/java/org/springframework/security/saml/parser/SAMLObjectTest.java +++ b/core/src/test/java/org/springframework/security/saml/parser/SAMLObjectTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/processor/SAMLProcessorImplTest.java b/core/src/test/java/org/springframework/security/saml/processor/SAMLProcessorImplTest.java index 7d6a877b4..365bdf865 100644 --- a/core/src/test/java/org/springframework/security/saml/processor/SAMLProcessorImplTest.java +++ b/core/src/test/java/org/springframework/security/saml/processor/SAMLProcessorImplTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/storage/HttpSessionStorageTest.java b/core/src/test/java/org/springframework/security/saml/storage/HttpSessionStorageTest.java index cf2faee01..be427d453 100644 --- a/core/src/test/java/org/springframework/security/saml/storage/HttpSessionStorageTest.java +++ b/core/src/test/java/org/springframework/security/saml/storage/HttpSessionStorageTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/storage/StorageFactoryTestImpl.java b/core/src/test/java/org/springframework/security/saml/storage/StorageFactoryTestImpl.java index f2ea7ca94..472ba86a4 100644 --- a/core/src/test/java/org/springframework/security/saml/storage/StorageFactoryTestImpl.java +++ b/core/src/test/java/org/springframework/security/saml/storage/StorageFactoryTestImpl.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/trust/UntrustedCertificateExceptionTest.java b/core/src/test/java/org/springframework/security/saml/trust/UntrustedCertificateExceptionTest.java index 615037669..a7f9ac40b 100644 --- a/core/src/test/java/org/springframework/security/saml/trust/UntrustedCertificateExceptionTest.java +++ b/core/src/test/java/org/springframework/security/saml/trust/UntrustedCertificateExceptionTest.java @@ -5,7 +5,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/websso/ArtifactResolutionProfileImplTest.java b/core/src/test/java/org/springframework/security/saml/websso/ArtifactResolutionProfileImplTest.java index 118f0a374..a2875e20d 100644 --- a/core/src/test/java/org/springframework/security/saml/websso/ArtifactResolutionProfileImplTest.java +++ b/core/src/test/java/org/springframework/security/saml/websso/ArtifactResolutionProfileImplTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileConsumerImplTest.java b/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileConsumerImplTest.java index 12e1ac5f0..cb8186fb2 100644 --- a/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileConsumerImplTest.java +++ b/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileConsumerImplTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileHoKImplTest.java b/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileHoKImplTest.java index 349fd8f88..2774ac91c 100644 --- a/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileHoKImplTest.java +++ b/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileHoKImplTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileImplTest.java b/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileImplTest.java index 37656e644..4d7d07740 100644 --- a/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileImplTest.java +++ b/core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileImplTest.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/docs/dist/license.txt b/docs/dist/license.txt index 261eeb9e9..20e4bd856 100644 --- a/docs/dist/license.txt +++ b/docs/dist/license.txt @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -192,7 +192,7 @@ 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 + https://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, diff --git a/docs/reference/docbook/introduction.xml b/docs/reference/docbook/introduction.xml index 17f15a819..b6be2a440 100644 --- a/docs/reference/docbook/introduction.xml +++ b/docs/reference/docbook/introduction.xml @@ -175,7 +175,7 @@ License Source code of the module is licensed under the Apache License, Version 2.0. You may obtain copy - of the license at http://www.apache.org/licenses/LICENSE-2.0. + of the license at https://www.apache.org/licenses/LICENSE-2.0.
diff --git a/sample/src/main/java/org/springframework/security/saml/web/MetadataController.java b/sample/src/main/java/org/springframework/security/saml/web/MetadataController.java index e82f43e1a..b2df5f27a 100755 --- a/sample/src/main/java/org/springframework/security/saml/web/MetadataController.java +++ b/sample/src/main/java/org/springframework/security/saml/web/MetadataController.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/sample/src/main/java/org/springframework/security/saml/web/MetadataForm.java b/sample/src/main/java/org/springframework/security/saml/web/MetadataForm.java index 88a72a777..d85feb9b5 100755 --- a/sample/src/main/java/org/springframework/security/saml/web/MetadataForm.java +++ b/sample/src/main/java/org/springframework/security/saml/web/MetadataForm.java @@ -4,7 +4,7 @@ * 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 + * https://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, diff --git a/sample/src/main/java/org/springframework/security/saml/web/MetadataValidator.java b/sample/src/main/java/org/springframework/security/saml/web/MetadataValidator.java index f5ce6d436..de08f40f9 100755 --- a/sample/src/main/java/org/springframework/security/saml/web/MetadataValidator.java +++ b/sample/src/main/java/org/springframework/security/saml/web/MetadataValidator.java @@ -4,7 +4,7 @@ * 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 + * https://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, From 8c0aaf90ef245e4147e59918b362478072549f24 Mon Sep 17 00:00:00 2001 From: James Howe <675056+OrangeDog@users.noreply.github.com> Date: Fri, 3 May 2019 17:20:21 +0100 Subject: [PATCH 02/10] Fix initialisation of provider filters Always create a new chain to simplify branches. Use `chain.setFilters()` to avoid `UnsupportedOperationException`. Insert validation filters at the top of the chain. Ensure `setMetadataFilter` is called. Hopefully fixes: #153 #160 #199 --- .../saml/metadata/MetadataManager.java | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java index 02899ab96..011059700 100644 --- a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java @@ -15,15 +15,7 @@ package org.springframework.security.saml.metadata; import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; +import java.util.*; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.opensaml.common.xml.SAMLConstants; @@ -551,19 +543,12 @@ protected void initializeProviderFilters(ExtendedMetadataDelegate provider) thro log.debug("Created new trust manager for metadata provider {}", provider); - // Combine any existing filters with the signature verification MetadataFilter currentFilter = provider.getMetadataFilter(); if (currentFilter != null) { - if (currentFilter instanceof MetadataFilterChain) { - log.debug("Adding signature filter into existing chain"); - MetadataFilterChain chain = (MetadataFilterChain) currentFilter; - chain.getFilters().add(filter); - } else { - log.debug("Combining signature filter with the existing in a new chain"); - MetadataFilterChain chain = new MetadataFilterChain(); - chain.getFilters().add(currentFilter); - chain.getFilters().add(filter); - } + log.debug("Adding signature filter before existing filters"); + MetadataFilterChain chain = new MetadataFilterChain(); + chain.setFilters(Arrays.asList(filter, currentFilter)); + provider.setMetadataFilter(chain); } else { log.debug("Adding signature filter"); provider.setMetadataFilter(filter); @@ -1112,4 +1097,4 @@ public void setTLSConfigurer(TLSProtocolConfigurer configurer) { // Only explicit dependency } -} \ No newline at end of file +} From 1f4901996860e67b264bd423fefb913ac79ae637 Mon Sep 17 00:00:00 2001 From: James Howe <675056+OrangeDog@users.noreply.github.com> Date: Wed, 18 Sep 2019 14:34:49 +0100 Subject: [PATCH 03/10] Missing placeholder in debug messages (Obvious Fix) --- .../security/saml/metadata/MetadataManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java index 011059700..d77493130 100644 --- a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java @@ -250,18 +250,18 @@ public void refreshMetadata() { try { - log.debug("Refreshing metadata provider {}", provider.toString()); + log.debug("Refreshing metadata provider {}", provider); initializeProviderFilters(provider); initializeProvider(provider); initializeProviderData(provider); // Make provider available for queries super.addMetadataProvider(provider); - log.debug("Metadata provider was initialized {}", provider.toString()); + log.debug("Metadata provider was initialized {}", provider); } catch (MetadataProviderException e) { - log.error("Initialization of metadata provider " + provider + " failed, provider will be ignored", e); + log.error("Initialization of metadata provider {} failed, provider will be ignored", provider, e); } @@ -689,7 +689,7 @@ protected List parseProvider(MetadataProvider provider) throws MetadataP */ private void addDescriptors(List result, EntitiesDescriptor descriptors) throws MetadataProviderException { - log.debug("Found metadata EntitiesDescriptor with ID", descriptors.getID()); + log.debug("Found metadata EntitiesDescriptor with ID {}", descriptors.getID()); if (descriptors.getEntitiesDescriptors() != null) { for (EntitiesDescriptor descriptor : descriptors.getEntitiesDescriptors()) { @@ -715,7 +715,7 @@ private void addDescriptors(List result, EntitiesDescriptor descriptors) private void addDescriptor(List result, EntityDescriptor descriptor) throws MetadataProviderException { String entityID = descriptor.getEntityID(); - log.debug("Found metadata EntityDescriptor with ID", entityID); + log.debug("Found metadata EntityDescriptor with ID {}", entityID); result.add(entityID); } From ef8fd35b1b725175b788c67441d3ae1237c1f8e1 Mon Sep 17 00:00:00 2001 From: charliehubbard Date: Tue, 29 Oct 2019 12:33:24 -0400 Subject: [PATCH 04/10] spring-projects/spring-security-saml#233 Provide fixes to name verification of certs for trust engine when using TLSProtocolConfigurer and TLSProtocolSocketFactory which would always send a null in for trustedKey names. This caused the algorithm in BasicX509CredentialNameEvaluator to always reject any key over HTTPS regardless if that cert was imported into the keystore properly. --- .../security/saml/metadata/MetadataManager.java | 4 +++- .../trust/httpclient/TLSProtocolSocketFactory.java | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java index b18883e2b..2d7236e1f 100644 --- a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java @@ -640,11 +640,13 @@ protected PKIXValidationInformationResolver getPKIXResolver(MetadataProvider pro // Resolve allowed certificates to build the anchors List certificates = new LinkedList(); + Set trustedSubjectDns = new HashSet(); for (String key : trustedKeys) { log.debug("Adding PKIX trust anchor {} for metadata verification of provider {}", key, provider); X509Certificate certificate = keyManager.getCertificate(key); if (certificate != null) { certificates.add(certificate); + trustedSubjectDns.add( certificate.getSubjectDN().getName() ); } else { log.warn("Cannot construct PKIX trust anchor for key with alias {} for provider {}, key isn't included in the keystore", key, provider); } @@ -652,7 +654,7 @@ protected PKIXValidationInformationResolver getPKIXResolver(MetadataProvider pro List info = new LinkedList(); info.add(new BasicPKIXValidationInformation(certificates, null, 4)); - return new StaticPKIXValidationInformationResolver(info, trustedNames) { + return new StaticPKIXValidationInformationResolver(info, trustedNames != null ? trustedNames : trustedSubjectDns) { @Override public Set resolveTrustedNames(CriteriaSet criteriaSet) throws SecurityException, UnsupportedOperationException { diff --git a/core/src/main/java/org/springframework/security/saml/trust/httpclient/TLSProtocolSocketFactory.java b/core/src/main/java/org/springframework/security/saml/trust/httpclient/TLSProtocolSocketFactory.java index c5ed5aa1f..fc7b2d193 100644 --- a/core/src/main/java/org/springframework/security/saml/trust/httpclient/TLSProtocolSocketFactory.java +++ b/core/src/main/java/org/springframework/security/saml/trust/httpclient/TLSProtocolSocketFactory.java @@ -26,10 +26,7 @@ import java.net.InetAddress; import java.net.Socket; import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; +import java.util.*; /** * Socket factory can be used with HTTP Client for creation of SSL/TLS sockets. Implementation uses internal KeyManager @@ -136,14 +133,17 @@ protected PKIXValidationInformationResolver getPKIXResolver() { // Resolve allowed certificates to build the anchors List certificates = new ArrayList(trustedKeys.size()); + Set subjectDNs = new HashSet(trustedKeys.size()); for (String key : trustedKeys) { log.debug("Adding PKIX trust anchor {} for SSL/TLS verification {}", key); - certificates.add(keyManager.getCertificate(key)); + X509Certificate cert = keyManager.getCertificate(key); + certificates.add(cert); + subjectDNs.add(cert.getSubjectDN().getName()); } List info = new LinkedList(); info.add(new BasicPKIXValidationInformation(certificates, null, 4)); - return new StaticPKIXValidationInformationResolver(info, null); + return new StaticPKIXValidationInformationResolver(info, subjectDNs); } From 896af5a23c1a5fbffa4ec1957e0133a662304855 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Fri, 8 Nov 2019 08:25:51 -0800 Subject: [PATCH 05/10] reformat --- .../saml/metadata/MetadataManager.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java index fe395a21c..17acde390 100644 --- a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java @@ -14,18 +14,6 @@ */ package org.springframework.security.saml.metadata; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; -import java.util.concurrent.locks.ReentrantReadWriteLock; - import org.opensaml.common.xml.SAMLConstants; import org.opensaml.saml2.metadata.EntitiesDescriptor; import org.opensaml.saml2.metadata.EntityDescriptor; @@ -62,6 +50,19 @@ import org.springframework.security.saml.util.SAMLUtil; import org.springframework.util.Assert; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.Timer; +import java.util.TimerTask; +import java.util.concurrent.locks.ReentrantReadWriteLock; + /** * Class offers extra services on top of the underlying chaining MetadataProviders. Manager keeps track of all available * identity and service providers configured inside the chained metadata providers. Exactly one service provider can From a30ee46d97b13f5d37f9d3443d91a4daedff3ee7 Mon Sep 17 00:00:00 2001 From: Filip Hanik Date: Fri, 8 Nov 2019 08:32:37 -0800 Subject: [PATCH 06/10] Upgrade dependencies --- build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 22226687a..e90f62900 100644 --- a/build.gradle +++ b/build.gradle @@ -15,14 +15,14 @@ def coreProjects = subprojects.findAll { !it.name.contains("sample") } configure(allprojects) { project -> group = "org.springframework.security.extensions" - ext.slf4jVersion = "1.7.25" - ext.springVersion = "4.3.14.RELEASE" - ext.springSecurityVersion = "4.2.4.RELEASE" - ext.bcprovVersion = "1.60" - ext.bcpkixVersion = "1.60" + ext.slf4jVersion = "1.7.29" + ext.springVersion = "4.3.25.RELEASE" + ext.springSecurityVersion = "4.2.13.RELEASE" + ext.bcprovVersion = "1.64" + ext.bcpkixVersion = "1.64" ext.openSamlVersion = "2.6.6" ext.openSamlXmlSec = "1.5.8" - ext.esapiVersion = "2.1.0.1" + ext.esapiVersion = "2.2.0.0" ext.xalanVersion = "2.7.2" ext.xmlApisVersion = "1.4.01" ext.gradleScriptDir = "${rootProject.projectDir}/gradle" From f374a3b5f762437f1585ed906abe5a41b4a6a2cf Mon Sep 17 00:00:00 2001 From: Spring Buildmaster Date: Fri, 8 Nov 2019 16:48:55 +0000 Subject: [PATCH 07/10] [artifactory-release] Next development version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9ae90dd46..2c666534f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version=1.0.10.BUILD-SNAPSHOT +version=1.0.11.BUILD-SNAPSHOT maxParallelForks=1 From f58a8fac41a25a6a993db8f011e0e86ae69463e6 Mon Sep 17 00:00:00 2001 From: charliehubbard Date: Tue, 29 Oct 2019 12:33:24 -0400 Subject: [PATCH 08/10] spring-projects/spring-security-saml#233 Provide fixes to name verification of certs for trust engine when using TLSProtocolConfigurer and TLSProtocolSocketFactory which would always send a null in for trustedKey names. This caused the algorithm in BasicX509CredentialNameEvaluator to always reject any key over HTTPS regardless if that cert was imported into the keystore properly. --- .../security/saml/metadata/MetadataManager.java | 4 +++- .../trust/httpclient/TLSProtocolSocketFactory.java | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java index 17acde390..28e59abb7 100644 --- a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java @@ -634,11 +634,13 @@ protected PKIXValidationInformationResolver getPKIXResolver(MetadataProvider pro // Resolve allowed certificates to build the anchors List certificates = new LinkedList(); + Set trustedSubjectDns = new HashSet(); for (String key : trustedKeys) { log.debug("Adding PKIX trust anchor {} for metadata verification of provider {}", key, provider); X509Certificate certificate = keyManager.getCertificate(key); if (certificate != null) { certificates.add(certificate); + trustedSubjectDns.add( certificate.getSubjectDN().getName() ); } else { log.warn("Cannot construct PKIX trust anchor for key with alias {} for provider {}, key isn't included in the keystore", key, provider); } @@ -646,7 +648,7 @@ protected PKIXValidationInformationResolver getPKIXResolver(MetadataProvider pro List info = new LinkedList(); info.add(new BasicPKIXValidationInformation(certificates, null, 4)); - return new StaticPKIXValidationInformationResolver(info, trustedNames) { + return new StaticPKIXValidationInformationResolver(info, trustedNames != null ? trustedNames : trustedSubjectDns) { @Override public Set resolveTrustedNames(CriteriaSet criteriaSet) throws SecurityException, UnsupportedOperationException { diff --git a/core/src/main/java/org/springframework/security/saml/trust/httpclient/TLSProtocolSocketFactory.java b/core/src/main/java/org/springframework/security/saml/trust/httpclient/TLSProtocolSocketFactory.java index c5ed5aa1f..fc7b2d193 100644 --- a/core/src/main/java/org/springframework/security/saml/trust/httpclient/TLSProtocolSocketFactory.java +++ b/core/src/main/java/org/springframework/security/saml/trust/httpclient/TLSProtocolSocketFactory.java @@ -26,10 +26,7 @@ import java.net.InetAddress; import java.net.Socket; import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; +import java.util.*; /** * Socket factory can be used with HTTP Client for creation of SSL/TLS sockets. Implementation uses internal KeyManager @@ -136,14 +133,17 @@ protected PKIXValidationInformationResolver getPKIXResolver() { // Resolve allowed certificates to build the anchors List certificates = new ArrayList(trustedKeys.size()); + Set subjectDNs = new HashSet(trustedKeys.size()); for (String key : trustedKeys) { log.debug("Adding PKIX trust anchor {} for SSL/TLS verification {}", key); - certificates.add(keyManager.getCertificate(key)); + X509Certificate cert = keyManager.getCertificate(key); + certificates.add(cert); + subjectDNs.add(cert.getSubjectDN().getName()); } List info = new LinkedList(); info.add(new BasicPKIXValidationInformation(certificates, null, 4)); - return new StaticPKIXValidationInformationResolver(info, null); + return new StaticPKIXValidationInformationResolver(info, subjectDNs); } From 678f45a3d5565fdfab6b3675f263893156e95e5a Mon Sep 17 00:00:00 2001 From: charliehubbard Date: Fri, 22 May 2020 12:26:59 -0400 Subject: [PATCH 09/10] spring-projects/spring-security-saml#233 Added a test to verify when TLSConfigurer is loaded and we are validating against chained certs things still work. --- .../MetadataManagerWithTLSConfigurer.java | 53 +++++++++++++++++++ .../MetadataManagerWithTLSConfigurer.xml | 43 +++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerWithTLSConfigurer.java create mode 100644 core/src/test/resources/org/springframework/security/saml/metadata/MetadataManagerWithTLSConfigurer.xml diff --git a/core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerWithTLSConfigurer.java b/core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerWithTLSConfigurer.java new file mode 100644 index 000000000..61463897b --- /dev/null +++ b/core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerWithTLSConfigurer.java @@ -0,0 +1,53 @@ +package org.springframework.security.saml.metadata; + +import org.junit.Before; +import org.junit.Test; +import org.opensaml.saml2.metadata.provider.FilesystemMetadataProvider; +import org.opensaml.xml.parse.ParserPool; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.security.saml.key.KeyManager; + +import java.io.File; + +import static junit.framework.Assert.assertNotNull; + +public class MetadataManagerWithTLSConfigurer { + + ApplicationContext context; + KeyManager keyManager; + MetadataManager manager; + ParserPool pool; + + @Before + public void initialize() throws Exception { + String resName = "/" + getClass().getName().replace('.', '/') + ".xml"; + context = new ClassPathXmlApplicationContext(resName); + keyManager = context.getBean("keyManager", KeyManager.class); + manager = context.getBean("metadata", MetadataManager.class); + pool = context.getBean("parserPool", ParserPool.class); + } + + @Test + public void testExplicitKeyStore() throws Exception { + ExtendedMetadataDelegate provider = getMetadata("classpath:testSP_signed_ca2_chain.xml"); + provider.setMetadataRequireSignature(true); + provider.setMetadataTrustCheck(true); + provider.setForceMetadataRevocationCheck(true); + + manager.addMetadataProvider(provider); + manager.refreshMetadata(); + + assertNotNull(manager.getEntityDescriptor("test_ca2")); + + } + + protected ExtendedMetadataDelegate getMetadata(String fileName) throws Exception { + File file = context.getResource(fileName).getFile(); + FilesystemMetadataProvider innerProvider = new FilesystemMetadataProvider(file); + innerProvider.setParserPool(pool); + return new ExtendedMetadataDelegate(innerProvider); + } + + +} diff --git a/core/src/test/resources/org/springframework/security/saml/metadata/MetadataManagerWithTLSConfigurer.xml b/core/src/test/resources/org/springframework/security/saml/metadata/MetadataManagerWithTLSConfigurer.xml new file mode 100644 index 000000000..9b90fc20e --- /dev/null +++ b/core/src/test/resources/org/springframework/security/saml/metadata/MetadataManagerWithTLSConfigurer.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 39aba9d22132a292ebb7c8a18560bc500f4b117b Mon Sep 17 00:00:00 2001 From: charliehubbard Date: Sat, 17 Jul 2021 18:08:54 -0400 Subject: [PATCH 10/10] spring-projects/spring-security-saml#233 Make members protected so subclasses can work with the internals of this class better. --- .../saml/metadata/MetadataManager.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java index 28e59abb7..1f61d1609 100644 --- a/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java +++ b/core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java @@ -81,46 +81,46 @@ public class MetadataManager extends ChainingMetadataProvider implements Extende protected final Logger log = LoggerFactory.getLogger(MetadataManager.class); // Lock for the instance - private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + protected final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); // Lock for the refresh mechanism - private final ReentrantReadWriteLock refreshLock = new ReentrantReadWriteLock(); + protected final ReentrantReadWriteLock refreshLock = new ReentrantReadWriteLock(); - private String hostedSPName; + protected String hostedSPName; - private String defaultIDP; + protected String defaultIDP; - private ExtendedMetadata defaultExtendedMetadata; + protected ExtendedMetadata defaultExtendedMetadata; // Timer used to refresh the metadata upon changes - private Timer timer; + protected Timer timer; // Internal of metadata refresh checking in ms - private long refreshCheckInterval = 10000l; + protected long refreshCheckInterval = 10000l; // Flag indicating whether metadata needs to be reloaded - private boolean refreshRequired = true; + protected boolean refreshRequired = true; // Storage for cryptographic data used to verify metadata signatures protected KeyManager keyManager; // All providers which were added, not all may be active - private List availableProviders; + protected List availableProviders; /** * Set of IDP names available in the system. */ - private Set idpName; + protected Set idpName; /** * Set of SP names available in the system. */ - private Set spName; + protected Set spName; /** * All valid aliases. */ - private Set aliasSet; + protected Set aliasSet; /** * Creates new metadata manager, automatically registers itself for notifications from metadata changes and calls