Skip to content
Permalink
Browse files

Line endings change

  • Loading branch information...
fhanik committed Mar 26, 2018
1 parent baf633d commit 0b0d33cbad55f0d21e1acbcf89f7992a87b7b303
Showing with 22,774 additions and 22,774 deletions.
  1. +31 −31 core/src/main/java/org/opensaml/saml2/binding/decoding/HTTPSOAP11DecoderImpl.java
  2. +10 −10 core/src/main/java/org/opensaml/ws/transport/http/LocationAwareInTransport.java
  3. +84 −84 core/src/main/java/org/springframework/security/providers/ExpiringUsernameAuthenticationToken.java
  4. +333 −333 core/src/main/java/org/springframework/security/saml/SAMLAuthenticationProvider.java
  5. +85 −85 core/src/main/java/org/springframework/security/saml/SAMLAuthenticationToken.java
  6. +78 −78 core/src/main/java/org/springframework/security/saml/SAMLBootstrap.java
  7. +91 −91 core/src/main/java/org/springframework/security/saml/SAMLConstants.java
  8. +257 −257 core/src/main/java/org/springframework/security/saml/SAMLCredential.java
  9. +456 −456 core/src/main/java/org/springframework/security/saml/SAMLDiscovery.java
  10. +450 −450 core/src/main/java/org/springframework/security/saml/SAMLEntryPoint.java
  11. +254 −254 core/src/main/java/org/springframework/security/saml/SAMLLogoutFilter.java
  12. +318 −318 core/src/main/java/org/springframework/security/saml/SAMLLogoutProcessingFilter.java
  13. +204 −204 core/src/main/java/org/springframework/security/saml/SAMLProcessingFilter.java
  14. +73 −73 core/src/main/java/org/springframework/security/saml/SAMLRelayStateSuccessHandler.java
  15. +45 −45 core/src/main/java/org/springframework/security/saml/SAMLWebSSOHoKProcessingFilter.java
  16. +53 −53 core/src/main/java/org/springframework/security/saml/context/SAMLContextProvider.java
  17. +596 −596 core/src/main/java/org/springframework/security/saml/context/SAMLContextProviderImpl.java
  18. +235 −235 core/src/main/java/org/springframework/security/saml/context/SAMLMessageContext.java
  19. +220 −220 core/src/main/java/org/springframework/security/saml/key/JKSKeyManager.java
  20. +70 −70 core/src/main/java/org/springframework/security/saml/key/KeyManager.java
  21. +165 −165 core/src/main/java/org/springframework/security/saml/log/SAMLDefaultLogger.java
  22. +37 −37 core/src/main/java/org/springframework/security/saml/log/SAMLEmptyLogger.java
  23. +32 −32 core/src/main/java/org/springframework/security/saml/log/SAMLLogger.java
  24. +131 −131 core/src/main/java/org/springframework/security/saml/metadata/AbstractMetadataDelegate.java
  25. +223 −223 core/src/main/java/org/springframework/security/saml/metadata/CachingMetadataManager.java
  26. +613 −613 core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadata.java
  27. +266 −266 core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadataDelegate.java
  28. +35 −35 core/src/main/java/org/springframework/security/saml/metadata/ExtendedMetadataProvider.java
  29. +194 −194 core/src/main/java/org/springframework/security/saml/metadata/MetadataDisplayFilter.java
  30. +893 −893 core/src/main/java/org/springframework/security/saml/metadata/MetadataGenerator.java
  31. +223 −223 core/src/main/java/org/springframework/security/saml/metadata/MetadataGeneratorFilter.java
  32. +1,114 −1,114 core/src/main/java/org/springframework/security/saml/metadata/MetadataManager.java
  33. +54 −54 core/src/main/java/org/springframework/security/saml/metadata/MetadataMemoryProvider.java
  34. +68 −68 core/src/main/java/org/springframework/security/saml/parser/ParserPoolHolder.java
  35. +150 −150 core/src/main/java/org/springframework/security/saml/parser/SAMLBase.java
  36. +109 −109 core/src/main/java/org/springframework/security/saml/parser/SAMLCollection.java
  37. +99 −99 core/src/main/java/org/springframework/security/saml/parser/SAMLObject.java
  38. +91 −91 core/src/main/java/org/springframework/security/saml/processor/HTTPArtifactBinding.java
  39. +103 −103 core/src/main/java/org/springframework/security/saml/processor/HTTPPostBinding.java
  40. +89 −89 core/src/main/java/org/springframework/security/saml/processor/HTTPRedirectDeflateBinding.java
  41. +86 −86 core/src/main/java/org/springframework/security/saml/processor/HTTPSOAP11Binding.java
  42. +77 −77 core/src/main/java/org/springframework/security/saml/processor/SAMLBinding.java
  43. +50 −50 core/src/main/java/org/springframework/security/saml/processor/SAMLBindingImpl.java
  44. +38 −38 core/src/main/java/org/springframework/security/saml/processor/SAMLProcessor.java
  45. +303 −303 core/src/main/java/org/springframework/security/saml/processor/SAMLProcessorImpl.java
  46. +179 −179 core/src/main/java/org/springframework/security/saml/storage/HttpSessionStorage.java
  47. +45 −45 core/src/main/java/org/springframework/security/saml/storage/SAMLMessageStorage.java
  48. +47 −47 core/src/main/java/org/springframework/security/saml/trust/AllowAllSignatureTrustEngine.java
  49. +158 −158 core/src/main/java/org/springframework/security/saml/trust/MetadataCredentialResolver.java
  50. +484 −484 core/src/main/java/org/springframework/security/saml/trust/PKIXInformationResolver.java
  51. +81 −81 core/src/main/java/org/springframework/security/saml/trust/X509KeyManager.java
  52. +104 −104 core/src/main/java/org/springframework/security/saml/trust/X509TrustManager.java
  53. +47 −47 core/src/main/java/org/springframework/security/saml/userdetails/SAMLUserDetailsService.java
  54. +668 −668 core/src/main/java/org/springframework/security/saml/util/SAMLUtil.java
  55. +41 −41 core/src/main/java/org/springframework/security/saml/util/VelocityFactory.java
  56. +340 −340 core/src/main/java/org/springframework/security/saml/websso/AbstractProfileBase.java
  57. +39 −39 core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfile.java
  58. +186 −186 core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfileBase.java
  59. +258 −258 core/src/main/java/org/springframework/security/saml/websso/ArtifactResolutionProfileImpl.java
  60. +82 −82 core/src/main/java/org/springframework/security/saml/websso/SingleLogoutProfile.java
  61. +359 −359 core/src/main/java/org/springframework/security/saml/websso/SingleLogoutProfileImpl.java
  62. +29 −29 core/src/main/java/org/springframework/security/saml/websso/WebSSOProfile.java
  63. +32 −32 core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumer.java
  64. +181 −181 core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumerHoKImpl.java
  65. +689 −689 core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileConsumerImpl.java
  66. +65 −65 core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileHoKImpl.java
  67. +428 −428 core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileImpl.java
  68. +293 −293 core/src/main/java/org/springframework/security/saml/websso/WebSSOProfileOptions.java
  69. +40 −40 core/src/main/resources/schema/liberty-schema-paos-1.1.xsd
  70. +107 −107 core/src/test/java/org/opensaml/common/BaseSAMLObjectProviderTestCase.java
  71. +176 −176 core/src/test/java/org/opensaml/common/BaseTestCase.java
  72. +33 −33 core/src/test/java/org/opensaml/common/BootstrapHelper.java
  73. +83 −83 ...src/test/java/org/springframework/security/providers/ExpiringUsernameAuthenticationTokenTest.java
  74. +182 −182 core/src/test/java/org/springframework/security/saml/SAMLAuthenticationProviderTest.java
  75. +63 −63 core/src/test/java/org/springframework/security/saml/SAMLAuthenticationTokenTest.java
  76. +142 −142 core/src/test/java/org/springframework/security/saml/SAMLCredentialTest.java
  77. +357 −357 core/src/test/java/org/springframework/security/saml/SAMLEntryPointTest.java
  78. +232 −232 core/src/test/java/org/springframework/security/saml/SAMLProcessingFilterTest.java
  79. +99 −99 core/src/test/java/org/springframework/security/saml/SAMLRelayStateSuccessHandlerTest.java
  80. +170 −170 core/src/test/java/org/springframework/security/saml/context/SAMLContextProviderImplTest.java
  81. +99 −99 core/src/test/java/org/springframework/security/saml/key/JKSKeyManagerTest.java
  82. +198 −198 core/src/test/java/org/springframework/security/saml/metadata/MetadataGeneratorTest.java
  83. +245 −245 core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerSignaturesTest.java
  84. +345 −345 core/src/test/java/org/springframework/security/saml/metadata/MetadataManagerTest.java
  85. +116 −116 core/src/test/java/org/springframework/security/saml/parser/SAMLCollectionTest.java
  86. +247 −247 core/src/test/java/org/springframework/security/saml/parser/SAMLObjectTest.java
  87. +207 −207 core/src/test/java/org/springframework/security/saml/processor/SAMLProcessorImplTest.java
  88. +211 −211 core/src/test/java/org/springframework/security/saml/storage/HttpSessionStorageTest.java
  89. +415 −415 core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileConsumerImplTest.java
  90. +332 −332 core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileHoKImplTest.java
  91. +409 −409 core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileImplTest.java
  92. +179 −179 core/src/test/java/org/springframework/security/saml/websso/WebSSOProfileTestHelper.java
  93. +6 −6 core/src/test/resources/log4j.properties
  94. +72 −72 core/src/test/resources/message/SAMLResponse.xml
  95. +69 −69 core/src/test/resources/message/SAMLResponseInvalidSignature.xml
  96. +112 −112 core/src/test/resources/org/springframework/security/saml/SAMLEntryPointTest.xml
  97. +156 −156 core/src/test/resources/org/springframework/security/saml/SAMLProcessingFilterTest.xml
  98. +160 −160 core/src/test/resources/org/springframework/security/saml/context/SAMLContextProviderImplTest.xml
  99. +17 −17 core/src/test/resources/org/springframework/security/saml/key/JKSKeyManagerTest.xml
  100. +119 −119 core/src/test/resources/org/springframework/security/saml/metadata/MetadataGeneratorTest.xml
  101. +41 −41 core/src/test/resources/org/springframework/security/saml/metadata/MetadataManagerSignaturesTest.xml
  102. +120 −120 core/src/test/resources/org/springframework/security/saml/metadata/MetadataManagerTest.xml
  103. +98 −98 core/src/test/resources/org/springframework/security/saml/processor/SAMLProcessorImplTest.xml
  104. +110 −110 core/src/test/resources/org/springframework/security/saml/websso/WebSSOProfileConsumerImplTest.xml
  105. +135 −135 core/src/test/resources/org/springframework/security/saml/websso/WebSSOProfileHoKImplTest.xml
  106. +137 −137 core/src/test/resources/org/springframework/security/saml/websso/WebSSOProfileImplTest.xml
  107. +23 −23 core/src/test/resources/testIDP.xml
  108. +37 −37 core/src/test/resources/testIDPNoSSOBinding.xml
  109. +40 −40 core/src/test/resources/testIDPNoSigning.xml
  110. +69 −69 core/src/test/resources/testIDPnestedMetadata.xml
  111. +50 −50 core/src/test/resources/testSP.xml
  112. +45 −45 core/src/test/resources/testSP2.xml
  113. +1 −1 core/src/test/resources/testSPMissingDescriptor.xml
  114. +33 −33 core/src/test/resources/testSP_signed.xml
  115. +21 −21 core/src/test/resources/testSP_signed_ca.xml
  116. +45 −45 core/src/test/resources/testSP_signed_ca2.xml
  117. +93 −93 core/src/test/resources/testSP_signed_ca2_chain.xml
  118. +21 −21 core/src/test/resources/testSP_signed_invalid.xml
  119. +65 −65 docs/reference/docbook/index.xml
  120. +91 −91 gradlew.bat
  121. +413 −413 sample/src/main/java/org/springframework/security/saml/web/MetadataController.java
  122. +278 −278 sample/src/main/java/org/springframework/security/saml/web/MetadataForm.java
  123. +116 −116 sample/src/main/java/org/springframework/security/saml/web/MetadataValidator.java
  124. +15 −15 sample/src/main/resources/log4j.properties
  125. +39 −39 sample/src/main/resources/metadata/idp.xml
  126. +47 −47 sample/src/main/webapp/WEB-INF/security/idpSelection.jsp
  127. +445 −445 sample/src/main/webapp/WEB-INF/security/metadataGenerator.jsp
  128. +69 −69 sample/src/main/webapp/WEB-INF/security/metadataList.jsp
  129. +94 −94 sample/src/main/webapp/WEB-INF/security/metadataView.jsp
  130. +37 −37 sample/src/main/webapp/WEB-INF/security/providerView.jsp
  131. +333 −333 sample/src/main/webapp/WEB-INF/securityContext.xml
  132. +194 −194 sample/src/main/webapp/index.jsp
