1
0
mirror of synced 2026-05-22 13:23:17 +00:00

Deprecate openID 2.0 support

This commit adds link to spring code on the top of ThomasVitale's changes.

Fixes gh-7153
This commit is contained in:
Dávid Kovács
2020-05-02 10:25:35 +02:00
parent 84f45e4196
commit 2d9a6aca98
19 changed files with 19 additions and 19 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
// NOTE: The OpenID 1.0 and 2.0 protocols have been deprecated and users are // NOTE: The OpenID 1.0 and 2.0 protocols have been deprecated and users are
// <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> // <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
// to <a href="https://openid.net/connect/">OpenID Connect</a>. // to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
@@ -22,7 +22,7 @@ import org.springframework.security.core.AuthenticationException;
* *
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Robin Bramley, Opsera Ltd * @author Robin Bramley, Opsera Ltd
*/ */
public class AuthenticationCancelledException extends AuthenticationException { public class AuthenticationCancelledException extends AuthenticationException {
@@ -26,7 +26,7 @@ import java.util.List;
* *
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Luke Taylor * @author Luke Taylor
* @since 3.1 * @since 3.1
*/ */
@@ -21,7 +21,7 @@ import java.util.List;
/** /**
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Luke Taylor * @author Luke Taylor
* @since 3.1 * @since 3.1
*/ */
@@ -43,7 +43,7 @@ import org.springframework.util.StringUtils;
/** /**
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Ray Krueger * @author Ray Krueger
* @author Luke Taylor * @author Luke Taylor
*/ */
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
* *
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Luke Taylor * @author Luke Taylor
* @since 3.0 * @since 3.0
*/ */
@@ -61,7 +61,7 @@ import java.util.*;
* *
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Robin Bramley * @author Robin Bramley
* @author Ray Krueger * @author Ray Krueger
* @author Luke Taylor * @author Luke Taylor
@@ -46,7 +46,7 @@ import org.springframework.util.Assert;
* *
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Robin Bramley, Opsera Ltd. * @author Robin Bramley, Opsera Ltd.
* @author Luke Taylor * @author Luke Taylor
*/ */
@@ -20,7 +20,7 @@ package org.springframework.security.openid;
* *
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author JanRain Inc. * @author JanRain Inc.
* @author Robin Bramley, Opsera Ltd * @author Robin Bramley, Opsera Ltd
* @author Luke Taylor * @author Luke Taylor
@@ -28,7 +28,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
* *
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Robin Bramley * @author Robin Bramley
*/ */
public class OpenIDAuthenticationToken extends AbstractAuthenticationToken { public class OpenIDAuthenticationToken extends AbstractAuthenticationToken {
@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest;
* *
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Ray Krueger * @author Ray Krueger
* @author Robin Bramley, Opsera Ltd * @author Robin Bramley, Opsera Ltd
*/ */
@@ -20,7 +20,7 @@ package org.springframework.security.openid;
* *
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Robin Bramley, Opsera Ltd * @author Robin Bramley, Opsera Ltd
*/ */
public class OpenIDConsumerException extends Exception { public class OpenIDConsumerException extends Exception {
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
/** /**
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Luke Taylor * @author Luke Taylor
* @since 3.1 * @since 3.1
*/ */
@@ -4,6 +4,6 @@
<p>NOTE: The OpenID 1.0 and 2.0 protocols have been deprecated and users are <p>NOTE: The OpenID 1.0 and 2.0 protocols have been deprecated and users are
<a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
to <a href="https://openid.net/connect/">OpenID Connect</a>.</p> to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.</p>
</body> </body>
</html> </html>
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest;
/** /**
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Robin Bramley, Opsera Ltd * @author Robin Bramley, Opsera Ltd
*/ */
public class MockOpenIDConsumer implements OpenIDConsumer { public class MockOpenIDConsumer implements OpenIDConsumer {
@@ -42,7 +42,7 @@ import java.util.*;
/** /**
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Luke Taylor * @author Luke Taylor
*/ */
public class OpenID4JavaConsumerTests { public class OpenID4JavaConsumerTests {
@@ -34,7 +34,7 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti
/** /**
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
*/ */
public class OpenIDAuthenticationFilterTests { public class OpenIDAuthenticationFilterTests {
@@ -37,7 +37,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
* *
* @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are
* <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> * <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
* to <a href="https://openid.net/connect/">OpenID Connect</a>. * to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>.
* @author Robin Bramley, Opsera Ltd * @author Robin Bramley, Opsera Ltd
*/ */
public class OpenIDAuthenticationProviderTests { public class OpenIDAuthenticationProviderTests {
+1 -1
View File
@@ -1,6 +1,6 @@
<!-- NOTE: The OpenID 1.0 and 2.0 protocols have been deprecated and users are <!-- NOTE: The OpenID 1.0 and 2.0 protocols have been deprecated and users are
<a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a> <a href="https://openid.net/specs/openid-connect-migration-1_0.html">encouraged to migrate</a>
to <a href="https://openid.net/connect/">OpenID Connect</a>. --> to <a href="https://openid.net/connect/">OpenID Connect</a>, which is supported by <code>spring-security-oauth2</code>. -->
<configuration> <configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">