Home Explore Help
Register Sign In
github
/
spring-security
mirror of https://github.com/spring-projects/spring-security
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Add integrity attribute for signin.css

Closes gh-13486
Olivier Vanekem 2 years ago
parent
5828e4e65c
commit
6353d90047
7 changed files with 14 additions and 14 deletions
Unified View Show Diff Stats
  1. 4 4
      config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.java
  2. 3 3
      config/src/test/java/org/springframework/security/config/http/FormLoginBeanDefinitionParserTests.java
  3. 1 1
      web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java
  4. 2 2
      web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilter.java
  5. 1 1
      web/src/main/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilter.java
  6. 1 1
      web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java
  7. 2 2
      web/src/test/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilterTests.java

+ 4 - 4
config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurerTests.java
View File 

@@ -96,7 +96,7 @@ public class DefaultLoginPageConfigurerTests {
 
 						+ "    <meta name=\"author\" content=\"\">\n"
 
 						+ "    <meta name=\"author\" content=\"\">\n"
 
 						+ "    <title>Please sign in</title>\n"
 
 						+ "    <title>Please sign in</title>\n"
 
 						+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
 						+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
-						+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n"
 
+						+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n"
 
 						+ "  </head>\n"
 
 						+ "  </head>\n"
 
 						+ "  <body>\n"
 
 						+ "  <body>\n"
 
 						+ "     <div class=\"container\">\n"
 
 						+ "     <div class=\"container\">\n"
 
@@ -145,7 +145,7 @@ public class DefaultLoginPageConfigurerTests {
 
 						+ "    <meta name=\"author\" content=\"\">\n"
 
 						+ "    <meta name=\"author\" content=\"\">\n"
 
 						+ "    <title>Please sign in</title>\n"
 
 						+ "    <title>Please sign in</title>\n"
 
 						+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
 						+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
-						+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n"
 
+						+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n"
 
 						+ "  </head>\n"
 
 						+ "  </head>\n"
 
 						+ "  <body>\n"
 
 						+ "  <body>\n"
 
 						+ "     <div class=\"container\">\n"
 
 						+ "     <div class=\"container\">\n"
 
@@ -197,7 +197,7 @@ public class DefaultLoginPageConfigurerTests {
 
 						+ "    <meta name=\"author\" content=\"\">\n"
 
 						+ "    <meta name=\"author\" content=\"\">\n"
 
 						+ "    <title>Please sign in</title>\n"
 
 						+ "    <title>Please sign in</title>\n"
 
 						+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
 						+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
-						+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n"
 
+						+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n"
 
 						+ "  </head>\n"
 
 						+ "  </head>\n"
 
 						+ "  <body>\n"
 
 						+ "  <body>\n"
 
 						+ "     <div class=\"container\">\n"
 
 						+ "     <div class=\"container\">\n"
 
@@ -250,7 +250,7 @@ public class DefaultLoginPageConfigurerTests {
 
 						+ "    <meta name=\"author\" content=\"\">\n"
 
 						+ "    <meta name=\"author\" content=\"\">\n"
 
 						+ "    <title>Please sign in</title>\n"
 
 						+ "    <title>Please sign in</title>\n"
 
 						+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
 						+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
-						+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n"
 
+						+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n"
 
 						+ "  </head>\n"
 
 						+ "  </head>\n"
 
 						+ "  <body>\n"
 
 						+ "  <body>\n"
 
 						+ "     <div class=\"container\">\n"
 
 						+ "     <div class=\"container\">\n"

+ 3 - 3
config/src/test/java/org/springframework/security/config/http/FormLoginBeanDefinitionParserTests.java
View File 

@@ -1,5 +1,5 @@
 
 /*
 
 /*
 
- * Copyright 2002-2018 the original author or authors.
 
+ * Copyright 2002-2023 the original author or authors.
 
  *
 
  *
 
  * Licensed under the Apache License, Version 2.0 (the "License");
 
  * Licensed under the Apache License, Version 2.0 (the "License");
 
  * you may not use this file except in compliance with the License.
 
  * you may not use this file except in compliance with the License.
 
@@ -63,7 +63,7 @@ public class FormLoginBeanDefinitionParserTests {
 
 				+ "    <meta name=\"author\" content=\"\">\n"
 
 				+ "    <meta name=\"author\" content=\"\">\n"
 
 				+ "    <title>Please sign in</title>\n"
 
 				+ "    <title>Please sign in</title>\n"
 
 				+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
 				+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
-				+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n"
 
+				+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n"
 
 				+ "  </head>\n"
 
 				+ "  </head>\n"
 
 				+ "  <body>\n"
 
 				+ "  <body>\n"
 
 				+ "     <div class=\"container\">\n"
 
 				+ "     <div class=\"container\">\n"
 
@@ -104,7 +104,7 @@ public class FormLoginBeanDefinitionParserTests {
 
 				+ "    <meta name=\"author\" content=\"\">\n"
 
 				+ "    <meta name=\"author\" content=\"\">\n"
 
 				+ "    <title>Please sign in</title>\n"
 
 				+ "    <title>Please sign in</title>\n"
 
 				+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
 				+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
-				+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n"
 
+				+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n"
 
 				+ "  </head>\n"
 
 				+ "  </head>\n"
 
 				+ "  <body>\n"
 
 				+ "  <body>\n"
 
 				+ "     <div class=\"container\">\n"
 
 				+ "     <div class=\"container\">\n"

+ 1 - 1
web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java
View File 

@@ -203,7 +203,7 @@ public class DefaultLoginPageGeneratingFilter extends GenericFilterBean {
 
 		sb.append("    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" "
 
 		sb.append("    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" "
 
 				+ "rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n");
 
 				+ "rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n");
 
 		sb.append("    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" "
 
 		sb.append("    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" "
 
-				+ "rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n");
 
+				+ "rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n");
 
 		sb.append("  </head>\n");
 
 		sb.append("  </head>\n");
 
 		sb.append("  <body>\n");
 
 		sb.append("  <body>\n");
 
 		sb.append("     <div class=\"container\">\n");
 
 		sb.append("     <div class=\"container\">\n");

+ 2 - 2
web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilter.java
View File 

@@ -1,5 +1,5 @@
 
 /*
 
 /*
 
- * Copyright 2002-2018 the original author or authors.
 
+ * Copyright 2002-2023 the original author or authors.
 
  *
 
  *
 
  * Licensed under the Apache License, Version 2.0 (the "License");
 
  * Licensed under the Apache License, Version 2.0 (the "License");
 
  * you may not use this file except in compliance with the License.
 
  * you may not use this file except in compliance with the License.
 
@@ -73,7 +73,7 @@ public class DefaultLogoutPageGeneratingFilter extends OncePerRequestFilter {
 
 				+ "rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" "
 
 				+ "rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" "
 
 				+ "crossorigin=\"anonymous\">\n");
 
 				+ "crossorigin=\"anonymous\">\n");
 
 		sb.append("    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" "
 
 		sb.append("    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" "
 
-				+ "rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n");
 
+				+ "rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n");
 
 		sb.append("  </head>\n");
 
 		sb.append("  </head>\n");
 
 		sb.append("  <body>\n");
 
 		sb.append("  <body>\n");
 
 		sb.append("     <div class=\"container\">\n");
 
 		sb.append("     <div class=\"container\">\n");

+ 1 - 1
web/src/main/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilter.java
View File 

@@ -99,7 +99,7 @@ public class LoginPageGeneratingWebFilter implements WebFilter {
 
 				+ "rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" "
 
 				+ "rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" "
 
 				+ "crossorigin=\"anonymous\">\n");
 
 				+ "crossorigin=\"anonymous\">\n");
 
 		page.append("    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" "
 
 		page.append("    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" "
 
-				+ "rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n");
 
+				+ "rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n");
 
 		page.append("  </head>\n");
 
 		page.append("  </head>\n");
 
 		page.append("  <body>\n");
 
 		page.append("  <body>\n");
 
 		page.append("     <div class=\"container\">\n");
 
 		page.append("     <div class=\"container\">\n");

+ 1 - 1
web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java
View File 

@@ -79,7 +79,7 @@ public class LogoutPageGeneratingWebFilter implements WebFilter {
 
 		page.append("    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" "
 
 		page.append("    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" "
 
 				+ "rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n");
 
 				+ "rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n");
 
 		page.append("    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" "
 
 		page.append("    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" "
 
-				+ "rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n");
 
+				+ "rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n");
 
 		page.append("  </head>\n");
 
 		page.append("  </head>\n");
 
 		page.append("  <body>\n");
 
 		page.append("  <body>\n");
 
 		page.append("     <div class=\"container\">\n");
 
 		page.append("     <div class=\"container\">\n");

+ 2 - 2
web/src/test/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilterTests.java
View File 

@@ -1,5 +1,5 @@
 
 /*
 
 /*
 
- * Copyright 2002-2018 the original author or authors.
 
+ * Copyright 2002-2023 the original author or authors.
 
  *
 
  *
 
  * Licensed under the Apache License, Version 2.0 (the "License");
 
  * Licensed under the Apache License, Version 2.0 (the "License");
 
  * you may not use this file except in compliance with the License.
 
  * you may not use this file except in compliance with the License.
 
@@ -44,7 +44,7 @@ public class DefaultLogoutPageGeneratingFilterTests {
 
 				+ "    <meta name=\"description\" content=\"\">\n" + "    <meta name=\"author\" content=\"\">\n"
 
 				+ "    <meta name=\"description\" content=\"\">\n" + "    <meta name=\"author\" content=\"\">\n"
 
 				+ "    <title>Confirm Log Out?</title>\n"
 
 				+ "    <title>Confirm Log Out?</title>\n"
 
 				+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
 				+ "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" crossorigin=\"anonymous\">\n"
 
-				+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n"
 
+				+ "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" rel=\"stylesheet\" integrity=\"sha384-oOE/3m0LUMPub4kaC09mrdEhIc+e3exm4xOGxAmuFXhBNF4hcg/6MiAXAf5p0P56\" crossorigin=\"anonymous\"/>\n"
 
 				+ "  </head>\n" + "  <body>\n" + "     <div class=\"container\">\n"
 
 				+ "  </head>\n" + "  <body>\n" + "     <div class=\"container\">\n"
 
 				+ "      <form class=\"form-signin\" method=\"post\" action=\"/logout\">\n"
 
 				+ "      <form class=\"form-signin\" method=\"post\" action=\"/logout\">\n"
 
 				+ "        <h2 class=\"form-signin-heading\">Are you sure you want to log out?</h2>\n"
 
 				+ "        <h2 class=\"form-signin-heading\">Are you sure you want to log out?</h2>\n"