@@ -1,32 +1,32 @@
/*
* Copyright 2010 Vladimir Schaefer
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.opensaml.saml2.binding.decoding;

import net.shibboleth.utilities.java.support.xml.ParserPool;
import org.opensaml.saml.saml2.binding.decoding.impl.HTTPSOAP11Decoder;

/**
* Custom implementation of the decoder which takes into account user HTTPInput method
* for determining correct expected URI.
*/
public class HTTPSOAP11DecoderImpl extends HTTPSOAP11Decoder {

public HTTPSOAP11DecoderImpl(ParserPool pool) {
super();
setParserPool(pool);
}

/*
* Copyright 2010 Vladimir Schaefer
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.opensaml.saml2.binding.decoding;

import net.shibboleth.utilities.java.support.xml.ParserPool;
import org.opensaml.saml.saml2.binding.decoding.impl.HTTPSOAP11Decoder;

/**
* Custom implementation of the decoder which takes into account user HTTPInput method
* for determining correct expected URI.
*/
public class HTTPSOAP11DecoderImpl extends HTTPSOAP11Decoder {

public HTTPSOAP11DecoderImpl(ParserPool pool) {
super();
setParserPool(pool);
}

}
@@ -1,10 +1,10 @@
package org.opensaml.ws.transport.http;

/**
* Interface marks HTTP In Transports which can contain URL at which is the reception of data done.
*/
public interface LocationAwareInTransport {

public String getLocalAddress();

}
package org.opensaml.ws.transport.http;

/**
* Interface marks HTTP In Transports which can contain URL at which is the reception of data done.
*/
public interface LocationAwareInTransport {

public String getLocalAddress();

}
@@ -1,85 +1,85 @@
/* Copyright 2009 Vladimir Schäfer
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.security.providers;

import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;

import java.util.Collection;
import java.util.Date;

/**
* Authentication token with capability to disable itself after specific datetime. In case no expiration date is
* specified for the token functionality is exactly the same as of {@link UsernamePasswordAuthenticationToken}.
*
* @author Vladimir Schäfer
*/
public class ExpiringUsernameAuthenticationToken extends UsernamePasswordAuthenticationToken {

private Date tokenExpiration;

/**
* @param principal principal
* @param credentials credential
*
* @see UsernamePasswordAuthenticationToken#UsernamePasswordAuthenticationToken(Object, Object)
*/
public ExpiringUsernameAuthenticationToken(Object principal, Object credentials) {
super(principal, credentials);
}

/**
* Should only be used by authenticationManager as specified in {@link UsernamePasswordAuthenticationToken}. In
* case the tokenExpiration is not null the calls to the isAuthenticated method will return false after
* the current time is beyond the tokenExpiration. No functionality is changed when tokenExpiration is null.
*
* @param tokenExpiration null or date after which the token is not valid anymore
* @param principal principal
* @param credentials credentials
* @param authorities authorities
*/
public ExpiringUsernameAuthenticationToken(Date tokenExpiration, Object principal, Object credentials, Collection<? extends GrantedAuthority> authorities) {
super(principal, credentials, authorities);
this.tokenExpiration = tokenExpiration;
}

/**
* @return true in case the token is authenticated (determined by constructor call) and tokenExpiration
* is either null or the expiration time is on or after current time.
*/
@Override
public boolean isAuthenticated() {
if (tokenExpiration != null && new Date().compareTo(tokenExpiration) >= 0) {
return false;
} else {
return super.isAuthenticated();
}
}

/**
* @return null if no expiration is set, expiration date otherwise
*/
public Date getTokenExpiration() {
return tokenExpiration;
}

/**
* SAML credentials can be kept without clearing.
*/
@Override
public void eraseCredentials() {
}

/* Copyright 2009 Vladimir Schäfer
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.security.providers;

import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;

import java.util.Collection;
import java.util.Date;

/**
* Authentication token with capability to disable itself after specific datetime. In case no expiration date is
* specified for the token functionality is exactly the same as of {@link UsernamePasswordAuthenticationToken}.
*
* @author Vladimir Schäfer
*/
public class ExpiringUsernameAuthenticationToken extends UsernamePasswordAuthenticationToken {

private Date tokenExpiration;

/**
* @param principal principal
* @param credentials credential
*
* @see UsernamePasswordAuthenticationToken#UsernamePasswordAuthenticationToken(Object, Object)
*/
public ExpiringUsernameAuthenticationToken(Object principal, Object credentials) {
super(principal, credentials);
}

/**
* Should only be used by authenticationManager as specified in {@link UsernamePasswordAuthenticationToken}. In
* case the tokenExpiration is not null the calls to the isAuthenticated method will return false after
* the current time is beyond the tokenExpiration. No functionality is changed when tokenExpiration is null.
*
* @param tokenExpiration null or date after which the token is not valid anymore
* @param principal principal
* @param credentials credentials
* @param authorities authorities
*/
public ExpiringUsernameAuthenticationToken(Date tokenExpiration, Object principal, Object credentials, Collection<? extends GrantedAuthority> authorities) {
super(principal, credentials, authorities);
this.tokenExpiration = tokenExpiration;
}

/**
* @return true in case the token is authenticated (determined by constructor call) and tokenExpiration
* is either null or the expiration time is on or after current time.
*/
@Override
public boolean isAuthenticated() {
if (tokenExpiration != null && new Date().compareTo(tokenExpiration) >= 0) {
return false;
} else {
return super.isAuthenticated();
}
}

/**
* @return null if no expiration is set, expiration date otherwise
*/
public Date getTokenExpiration() {
return tokenExpiration;
}

/**
* SAML credentials can be kept without clearing.
*/
@Override
public void eraseCredentials() {
}

}
Oops, something went wrong.

0 comments on commit 0b0d33c

Please sign in to comment.
You can’t perform that action at this time.