From 88fd834d6bdce1b5795d1b323e8e613a1f7ff712 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 2 Apr 2021 13:10:01 -0500 Subject: [PATCH] Remove samples Remove in favor of the spring-projects/spring-security-samples repository. Issue gh-9539 --- ...-security-samples-boot-hellorsocket.gradle | 11 - .../sample/HelloRSocketApplicationITests.java | 82 - .../java/sample/HelloRSocketApplication.java | 33 - .../sample/HelloRSocketSecurityConfig.java | 44 - .../main/java/sample/MessageController.java | 34 - .../src/main/resources/application.properties | 1 - ...ty-samples-boot-hellowebflux-method.gradle | 12 - .../HelloWebfluxMethodApplicationITests.java | 80 - .../sample/HelloWebfluxMethodApplication.java | 32 - .../java/sample/HelloWorldMessageService.java | 33 - .../main/java/sample/MessageController.java | 39 - .../src/main/java/sample/SecurityConfig.java | 58 - .../HelloWebfluxMethodApplicationTests.java | 132 - .../sample/HelloWorldMessageServiceTests.java | 60 - ...-security-samples-boot-hellowebflux.gradle | 11 - .../sample/HelloWebfluxApplicationITests.java | 78 - .../main/java/sample/HelloUserController.java | 44 - .../java/sample/HelloWebfluxApplication.java | 33 - .../sample/HelloWebfluxSecurityConfig.java | 41 - .../sample/HelloWebfluxApplicationTests.java | 114 - ...ecurity-samples-boot-hellowebfluxfn.gradle | 11 - .../HelloWebfluxFnApplicationITests.java | 84 - .../main/java/sample/HelloUserController.java | 45 - .../sample/HelloWebfluxFnApplication.java | 44 - .../sample/HelloWebfluxFnSecurityConfig.java | 41 - .../HelloWebfluxFnApplicationTests.java | 115 - ...ng-security-samples-boot-helloworld.gradle | 12 - .../samples/HelloWorldApplicationTests.java | 119 - .../samples/HelloWorldApplication.java | 33 - .../samples/config/SecurityConfig.java | 58 - .../security/samples/web/MainController.java | 55 - .../src/main/resources/application.yml | 12 - .../src/main/resources/static/css/main.css | 13 - .../src/main/resources/templates/index.html | 24 - .../src/main/resources/templates/login.html | 21 - .../main/resources/templates/user/index.html | 13 - ...ring-security-samples-boot-insecure.gradle | 8 - .../samples/InsecureApplicationTests.java | 48 - .../security/samples/InsecureApplication.java | 33 - .../security/samples/web/MainController.java | 62 - .../src/main/resources/application.yml | 11 - .../src/main/resources/static/css/main.css | 13 - .../src/main/resources/templates/index.html | 15 - .../src/main/resources/templates/login.html | 21 - .../main/resources/templates/user/index.html | 13 - ...ity-samples-boot-kotlin-webflux.gradle.kts | 41 - .../samples/KotlinWebfluxApplication.kt | 27 - .../security/samples/config/SecurityConfig.kt | 55 - .../security/samples/web/MainController.kt | 39 - .../src/main/resources/application.yml | 6 - .../src/main/resources/css/main.css | 8 - .../src/main/resources/templates/index.html | 24 - .../src/main/resources/templates/login.html | 20 - .../main/resources/templates/user/index.html | 13 - .../samples/KotlinWebfluxApplicationTests.kt | 67 - ...ng-security-samples-boot-kotlin.gradle.kts | 31 - .../security/samples/KotlinApplication.kt | 29 - .../security/samples/config/SecurityConfig.kt | 55 - .../security/samples/web/MainController.kt | 42 - .../kotlin/src/main/resources/application.yml | 6 - .../src/main/resources/static/css/main.css | 8 - .../src/main/resources/templates/index.html | 40 - .../src/main/resources/templates/login.html | 20 - .../main/resources/templates/user/index.html | 29 - .../samples/KotlinApplicationTests.kt | 85 - .../oauth2authorizationserver/README.adoc | 39 - ...ples-boot-oauth2authorizationserver.gradle | 14 - .../AuthorizationServerConfiguration.java | 284 - .../OAuth2AuthorizationServerApplication.java | 31 - .../src/main/resources/application.yml | 3 - ...h2AuthorizationServerApplicationTests.java | 65 - samples/boot/oauth2login-webflux/README.adoc | 324 - ...ty-samples-boot-oauth2login-webflux.gradle | 14 - .../sample/OAuth2LoginApplicationTests.java | 56 - .../ReactiveOAuth2LoginApplication.java | 32 - .../sample/web/OAuth2LoginController.java | 42 - .../src/main/resources/application.yml | 35 - .../src/main/resources/templates/index.html | 51 - .../sample/OAuth2LoginControllerTests.java | 83 - samples/boot/oauth2login/README.adoc | 321 - ...g-security-samples-boot-oauth2login.gradle | 14 - .../sample/OAuth2LoginApplicationTests.java | 385 -- .../java/sample/OAuth2LoginApplication.java | 31 - .../sample/web/OAuth2LoginController.java | 43 - .../src/main/resources/application.yml | 35 - .../src/main/resources/templates/index.html | 34 - .../web/OAuth2LoginControllerTests.java | 71 - .../boot/oauth2resourceserver-jwe/README.adoc | 119 - ...mples-boot-oauth2resourceserver-jwe.gradle | 13 - ...OAuth2ResourceServerApplicationITests.java | 100 - ...MockWebServerEnvironmentPostProcessor.java | 41 - .../boot/env/MockWebServerPropertySource.java | 122 - .../boot/env/package-info.java | 22 - .../OAuth2ResourceServerApplication.java | 31 - .../OAuth2ResourceServerController.java | 39 - ...h2ResourceServerSecurityConfiguration.java | 114 - .../main/resources/META-INF/spring.factories | 1 - .../src/main/resources/application.yml | 9 - .../src/main/resources/simple.priv | 28 - .../src/main/resources/simple.pub | 9 - .../README.adoc | 155 - ...t-oauth2resourceserver-multitenancy.gradle | 14 - ...OAuth2ResourceServerApplicationITests.java | 129 - ...MockWebServerEnvironmentPostProcessor.java | 41 - .../boot/env/MockWebServerPropertySource.java | 195 - .../boot/env/package-info.java | 22 - .../OAuth2ResourceServerApplication.java | 31 - .../OAuth2ResourceServerController.java | 41 - ...h2ResourceServerSecurityConfiguration.java | 49 - .../TenantAuthenticationManagerResolver.java | 58 - .../main/resources/META-INF/spring.factories | 1 - .../src/main/resources/application.yml | 10 - .../oauth2resourceserver-opaque/README.adoc | 114 - ...es-boot-oauth2resourceserver-opaque.gradle | 14 - ...OAuth2ResourceServerApplicationITests.java | 100 - ...MockWebServerEnvironmentPostProcessor.java | 41 - .../boot/env/MockWebServerPropertySource.java | 181 - .../boot/env/package-info.java | 23 - .../OAuth2ResourceServerApplication.java | 31 - .../OAuth2ResourceServerController.java | 45 - ...h2ResourceServerSecurityConfiguration.java | 55 - .../main/resources/META-INF/spring.factories | 1 - .../src/main/resources/application.yml | 8 - .../OAuth2ResourceServerControllerTests.java | 93 - .../oauth2resourceserver-static/README.adoc | 82 - ...es-boot-oauth2resourceserver-static.gradle | 12 - ...OAuth2ResourceServerApplicationITests.java | 100 - .../OAuth2ResourceServerApplication.java | 31 - .../OAuth2ResourceServerController.java | 39 - ...h2ResourceServerSecurityConfiguration.java | 60 - .../src/main/resources/application.yml | 6 - .../src/main/resources/simple.pub | 7 - .../oauth2resourceserver-webflux/README.adoc | 112 - ...s-boot-oauth2resourceserver-webflux.gradle | 16 - ...OAuth2ResourceServerApplicationITests.java | 77 - ...MockWebServerEnvironmentPostProcessor.java | 41 - .../boot/env/MockWebServerPropertySource.java | 121 - .../boot/env/package-info.java | 22 - .../OAuth2ResourceServerController.java | 46 - .../src/main/java/sample/SecurityConfig.java | 49 - ...ServerOAuth2ResourceServerApplication.java | 31 - .../main/resources/META-INF/spring.factories | 1 - .../src/main/resources/application.yml | 6 - .../OAuth2ResourceServerControllerTests.java | 110 - samples/boot/oauth2resourceserver/README.adoc | 126 - ...y-samples-boot-oauth2resourceserver.gradle | 13 - ...OAuth2ResourceServerApplicationITests.java | 123 - ...MockWebServerEnvironmentPostProcessor.java | 41 - .../boot/env/MockWebServerPropertySource.java | 121 - .../boot/env/package-info.java | 22 - .../OAuth2ResourceServerApplication.java | 31 - .../OAuth2ResourceServerController.java | 46 - ...h2ResourceServerSecurityConfiguration.java | 55 - .../main/resources/META-INF/spring.factories | 1 - .../src/main/resources/application.yml | 6 - .../OAuth2ResourceServerControllerTests.java | 96 - .../boot/oauth2webclient-webflux/README.adoc | 63 - ...amples-boot-oauth2webclient-webflux.gradle | 15 - .../OAuth2WebClientWebFluxApplication.java | 31 - .../java/sample/config/SecurityConfig.java | 58 - .../java/sample/config/WebClientConfig.java | 70 - .../main/java/sample/web/IndexController.java | 31 - .../sample/web/OAuth2WebClientController.java | 62 - ...teredOAuth2AuthorizedClientController.java | 66 - .../src/main/resources/application.yml | 21 - .../src/main/resources/templates/index.html | 51 - .../main/resources/templates/response.html | 31 - .../OAuth2WebClientControllerTests.java | 98 - ...Auth2WebClientWebFluxApplicationTests.java | 43 - ...OAuth2AuthorizedClientControllerTests.java | 98 - samples/boot/oauth2webclient/README.adoc | 63 - ...curity-samples-boot-oauth2webclient.gradle | 16 - .../sample/OAuth2WebClientApplication.java | 33 - .../java/sample/config/SecurityConfig.java | 58 - .../java/sample/config/WebClientConfig.java | 67 - .../main/java/sample/web/IndexController.java | 31 - .../sample/web/OAuth2WebClientController.java | 62 - ...teredOAuth2AuthorizedClientController.java | 65 - .../src/main/resources/application.yml | 21 - .../src/main/resources/templates/index.html | 51 - .../main/resources/templates/response.html | 31 - .../OAuth2WebClientApplicationTests.java | 46 - .../OAuth2WebClientControllerTests.java | 93 - ...OAuth2AuthorizedClientControllerTests.java | 93 - samples/boot/saml2login/README.adoc | 38 - ...ng-security-samples-boot-saml2login.gradle | 35 - .../sample/Saml2LoginApplicationITests.java | 99 - .../src/main/java/sample/IndexController.java | 36 - .../java/sample/Saml2LoginApplication.java | 29 - .../src/main/java/sample/SecurityConfig.java | 36 - .../src/main/resources/application.yml | 1 - .../src/main/resources/templates/index.html | 46 - ...-security-samples-boot-webflux-form.gradle | 36 - .../sample/WebfluxFormApplicationTests.java | 80 - .../java/sample/webdriver/IndexPage.java | 53 - .../java/sample/webdriver/LoginPage.java | 92 - .../src/main/java/sample/IndexController.java | 38 - .../java/sample/WebfluxFormApplication.java | 32 - .../sample/WebfluxFormSecurityConfig.java | 61 - .../src/main/resources/logback.xml | 12 - .../src/main/resources/templates/index.html | 17 - .../src/main/resources/templates/login.html | 32 - ...-security-samples-boot-webflux-x509.gradle | 11 - .../src/main/java/sample/MeController.java | 40 - .../java/sample/WebfluxX509Application.java | 61 - .../src/main/resources/application.yml | 8 - .../src/main/resources/certs/curl_app.sh | 2 - .../src/main/resources/certs/server.p12 | Bin 5255 -> 0 bytes .../sample/WebfluxX509ApplicationTest.java | 90 - samples/certificates/Readme.txt | 10 - samples/certificates/ca.pem | 22 - samples/certificates/dianne.p12 | Bin 1768 -> 0 bytes samples/certificates/localhost-with-ca/ca.crt | 13 - samples/certificates/localhost-with-ca/ca.csr | 11 - samples/certificates/localhost-with-ca/ca.key | 15 - .../certificates/localhost-with-ca/ca.key.org | 18 - .../localhost-with-ca/generate.sh | 13 - .../certificates/localhost-with-ca/tomcat.cer | 16 - .../certificates/localhost-with-ca/tomcat.csr | 15 - samples/certificates/rod.p12 | Bin 1784 -> 0 bytes samples/certificates/scott.p12 | Bin 1768 -> 0 bytes samples/certificates/server.jks | Bin 84658 -> 0 bytes ...security-samples-javaconfig-aspectj.gradle | 20 - .../sample/aspectj/AspectjSecurityConfig.java | 44 - .../java/sample/aspectj/SecuredService.java | 34 - .../src/main/java/sample/aspectj/Service.java | 38 - .../aspectj/AspectJInterceptorTests.java | 108 - .../src/test/resources/logback-test.xml | 15 - ...rity-samples-javaconfig-concurrency.gradle | 20 - ...sageSecurityWebApplicationInitializer.java | 35 - .../samples/config/SecurityConfig.java | 61 - .../samples/config/SecurityConfigTests.java | 35 - ...ng-security-samples-javaconfig-data.gradle | 12 - .../src/main/java/samples/DataConfig.java | 86 - .../src/main/java/samples/data/Message.java | 81 - .../java/samples/data/MessageRepository.java | 27 - .../data/SecurityMessageRepository.java | 31 - .../data/src/main/java/samples/data/User.java | 80 - .../data/SecurityMessageRepositoryTests.java | 72 - .../data/src/test/resources/data.sql | 10 - ...ng-security-samples-javaconfig-form.gradle | 40 - .../security/samples/FormJcTests.java | 78 - .../security/samples/pages/HomePage.java | 63 - .../security/samples/pages/LoginPage.java | 75 - ...sageSecurityWebApplicationInitializer.java | 28 - .../samples/config/SecurityConfig.java | 59 - .../form/src/main/resources/logback.xml | 12 - .../form/src/main/resources/views/login.html | 24 - .../src/main/webapp/WEB-INF/views/login.jspx | 36 - .../WEB-INF/views/messages/compose.jspx | 26 - .../webapp/WEB-INF/views/messages/inbox.jspx | 40 - .../webapp/WEB-INF/views/messages/show.jspx | 24 - .../samples/config/SecurityConfigTests.java | 35 - ...security-samples-javaconfig-hellojs.gradle | 20 - ...sageSecurityWebApplicationInitializer.java | 28 - .../samples/config/SecurityConfig.java | 35 - .../samples/mvc/MessageJsonController.java | 76 - .../main/resources/resources/js/bootstrap.js | 2280 ------- .../resources/js/jquery-3.5.1.min.js | 2 - .../resources/resources/js/knockout-2.3.0.js | 88 - .../main/resources/resources/js/message.js | 75 - .../main/resources/views/messages/inbox.html | 158 - .../src/main/webapp/META-INF/MANIFEST.MF | 2 - .../samples/config/SecurityConfigTests.java | 35 - ...ecurity-samples-javaconfig-hellomvc.gradle | 22 - ...sageSecurityWebApplicationInitializer.java | 30 - .../samples/config/SecurityConfig.java | 36 - .../src/main/resources/views/README.adoc | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 2 - .../samples/config/SecurityConfigTests.java | 115 - ...urity-samples-javaconfig-helloworld.gradle | 29 - .../security/samples/HelloWorldJcTests.java | 78 - .../security/samples/pages/HomePage.java | 66 - .../security/samples/pages/LoginPage.java | 75 - .../samples/config/SecurityConfig.java | 36 - .../SecurityWebApplicationInitializer.java | 32 - .../helloworld/src/main/resources/logback.xml | 12 - .../src/main/webapp/META-INF/MANIFEST.MF | 2 - .../helloworld/src/main/webapp/index.jsp | 38 - .../resources/css/bootstrap-responsive.css | 1092 --- .../main/webapp/resources/css/bootstrap.css | 6039 ----------------- .../src/main/webapp/resources/img/favicon.ico | Bin 1150 -> 0 bytes .../src/main/webapp/resources/img/logo.png | Bin 1123 -> 0 bytes ...ecurity-samples-javaconfig-inmemory.gradle | 22 - ...sageSecurityWebApplicationInitializer.java | 28 - .../samples/config/SecurityConfig.java | 38 - .../src/main/webapp/META-INF/MANIFEST.MF | 2 - .../samples/config/SecurityConfigTests.java | 88 - ...ng-security-samples-javaconfig-jdbc.gradle | 41 - .../security/samples/JdbcJcTests.java | 80 - .../security/samples/pages/HomePage.java | 63 - .../security/samples/pages/LoginPage.java | 75 - ...sageSecurityWebApplicationInitializer.java | 28 - .../samples/config/SecurityConfig.java | 41 - .../jdbc/src/main/resources/logback.xml | 12 - .../jdbc/src/main/webapp/META-INF/MANIFEST.MF | 2 - ...ng-security-samples-javaconfig-ldap.gradle | 39 - .../security/samples/LdapJcTests.java | 82 - .../security/samples/pages/HomePage.java | 63 - .../security/samples/pages/LoginPage.java | 75 - ...sageSecurityWebApplicationInitializer.java | 28 - .../samples/config/SecurityConfig.java | 36 - .../ldap/src/main/resources/logback.xml | 12 - .../ldap/src/main/resources/users.ldif | 42 - .../ldap/src/main/webapp/META-INF/MANIFEST.MF | 2 - ...ecurity-samples-javaconfig-messages.gradle | 31 - .../src/main/java/META-INF/MANIFEST.MF | 3 - .../samples/config/DataConfiguration.java | 75 - .../MessageWebApplicationInitializer.java | 47 - .../samples/config/RootConfiguration.java | 26 - .../security/samples/data/Message.java | 73 - .../samples/data/MessageRepository.java | 28 - .../samples/mvc/DefaultController.java | 29 - .../samples/mvc/MessageController.java | 76 - .../mvc/config/WebMvcConfiguration.java | 88 - .../messages/src/main/resources/data.sql | 2 - .../resources/css/bootstrap-responsive.css | 1092 --- .../resources/resources/css/bootstrap.css | 6039 ----------------- .../main/resources/resources/img/favicon.ico | Bin 1150 -> 0 bytes .../src/main/resources/resources/img/logo.png | Bin 1123 -> 0 bytes .../src/main/resources/views/layout.html | 121 - .../resources/views/messages/compose.html | 40 - .../main/resources/views/messages/inbox.html | 29 - .../main/resources/views/messages/show.html | 20 - ...-security-samples-javaconfig-openid.gradle | 22 - ...sageSecurityWebApplicationInitializer.java | 31 - .../samples/config/SecurityConfig.java | 102 - .../security/samples/mvc/UserController.java | 39 - .../security/CustomUserDetailsService.java | 38 - .../openid/src/main/resources/logback.xml | 12 - .../main/resources/resources/css/openid.css | 45 - .../src/main/resources/resources/img/aol.gif | Bin 2205 -> 0 bytes .../main/resources/resources/img/blogger.ico | Bin 3638 -> 0 bytes .../main/resources/resources/img/claimid.ico | Bin 3638 -> 0 bytes .../main/resources/resources/img/facebook.gif | Bin 2075 -> 0 bytes .../main/resources/resources/img/favicon.ico | Bin 1150 -> 0 bytes .../main/resources/resources/img/flickr.ico | Bin 1150 -> 0 bytes .../main/resources/resources/img/google.gif | Bin 1596 -> 0 bytes .../resources/resources/img/livejournal.ico | Bin 5222 -> 0 bytes .../src/main/resources/resources/img/logo.png | Bin 1123 -> 0 bytes .../main/resources/resources/img/myopenid.ico | Bin 2862 -> 0 bytes .../resources/img/openid-inputicon.gif | Bin 237 -> 0 bytes .../main/resources/resources/img/openid.gif | Bin 740 -> 0 bytes .../resources/resources/img/technorati.ico | Bin 2294 -> 0 bytes .../main/resources/resources/img/verisign.gif | Bin 2550 -> 0 bytes .../main/resources/resources/img/verisign.ico | Bin 4710 -> 0 bytes .../main/resources/resources/img/vidoop.ico | Bin 1406 -> 0 bytes .../resources/resources/img/wordpress.ico | Bin 1150 -> 0 bytes .../main/resources/resources/img/yahoo.gif | Bin 1682 -> 0 bytes .../resources/js/jquery-1.2.6.min.js | 32 - .../js/openid-client/jquery.query-2.1.3.js | 220 - .../js/openid-client/openid-client-config.js | 20 - .../js/openid-client/openid-client.js | 63 - .../resources/resources/js/openid-jquery.js | 240 - .../openid/src/main/resources/users.ldif | 42 - .../src/main/resources/views/login.html | 51 - .../src/main/resources/views/user/show.html | 34 - .../src/main/resources/views/user/show.jspx | 42 - .../src/main/webapp/META-INF/MANIFEST.MF | 2 - .../samples/config/SecurityConfigTests.java | 48 - ...security-samples-javaconfig-preauth.gradle | 19 - ...sageSecurityWebApplicationInitializer.java | 28 - .../samples/config/SecurityConfig.java | 41 - .../preauth/src/main/resources/logback.xml | 12 - .../src/main/resources/views/login.html | 24 - .../src/main/webapp/META-INF/MANIFEST.MF | 2 - .../preauth/src/main/webapp/WEB-INF/web.xml | 35 - .../samples/config/SecurityConfigTests.java | 35 - ...urity-samples-javaconfig-rememberme.gradle | 19 - ...sageSecurityWebApplicationInitializer.java | 28 - .../samples/config/SecurityConfig.java | 58 - .../rememberme/src/main/resources/logback.xml | 12 - .../src/main/resources/views/login.html | 26 - .../src/main/webapp/META-INF/MANIFEST.MF | 2 - .../samples/config/SecurityConfigTests.java | 35 - ...urity-samples-javaconfig-saml2login.gradle | 13 - ...sageSecurityWebApplicationInitializer.java | 39 - .../samples/config/SecurityConfig.java | 91 - .../saml2login/src/main/resources/logback.xml | 12 - .../samples/config/SecurityConfigTests.java | 32 - ...ng-security-samples-javaconfig-x509.gradle | 19 - samples/javaconfig/x509/src/etc/ca.pem | 22 - samples/javaconfig/x509/src/etc/dianne.p12 | Bin 1768 -> 0 bytes samples/javaconfig/x509/src/etc/rod.p12 | Bin 1784 -> 0 bytes samples/javaconfig/x509/src/etc/scott.p12 | Bin 1768 -> 0 bytes samples/javaconfig/x509/src/etc/server.jks | Bin 84658 -> 0 bytes samples/javaconfig/x509/src/etc/server.xml | 46 - ...sageSecurityWebApplicationInitializer.java | 28 - .../samples/config/SecurityConfig.java | 53 - .../x509/src/main/resources/logback.xml | 12 - .../x509/src/main/webapp/META-INF/MANIFEST.MF | 2 - .../src/main/webapp/WEB-INF/decorators.xml | 5 - .../main/webapp/WEB-INF/decorators/main.jsp | 138 - .../src/main/webapp/WEB-INF/views/login.jspx | 36 - .../WEB-INF/views/messages/compose.jspx | 26 - .../webapp/WEB-INF/views/messages/inbox.jspx | 40 - .../webapp/WEB-INF/views/messages/show.jspx | 24 - .../x509/src/main/webapp/WEB-INF/web.xml- | 35 - .../samples/config/SecurityConfigTests.java | 35 - ...spring-security-samples-xml-aspectj.gradle | 16 - .../java/sample/aspectj/SecuredService.java | 34 - .../src/main/java/sample/aspectj/Service.java | 38 - .../src/main/resources/aspectj-context.xml | 48 - .../aspectj/AspectJInterceptorTests.java | 97 - .../src/test/resources/logback-test.xml | 15 - samples/xml/cas/Readme.txt | 12 - ...ring-security-samples-xml-cassample.gradle | 61 - .../samples/cas/CasSampleProxyTests.java | 148 - .../security/samples/cas/CasSampleTests.java | 158 - .../security/samples/cas/JettyCasService.java | 163 - .../samples/cas/pages/AccessDeniedPage.java | 53 - .../cas/pages/ExtremelySecurePage.java | 54 - .../security/samples/cas/pages/HomePage.java | 54 - .../samples/cas/pages/LocalLogoutPage.java | 34 - .../security/samples/cas/pages/LoginPage.java | 66 - .../security/samples/cas/pages/Page.java | 51 - .../cas/pages/ProxyTicketSamplePage.java | 54 - .../samples/cas/pages/SecurePage.java | 67 - .../samples/cas/pages/UnauthorizedPage.java | 52 - .../resources/logback-test.xml | 16 - .../cas/web/ProxyTicketSampleServlet.java | 90 - .../xml/cas/cassample/src/main/webapp/401.jsp | 8 - .../xml/cas/cassample/src/main/webapp/403.jsp | 8 - .../WEB-INF/applicationContext-security.xml | 124 - .../cassample/src/main/webapp/WEB-INF/web.xml | 89 - .../cassample/src/main/webapp/cas-logout.jsp | 15 - .../cassample/src/main/webapp/casfailed.jsp | 17 - .../cas/cassample/src/main/webapp/index.jsp | 12 - .../src/main/webapp/secure/extreme/index.jsp | 12 - .../src/main/webapp/secure/index.jsp | 15 - ...ring-security-samples-xml-casserver.gradle | 56 - .../src/main/webapp/WEB-INF/classes/log4j.xml | 17 - .../webapp/WEB-INF/deployerConfigContext.xml | 192 - .../applicationContext.xml | 149 - .../spring-security-samples-xml-cas.gradle | 25 - samples/xml/contacts/client/client.properties | 8 - samples/xml/contacts/client/clientContext.xml | 73 - ...pring-security-samples-xml-contacts.gradle | 43 - .../security/samples/ContactsTests.java | 93 - .../security/samples/pages/AddPage.java | 71 - .../security/samples/pages/ContactsPage.java | 131 - .../security/samples/pages/HomePage.java | 70 - .../security/samples/pages/LoginPage.java | 73 - .../contact/AddDeleteContactController.java | 79 - .../java/sample/contact/AddPermission.java | 57 - .../contact/AddPermissionValidator.java | 64 - .../contact/AdminPermissionController.java | 189 - .../sample/contact/ClientApplication.java | 153 - .../src/main/java/sample/contact/Contact.java | 92 - .../main/java/sample/contact/ContactDao.java | 42 - .../java/sample/contact/ContactDaoSpring.java | 96 - .../java/sample/contact/ContactManager.java | 57 - .../sample/contact/ContactManagerBackend.java | 194 - .../sample/contact/DataSourcePopulator.java | 276 - .../java/sample/contact/IndexController.java | 105 - .../main/java/sample/contact/WebContact.java | 46 - .../sample/contact/WebContactValidator.java | 49 - ...pplicationContext-common-authorization.xml | 66 - .../applicationContext-common-business.xml | 49 - .../resources/applicationContext-security.xml | 70 - .../contacts/src/main/resources/logback.xml | 14 - .../src/main/resources/messages.properties | 6 - .../main/webapp/WEB-INF/contacts-servlet.xml | 26 - .../src/main/webapp/WEB-INF/jsp/add.jsp | 42 - .../main/webapp/WEB-INF/jsp/addPermission.jsp | 56 - .../webapp/WEB-INF/jsp/adminPermission.jsp | 30 - .../webapp/WEB-INF/jsp/deletePermission.jsp | 20 - .../src/main/webapp/WEB-INF/jsp/deleted.jsp | 13 - .../src/main/webapp/WEB-INF/jsp/frames.jsp | 10 - .../src/main/webapp/WEB-INF/jsp/hello.jsp | 52 - .../src/main/webapp/WEB-INF/jsp/include.jsp | 6 - .../src/main/webapp/WEB-INF/jsp/index.jsp | 37 - .../main/webapp/WEB-INF/remoting-servlet.xml | 49 - .../src/main/webapp/WEB-INF/spring.tld | 311 - .../contacts/src/main/webapp/WEB-INF/web.xml | 99 - .../contacts/src/main/webapp/accessDenied.jsp | 22 - .../xml/contacts/src/main/webapp/error.html | 5 - .../xml/contacts/src/main/webapp/exitUser.jsp | 39 - .../xml/contacts/src/main/webapp/index.jsp | 4 - .../xml/contacts/src/main/webapp/login.jsp | 47 - .../contacts/src/main/webapp/secure/debug.jsp | 40 - .../contacts/src/main/webapp/switchUser.jsp | 42 - .../src/site/resources/logback-test.xml | 15 - .../contacts/src/site/resources/sslhowto.txt | 99 - .../sample/contact/ContactManagerTests.java | 173 - .../src/test/resources/logback-test.xml | 15 - .../spring-security-samples-xml-dms.gradle | 17 - .../main/java/sample/dms/AbstractElement.java | 100 - .../java/sample/dms/DataSourcePopulator.java | 166 - .../src/main/java/sample/dms/Directory.java | 40 - .../src/main/java/sample/dms/DocumentDao.java | 56 - .../main/java/sample/dms/DocumentDaoImpl.java | 136 - .../dms/src/main/java/sample/dms/File.java | 50 - .../secured/SecureDataSourcePopulator.java | 118 - .../sample/dms/secured/SecureDocumentDao.java | 32 - .../dms/secured/SecureDocumentDaoImpl.java | 73 - .../applicationContext-dms-insecure.xml | 40 - .../applicationContext-dms-secure.xml | 245 - .../applicationContext-dms-shared.xml | 18 - .../test/java/sample/DmsIntegrationTests.java | 160 - .../sample/SecureDmsIntegrationTests.java | 69 - .../dms/src/test/resources/logback-test.xml | 15 - samples/xml/gae/README.adoc | 5 - .../spring-security-samples-xml-gae.gradle | 44 - .../java/samples/gae/security/AppRole.java | 48 - .../gae/security/GaeAuthenticationFilter.java | 135 - .../gae/security/GaeUserAuthentication.java | 75 - ...oogleAccountsAuthenticationEntryPoint.java | 38 - .../GoogleAccountsAuthenticationProvider.java | 85 - .../gae/users/GaeDatastoreUserRegistry.java | 110 - .../main/java/samples/gae/users/GaeUser.java | 103 - .../gae/users/InMemoryUserRegistry.java | 51 - .../java/samples/gae/users/UserRegistry.java | 32 - .../java/samples/gae/validation/Forename.java | 39 - .../gae/validation/ForenameValidator.java | 35 - .../java/samples/gae/validation/Surname.java | 39 - .../gae/validation/SurnameValidator.java | 35 - .../samples/gae/web/GaeAppController.java | 66 - .../gae/web/RegistrationController.java | 79 - .../samples/gae/web/RegistrationForm.java | 46 - .../src/main/webapp/WEB-INF/appengine-web.xml | 11 - .../WEB-INF/applicationContext-security.xml | 48 - .../classes/ValidationMessages.properties | 2 - .../src/main/webapp/WEB-INF/gae-servlet.xml | 25 - .../src/main/webapp/WEB-INF/jsp/disabled.jsp | 16 - .../gae/src/main/webapp/WEB-INF/jsp/home.jsp | 26 - .../src/main/webapp/WEB-INF/jsp/landing.jsp | 33 - .../src/main/webapp/WEB-INF/jsp/loggedout.jsp | 17 - .../src/main/webapp/WEB-INF/jsp/register.jsp | 40 - .../main/webapp/WEB-INF/logging.properties | 5 - .../xml/gae/src/main/webapp/WEB-INF/web.xml | 46 - samples/xml/gae/src/main/webapp/favicon.ico | Bin 1150 -> 0 bytes .../gae/src/main/webapp/static/css/gae.css | 26 - .../samples/gae/security/AppRoleTests.java | 45 - .../users/GaeDataStoreUserRegistryTests.java | 70 - .../gae/src/test/resources/logback-test.xml | 15 - ...ing-security-samples-xml-helloworld.gradle | 33 - .../security/samples/HelloWorldXmlTests.java | 78 - .../security/samples/pages/HomePage.java | 66 - .../security/samples/pages/LoginPage.java | 75 - .../helloworld/src/main/resources/logback.xml | 12 - .../src/main/webapp/META-INF/MANIFEST.MF | 2 - .../main/webapp/WEB-INF/spring/security.xml | 11 - .../src/main/webapp/WEB-INF/web.xml | 36 - .../xml/helloworld/src/main/webapp/index.jsp | 38 - .../resources/css/bootstrap-responsive.css | 1092 --- .../main/webapp/resources/css/bootstrap.css | 6039 ----------------- .../src/main/webapp/resources/img/favicon.ico | Bin 1150 -> 0 bytes .../src/main/webapp/resources/img/logo.png | Bin 1123 -> 0 bytes ...pring-security-samples-xml-insecure.gradle | 28 - .../security/samples/HelloInsecureTests.java | 52 - .../security/samples/pages/HomePage.java | 55 - .../xml/insecure/src/main/java/README.adoc | 0 .../xml/insecure/src/main/webapp/index.jsp | 31 - .../resources/css/bootstrap-responsive.css | 1092 --- .../main/webapp/resources/css/bootstrap.css | 6039 ----------------- .../src/main/webapp/resources/img/favicon.ico | Bin 1150 -> 0 bytes .../src/main/webapp/resources/img/logo.png | Bin 1123 -> 0 bytes ...ng-security-samples-xml-insecuremvc.gradle | 17 - .../xml/insecuremvc/src/main/java/README.adoc | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 2 - .../samples/config/SecurityConfigTests.java | 60 - .../src/test/resources/logback-test.xml | 15 - .../spring-security-samples-xml-jaas.gradle | 33 - .../security/samples/JaasXmlTests.java | 84 - .../security/samples/pages/HomePage.java | 69 - .../security/samples/pages/LoginPage.java | 77 - .../security/samples/pages/LogoutPage.java | 45 - .../security/samples/pages/SecurePage.java | 56 - .../jaas/RoleUserAuthorityGranter.java | 35 - .../UsernameEqualsPasswordLoginModule.java | 111 - .../resources/applicationContext-security.xml | 51 - .../xml/jaas/src/main/resources/logback.xml | 12 - .../xml/jaas/src/main/webapp/WEB-INF/web.xml | 63 - samples/xml/jaas/src/main/webapp/index.jsp | 24 - .../xml/jaas/src/main/webapp/secure/index.jsp | 58 - .../spring-security-samples-xml-ldap.gradle | 31 - .../security/samples/LdapXmlTests.java | 84 - .../security/samples/pages/HomePage.java | 69 - .../security/samples/pages/LoginPage.java | 77 - .../security/samples/pages/LogoutPage.java | 45 - .../security/samples/pages/SecurePage.java | 56 - .../xml/ldap/src/main/resources/logback.xml | 12 - .../xml/ldap/src/main/resources/users.ldif | 60 - .../WEB-INF/applicationContext-security.xml | 65 - .../xml/ldap/src/main/webapp/WEB-INF/web.xml | 44 - samples/xml/ldap/src/main/webapp/index.jsp | 12 - .../src/main/webapp/secure/extreme/index.jsp | 15 - .../xml/ldap/src/main/webapp/secure/index.jsp | 21 - samples/xml/oauth2login/README.adoc | 278 - ...ng-security-samples-xml-oauth2login.gradle | 15 - .../main/java/sample/config/WebConfig.java | 104 - .../sample/web/OAuth2LoginController.java | 42 - .../src/main/webapp/WEB-INF/security.xml | 52 - .../main/webapp/WEB-INF/spring-servlet.xml | 10 - .../main/webapp/WEB-INF/templates/index.html | 34 - .../src/main/webapp/WEB-INF/web.xml | 34 - .../spring-security-samples-xml-openid.gradle | 14 - .../samples/openid/CustomUserDetails.java | 65 - .../openid/CustomUserDetailsService.java | 129 - .../xml/openid/src/main/resources/logback.xml | 16 - .../WEB-INF/applicationContext-security.xml | 61 - .../openid/src/main/webapp/WEB-INF/web.xml | 44 - .../xml/openid/src/main/webapp/css/openid.css | 45 - .../xml/openid/src/main/webapp/images/aol.gif | Bin 2205 -> 0 bytes .../openid/src/main/webapp/images/blogger.ico | Bin 3638 -> 0 bytes .../openid/src/main/webapp/images/claimid.ico | Bin 3638 -> 0 bytes .../src/main/webapp/images/facebook.gif | Bin 2075 -> 0 bytes .../openid/src/main/webapp/images/flickr.ico | Bin 1150 -> 0 bytes .../openid/src/main/webapp/images/google.gif | Bin 1596 -> 0 bytes .../src/main/webapp/images/livejournal.ico | Bin 5222 -> 0 bytes .../src/main/webapp/images/myopenid.ico | Bin 2862 -> 0 bytes .../main/webapp/images/openid-inputicon.gif | Bin 237 -> 0 bytes .../openid/src/main/webapp/images/openid.gif | Bin 740 -> 0 bytes .../src/main/webapp/images/technorati.ico | Bin 2294 -> 0 bytes .../src/main/webapp/images/verisign.gif | Bin 2550 -> 0 bytes .../src/main/webapp/images/verisign.ico | Bin 4710 -> 0 bytes .../openid/src/main/webapp/images/vidoop.ico | Bin 1406 -> 0 bytes .../src/main/webapp/images/wordpress.ico | Bin 1150 -> 0 bytes .../openid/src/main/webapp/images/yahoo.gif | Bin 1682 -> 0 bytes samples/xml/openid/src/main/webapp/index.jsp | 38 - .../src/main/webapp/js/jquery-3.5.1.min.js | 2 - .../js/openid-client/jquery.query-2.1.3.js | 220 - .../js/openid-client/openid-client-config.js | 20 - .../webapp/js/openid-client/openid-client.js | 63 - .../src/main/webapp/js/openid-jquery.js | 240 - .../openid/src/main/webapp/openidlogin.jsp | 71 - samples/xml/preauth/realm.properties | 3 - ...spring-security-samples-xml-preauth.gradle | 16 - .../preauth/src/main/resources/logback.xml | 12 - .../WEB-INF/applicationContext-security.xml | 26 - .../preauth/src/main/webapp/WEB-INF/web.xml | 60 - samples/xml/preauth/src/main/webapp/index.jsp | 11 - .../src/main/webapp/secure/extreme/index.jsp | 10 - .../preauth/src/main/webapp/secure/index.jsp | 15 - .../src/test/java/sample/PreAuthXmlTests.java | 39 - .../src/test/resources/logback-test.xml | 15 - ...ing-security-samples-xml-servletapi.gradle | 21 - .../samples/servletapi/mvc/LoginForm.java | 43 - .../servletapi/mvc/ServletApiController.java | 211 - .../resources/applicationContext-security.xml | 20 - .../servletapi/src/main/resources/logback.xml | 12 - .../main/webapp/WEB-INF/spring-servlet.xml | 24 - .../src/main/webapp/WEB-INF/views/index.jsp | 44 - .../src/main/webapp/WEB-INF/views/login.jsp | 26 - .../src/main/webapp/WEB-INF/web.xml | 57 - samples/xml/tutorial/readme.txt | 10 - .../xml/tutorial/scripts/exec-list-as-peter | 5 - samples/xml/tutorial/scripts/exec-list-as-rod | 5 - .../xml/tutorial/scripts/exec-list-no-auth | 5 - .../tutorial/scripts/exec-list-wrong-password | 5 - .../xml/tutorial/scripts/exec-post-as-peter | 5 - samples/xml/tutorial/scripts/exec-post-as-rod | 5 - .../xml/tutorial/scripts/exec-post-no-auth | 5 - .../tutorial/scripts/exec-post-wrong-password | 5 - ...pring-security-samples-xml-tutorial.gradle | 16 - .../src/main/java/bigbank/Account.java | 74 - .../src/main/java/bigbank/BankDao.java | 25 - .../src/main/java/bigbank/BankDaoStub.java | 48 - .../src/main/java/bigbank/BankService.java | 30 - .../main/java/bigbank/BankServiceImpl.java | 50 - .../src/main/java/bigbank/SeedData.java | 37 - .../main/java/bigbank/web/ListAccounts.java | 53 - .../main/java/bigbank/web/PostAccounts.java | 57 - .../resources/applicationContext-business.xml | 24 - .../tutorial/src/main/resources/logback.xml | 12 - .../WEB-INF/applicationContext-security.xml | 64 - .../src/main/webapp/WEB-INF/bank-servlet.xml | 20 - .../main/webapp/WEB-INF/jsp/listAccounts.jsp | 58 - .../tutorial/src/main/webapp/WEB-INF/web.xml | 73 - .../xml/tutorial/src/main/webapp/index.jsp | 42 - .../tutorial/src/main/webapp/loggedout.jsp | 20 - .../src/main/webapp/secure/extreme/index.jsp | 29 - .../tutorial/src/main/webapp/secure/index.jsp | 53 - .../src/main/webapp/static/css/tutorial.css | 13 - .../xml/tutorial/src/main/webapp/timeout.jsp | 20 - 676 files changed, 61396 deletions(-) delete mode 100644 samples/boot/hellorsocket/spring-security-samples-boot-hellorsocket.gradle delete mode 100644 samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java delete mode 100644 samples/boot/hellorsocket/src/main/java/sample/HelloRSocketApplication.java delete mode 100644 samples/boot/hellorsocket/src/main/java/sample/HelloRSocketSecurityConfig.java delete mode 100644 samples/boot/hellorsocket/src/main/java/sample/MessageController.java delete mode 100644 samples/boot/hellorsocket/src/main/resources/application.properties delete mode 100644 samples/boot/hellowebflux-method/spring-security-samples-boot-hellowebflux-method.gradle delete mode 100644 samples/boot/hellowebflux-method/src/integration-test/java/sample/HelloWebfluxMethodApplicationITests.java delete mode 100644 samples/boot/hellowebflux-method/src/main/java/sample/HelloWebfluxMethodApplication.java delete mode 100644 samples/boot/hellowebflux-method/src/main/java/sample/HelloWorldMessageService.java delete mode 100644 samples/boot/hellowebflux-method/src/main/java/sample/MessageController.java delete mode 100644 samples/boot/hellowebflux-method/src/main/java/sample/SecurityConfig.java delete mode 100644 samples/boot/hellowebflux-method/src/test/java/sample/HelloWebfluxMethodApplicationTests.java delete mode 100644 samples/boot/hellowebflux-method/src/test/java/sample/HelloWorldMessageServiceTests.java delete mode 100644 samples/boot/hellowebflux/spring-security-samples-boot-hellowebflux.gradle delete mode 100644 samples/boot/hellowebflux/src/integration-test/java/sample/HelloWebfluxApplicationITests.java delete mode 100644 samples/boot/hellowebflux/src/main/java/sample/HelloUserController.java delete mode 100644 samples/boot/hellowebflux/src/main/java/sample/HelloWebfluxApplication.java delete mode 100644 samples/boot/hellowebflux/src/main/java/sample/HelloWebfluxSecurityConfig.java delete mode 100644 samples/boot/hellowebflux/src/test/java/sample/HelloWebfluxApplicationTests.java delete mode 100644 samples/boot/hellowebfluxfn/spring-security-samples-boot-hellowebfluxfn.gradle delete mode 100644 samples/boot/hellowebfluxfn/src/integration-test/java/sample/HelloWebfluxFnApplicationITests.java delete mode 100644 samples/boot/hellowebfluxfn/src/main/java/sample/HelloUserController.java delete mode 100644 samples/boot/hellowebfluxfn/src/main/java/sample/HelloWebfluxFnApplication.java delete mode 100644 samples/boot/hellowebfluxfn/src/main/java/sample/HelloWebfluxFnSecurityConfig.java delete mode 100644 samples/boot/hellowebfluxfn/src/test/java/sample/HelloWebfluxFnApplicationTests.java delete mode 100644 samples/boot/helloworld/spring-security-samples-boot-helloworld.gradle delete mode 100644 samples/boot/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldApplicationTests.java delete mode 100644 samples/boot/helloworld/src/main/java/org/springframework/security/samples/HelloWorldApplication.java delete mode 100644 samples/boot/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/boot/helloworld/src/main/java/org/springframework/security/samples/web/MainController.java delete mode 100644 samples/boot/helloworld/src/main/resources/application.yml delete mode 100644 samples/boot/helloworld/src/main/resources/static/css/main.css delete mode 100644 samples/boot/helloworld/src/main/resources/templates/index.html delete mode 100644 samples/boot/helloworld/src/main/resources/templates/login.html delete mode 100644 samples/boot/helloworld/src/main/resources/templates/user/index.html delete mode 100644 samples/boot/insecure/spring-security-samples-boot-insecure.gradle delete mode 100644 samples/boot/insecure/src/integration-test/java/org/springframework/security/samples/InsecureApplicationTests.java delete mode 100644 samples/boot/insecure/src/main/java/org/springframework/security/samples/InsecureApplication.java delete mode 100644 samples/boot/insecure/src/main/java/org/springframework/security/samples/web/MainController.java delete mode 100644 samples/boot/insecure/src/main/resources/application.yml delete mode 100644 samples/boot/insecure/src/main/resources/static/css/main.css delete mode 100644 samples/boot/insecure/src/main/resources/templates/index.html delete mode 100644 samples/boot/insecure/src/main/resources/templates/login.html delete mode 100644 samples/boot/insecure/src/main/resources/templates/user/index.html delete mode 100644 samples/boot/kotlin-webflux/spring-security-samples-boot-kotlin-webflux.gradle.kts delete mode 100644 samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/KotlinWebfluxApplication.kt delete mode 100644 samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt delete mode 100644 samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/web/MainController.kt delete mode 100644 samples/boot/kotlin-webflux/src/main/resources/application.yml delete mode 100644 samples/boot/kotlin-webflux/src/main/resources/css/main.css delete mode 100644 samples/boot/kotlin-webflux/src/main/resources/templates/index.html delete mode 100644 samples/boot/kotlin-webflux/src/main/resources/templates/login.html delete mode 100644 samples/boot/kotlin-webflux/src/main/resources/templates/user/index.html delete mode 100644 samples/boot/kotlin-webflux/src/test/kotlin/org/springframework/security/samples/KotlinWebfluxApplicationTests.kt delete mode 100644 samples/boot/kotlin/spring-security-samples-boot-kotlin.gradle.kts delete mode 100644 samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/KotlinApplication.kt delete mode 100644 samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt delete mode 100644 samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/web/MainController.kt delete mode 100644 samples/boot/kotlin/src/main/resources/application.yml delete mode 100644 samples/boot/kotlin/src/main/resources/static/css/main.css delete mode 100644 samples/boot/kotlin/src/main/resources/templates/index.html delete mode 100644 samples/boot/kotlin/src/main/resources/templates/login.html delete mode 100644 samples/boot/kotlin/src/main/resources/templates/user/index.html delete mode 100644 samples/boot/kotlin/src/test/kotlin/org/springframework/security/samples/KotlinApplicationTests.kt delete mode 100644 samples/boot/oauth2authorizationserver/README.adoc delete mode 100644 samples/boot/oauth2authorizationserver/spring-security-samples-boot-oauth2authorizationserver.gradle delete mode 100644 samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java delete mode 100644 samples/boot/oauth2authorizationserver/src/main/java/sample/OAuth2AuthorizationServerApplication.java delete mode 100644 samples/boot/oauth2authorizationserver/src/main/resources/application.yml delete mode 100644 samples/boot/oauth2authorizationserver/src/test/java/sample/OAuth2AuthorizationServerApplicationTests.java delete mode 100644 samples/boot/oauth2login-webflux/README.adoc delete mode 100644 samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle delete mode 100644 samples/boot/oauth2login-webflux/src/integration-test/java/sample/OAuth2LoginApplicationTests.java delete mode 100644 samples/boot/oauth2login-webflux/src/main/java/sample/ReactiveOAuth2LoginApplication.java delete mode 100644 samples/boot/oauth2login-webflux/src/main/java/sample/web/OAuth2LoginController.java delete mode 100644 samples/boot/oauth2login-webflux/src/main/resources/application.yml delete mode 100644 samples/boot/oauth2login-webflux/src/main/resources/templates/index.html delete mode 100644 samples/boot/oauth2login-webflux/src/test/java/sample/OAuth2LoginControllerTests.java delete mode 100644 samples/boot/oauth2login/README.adoc delete mode 100644 samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle delete mode 100644 samples/boot/oauth2login/src/integration-test/java/sample/OAuth2LoginApplicationTests.java delete mode 100644 samples/boot/oauth2login/src/main/java/sample/OAuth2LoginApplication.java delete mode 100644 samples/boot/oauth2login/src/main/java/sample/web/OAuth2LoginController.java delete mode 100644 samples/boot/oauth2login/src/main/resources/application.yml delete mode 100644 samples/boot/oauth2login/src/main/resources/templates/index.html delete mode 100644 samples/boot/oauth2login/src/test/java/sample/web/OAuth2LoginControllerTests.java delete mode 100644 samples/boot/oauth2resourceserver-jwe/README.adoc delete mode 100644 samples/boot/oauth2resourceserver-jwe/spring-security-samples-boot-oauth2resourceserver-jwe.gradle delete mode 100644 samples/boot/oauth2resourceserver-jwe/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java delete mode 100644 samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java delete mode 100644 samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java delete mode 100644 samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/package-info.java delete mode 100644 samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerApplication.java delete mode 100644 samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerController.java delete mode 100644 samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java delete mode 100644 samples/boot/oauth2resourceserver-jwe/src/main/resources/META-INF/spring.factories delete mode 100644 samples/boot/oauth2resourceserver-jwe/src/main/resources/application.yml delete mode 100644 samples/boot/oauth2resourceserver-jwe/src/main/resources/simple.priv delete mode 100644 samples/boot/oauth2resourceserver-jwe/src/main/resources/simple.pub delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/README.adoc delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/spring-security-samples-boot-oauth2resourceserver-multitenancy.gradle delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/package-info.java delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerApplication.java delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerController.java delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/TenantAuthenticationManagerResolver.java delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/src/main/resources/META-INF/spring.factories delete mode 100644 samples/boot/oauth2resourceserver-multitenancy/src/main/resources/application.yml delete mode 100644 samples/boot/oauth2resourceserver-opaque/README.adoc delete mode 100644 samples/boot/oauth2resourceserver-opaque/spring-security-samples-boot-oauth2resourceserver-opaque.gradle delete mode 100644 samples/boot/oauth2resourceserver-opaque/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java delete mode 100644 samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java delete mode 100644 samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java delete mode 100644 samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/package-info.java delete mode 100644 samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerApplication.java delete mode 100644 samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerController.java delete mode 100644 samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java delete mode 100644 samples/boot/oauth2resourceserver-opaque/src/main/resources/META-INF/spring.factories delete mode 100644 samples/boot/oauth2resourceserver-opaque/src/main/resources/application.yml delete mode 100644 samples/boot/oauth2resourceserver-opaque/src/test/java/sample/OAuth2ResourceServerControllerTests.java delete mode 100644 samples/boot/oauth2resourceserver-static/README.adoc delete mode 100644 samples/boot/oauth2resourceserver-static/spring-security-samples-boot-oauth2resourceserver-static.gradle delete mode 100644 samples/boot/oauth2resourceserver-static/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java delete mode 100644 samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerApplication.java delete mode 100644 samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerController.java delete mode 100644 samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java delete mode 100644 samples/boot/oauth2resourceserver-static/src/main/resources/application.yml delete mode 100644 samples/boot/oauth2resourceserver-static/src/main/resources/simple.pub delete mode 100644 samples/boot/oauth2resourceserver-webflux/README.adoc delete mode 100644 samples/boot/oauth2resourceserver-webflux/spring-security-samples-boot-oauth2resourceserver-webflux.gradle delete mode 100644 samples/boot/oauth2resourceserver-webflux/src/integration-test/java/sample/ServerOAuth2ResourceServerApplicationITests.java delete mode 100644 samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java delete mode 100644 samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java delete mode 100644 samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/package-info.java delete mode 100644 samples/boot/oauth2resourceserver-webflux/src/main/java/sample/OAuth2ResourceServerController.java delete mode 100644 samples/boot/oauth2resourceserver-webflux/src/main/java/sample/SecurityConfig.java delete mode 100644 samples/boot/oauth2resourceserver-webflux/src/main/java/sample/ServerOAuth2ResourceServerApplication.java delete mode 100644 samples/boot/oauth2resourceserver-webflux/src/main/resources/META-INF/spring.factories delete mode 100644 samples/boot/oauth2resourceserver-webflux/src/main/resources/application.yml delete mode 100644 samples/boot/oauth2resourceserver-webflux/src/test/java/sample/OAuth2ResourceServerControllerTests.java delete mode 100644 samples/boot/oauth2resourceserver/README.adoc delete mode 100644 samples/boot/oauth2resourceserver/spring-security-samples-boot-oauth2resourceserver.gradle delete mode 100644 samples/boot/oauth2resourceserver/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java delete mode 100644 samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java delete mode 100644 samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java delete mode 100644 samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/package-info.java delete mode 100644 samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerApplication.java delete mode 100644 samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerController.java delete mode 100644 samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java delete mode 100644 samples/boot/oauth2resourceserver/src/main/resources/META-INF/spring.factories delete mode 100644 samples/boot/oauth2resourceserver/src/main/resources/application.yml delete mode 100644 samples/boot/oauth2resourceserver/src/test/java/sample/OAuth2ResourceServerControllerTests.java delete mode 100644 samples/boot/oauth2webclient-webflux/README.adoc delete mode 100644 samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle delete mode 100644 samples/boot/oauth2webclient-webflux/src/main/java/sample/OAuth2WebClientWebFluxApplication.java delete mode 100644 samples/boot/oauth2webclient-webflux/src/main/java/sample/config/SecurityConfig.java delete mode 100644 samples/boot/oauth2webclient-webflux/src/main/java/sample/config/WebClientConfig.java delete mode 100644 samples/boot/oauth2webclient-webflux/src/main/java/sample/web/IndexController.java delete mode 100644 samples/boot/oauth2webclient-webflux/src/main/java/sample/web/OAuth2WebClientController.java delete mode 100644 samples/boot/oauth2webclient-webflux/src/main/java/sample/web/RegisteredOAuth2AuthorizedClientController.java delete mode 100644 samples/boot/oauth2webclient-webflux/src/main/resources/application.yml delete mode 100644 samples/boot/oauth2webclient-webflux/src/main/resources/templates/index.html delete mode 100644 samples/boot/oauth2webclient-webflux/src/main/resources/templates/response.html delete mode 100644 samples/boot/oauth2webclient-webflux/src/test/java/sample/OAuth2WebClientControllerTests.java delete mode 100644 samples/boot/oauth2webclient-webflux/src/test/java/sample/OAuth2WebClientWebFluxApplicationTests.java delete mode 100644 samples/boot/oauth2webclient-webflux/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java delete mode 100644 samples/boot/oauth2webclient/README.adoc delete mode 100644 samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle delete mode 100644 samples/boot/oauth2webclient/src/main/java/sample/OAuth2WebClientApplication.java delete mode 100644 samples/boot/oauth2webclient/src/main/java/sample/config/SecurityConfig.java delete mode 100644 samples/boot/oauth2webclient/src/main/java/sample/config/WebClientConfig.java delete mode 100644 samples/boot/oauth2webclient/src/main/java/sample/web/IndexController.java delete mode 100644 samples/boot/oauth2webclient/src/main/java/sample/web/OAuth2WebClientController.java delete mode 100644 samples/boot/oauth2webclient/src/main/java/sample/web/RegisteredOAuth2AuthorizedClientController.java delete mode 100644 samples/boot/oauth2webclient/src/main/resources/application.yml delete mode 100644 samples/boot/oauth2webclient/src/main/resources/templates/index.html delete mode 100644 samples/boot/oauth2webclient/src/main/resources/templates/response.html delete mode 100644 samples/boot/oauth2webclient/src/test/java/sample/OAuth2WebClientApplicationTests.java delete mode 100644 samples/boot/oauth2webclient/src/test/java/sample/OAuth2WebClientControllerTests.java delete mode 100644 samples/boot/oauth2webclient/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java delete mode 100644 samples/boot/saml2login/README.adoc delete mode 100644 samples/boot/saml2login/spring-security-samples-boot-saml2login.gradle delete mode 100644 samples/boot/saml2login/src/integration-test/java/sample/Saml2LoginApplicationITests.java delete mode 100644 samples/boot/saml2login/src/main/java/sample/IndexController.java delete mode 100644 samples/boot/saml2login/src/main/java/sample/Saml2LoginApplication.java delete mode 100644 samples/boot/saml2login/src/main/java/sample/SecurityConfig.java delete mode 100644 samples/boot/saml2login/src/main/resources/application.yml delete mode 100644 samples/boot/saml2login/src/main/resources/templates/index.html delete mode 100644 samples/boot/webflux-form/spring-security-samples-boot-webflux-form.gradle delete mode 100644 samples/boot/webflux-form/src/integration-test/java/sample/WebfluxFormApplicationTests.java delete mode 100644 samples/boot/webflux-form/src/integration-test/java/sample/webdriver/IndexPage.java delete mode 100644 samples/boot/webflux-form/src/integration-test/java/sample/webdriver/LoginPage.java delete mode 100644 samples/boot/webflux-form/src/main/java/sample/IndexController.java delete mode 100644 samples/boot/webflux-form/src/main/java/sample/WebfluxFormApplication.java delete mode 100644 samples/boot/webflux-form/src/main/java/sample/WebfluxFormSecurityConfig.java delete mode 100644 samples/boot/webflux-form/src/main/resources/logback.xml delete mode 100644 samples/boot/webflux-form/src/main/resources/templates/index.html delete mode 100644 samples/boot/webflux-form/src/main/resources/templates/login.html delete mode 100644 samples/boot/webflux-x509/spring-security-samples-boot-webflux-x509.gradle delete mode 100644 samples/boot/webflux-x509/src/main/java/sample/MeController.java delete mode 100644 samples/boot/webflux-x509/src/main/java/sample/WebfluxX509Application.java delete mode 100644 samples/boot/webflux-x509/src/main/resources/application.yml delete mode 100644 samples/boot/webflux-x509/src/main/resources/certs/curl_app.sh delete mode 100644 samples/boot/webflux-x509/src/main/resources/certs/server.p12 delete mode 100644 samples/boot/webflux-x509/src/test/java/sample/WebfluxX509ApplicationTest.java delete mode 100644 samples/certificates/Readme.txt delete mode 100644 samples/certificates/ca.pem delete mode 100755 samples/certificates/dianne.p12 delete mode 100644 samples/certificates/localhost-with-ca/ca.crt delete mode 100644 samples/certificates/localhost-with-ca/ca.csr delete mode 100644 samples/certificates/localhost-with-ca/ca.key delete mode 100644 samples/certificates/localhost-with-ca/ca.key.org delete mode 100644 samples/certificates/localhost-with-ca/generate.sh delete mode 100644 samples/certificates/localhost-with-ca/tomcat.cer delete mode 100644 samples/certificates/localhost-with-ca/tomcat.csr delete mode 100755 samples/certificates/rod.p12 delete mode 100644 samples/certificates/scott.p12 delete mode 100755 samples/certificates/server.jks delete mode 100644 samples/javaconfig/aspectj/spring-security-samples-javaconfig-aspectj.gradle delete mode 100644 samples/javaconfig/aspectj/src/main/java/sample/aspectj/AspectjSecurityConfig.java delete mode 100644 samples/javaconfig/aspectj/src/main/java/sample/aspectj/SecuredService.java delete mode 100644 samples/javaconfig/aspectj/src/main/java/sample/aspectj/Service.java delete mode 100644 samples/javaconfig/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java delete mode 100644 samples/javaconfig/aspectj/src/test/resources/logback-test.xml delete mode 100644 samples/javaconfig/concurrency/spring-security-samples-javaconfig-concurrency.gradle delete mode 100644 samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/concurrency/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java delete mode 100644 samples/javaconfig/data/spring-security-samples-javaconfig-data.gradle delete mode 100644 samples/javaconfig/data/src/main/java/samples/DataConfig.java delete mode 100644 samples/javaconfig/data/src/main/java/samples/data/Message.java delete mode 100644 samples/javaconfig/data/src/main/java/samples/data/MessageRepository.java delete mode 100644 samples/javaconfig/data/src/main/java/samples/data/SecurityMessageRepository.java delete mode 100644 samples/javaconfig/data/src/main/java/samples/data/User.java delete mode 100644 samples/javaconfig/data/src/test/java/samples/data/SecurityMessageRepositoryTests.java delete mode 100644 samples/javaconfig/data/src/test/resources/data.sql delete mode 100644 samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle delete mode 100644 samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/FormJcTests.java delete mode 100644 samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java delete mode 100644 samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java delete mode 100644 samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/form/src/main/resources/logback.xml delete mode 100644 samples/javaconfig/form/src/main/resources/views/login.html delete mode 100644 samples/javaconfig/form/src/main/webapp/WEB-INF/views/login.jspx delete mode 100644 samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/compose.jspx delete mode 100644 samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/inbox.jspx delete mode 100644 samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/show.jspx delete mode 100644 samples/javaconfig/form/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java delete mode 100644 samples/javaconfig/hellojs/spring-security-samples-javaconfig-hellojs.gradle delete mode 100644 samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java delete mode 100644 samples/javaconfig/hellojs/src/main/resources/resources/js/bootstrap.js delete mode 100644 samples/javaconfig/hellojs/src/main/resources/resources/js/jquery-3.5.1.min.js delete mode 100644 samples/javaconfig/hellojs/src/main/resources/resources/js/knockout-2.3.0.js delete mode 100644 samples/javaconfig/hellojs/src/main/resources/resources/js/message.js delete mode 100644 samples/javaconfig/hellojs/src/main/resources/views/messages/inbox.html delete mode 100644 samples/javaconfig/hellojs/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/javaconfig/hellojs/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java delete mode 100644 samples/javaconfig/hellomvc/spring-security-samples-javaconfig-hellomvc.gradle delete mode 100644 samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/hellomvc/src/main/resources/views/README.adoc delete mode 100644 samples/javaconfig/hellomvc/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/javaconfig/hellomvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java delete mode 100644 samples/javaconfig/helloworld/spring-security-samples-javaconfig-helloworld.gradle delete mode 100644 samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldJcTests.java delete mode 100644 samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java delete mode 100644 samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java delete mode 100644 samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/helloworld/src/main/resources/logback.xml delete mode 100644 samples/javaconfig/helloworld/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/javaconfig/helloworld/src/main/webapp/index.jsp delete mode 100644 samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css delete mode 100644 samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap.css delete mode 100644 samples/javaconfig/helloworld/src/main/webapp/resources/img/favicon.ico delete mode 100644 samples/javaconfig/helloworld/src/main/webapp/resources/img/logo.png delete mode 100644 samples/javaconfig/inmemory/spring-security-samples-javaconfig-inmemory.gradle delete mode 100644 samples/javaconfig/inmemory/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/inmemory/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/inmemory/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/javaconfig/inmemory/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java delete mode 100644 samples/javaconfig/jdbc/spring-security-samples-javaconfig-jdbc.gradle delete mode 100644 samples/javaconfig/jdbc/src/integration-test/java/org/springframework/security/samples/JdbcJcTests.java delete mode 100644 samples/javaconfig/jdbc/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java delete mode 100644 samples/javaconfig/jdbc/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java delete mode 100644 samples/javaconfig/jdbc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/jdbc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/jdbc/src/main/resources/logback.xml delete mode 100644 samples/javaconfig/jdbc/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle delete mode 100644 samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/LdapJcTests.java delete mode 100644 samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java delete mode 100644 samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java delete mode 100644 samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/ldap/src/main/resources/logback.xml delete mode 100644 samples/javaconfig/ldap/src/main/resources/users.ldif delete mode 100644 samples/javaconfig/ldap/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/javaconfig/messages/spring-security-samples-javaconfig-messages.gradle delete mode 100644 samples/javaconfig/messages/src/main/java/META-INF/MANIFEST.MF delete mode 100644 samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/DataConfiguration.java delete mode 100644 samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java delete mode 100644 samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/RootConfiguration.java delete mode 100644 samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/Message.java delete mode 100644 samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/MessageRepository.java delete mode 100644 samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/DefaultController.java delete mode 100644 samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/MessageController.java delete mode 100644 samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java delete mode 100644 samples/javaconfig/messages/src/main/resources/data.sql delete mode 100644 samples/javaconfig/messages/src/main/resources/resources/css/bootstrap-responsive.css delete mode 100644 samples/javaconfig/messages/src/main/resources/resources/css/bootstrap.css delete mode 100644 samples/javaconfig/messages/src/main/resources/resources/img/favicon.ico delete mode 100644 samples/javaconfig/messages/src/main/resources/resources/img/logo.png delete mode 100644 samples/javaconfig/messages/src/main/resources/views/layout.html delete mode 100644 samples/javaconfig/messages/src/main/resources/views/messages/compose.html delete mode 100644 samples/javaconfig/messages/src/main/resources/views/messages/inbox.html delete mode 100644 samples/javaconfig/messages/src/main/resources/views/messages/show.html delete mode 100644 samples/javaconfig/openid/spring-security-samples-javaconfig-openid.gradle delete mode 100644 samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/openid/src/main/java/org/springframework/security/samples/mvc/UserController.java delete mode 100644 samples/javaconfig/openid/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java delete mode 100644 samples/javaconfig/openid/src/main/resources/logback.xml delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/css/openid.css delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/aol.gif delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/blogger.ico delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/claimid.ico delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/facebook.gif delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/favicon.ico delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/flickr.ico delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/google.gif delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/livejournal.ico delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/logo.png delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/myopenid.ico delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/openid-inputicon.gif delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/openid.gif delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/technorati.ico delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/verisign.gif delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/verisign.ico delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/vidoop.ico delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/wordpress.ico delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/img/yahoo.gif delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/js/jquery-1.2.6.min.js delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/js/openid-client/jquery.query-2.1.3.js delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client-config.js delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client.js delete mode 100644 samples/javaconfig/openid/src/main/resources/resources/js/openid-jquery.js delete mode 100644 samples/javaconfig/openid/src/main/resources/users.ldif delete mode 100644 samples/javaconfig/openid/src/main/resources/views/login.html delete mode 100644 samples/javaconfig/openid/src/main/resources/views/user/show.html delete mode 100644 samples/javaconfig/openid/src/main/resources/views/user/show.jspx delete mode 100644 samples/javaconfig/openid/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/javaconfig/openid/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java delete mode 100644 samples/javaconfig/preauth/spring-security-samples-javaconfig-preauth.gradle delete mode 100644 samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/preauth/src/main/resources/logback.xml delete mode 100644 samples/javaconfig/preauth/src/main/resources/views/login.html delete mode 100644 samples/javaconfig/preauth/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/javaconfig/preauth/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/javaconfig/preauth/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java delete mode 100644 samples/javaconfig/rememberme/spring-security-samples-javaconfig-rememberme.gradle delete mode 100644 samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/rememberme/src/main/resources/logback.xml delete mode 100644 samples/javaconfig/rememberme/src/main/resources/views/login.html delete mode 100644 samples/javaconfig/rememberme/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/javaconfig/rememberme/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java delete mode 100644 samples/javaconfig/saml2login/spring-security-samples-javaconfig-saml2login.gradle delete mode 100644 samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/saml2login/src/main/resources/logback.xml delete mode 100644 samples/javaconfig/saml2login/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java delete mode 100644 samples/javaconfig/x509/spring-security-samples-javaconfig-x509.gradle delete mode 100644 samples/javaconfig/x509/src/etc/ca.pem delete mode 100644 samples/javaconfig/x509/src/etc/dianne.p12 delete mode 100644 samples/javaconfig/x509/src/etc/rod.p12 delete mode 100644 samples/javaconfig/x509/src/etc/scott.p12 delete mode 100644 samples/javaconfig/x509/src/etc/server.jks delete mode 100644 samples/javaconfig/x509/src/etc/server.xml delete mode 100644 samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java delete mode 100644 samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/SecurityConfig.java delete mode 100644 samples/javaconfig/x509/src/main/resources/logback.xml delete mode 100644 samples/javaconfig/x509/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators.xml delete mode 100644 samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators/main.jsp delete mode 100644 samples/javaconfig/x509/src/main/webapp/WEB-INF/views/login.jspx delete mode 100644 samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/compose.jspx delete mode 100644 samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/inbox.jspx delete mode 100644 samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/show.jspx delete mode 100644 samples/javaconfig/x509/src/main/webapp/WEB-INF/web.xml- delete mode 100644 samples/javaconfig/x509/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java delete mode 100644 samples/xml/aspectj/spring-security-samples-xml-aspectj.gradle delete mode 100644 samples/xml/aspectj/src/main/java/sample/aspectj/SecuredService.java delete mode 100644 samples/xml/aspectj/src/main/java/sample/aspectj/Service.java delete mode 100644 samples/xml/aspectj/src/main/resources/aspectj-context.xml delete mode 100644 samples/xml/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java delete mode 100644 samples/xml/aspectj/src/test/resources/logback-test.xml delete mode 100644 samples/xml/cas/Readme.txt delete mode 100644 samples/xml/cas/cassample/spring-security-samples-xml-cassample.gradle delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleProxyTests.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleTests.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/JettyCasService.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/AccessDeniedPage.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/ExtremelySecurePage.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/HomePage.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/LocalLogoutPage.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/LoginPage.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/Page.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/SecurePage.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/UnauthorizedPage.java delete mode 100644 samples/xml/cas/cassample/src/integration-test/resources/logback-test.xml delete mode 100644 samples/xml/cas/cassample/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java delete mode 100644 samples/xml/cas/cassample/src/main/webapp/401.jsp delete mode 100644 samples/xml/cas/cassample/src/main/webapp/403.jsp delete mode 100644 samples/xml/cas/cassample/src/main/webapp/WEB-INF/applicationContext-security.xml delete mode 100644 samples/xml/cas/cassample/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/xml/cas/cassample/src/main/webapp/cas-logout.jsp delete mode 100644 samples/xml/cas/cassample/src/main/webapp/casfailed.jsp delete mode 100644 samples/xml/cas/cassample/src/main/webapp/index.jsp delete mode 100644 samples/xml/cas/cassample/src/main/webapp/secure/extreme/index.jsp delete mode 100644 samples/xml/cas/cassample/src/main/webapp/secure/index.jsp delete mode 100644 samples/xml/cas/casserver/spring-security-samples-xml-casserver.gradle delete mode 100644 samples/xml/cas/casserver/src/main/webapp/WEB-INF/classes/log4j.xml delete mode 100644 samples/xml/cas/casserver/src/main/webapp/WEB-INF/deployerConfigContext.xml delete mode 100644 samples/xml/cas/casserver/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml delete mode 100644 samples/xml/cas/spring-security-samples-xml-cas.gradle delete mode 100644 samples/xml/contacts/client/client.properties delete mode 100644 samples/xml/contacts/client/clientContext.xml delete mode 100644 samples/xml/contacts/spring-security-samples-xml-contacts.gradle delete mode 100644 samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/ContactsTests.java delete mode 100644 samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/AddPage.java delete mode 100644 samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/ContactsPage.java delete mode 100644 samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java delete mode 100644 samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/AddDeleteContactController.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/AddPermission.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/AdminPermissionController.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/ClientApplication.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/Contact.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/ContactDao.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/ContactManager.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/ContactManagerBackend.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/IndexController.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/WebContact.java delete mode 100644 samples/xml/contacts/src/main/java/sample/contact/WebContactValidator.java delete mode 100644 samples/xml/contacts/src/main/resources/applicationContext-common-authorization.xml delete mode 100644 samples/xml/contacts/src/main/resources/applicationContext-common-business.xml delete mode 100644 samples/xml/contacts/src/main/resources/applicationContext-security.xml delete mode 100644 samples/xml/contacts/src/main/resources/logback.xml delete mode 100644 samples/xml/contacts/src/main/resources/messages.properties delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/contacts-servlet.xml delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/jsp/add.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/jsp/addPermission.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/jsp/adminPermission.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deletePermission.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deleted.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/jsp/frames.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/jsp/hello.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/jsp/include.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/jsp/index.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld delete mode 100644 samples/xml/contacts/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/xml/contacts/src/main/webapp/accessDenied.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/error.html delete mode 100644 samples/xml/contacts/src/main/webapp/exitUser.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/index.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/login.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/secure/debug.jsp delete mode 100644 samples/xml/contacts/src/main/webapp/switchUser.jsp delete mode 100644 samples/xml/contacts/src/site/resources/logback-test.xml delete mode 100644 samples/xml/contacts/src/site/resources/sslhowto.txt delete mode 100644 samples/xml/contacts/src/test/java/sample/contact/ContactManagerTests.java delete mode 100644 samples/xml/contacts/src/test/resources/logback-test.xml delete mode 100644 samples/xml/dms/spring-security-samples-xml-dms.gradle delete mode 100755 samples/xml/dms/src/main/java/sample/dms/AbstractElement.java delete mode 100755 samples/xml/dms/src/main/java/sample/dms/DataSourcePopulator.java delete mode 100755 samples/xml/dms/src/main/java/sample/dms/Directory.java delete mode 100755 samples/xml/dms/src/main/java/sample/dms/DocumentDao.java delete mode 100755 samples/xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java delete mode 100755 samples/xml/dms/src/main/java/sample/dms/File.java delete mode 100755 samples/xml/dms/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java delete mode 100755 samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java delete mode 100755 samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java delete mode 100755 samples/xml/dms/src/main/resources/applicationContext-dms-insecure.xml delete mode 100755 samples/xml/dms/src/main/resources/applicationContext-dms-secure.xml delete mode 100755 samples/xml/dms/src/main/resources/applicationContext-dms-shared.xml delete mode 100644 samples/xml/dms/src/test/java/sample/DmsIntegrationTests.java delete mode 100644 samples/xml/dms/src/test/java/sample/SecureDmsIntegrationTests.java delete mode 100644 samples/xml/dms/src/test/resources/logback-test.xml delete mode 100644 samples/xml/gae/README.adoc delete mode 100644 samples/xml/gae/spring-security-samples-xml-gae.gradle delete mode 100644 samples/xml/gae/src/main/java/samples/gae/security/AppRole.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/security/GaeAuthenticationFilter.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/security/GaeUserAuthentication.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/users/GaeUser.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/users/UserRegistry.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/validation/Forename.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/validation/ForenameValidator.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/validation/Surname.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/validation/SurnameValidator.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/web/GaeAppController.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/web/RegistrationController.java delete mode 100644 samples/xml/gae/src/main/java/samples/gae/web/RegistrationForm.java delete mode 100644 samples/xml/gae/src/main/webapp/WEB-INF/appengine-web.xml delete mode 100644 samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml delete mode 100644 samples/xml/gae/src/main/webapp/WEB-INF/classes/ValidationMessages.properties delete mode 100644 samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml delete mode 100644 samples/xml/gae/src/main/webapp/WEB-INF/jsp/disabled.jsp delete mode 100644 samples/xml/gae/src/main/webapp/WEB-INF/jsp/home.jsp delete mode 100644 samples/xml/gae/src/main/webapp/WEB-INF/jsp/landing.jsp delete mode 100644 samples/xml/gae/src/main/webapp/WEB-INF/jsp/loggedout.jsp delete mode 100644 samples/xml/gae/src/main/webapp/WEB-INF/jsp/register.jsp delete mode 100644 samples/xml/gae/src/main/webapp/WEB-INF/logging.properties delete mode 100644 samples/xml/gae/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/xml/gae/src/main/webapp/favicon.ico delete mode 100644 samples/xml/gae/src/main/webapp/static/css/gae.css delete mode 100644 samples/xml/gae/src/test/java/samples/gae/security/AppRoleTests.java delete mode 100644 samples/xml/gae/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java delete mode 100644 samples/xml/gae/src/test/resources/logback-test.xml delete mode 100644 samples/xml/helloworld/spring-security-samples-xml-helloworld.gradle delete mode 100644 samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldXmlTests.java delete mode 100644 samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java delete mode 100644 samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java delete mode 100644 samples/xml/helloworld/src/main/resources/logback.xml delete mode 100644 samples/xml/helloworld/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml delete mode 100644 samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/xml/helloworld/src/main/webapp/index.jsp delete mode 100644 samples/xml/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css delete mode 100644 samples/xml/helloworld/src/main/webapp/resources/css/bootstrap.css delete mode 100644 samples/xml/helloworld/src/main/webapp/resources/img/favicon.ico delete mode 100644 samples/xml/helloworld/src/main/webapp/resources/img/logo.png delete mode 100644 samples/xml/insecure/spring-security-samples-xml-insecure.gradle delete mode 100644 samples/xml/insecure/src/integration-test/java/org/springframework/security/samples/HelloInsecureTests.java delete mode 100644 samples/xml/insecure/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java delete mode 100644 samples/xml/insecure/src/main/java/README.adoc delete mode 100644 samples/xml/insecure/src/main/webapp/index.jsp delete mode 100644 samples/xml/insecure/src/main/webapp/resources/css/bootstrap-responsive.css delete mode 100644 samples/xml/insecure/src/main/webapp/resources/css/bootstrap.css delete mode 100644 samples/xml/insecure/src/main/webapp/resources/img/favicon.ico delete mode 100644 samples/xml/insecure/src/main/webapp/resources/img/logo.png delete mode 100644 samples/xml/insecuremvc/spring-security-samples-xml-insecuremvc.gradle delete mode 100644 samples/xml/insecuremvc/src/main/java/README.adoc delete mode 100644 samples/xml/insecuremvc/src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 samples/xml/insecuremvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java delete mode 100644 samples/xml/insecuremvc/src/test/resources/logback-test.xml delete mode 100644 samples/xml/jaas/spring-security-samples-xml-jaas.gradle delete mode 100644 samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/JaasXmlTests.java delete mode 100644 samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java delete mode 100644 samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java delete mode 100644 samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/LogoutPage.java delete mode 100644 samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java delete mode 100644 samples/xml/jaas/src/main/java/samples/jaas/RoleUserAuthorityGranter.java delete mode 100644 samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java delete mode 100644 samples/xml/jaas/src/main/resources/applicationContext-security.xml delete mode 100644 samples/xml/jaas/src/main/resources/logback.xml delete mode 100644 samples/xml/jaas/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/xml/jaas/src/main/webapp/index.jsp delete mode 100644 samples/xml/jaas/src/main/webapp/secure/index.jsp delete mode 100644 samples/xml/ldap/spring-security-samples-xml-ldap.gradle delete mode 100644 samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/LdapXmlTests.java delete mode 100644 samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java delete mode 100644 samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java delete mode 100644 samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/LogoutPage.java delete mode 100644 samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java delete mode 100644 samples/xml/ldap/src/main/resources/logback.xml delete mode 100644 samples/xml/ldap/src/main/resources/users.ldif delete mode 100644 samples/xml/ldap/src/main/webapp/WEB-INF/applicationContext-security.xml delete mode 100644 samples/xml/ldap/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/xml/ldap/src/main/webapp/index.jsp delete mode 100644 samples/xml/ldap/src/main/webapp/secure/extreme/index.jsp delete mode 100644 samples/xml/ldap/src/main/webapp/secure/index.jsp delete mode 100644 samples/xml/oauth2login/README.adoc delete mode 100644 samples/xml/oauth2login/spring-security-samples-xml-oauth2login.gradle delete mode 100644 samples/xml/oauth2login/src/main/java/sample/config/WebConfig.java delete mode 100644 samples/xml/oauth2login/src/main/java/sample/web/OAuth2LoginController.java delete mode 100644 samples/xml/oauth2login/src/main/webapp/WEB-INF/security.xml delete mode 100644 samples/xml/oauth2login/src/main/webapp/WEB-INF/spring-servlet.xml delete mode 100644 samples/xml/oauth2login/src/main/webapp/WEB-INF/templates/index.html delete mode 100644 samples/xml/oauth2login/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/xml/openid/spring-security-samples-xml-openid.gradle delete mode 100644 samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java delete mode 100644 samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java delete mode 100644 samples/xml/openid/src/main/resources/logback.xml delete mode 100644 samples/xml/openid/src/main/webapp/WEB-INF/applicationContext-security.xml delete mode 100644 samples/xml/openid/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/xml/openid/src/main/webapp/css/openid.css delete mode 100644 samples/xml/openid/src/main/webapp/images/aol.gif delete mode 100644 samples/xml/openid/src/main/webapp/images/blogger.ico delete mode 100644 samples/xml/openid/src/main/webapp/images/claimid.ico delete mode 100644 samples/xml/openid/src/main/webapp/images/facebook.gif delete mode 100644 samples/xml/openid/src/main/webapp/images/flickr.ico delete mode 100644 samples/xml/openid/src/main/webapp/images/google.gif delete mode 100644 samples/xml/openid/src/main/webapp/images/livejournal.ico delete mode 100644 samples/xml/openid/src/main/webapp/images/myopenid.ico delete mode 100644 samples/xml/openid/src/main/webapp/images/openid-inputicon.gif delete mode 100644 samples/xml/openid/src/main/webapp/images/openid.gif delete mode 100644 samples/xml/openid/src/main/webapp/images/technorati.ico delete mode 100644 samples/xml/openid/src/main/webapp/images/verisign.gif delete mode 100644 samples/xml/openid/src/main/webapp/images/verisign.ico delete mode 100644 samples/xml/openid/src/main/webapp/images/vidoop.ico delete mode 100644 samples/xml/openid/src/main/webapp/images/wordpress.ico delete mode 100644 samples/xml/openid/src/main/webapp/images/yahoo.gif delete mode 100644 samples/xml/openid/src/main/webapp/index.jsp delete mode 100644 samples/xml/openid/src/main/webapp/js/jquery-3.5.1.min.js delete mode 100644 samples/xml/openid/src/main/webapp/js/openid-client/jquery.query-2.1.3.js delete mode 100644 samples/xml/openid/src/main/webapp/js/openid-client/openid-client-config.js delete mode 100644 samples/xml/openid/src/main/webapp/js/openid-client/openid-client.js delete mode 100644 samples/xml/openid/src/main/webapp/js/openid-jquery.js delete mode 100644 samples/xml/openid/src/main/webapp/openidlogin.jsp delete mode 100644 samples/xml/preauth/realm.properties delete mode 100644 samples/xml/preauth/spring-security-samples-xml-preauth.gradle delete mode 100644 samples/xml/preauth/src/main/resources/logback.xml delete mode 100644 samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml delete mode 100644 samples/xml/preauth/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/xml/preauth/src/main/webapp/index.jsp delete mode 100644 samples/xml/preauth/src/main/webapp/secure/extreme/index.jsp delete mode 100644 samples/xml/preauth/src/main/webapp/secure/index.jsp delete mode 100644 samples/xml/preauth/src/test/java/sample/PreAuthXmlTests.java delete mode 100644 samples/xml/preauth/src/test/resources/logback-test.xml delete mode 100644 samples/xml/servletapi/spring-security-samples-xml-servletapi.gradle delete mode 100644 samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java delete mode 100644 samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java delete mode 100644 samples/xml/servletapi/src/main/resources/applicationContext-security.xml delete mode 100644 samples/xml/servletapi/src/main/resources/logback.xml delete mode 100644 samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml delete mode 100644 samples/xml/servletapi/src/main/webapp/WEB-INF/views/index.jsp delete mode 100644 samples/xml/servletapi/src/main/webapp/WEB-INF/views/login.jsp delete mode 100644 samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/xml/tutorial/readme.txt delete mode 100755 samples/xml/tutorial/scripts/exec-list-as-peter delete mode 100755 samples/xml/tutorial/scripts/exec-list-as-rod delete mode 100755 samples/xml/tutorial/scripts/exec-list-no-auth delete mode 100755 samples/xml/tutorial/scripts/exec-list-wrong-password delete mode 100755 samples/xml/tutorial/scripts/exec-post-as-peter delete mode 100755 samples/xml/tutorial/scripts/exec-post-as-rod delete mode 100755 samples/xml/tutorial/scripts/exec-post-no-auth delete mode 100755 samples/xml/tutorial/scripts/exec-post-wrong-password delete mode 100644 samples/xml/tutorial/spring-security-samples-xml-tutorial.gradle delete mode 100644 samples/xml/tutorial/src/main/java/bigbank/Account.java delete mode 100644 samples/xml/tutorial/src/main/java/bigbank/BankDao.java delete mode 100644 samples/xml/tutorial/src/main/java/bigbank/BankDaoStub.java delete mode 100644 samples/xml/tutorial/src/main/java/bigbank/BankService.java delete mode 100644 samples/xml/tutorial/src/main/java/bigbank/BankServiceImpl.java delete mode 100644 samples/xml/tutorial/src/main/java/bigbank/SeedData.java delete mode 100644 samples/xml/tutorial/src/main/java/bigbank/web/ListAccounts.java delete mode 100644 samples/xml/tutorial/src/main/java/bigbank/web/PostAccounts.java delete mode 100644 samples/xml/tutorial/src/main/resources/applicationContext-business.xml delete mode 100644 samples/xml/tutorial/src/main/resources/logback.xml delete mode 100644 samples/xml/tutorial/src/main/webapp/WEB-INF/applicationContext-security.xml delete mode 100644 samples/xml/tutorial/src/main/webapp/WEB-INF/bank-servlet.xml delete mode 100644 samples/xml/tutorial/src/main/webapp/WEB-INF/jsp/listAccounts.jsp delete mode 100644 samples/xml/tutorial/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/xml/tutorial/src/main/webapp/index.jsp delete mode 100644 samples/xml/tutorial/src/main/webapp/loggedout.jsp delete mode 100644 samples/xml/tutorial/src/main/webapp/secure/extreme/index.jsp delete mode 100644 samples/xml/tutorial/src/main/webapp/secure/index.jsp delete mode 100644 samples/xml/tutorial/src/main/webapp/static/css/tutorial.css delete mode 100644 samples/xml/tutorial/src/main/webapp/timeout.jsp diff --git a/samples/boot/hellorsocket/spring-security-samples-boot-hellorsocket.gradle b/samples/boot/hellorsocket/spring-security-samples-boot-hellorsocket.gradle deleted file mode 100644 index f2b788a0e2..0000000000 --- a/samples/boot/hellorsocket/spring-security-samples-boot-hellorsocket.gradle +++ /dev/null @@ -1,11 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-core') - compile project(':spring-security-config') - compile project(':spring-security-rsocket') - compile 'org.springframework.boot:spring-boot-starter-rsocket' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java b/samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java deleted file mode 100644 index 0709dd93bc..0000000000 --- a/samples/boot/hellorsocket/src/integration-test/java/sample/HelloRSocketApplicationITests.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.rsocket.context.LocalRSocketServerPort; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.messaging.rsocket.RSocketRequester; -import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder; -import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; - -import org.junit.Test; -import org.junit.runner.RunWith; -import reactor.core.publisher.Mono; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.springframework.security.rsocket.metadata.UsernamePasswordMetadata.BASIC_AUTHENTICATION_MIME_TYPE; - -/** - * @author Rob Winch - * @author Eddú Meléndez - * @since 5.0 - */ -@RunWith(SpringRunner.class) -@TestPropertySource(properties = "spring.rsocket.server.port=0") -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class HelloRSocketApplicationITests { - - @Autowired - RSocketRequester.Builder requester; - - @LocalRSocketServerPort - int port; - - @Test - public void messageWhenAuthenticatedThenSuccess() { - UsernamePasswordMetadata credentials = new UsernamePasswordMetadata("user", "password"); - RSocketRequester requester = this.requester - .rsocketStrategies((builder) -> builder.encoder(new BasicAuthenticationEncoder())) - .setupMetadata(credentials, BASIC_AUTHENTICATION_MIME_TYPE) - .connectTcp("localhost", this.port) - .block(); - - String message = requester.route("message") - .data(Mono.empty()) - .retrieveMono(String.class) - .block(); - - assertThat(message).isEqualTo("Hello"); - } - - @Test - public void messageWhenNotAuthenticatedThenError() { - RSocketRequester requester = this.requester - .connectTcp("localhost", this.port) - .block(); - - assertThatThrownBy(() -> requester.route("message") - .data(Mono.empty()) - .retrieveMono(String.class) - .block()) - .isNotNull(); - } - -} diff --git a/samples/boot/hellorsocket/src/main/java/sample/HelloRSocketApplication.java b/samples/boot/hellorsocket/src/main/java/sample/HelloRSocketApplication.java deleted file mode 100644 index fbbc6df27d..0000000000 --- a/samples/boot/hellorsocket/src/main/java/sample/HelloRSocketApplication.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Rob Winch - * @since 5.2 - */ -@SpringBootApplication -public class HelloRSocketApplication { - - public static void main(String[] args) { - SpringApplication.run(HelloRSocketApplication.class, args); - } - -} diff --git a/samples/boot/hellorsocket/src/main/java/sample/HelloRSocketSecurityConfig.java b/samples/boot/hellorsocket/src/main/java/sample/HelloRSocketSecurityConfig.java deleted file mode 100644 index 9f469f08e7..0000000000 --- a/samples/boot/hellorsocket/src/main/java/sample/HelloRSocketSecurityConfig.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.rsocket.EnableRSocketSecurity; -import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; - -/** - * @author Rob Winch - * @since 5.2 - */ -@Configuration -@EnableRSocketSecurity -public class HelloRSocketSecurityConfig { - - @Bean - MapReactiveUserDetailsService userDetailsService() { - UserDetails user = User.withDefaultPasswordEncoder() - .username("user") - .password("password") - .roles("SETUP") - .build(); - return new MapReactiveUserDetailsService(user); - } - -} diff --git a/samples/boot/hellorsocket/src/main/java/sample/MessageController.java b/samples/boot/hellorsocket/src/main/java/sample/MessageController.java deleted file mode 100644 index 0150b3f821..0000000000 --- a/samples/boot/hellorsocket/src/main/java/sample/MessageController.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.messaging.handler.annotation.MessageMapping; -import org.springframework.stereotype.Controller; -import reactor.core.publisher.Mono; - -/** - * @author Rob Winch - * @since 5.2 - */ -@Controller -public class MessageController { - - @MessageMapping("message") - public Mono message() { - return Mono.just("Hello"); - } -} diff --git a/samples/boot/hellorsocket/src/main/resources/application.properties b/samples/boot/hellorsocket/src/main/resources/application.properties deleted file mode 100644 index 0d91b628f6..0000000000 --- a/samples/boot/hellorsocket/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.rsocket.server.port=8080 diff --git a/samples/boot/hellowebflux-method/spring-security-samples-boot-hellowebflux-method.gradle b/samples/boot/hellowebflux-method/spring-security-samples-boot-hellowebflux-method.gradle deleted file mode 100644 index c21781806f..0000000000 --- a/samples/boot/hellowebflux-method/spring-security-samples-boot-hellowebflux-method.gradle +++ /dev/null @@ -1,12 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-core') - compile project(':spring-security-config') - compile project(':spring-security-web') - compile 'org.springframework.boot:spring-boot-starter-webflux' - - testCompile project(':spring-security-test') - testCompile 'io.projectreactor:reactor-test' - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/hellowebflux-method/src/integration-test/java/sample/HelloWebfluxMethodApplicationITests.java b/samples/boot/hellowebflux-method/src/integration-test/java/sample/HelloWebfluxMethodApplicationITests.java deleted file mode 100644 index d95956b2d6..0000000000 --- a/samples/boot/hellowebflux-method/src/integration-test/java/sample/HelloWebfluxMethodApplicationITests.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import java.util.function.Consumer; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; - -/** - * @author Rob Winch - * @since 5.0 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class HelloWebfluxMethodApplicationITests { - - @Autowired - WebTestClient rest; - - - @Test - public void messageWhenNotAuthenticated() { - this.rest - .get() - .uri("/message") - .exchange() - .expectStatus().isUnauthorized(); - } - - @Test - public void messageWhenUserThenForbidden() { - this.rest - .get() - .uri("/message") - .headers(robsCredentials()) - .exchange() - .expectStatus().isEqualTo(HttpStatus.FORBIDDEN); - } - - @Test - public void messageWhenAdminThenOk() { - this.rest - .get() - .uri("/message") - .headers(adminCredentials()) - .exchange() - .expectStatus().isOk() - .expectBody(String.class).isEqualTo("Hello World!"); - } - - private Consumer robsCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("rob", "rob"); - } - - private Consumer adminCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("admin", "admin"); - } -} - diff --git a/samples/boot/hellowebflux-method/src/main/java/sample/HelloWebfluxMethodApplication.java b/samples/boot/hellowebflux-method/src/main/java/sample/HelloWebfluxMethodApplication.java deleted file mode 100644 index 37aec1d99f..0000000000 --- a/samples/boot/hellowebflux-method/src/main/java/sample/HelloWebfluxMethodApplication.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Rob Winch - * @since 5.0 - */ -@SpringBootApplication -public class HelloWebfluxMethodApplication { - - public static void main(String[] args) { - SpringApplication.run(HelloWebfluxMethodApplication.class, args); - } -} diff --git a/samples/boot/hellowebflux-method/src/main/java/sample/HelloWorldMessageService.java b/samples/boot/hellowebflux-method/src/main/java/sample/HelloWorldMessageService.java deleted file mode 100644 index c6184c830d..0000000000 --- a/samples/boot/hellowebflux-method/src/main/java/sample/HelloWorldMessageService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.stereotype.Component; -import reactor.core.publisher.Mono; - -/** - * @author Rob Winch - * @since 5.0 - */ -@Component -public class HelloWorldMessageService { - @PreAuthorize("hasRole('ADMIN')") - public Mono findMessage() { - return Mono.just("Hello World!"); - } -} diff --git a/samples/boot/hellowebflux-method/src/main/java/sample/MessageController.java b/samples/boot/hellowebflux-method/src/main/java/sample/MessageController.java deleted file mode 100644 index b8e96e6a45..0000000000 --- a/samples/boot/hellowebflux-method/src/main/java/sample/MessageController.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; -import reactor.core.publisher.Mono; - -/** - * @author Rob Winch - * @since 5.0 - */ -@RestController -public class MessageController { - private final HelloWorldMessageService messages; - - public MessageController(HelloWorldMessageService messages) { - this.messages = messages; - } - - @GetMapping("/message") - public Mono message() { - return this.messages.findMessage(); - } -} diff --git a/samples/boot/hellowebflux-method/src/main/java/sample/SecurityConfig.java b/samples/boot/hellowebflux-method/src/main/java/sample/SecurityConfig.java deleted file mode 100644 index fbbcdc835e..0000000000 --- a/samples/boot/hellowebflux-method/src/main/java/sample/SecurityConfig.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; -import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; -import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; -import org.springframework.security.config.web.server.ServerHttpSecurity; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.web.server.SecurityWebFilterChain; - -import static org.springframework.security.config.Customizer.withDefaults; - -/** - * @author Rob Winch - * @since 5.0 - */ -@EnableWebFluxSecurity -@EnableReactiveMethodSecurity -public class SecurityConfig { - - @Bean - SecurityWebFilterChain springWebFilterChain(ServerHttpSecurity http) { - return http - // Demonstrate that method security works - // Best practice to use both for defense in depth - .authorizeExchange((exchanges) -> exchanges - .anyExchange().permitAll() - ) - .httpBasic(withDefaults()) - .build(); - } - - @Bean - public MapReactiveUserDetailsService userDetailsService() { - User.UserBuilder userBuilder = User.withDefaultPasswordEncoder(); - UserDetails rob = userBuilder.username("rob").password("rob").roles("USER").build(); - UserDetails admin = userBuilder.username("admin").password("admin").roles("USER", "ADMIN").build(); - return new MapReactiveUserDetailsService(rob, admin); - } - -} diff --git a/samples/boot/hellowebflux-method/src/test/java/sample/HelloWebfluxMethodApplicationTests.java b/samples/boot/hellowebflux-method/src/test/java/sample/HelloWebfluxMethodApplicationTests.java deleted file mode 100644 index 6a2e2898ed..0000000000 --- a/samples/boot/hellowebflux-method/src/test/java/sample/HelloWebfluxMethodApplicationTests.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockUser; -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.springSecurity; - -import java.util.function.Consumer; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationContext; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; - -/** - * @author Rob Winch - * @since 5.0 - */ -@RunWith(SpringRunner.class) -@SpringBootTest -public class HelloWebfluxMethodApplicationTests { - WebTestClient rest; - - @Autowired - public void setup(ApplicationContext context) { - this.rest = WebTestClient - .bindToApplicationContext(context) - .apply(springSecurity()) - .configureClient() - .build(); - } - - @Test - public void messageWhenNotAuthenticated() { - this.rest - .get() - .uri("/message") - .exchange() - .expectStatus().isUnauthorized(); - } - - @Test - public void messageWhenUserThenForbidden() { - this.rest - .get() - .uri("/message") - .headers(robsCredentials()) - .exchange() - .expectStatus().isEqualTo(HttpStatus.FORBIDDEN); - } - - @Test - public void messageWhenAdminThenOk() { - this.rest - .get() - .uri("/message") - .headers(adminCredentials()) - .exchange() - .expectStatus().isOk() - .expectBody(String.class).isEqualTo("Hello World!"); - } - - @Test - @WithMockUser - public void messageWhenWithMockUserThenForbidden() { - this.rest - .get() - .uri("/message") - .exchange() - .expectStatus().isEqualTo(HttpStatus.FORBIDDEN); - } - - @Test - @WithMockUser(roles = "ADMIN") - public void messageWhenWithMockAdminThenOk() { - this.rest - .get() - .uri("/message") - .exchange() - .expectStatus().isOk() - .expectBody(String.class).isEqualTo("Hello World!"); - } - - @Test - public void messageWhenMutateWithMockUserThenForbidden() { - this.rest - .mutateWith(mockUser()) - .get() - .uri("/message") - .exchange() - .expectStatus().isEqualTo(HttpStatus.FORBIDDEN); - } - - @Test - public void messageWhenMutateWithMockAdminThenOk() { - this.rest - .mutateWith(mockUser().roles("ADMIN")) - .get() - .uri("/message") - .exchange() - .expectStatus().isOk() - .expectBody(String.class).isEqualTo("Hello World!"); - } - - private Consumer robsCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("rob", "rob"); - } - - private Consumer adminCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("admin", "admin"); - } -} diff --git a/samples/boot/hellowebflux-method/src/test/java/sample/HelloWorldMessageServiceTests.java b/samples/boot/hellowebflux-method/src/test/java/sample/HelloWorldMessageServiceTests.java deleted file mode 100644 index d8f2aae925..0000000000 --- a/samples/boot/hellowebflux-method/src/test/java/sample/HelloWorldMessageServiceTests.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.junit4.SpringRunner; -import reactor.test.StepVerifier; - -/** - * @author Rob Winch - * @since 5.0 - */ -@RunWith(SpringRunner.class) -@SpringBootTest -public class HelloWorldMessageServiceTests { - @Autowired - HelloWorldMessageService messages; - - @Test - public void messagesWhenNotAuthenticatedThenDenied() { - StepVerifier.create(this.messages.findMessage()) - .expectError(AccessDeniedException.class) - .verify(); - } - - @Test - @WithMockUser - public void messagesWhenUserThenDenied() { - StepVerifier.create(this.messages.findMessage()) - .expectError(AccessDeniedException.class) - .verify(); - } - - @Test - @WithMockUser(roles = "ADMIN") - public void messagesWhenAdminThenOk() { - StepVerifier.create(this.messages.findMessage()) - .expectNext("Hello World!") - .verifyComplete(); - } -} diff --git a/samples/boot/hellowebflux/spring-security-samples-boot-hellowebflux.gradle b/samples/boot/hellowebflux/spring-security-samples-boot-hellowebflux.gradle deleted file mode 100644 index d65d168ad1..0000000000 --- a/samples/boot/hellowebflux/spring-security-samples-boot-hellowebflux.gradle +++ /dev/null @@ -1,11 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-core') - compile project(':spring-security-config') - compile project(':spring-security-web') - compile 'org.springframework.boot:spring-boot-starter-webflux' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/hellowebflux/src/integration-test/java/sample/HelloWebfluxApplicationITests.java b/samples/boot/hellowebflux/src/integration-test/java/sample/HelloWebfluxApplicationITests.java deleted file mode 100644 index 6d1dda2fac..0000000000 --- a/samples/boot/hellowebflux/src/integration-test/java/sample/HelloWebfluxApplicationITests.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import java.util.function.Consumer; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; - -/** - * @author Rob Winch - * @since 5.0 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class HelloWebfluxApplicationITests { - - @Autowired - WebTestClient rest; - - @Test - public void basicWhenNoCredentialsThenUnauthorized() { - this.rest - .get() - .uri("/") - .exchange() - .expectStatus().isUnauthorized(); - } - - @Test - public void basicWhenValidCredentialsThenOk() { - this.rest - .get() - .uri("/") - .headers(userCredentials()) - .exchange() - .expectStatus().isOk() - .expectBody().json("{\"message\":\"Hello user!\"}"); - } - - @Test - public void basicWhenInvalidCredentialsThenUnauthorized() { - this.rest - .get() - .uri("/") - .headers(invalidCredentials()) - .exchange() - .expectStatus().isUnauthorized() - .expectBody().isEmpty(); - } - - private Consumer userCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("user", "user"); - } - - private Consumer invalidCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("user", "INVALID"); - } -} diff --git a/samples/boot/hellowebflux/src/main/java/sample/HelloUserController.java b/samples/boot/hellowebflux/src/main/java/sample/HelloUserController.java deleted file mode 100644 index e06932f222..0000000000 --- a/samples/boot/hellowebflux/src/main/java/sample/HelloUserController.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import java.security.Principal; -import java.util.Collections; -import java.util.Map; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; -import reactor.core.publisher.Mono; - -/** - * @author Rob Winch - * @since 5.0 - */ -@RestController -public class HelloUserController { - - @GetMapping("/") - public Mono> hello(Mono principal) { - return principal - .map(Principal::getName) - .map(this::helloMessage); - } - - private Map helloMessage(String username) { - return Collections.singletonMap("message", "Hello " + username + "!"); - } -} diff --git a/samples/boot/hellowebflux/src/main/java/sample/HelloWebfluxApplication.java b/samples/boot/hellowebflux/src/main/java/sample/HelloWebfluxApplication.java deleted file mode 100644 index b3b27fdf73..0000000000 --- a/samples/boot/hellowebflux/src/main/java/sample/HelloWebfluxApplication.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Rob Winch - * @since 5.0 - */ -@SpringBootApplication -public class HelloWebfluxApplication { - - public static void main(String[] args) { - SpringApplication.run(HelloWebfluxApplication.class, args); - } - -} diff --git a/samples/boot/hellowebflux/src/main/java/sample/HelloWebfluxSecurityConfig.java b/samples/boot/hellowebflux/src/main/java/sample/HelloWebfluxSecurityConfig.java deleted file mode 100644 index e082133afd..0000000000 --- a/samples/boot/hellowebflux/src/main/java/sample/HelloWebfluxSecurityConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; -import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; - -/** - * @author Rob Winch - * @since 5.0 - */ -@EnableWebFluxSecurity -public class HelloWebfluxSecurityConfig { - - @Bean - public MapReactiveUserDetailsService userDetailsService() { - UserDetails user = User.withDefaultPasswordEncoder() - .username("user") - .password("user") - .roles("USER") - .build(); - return new MapReactiveUserDetailsService(user); - } -} diff --git a/samples/boot/hellowebflux/src/test/java/sample/HelloWebfluxApplicationTests.java b/samples/boot/hellowebflux/src/test/java/sample/HelloWebfluxApplicationTests.java deleted file mode 100644 index cc7892116f..0000000000 --- a/samples/boot/hellowebflux/src/test/java/sample/HelloWebfluxApplicationTests.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockUser; -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.springSecurity; - -import java.util.function.Consumer; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationContext; -import org.springframework.http.HttpHeaders; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; - -/** - * @author Rob Winch - * @since 5.0 - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@AutoConfigureWebTestClient -public class HelloWebfluxApplicationTests { - WebTestClient rest; - - @Autowired - public void setup(ApplicationContext context) { - this.rest = WebTestClient - .bindToApplicationContext(context) - .apply(springSecurity()) - .configureClient() - .build(); - } - - @Test - public void basicWhenNoCredentialsThenUnauthorized() { - this.rest - .get() - .uri("/") - .exchange() - .expectStatus().isUnauthorized(); - } - - @Test - public void basicWhenValidCredentialsThenOk() { - this.rest - .get() - .uri("/") - .headers(userCredentials()) - .exchange() - .expectStatus().isOk() - .expectBody().json("{\"message\":\"Hello user!\"}"); - } - - @Test - public void basicWhenInvalidCredentialsThenUnauthorized() { - this.rest - .get() - .uri("/") - .headers(invalidCredentials()) - .exchange() - .expectStatus().isUnauthorized() - .expectBody().isEmpty(); - } - - @Test - public void mockSupportWhenMutateWithMockUserThenOk() { - this.rest - .mutateWith(mockUser()) - .get() - .uri("/") - .exchange() - .expectStatus().isOk() - .expectBody().json("{\"message\":\"Hello user!\"}"); - } - - @Test - @WithMockUser - public void mockSupportWhenWithMockUserThenOk() { - this.rest - .get() - .uri("/") - .exchange() - .expectStatus().isOk() - .expectBody().json("{\"message\":\"Hello user!\"}"); - } - - private Consumer userCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("user", "user"); - } - - private Consumer invalidCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("user", "INVALID"); - } -} diff --git a/samples/boot/hellowebfluxfn/spring-security-samples-boot-hellowebfluxfn.gradle b/samples/boot/hellowebfluxfn/spring-security-samples-boot-hellowebfluxfn.gradle deleted file mode 100644 index d65d168ad1..0000000000 --- a/samples/boot/hellowebfluxfn/spring-security-samples-boot-hellowebfluxfn.gradle +++ /dev/null @@ -1,11 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-core') - compile project(':spring-security-config') - compile project(':spring-security-web') - compile 'org.springframework.boot:spring-boot-starter-webflux' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/hellowebfluxfn/src/integration-test/java/sample/HelloWebfluxFnApplicationITests.java b/samples/boot/hellowebfluxfn/src/integration-test/java/sample/HelloWebfluxFnApplicationITests.java deleted file mode 100644 index de42538a78..0000000000 --- a/samples/boot/hellowebfluxfn/src/integration-test/java/sample/HelloWebfluxFnApplicationITests.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import java.util.function.Consumer; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; -import org.springframework.web.reactive.function.client.ExchangeFilterFunctions; - -/** - * @author Rob Winch - * @since 5.0 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class HelloWebfluxFnApplicationITests { - - WebTestClient rest; - - @Autowired - public void setRest(WebTestClient rest) { - this.rest = rest - .mutateWith((b, h, c) -> b.filter(ExchangeFilterFunctions.basicAuthentication())); - } - - @Test - public void basicWhenNoCredentialsThenUnauthorized() { - this.rest - .get() - .uri("/") - .exchange() - .expectStatus().isUnauthorized(); - } - - @Test - public void basicWhenValidCredentialsThenOk() { - this.rest - .get() - .uri("/") - .headers(userCredentials()) - .exchange() - .expectStatus().isOk() - .expectBody().json("{\"message\":\"Hello user!\"}"); - } - - @Test - public void basicWhenInvalidCredentialsThenUnauthorized() { - this.rest - .get() - .uri("/") - .headers(invalidCredentials()) - .exchange() - .expectStatus().isUnauthorized() - .expectBody().isEmpty(); - } - - private Consumer userCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("user", "user"); - } - - private Consumer invalidCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("user", "INVALID"); - } -} diff --git a/samples/boot/hellowebfluxfn/src/main/java/sample/HelloUserController.java b/samples/boot/hellowebfluxfn/src/main/java/sample/HelloUserController.java deleted file mode 100644 index e0c0810cee..0000000000 --- a/samples/boot/hellowebfluxfn/src/main/java/sample/HelloUserController.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import java.security.Principal; -import java.util.Collections; - -import reactor.core.publisher.Mono; - -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; - -/** - * @author Rob Winch - * @since 5.0 - */ -@Component -public class HelloUserController { - - public Mono hello(ServerRequest serverRequest) { - return serverRequest.principal() - .map(Principal::getName) - .flatMap((username) -> - ServerResponse.ok() - .contentType(MediaType.APPLICATION_JSON) - .syncBody(Collections.singletonMap("message", "Hello " + username + "!")) - ); - } -} diff --git a/samples/boot/hellowebfluxfn/src/main/java/sample/HelloWebfluxFnApplication.java b/samples/boot/hellowebfluxfn/src/main/java/sample/HelloWebfluxFnApplication.java deleted file mode 100644 index c508e9f554..0000000000 --- a/samples/boot/hellowebfluxfn/src/main/java/sample/HelloWebfluxFnApplication.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import static org.springframework.web.reactive.function.server.RequestPredicates.GET; -import static org.springframework.web.reactive.function.server.RouterFunctions.route; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.web.reactive.function.server.RouterFunction; -import org.springframework.web.reactive.function.server.ServerResponse; - -/** - * @author Rob Winch - * @since 5.0 - */ -@SpringBootApplication -public class HelloWebfluxFnApplication { - - public static void main(String[] args) { - SpringApplication.run(HelloWebfluxFnApplication.class, args); - } - - @Bean - public RouterFunction routes(HelloUserController userController) { - return route( - GET("/"), userController::hello); - } -} diff --git a/samples/boot/hellowebfluxfn/src/main/java/sample/HelloWebfluxFnSecurityConfig.java b/samples/boot/hellowebfluxfn/src/main/java/sample/HelloWebfluxFnSecurityConfig.java deleted file mode 100644 index bd8c83c553..0000000000 --- a/samples/boot/hellowebfluxfn/src/main/java/sample/HelloWebfluxFnSecurityConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; -import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; - -/** - * @author Rob Winch - * @since 5.0 - */ -@EnableWebFluxSecurity -public class HelloWebfluxFnSecurityConfig { - - @Bean - public MapReactiveUserDetailsService userDetailsService() { - UserDetails user = User.withDefaultPasswordEncoder() - .username("user") - .password("user") - .roles("USER") - .build(); - return new MapReactiveUserDetailsService(user); - } -} diff --git a/samples/boot/hellowebfluxfn/src/test/java/sample/HelloWebfluxFnApplicationTests.java b/samples/boot/hellowebfluxfn/src/test/java/sample/HelloWebfluxFnApplicationTests.java deleted file mode 100644 index 826fe95cf3..0000000000 --- a/samples/boot/hellowebfluxfn/src/test/java/sample/HelloWebfluxFnApplicationTests.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockUser; -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.springSecurity; - -import java.util.function.Consumer; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationContext; -import org.springframework.http.HttpHeaders; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; - -/** - * @author Rob Winch - * @since 5.0 - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@AutoConfigureWebTestClient -public class HelloWebfluxFnApplicationTests { - - WebTestClient rest; - - @Autowired - public void setup(ApplicationContext context) { - this.rest = WebTestClient - .bindToApplicationContext(context) - .apply(springSecurity()) - .configureClient() - .build(); - } - - @Test - public void basicWhenNoCredentialsThenUnauthorized() { - this.rest - .get() - .uri("/") - .exchange() - .expectStatus().isUnauthorized(); - } - - @Test - public void basicWhenValidCredentialsThenOk() { - this.rest - .get() - .uri("/") - .headers(userCredentials()) - .exchange() - .expectStatus().isOk() - .expectBody().json("{\"message\":\"Hello user!\"}"); - } - - @Test - public void basicWhenInvalidCredentialsThenUnauthorized() { - this.rest - .get() - .uri("/") - .headers(invalidCredentials()) - .exchange() - .expectStatus().isUnauthorized() - .expectBody().isEmpty(); - } - - @Test - public void mockSupportWhenMutateWithMockUserThenOk() { - this.rest - .mutateWith(mockUser()) - .get() - .uri("/") - .exchange() - .expectStatus().isOk() - .expectBody().json("{\"message\":\"Hello user!\"}"); - } - - @Test - @WithMockUser - public void mockSupportWhenWithMockUserThenOk() { - this.rest - .get() - .uri("/") - .exchange() - .expectStatus().isOk() - .expectBody().json("{\"message\":\"Hello user!\"}"); - } - - private Consumer userCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("user", "user"); - } - - private Consumer invalidCredentials() { - return (httpHeaders) -> httpHeaders.setBasicAuth("user", "INVALID"); - } -} diff --git a/samples/boot/helloworld/spring-security-samples-boot-helloworld.gradle b/samples/boot/helloworld/spring-security-samples-boot-helloworld.gradle deleted file mode 100644 index a64426286b..0000000000 --- a/samples/boot/helloworld/spring-security-samples-boot-helloworld.gradle +++ /dev/null @@ -1,12 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-web') - compile 'org.springframework.boot:spring-boot-starter-thymeleaf' - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldApplicationTests.java b/samples/boot/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldApplicationTests.java deleted file mode 100644 index faeeb015a2..0000000000 --- a/samples/boot/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldApplicationTests.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright 2012-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.mock.web.MockHttpSession; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * - * @author Joe Grandja - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -@AutoConfigureMockMvc -public class HelloWorldApplicationTests { - - @Autowired - private MockMvc mockMvc; - - @Test - public void accessUnprotected() throws Exception { - // @formatter:off - this.mockMvc.perform(get("/index")) - .andExpect(status().isOk()); - // @formatter:on - } - - @Test - public void accessProtectedRedirectsToLogin() throws Exception { - // @formatter:off - MvcResult mvcResult = this.mockMvc.perform(get("/user/index")) - .andExpect(status().is3xxRedirection()) - .andReturn(); - // @formatter:on - - assertThat(mvcResult.getResponse().getRedirectedUrl()).endsWith("/login"); - } - - @Test - public void loginUser() throws Exception { - // @formatter:off - this.mockMvc.perform(formLogin().user("user").password("password")) - .andExpect(authenticated()); - // @formatter:on - } - - @Test - public void loginInvalidUser() throws Exception { - // @formatter:off - this.mockMvc.perform(formLogin().user("invalid").password("invalid")) - .andExpect(unauthenticated()) - .andExpect(status().is3xxRedirection()); - // @formatter:on - } - - @Test - public void loginUserAccessProtected() throws Exception { - // @formatter:off - MvcResult mvcResult = this.mockMvc.perform(formLogin().user("user").password("password")) - .andExpect(authenticated()).andReturn(); - // @formatter:on - - MockHttpSession httpSession = (MockHttpSession) mvcResult.getRequest().getSession(false); - - // @formatter:off - this.mockMvc.perform(get("/user/index").session(httpSession)) - .andExpect(status().isOk()); - // @formatter:on - } - - @Test - public void loginUserValidateLogout() throws Exception { - // @formatter:off - MvcResult mvcResult = this.mockMvc.perform(formLogin().user("user").password("password")) - .andExpect(authenticated()).andReturn(); - // @formatter:on - - MockHttpSession httpSession = (MockHttpSession) mvcResult.getRequest().getSession(false); - - // @formatter:off - this.mockMvc.perform(post("/logout").with(csrf()).session(httpSession)) - .andExpect(unauthenticated()); - this.mockMvc.perform(get("/user/index").session(httpSession)) - .andExpect(unauthenticated()) - .andExpect(status().is3xxRedirection()); - // @formatter:on - } -} diff --git a/samples/boot/helloworld/src/main/java/org/springframework/security/samples/HelloWorldApplication.java b/samples/boot/helloworld/src/main/java/org/springframework/security/samples/HelloWorldApplication.java deleted file mode 100644 index 170bcadef3..0000000000 --- a/samples/boot/helloworld/src/main/java/org/springframework/security/samples/HelloWorldApplication.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2012-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Joe Grandja - */ -@SpringBootApplication -public class HelloWorldApplication { - - public static void main(String[] args) { - SpringApplication.run(HelloWorldApplication.class, args); - } - - -} \ No newline at end of file diff --git a/samples/boot/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/boot/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index c3c71cf2fe..0000000000 --- a/samples/boot/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.provisioning.InMemoryUserDetailsManager; - -/** - * @author Joe Grandja - */ -@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - // @formatter:off - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .authorizeRequests((authorize) -> authorize - .antMatchers("/css/**", "/index").permitAll() - .antMatchers("/user/**").hasRole("USER") - ) - .formLogin((formLogin) -> formLogin - .loginPage("/login") - .failureUrl("/login-error") - ); - } - // @formatter:on - - @Bean - public UserDetailsService userDetailsService() { - UserDetails userDetails = User.withDefaultPasswordEncoder() - .username("user") - .password("password") - .roles("USER") - .build(); - return new InMemoryUserDetailsManager(userDetails); - } -} diff --git a/samples/boot/helloworld/src/main/java/org/springframework/security/samples/web/MainController.java b/samples/boot/helloworld/src/main/java/org/springframework/security/samples/web/MainController.java deleted file mode 100644 index 793a8e97eb..0000000000 --- a/samples/boot/helloworld/src/main/java/org/springframework/security/samples/web/MainController.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.web; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * @author Joe Grandja - */ -@Controller -public class MainController { - - @RequestMapping("/") - public String root() { - return "redirect:/index"; - } - - @RequestMapping("/index") - public String index() { - return "index"; - } - - @RequestMapping("/user/index") - public String userIndex() { - return "user/index"; - } - - @RequestMapping("/login") - public String login() { - return "login"; - } - - @RequestMapping("/login-error") - public String loginError(Model model) { - model.addAttribute("loginError", true); - return "login"; - } - -} diff --git a/samples/boot/helloworld/src/main/resources/application.yml b/samples/boot/helloworld/src/main/resources/application.yml deleted file mode 100644 index b59d86df49..0000000000 --- a/samples/boot/helloworld/src/main/resources/application.yml +++ /dev/null @@ -1,12 +0,0 @@ -server: - port: 8080 - -logging: - level: - root: WARN - org.springframework.web: INFO - org.springframework.security: INFO - -spring: - thymeleaf: - cache: false diff --git a/samples/boot/helloworld/src/main/resources/static/css/main.css b/samples/boot/helloworld/src/main/resources/static/css/main.css deleted file mode 100644 index 5e6687a387..0000000000 --- a/samples/boot/helloworld/src/main/resources/static/css/main.css +++ /dev/null @@ -1,13 +0,0 @@ -body { - font-family: sans; - font-size: 1em; -} - -p.error { - font-weight: bold; - color: red; -} - -div.logout { - float: right; -} \ No newline at end of file diff --git a/samples/boot/helloworld/src/main/resources/templates/index.html b/samples/boot/helloworld/src/main/resources/templates/index.html deleted file mode 100644 index 05fad12033..0000000000 --- a/samples/boot/helloworld/src/main/resources/templates/index.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - Hello Spring Security - - - - -
- Logged in user: | - Roles: -
-
- -
-
-
-

Hello Spring Security

-

This is an unsecured page, but you can access the secured pages after authenticating.

- - - diff --git a/samples/boot/helloworld/src/main/resources/templates/login.html b/samples/boot/helloworld/src/main/resources/templates/login.html deleted file mode 100644 index cec2b5b0da..0000000000 --- a/samples/boot/helloworld/src/main/resources/templates/login.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - Login page - - - - -

Login page

-

Example user: user / password

-

Wrong user or password

-
- : -
- : -
- -
-

Back to home page

- - diff --git a/samples/boot/helloworld/src/main/resources/templates/user/index.html b/samples/boot/helloworld/src/main/resources/templates/user/index.html deleted file mode 100644 index 53dd9319a5..0000000000 --- a/samples/boot/helloworld/src/main/resources/templates/user/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Hello Spring Security - - - - -
-

This is a secured page!

-

Back to home page

- - diff --git a/samples/boot/insecure/spring-security-samples-boot-insecure.gradle b/samples/boot/insecure/spring-security-samples-boot-insecure.gradle deleted file mode 100644 index 556ebbb053..0000000000 --- a/samples/boot/insecure/spring-security-samples-boot-insecure.gradle +++ /dev/null @@ -1,8 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile 'org.springframework.boot:spring-boot-starter-thymeleaf' - compile 'org.springframework.boot:spring-boot-starter-web' - - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/insecure/src/integration-test/java/org/springframework/security/samples/InsecureApplicationTests.java b/samples/boot/insecure/src/integration-test/java/org/springframework/security/samples/InsecureApplicationTests.java deleted file mode 100644 index f2c7542e5b..0000000000 --- a/samples/boot/insecure/src/integration-test/java/org/springframework/security/samples/InsecureApplicationTests.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2012-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.web.servlet.MockMvc; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * - * @author Joe Grandja - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -@AutoConfigureMockMvc -public class InsecureApplicationTests { - - @Autowired - private MockMvc mockMvc; - - @Test - public void accessUnprotected() throws Exception { - this.mockMvc.perform(get("/index")).andExpect(status().isOk()); - } - -} diff --git a/samples/boot/insecure/src/main/java/org/springframework/security/samples/InsecureApplication.java b/samples/boot/insecure/src/main/java/org/springframework/security/samples/InsecureApplication.java deleted file mode 100644 index aab24fa9d3..0000000000 --- a/samples/boot/insecure/src/main/java/org/springframework/security/samples/InsecureApplication.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2012-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Joe Grandja - */ -@SpringBootApplication -public class InsecureApplication { - - public static void main(String[] args) { - SpringApplication.run(InsecureApplication.class, args); - } - - -} diff --git a/samples/boot/insecure/src/main/java/org/springframework/security/samples/web/MainController.java b/samples/boot/insecure/src/main/java/org/springframework/security/samples/web/MainController.java deleted file mode 100644 index f7de44adcc..0000000000 --- a/samples/boot/insecure/src/main/java/org/springframework/security/samples/web/MainController.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.web; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -/** - * @author Joe Grandja - */ -@Controller -public class MainController { - - @RequestMapping("/") - public String root() { - return "redirect:/index"; - } - - @RequestMapping("/index") - public String index() { - return "index"; - } - - @RequestMapping("/user/index") - public String userIndex() { - return "user/index"; - } - - @RequestMapping(value = "/login") - public String login() { - return "login"; - } - - @RequestMapping(value = "/login", method = RequestMethod.POST) - public String postLogin() { - // TODO Enable form login with Spring Security (trigger error for now) - return "redirect:/login-error"; - } - - @RequestMapping("/login-error") - public String loginError(Model model) { - model.addAttribute("loginError", true); - return "login"; - } - -} diff --git a/samples/boot/insecure/src/main/resources/application.yml b/samples/boot/insecure/src/main/resources/application.yml deleted file mode 100644 index 0254088803..0000000000 --- a/samples/boot/insecure/src/main/resources/application.yml +++ /dev/null @@ -1,11 +0,0 @@ -server: - port: 8080 - -logging: - level: - root: WARN - org.springframework.web: INFO - -spring: - thymeleaf: - cache: false diff --git a/samples/boot/insecure/src/main/resources/static/css/main.css b/samples/boot/insecure/src/main/resources/static/css/main.css deleted file mode 100644 index 5e6687a387..0000000000 --- a/samples/boot/insecure/src/main/resources/static/css/main.css +++ /dev/null @@ -1,13 +0,0 @@ -body { - font-family: sans; - font-size: 1em; -} - -p.error { - font-weight: bold; - color: red; -} - -div.logout { - float: right; -} \ No newline at end of file diff --git a/samples/boot/insecure/src/main/resources/templates/index.html b/samples/boot/insecure/src/main/resources/templates/index.html deleted file mode 100644 index ee9ccec618..0000000000 --- a/samples/boot/insecure/src/main/resources/templates/index.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - Hello Spring Security - - - - -

Hello Spring Security

-

This is an unsecured page, but you can access the secured pages after authenticating.

- - - diff --git a/samples/boot/insecure/src/main/resources/templates/login.html b/samples/boot/insecure/src/main/resources/templates/login.html deleted file mode 100644 index cec2b5b0da..0000000000 --- a/samples/boot/insecure/src/main/resources/templates/login.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - Login page - - - - -

Login page

-

Example user: user / password

-

Wrong user or password

-
- : -
- : -
- -
-

Back to home page

- - diff --git a/samples/boot/insecure/src/main/resources/templates/user/index.html b/samples/boot/insecure/src/main/resources/templates/user/index.html deleted file mode 100644 index 3fd4ccc1a3..0000000000 --- a/samples/boot/insecure/src/main/resources/templates/user/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Hello Spring Security - - - - -

TODO Secure this

-

We would like to secure this page

-

Back to home page

- - diff --git a/samples/boot/kotlin-webflux/spring-security-samples-boot-kotlin-webflux.gradle.kts b/samples/boot/kotlin-webflux/spring-security-samples-boot-kotlin-webflux.gradle.kts deleted file mode 100644 index 20eb7b4060..0000000000 --- a/samples/boot/kotlin-webflux/spring-security-samples-boot-kotlin-webflux.gradle.kts +++ /dev/null @@ -1,41 +0,0 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -plugins { - id("io.spring.convention.spring-sample-boot") - kotlin("jvm") - kotlin("plugin.spring") version "1.3.71" -} - -repositories { - mavenCentral() -} - -dependencies { - implementation(project(":spring-security-core")) - implementation(project(":spring-security-config")) - implementation(project(":spring-security-web")) - implementation("org.springframework.boot:spring-boot-starter-webflux") - implementation("org.springframework.boot:spring-boot-starter-thymeleaf") - implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity5") - implementation("io.projectreactor.kotlin:reactor-kotlin-extensions") - implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") - - testImplementation(project(":spring-security-test")) - testImplementation("org.springframework.boot:spring-boot-starter-test") { - exclude(group = "org.junit.vintage", module = "junit-vintage-engine") - } - testImplementation("io.projectreactor:reactor-test") -} - -tasks.withType { - useJUnitPlatform() -} - -tasks.withType { - kotlinOptions { - freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "1.8" - } -} diff --git a/samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/KotlinWebfluxApplication.kt b/samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/KotlinWebfluxApplication.kt deleted file mode 100644 index 572be2a6e3..0000000000 --- a/samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/KotlinWebfluxApplication.kt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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.samples - -import org.springframework.boot.autoconfigure.SpringBootApplication -import org.springframework.boot.runApplication - -@SpringBootApplication -class KotlinWebfluxApplication - -fun main(args: Array) { - runApplication(*args) -} diff --git a/samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt b/samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt deleted file mode 100644 index fcdb5fdcde..0000000000 --- a/samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config - -import org.springframework.context.annotation.Bean -import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity -import org.springframework.security.config.web.server.ServerHttpSecurity -import org.springframework.security.config.web.server.invoke -import org.springframework.security.core.userdetails.MapReactiveUserDetailsService -import org.springframework.security.core.userdetails.ReactiveUserDetailsService -import org.springframework.security.core.userdetails.User -import org.springframework.security.web.server.SecurityWebFilterChain - -@EnableWebFluxSecurity -class SecurityConfig { - - @Bean - fun springSecurityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain { - return http { - authorizeExchange { - authorize("/log-in", permitAll) - authorize("/", permitAll) - authorize("/css/**", permitAll) - authorize("/user/**", hasAuthority("ROLE_USER")) - } - formLogin { - loginPage = "/log-in" - } - } - } - - @Bean - fun userDetailsService(): ReactiveUserDetailsService { - val userDetails = User.withDefaultPasswordEncoder() - .username("user") - .password("password") - .roles("USER") - .build() - return MapReactiveUserDetailsService(userDetails) - } -} diff --git a/samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/web/MainController.kt b/samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/web/MainController.kt deleted file mode 100644 index 991c0195c0..0000000000 --- a/samples/boot/kotlin-webflux/src/main/kotlin/org/springframework/security/samples/web/MainController.kt +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.web - -import org.springframework.stereotype.Controller -import org.springframework.web.bind.annotation.GetMapping - -@Controller -class MainController { - - @GetMapping("/") - fun index(): String { - return "index" - } - - @GetMapping("/user/index") - fun userIndex(): String { - return "user/index" - } - - @GetMapping("/log-in") - fun login(): String { - return "login" - } -} diff --git a/samples/boot/kotlin-webflux/src/main/resources/application.yml b/samples/boot/kotlin-webflux/src/main/resources/application.yml deleted file mode 100644 index 8c01e005bc..0000000000 --- a/samples/boot/kotlin-webflux/src/main/resources/application.yml +++ /dev/null @@ -1,6 +0,0 @@ -server: - port: 8080 - -spring: - thymeleaf: - cache: false diff --git a/samples/boot/kotlin-webflux/src/main/resources/css/main.css b/samples/boot/kotlin-webflux/src/main/resources/css/main.css deleted file mode 100644 index de0941ecd5..0000000000 --- a/samples/boot/kotlin-webflux/src/main/resources/css/main.css +++ /dev/null @@ -1,8 +0,0 @@ -body { - font-family: sans; - font-size: 1em; -} - -div.logout { - float: right; -} diff --git a/samples/boot/kotlin-webflux/src/main/resources/templates/index.html b/samples/boot/kotlin-webflux/src/main/resources/templates/index.html deleted file mode 100644 index f637854f04..0000000000 --- a/samples/boot/kotlin-webflux/src/main/resources/templates/index.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - Hello Spring Security - - - - -
- Logged in user: | - Roles: -
-
- -
-
-
-

Hello Spring Security

-

This is an unsecured page, but you can access the secured pages after authenticating.

- - - diff --git a/samples/boot/kotlin-webflux/src/main/resources/templates/login.html b/samples/boot/kotlin-webflux/src/main/resources/templates/login.html deleted file mode 100644 index 2ee9216937..0000000000 --- a/samples/boot/kotlin-webflux/src/main/resources/templates/login.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - Login page - - - - -

Login page

-

Example user: user / password

-
- : -
- : -
- -
-

Back to home page

- - diff --git a/samples/boot/kotlin-webflux/src/main/resources/templates/user/index.html b/samples/boot/kotlin-webflux/src/main/resources/templates/user/index.html deleted file mode 100644 index 393f6d3705..0000000000 --- a/samples/boot/kotlin-webflux/src/main/resources/templates/user/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Hello Spring Security - - - - -
-

This is a secured page!

-

Back to home page

- - diff --git a/samples/boot/kotlin-webflux/src/test/kotlin/org/springframework/security/samples/KotlinWebfluxApplicationTests.kt b/samples/boot/kotlin-webflux/src/test/kotlin/org/springframework/security/samples/KotlinWebfluxApplicationTests.kt deleted file mode 100644 index fc126e58b7..0000000000 --- a/samples/boot/kotlin-webflux/src/test/kotlin/org/springframework/security/samples/KotlinWebfluxApplicationTests.kt +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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.samples - -import org.junit.jupiter.api.Test -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.context.SpringBootTest -import org.springframework.context.ApplicationContext -import org.springframework.test.web.reactive.server.WebTestClient -import org.springframework.security.test.context.support.WithMockUser - -@SpringBootTest -class KotlinWebfluxApplicationTests { - - lateinit var rest: WebTestClient - - @Autowired - fun setup(context: ApplicationContext) { - rest = WebTestClient - .bindToApplicationContext(context) - .configureClient() - .build() - } - - @Test - fun `index page is not protected`() { - rest - .get() - .uri("/") - .exchange() - .expectStatus().isOk - } - - @Test - fun `protected page when unauthenticated then redirects to login `() { - rest - .get() - .uri("/user/index") - .exchange() - .expectStatus().is3xxRedirection - .expectHeader().valueEquals("Location", "/log-in") - } - - @Test - @WithMockUser - fun `protected page can be accessed when authenticated`() { - rest - .get() - .uri("/user/index") - .exchange() - .expectStatus().isOk - } -} diff --git a/samples/boot/kotlin/spring-security-samples-boot-kotlin.gradle.kts b/samples/boot/kotlin/spring-security-samples-boot-kotlin.gradle.kts deleted file mode 100644 index bd841b8b71..0000000000 --- a/samples/boot/kotlin/spring-security-samples-boot-kotlin.gradle.kts +++ /dev/null @@ -1,31 +0,0 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -plugins { - id("io.spring.convention.spring-sample-boot") - kotlin("jvm") - kotlin("plugin.spring") version "1.3.71" -} - -repositories { - mavenCentral() -} - -dependencies { - implementation(project(":spring-security-core")) - implementation(project(":spring-security-config")) - implementation(project(":spring-security-web")) - implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springframework.boot:spring-boot-starter-thymeleaf") - implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity5") - implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - testImplementation(project(":spring-security-test")) - testImplementation("org.springframework.boot:spring-boot-starter-test") -} - -tasks.withType { - kotlinOptions { - freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "1.8" - } -} diff --git a/samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/KotlinApplication.kt b/samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/KotlinApplication.kt deleted file mode 100644 index 1d7c7b28f2..0000000000 --- a/samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/KotlinApplication.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples - -import org.springframework.boot.autoconfigure.SpringBootApplication -import org.springframework.boot.runApplication - -/** - * @author Eleftheria Stein - */ -@SpringBootApplication -class KotlinApplication - -fun main(args: Array) { - runApplication(*args) -} diff --git a/samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt b/samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt deleted file mode 100644 index 043f29ecae..0000000000 --- a/samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config - -import org.springframework.context.annotation.Bean -import org.springframework.security.config.annotation.web.builders.HttpSecurity -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter -import org.springframework.security.config.web.servlet.invoke -import org.springframework.security.core.userdetails.User -import org.springframework.security.core.userdetails.UserDetailsService -import org.springframework.security.provisioning.InMemoryUserDetailsManager - -/** - * @author Eleftheria Stein - */ -@EnableWebSecurity -class SecurityConfig : WebSecurityConfigurerAdapter() { - - override fun configure(http: HttpSecurity) { - http { - authorizeRequests { - authorize("/css/**", permitAll) - authorize("/user/**", hasAuthority("ROLE_USER")) - } - formLogin { - loginPage = "/log-in" - } - } - } - - @Bean - public override fun userDetailsService(): UserDetailsService { - val userDetails = User.withDefaultPasswordEncoder() - .username("user") - .password("password") - .roles("USER") - .build() - return InMemoryUserDetailsManager(userDetails) - } -} diff --git a/samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/web/MainController.kt b/samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/web/MainController.kt deleted file mode 100644 index e8c8128ad8..0000000000 --- a/samples/boot/kotlin/src/main/kotlin/org/springframework/security/samples/web/MainController.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.web - -import org.springframework.stereotype.Controller -import org.springframework.web.bind.annotation.GetMapping - -/** - * @author Eleftheria Stein - */ -@Controller -class MainController { - - @GetMapping("/") - fun index(): String { - return "index" - } - - @GetMapping("/user/index") - fun userIndex(): String { - return "user/index" - } - - @GetMapping("/log-in") - fun login(): String { - return "login" - } -} diff --git a/samples/boot/kotlin/src/main/resources/application.yml b/samples/boot/kotlin/src/main/resources/application.yml deleted file mode 100644 index 8c01e005bc..0000000000 --- a/samples/boot/kotlin/src/main/resources/application.yml +++ /dev/null @@ -1,6 +0,0 @@ -server: - port: 8080 - -spring: - thymeleaf: - cache: false diff --git a/samples/boot/kotlin/src/main/resources/static/css/main.css b/samples/boot/kotlin/src/main/resources/static/css/main.css deleted file mode 100644 index de0941ecd5..0000000000 --- a/samples/boot/kotlin/src/main/resources/static/css/main.css +++ /dev/null @@ -1,8 +0,0 @@ -body { - font-family: sans; - font-size: 1em; -} - -div.logout { - float: right; -} diff --git a/samples/boot/kotlin/src/main/resources/templates/index.html b/samples/boot/kotlin/src/main/resources/templates/index.html deleted file mode 100644 index c30f4a8292..0000000000 --- a/samples/boot/kotlin/src/main/resources/templates/index.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - Hello Spring Security - - - - -
- Logged in user: | - Roles: -
-
- -
-
-
-

Hello Spring Security

-

This is an unsecured page, but you can access the secured pages after authenticating.

- - - diff --git a/samples/boot/kotlin/src/main/resources/templates/login.html b/samples/boot/kotlin/src/main/resources/templates/login.html deleted file mode 100644 index 2ee9216937..0000000000 --- a/samples/boot/kotlin/src/main/resources/templates/login.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - Login page - - - - -

Login page

-

Example user: user / password

-
- : -
- : -
- -
-

Back to home page

- - diff --git a/samples/boot/kotlin/src/main/resources/templates/user/index.html b/samples/boot/kotlin/src/main/resources/templates/user/index.html deleted file mode 100644 index b36caed027..0000000000 --- a/samples/boot/kotlin/src/main/resources/templates/user/index.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - Hello Spring Security - - - - -
-

This is a secured page!

-

Back to home page

- - diff --git a/samples/boot/kotlin/src/test/kotlin/org/springframework/security/samples/KotlinApplicationTests.kt b/samples/boot/kotlin/src/test/kotlin/org/springframework/security/samples/KotlinApplicationTests.kt deleted file mode 100644 index 393bb0f2e2..0000000000 --- a/samples/boot/kotlin/src/test/kotlin/org/springframework/security/samples/KotlinApplicationTests.kt +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples - -import org.assertj.core.api.Assertions.assertThat -import org.junit.Test -import org.junit.runner.RunWith -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc -import org.springframework.boot.test.context.SpringBootTest -import org.springframework.mock.web.MockHttpSession -import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin -import org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated -import org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated -import org.springframework.test.context.junit4.SpringRunner -import org.springframework.test.web.servlet.MockMvc -import org.springframework.test.web.servlet.get -import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status - -@RunWith(SpringRunner::class) -@SpringBootTest -@AutoConfigureMockMvc -class KotlinApplicationTests { - - @Autowired - private lateinit var mockMvc: MockMvc - - @Test - fun `index page is not protected`() { - this.mockMvc.get("/") - .andExpect { - status { isOk() } - } - } - - @Test - fun `protected page redirects to login`() { - val mvcResult = this.mockMvc.get("/user/index") - .andExpect { status { is3xxRedirection() } } - .andReturn() - - assertThat(mvcResult.response.redirectedUrl).endsWith("/log-in") - } - - @Test - fun `valid user permitted to log in`() { - this.mockMvc.perform(formLogin("/log-in").user("user").password("password")) - .andExpect(authenticated()) - } - - @Test - fun `invalid user not permitted to log in`() { - this.mockMvc.perform(formLogin("/log-in").user("invalid").password("invalid")) - .andExpect(unauthenticated()) - .andExpect(status().is3xxRedirection) - } - - @Test - fun `logged in user can access protected page`() { - val mvcResult = this.mockMvc.perform(formLogin("/log-in").user("user").password("password")) - .andExpect(authenticated()).andReturn() - - val httpSession = mvcResult.request.getSession(false) as MockHttpSession - - this.mockMvc.get("/user/index") { - session = httpSession - }.andExpect { - status { isOk() } - } - } -} diff --git a/samples/boot/oauth2authorizationserver/README.adoc b/samples/boot/oauth2authorizationserver/README.adoc deleted file mode 100644 index e056a21b17..0000000000 --- a/samples/boot/oauth2authorizationserver/README.adoc +++ /dev/null @@ -1,39 +0,0 @@ -= OAuth 2.0 Authorization Server Sample - -This sample demonstrates an Authorization Server that supports a simple, static JWK Set. - -It's useful for working with the other samples in the library that want to point to an Authorization Server. - -== 1. Running the server - -To run the server, do: - -```bash -./gradlew bootRun -``` - -Or import the project into your IDE and run `OAuth2AuthorizationServerApplication` from there. - -Once it is up, this request asks for a token with the "message:read" scope: - -```bash -curl reader:secret@localhost:8081/oauth/token -d grant_type=password -d username=subject -d password=password -``` - -Which will respond with something like: - -```json -{ - "access_token":"eyJhbGciOiJSUzI1NiIsI...Fhq4RIVyA4ZAkC7T1aZbKAQ", - "token_type":"bearer", - "expires_in":599999999, - "scope":"message:read", - "jti":"8a425df7-f4c9-4ca4-be12-0136c3015da0" -} -``` - -You can also do the same with the `writer` client: - -```bash -curl writer:secret@localhost:8081/oauth/token -d grant_type=password -d username=subject -d password=password -``` diff --git a/samples/boot/oauth2authorizationserver/spring-security-samples-boot-oauth2authorizationserver.gradle b/samples/boot/oauth2authorizationserver/spring-security-samples-boot-oauth2authorizationserver.gradle deleted file mode 100644 index 3b2df4e605..0000000000 --- a/samples/boot/oauth2authorizationserver/spring-security-samples-boot-oauth2authorizationserver.gradle +++ /dev/null @@ -1,14 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-security' - compile "org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:${springBootVersion}" - - compile 'javax.xml.bind:jaxb-api' - compile 'com.sun.xml.bind:jaxb-core' - compile 'com.sun.xml.bind:jaxb-impl' - compile 'com.nimbusds:nimbus-jose-jwt' - - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java b/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java deleted file mode 100644 index 4b20b0c88c..0000000000 --- a/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java +++ /dev/null @@ -1,284 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import java.math.BigInteger; -import java.security.KeyFactory; -import java.security.KeyPair; -import java.security.interfaces.RSAPublicKey; -import java.security.spec.RSAPrivateKeySpec; -import java.security.spec.RSAPublicKeySpec; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.stream.Collectors; - -import com.nimbusds.jose.jwk.JWKSet; -import com.nimbusds.jose.jwk.RSAKey; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.oauth2.common.OAuth2AccessToken; -import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; -import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; -import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; -import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; -import org.springframework.security.oauth2.provider.OAuth2Authentication; -import org.springframework.security.oauth2.provider.endpoint.FrameworkEndpoint; -import org.springframework.security.oauth2.provider.token.DefaultAccessTokenConverter; -import org.springframework.security.oauth2.provider.token.DefaultUserAuthenticationConverter; -import org.springframework.security.oauth2.provider.token.TokenStore; -import org.springframework.security.oauth2.provider.token.store.InMemoryTokenStore; -import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter; -import org.springframework.security.oauth2.provider.token.store.JwtTokenStore; -import org.springframework.security.provisioning.InMemoryUserDetailsManager; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * An instance of Legacy Authorization Server (spring-security-oauth2) that uses a single, - * not-rotating key and exposes a JWK endpoint. - * - * See - * - * Spring Security OAuth Autoconfig's documentation for additional detail - * - * @author Josh Cummings - * @since 5.1 - */ -@EnableAuthorizationServer -@Configuration -public class AuthorizationServerConfiguration extends AuthorizationServerConfigurerAdapter { - - AuthenticationManager authenticationManager; - KeyPair keyPair; - boolean jwtEnabled; - - public AuthorizationServerConfiguration( - AuthenticationConfiguration authenticationConfiguration, - KeyPair keyPair, - @Value("${security.oauth2.authorizationserver.jwt.enabled:true}") boolean jwtEnabled) throws Exception { - - this.authenticationManager = authenticationConfiguration.getAuthenticationManager(); - this.keyPair = keyPair; - this.jwtEnabled = jwtEnabled; - } - - @Override - public void configure(ClientDetailsServiceConfigurer clients) - throws Exception { - // @formatter:off - clients.inMemory() - .withClient("reader") - .authorizedGrantTypes("password") - .secret("{noop}secret") - .scopes("message:read") - .accessTokenValiditySeconds(600_000_000) - .and() - .withClient("writer") - .authorizedGrantTypes("password") - .secret("{noop}secret") - .scopes("message:write") - .accessTokenValiditySeconds(600_000_000) - .and() - .withClient("noscopes") - .authorizedGrantTypes("password") - .secret("{noop}secret") - .scopes("none") - .accessTokenValiditySeconds(600_000_000); - // @formatter:on - } - - @Override - public void configure(AuthorizationServerEndpointsConfigurer endpoints) { - // @formatter:off - endpoints - .authenticationManager(this.authenticationManager) - .tokenStore(tokenStore()); - - if (this.jwtEnabled) { - endpoints - .accessTokenConverter(accessTokenConverter()); - } - // @formatter:on - } - - @Bean - public TokenStore tokenStore() { - if (this.jwtEnabled) { - return new JwtTokenStore(accessTokenConverter()); - } else { - return new InMemoryTokenStore(); - } - } - - @Bean - public JwtAccessTokenConverter accessTokenConverter() { - JwtAccessTokenConverter converter = new JwtAccessTokenConverter(); - converter.setKeyPair(this.keyPair); - - DefaultAccessTokenConverter accessTokenConverter = new DefaultAccessTokenConverter(); - accessTokenConverter.setUserTokenConverter(new SubjectAttributeUserTokenConverter()); - converter.setAccessTokenConverter(accessTokenConverter); - - return converter; - } -} - -/** - * For configuring the end users recognized by this Authorization Server - */ -@Configuration -class UserConfig extends WebSecurityConfigurerAdapter { - - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .authorizeRequests() - .mvcMatchers("/.well-known/jwks.json").permitAll() - .anyRequest().authenticated() - .and() - .httpBasic() - .and() - .csrf().ignoringRequestMatchers((request) -> "/introspect".equals(request.getRequestURI())); - } - - @Bean - @Override - public UserDetailsService userDetailsService() { - return new InMemoryUserDetailsManager( - User.withDefaultPasswordEncoder() - .username("subject") - .password("password") - .roles("USER") - .build()); - } -} - -/** - * Legacy Authorization Server (spring-security-oauth2) does not support any - * Token Introspection endpoint. - * - * This class adds ad-hoc support in order to better support the other samples in the repo. - */ -@FrameworkEndpoint -class IntrospectEndpoint { - TokenStore tokenStore; - - IntrospectEndpoint(TokenStore tokenStore) { - this.tokenStore = tokenStore; - } - - @PostMapping("/introspect") - @ResponseBody - public Map introspect(@RequestParam("token") String token) { - OAuth2AccessToken accessToken = this.tokenStore.readAccessToken(token); - Map attributes = new HashMap<>(); - if (accessToken == null || accessToken.isExpired()) { - attributes.put("active", false); - return attributes; - } - - OAuth2Authentication authentication = this.tokenStore.readAuthentication(token); - - attributes.put("active", true); - attributes.put("exp", accessToken.getExpiration().getTime()); - attributes.put("scope", accessToken.getScope().stream().collect(Collectors.joining(" "))); - attributes.put("sub", authentication.getName()); - - return attributes; - } -} - -/** - * Legacy Authorization Server (spring-security-oauth2) does not support any - * JWK Set endpoint. - * - * This class adds ad-hoc support in order to better support the other samples in the repo. - */ -@FrameworkEndpoint -class JwkSetEndpoint { - KeyPair keyPair; - - JwkSetEndpoint(KeyPair keyPair) { - this.keyPair = keyPair; - } - - @GetMapping("/.well-known/jwks.json") - @ResponseBody - public Map getKey() { - RSAPublicKey publicKey = (RSAPublicKey) this.keyPair.getPublic(); - RSAKey key = new RSAKey.Builder(publicKey).build(); - return new JWKSet(key).toJSONObject(); - } -} - -/** - * An Authorization Server will more typically have a key rotation strategy, and the keys will not - * be hard-coded into the application code. - * - * For simplicity, though, this sample doesn't demonstrate key rotation. - */ -@Configuration -class KeyConfig { - @Bean - KeyPair keyPair() { - try { - String privateExponent = "3851612021791312596791631935569878540203393691253311342052463788814433805390794604753109719790052408607029530149004451377846406736413270923596916756321977922303381344613407820854322190592787335193581632323728135479679928871596911841005827348430783250026013354350760878678723915119966019947072651782000702927096735228356171563532131162414366310012554312756036441054404004920678199077822575051043273088621405687950081861819700809912238863867947415641838115425624808671834312114785499017269379478439158796130804789241476050832773822038351367878951389438751088021113551495469440016698505614123035099067172660197922333993"; - String modulus = "18044398961479537755088511127417480155072543594514852056908450877656126120801808993616738273349107491806340290040410660515399239279742407357192875363433659810851147557504389760192273458065587503508596714389889971758652047927503525007076910925306186421971180013159326306810174367375596043267660331677530921991343349336096643043840224352451615452251387611820750171352353189973315443889352557807329336576421211370350554195530374360110583327093711721857129170040527236951522127488980970085401773781530555922385755722534685479501240842392531455355164896023070459024737908929308707435474197069199421373363801477026083786683"; - String exponent = "65537"; - - RSAPublicKeySpec publicSpec = new RSAPublicKeySpec(new BigInteger(modulus), new BigInteger(exponent)); - RSAPrivateKeySpec privateSpec = new RSAPrivateKeySpec(new BigInteger(modulus), new BigInteger(privateExponent)); - KeyFactory factory = KeyFactory.getInstance("RSA"); - return new KeyPair(factory.generatePublic(publicSpec), factory.generatePrivate(privateSpec)); - } catch ( Exception e ) { - throw new IllegalArgumentException(e); - } - } -} - -/** - * Legacy Authorization Server does not support a custom name for the user parameter, so we'll need - * to extend the default. By default, it uses the attribute {@code user_name}, though it would be - * better to adhere to the {@code sub} property defined in the - * JWT Specification. - */ -class SubjectAttributeUserTokenConverter extends DefaultUserAuthenticationConverter { - @Override - public Map convertUserAuthentication(Authentication authentication) { - Map response = new LinkedHashMap<>(); - response.put("sub", authentication.getName()); - if (authentication.getAuthorities() != null && !authentication.getAuthorities().isEmpty()) { - response.put(AUTHORITIES, AuthorityUtils.authorityListToSet(authentication.getAuthorities())); - } - return response; - } -} diff --git a/samples/boot/oauth2authorizationserver/src/main/java/sample/OAuth2AuthorizationServerApplication.java b/samples/boot/oauth2authorizationserver/src/main/java/sample/OAuth2AuthorizationServerApplication.java deleted file mode 100644 index 13602ec74e..0000000000 --- a/samples/boot/oauth2authorizationserver/src/main/java/sample/OAuth2AuthorizationServerApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Josh Cummings - */ -@SpringBootApplication -public class OAuth2AuthorizationServerApplication { - - public static void main(String[] args) { - SpringApplication.run(OAuth2AuthorizationServerApplication.class, args); - } -} diff --git a/samples/boot/oauth2authorizationserver/src/main/resources/application.yml b/samples/boot/oauth2authorizationserver/src/main/resources/application.yml deleted file mode 100644 index b0b10a294f..0000000000 --- a/samples/boot/oauth2authorizationserver/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -server.port: 8081 - -# security.oauth2.authorizationserver.jwt.enabled: false diff --git a/samples/boot/oauth2authorizationserver/src/test/java/sample/OAuth2AuthorizationServerApplicationTests.java b/samples/boot/oauth2authorizationserver/src/test/java/sample/OAuth2AuthorizationServerApplicationTests.java deleted file mode 100644 index 05377bf3f8..0000000000 --- a/samples/boot/oauth2authorizationserver/src/test/java/sample/OAuth2AuthorizationServerApplicationTests.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * Tests for {@link OAuth2AuthorizationServerApplication} - * - * @author Josh Cummings - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@AutoConfigureMockMvc -public class OAuth2AuthorizationServerApplicationTests { - - @Autowired - MockMvc mvc; - - @Test - public void requestTokenWhenUsingPasswordGrantTypeThenOk() - throws Exception { - - this.mvc.perform(post("/oauth/token") - .param("grant_type", "password") - .param("username", "subject") - .param("password", "password") - .header("Authorization", "Basic cmVhZGVyOnNlY3JldA==")) - .andExpect(status().isOk()); - } - - @Test - public void requestJwkSetWhenUsingDefaultsThenOk() - throws Exception { - - this.mvc.perform(get("/.well-known/jwks.json")) - .andExpect(status().isOk()); - } - -} diff --git a/samples/boot/oauth2login-webflux/README.adoc b/samples/boot/oauth2login-webflux/README.adoc deleted file mode 100644 index a96fec395b..0000000000 --- a/samples/boot/oauth2login-webflux/README.adoc +++ /dev/null @@ -1,324 +0,0 @@ -NOTE: Spring Security Reactive OAuth only supports authentication using a user info endpoint. -Support for JWT validation will be added in https://github.com/spring-projects/spring-security/issues/5330[gh-5330]. - -= OAuth 2.0 Login Sample - -This guide provides instructions on setting up the sample application with OAuth 2.0 Login using an OAuth 2.0 Provider or OpenID Connect 1.0 Provider. -The sample application uses Spring Boot 2.0.0.M6 and the `spring-security-oauth2-client` module which is new in Spring Security 5.0. - -The following sections provide detailed steps for setting up OAuth 2.0 Login for these Providers: - -* <> -* <> -* <> -* <> - -[[google-login]] -== Login with Google - -This section shows how to configure the sample application using Google as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> -* <> - -[[google-initial-setup]] -=== Initial setup - -To use Google's OAuth 2.0 authentication system for login, you must set up a project in the Google API Console to obtain OAuth 2.0 credentials. - -NOTE: https://developers.google.com/identity/protocols/OpenIDConnect[Google's OAuth 2.0 implementation] for authentication conforms to the - https://openid.net/connect/[OpenID Connect 1.0] specification and is https://openid.net/certification/[OpenID Certified]. - -Follow the instructions on the https://developers.google.com/identity/protocols/OpenIDConnect[OpenID Connect] page, starting in the section, "Setting up OAuth 2.0". - -After completing the "Obtain OAuth 2.0 credentials" instructions, you should have a new OAuth Client with credentials consisting of a Client ID and a Client Secret. - -[[google-redirect-uri]] -=== Setting the redirect URI - -The redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Google -and have granted access to the OAuth Client _(created in the previous step)_ on the Consent page. - -In the "Set a redirect URI" sub-section, ensure that the *Authorized redirect URIs* field is set to `http://localhost:8080/login/oauth2/code/google`. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[google-application-config]] -=== Configure application.yml - -Now that you have a new OAuth Client with Google, you need to configure the application to use the OAuth Client for the _authentication flow_. To do so: - -. Go to `application.yml` and set the following configuration: -+ -[source,yaml] ----- -spring: - security: - oauth2: - client: - registration: <1> - google: <2> - client-id: google-client-id - client-secret: google-client-secret ----- -+ -.OAuth Client properties -==== -<1> `spring.security.oauth2.client.registration` is the base property prefix for OAuth Client properties. -<2> Following the base property prefix is the ID for the `ClientRegistration`, such as google. -==== - -. Replace the values in the `client-id` and `client-secret` property with the OAuth 2.0 credentials you created earlier. - -[[google-boot-application]] -=== Boot up the application - -Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for Google. - -Click on the Google link, and you are then redirected to Google for authentication. - -After authenticating with your Google account credentials, the next page presented to you is the Consent screen. -The Consent screen asks you to either allow or deny access to the OAuth Client you created earlier. -Click *Allow* to authorize the OAuth Client to access your email address and basic profile information. - -At this point, the OAuth Client retrieves your email address and basic profile information -from the https://openid.net/specs/openid-connect-core-1_0.html#UserInfo[UserInfo Endpoint] and establishes an authenticated session. - -[[github-login]] -== Login with GitHub - -This section shows how to configure the sample application using GitHub as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> - -[[github-register-application]] -=== Register OAuth application - -To use GitHub's OAuth 2.0 authentication system for login, you must https://github.com/settings/applications/new[Register a new OAuth application]. - -When registering the OAuth application, ensure the *Authorization callback URL* is set to `http://localhost:8080/login/oauth2/code/github`. - -The Authorization callback URL (redirect URI) is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with GitHub -and have granted access to the OAuth application on the _Authorize application_ page. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[github-application-config]] -=== Configure application.yml - -Now that you have a new OAuth application with GitHub, you need to configure the application to use the OAuth application for the _authentication flow_. To do so: - -. Go to `application.yml` and set the following configuration: -+ -[source,yaml] ----- -spring: - security: - oauth2: - client: - registration: <1> - github: <2> - client-id: github-client-id - client-secret: github-client-secret ----- -+ -.OAuth Client properties -==== -<1> `spring.security.oauth2.client.registration` is the base property prefix for OAuth Client properties. -<2> Following the base property prefix is the ID for the `ClientRegistration`, such as github. -==== - -. Replace the values in the `client-id` and `client-secret` property with the OAuth 2.0 credentials you created earlier. - -[[github-boot-application]] -=== Boot up the application - -Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for GitHub. - -Click on the GitHub link, and you are then redirected to GitHub for authentication. - -After authenticating with your GitHub credentials, the next page presented to you is "Authorize application". -This page will ask you to *Authorize* the application you created in the previous step. -Click _Authorize application_ to allow the OAuth application to access your personal user data information. - -At this point, the OAuth Client retrieves your personal user information -from the UserInfo Endpoint and establishes an authenticated session. - -[TIP] -For detailed information returned from the UserInfo Endpoint, see the API documentation -for https://developer.github.com/v3/users/#get-the-authenticated-user["Get the authenticated user"]. - -[[facebook-login]] -== Login with Facebook - -This section shows how to configure the sample application using Facebook as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> - -[[facebook-register-application]] -=== Add a New App - -To use Facebook's OAuth 2.0 authentication system for login, you must first https://developers.facebook.com/apps[Add a New App]. - -Select "Create a New App" and then the "Create a New App ID" page is presented. Enter the Display Name, Contact Email, Category and then click "Create App ID". - -NOTE: The selection for the _Category_ field is not relevant but it's a required field - select "Local". - -The next page presented is "Product Setup". Click the "Get Started" button for the *Facebook Login* product. -In the left sidebar, under _Products -> Facebook Login_, select _Settings_. - -For the field *Valid OAuth redirect URIs*, enter `http://localhost:8080/login/oauth2/code/facebook` then click _Save Changes_. - -The OAuth redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Facebook -and have granted access to the application on the _Authorize application_ page. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[facebook-application-config]] -=== Configure application.yml - -Now that you have created a new application with Facebook, you need to configure the sample application to use the application for the _authentication flow_. To do so: - -. Go to `application.yml` and set the following configuration: -+ -[source,yaml] ----- -spring: - security: - oauth2: - client: - registration: <1> - facebook: <2> - client-id: facebook-client-id - client-secret: facebook-client-secret ----- -+ -.OAuth Client properties -==== -<1> `spring.security.oauth2.client.registration` is the base property prefix for OAuth Client properties. -<2> Following the base property prefix is the ID for the `ClientRegistration`, such as facebook. -==== - -. Replace the values in the `client-id` and `client-secret` property with the OAuth 2.0 credentials you created earlier. - -[[facebook-boot-application]] -=== Boot up the application - -Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for Facebook. - -Click on the Facebook link, and you are then redirected to Facebook for authentication. - -After authenticating with your Facebook credentials, the next page presented to you is "Authorize application". -This page will ask you to *Authorize* the application you created in the previous step. -Click _Authorize application_ to allow the OAuth application to access your _public profile_ and _email address_ information. - -At this point, the OAuth Client retrieves your personal user information -from the UserInfo Endpoint and establishes an authenticated session. - -[[okta-login]] -== Login with Okta - -This section shows how to configure the sample application using Okta as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> -* <> - -[[okta-register-application]] -=== Add Application - -To use Okta's OAuth 2.0 authentication system for login, you must first https://www.okta.com/developer/signup[create a developer account]. - -Sign in to your account sub-domain and navigate to _Applications -> Applications_ and then select the "Add Application" button. -From the "Add Application" page, select the "Create New App" button and enter the following: - -* *Platform:* Web -* *Sign on method:* OpenID Connect - -Select the _Create_ button. -On the "General Settings" page, enter the Application Name (for example, "Spring Security Okta Login") and then select the _Next_ button. -On the "Configure OpenID Connect" page, enter `http://localhost:8080/login/oauth2/code/okta` for the field *Redirect URIs* and then select _Finish_. - -The redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Okta -and have granted access to the application on the _Authorize application_ page. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[okta-assign-application-people]] -=== Assign Application to People - -From the "General" tab of the application, select the "Assignments" tab and then select the _Assign_ button. -Select _Assign to People_ and assign your account to the application. Then select the _Save and Go Back_ button. - -[[okta-application-config]] -=== Configure application.yml - -Now that you have created a new application with Okta, you need to configure the sample application to use the application for the _authentication flow_. To do so: - -. Go to `application.yml` and set the following configuration: -+ -[source,yaml] ----- -spring: - security: - oauth2: - client: - registration: <1> - okta: <2> - client-id: okta-client-id - client-secret: okta-client-secret - provider: <3> - okta: - authorization-uri: https://your-subdomain.oktapreview.com/oauth2/v1/authorize - token-uri: https://your-subdomain.oktapreview.com/oauth2/v1/token - user-info-uri: https://your-subdomain.oktapreview.com/oauth2/v1/userinfo - user-name-attribute: sub - jwk-set-uri: https://your-subdomain.oktapreview.com/oauth2/v1/keys ----- -+ -.OAuth Client properties -==== -<1> `spring.security.oauth2.client.registration` is the base property prefix for OAuth Client properties. -<2> Following the base property prefix is the ID for the `ClientRegistration`, such as okta. -<3> `spring.security.oauth2.client.provider` is the base property prefix for OAuth Provider properties. -==== - -. Replace the values in the `client-id` and `client-secret` property with the OAuth 2.0 credentials you created earlier. -As well, replace `https://your-subdomain.oktapreview.com` in `authorization-uri`, `token-uri`, `user-info-uri` and `jwk-set-uri` with the sub-domain assigned to your account during the registration process. - -[[okta-boot-application]] -=== Boot up the application - -Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for Okta. - -Click on the Okta link, and you are then redirected to Okta for authentication. - -After authenticating with your Okta account credentials, the OAuth Client retrieves your email address and basic profile information -from the https://openid.net/specs/openid-connect-core-1_0.html#UserInfo[UserInfo Endpoint] and establishes an authenticated session. diff --git a/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle b/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle deleted file mode 100644 index 49099dbd7a..0000000000 --- a/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle +++ /dev/null @@ -1,14 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-oauth2-client') - compile project(':spring-security-oauth2-jose') - compile 'org.springframework.boot:spring-boot-starter-thymeleaf' - compile 'org.springframework.boot:spring-boot-starter-webflux' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' - - testCompile project(':spring-security-test') - testCompile 'net.sourceforge.htmlunit:htmlunit' - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/oauth2login-webflux/src/integration-test/java/sample/OAuth2LoginApplicationTests.java b/samples/boot/oauth2login-webflux/src/integration-test/java/sample/OAuth2LoginApplicationTests.java deleted file mode 100644 index c3e2b63af6..0000000000 --- a/samples/boot/oauth2login-webflux/src/integration-test/java/sample/OAuth2LoginApplicationTests.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; - -import static org.hamcrest.core.StringContains.containsString; -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockOAuth2Login; - -/** - * Tests for {@link ReactiveOAuth2LoginApplication} - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@AutoConfigureWebTestClient -public class OAuth2LoginApplicationTests { - - @Autowired - WebTestClient test; - - @Autowired - ReactiveClientRegistrationRepository clientRegistrationRepository; - - @Test - public void requestWhenMockOidcLoginThenIndex() { - this.clientRegistrationRepository.findByRegistrationId("github") - .map((clientRegistration) -> - this.test.mutateWith(mockOAuth2Login().clientRegistration(clientRegistration)) - .get().uri("/") - .exchange() - .expectBody(String.class).value(containsString("GitHub")) - ).block(); - } -} diff --git a/samples/boot/oauth2login-webflux/src/main/java/sample/ReactiveOAuth2LoginApplication.java b/samples/boot/oauth2login-webflux/src/main/java/sample/ReactiveOAuth2LoginApplication.java deleted file mode 100644 index f6fd94e849..0000000000 --- a/samples/boot/oauth2login-webflux/src/main/java/sample/ReactiveOAuth2LoginApplication.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Rob Winch - */ -@SpringBootApplication -public class ReactiveOAuth2LoginApplication { - - public static void main(String[] args) { - SpringApplication.run(ReactiveOAuth2LoginApplication.class, args); - } - -} diff --git a/samples/boot/oauth2login-webflux/src/main/java/sample/web/OAuth2LoginController.java b/samples/boot/oauth2login-webflux/src/main/java/sample/web/OAuth2LoginController.java deleted file mode 100644 index 2e03a6adcd..0000000000 --- a/samples/boot/oauth2login-webflux/src/main/java/sample/web/OAuth2LoginController.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.web; - -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.oauth2.client.OAuth2AuthorizedClient; -import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient; -import org.springframework.security.oauth2.core.user.OAuth2User; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @author Rob Winch - */ -@Controller -public class OAuth2LoginController { - - @GetMapping("/") - public String index(Model model, - @RegisteredOAuth2AuthorizedClient OAuth2AuthorizedClient authorizedClient, - @AuthenticationPrincipal OAuth2User oauth2User) { - model.addAttribute("userName", oauth2User.getName()); - model.addAttribute("clientName", authorizedClient.getClientRegistration().getClientName()); - model.addAttribute("userAttributes", oauth2User.getAttributes()); - return "index"; - } -} diff --git a/samples/boot/oauth2login-webflux/src/main/resources/application.yml b/samples/boot/oauth2login-webflux/src/main/resources/application.yml deleted file mode 100644 index 73b08fbd83..0000000000 --- a/samples/boot/oauth2login-webflux/src/main/resources/application.yml +++ /dev/null @@ -1,35 +0,0 @@ -server: - port: 8080 - -logging: - level: - root: INFO - org.springframework.web: INFO - org.springframework.security: INFO -# org.springframework.boot.autoconfigure: DEBUG - -spring: - thymeleaf: - cache: false - security: - oauth2: - client: - registration: - google: - client-id: your-app-client-id - client-secret: your-app-client-secret - github: - client-id: your-app-client-id - client-secret: your-app-client-secret - facebook: - client-id: your-app-client-id - client-secret: your-app-client-secret - okta: - client-id: your-app-client-id - client-secret: your-app-client-secret - provider: - okta: - authorization-uri: https://your-subdomain.oktapreview.com/oauth2/v1/authorize - token-uri: https://your-subdomain.oktapreview.com/oauth2/v1/token - user-info-uri: https://your-subdomain.oktapreview.com/oauth2/v1/userinfo - jwk-set-uri: https://your-subdomain.oktapreview.com/oauth2/v1/keys diff --git a/samples/boot/oauth2login-webflux/src/main/resources/templates/index.html b/samples/boot/oauth2login-webflux/src/main/resources/templates/index.html deleted file mode 100644 index ce8cdcde23..0000000000 --- a/samples/boot/oauth2login-webflux/src/main/resources/templates/index.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - Spring Security - OAuth 2.0 Login - - - -
-
- User: -
-
 
-
- Log Out -
-
-

OAuth 2.0 Login with Spring Security

-
- You are successfully logged in - via the OAuth 2.0 Client -
-
 
-
- User Attributes: -
    -
  • - : -
    • -
-
- - diff --git a/samples/boot/oauth2login-webflux/src/test/java/sample/OAuth2LoginControllerTests.java b/samples/boot/oauth2login-webflux/src/test/java/sample/OAuth2LoginControllerTests.java deleted file mode 100644 index 11ae5f8ba6..0000000000 --- a/samples/boot/oauth2login-webflux/src/test/java/sample/OAuth2LoginControllerTests.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import sample.web.OAuth2LoginController; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest; -import org.springframework.core.ReactiveAdapterRegistry; -import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository; -import org.springframework.security.oauth2.client.web.reactive.result.method.annotation.OAuth2AuthorizedClientArgumentResolver; -import org.springframework.security.oauth2.client.web.server.ServerOAuth2AuthorizedClientRepository; -import org.springframework.security.web.reactive.result.method.annotation.AuthenticationPrincipalArgumentResolver; -import org.springframework.security.web.server.context.SecurityContextServerWebExchangeWebFilter; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; -import org.springframework.web.reactive.result.view.ViewResolver; - -import static org.hamcrest.Matchers.containsString; -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockOAuth2Login; -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.springSecurity; - -/** - * @author Josh Cummings - */ -@RunWith(SpringRunner.class) -@WebFluxTest(OAuth2LoginController.class) -public class OAuth2LoginControllerTests { - - @Autowired - OAuth2LoginController controller; - - @Autowired - ViewResolver viewResolver; - - @Mock - ReactiveClientRegistrationRepository clientRegistrationRepository; - - @Mock - ServerOAuth2AuthorizedClientRepository authorizedClientRepository; - - WebTestClient rest; - - @Before - public void setup() { - this.rest = WebTestClient - .bindToController(this.controller) - .apply(springSecurity()) - .webFilter(new SecurityContextServerWebExchangeWebFilter()) - .argumentResolvers((c) -> { - c.addCustomResolver(new AuthenticationPrincipalArgumentResolver(new ReactiveAdapterRegistry())); - c.addCustomResolver(new OAuth2AuthorizedClientArgumentResolver - (this.clientRegistrationRepository, this.authorizedClientRepository)); - }) - .viewResolvers((c) -> c.viewResolver(this.viewResolver)) - .build(); - } - - @Test - public void indexGreetsAuthenticatedUser() { - this.rest.mutateWith(mockOAuth2Login()) - .get().uri("/").exchange() - .expectBody(String.class).value(containsString("user")); - } -} diff --git a/samples/boot/oauth2login/README.adoc b/samples/boot/oauth2login/README.adoc deleted file mode 100644 index e949a7f84e..0000000000 --- a/samples/boot/oauth2login/README.adoc +++ /dev/null @@ -1,321 +0,0 @@ -= OAuth 2.0 Login Sample - -This guide provides instructions on setting up the sample application with OAuth 2.0 Login using an OAuth 2.0 Provider or OpenID Connect 1.0 Provider. -The sample application uses Spring Boot 2.0.0.M6 and the `spring-security-oauth2-client` module which is new in Spring Security 5.0. - -The following sections provide detailed steps for setting up OAuth 2.0 Login for these Providers: - -* <> -* <> -* <> -* <> - -[[google-login]] -== Login with Google - -This section shows how to configure the sample application using Google as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> -* <> - -[[google-initial-setup]] -=== Initial setup - -To use Google's OAuth 2.0 authentication system for login, you must set up a project in the Google API Console to obtain OAuth 2.0 credentials. - -NOTE: https://developers.google.com/identity/protocols/OpenIDConnect[Google's OAuth 2.0 implementation] for authentication conforms to the - https://openid.net/connect/[OpenID Connect 1.0] specification and is https://openid.net/certification/[OpenID Certified]. - -Follow the instructions on the https://developers.google.com/identity/protocols/OpenIDConnect[OpenID Connect] page, starting in the section, "Setting up OAuth 2.0". - -After completing the "Obtain OAuth 2.0 credentials" instructions, you should have a new OAuth Client with credentials consisting of a Client ID and a Client Secret. - -[[google-redirect-uri]] -=== Setting the redirect URI - -The redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Google -and have granted access to the OAuth Client _(created in the previous step)_ on the Consent page. - -In the "Set a redirect URI" sub-section, ensure that the *Authorized redirect URIs* field is set to `http://localhost:8080/login/oauth2/code/google`. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[google-application-config]] -=== Configure application.yml - -Now that you have a new OAuth Client with Google, you need to configure the application to use the OAuth Client for the _authentication flow_. To do so: - -. Go to `application.yml` and set the following configuration: -+ -[source,yaml] ----- -spring: - security: - oauth2: - client: - registration: <1> - google: <2> - client-id: google-client-id - client-secret: google-client-secret ----- -+ -.OAuth Client properties -==== -<1> `spring.security.oauth2.client.registration` is the base property prefix for OAuth Client properties. -<2> Following the base property prefix is the ID for the `ClientRegistration`, such as google. -==== - -. Replace the values in the `client-id` and `client-secret` property with the OAuth 2.0 credentials you created earlier. - -[[google-boot-application]] -=== Boot up the application - -Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for Google. - -Click on the Google link, and you are then redirected to Google for authentication. - -After authenticating with your Google account credentials, the next page presented to you is the Consent screen. -The Consent screen asks you to either allow or deny access to the OAuth Client you created earlier. -Click *Allow* to authorize the OAuth Client to access your email address and basic profile information. - -At this point, the OAuth Client retrieves your email address and basic profile information -from the https://openid.net/specs/openid-connect-core-1_0.html#UserInfo[UserInfo Endpoint] and establishes an authenticated session. - -[[github-login]] -== Login with GitHub - -This section shows how to configure the sample application using GitHub as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> - -[[github-register-application]] -=== Register OAuth application - -To use GitHub's OAuth 2.0 authentication system for login, you must https://github.com/settings/applications/new[Register a new OAuth application]. - -When registering the OAuth application, ensure the *Authorization callback URL* is set to `http://localhost:8080/login/oauth2/code/github`. - -The Authorization callback URL (redirect URI) is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with GitHub -and have granted access to the OAuth application on the _Authorize application_ page. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[github-application-config]] -=== Configure application.yml - -Now that you have a new OAuth application with GitHub, you need to configure the application to use the OAuth application for the _authentication flow_. To do so: - -. Go to `application.yml` and set the following configuration: -+ -[source,yaml] ----- -spring: - security: - oauth2: - client: - registration: <1> - github: <2> - client-id: github-client-id - client-secret: github-client-secret ----- -+ -.OAuth Client properties -==== -<1> `spring.security.oauth2.client.registration` is the base property prefix for OAuth Client properties. -<2> Following the base property prefix is the ID for the `ClientRegistration`, such as github. -==== - -. Replace the values in the `client-id` and `client-secret` property with the OAuth 2.0 credentials you created earlier. - -[[github-boot-application]] -=== Boot up the application - -Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for GitHub. - -Click on the GitHub link, and you are then redirected to GitHub for authentication. - -After authenticating with your GitHub credentials, the next page presented to you is "Authorize application". -This page will ask you to *Authorize* the application you created in the previous step. -Click _Authorize application_ to allow the OAuth application to access your personal user data information. - -At this point, the OAuth Client retrieves your personal user information -from the UserInfo Endpoint and establishes an authenticated session. - -[TIP] -For detailed information returned from the UserInfo Endpoint, see the API documentation -for https://developer.github.com/v3/users/#get-the-authenticated-user["Get the authenticated user"]. - -[[facebook-login]] -== Login with Facebook - -This section shows how to configure the sample application using Facebook as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> - -[[facebook-register-application]] -=== Add a New App - -To use Facebook's OAuth 2.0 authentication system for login, you must first https://developers.facebook.com/apps[Add a New App]. - -Select "Create a New App" and then the "Create a New App ID" page is presented. Enter the Display Name, Contact Email, Category and then click "Create App ID". - -NOTE: The selection for the _Category_ field is not relevant but it's a required field - select "Local". - -The next page presented is "Product Setup". Click the "Get Started" button for the *Facebook Login* product. -In the left sidebar, under _Products -> Facebook Login_, select _Settings_. - -For the field *Valid OAuth redirect URIs*, enter `http://localhost:8080/login/oauth2/code/facebook` then click _Save Changes_. - -The OAuth redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Facebook -and have granted access to the application on the _Authorize application_ page. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[facebook-application-config]] -=== Configure application.yml - -Now that you have created a new application with Facebook, you need to configure the sample application to use the application for the _authentication flow_. To do so: - -. Go to `application.yml` and set the following configuration: -+ -[source,yaml] ----- -spring: - security: - oauth2: - client: - registration: <1> - facebook: <2> - client-id: facebook-client-id - client-secret: facebook-client-secret ----- -+ -.OAuth Client properties -==== -<1> `spring.security.oauth2.client.registration` is the base property prefix for OAuth Client properties. -<2> Following the base property prefix is the ID for the `ClientRegistration`, such as facebook. -==== - -. Replace the values in the `client-id` and `client-secret` property with the OAuth 2.0 credentials you created earlier. - -[[facebook-boot-application]] -=== Boot up the application - -Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for Facebook. - -Click on the Facebook link, and you are then redirected to Facebook for authentication. - -After authenticating with your Facebook credentials, the next page presented to you is "Authorize application". -This page will ask you to *Authorize* the application you created in the previous step. -Click _Authorize application_ to allow the OAuth application to access your _public profile_ and _email address_ information. - -At this point, the OAuth Client retrieves your personal user information -from the UserInfo Endpoint and establishes an authenticated session. - -[[okta-login]] -== Login with Okta - -This section shows how to configure the sample application using Okta as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> -* <> - -[[okta-register-application]] -=== Add Application - -To use Okta's OAuth 2.0 authentication system for login, you must first https://www.okta.com/developer/signup[create a developer account]. - -Sign in to your account sub-domain and navigate to _Applications -> Applications_ and then select the "Add Application" button. -From the "Add Application" page, select the "Create New App" button and enter the following: - -* *Platform:* Web -* *Sign on method:* OpenID Connect - -Select the _Create_ button. -On the "General Settings" page, enter the Application Name (for example, "Spring Security Okta Login") and then select the _Next_ button. -On the "Configure OpenID Connect" page, enter `http://localhost:8080/login/oauth2/code/okta` for the field *Redirect URIs* and then select _Finish_. - -The redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Okta -and have granted access to the application on the _Authorize application_ page. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[okta-assign-application-people]] -=== Assign Application to People - -From the "General" tab of the application, select the "Assignments" tab and then select the _Assign_ button. -Select _Assign to People_ and assign your account to the application. Then select the _Save and Go Back_ button. - -[[okta-application-config]] -=== Configure application.yml - -Now that you have created a new application with Okta, you need to configure the sample application to use the application for the _authentication flow_. To do so: - -. Go to `application.yml` and set the following configuration: -+ -[source,yaml] ----- -spring: - security: - oauth2: - client: - registration: <1> - okta: <2> - client-id: okta-client-id - client-secret: okta-client-secret - provider: <3> - okta: - authorization-uri: https://your-subdomain.oktapreview.com/oauth2/v1/authorize - token-uri: https://your-subdomain.oktapreview.com/oauth2/v1/token - user-info-uri: https://your-subdomain.oktapreview.com/oauth2/v1/userinfo - user-name-attribute: sub - jwk-set-uri: https://your-subdomain.oktapreview.com/oauth2/v1/keys ----- -+ -.OAuth Client properties -==== -<1> `spring.security.oauth2.client.registration` is the base property prefix for OAuth Client properties. -<2> Following the base property prefix is the ID for the `ClientRegistration`, such as okta. -<3> `spring.security.oauth2.client.provider` is the base property prefix for OAuth Provider properties. -==== - -. Replace the values in the `client-id` and `client-secret` property with the OAuth 2.0 credentials you created earlier. -As well, replace `https://your-subdomain.oktapreview.com` in `authorization-uri`, `token-uri`, `user-info-uri` and `jwk-set-uri` with the sub-domain assigned to your account during the registration process. - -[[okta-boot-application]] -=== Boot up the application - -Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for Okta. - -Click on the Okta link, and you are then redirected to Okta for authentication. - -After authenticating with your Okta account credentials, the OAuth Client retrieves your email address and basic profile information -from the https://openid.net/specs/openid-connect-core-1_0.html#UserInfo[UserInfo Endpoint] and establishes an authenticated session. diff --git a/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle b/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle deleted file mode 100644 index ef3a4e27b5..0000000000 --- a/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle +++ /dev/null @@ -1,14 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-oauth2-client') - compile project(':spring-security-oauth2-jose') - compile 'org.springframework.boot:spring-boot-starter-thymeleaf' - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' - - testCompile project(':spring-security-test') - testCompile 'net.sourceforge.htmlunit:htmlunit' - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/oauth2login/src/integration-test/java/sample/OAuth2LoginApplicationTests.java b/samples/boot/oauth2login/src/integration-test/java/sample/OAuth2LoginApplicationTests.java deleted file mode 100644 index 77867dbbc8..0000000000 --- a/samples/boot/oauth2login/src/integration-test/java/sample/OAuth2LoginApplicationTests.java +++ /dev/null @@ -1,385 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import java.net.URI; -import java.net.URL; -import java.net.URLDecoder; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.gargoylesoftware.htmlunit.html.DomNodeList; -import com.gargoylesoftware.htmlunit.html.HtmlAnchor; -import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.http.HttpStatus; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; -import org.springframework.security.oauth2.client.registration.ClientRegistration; -import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; -import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; -import org.springframework.security.oauth2.client.userinfo.OAuth2UserService; -import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestRedirectFilter; -import org.springframework.security.oauth2.client.web.OAuth2LoginAuthenticationFilter; -import org.springframework.security.oauth2.core.OAuth2AccessToken; -import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; -import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponseType; -import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; -import org.springframework.security.oauth2.core.user.DefaultOAuth2User; -import org.springframework.security.oauth2.core.user.OAuth2User; -import org.springframework.security.oauth2.core.user.OAuth2UserAuthority; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.web.util.UriComponents; -import org.springframework.web.util.UriComponentsBuilder; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oauth2Login; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model; - -/** - * Integration tests for the OAuth 2.0 client filters {@link OAuth2AuthorizationRequestRedirectFilter} - * and {@link OAuth2LoginAuthenticationFilter}. These filters work together to realize - * OAuth 2.0 Login leveraging the Authorization Code Grant flow. - * - * @author Joe Grandja - * @since 5.0 - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@AutoConfigureMockMvc -public class OAuth2LoginApplicationTests { - private static final String AUTHORIZATION_BASE_URI = "/oauth2/authorization"; - private static final String AUTHORIZE_BASE_URL = "http://localhost:8080/login/oauth2/code"; - - @Autowired - private WebClient webClient; - - @Autowired - private MockMvc mvc; - - @Autowired - private ClientRegistrationRepository clientRegistrationRepository; - - @Before - public void setup() { - this.webClient.getCookieManager().clearCookies(); - } - - @Test - public void requestIndexPageWhenNotAuthenticatedThenDisplayLoginPage() throws Exception { - HtmlPage page = this.webClient.getPage("/"); - this.assertLoginPage(page); - } - - @Test - public void requestOtherPageWhenNotAuthenticatedThenDisplayLoginPage() throws Exception { - HtmlPage page = this.webClient.getPage("/other-page"); - this.assertLoginPage(page); - } - - @Test - public void requestAuthorizeGitHubClientWhenLinkClickedThenStatusRedirectForAuthorization() throws Exception { - HtmlPage page = this.webClient.getPage("/"); - - ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId("github"); - - HtmlAnchor clientAnchorElement = this.getClientAnchorElement(page, clientRegistration); - assertThat(clientAnchorElement).isNotNull(); - - WebResponse response = this.followLinkDisableRedirects(clientAnchorElement); - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.MOVED_PERMANENTLY.value()); - - String authorizeRedirectUri = response.getResponseHeaderValue("Location"); - assertThat(authorizeRedirectUri).isNotNull(); - - UriComponents uriComponents = UriComponentsBuilder.fromUri(URI.create(authorizeRedirectUri)).build(); - - String requestUri = uriComponents.getScheme() + "://" + uriComponents.getHost() + uriComponents.getPath(); - assertThat(requestUri).isEqualTo(clientRegistration.getProviderDetails().getAuthorizationUri()); - - Map params = uriComponents.getQueryParams().toSingleValueMap(); - - assertThat(params.get(OAuth2ParameterNames.RESPONSE_TYPE)).isEqualTo(OAuth2AuthorizationResponseType.CODE.getValue()); - assertThat(params.get(OAuth2ParameterNames.CLIENT_ID)).isEqualTo(clientRegistration.getClientId()); - String redirectUri = AUTHORIZE_BASE_URL + "/" + clientRegistration.getRegistrationId(); - assertThat(URLDecoder.decode(params.get(OAuth2ParameterNames.REDIRECT_URI), "UTF-8")).isEqualTo(redirectUri); - assertThat(URLDecoder.decode(params.get(OAuth2ParameterNames.SCOPE), "UTF-8")) - .isEqualTo(clientRegistration.getScopes().stream().collect(Collectors.joining(" "))); - assertThat(params.get(OAuth2ParameterNames.STATE)).isNotNull(); - } - - @Test - public void requestAuthorizeClientWhenInvalidClientThenStatusInternalServerError() throws Exception { - HtmlPage page = this.webClient.getPage("/"); - - ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId("google"); - - HtmlAnchor clientAnchorElement = this.getClientAnchorElement(page, clientRegistration); - assertThat(clientAnchorElement).isNotNull(); - clientAnchorElement.setAttribute("href", clientAnchorElement.getHrefAttribute() + "-invalid"); - - WebResponse response = null; - try { - clientAnchorElement.click(); - } catch (FailingHttpStatusCodeException ex) { - response = ex.getResponse(); - } - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR.value()); - } - - @Test - public void requestAuthorizationCodeGrantWhenValidAuthorizationResponseThenDisplayIndexPage() throws Exception { - HtmlPage page = this.webClient.getPage("/"); - - ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId("github"); - - HtmlAnchor clientAnchorElement = this.getClientAnchorElement(page, clientRegistration); - assertThat(clientAnchorElement).isNotNull(); - - WebResponse response = this.followLinkDisableRedirects(clientAnchorElement); - - UriComponents authorizeRequestUriComponents = UriComponentsBuilder.fromUri( - URI.create(response.getResponseHeaderValue("Location"))).build(); - - Map params = authorizeRequestUriComponents.getQueryParams().toSingleValueMap(); - String code = "auth-code"; - String state = URLDecoder.decode(params.get(OAuth2ParameterNames.STATE), "UTF-8"); - String redirectUri = URLDecoder.decode(params.get(OAuth2ParameterNames.REDIRECT_URI), "UTF-8"); - - String authorizationResponseUri = - UriComponentsBuilder.fromHttpUrl(redirectUri) - .queryParam(OAuth2ParameterNames.CODE, code) - .queryParam(OAuth2ParameterNames.STATE, state) - .build().encode().toUriString(); - - page = this.webClient.getPage(new URL(authorizationResponseUri)); - this.assertIndexPage(page); - } - - @Test - public void requestAuthorizationCodeGrantWhenNoMatchingAuthorizationRequestThenDisplayLoginPageWithError() throws Exception { - HtmlPage page = this.webClient.getPage("/"); - URL loginPageUrl = page.getBaseURL(); - URL loginErrorPageUrl = new URL(loginPageUrl.toString() + "?error"); - - ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId("google"); - - String code = "auth-code"; - String state = "state"; - String redirectUri = AUTHORIZE_BASE_URL + "/" + clientRegistration.getRegistrationId(); - - String authorizationResponseUri = - UriComponentsBuilder.fromHttpUrl(redirectUri) - .queryParam(OAuth2ParameterNames.CODE, code) - .queryParam(OAuth2ParameterNames.STATE, state) - .build().encode().toUriString(); - - // Clear session cookie will ensure the 'session-saved' - // Authorization Request (from previous request) is not found - this.webClient.getCookieManager().clearCookies(); - - page = this.webClient.getPage(new URL(authorizationResponseUri)); - assertThat(page.getBaseURL()).isEqualTo(loginErrorPageUrl); - - HtmlElement errorElement = page.getBody().getFirstByXPath("div"); - assertThat(errorElement).isNotNull(); - assertThat(errorElement.asText()).contains("authorization_request_not_found"); - } - - @Test - public void requestAuthorizationCodeGrantWhenInvalidStateParamThenDisplayLoginPageWithError() throws Exception { - HtmlPage page = this.webClient.getPage("/"); - URL loginPageUrl = page.getBaseURL(); - URL loginErrorPageUrl = new URL(loginPageUrl.toString() + "?error"); - - ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId("google"); - - HtmlAnchor clientAnchorElement = this.getClientAnchorElement(page, clientRegistration); - assertThat(clientAnchorElement).isNotNull(); - this.followLinkDisableRedirects(clientAnchorElement); - - String code = "auth-code"; - String state = "invalid-state"; - String redirectUri = AUTHORIZE_BASE_URL + "/" + clientRegistration.getRegistrationId(); - - String authorizationResponseUri = - UriComponentsBuilder.fromHttpUrl(redirectUri) - .queryParam(OAuth2ParameterNames.CODE, code) - .queryParam(OAuth2ParameterNames.STATE, state) - .build().encode().toUriString(); - - page = this.webClient.getPage(new URL(authorizationResponseUri)); - assertThat(page.getBaseURL()).isEqualTo(loginErrorPageUrl); - - HtmlElement errorElement = page.getBody().getFirstByXPath("div"); - assertThat(errorElement).isNotNull(); - assertThat(errorElement.asText()).contains("authorization_request_not_found"); - } - - @Test - public void requestWhenMockOAuth2LoginThenIndex() throws Exception { - ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId("github"); - this.mvc.perform(get("/").with(oauth2Login().clientRegistration(clientRegistration))) - .andExpect(model().attribute("userName", "user")) - .andExpect(model().attribute("clientName", "GitHub")) - .andExpect(model().attribute("userAttributes", Collections.singletonMap("sub", "user"))); - } - - private void assertLoginPage(HtmlPage page) { - assertThat(page.getTitleText()).isEqualTo("Please sign in"); - - int expectedClients = 4; - - List clientAnchorElements = page.getAnchors(); - assertThat(clientAnchorElements.size()).isEqualTo(expectedClients); - - ClientRegistration googleClientRegistration = this.clientRegistrationRepository.findByRegistrationId("google"); - ClientRegistration githubClientRegistration = this.clientRegistrationRepository.findByRegistrationId("github"); - ClientRegistration facebookClientRegistration = this.clientRegistrationRepository.findByRegistrationId("facebook"); - ClientRegistration oktaClientRegistration = this.clientRegistrationRepository.findByRegistrationId("okta"); - - String baseAuthorizeUri = AUTHORIZATION_BASE_URI + "/"; - String googleClientAuthorizeUri = baseAuthorizeUri + googleClientRegistration.getRegistrationId(); - String githubClientAuthorizeUri = baseAuthorizeUri + githubClientRegistration.getRegistrationId(); - String facebookClientAuthorizeUri = baseAuthorizeUri + facebookClientRegistration.getRegistrationId(); - String oktaClientAuthorizeUri = baseAuthorizeUri + oktaClientRegistration.getRegistrationId(); - - for (int i=0; i divElements = page.getBody().getElementsByTagName("div"); - assertThat(divElements.get(1).asText()).contains("User: joeg@springsecurity.io"); - assertThat(divElements.get(4).asText()).contains("You are successfully logged in joeg@springsecurity.io"); - } - - private HtmlAnchor getClientAnchorElement(HtmlPage page, ClientRegistration clientRegistration) { - Optional clientAnchorElement = page.getAnchors().stream() - .filter((e) -> e.asText().equals(clientRegistration.getClientName())).findFirst(); - - return (clientAnchorElement.orElse(null)); - } - - private WebResponse followLinkDisableRedirects(HtmlAnchor anchorElement) throws Exception { - WebResponse response = null; - try { - // Disable the automatic redirection (which will trigger - // an exception) so that we can capture the response - this.webClient.getOptions().setRedirectEnabled(false); - anchorElement.click(); - } catch (FailingHttpStatusCodeException ex) { - response = ex.getResponse(); - this.webClient.getOptions().setRedirectEnabled(true); - } - return response; - } - - @EnableWebSecurity - @TestConfiguration - public static class SecurityTestConfig extends WebSecurityConfigurerAdapter { - - // @formatter:off - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .anyRequest().authenticated() - ) - .oauth2Login((oauth2Login) -> - oauth2Login - .tokenEndpoint((tokenEndpoint) -> - tokenEndpoint - .accessTokenResponseClient(this.mockAccessTokenResponseClient()) - ) - .userInfoEndpoint((userInfoEndpoint) -> - userInfoEndpoint - .userService(this.mockUserService()) - ) - ); - } - // @formatter:on - - private OAuth2AccessTokenResponseClient mockAccessTokenResponseClient() { - OAuth2AccessTokenResponse accessTokenResponse = OAuth2AccessTokenResponse.withToken("access-token-1234") - .tokenType(OAuth2AccessToken.TokenType.BEARER) - .expiresIn(60 * 1000) - .build(); - - OAuth2AccessTokenResponseClient tokenResponseClient = mock(OAuth2AccessTokenResponseClient.class); - when(tokenResponseClient.getTokenResponse(any())).thenReturn(accessTokenResponse); - return tokenResponseClient; - } - - private OAuth2UserService mockUserService() { - Map attributes = new HashMap<>(); - attributes.put("id", "joeg"); - attributes.put("first-name", "Joe"); - attributes.put("last-name", "Grandja"); - attributes.put("email", "joeg@springsecurity.io"); - - GrantedAuthority authority = new OAuth2UserAuthority(attributes); - Set authorities = new HashSet<>(); - authorities.add(authority); - - DefaultOAuth2User user = new DefaultOAuth2User(authorities, attributes, "email"); - - OAuth2UserService userService = mock(OAuth2UserService.class); - when(userService.loadUser(any())).thenReturn(user); - return userService; - } - } -} diff --git a/samples/boot/oauth2login/src/main/java/sample/OAuth2LoginApplication.java b/samples/boot/oauth2login/src/main/java/sample/OAuth2LoginApplication.java deleted file mode 100644 index dc69b3f9ec..0000000000 --- a/samples/boot/oauth2login/src/main/java/sample/OAuth2LoginApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Joe Grandja - */ -@SpringBootApplication -public class OAuth2LoginApplication { - - public static void main(String[] args) { - SpringApplication.run(OAuth2LoginApplication.class, args); - } -} diff --git a/samples/boot/oauth2login/src/main/java/sample/web/OAuth2LoginController.java b/samples/boot/oauth2login/src/main/java/sample/web/OAuth2LoginController.java deleted file mode 100644 index fa46a60ad7..0000000000 --- a/samples/boot/oauth2login/src/main/java/sample/web/OAuth2LoginController.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.web; - -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.oauth2.client.OAuth2AuthorizedClient; -import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient; -import org.springframework.security.oauth2.core.user.OAuth2User; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @author Joe Grandja - * @author Rob Winch - */ -@Controller -public class OAuth2LoginController { - - @GetMapping("/") - public String index(Model model, - @RegisteredOAuth2AuthorizedClient OAuth2AuthorizedClient authorizedClient, - @AuthenticationPrincipal OAuth2User oauth2User) { - model.addAttribute("userName", oauth2User.getName()); - model.addAttribute("clientName", authorizedClient.getClientRegistration().getClientName()); - model.addAttribute("userAttributes", oauth2User.getAttributes()); - return "index"; - } -} diff --git a/samples/boot/oauth2login/src/main/resources/application.yml b/samples/boot/oauth2login/src/main/resources/application.yml deleted file mode 100644 index 73b08fbd83..0000000000 --- a/samples/boot/oauth2login/src/main/resources/application.yml +++ /dev/null @@ -1,35 +0,0 @@ -server: - port: 8080 - -logging: - level: - root: INFO - org.springframework.web: INFO - org.springframework.security: INFO -# org.springframework.boot.autoconfigure: DEBUG - -spring: - thymeleaf: - cache: false - security: - oauth2: - client: - registration: - google: - client-id: your-app-client-id - client-secret: your-app-client-secret - github: - client-id: your-app-client-id - client-secret: your-app-client-secret - facebook: - client-id: your-app-client-id - client-secret: your-app-client-secret - okta: - client-id: your-app-client-id - client-secret: your-app-client-secret - provider: - okta: - authorization-uri: https://your-subdomain.oktapreview.com/oauth2/v1/authorize - token-uri: https://your-subdomain.oktapreview.com/oauth2/v1/token - user-info-uri: https://your-subdomain.oktapreview.com/oauth2/v1/userinfo - jwk-set-uri: https://your-subdomain.oktapreview.com/oauth2/v1/keys diff --git a/samples/boot/oauth2login/src/main/resources/templates/index.html b/samples/boot/oauth2login/src/main/resources/templates/index.html deleted file mode 100644 index 629d8ac8ee..0000000000 --- a/samples/boot/oauth2login/src/main/resources/templates/index.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - Spring Security - OAuth 2.0 Login - - - -
-
- User: -
-
 
-
-
- -
-
-
-

OAuth 2.0 Login with Spring Security

-
- You are successfully logged in - via the OAuth 2.0 Client -
-
 
-
- User Attributes: -
    -
  • - : -
    • -
-
- - diff --git a/samples/boot/oauth2login/src/test/java/sample/web/OAuth2LoginControllerTests.java b/samples/boot/oauth2login/src/test/java/sample/web/OAuth2LoginControllerTests.java deleted file mode 100644 index 6a3af42ff7..0000000000 --- a/samples/boot/oauth2login/src/test/java/sample/web/OAuth2LoginControllerTests.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.web; - -import java.util.Collections; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.security.oauth2.client.registration.ClientRegistration; -import org.springframework.security.oauth2.core.AuthorizationGrantType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; - -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oauth2Login; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model; - -/** - * Tests for {@link OAuth2LoginController} - * - * @author Josh Cummings - */ -@RunWith(SpringRunner.class) -@WebMvcTest(OAuth2LoginController.class) -public class OAuth2LoginControllerTests { - - @Autowired - MockMvc mvc; - - @Test - public void rootWhenAuthenticatedReturnsUserAndClient() throws Exception { - this.mvc.perform(get("/").with(oauth2Login())) - .andExpect(model().attribute("userName", "user")) - .andExpect(model().attribute("clientName", "test")) - .andExpect(model().attribute("userAttributes", Collections.singletonMap("sub", "user"))); - } - - @Test - public void rootWhenOverridingClientRegistrationReturnsAccordingly() throws Exception { - ClientRegistration clientRegistration = ClientRegistration.withRegistrationId("test") - .authorizationGrantType(AuthorizationGrantType.PASSWORD) - .clientId("my-client-id") - .clientName("my-client-name") - .tokenUri("https://token-uri.example.org") - .build(); - - this.mvc.perform(get("/").with(oauth2Login() - .clientRegistration(clientRegistration) - .attributes((a) -> a.put("sub", "spring-security")))) - .andExpect(model().attribute("userName", "spring-security")) - .andExpect(model().attribute("clientName", "my-client-name")) - .andExpect(model().attribute("userAttributes", Collections.singletonMap("sub", "spring-security"))); - } -} diff --git a/samples/boot/oauth2resourceserver-jwe/README.adoc b/samples/boot/oauth2resourceserver-jwe/README.adoc deleted file mode 100644 index 84c64f6f58..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/README.adoc +++ /dev/null @@ -1,119 +0,0 @@ -= OAuth 2.0 Resource Server Sample - -This sample demonstrates integrating Resource Server with a mock Authorization Server, though it can be modified to integrate -with your favorite Authorization Server. This resource server is configured to accept JWE-encrypted tokens. - -With it, you can run the integration tests or run the application as a stand-alone service to explore how you can -secure your own service with OAuth 2.0 Bearer Tokens using Spring Security. - -== 1. Running the tests - -To run the tests, do: - -```bash -./gradlew integrationTest -``` - -Or import the project into your IDE and run `OAuth2ResourceServerApplicationTests` from there. - -=== What is it doing? - -By default, the tests are pointing at a mock Authorization Server instance. - -The tests are configured with a set of hard-coded tokens originally obtained from the mock Authorization Server, -and each makes a query to the Resource Server with their corresponding token. - -The Resource Server decrypts the token and subsquently verifies it with the Authorization Server and authorizes the request, returning the phrase - -```bash -Hello, subject! -``` - -where "subject" is the value of the `sub` field in the JWT returned by the Authorization Server. - -== 2. Running the app - -To run as a stand-alone application, do: - -```bash -./gradlew bootRun -``` - -Or import the project into your IDE and run `OAuth2ResourceServerApplication` from there. - -Once it is up, you can use the following token: - -```bash -export TOKEN=eyJjdHkiOiJKV1QiLCJlbmMiOiJBMjU2R0NNIiwiYWxnIjoiUlNBLU9BRVAtMjU2In0.IyeWtsTonaiWJdoT13B0M7gpqVxAirVGlfqFI4TOmTRcVHICs_ESezS7fa0ODS9XYdwklTtG7hH39yeeMzr2Zo1Ghh-m36fdoqQrV1Do04rUvuTjqbgyNffeZEGB6rquJ-cyAVjp_Oljy10-Bbnw7CeVGwNBSVo9UCB5j49OlNWhLxFpYARFmOlYpXj-s4Q4JiqV6EvjDAYeohAR4QQmND3qoxR-s2I6SLcIho0sSSpUlhrRiqu2uvWefHDcZJdW2WYWnxLHxhzNu3CfnLiqhhaA_YA_iWXR9FYnPDCf_4q3FgSXcgttXzomFKAx5DwnE_dXvsCvpWxslZMU1UIiLA.MHOrrza2GQ9_5PIv.zU4tfhxT6apWBC3stBwQmGlCQBltWVQe4dFIykybWWBFqxo1bf2BZ37twzoEIFXG9jSYEMH4mvBXPWSvn66t-_jnqLnKTJst2plBjhagGCAoLNWXVKeYNp67o-lKOD_JJQFqsRw4oE05VSgRr14MZeaUBFcU3A_kKxMXOu899DKfXBGJvj75H7lDyd8RUXTb-OSWWfUiJc6Y5AUy1zCZCN9yfDsCXt9heTsZANy92Oou9sMFaXkYzyums5OtkBtLFzyuNMEoNioRehTV-FTuL8tDRB1mNhHObwsBfFbR6M1jJK37pHUXGtko-yZ6NGwxyLtwGh4uU2jzE614rQzuzR8aHaHxOkUs1pBTZ8AcRt41snByOe-KU0adthHxedobFiQQBoQ05DgSU7DO6hsK0uVBDF3eG2KjH4L2lZy-WugloLHhdguUoO9F0zUx15-XZO4EVzmhy8xfH2tSXz98eKzz9Dv0DdGnrBL9cK2MM88N1zoq5u4NdlnE12HvuesB7GKdMwZx1-gTw_pzP81TzcctJWl6ETK09Uc.jk0O8qc4Fvip856stDz05Q -``` - -And then make this request: - -```bash -curl -H "Authorization: Bearer $TOKEN" localhost:8080 -``` - -Which will respond with the phrase: - -```bash -Hello, subject! -``` - -where `subject` is the value of the `sub` field in the JWT returned by the Authorization Server. - -Or this: - -```bash -export TOKEN=eyJjdHkiOiJKV1QiLCJlbmMiOiJBMjU2R0NNIiwiYWxnIjoiUlNBLU9BRVAtMjU2In0.CRBAEgvQhpB6pPQhpkTAKpsDai1FDcvkDSRig1R3OI-g18JdTe-qDhzWwP-hV3aCwFwHxQ_g8Z8OIZvhyKpQaPwBb72UeLqqhzSIkm0gEsmmjYg1vEGOrDH5_Fqlm0LnAnXTmsbOIWYIj11ZuenI2lEmMCkVwqth0RlzakdcHRXiuDTEln_trhZpE2j80X-9rS2gZy9Raa9VLir3-F3wC0GKPEL6e3x1OygC03ix9uyXS3vpTsU9zlgoYADZyaLeOF1mCG4mQhvXs7IPmPbwNsElJwKh0xSQCHvNOQShprlvd3cHiUFKYw9fXphY1O-AUYcRzHk4DjoBdkGNQMy_Kw.KtC_z674rYBtDgkN.e8QU50Iq1JHkn-1USSxpjEkbrukb4cobvlQRK40iXGAKVIuOod4bSq5fDpIAPHugqIf-_zGsvr-2OCOdzhtBikL46wU7UdZppxPWtk-X6kl33zH_XObRMaGfe-hLxt3RPxRVn7I1Hp6tGW1Rkxyf_ESq4XlcbbrkhDoIz_G_LKXJhvQ-xahW2e0AUc7RZSucns4XUeq9xX_dd7Ht-o1TmQI9WFoFc1l7oh9GtQ6GZMsghnZ1VrbIS2L7jSYiSsD2JqSv1LLtOGj_FBA0ufhqM3LloGiwflEwAryMD10oNb73WonKEycEj1rBsTIKW7SHkI-VkrQA4-8N-aLWgHwDnzyPZmyNyKpqUMvhjIE_0w6oqU4HpN7J5nfBEIAtpPZ_pDkwAdxCQ7JV3zfiUnF7ZQ3q1PnSId315si02ZN9-wRSrMHcHnboQN1Hs4xCAfGyClVyLpCzfa_fAehjt6v1DjgjbzwSjr_LdNmWTvXYBhNO8Jq9Vb7axksrdwksD3pYNMY8cRZxP-LO0V5Sv1_kT_Hf2yLo2iTwB8n8szzGrJ4QQLb5Znu7Sv-M2x52cnIDMiorP3LNpFk.G85FuMSm-8bGumFAStiFQA - -curl -H "Authorization: Bearer $TOKEN" localhost:8080/message -``` - -Will respond with: - -```bash -secret message -``` - -== 2. Testing against other Authorization Servers - -_In order to use this sample, your Authorization Server must encrypt using the public key available in the sample. -Also it must support JWTs that either use the "scope" or "scp" attribute._ - -To change the sample to point at your Authorization Server, simply find this property in the `application.yml`: - -```yaml -spring: - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: ${mockwebserver.url}/.well-known/jwks.json -``` - -And change the property to your Authorization Server's JWK set endpoint: - -```yaml -spring: - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: https://localhost:9031/pf/JWKS -``` - -If your Authorization Server does not support RSA_OAEP_256 or AESGCM, then you can change these values in `OAuth2ResourceServerSecurityConfiguration`: - -```java - -``` - -And then you can run the app the same as before: - -```bash -./gradlew bootRun -``` - -Make sure to obtain valid tokens from your Authorization Server in order to play with the sample Resource Server. -To use the `/` endpoint, any valid token from your Authorization Server will do. -To use the `/message` endpoint, the token should have the `message:read` scope. diff --git a/samples/boot/oauth2resourceserver-jwe/spring-security-samples-boot-oauth2resourceserver-jwe.gradle b/samples/boot/oauth2resourceserver-jwe/spring-security-samples-boot-oauth2resourceserver-jwe.gradle deleted file mode 100644 index 2135bb0af6..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/spring-security-samples-boot-oauth2resourceserver-jwe.gradle +++ /dev/null @@ -1,13 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-oauth2-jose') - compile project(':spring-security-oauth2-resource-server') - - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'com.squareup.okhttp3:mockwebserver' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/oauth2resourceserver-jwe/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver-jwe/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java deleted file mode 100644 index cd25346ce8..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.RequestPostProcessor; - -import static org.hamcrest.Matchers.containsString; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * Integration tests for {@link OAuth2ResourceServerApplication} - * - * @author Josh Cummings - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@AutoConfigureMockMvc -@ActiveProfiles("test") -public class OAuth2ResourceServerApplicationITests { - - String noScopesToken = "eyJjdHkiOiJKV1QiLCJlbmMiOiJBMjU2R0NNIiwiYWxnIjoiUlNBLU9BRVAtMjU2In0.IyeWtsTonaiWJdoT13B0M7gpqVxAirVGlfqFI4TOmTRcVHICs_ESezS7fa0ODS9XYdwklTtG7hH39yeeMzr2Zo1Ghh-m36fdoqQrV1Do04rUvuTjqbgyNffeZEGB6rquJ-cyAVjp_Oljy10-Bbnw7CeVGwNBSVo9UCB5j49OlNWhLxFpYARFmOlYpXj-s4Q4JiqV6EvjDAYeohAR4QQmND3qoxR-s2I6SLcIho0sSSpUlhrRiqu2uvWefHDcZJdW2WYWnxLHxhzNu3CfnLiqhhaA_YA_iWXR9FYnPDCf_4q3FgSXcgttXzomFKAx5DwnE_dXvsCvpWxslZMU1UIiLA.MHOrrza2GQ9_5PIv.zU4tfhxT6apWBC3stBwQmGlCQBltWVQe4dFIykybWWBFqxo1bf2BZ37twzoEIFXG9jSYEMH4mvBXPWSvn66t-_jnqLnKTJst2plBjhagGCAoLNWXVKeYNp67o-lKOD_JJQFqsRw4oE05VSgRr14MZeaUBFcU3A_kKxMXOu899DKfXBGJvj75H7lDyd8RUXTb-OSWWfUiJc6Y5AUy1zCZCN9yfDsCXt9heTsZANy92Oou9sMFaXkYzyums5OtkBtLFzyuNMEoNioRehTV-FTuL8tDRB1mNhHObwsBfFbR6M1jJK37pHUXGtko-yZ6NGwxyLtwGh4uU2jzE614rQzuzR8aHaHxOkUs1pBTZ8AcRt41snByOe-KU0adthHxedobFiQQBoQ05DgSU7DO6hsK0uVBDF3eG2KjH4L2lZy-WugloLHhdguUoO9F0zUx15-XZO4EVzmhy8xfH2tSXz98eKzz9Dv0DdGnrBL9cK2MM88N1zoq5u4NdlnE12HvuesB7GKdMwZx1-gTw_pzP81TzcctJWl6ETK09Uc.jk0O8qc4Fvip856stDz05Q"; - String messageReadToken = "eyJjdHkiOiJKV1QiLCJlbmMiOiJBMjU2R0NNIiwiYWxnIjoiUlNBLU9BRVAtMjU2In0.CRBAEgvQhpB6pPQhpkTAKpsDai1FDcvkDSRig1R3OI-g18JdTe-qDhzWwP-hV3aCwFwHxQ_g8Z8OIZvhyKpQaPwBb72UeLqqhzSIkm0gEsmmjYg1vEGOrDH5_Fqlm0LnAnXTmsbOIWYIj11ZuenI2lEmMCkVwqth0RlzakdcHRXiuDTEln_trhZpE2j80X-9rS2gZy9Raa9VLir3-F3wC0GKPEL6e3x1OygC03ix9uyXS3vpTsU9zlgoYADZyaLeOF1mCG4mQhvXs7IPmPbwNsElJwKh0xSQCHvNOQShprlvd3cHiUFKYw9fXphY1O-AUYcRzHk4DjoBdkGNQMy_Kw.KtC_z674rYBtDgkN.e8QU50Iq1JHkn-1USSxpjEkbrukb4cobvlQRK40iXGAKVIuOod4bSq5fDpIAPHugqIf-_zGsvr-2OCOdzhtBikL46wU7UdZppxPWtk-X6kl33zH_XObRMaGfe-hLxt3RPxRVn7I1Hp6tGW1Rkxyf_ESq4XlcbbrkhDoIz_G_LKXJhvQ-xahW2e0AUc7RZSucns4XUeq9xX_dd7Ht-o1TmQI9WFoFc1l7oh9GtQ6GZMsghnZ1VrbIS2L7jSYiSsD2JqSv1LLtOGj_FBA0ufhqM3LloGiwflEwAryMD10oNb73WonKEycEj1rBsTIKW7SHkI-VkrQA4-8N-aLWgHwDnzyPZmyNyKpqUMvhjIE_0w6oqU4HpN7J5nfBEIAtpPZ_pDkwAdxCQ7JV3zfiUnF7ZQ3q1PnSId315si02ZN9-wRSrMHcHnboQN1Hs4xCAfGyClVyLpCzfa_fAehjt6v1DjgjbzwSjr_LdNmWTvXYBhNO8Jq9Vb7axksrdwksD3pYNMY8cRZxP-LO0V5Sv1_kT_Hf2yLo2iTwB8n8szzGrJ4QQLb5Znu7Sv-M2x52cnIDMiorP3LNpFk.G85FuMSm-8bGumFAStiFQA"; - - @Autowired - MockMvc mvc; - - @Test - public void performWhenValidBearerTokenThenAllows() - throws Exception { - - this.mvc.perform(get("/").with(bearerToken(this.noScopesToken))) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("Hello, subject!"))); - } - - @Test - public void performWhenValidBearerTokenThenScopedRequestsAlsoWork() - throws Exception { - - this.mvc.perform(get("/message").with(bearerToken(this.messageReadToken))) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("secret message"))); - } - - @Test - public void performWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethodAccess() - throws Exception { - - this.mvc.perform(get("/message").with(bearerToken(this.noScopesToken))) - .andExpect(status().isForbidden()) - .andExpect(header().string(HttpHeaders.WWW_AUTHENTICATE, - containsString("Bearer error=\"insufficient_scope\""))); - } - - private static class BearerTokenRequestPostProcessor implements RequestPostProcessor { - private String token; - - BearerTokenRequestPostProcessor(String token) { - this.token = token; - } - - @Override - public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { - request.addHeader("Authorization", "Bearer " + this.token); - return request; - } - } - - private static BearerTokenRequestPostProcessor bearerToken(String token) { - return new BearerTokenRequestPostProcessor(token); - } -} diff --git a/samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java b/samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java deleted file mode 100644 index 62f91d1a1f..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.boot.env; - -import org.springframework.beans.factory.DisposableBean; -import org.springframework.boot.SpringApplication; -import org.springframework.core.env.ConfigurableEnvironment; - -/** - * @author Rob Winch - */ -public class MockWebServerEnvironmentPostProcessor - implements EnvironmentPostProcessor, DisposableBean { - - private final MockWebServerPropertySource propertySource = new MockWebServerPropertySource(); - - @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, - SpringApplication application) { - environment.getPropertySources().addFirst(this.propertySource); - } - - @Override - public void destroy() throws Exception { - this.propertySource.destroy(); - } -} diff --git a/samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java b/samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java deleted file mode 100644 index 5e9df1d836..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.boot.env; - -import java.io.IOException; - -import okhttp3.mockwebserver.Dispatcher; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import okhttp3.mockwebserver.RecordedRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.DisposableBean; -import org.springframework.core.env.PropertySource; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; - -/** - * @author Rob Winch - */ -public class MockWebServerPropertySource extends PropertySource implements - DisposableBean { - - private static final MockResponse JWKS_RESPONSE = response( - "{\"keys\":[{\"kty\":\"RSA\",\"e\":\"AQAB\",\"use\":\"sig\",\"kid\":\"one\",\"n\":\"i7H90yfquGVhXxekdzXkMaxlIg67Q_ofd7iuFHtgeUx-Iye2QjukuULhl774oITYnZIZsh2UHxRYG8nFypcYZfHJMQes_OYFTkTvRroKll5p3wxSkhpARbkEPFMyMJ5WIm3MeNO2ermMhDWVVeI2xQH-tW6w-C6b5d_F6lrIwCnpZwSv6PQ3kef-rcObp_PZANIo232bvpwyC6uW1W2kpjAvYJhQ8NrkG2oO0ynqEJW2UyoCWRdsT2BLZcFMAcxG3Iw9b9__IbvNoUBwr596JYfzrX0atiKyk4Yg8dJ1wBjHFN2fkHTlzn6HDwTJkj4VNDQvKu4P2zhKn1gmWuxhuQ\"}]}", - 200 - ); - - private static final MockResponse NOT_FOUND_RESPONSE = response( - "{ \"message\" : \"This mock authorization server responds to just one request: GET /.well-known/jwks.json.\" }", - 404 - ); - - /** - * Name of the random {@link PropertySource}. - */ - public static final String MOCK_WEB_SERVER_PROPERTY_SOURCE_NAME = "mockwebserver"; - - private static final String NAME = "mockwebserver.url"; - - private static final Log logger = LogFactory.getLog(MockWebServerPropertySource.class); - - private boolean started; - - public MockWebServerPropertySource() { - super(MOCK_WEB_SERVER_PROPERTY_SOURCE_NAME, new MockWebServer()); - } - - @Override - public Object getProperty(String name) { - if (!name.equals(NAME)) { - return null; - } - if (logger.isTraceEnabled()) { - logger.trace("Looking up the url for '" + name + "'"); - } - String url = getUrl(); - return url; - } - - @Override - public void destroy() throws Exception { - getSource().shutdown(); - } - - /** - * Get's the URL (i.e. "http://localhost:123456") - * @return - */ - private String getUrl() { - MockWebServer mockWebServer = getSource(); - if (!this.started) { - intializeMockWebServer(mockWebServer); - } - String url = mockWebServer.url("").url().toExternalForm(); - return url.substring(0, url.length() - 1); - } - - private void intializeMockWebServer(MockWebServer mockWebServer) { - Dispatcher dispatcher = new Dispatcher() { - @Override - public MockResponse dispatch(RecordedRequest request) { - if ("/.well-known/jwks.json".equals(request.getPath())) { - return JWKS_RESPONSE; - } - - return NOT_FOUND_RESPONSE; - } - }; - - mockWebServer.setDispatcher(dispatcher); - try { - mockWebServer.start(); - this.started = true; - } catch (IOException e) { - throw new RuntimeException("Could not start " + mockWebServer, e); - } - } - - private static MockResponse response(String body, int status) { - return new MockResponse() - .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .setResponseCode(status) - .setBody(body); - } - -} diff --git a/samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/package-info.java b/samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/package-info.java deleted file mode 100644 index 0226037822..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/src/main/java/org/springframework/boot/env/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -/** - * This provides integration of a {@link okhttp3.mockwebserver.MockWebServer} and the - * {@link org.springframework.core.env.Environment} - * @author Rob Winch - */ -package org.springframework.boot.env; diff --git a/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerApplication.java b/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerApplication.java deleted file mode 100644 index a0841c00f3..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Josh Cummings - */ -@SpringBootApplication -public class OAuth2ResourceServerApplication { - - public static void main(String[] args) { - SpringApplication.run(OAuth2ResourceServerApplication.class, args); - } -} diff --git a/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerController.java b/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerController.java deleted file mode 100644 index f0bcdbe64f..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerController.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.oauth2.jwt.Jwt; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author Josh Cummings - */ -@RestController -public class OAuth2ResourceServerController { - - @GetMapping("/") - public String index(@AuthenticationPrincipal Jwt jwt) { - return String.format("Hello, %s!", jwt.getSubject()); - } - - @GetMapping("/message") - public String message() { - return "secret message"; - } -} diff --git a/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java b/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java deleted file mode 100644 index dfe4135d4b..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import java.net.URL; -import java.security.interfaces.RSAPrivateCrtKey; -import java.security.interfaces.RSAPrivateKey; - -import com.nimbusds.jose.EncryptionMethod; -import com.nimbusds.jose.JWEAlgorithm; -import com.nimbusds.jose.JWSAlgorithm; -import com.nimbusds.jose.jwk.JWKSet; -import com.nimbusds.jose.jwk.KeyUse; -import com.nimbusds.jose.jwk.RSAKey; -import com.nimbusds.jose.jwk.source.ImmutableJWKSet; -import com.nimbusds.jose.jwk.source.JWKSource; -import com.nimbusds.jose.jwk.source.RemoteJWKSet; -import com.nimbusds.jose.proc.JWEDecryptionKeySelector; -import com.nimbusds.jose.proc.JWEKeySelector; -import com.nimbusds.jose.proc.JWSKeySelector; -import com.nimbusds.jose.proc.JWSVerificationKeySelector; -import com.nimbusds.jose.proc.SecurityContext; -import com.nimbusds.jose.util.Base64URL; -import com.nimbusds.jwt.proc.ConfigurableJWTProcessor; -import com.nimbusds.jwt.proc.DefaultJWTProcessor; -import com.nimbusds.jwt.proc.JWTProcessor; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; - -import static org.springframework.security.config.Customizer.withDefaults; - -/** - * @author Josh Cummings - */ -@EnableWebSecurity -public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfigurerAdapter { - - private final JWSAlgorithm jwsAlgorithm = JWSAlgorithm.RS256; - private final JWEAlgorithm jweAlgorithm = JWEAlgorithm.RSA_OAEP_256; - private final EncryptionMethod encryptionMethod = EncryptionMethod.A256GCM; - - @Value("${spring.security.oauth2.resourceserver.jwt.jwk-set-uri}") - URL jwkSetUri; - - @Value("${sample.jwe-key-value}") - RSAPrivateKey key; - - @Override - protected void configure(HttpSecurity http) throws Exception { - // @formatter:off - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .antMatchers("/message/**").hasAuthority("SCOPE_message:read") - .anyRequest().authenticated() - ) - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer - .jwt(withDefaults()) - ); - // @formatter:on - } - - @Bean - JwtDecoder jwtDecoder() { - return new NimbusJwtDecoder(jwtProcessor()); - } - - private JWTProcessor jwtProcessor() { - JWKSource jwsJwkSource = new RemoteJWKSet<>(this.jwkSetUri); - JWSKeySelector jwsKeySelector = - new JWSVerificationKeySelector<>(this.jwsAlgorithm, jwsJwkSource); - - JWKSource jweJwkSource = new ImmutableJWKSet<>(new JWKSet(rsaKey())); - JWEKeySelector jweKeySelector = - new JWEDecryptionKeySelector<>(this.jweAlgorithm, this.encryptionMethod, jweJwkSource); - - ConfigurableJWTProcessor jwtProcessor = new DefaultJWTProcessor<>(); - jwtProcessor.setJWSKeySelector(jwsKeySelector); - jwtProcessor.setJWEKeySelector(jweKeySelector); - - return jwtProcessor; - } - - private RSAKey rsaKey() { - RSAPrivateCrtKey crtKey = (RSAPrivateCrtKey) this.key; - Base64URL n = Base64URL.encode(crtKey.getModulus()); - Base64URL e = Base64URL.encode(crtKey.getPublicExponent()); - return new RSAKey.Builder(n, e) - .privateKey(this.key) - .keyUse(KeyUse.ENCRYPTION) - .build(); - } -} diff --git a/samples/boot/oauth2resourceserver-jwe/src/main/resources/META-INF/spring.factories b/samples/boot/oauth2resourceserver-jwe/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 37b447c970..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.env.EnvironmentPostProcessor=org.springframework.boot.env.MockWebServerEnvironmentPostProcessor diff --git a/samples/boot/oauth2resourceserver-jwe/src/main/resources/application.yml b/samples/boot/oauth2resourceserver-jwe/src/main/resources/application.yml deleted file mode 100644 index 8573fda8f6..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/src/main/resources/application.yml +++ /dev/null @@ -1,9 +0,0 @@ -spring: - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: ${mockwebserver.url}/.well-known/jwks.json - -sample: - jwe-key-value: classpath:simple.priv diff --git a/samples/boot/oauth2resourceserver-jwe/src/main/resources/simple.priv b/samples/boot/oauth2resourceserver-jwe/src/main/resources/simple.priv deleted file mode 100644 index 53510079ac..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/src/main/resources/simple.priv +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDcWWomvlNGyQhA -iB0TcN3sP2VuhZ1xNRPxr58lHswC9Cbtdc2hiSbe/sxAvU1i0O8vaXwICdzRZ1JM -g1TohG9zkqqjZDhyw1f1Ic6YR/OhE6NCpqERy97WMFeW6gJd1i5inHj/W19GAbqK -LhSHGHqIjyo0wlBf58t+qFt9h/EFBVE/LAGQBsg/jHUQCxsLoVI2aSELGIw2oSDF -oiljwLaQl0n9khX5ZbiegN3OkqodzCYHwWyu6aVVj8M1W9RIMiKmKr09s/gf31Nc -3WjvjqhFo1rTuurWGgKAxJLL7zlJqAKjGWbIT4P6h/1Kwxjw6X23St3OmhsG6HIn -+jl1++MrAgMBAAECggEBAMf820wop3pyUOwI3aLcaH7YFx5VZMzvqJdNlvpg1jbE -E2Sn66b1zPLNfOIxLcBG8x8r9Ody1Bi2Vsqc0/5o3KKfdgHvnxAB3Z3dPh2WCDek -lCOVClEVoLzziTuuTdGO5/CWJXdWHcVzIjPxmK34eJXioiLaTYqN3XKqKMdpD0ZG -mtNTGvGf+9fQ4i94t0WqIxpMpGt7NM4RHy3+Onggev0zLiDANC23mWrTsUgect/7 -62TYg8g1bKwLAb9wCBT+BiOuCc2wrArRLOJgUkj/F4/gtrR9ima34SvWUyoUaKA0 -bi4YBX9l8oJwFGHbU9uFGEMnH0T/V0KtIB7qetReywkCgYEA9cFyfBIQrYISV/OA -+Z0bo3vh2aL0QgKrSXZ924cLt7itQAHNZ2ya+e3JRlTczi5mnWfjPWZ6eJB/8MlH -Gpn12o/POEkU+XjZZSPe1RWGt5g0S3lWqyx9toCS9ACXcN9tGbaqcFSVI73zVTRA -8J9grR0fbGn7jaTlTX2tnlOTQ60CgYEA5YjYpEq4L8UUMFkuj+BsS3u0oEBnzuHd -I9LEHmN+CMPosvabQu5wkJXLuqo2TxRnAznsA8R3pCLkdPGoWMCiWRAsCn979TdY -QbqO2qvBAD2Q19GtY7lIu6C35/enQWzJUMQE3WW0OvjLzZ0l/9mA2FBRR+3F9A1d -rBdnmv0c3TcCgYEAi2i+ggVZcqPbtgrLOk5WVGo9F1GqUBvlgNn30WWNTx4zIaEk -HSxtyaOLTxtq2odV7Kr3LGiKxwPpn/T+Ief+oIp92YcTn+VfJVGw4Z3BezqbR8lA -Uf/+HF5ZfpMrVXtZD4Igs3I33Duv4sCuqhEvLWTc44pHifVloozNxYfRfU0CgYBN -HXa7a6cJ1Yp829l62QlJKtx6Ymj95oAnQu5Ez2ROiZMqXRO4nucOjGUP55Orac1a -FiGm+mC/skFS0MWgW8evaHGDbWU180wheQ35hW6oKAb7myRHtr4q20ouEtQMdQIF -snV39G1iyqeeAsf7dxWElydXpRi2b68i3BIgzhzebQKBgQCdUQuTsqV9y/JFpu6H -c5TVvhG/ubfBspI5DhQqIGijnVBzFT//UfIYMSKJo75qqBEyP2EJSmCsunWsAFsM -TszuiGTkrKcZy9G0wJqPztZZl2F2+bJgnA6nBEV7g5PA4Af+QSmaIhRwqGDAuROR -47jndeyIaMTNETEmOnms+as17g== ------END PRIVATE KEY----- \ No newline at end of file diff --git a/samples/boot/oauth2resourceserver-jwe/src/main/resources/simple.pub b/samples/boot/oauth2resourceserver-jwe/src/main/resources/simple.pub deleted file mode 100644 index 0b2ee7b336..0000000000 --- a/samples/boot/oauth2resourceserver-jwe/src/main/resources/simple.pub +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3FlqJr5TRskIQIgdE3Dd -7D9lboWdcTUT8a+fJR7MAvQm7XXNoYkm3v7MQL1NYtDvL2l8CAnc0WdSTINU6IRv -c5Kqo2Q4csNX9SHOmEfzoROjQqahEcve1jBXluoCXdYuYpx4/1tfRgG6ii4Uhxh6 -iI8qNMJQX+fLfqhbfYfxBQVRPywBkAbIP4x1EAsbC6FSNmkhCxiMNqEgxaIpY8C2 -kJdJ/ZIV+WW4noDdzpKqHcwmB8FsrumlVY/DNVvUSDIipiq9PbP4H99TXN1o746o -RaNa07rq1hoCgMSSy+85SagCoxlmyE+D+of9SsMY8Ol9t0rdzpobBuhyJ/o5dfvj -KwIDAQAB ------END PUBLIC KEY----- \ No newline at end of file diff --git a/samples/boot/oauth2resourceserver-multitenancy/README.adoc b/samples/boot/oauth2resourceserver-multitenancy/README.adoc deleted file mode 100644 index 97674479bd..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/README.adoc +++ /dev/null @@ -1,155 +0,0 @@ -= OAuth 2.0 Resource Server Sample - -This sample demonstrates integrating Resource Server with a mock Authorization Server, though it can be modified to integrate -with your favorite Authorization Server. - -With it, you can run the integration tests or run the application as a stand-alone service to explore how you can -secure your own service with OAuth 2.0 Bearer Tokens using Spring Security. - -== 1. Running the tests - -To run the tests, do: - -```bash -./gradlew integrationTest -``` - -Or import the project into your IDE and run `OAuth2ResourceServerApplicationTests` from there. - -=== What is it doing? - -By default, the tests are pointing at a mock Authorization Server instance. - -The tests are configured with a set of hard-coded tokens originally obtained from the mock Authorization Server, -and each makes a query to the Resource Server with their corresponding token. - -The Resource Server subsequently verifies with the Authorization Server and authorizes the request, returning either the -phrase - -```bash -Hello, subject for tenant one! -``` - -where "subject" is the value of the `sub` field in the JWT sent in the `Authorization` header, - -or the phrase -```bash -Hello, subject for tenant two! -``` -where "subject" is the value of the `sub` field in the Introspection response from the Authorization Server. - - -== 2. Running the app - -To run as a stand-alone application, do: - -```bash -./gradlew bootRun -``` - -Or import the project into your IDE and run `OAuth2ResourceServerApplication` from there. - -=== Authorizing with tenantOne (JWT) - -Once it is up, you can use the following token: - -```bash -export TOKEN=eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjo0NjgzODA1MTI4fQ.ULEPdHG-MK5GlrTQMhgqcyug2brTIZaJIrahUeq9zaiwUSdW83fJ7W1IDd2Z3n4a25JY2uhEcoV95lMfccHR6y_2DLrNvfta22SumY9PEDF2pido54LXG6edIGgarnUbJdR4rpRe_5oRGVa8gDx8FnuZsNv6StSZHAzw5OsuevSTJ1UbJm4UfX3wiahFOQ2OI6G-r5TB2rQNdiPHuNyzG5yznUqRIZ7-GCoMqHMaC-1epKxiX8gYXRROuUYTtcMNa86wh7OVDmvwVmFioRcR58UWBRoO1XQexTtOQq_t8KYsrPZhb9gkyW8x2bAQF-d0J0EJY8JslaH6n4RBaZISww -``` - -And then make this request: - -```bash -curl -H "tenant: one" -H "Authorization: Bearer $TOKEN" localhost:8080 -``` - -Which will respond with the phrase: - -```bash -Hello, subject for tenant one! -``` - -where `subject` is the value of the `sub` field in the JWT sent in the `Authorization` header. - -Or this: - -```bash -export TOKEN=eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0Iiwic2NvcGUiOiJtZXNzYWdlOnJlYWQiLCJleHAiOjQ2ODM4MDUxNDF9.h-j6FKRFdnTdmAueTZCdep45e6DPwqM68ZQ8doIJ1exi9YxAlbWzOwId6Bd0L5YmCmp63gGQgsBUBLzwnZQ8kLUgUOBEC3UzSWGRqMskCY9_k9pX0iomX6IfF3N0PaYs0WPC4hO1s8wfZQ-6hKQ4KigFi13G9LMLdH58PRMK0pKEvs3gCbHJuEPw-K5ORlpdnleUTQIwINafU57cmK3KocTeknPAM_L716sCuSYGvDl6xUTXO7oPdrXhS_EhxLP6KxrpI1uD4Ea_5OWTh7S0Wx5LLDfU6wBG1DowN20d374zepOIEkR-Jnmr_QlR44vmRqS5ncrF-1R0EGcPX49U6A - -curl -H "tenant: one" -H "Authorization: Bearer $TOKEN" localhost:8080/message -``` - -Will respond with: - -```bash -secret message for tenant one -``` - -=== Authorizing with tenantTwo (Opaque token) - -Once it is up, you can use the following token: - -```bash -export TOKEN=00ed5855-1869-47a0-b0c9-0f3ce520aee7 -``` - -And then make this request: - -```bash -curl -H "tenant: two" -H "Authorization: Bearer $TOKEN" localhost:8080 -``` - -Which will respond with the phrase: - -```bash -Hello, subject for tenant two! -``` - -where `subject` is the value of the `sub` field in the Introspection response from the Authorization Server. - -Or this: - -```bash -export TOKEN=b43d1500-c405-4dc9-b9c9-6cfd966c34c9 - -curl -H "tenant: two" -H "Authorization: Bearer $TOKEN" localhost:8080/message -``` - -Will respond with: - -```bash -secret message for tenant two -``` - -== 2. Testing against other Authorization Servers - -_In order to use this sample, your Authorization Server must support JWTs that either use the "scope" or "scp" attribute._ - -To change the sample to point at your Authorization Server, simply find these properties in the `application.yml`: - -```yaml -tenantOne.jwk-set-uri: ${mockwebserver.url}/.well-known/jwks.json -tenantTwo.introspection-uri: ${mockwebserver.url}/introspect -tenantTwo.introspection-client-id: client -tenantTwo.introspection-client-secret: secret -``` - -And change the properties to your Authorization Server's JWK set endpoint and -introspection endpoint, including its client id and secret - -```yaml -tenantOne.jwk-set-uri: https://dev-123456.oktapreview.com/oauth2/default/v1/keys -tenantTwo.introspection-uri: https://dev-123456.oktapreview.com/oauth2/default/v1/introspect -tenantTwo.introspection-client-id: client -tenantTwo.introspection-client-secret: secret -``` - -And then you can run the app the same as before: - -```bash -./gradlew bootRun -``` - -Make sure to obtain valid tokens from your Authorization Server in order to play with the sample Resource Server. -To use the `/` endpoint, any valid token from your Authorization Server will do. -To use the `/message` endpoint, the token should have the `message:read` scope. diff --git a/samples/boot/oauth2resourceserver-multitenancy/spring-security-samples-boot-oauth2resourceserver-multitenancy.gradle b/samples/boot/oauth2resourceserver-multitenancy/spring-security-samples-boot-oauth2resourceserver-multitenancy.gradle deleted file mode 100644 index 9074842b18..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/spring-security-samples-boot-oauth2resourceserver-multitenancy.gradle +++ /dev/null @@ -1,14 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-oauth2-jose') - compile project(':spring-security-oauth2-resource-server') - - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'com.nimbusds:oauth2-oidc-sdk' - compile 'com.squareup.okhttp3:mockwebserver' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver-multitenancy/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java deleted file mode 100644 index be6d3f559c..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; - -import static org.hamcrest.Matchers.containsString; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * Integration tests for {@link OAuth2ResourceServerApplication} - * - * @author Josh Cummings - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@AutoConfigureMockMvc -public class OAuth2ResourceServerApplicationITests { - - String tenantOneNoScopesToken = "eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjo0NjgzODA1MTI4fQ.ULEPdHG-MK5GlrTQMhgqcyug2brTIZaJIrahUeq9zaiwUSdW83fJ7W1IDd2Z3n4a25JY2uhEcoV95lMfccHR6y_2DLrNvfta22SumY9PEDF2pido54LXG6edIGgarnUbJdR4rpRe_5oRGVa8gDx8FnuZsNv6StSZHAzw5OsuevSTJ1UbJm4UfX3wiahFOQ2OI6G-r5TB2rQNdiPHuNyzG5yznUqRIZ7-GCoMqHMaC-1epKxiX8gYXRROuUYTtcMNa86wh7OVDmvwVmFioRcR58UWBRoO1XQexTtOQq_t8KYsrPZhb9gkyW8x2bAQF-d0J0EJY8JslaH6n4RBaZISww"; - String tenantOneMessageReadToken = "eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0Iiwic2NvcGUiOiJtZXNzYWdlOnJlYWQiLCJleHAiOjQ2ODM4MDUxNDF9.h-j6FKRFdnTdmAueTZCdep45e6DPwqM68ZQ8doIJ1exi9YxAlbWzOwId6Bd0L5YmCmp63gGQgsBUBLzwnZQ8kLUgUOBEC3UzSWGRqMskCY9_k9pX0iomX6IfF3N0PaYs0WPC4hO1s8wfZQ-6hKQ4KigFi13G9LMLdH58PRMK0pKEvs3gCbHJuEPw-K5ORlpdnleUTQIwINafU57cmK3KocTeknPAM_L716sCuSYGvDl6xUTXO7oPdrXhS_EhxLP6KxrpI1uD4Ea_5OWTh7S0Wx5LLDfU6wBG1DowN20d374zepOIEkR-Jnmr_QlR44vmRqS5ncrF-1R0EGcPX49U6A"; - String tenantTwoNoScopesToken = "00ed5855-1869-47a0-b0c9-0f3ce520aee7"; - String tenantTwoMessageReadToken = "b43d1500-c405-4dc9-b9c9-6cfd966c34c9"; - - @Autowired - MockMvc mvc; - - @Test - public void tenantOnePerformWhenValidBearerTokenThenAllows() - throws Exception { - - this.mvc.perform(get("/") - .header("tenant", "one") - .header("Authorization", "Bearer " + this.tenantOneNoScopesToken)) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("Hello, subject for tenant one!"))); - } - - @Test - public void tenantOnePerformWhenValidBearerTokenThenScopedRequestsAlsoWork() - throws Exception { - - this.mvc.perform(get("/message") - .header("tenant", "one") - .header("Authorization", "Bearer " + this.tenantOneMessageReadToken)) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("secret message for tenant one"))); - } - - @Test - public void tenantOnePerformWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethodAccess() - throws Exception { - - this.mvc.perform(get("/message") - .header("tenant", "one") - .header("Authorization", "Bearer " + this.tenantOneNoScopesToken)) - .andExpect(status().isForbidden()) - .andExpect(header().string(HttpHeaders.WWW_AUTHENTICATE, - containsString("Bearer error=\"insufficient_scope\""))); - } - - @Test - public void tenantTwoPerformWhenValidBearerTokenThenAllows() - throws Exception { - - this.mvc.perform(get("/") - .header("tenant", "two") - .header("Authorization", "Bearer " + this.tenantTwoNoScopesToken)) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("Hello, subject for tenant two!"))); - } - - @Test - public void tenantTwoPerformWhenValidBearerTokenThenScopedRequestsAlsoWork() - throws Exception { - - this.mvc.perform(get("/message") - .header("tenant", "two") - .header("Authorization", "Bearer " + this.tenantTwoMessageReadToken)) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("secret message for tenant two"))); - } - - @Test - public void tenantTwoPerformWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethodAccess() - throws Exception { - - this.mvc.perform(get("/message") - .header("tenant", "two") - .header("Authorization", "Bearer " + this.tenantTwoNoScopesToken)) - .andExpect(status().isForbidden()) - .andExpect(header().string(HttpHeaders.WWW_AUTHENTICATE, - containsString("Bearer error=\"insufficient_scope\""))); - } - - @Test(expected = IllegalArgumentException.class) - public void invalidTenantPerformWhenValidBearerTokenThenThrowsException() - throws Exception { - - this.mvc.perform(get("/") - .header("tenant", "three") - .header("Authorization", "Bearer " + this.tenantOneNoScopesToken)); - } -} diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java b/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java deleted file mode 100644 index f6f664891b..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.boot.env; - -import org.springframework.beans.factory.DisposableBean; -import org.springframework.boot.SpringApplication; -import org.springframework.core.env.ConfigurableEnvironment; - -/** - * @author Rob Winch - */ -public class MockWebServerEnvironmentPostProcessor - implements EnvironmentPostProcessor, DisposableBean { - - private final MockWebServerPropertySource propertySource = new MockWebServerPropertySource(); - - @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, - SpringApplication application) { - environment.getPropertySources().addFirst(this.propertySource); - } - - @Override - public void destroy() throws Exception { - this.propertySource.destroy(); - } -} diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java b/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java deleted file mode 100644 index 9e3f58e628..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.boot.env; - -import java.io.IOException; -import java.util.Base64; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import okhttp3.mockwebserver.Dispatcher; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import okhttp3.mockwebserver.RecordedRequest; -import okio.Buffer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.DisposableBean; -import org.springframework.core.env.PropertySource; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; - -/** - * @author Rob Winch - */ -public class MockWebServerPropertySource extends PropertySource implements - DisposableBean { - - // introspection endpoint - - private static final MockResponse NO_SCOPES_RESPONSE = response( - "{\n" + - " \"active\": true,\n" + - " \"sub\": \"subject\"\n" + - " }", - 200 - ); - - private static final MockResponse MESSASGE_READ_SCOPE_RESPONSE = response( - "{\n" + - " \"active\": true,\n" + - " \"scope\" : \"message:read\"," + - " \"sub\": \"subject\"\n" + - " }", - 200 - ); - - private static final MockResponse INACTIVE_RESPONSE = response( - "{\n" + - " \"active\": false,\n" + - " }", - 200 - ); - - private static final MockResponse BAD_REQUEST_RESPONSE = response( - "{ \"message\" : \"This mock authorization server requires a username and password of " + - "client/secret and a POST body of token=${token}\" }", - 400 - ); - - private static final MockResponse NOT_FOUND_RESPONSE = response( - "{ \"message\" : \"This mock authorization server responds to just two requests: POST /introspect" + - " and GET /.well-known/jwks.json.\" }", - 404 - ); - - // jwks endpoint - - private static final MockResponse JWKS_RESPONSE = response( - "{\"keys\":[{\"p\":\"2p-ViY7DE9ZrdWQb544m0Jp7Cv03YCSljqfim9pD4ALhObX0OrAznOiowTjwBky9JGffMwDBVSfJSD9TSU7aH2sbbfi0bZLMdekKAuimudXwUqPDxrrg0BCyvCYgLmKjbVT3zcdylWSog93CNTxGDPzauu-oc0XPNKCXnaDpNvE\",\"kty\":\"RSA\",\"q\":\"sP_QYavrpBvSJ86uoKVGj2AGl78CSsAtpf1ybSY5TwUlorXSdqapRbY69Y271b0aMLzlleUn9ZTBO1dlKV2_dw_lPADHVia8z3pxL-8sUhIXLsgj4acchMk4c9YX-sFh07xENnyZ-_TXm3llPLuL67HUfBC2eKe800TmCYVWc9U\",\"d\":\"bn1nFxCQT4KLTHqo8mo9HvHD0cRNRNdWcKNnnEQkCF6tKbt-ILRyQGP8O40axLd7CoNVG9c9p_-g4-2kwCtLJNv_STLtwfpCY7VN5o6-ZIpfTjiW6duoPrLWq64Hm_4LOBQTiZfUPcLhsuJRHbWqakj-kV_YbUyC2Ocf_dd8IAQcSrAU2SCcDebhDCWwRUFvaa9V5eq0851S9goaA-AJz-JXyePH6ZFr8JxmWkWxYZ5kdcMD-sm9ZbxE0CaEk32l4fE4hR-L8x2dDtjWA-ahKCZ091z-gV3HWtR2JOjvxoNRjxUo3UxaGiFJHWNIl0EYUJZu1Cb-5wIlEI7wPx5mwQ\",\"e\":\"AQAB\",\"use\":\"sig\",\"kid\":\"one\",\"qi\":\"qS0OK48M2CIAA6_4Wdw4EbCaAfcTLf5Oy9t5BOF_PFUKqoSpZ6JsT5H0a_4zkjt-oI969v78OTlvBKbmEyKO-KeytzHBAA5CsLmVcz0THrMSg6oXZqu66MPnvWoZN9FEN5TklPOvBFm8Bg1QZ3k-YMVaM--DLvhaYR95_mqaz50\",\"dp\":\"Too2NozLGD1XrXyhabZvy1E0EuaVFj0UHQPDLSpkZ_2g3BK6Art6T0xmE8RYtmqrKIEIdlI3IliAvyvAx_1D7zWTTRaj-xlZyqJFrnXWL7zj8UxT8PkB-r2E-ILZ3NAi1gxIWezlBTZ8M6NfObDFmbTc_3tJkN_raISo8z_ziIE\",\"dq\":\"U0yhSkY5yOsa9YcMoigGVBWSJLpNHtbg5NypjHrPv8OhWbkOSq7WvSstBkFk5AtyFvvfZLMLIkWWxxGzV0t6f1MoxBtttLrYYyCxwihiiGFhLbAdSuZ1wnxcqA9bC7UVECvrQmVTpsMs8UupfHKbQBpZ8OWAqrnuYNNtG4_4Bt0\",\"n\":\"lygtuZj0lJjqOqIWocF8Bb583QDdq-aaFg8PesOp2-EDda6GqCpL-_NZVOflNGX7XIgjsWHcPsQHsV9gWuOzSJ0iEuWvtQ6eGBP5M6m7pccLNZfwUse8Cb4Ngx3XiTlyuqM7pv0LPyppZusfEHVEdeelou7Dy9k0OQ_nJTI3b2E1WBoHC58CJ453lo4gcBm1efURN3LIVc1V9NQY_ESBKVdwqYyoJPEanURLVGRd6cQKn6YrCbbIRHjqAyqOE-z3KmgDJnPriljfR5XhSGyM9eqD9Xpy6zu_MAeMJJfSArp857zLPk-Wf5VP9STAcjyfdBIybMKnwBYr2qHMT675hQ\"}]}", - 200 - ); - - /** - * Name of the random {@link PropertySource}. - */ - public static final String MOCK_WEB_SERVER_PROPERTY_SOURCE_NAME = "mockwebserver"; - - private static final String NAME = "mockwebserver.url"; - - private static final Log logger = LogFactory.getLog(MockWebServerPropertySource.class); - - private boolean started; - - public MockWebServerPropertySource() { - super(MOCK_WEB_SERVER_PROPERTY_SOURCE_NAME, new MockWebServer()); - } - - @Override - public Object getProperty(String name) { - if (!name.equals(NAME)) { - return null; - } - if (logger.isTraceEnabled()) { - logger.trace("Looking up the url for '" + name + "'"); - } - String url = getUrl(); - return url; - } - - @Override - public void destroy() throws Exception { - getSource().shutdown(); - } - - /** - * Get's the URL (i.e. "http://localhost:123456") - * @return - */ - private String getUrl() { - MockWebServer mockWebServer = getSource(); - if (!this.started) { - intializeMockWebServer(mockWebServer); - } - String url = mockWebServer.url("").url().toExternalForm(); - return url.substring(0, url.length() - 1); - } - - private void intializeMockWebServer(MockWebServer mockWebServer) { - Dispatcher dispatcher = new Dispatcher() { - @Override - public MockResponse dispatch(RecordedRequest request) { - return doDispatch(request); - } - }; - - mockWebServer.setDispatcher(dispatcher); - try { - mockWebServer.start(); - this.started = true; - } catch (IOException e) { - throw new RuntimeException("Could not start " + mockWebServer, e); - } - } - - private MockResponse doDispatch(RecordedRequest request) { - if ("/.well-known/jwks.json".equals(request.getPath())) { - return JWKS_RESPONSE; - } - - if ("/introspect".equals(request.getPath())) { - return Optional.ofNullable(request.getHeader(HttpHeaders.AUTHORIZATION)) - .filter((authorization) -> isAuthorized(authorization, "client", "secret")) - .map((authorization) -> parseBody(request.getBody())) - .map((parameters) -> parameters.get("token")) - .map((token) -> { - if ("00ed5855-1869-47a0-b0c9-0f3ce520aee7".equals(token)) { - return NO_SCOPES_RESPONSE; - } else if ("b43d1500-c405-4dc9-b9c9-6cfd966c34c9".equals(token)) { - return MESSASGE_READ_SCOPE_RESPONSE; - } else { - return INACTIVE_RESPONSE; - } - }) - .orElse(BAD_REQUEST_RESPONSE); - } - - return NOT_FOUND_RESPONSE; - } - - private boolean isAuthorized(String authorization, String username, String password) { - String[] values = new String(Base64.getDecoder().decode(authorization.substring(6))).split(":"); - return username.equals(values[0]) && password.equals(values[1]); - } - - private Map parseBody(Buffer body) { - return Stream.of(body.readUtf8().split("&")) - .map((parameter) -> parameter.split("=")) - .collect(Collectors.toMap((parts) -> parts[0], (parts) -> parts[1])); - } - - private static MockResponse response(String body, int status) { - return new MockResponse() - .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .setResponseCode(status) - .setBody(body); - } - -} diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/package-info.java b/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/package-info.java deleted file mode 100644 index 4db05821da..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/org/springframework/boot/env/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -/** - * This provides integration of a {@link okhttp3.mockwebserver.MockWebServer} and the - * {@link org.springframework.core.env.Environment} - * @author Rob Winch - */ -package org.springframework.boot.env; diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerApplication.java b/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerApplication.java deleted file mode 100644 index d5c70cc70d..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Josh Cummings - */ -@SpringBootApplication -public class OAuth2ResourceServerApplication { - - public static void main(String[] args) { - SpringApplication.run(OAuth2ResourceServerApplication.class, args); - } -} diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerController.java b/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerController.java deleted file mode 100644 index 1dce6e718a..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerController.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.oauth2.core.OAuth2AuthenticatedPrincipal; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author Josh Cummings - */ -@RestController -public class OAuth2ResourceServerController { - - @GetMapping("/") - public String index(@AuthenticationPrincipal OAuth2AuthenticatedPrincipal token, @RequestHeader("tenant") String tenant) { - String subject = token.getAttribute("sub"); - return String.format("Hello, %s for tenant %s!", subject, tenant); - } - - @GetMapping("/message") - public String message(@RequestHeader("tenant") String tenant) { - return String.format("secret message for tenant %s", tenant); - } -} diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java b/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java deleted file mode 100644 index 75bf3865b9..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.authentication.AuthenticationManagerResolver; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; - -/** - * @author Josh Cummings - */ -@EnableWebSecurity -public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfigurerAdapter { - - @Autowired - AuthenticationManagerResolver authenticationManagerResolver; - - @Override - protected void configure(HttpSecurity http) throws Exception { - // @formatter:off - http - .authorizeRequests((authz) -> authz - .antMatchers("/message/**").hasAuthority("SCOPE_message:read") - .anyRequest().authenticated() - ) - .oauth2ResourceServer((oauth2) -> oauth2 - .authenticationManagerResolver(this.authenticationManagerResolver) - ); - // @formatter:on - } -} diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/TenantAuthenticationManagerResolver.java b/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/TenantAuthenticationManagerResolver.java deleted file mode 100644 index 939bfc0b8b..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/src/main/java/sample/TenantAuthenticationManagerResolver.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.AuthenticationManagerResolver; -import org.springframework.security.authentication.ProviderManager; -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationProvider; -import org.springframework.security.oauth2.server.resource.authentication.JwtBearerTokenAuthenticationConverter; -import org.springframework.security.oauth2.server.resource.authentication.OpaqueTokenAuthenticationProvider; -import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector; -import org.springframework.stereotype.Component; - -@Component -public class TenantAuthenticationManagerResolver - implements AuthenticationManagerResolver { - - private AuthenticationManager jwt; - private AuthenticationManager opaqueToken; - - public TenantAuthenticationManagerResolver( - JwtDecoder jwtDecoder, OpaqueTokenIntrospector opaqueTokenIntrospector) { - - JwtAuthenticationProvider jwtAuthenticationProvider = new JwtAuthenticationProvider(jwtDecoder); - jwtAuthenticationProvider.setJwtAuthenticationConverter(new JwtBearerTokenAuthenticationConverter()); - this.jwt = new ProviderManager(jwtAuthenticationProvider); - this.opaqueToken = new ProviderManager(new OpaqueTokenAuthenticationProvider(opaqueTokenIntrospector)); - } - - @Override - public AuthenticationManager resolve(HttpServletRequest request) { - String tenant = request.getHeader("tenant"); - if ("one".equals(tenant)) { - return this.jwt; - } - if ("two".equals(tenant)) { - return this.opaqueToken; - } - throw new IllegalArgumentException("unknown tenant"); - } -} diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/main/resources/META-INF/spring.factories b/samples/boot/oauth2resourceserver-multitenancy/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 37b447c970..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.env.EnvironmentPostProcessor=org.springframework.boot.env.MockWebServerEnvironmentPostProcessor diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/main/resources/application.yml b/samples/boot/oauth2resourceserver-multitenancy/src/main/resources/application.yml deleted file mode 100644 index 6447ad0d94..0000000000 --- a/samples/boot/oauth2resourceserver-multitenancy/src/main/resources/application.yml +++ /dev/null @@ -1,10 +0,0 @@ -spring: - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: ${mockwebserver.url}/.well-known/jwks.json - opaquetoken: - introspection-uri: ${mockwebserver.url}/introspect - client-id: client - client-secret: secret diff --git a/samples/boot/oauth2resourceserver-opaque/README.adoc b/samples/boot/oauth2resourceserver-opaque/README.adoc deleted file mode 100644 index fc6add9a1f..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/README.adoc +++ /dev/null @@ -1,114 +0,0 @@ -= OAuth 2.0 Resource Server Sample - -This sample demonstrates integrating Resource Server with a mock Authorization Server, though it can be modified to integrate -with your favorite Authorization Server. - -With it, you can run the integration tests or run the application as a stand-alone service to explore how you can -secure your own service with OAuth 2.0 Opaque Bearer Tokens using Spring Security. - -== 1. Running the tests - -To run the tests, do: - -```bash -./gradlew integrationTest -``` - -Or import the project into your IDE and run `OAuth2ResourceServerApplicationTests` from there. - -=== What is it doing? - -By default, the tests are pointing at a mock Authorization Server instance. - -The tests are configured with a set of hard-coded tokens originally obtained from the mock Authorization Server, -and each makes a query to the Resource Server with their corresponding token. - -The Resource Server subsquently verifies with the Authorization Server and authorizes the request, returning the phrase - -```bash -Hello, subject! -``` - -where "subject" is the value of the `sub` field in the JWT returned by the Authorization Server. - -== 2. Running the app - -To run as a stand-alone application, do: - -```bash -./gradlew bootRun -``` - -Or import the project into your IDE and run `OAuth2ResourceServerApplication` from there. - -Once it is up, you can use the following token: - -```bash -export TOKEN=00ed5855-1869-47a0-b0c9-0f3ce520aee7 -``` - -And then make this request: - -```bash -curl -H "Authorization: Bearer $TOKEN" localhost:8080 -``` - -Which will respond with the phrase: - -```bash -Hello, subject! -``` - -where `subject` is the value of the `sub` field in the JWT returned by the Authorization Server. - -Or this: - -```bash -export TOKEN=b43d1500-c405-4dc9-b9c9-6cfd966c34c9 - -curl -H "Authorization: Bearer $TOKEN" localhost:8080/message -``` - -Will respond with: - -```bash -secret message -``` - -== 2. Testing against other Authorization Servers - -_In order to use this sample, your Authorization Server must support Opaque Tokens and the Introspection Endpoint. - -To change the sample to point at your Authorization Server, simply find this property in the `application.yml`: - -```yaml -spring: - security: - oauth2: - resourceserver: - opaque: - introspection-uri: ${mockwebserver.url}/introspect - introspection-client-id: client - introspection-client-secret: secret -``` - -And change the property to your Authorization Server's Introspection endpoint, including its client id and secret: - -```yaml -spring: - security: - oauth2: - resourceserver: - opaque: - introspection-uri: ${mockwebserver.url}/introspect -``` - -And then you can run the app the same as before: - -```bash -./gradlew bootRun -``` - -Make sure to obtain valid tokens from your Authorization Server in order to play with the sample Resource Server. -To use the `/` endpoint, any valid token from your Authorization Server will do. -To use the `/message` endpoint, the token should have the `message:read` scope. diff --git a/samples/boot/oauth2resourceserver-opaque/spring-security-samples-boot-oauth2resourceserver-opaque.gradle b/samples/boot/oauth2resourceserver-opaque/spring-security-samples-boot-oauth2resourceserver-opaque.gradle deleted file mode 100644 index 9074842b18..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/spring-security-samples-boot-oauth2resourceserver-opaque.gradle +++ /dev/null @@ -1,14 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-oauth2-jose') - compile project(':spring-security-oauth2-resource-server') - - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'com.nimbusds:oauth2-oidc-sdk' - compile 'com.squareup.okhttp3:mockwebserver' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/oauth2resourceserver-opaque/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver-opaque/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java deleted file mode 100644 index 10bd3fc7ec..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.RequestPostProcessor; - -import static org.hamcrest.Matchers.containsString; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * Integration tests for {@link OAuth2ResourceServerApplication} - * - * @author Josh Cummings - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@AutoConfigureMockMvc -@ActiveProfiles("test") -public class OAuth2ResourceServerApplicationITests { - - String noScopesToken = "00ed5855-1869-47a0-b0c9-0f3ce520aee7"; - String messageReadToken = "b43d1500-c405-4dc9-b9c9-6cfd966c34c9"; - - @Autowired - MockMvc mvc; - - @Test - public void performWhenValidBearerTokenThenAllows() - throws Exception { - - this.mvc.perform(get("/").with(bearerToken(this.noScopesToken))) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("Hello, subject!"))); - } - - @Test - public void performWhenValidBearerTokenThenScopedRequestsAlsoWork() - throws Exception { - - this.mvc.perform(get("/message").with(bearerToken(this.messageReadToken))) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("secret message"))); - } - - @Test - public void performWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethodAccess() - throws Exception { - - this.mvc.perform(get("/message").with(bearerToken(this.noScopesToken))) - .andExpect(status().isForbidden()) - .andExpect(header().string(HttpHeaders.WWW_AUTHENTICATE, - containsString("Bearer error=\"insufficient_scope\""))); - } - - private static class BearerTokenRequestPostProcessor implements RequestPostProcessor { - private String token; - - BearerTokenRequestPostProcessor(String token) { - this.token = token; - } - - @Override - public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { - request.addHeader("Authorization", "Bearer " + this.token); - return request; - } - } - - private static BearerTokenRequestPostProcessor bearerToken(String token) { - return new BearerTokenRequestPostProcessor(token); - } -} diff --git a/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java b/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java deleted file mode 100644 index f6f664891b..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.boot.env; - -import org.springframework.beans.factory.DisposableBean; -import org.springframework.boot.SpringApplication; -import org.springframework.core.env.ConfigurableEnvironment; - -/** - * @author Rob Winch - */ -public class MockWebServerEnvironmentPostProcessor - implements EnvironmentPostProcessor, DisposableBean { - - private final MockWebServerPropertySource propertySource = new MockWebServerPropertySource(); - - @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, - SpringApplication application) { - environment.getPropertySources().addFirst(this.propertySource); - } - - @Override - public void destroy() throws Exception { - this.propertySource.destroy(); - } -} diff --git a/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java b/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java deleted file mode 100644 index 0bc6b57558..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.boot.env; - -import java.io.IOException; -import java.util.Base64; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import okhttp3.mockwebserver.Dispatcher; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import okhttp3.mockwebserver.RecordedRequest; -import okio.Buffer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.DisposableBean; -import org.springframework.core.env.PropertySource; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; - -/** - * @author Rob Winch - */ -public class MockWebServerPropertySource extends PropertySource implements - DisposableBean { - - private static final MockResponse NO_SCOPES_RESPONSE = response( - "{\n" + - " \"active\": true,\n" + - " \"sub\": \"subject\"\n" + - " }", - 200 - ); - - private static final MockResponse MESSASGE_READ_SCOPE_RESPONSE = response( - "{\n" + - " \"active\": true,\n" + - " \"scope\" : \"message:read\"," + - " \"sub\": \"subject\"\n" + - " }", - 200 - ); - - private static final MockResponse INACTIVE_RESPONSE = response( - "{\n" + - " \"active\": false,\n" + - " }", - 200 - ); - - private static final MockResponse BAD_REQUEST_RESPONSE = response( - "{ \"message\" : \"This mock authorization server requires a username and password of " + - "client/secret and a POST body of token=${token}\" }", - 400 - ); - - private static final MockResponse NOT_FOUND_RESPONSE = response( - "{ \"message\" : \"This mock authorization server responds to just one request: POST /introspect.\" }", - 404 - ); - - /** - * Name of the random {@link PropertySource}. - */ - public static final String MOCK_WEB_SERVER_PROPERTY_SOURCE_NAME = "mockwebserver"; - - private static final String NAME = "mockwebserver.url"; - - private static final Log logger = LogFactory.getLog(MockWebServerPropertySource.class); - - private boolean started; - - public MockWebServerPropertySource() { - super(MOCK_WEB_SERVER_PROPERTY_SOURCE_NAME, new MockWebServer()); - } - - @Override - public Object getProperty(String name) { - if (!name.equals(NAME)) { - return null; - } - if (logger.isTraceEnabled()) { - logger.trace("Looking up the url for '" + name + "'"); - } - String url = getUrl(); - return url; - } - - @Override - public void destroy() throws Exception { - getSource().shutdown(); - } - - /** - * Get's the URL (e.g. "http://localhost:123456") - * @return - */ - private String getUrl() { - MockWebServer mockWebServer = getSource(); - if (!this.started) { - initializeMockWebServer(mockWebServer); - } - String url = mockWebServer.url("").url().toExternalForm(); - return url.substring(0, url.length() - 1); - } - - private void initializeMockWebServer(MockWebServer mockWebServer) { - Dispatcher dispatcher = new Dispatcher() { - @Override - public MockResponse dispatch(RecordedRequest request) { - return doDispatch(request); - } - }; - - mockWebServer.setDispatcher(dispatcher); - try { - mockWebServer.start(); - this.started = true; - } catch (IOException e) { - throw new RuntimeException("Could not start " + mockWebServer, e); - } - } - - private MockResponse doDispatch(RecordedRequest request) { - if ("/introspect".equals(request.getPath())) { - return Optional.ofNullable(request.getHeader(HttpHeaders.AUTHORIZATION)) - .filter((authorization) -> isAuthorized(authorization, "client", "secret")) - .map((authorization) -> parseBody(request.getBody())) - .map((parameters) -> parameters.get("token")) - .map((token) -> { - if ("00ed5855-1869-47a0-b0c9-0f3ce520aee7".equals(token)) { - return NO_SCOPES_RESPONSE; - } else if ("b43d1500-c405-4dc9-b9c9-6cfd966c34c9".equals(token)) { - return MESSASGE_READ_SCOPE_RESPONSE; - } else { - return INACTIVE_RESPONSE; - } - }) - .orElse(BAD_REQUEST_RESPONSE); - } - - return NOT_FOUND_RESPONSE; - } - - private boolean isAuthorized(String authorization, String username, String password) { - String[] values = new String(Base64.getDecoder().decode(authorization.substring(6))).split(":"); - return username.equals(values[0]) && password.equals(values[1]); - } - - private Map parseBody(Buffer body) { - return Stream.of(body.readUtf8().split("&")) - .map((parameter) -> parameter.split("=")) - .collect(Collectors.toMap((parts) -> parts[0], (parts) -> parts[1])); - } - - private static MockResponse response(String body, int status) { - return new MockResponse() - .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .setResponseCode(status) - .setBody(body); - } - -} diff --git a/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/package-info.java b/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/package-info.java deleted file mode 100644 index 22b7245ebb..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/src/main/java/org/springframework/boot/env/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -/** - * This provides integration of a {@link okhttp3.mockwebserver.MockWebServer} and the - * {@link org.springframework.core.env.Environment} - * - * @author Rob Winch - */ -package org.springframework.boot.env; diff --git a/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerApplication.java b/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerApplication.java deleted file mode 100644 index d5c70cc70d..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Josh Cummings - */ -@SpringBootApplication -public class OAuth2ResourceServerApplication { - - public static void main(String[] args) { - SpringApplication.run(OAuth2ResourceServerApplication.class, args); - } -} diff --git a/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerController.java b/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerController.java deleted file mode 100644 index 857d29be66..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerController.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author Josh Cummings - */ -@RestController -public class OAuth2ResourceServerController { - - @GetMapping("/") - public String index(@AuthenticationPrincipal(expression="subject") String subject) { - return String.format("Hello, %s!", subject); - } - - @GetMapping("/message") - public String message() { - return "secret message"; - } - - @PostMapping("/message") - public String createMessage(@RequestBody String message) { - return String.format("Message was created. Content: %s", message); - } -} diff --git a/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java b/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java deleted file mode 100644 index 6fc3444c73..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpMethod; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; - -/** - * @author Josh Cummings - */ -@EnableWebSecurity -public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfigurerAdapter { - - @Value("${spring.security.oauth2.resourceserver.opaque.introspection-uri}") String introspectionUri; - @Value("${spring.security.oauth2.resourceserver.opaque.introspection-client-id}") String clientId; - @Value("${spring.security.oauth2.resourceserver.opaque.introspection-client-secret}") String clientSecret; - - @Override - protected void configure(HttpSecurity http) throws Exception { - // @formatter:off - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .antMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read") - .antMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write") - .anyRequest().authenticated() - ) - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer - .opaqueToken((opaqueToken) -> - opaqueToken - .introspectionUri(this.introspectionUri) - .introspectionClientCredentials(this.clientId, this.clientSecret) - ) - ); - // @formatter:on - } -} diff --git a/samples/boot/oauth2resourceserver-opaque/src/main/resources/META-INF/spring.factories b/samples/boot/oauth2resourceserver-opaque/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 37b447c970..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.env.EnvironmentPostProcessor=org.springframework.boot.env.MockWebServerEnvironmentPostProcessor diff --git a/samples/boot/oauth2resourceserver-opaque/src/main/resources/application.yml b/samples/boot/oauth2resourceserver-opaque/src/main/resources/application.yml deleted file mode 100644 index a7dcfead94..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/src/main/resources/application.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - security: - oauth2: - resourceserver: - opaque: - introspection-uri: ${mockwebserver.url}/introspect - introspection-client-id: client - introspection-client-secret: secret diff --git a/samples/boot/oauth2resourceserver-opaque/src/test/java/sample/OAuth2ResourceServerControllerTests.java b/samples/boot/oauth2resourceserver-opaque/src/test/java/sample/OAuth2ResourceServerControllerTests.java deleted file mode 100644 index ee3318f246..0000000000 --- a/samples/boot/oauth2resourceserver-opaque/src/test/java/sample/OAuth2ResourceServerControllerTests.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; - -import static org.hamcrest.CoreMatchers.is; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.opaqueToken; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.jwt; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * @author Josh Cummings - * @since 5.3 - */ -@RunWith(SpringRunner.class) -@WebMvcTest(OAuth2ResourceServerController.class) -public class OAuth2ResourceServerControllerTests { - - @Autowired - MockMvc mvc; - - @Test - public void indexGreetsAuthenticatedUser() throws Exception { - this.mvc.perform(get("/").with(opaqueToken().attributes((a) -> a.put("sub", "ch4mpy")))) - .andExpect(content().string(is("Hello, ch4mpy!"))); - } - - @Test - public void messageCanBeReadWithScopeMessageReadAuthority() throws Exception { - this.mvc.perform(get("/message").with(opaqueToken().attributes((a) -> a.put("scope", "message:read")))) - .andExpect(content().string(is("secret message"))); - - this.mvc.perform(get("/message") - .with(jwt().authorities(new SimpleGrantedAuthority(("SCOPE_message:read"))))) - .andExpect(content().string(is("secret message"))); - } - - @Test - public void messageCanNotBeReadWithoutScopeMessageReadAuthority() throws Exception { - this.mvc.perform(get("/message").with(opaqueToken())) - .andExpect(status().isForbidden()); - } - - @Test - public void messageCanNotBeCreatedWithoutAnyScope() throws Exception { - this.mvc.perform(post("/message") - .content("Hello message") - .with(opaqueToken())) - .andExpect(status().isForbidden()); - } - - @Test - public void messageCanNotBeCreatedWithScopeMessageReadAuthority() throws Exception { - this.mvc.perform(post("/message") - .content("Hello message") - .with(opaqueToken().authorities(new SimpleGrantedAuthority("SCOPE_message:read")))) - .andExpect(status().isForbidden()); - } - - @Test - public void messageCanBeCreatedWithScopeMessageWriteAuthority() throws Exception { - this.mvc.perform(post("/message") - .content("Hello message") - .with(opaqueToken().authorities(new SimpleGrantedAuthority("SCOPE_message:write")))) - .andExpect(status().isOk()) - .andExpect(content().string(is("Message was created. Content: Hello message"))); - } -} diff --git a/samples/boot/oauth2resourceserver-static/README.adoc b/samples/boot/oauth2resourceserver-static/README.adoc deleted file mode 100644 index ecc530d724..0000000000 --- a/samples/boot/oauth2resourceserver-static/README.adoc +++ /dev/null @@ -1,82 +0,0 @@ -= OAuth 2.0 Resource Server Sample - -This sample demonstrates integrating Resource Server with a pre-configured key. - -With it, you can run the integration tests or run the application as a stand-alone service to explore how you can -secure your own service with OAuth 2.0 Bearer Tokens using Spring Security. - -== 1. Running the tests - -To run the tests, do: - -```bash -./gradlew integrationTest -``` - -Or import the project into your IDE and run `OAuth2ResourceServerApplicationITests` from there. - -=== What is it doing? - -By default, the application is configured with an RSA public key that is available in the sample. - -The tests are configured with a set of hard-coded tokens that are signed with the corresponding RSA private key. -Each test makes a query to the Resource Server with their corresponding token. - -The Resource Server subsequently verifies the token against the public key and authorizes the request, returning the phrase - -```bash -Hello, subject! -``` - -where "subject" is the value of the `sub` field in the token. - -== 2. Running the app - -To run as a stand-alone application, do: - -```bash -./gradlew bootRun -``` - -Or import the project into your IDE and run `OAuth2ResourceServerApplication` from there. - -Once it is up, you can use the following token: - -```bash -export TOKEN=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiaWF0IjoxNTE2MjM5MDIyfQ.eB2c9xtg5wcCZxZ-o-sH4Mx1JGkqAZwH4_WS0UcDbj_nen0NPBj6CqOEPhr_LZDagb4mM6HoAPJywWWG8b_Ylnn5r2gWDzib2mb0kxIuAjnvVBrpzusw4ItTVvP_srv2DrwcisKYiKqU5X_3ka7MSVvKtswdLY3RXeCJ_S2W9go -``` - -And then make this request: - -```bash -curl -H "Authorization: Bearer $TOKEN" localhost:8080 -``` - -Which will respond with the phrase: - -```bash -Hello, subject! -``` - -where `subject` is the value of the `sub` field in the token. - -Or this: - -```bash -export TOKEN=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiaWF0IjoxNTE2MjM5MDIyLCJzY29wZSI6Im1lc3NhZ2U6cmVhZCJ9.bsRCpUEaiWnzX4OqNxTBqwUD4vxxtPp-CHKTw7XcrglrvZ2lvYXaiZZbCp-hcPhuzMEzEAFuH6s4GZZOWVIX-wT47GdTz9cfA-Z4QPjS2RxePKphFXgBI3jHEpQo94Qya2fJdV4LvgBmA1uM_RTnYY1UbmeYuHKnXrZoGyV8QQQ - -curl -H "Authorization: Bearer $TOKEN" localhost:8080/message -``` - -Will respond with: - -```bash -secret message -``` - -== 3. Testing with Other Tokens - -You can create your own tokens. Simply edit the public key in `OAuth2ResourceServerSecurityConfiguration` to match the private key you use. - -To use the `/` endpoint, any valid token will do. -To use the `/message` endpoint, the token should have the `message:read` scope. diff --git a/samples/boot/oauth2resourceserver-static/spring-security-samples-boot-oauth2resourceserver-static.gradle b/samples/boot/oauth2resourceserver-static/spring-security-samples-boot-oauth2resourceserver-static.gradle deleted file mode 100644 index faba0d5f46..0000000000 --- a/samples/boot/oauth2resourceserver-static/spring-security-samples-boot-oauth2resourceserver-static.gradle +++ /dev/null @@ -1,12 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-oauth2-jose') - compile project(':spring-security-oauth2-resource-server') - - compile 'org.springframework.boot:spring-boot-starter-web' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/oauth2resourceserver-static/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver-static/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java deleted file mode 100644 index 851d3bd242..0000000000 --- a/samples/boot/oauth2resourceserver-static/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.RequestPostProcessor; - -import static org.hamcrest.Matchers.containsString; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * Integration tests for {@link OAuth2ResourceServerApplication} - * - * @author Josh Cummings - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@AutoConfigureMockMvc -@ActiveProfiles("test") -public class OAuth2ResourceServerApplicationITests { - - String noScopesToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiaWF0IjoxNTE2MjM5MDIyfQ.eB2c9xtg5wcCZxZ-o-sH4Mx1JGkqAZwH4_WS0UcDbj_nen0NPBj6CqOEPhr_LZDagb4mM6HoAPJywWWG8b_Ylnn5r2gWDzib2mb0kxIuAjnvVBrpzusw4ItTVvP_srv2DrwcisKYiKqU5X_3ka7MSVvKtswdLY3RXeCJ_S2W9go"; - String messageReadToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiaWF0IjoxNTE2MjM5MDIyLCJzY29wZSI6Im1lc3NhZ2U6cmVhZCJ9.bsRCpUEaiWnzX4OqNxTBqwUD4vxxtPp-CHKTw7XcrglrvZ2lvYXaiZZbCp-hcPhuzMEzEAFuH6s4GZZOWVIX-wT47GdTz9cfA-Z4QPjS2RxePKphFXgBI3jHEpQo94Qya2fJdV4LvgBmA1uM_RTnYY1UbmeYuHKnXrZoGyV8QQQ"; - - @Autowired - MockMvc mvc; - - @Test - public void performWhenValidBearerTokenThenAllows() - throws Exception { - - this.mvc.perform(get("/").with(bearerToken(this.noScopesToken))) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("Hello, subject!"))); - } - - @Test - public void performWhenValidBearerTokenThenScopedRequestsAlsoWork() - throws Exception { - - this.mvc.perform(get("/message").with(bearerToken(this.messageReadToken))) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("secret message"))); - } - - @Test - public void performWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethodAccess() - throws Exception { - - this.mvc.perform(get("/message").with(bearerToken(this.noScopesToken))) - .andExpect(status().isForbidden()) - .andExpect(header().string(HttpHeaders.WWW_AUTHENTICATE, - containsString("Bearer error=\"insufficient_scope\""))); - } - - private static class BearerTokenRequestPostProcessor implements RequestPostProcessor { - private String token; - - BearerTokenRequestPostProcessor(String token) { - this.token = token; - } - - @Override - public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { - request.addHeader("Authorization", "Bearer " + this.token); - return request; - } - } - - private static BearerTokenRequestPostProcessor bearerToken(String token) { - return new BearerTokenRequestPostProcessor(token); - } -} diff --git a/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerApplication.java b/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerApplication.java deleted file mode 100644 index a0841c00f3..0000000000 --- a/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Josh Cummings - */ -@SpringBootApplication -public class OAuth2ResourceServerApplication { - - public static void main(String[] args) { - SpringApplication.run(OAuth2ResourceServerApplication.class, args); - } -} diff --git a/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerController.java b/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerController.java deleted file mode 100644 index f0bcdbe64f..0000000000 --- a/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerController.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.oauth2.jwt.Jwt; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author Josh Cummings - */ -@RestController -public class OAuth2ResourceServerController { - - @GetMapping("/") - public String index(@AuthenticationPrincipal Jwt jwt) { - return String.format("Hello, %s!", jwt.getSubject()); - } - - @GetMapping("/message") - public String message() { - return "secret message"; - } -} diff --git a/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java b/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java deleted file mode 100644 index a57bed2d51..0000000000 --- a/samples/boot/oauth2resourceserver-static/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import java.security.interfaces.RSAPublicKey; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; - -/** - * @author Josh Cummings - */ -@EnableWebSecurity -public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfigurerAdapter { - - @Value("${spring.security.oauth2.resourceserver.jwt.key-value}") - RSAPublicKey key; - - @Override - protected void configure(HttpSecurity http) throws Exception { - // @formatter:off - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .antMatchers("/message/**").hasAuthority("SCOPE_message:read") - .anyRequest().authenticated() - ) - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer - .jwt((jwt) -> - jwt.decoder(jwtDecoder()) - ) - ); - // @formatter:on - } - - @Bean - JwtDecoder jwtDecoder() { - return NimbusJwtDecoder.withPublicKey(this.key).build(); - } -} diff --git a/samples/boot/oauth2resourceserver-static/src/main/resources/application.yml b/samples/boot/oauth2resourceserver-static/src/main/resources/application.yml deleted file mode 100644 index 123d342ead..0000000000 --- a/samples/boot/oauth2resourceserver-static/src/main/resources/application.yml +++ /dev/null @@ -1,6 +0,0 @@ -spring: - security: - oauth2: - resourceserver: - jwt: - key-value: classpath:simple.pub diff --git a/samples/boot/oauth2resourceserver-static/src/main/resources/simple.pub b/samples/boot/oauth2resourceserver-static/src/main/resources/simple.pub deleted file mode 100644 index a25c08779e..0000000000 --- a/samples/boot/oauth2resourceserver-static/src/main/resources/simple.pub +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd -UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs -HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D -o2kQ+X5xK9cipRgEKwIDAQAB ------END PUBLIC KEY----- - diff --git a/samples/boot/oauth2resourceserver-webflux/README.adoc b/samples/boot/oauth2resourceserver-webflux/README.adoc deleted file mode 100644 index 75c3fd7b41..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/README.adoc +++ /dev/null @@ -1,112 +0,0 @@ -= OAuth 2.0 Resource Server Sample - -This sample demonstrates integrating Resource Server with a mock Authorization Server, though it can be modified to integrate -with your favorite Authorization Server. - -With it, you can run the integration tests or run the application as a stand-alone service to explore how you can -secure your own service with OAuth 2.0 Bearer Tokens using Spring Security. - -== 1. Running the tests - -To run the tests, do: - -```bash -./gradlew integrationTest -``` - -Or import the project into your IDE and run `ServerOAuth2ResourceServerApplicationTests` from there. - -=== What is it doing? - -By default, the tests are pointing at a mock Authorization Server instance. - -The tests are configured with a set of hard-coded tokens originally obtained from the mock Authorization Server, -and each makes a query to the Resource Server with their corresponding token. - -The Resource Server subsquently verifies with the Authorization Server and authorizes the request, returning the phrase - -```bash -Hello, subject! -``` - -where "subject" is the value of the `sub` field in the JWT returned by the Authorization Server. - -== 2. Running the app - -To run as a stand-alone application, do: - -```bash -./gradlew bootRun -``` - -Or import the project into your IDE and run `ServerOAuth2ResourceServerApplication` from there. - -Once it is up, you can use the following token: - -```bash -export TOKEN=eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjo0NjgzODA1MTI4fQ.ULEPdHG-MK5GlrTQMhgqcyug2brTIZaJIrahUeq9zaiwUSdW83fJ7W1IDd2Z3n4a25JY2uhEcoV95lMfccHR6y_2DLrNvfta22SumY9PEDF2pido54LXG6edIGgarnUbJdR4rpRe_5oRGVa8gDx8FnuZsNv6StSZHAzw5OsuevSTJ1UbJm4UfX3wiahFOQ2OI6G-r5TB2rQNdiPHuNyzG5yznUqRIZ7-GCoMqHMaC-1epKxiX8gYXRROuUYTtcMNa86wh7OVDmvwVmFioRcR58UWBRoO1XQexTtOQq_t8KYsrPZhb9gkyW8x2bAQF-d0J0EJY8JslaH6n4RBaZISww -``` - -And then make this request: - -```bash -curl -H "Authorization: Bearer $TOKEN" localhost:8080 -``` - -Which will respond with the phrase: - -```bash -Hello, subject! -``` - -where `subject` is the value of the `sub` field in the JWT returned by the Authorization Server. - -Or this: - -```bash -export TOKEN=eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0Iiwic2NvcGUiOiJtZXNzYWdlOnJlYWQiLCJleHAiOjQ2ODM4MDUxNDF9.h-j6FKRFdnTdmAueTZCdep45e6DPwqM68ZQ8doIJ1exi9YxAlbWzOwId6Bd0L5YmCmp63gGQgsBUBLzwnZQ8kLUgUOBEC3UzSWGRqMskCY9_k9pX0iomX6IfF3N0PaYs0WPC4hO1s8wfZQ-6hKQ4KigFi13G9LMLdH58PRMK0pKEvs3gCbHJuEPw-K5ORlpdnleUTQIwINafU57cmK3KocTeknPAM_L716sCuSYGvDl6xUTXO7oPdrXhS_EhxLP6KxrpI1uD4Ea_5OWTh7S0Wx5LLDfU6wBG1DowN20d374zepOIEkR-Jnmr_QlR44vmRqS5ncrF-1R0EGcPX49U6A - -curl -H "Authorization: Bearer $TOKEN" localhost:8080/message -``` - -Will respond with: - -```bash -secret message -``` - -== 2. Testing against other Authorization Servers - -_In order to use this sample, your Authorization Server must support JWTs that either use the "scope" or "scp" attribute._ - -To change the sample to point at your Authorization Server, simply find this property in the `application.yml`: - -```yaml -spring: - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: ${mockwebserver.url}/.well-known/jwks.json -``` - -And change the property to your Authorization Server's JWK set endpoint: - -```yaml -spring: - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: https://dev-123456.oktapreview.com/oauth2/default/v1/keys -``` - -And then you can run the app the same as before: - -```bash -./gradlew bootRun -``` - -Make sure to obtain valid tokens from your Authorization Server in order to play with the sample Resource Server. -To use the `/` endpoint, any valid token from your Authorization Server will do. -To use the `/message` endpoint, the token should have the `message:read` scope. diff --git a/samples/boot/oauth2resourceserver-webflux/spring-security-samples-boot-oauth2resourceserver-webflux.gradle b/samples/boot/oauth2resourceserver-webflux/spring-security-samples-boot-oauth2resourceserver-webflux.gradle deleted file mode 100644 index 0d92aef8de..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/spring-security-samples-boot-oauth2resourceserver-webflux.gradle +++ /dev/null @@ -1,16 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-oauth2-jose') - compile project(':spring-security-oauth2-client') - compile project(':spring-security-oauth2-resource-server') - - compile 'org.springframework.boot:spring-boot-starter-webflux' - compile 'com.squareup.okhttp3:mockwebserver' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' - - testCompile 'com.squareup.okhttp3:mockwebserver' -} diff --git a/samples/boot/oauth2resourceserver-webflux/src/integration-test/java/sample/ServerOAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver-webflux/src/integration-test/java/sample/ServerOAuth2ResourceServerApplicationITests.java deleted file mode 100644 index 9cbdcf2b36..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/src/integration-test/java/sample/ServerOAuth2ResourceServerApplicationITests.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.web.reactive.server.WebTestClient; - -import java.util.function.Consumer; - -import static org.hamcrest.Matchers.containsString; - -/** - * @author Rob Winch - * @since 5.1 - */ -@SpringBootTest -@AutoConfigureWebTestClient -@RunWith(SpringJUnit4ClassRunner.class) -public class ServerOAuth2ResourceServerApplicationITests { - - Consumer noScopesToken = (http) -> http.setBearerAuth("eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjo0NjgzODA1MTI4fQ.ULEPdHG-MK5GlrTQMhgqcyug2brTIZaJIrahUeq9zaiwUSdW83fJ7W1IDd2Z3n4a25JY2uhEcoV95lMfccHR6y_2DLrNvfta22SumY9PEDF2pido54LXG6edIGgarnUbJdR4rpRe_5oRGVa8gDx8FnuZsNv6StSZHAzw5OsuevSTJ1UbJm4UfX3wiahFOQ2OI6G-r5TB2rQNdiPHuNyzG5yznUqRIZ7-GCoMqHMaC-1epKxiX8gYXRROuUYTtcMNa86wh7OVDmvwVmFioRcR58UWBRoO1XQexTtOQq_t8KYsrPZhb9gkyW8x2bAQF-d0J0EJY8JslaH6n4RBaZISww"); - Consumer messageReadToken = (http) -> http.setBearerAuth("eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0Iiwic2NvcGUiOiJtZXNzYWdlOnJlYWQiLCJleHAiOjQ2ODM4MDUxNDF9.h-j6FKRFdnTdmAueTZCdep45e6DPwqM68ZQ8doIJ1exi9YxAlbWzOwId6Bd0L5YmCmp63gGQgsBUBLzwnZQ8kLUgUOBEC3UzSWGRqMskCY9_k9pX0iomX6IfF3N0PaYs0WPC4hO1s8wfZQ-6hKQ4KigFi13G9LMLdH58PRMK0pKEvs3gCbHJuEPw-K5ORlpdnleUTQIwINafU57cmK3KocTeknPAM_L716sCuSYGvDl6xUTXO7oPdrXhS_EhxLP6KxrpI1uD4Ea_5OWTh7S0Wx5LLDfU6wBG1DowN20d374zepOIEkR-Jnmr_QlR44vmRqS5ncrF-1R0EGcPX49U6A"); - - @Autowired - private WebTestClient rest; - - - @Test - public void getWhenValidBearerTokenThenAllows() { - - this.rest.get().uri("/") - .headers(this.noScopesToken) - .exchange() - .expectStatus().isOk() - .expectBody(String.class).isEqualTo("Hello, subject!"); - } - - @Test - public void getWhenValidBearerTokenThenScopedRequestsAlsoWork() { - - this.rest.get().uri("/message") - .headers(this.messageReadToken) - .exchange() - .expectStatus().isOk() - .expectBody(String.class).isEqualTo("secret message"); - } - - @Test - public void getWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethodAccess() { - - this.rest.get().uri("/message") - .headers(this.noScopesToken) - .exchange() - .expectStatus().isForbidden() - .expectHeader().value(HttpHeaders.WWW_AUTHENTICATE, containsString("Bearer error=\"insufficient_scope\"")); - } -} diff --git a/samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java b/samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java deleted file mode 100644 index 62f91d1a1f..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.boot.env; - -import org.springframework.beans.factory.DisposableBean; -import org.springframework.boot.SpringApplication; -import org.springframework.core.env.ConfigurableEnvironment; - -/** - * @author Rob Winch - */ -public class MockWebServerEnvironmentPostProcessor - implements EnvironmentPostProcessor, DisposableBean { - - private final MockWebServerPropertySource propertySource = new MockWebServerPropertySource(); - - @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, - SpringApplication application) { - environment.getPropertySources().addFirst(this.propertySource); - } - - @Override - public void destroy() throws Exception { - this.propertySource.destroy(); - } -} diff --git a/samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java b/samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java deleted file mode 100644 index 54dc2ca143..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.boot.env; - -import okhttp3.mockwebserver.Dispatcher; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import okhttp3.mockwebserver.RecordedRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.core.env.PropertySource; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; - -import java.io.IOException; - -/** - * @author Rob Winch - */ -public class MockWebServerPropertySource extends PropertySource implements - DisposableBean { - - private static final MockResponse JWKS_RESPONSE = response( - "{\"keys\":[{\"p\":\"2p-ViY7DE9ZrdWQb544m0Jp7Cv03YCSljqfim9pD4ALhObX0OrAznOiowTjwBky9JGffMwDBVSfJSD9TSU7aH2sbbfi0bZLMdekKAuimudXwUqPDxrrg0BCyvCYgLmKjbVT3zcdylWSog93CNTxGDPzauu-oc0XPNKCXnaDpNvE\",\"kty\":\"RSA\",\"q\":\"sP_QYavrpBvSJ86uoKVGj2AGl78CSsAtpf1ybSY5TwUlorXSdqapRbY69Y271b0aMLzlleUn9ZTBO1dlKV2_dw_lPADHVia8z3pxL-8sUhIXLsgj4acchMk4c9YX-sFh07xENnyZ-_TXm3llPLuL67HUfBC2eKe800TmCYVWc9U\",\"d\":\"bn1nFxCQT4KLTHqo8mo9HvHD0cRNRNdWcKNnnEQkCF6tKbt-ILRyQGP8O40axLd7CoNVG9c9p_-g4-2kwCtLJNv_STLtwfpCY7VN5o6-ZIpfTjiW6duoPrLWq64Hm_4LOBQTiZfUPcLhsuJRHbWqakj-kV_YbUyC2Ocf_dd8IAQcSrAU2SCcDebhDCWwRUFvaa9V5eq0851S9goaA-AJz-JXyePH6ZFr8JxmWkWxYZ5kdcMD-sm9ZbxE0CaEk32l4fE4hR-L8x2dDtjWA-ahKCZ091z-gV3HWtR2JOjvxoNRjxUo3UxaGiFJHWNIl0EYUJZu1Cb-5wIlEI7wPx5mwQ\",\"e\":\"AQAB\",\"use\":\"sig\",\"kid\":\"one\",\"qi\":\"qS0OK48M2CIAA6_4Wdw4EbCaAfcTLf5Oy9t5BOF_PFUKqoSpZ6JsT5H0a_4zkjt-oI969v78OTlvBKbmEyKO-KeytzHBAA5CsLmVcz0THrMSg6oXZqu66MPnvWoZN9FEN5TklPOvBFm8Bg1QZ3k-YMVaM--DLvhaYR95_mqaz50\",\"dp\":\"Too2NozLGD1XrXyhabZvy1E0EuaVFj0UHQPDLSpkZ_2g3BK6Art6T0xmE8RYtmqrKIEIdlI3IliAvyvAx_1D7zWTTRaj-xlZyqJFrnXWL7zj8UxT8PkB-r2E-ILZ3NAi1gxIWezlBTZ8M6NfObDFmbTc_3tJkN_raISo8z_ziIE\",\"dq\":\"U0yhSkY5yOsa9YcMoigGVBWSJLpNHtbg5NypjHrPv8OhWbkOSq7WvSstBkFk5AtyFvvfZLMLIkWWxxGzV0t6f1MoxBtttLrYYyCxwihiiGFhLbAdSuZ1wnxcqA9bC7UVECvrQmVTpsMs8UupfHKbQBpZ8OWAqrnuYNNtG4_4Bt0\",\"n\":\"lygtuZj0lJjqOqIWocF8Bb583QDdq-aaFg8PesOp2-EDda6GqCpL-_NZVOflNGX7XIgjsWHcPsQHsV9gWuOzSJ0iEuWvtQ6eGBP5M6m7pccLNZfwUse8Cb4Ngx3XiTlyuqM7pv0LPyppZusfEHVEdeelou7Dy9k0OQ_nJTI3b2E1WBoHC58CJ453lo4gcBm1efURN3LIVc1V9NQY_ESBKVdwqYyoJPEanURLVGRd6cQKn6YrCbbIRHjqAyqOE-z3KmgDJnPriljfR5XhSGyM9eqD9Xpy6zu_MAeMJJfSArp857zLPk-Wf5VP9STAcjyfdBIybMKnwBYr2qHMT675hQ\"}]}", - 200 - ); - - private static final MockResponse NOT_FOUND_RESPONSE = response( - "{ \"message\" : \"This mock authorization server responds to just one request: GET /.well-known/jwks.json.\" }", - 404 - ); - - /** - * Name of the random {@link PropertySource}. - */ - public static final String MOCK_WEB_SERVER_PROPERTY_SOURCE_NAME = "mockwebserver"; - - private static final String NAME = "mockwebserver.url"; - - private static final Log logger = LogFactory.getLog(MockWebServerPropertySource.class); - - private boolean started; - - public MockWebServerPropertySource() { - super(MOCK_WEB_SERVER_PROPERTY_SOURCE_NAME, new MockWebServer()); - } - - @Override - public Object getProperty(String name) { - if (!name.equals(NAME)) { - return null; - } - if (logger.isTraceEnabled()) { - logger.trace("Looking up the url for '" + name + "'"); - } - String url = getUrl(); - return url; - } - - @Override - public void destroy() throws Exception { - getSource().shutdown(); - } - - /** - * Get's the URL (i.e. "http://localhost:123456") - * @return - */ - private String getUrl() { - MockWebServer mockWebServer = getSource(); - if (!this.started) { - intializeMockWebServer(mockWebServer); - } - String url = mockWebServer.url("").url().toExternalForm(); - return url.substring(0, url.length() - 1); - } - - private void intializeMockWebServer(MockWebServer mockWebServer) { - Dispatcher dispatcher = new Dispatcher() { - @Override - public MockResponse dispatch(RecordedRequest request) { - if ("/.well-known/jwks.json".equals(request.getPath())) { - return JWKS_RESPONSE; - } - - return NOT_FOUND_RESPONSE; - } - }; - - mockWebServer.setDispatcher(dispatcher); - try { - mockWebServer.start(); - this.started = true; - } catch (IOException e) { - throw new RuntimeException("Could not start " + mockWebServer, e); - } - } - - private static MockResponse response(String body, int status) { - return new MockResponse() - .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .setResponseCode(status) - .setBody(body); - } - -} diff --git a/samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/package-info.java b/samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/package-info.java deleted file mode 100644 index 0226037822..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/src/main/java/org/springframework/boot/env/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -/** - * This provides integration of a {@link okhttp3.mockwebserver.MockWebServer} and the - * {@link org.springframework.core.env.Environment} - * @author Rob Winch - */ -package org.springframework.boot.env; diff --git a/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/OAuth2ResourceServerController.java b/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/OAuth2ResourceServerController.java deleted file mode 100644 index ea34b99e20..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/OAuth2ResourceServerController.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.oauth2.jwt.Jwt; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author Josh Cummings - */ -@RestController -public class OAuth2ResourceServerController { - - @GetMapping("/") - public String index(@AuthenticationPrincipal Jwt jwt) { - return String.format("Hello, %s!", jwt.getSubject()); - } - - @GetMapping("/message") - public String message() { - return "secret message"; - } - - @PostMapping("/message") - public String createMessage(@RequestBody String message) { - return String.format("Message was created. Content: %s", message); - } -} diff --git a/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/SecurityConfig.java b/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/SecurityConfig.java deleted file mode 100644 index d4f6429b51..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/SecurityConfig.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.context.annotation.Bean; -import org.springframework.http.HttpMethod; -import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; -import org.springframework.security.config.web.server.ServerHttpSecurity; -import org.springframework.security.web.server.SecurityWebFilterChain; - -import static org.springframework.security.config.Customizer.withDefaults; - -/** - * @author Rob Winch - * @since 5.1 - */ -@EnableWebFluxSecurity -public class SecurityConfig { - - @Bean - SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - http - .authorizeExchange((exchanges) -> - exchanges - .pathMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read") - .pathMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write") - .anyExchange().authenticated() - ) - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer - .jwt(withDefaults()) - ); - return http.build(); - } -} diff --git a/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/ServerOAuth2ResourceServerApplication.java b/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/ServerOAuth2ResourceServerApplication.java deleted file mode 100644 index c3e3575e26..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/src/main/java/sample/ServerOAuth2ResourceServerApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Rob Winch - */ -@SpringBootApplication -public class ServerOAuth2ResourceServerApplication { - - public static void main(String[] args) { - SpringApplication.run(ServerOAuth2ResourceServerApplication.class, args); - } -} diff --git a/samples/boot/oauth2resourceserver-webflux/src/main/resources/META-INF/spring.factories b/samples/boot/oauth2resourceserver-webflux/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 37b447c970..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.env.EnvironmentPostProcessor=org.springframework.boot.env.MockWebServerEnvironmentPostProcessor diff --git a/samples/boot/oauth2resourceserver-webflux/src/main/resources/application.yml b/samples/boot/oauth2resourceserver-webflux/src/main/resources/application.yml deleted file mode 100644 index 2a6d127d3f..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/src/main/resources/application.yml +++ /dev/null @@ -1,6 +0,0 @@ -spring: - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: ${mockwebserver.url}/.well-known/jwks.json diff --git a/samples/boot/oauth2resourceserver-webflux/src/test/java/sample/OAuth2ResourceServerControllerTests.java b/samples/boot/oauth2resourceserver-webflux/src/test/java/sample/OAuth2ResourceServerControllerTests.java deleted file mode 100644 index 8fc72574f1..0000000000 --- a/samples/boot/oauth2resourceserver-webflux/src/test/java/sample/OAuth2ResourceServerControllerTests.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; -import reactor.core.publisher.Mono; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.Import; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.oauth2.jwt.Jwt; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; - -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.when; -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockJwt; - -/** - * @author Josh Cummings - */ -@RunWith(SpringRunner.class) -@WebFluxTest(OAuth2ResourceServerController.class) -@Import(SecurityConfig.class) -public class OAuth2ResourceServerControllerTests { - - @Autowired - WebTestClient rest; - - @MockBean - ReactiveJwtDecoder jwtDecoder; - - @Test - public void indexGreetsAuthenticatedUser() { - this.rest.mutateWith(mockJwt().jwt((jwt) -> jwt.subject("test-subject"))) - .get().uri("/").exchange() - .expectBody(String.class).isEqualTo("Hello, test-subject!"); - } - - @Test - public void messageCanBeReadWithScopeMessageReadAuthority() { - this.rest.mutateWith(mockJwt().jwt((jwt) -> jwt.claim("scope", "message:read"))) - .get().uri("/message").exchange() - .expectBody(String.class).isEqualTo("secret message"); - - this.rest.mutateWith(mockJwt().authorities(new SimpleGrantedAuthority("SCOPE_message:read"))) - .get().uri("/message").exchange() - .expectBody(String.class).isEqualTo("secret message"); - } - - @Test - public void messageCanNotBeReadWithoutScopeMessageReadAuthority() { - this.rest.mutateWith(mockJwt()) - .get().uri("/message").exchange() - .expectStatus().isForbidden(); - } - - @Test - public void messageCanNotBeCreatedWithoutAnyScope() { - Jwt jwt = jwt().claim("scope", "").build(); - when(this.jwtDecoder.decode(anyString())).thenReturn(Mono.just(jwt)); - this.rest.post().uri("/message") - .headers((headers) -> headers.setBearerAuth(jwt.getTokenValue())) - .syncBody("Hello message").exchange() - .expectStatus().isForbidden(); - } - - @Test - public void messageCanNotBeCreatedWithScopeMessageReadAuthority() { - Jwt jwt = jwt().claim("scope", "message:read").build(); - when(this.jwtDecoder.decode(anyString())).thenReturn(Mono.just(jwt)); - this.rest.post().uri("/message") - .headers((headers) -> headers.setBearerAuth(jwt.getTokenValue())) - .syncBody("Hello message").exchange() - .expectStatus().isForbidden(); - } - - @Test - public void messageCanBeCreatedWithScopeMessageWriteAuthority() { - Jwt jwt = jwt().claim("scope", "message:write").build(); - when(this.jwtDecoder.decode(anyString())).thenReturn(Mono.just(jwt)); - this.rest.post().uri("/message") - .headers((headers) -> headers.setBearerAuth(jwt.getTokenValue())) - .syncBody("Hello message").exchange() - .expectStatus().isOk() - .expectBody(String.class).isEqualTo("Message was created. Content: Hello message"); - } - - private Jwt.Builder jwt() { - return Jwt.withTokenValue("token").header("alg", "none"); - } -} diff --git a/samples/boot/oauth2resourceserver/README.adoc b/samples/boot/oauth2resourceserver/README.adoc deleted file mode 100644 index a82747004f..0000000000 --- a/samples/boot/oauth2resourceserver/README.adoc +++ /dev/null @@ -1,126 +0,0 @@ -= OAuth 2.0 Resource Server Sample - -This sample demonstrates integrating Resource Server with a mock Authorization Server, though it can be modified to integrate -with your favorite Authorization Server. - -With it, you can run the integration tests or run the application as a stand-alone service to explore how you can -secure your own service with OAuth 2.0 Bearer Tokens using Spring Security. - -== 1. Running the tests - -To run the tests, do: - -```bash -./gradlew integrationTest -``` - -Or import the project into your IDE and run `OAuth2ResourceServerApplicationTests` from there. - -=== What is it doing? - -By default, the tests are pointing at a mock Authorization Server instance. - -The tests are configured with a set of hard-coded tokens originally obtained from the mock Authorization Server, -and each makes a query to the Resource Server with their corresponding token. - -The Resource Server subsquently verifies with the Authorization Server and authorizes the request, returning the phrase - -```bash -Hello, subject! -``` - -where "subject" is the value of the `sub` field in the JWT returned by the Authorization Server. - -== 2. Running the app - -To run as a stand-alone application, do: - -```bash -./gradlew bootRun -``` - -Or import the project into your IDE and run `OAuth2ResourceServerApplication` from there. - -Once it is up, you can use the following token: - -```bash -export TOKEN=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjoyMTY0MjQ1ODgwLCJhdXRob3JpdGllcyI6WyJST0xFX1VTRVIiXSwianRpIjoiMDFkOThlZWEtNjc0MC00OGRlLTk4ODAtYzM5ZjgyMGZiNzVlIiwiY2xpZW50X2lkIjoibm9zY29wZXMiLCJzY29wZSI6WyJub25lIl19.VOzgGLOUuQ_R2Ur1Ke41VaobddhKgUZgto7Y3AGxst7SuxLQ4LgWwdSSDRx-jRvypjsCgYPbjAYLhn9nCbfwtCitkymUKUNKdebvVAI0y8YvliWTL5S-GiJD9dN8SSsXUla9A4xB_9Mt5JAlRpQotQSCLojVSKQmjhMpQWmYAlKVjnlImoRwQFPI4w3Ijn4G4EMTKWUYRfrD0-WNT9ZYWBeza6QgV6sraP7ToRB3eQLy2p04cU40X-RHLeYCsMBfxsMMh89CJff-9tn7VDKi1hAGc_Lp9yS9ZaItJuFJTjf8S_vsjVB1nBhvdS_6IED_m_fOU52KiGSO2qL6shxHvg -``` - -And then make this request: - -```bash -curl -H "Authorization: Bearer $TOKEN" localhost:8080 -``` - -Which will respond with the phrase: - -```bash -Hello, subject! -``` - -where `subject` is the value of the `sub` field in the JWT returned by the Authorization Server. - -Or this to make a GET request to /messages: - -```bash -export TOKEN=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjoyMTY0MjQ1NjQ4LCJhdXRob3JpdGllcyI6WyJST0xFX1VTRVIiXSwianRpIjoiY2I1ZGMwNDYtMDkyMi00ZGJmLWE5MzAtOGI2M2FhZTYzZjk2IiwiY2xpZW50X2lkIjoicmVhZGVyIiwic2NvcGUiOlsibWVzc2FnZTpyZWFkIl19.Pre2ksnMiOGYWQtuIgHB0i3uTnNzD0SMFM34iyQJHK5RLlSjge08s9qHdx6uv5cZ4gZm_cB1D6f4-fLx76bCblK6mVcabbR74w_eCdSBXNXuqG-HNrOYYmmx5iJtdwx5fXPmF8TyVzsq_LvRm_LN4lWNYquT4y36Tox6ZD3feYxXvHQ3XyZn9mVKnlzv-GCwkBohCR3yPow5uVmr04qh_al52VIwKMrvJBr44igr4fTZmzwRAZmQw5rZeyep0b4nsCjadNcndHtMtYKNVuG5zbDLsB7GGvilcI9TDDnUXtwthB_3iq32DAd9x8wJmJ5K8gmX6GjZFtYzKk_zEboXoQ - -curl -H "Authorization: Bearer $TOKEN" localhost:8080/message -``` - -Will respond with: - -```bash -secret message -``` - -In order to make a POST request to /message, you can use the following request: - -```bash -export TOKEN=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjoyMTY0MjQzOTA0LCJhdXRob3JpdGllcyI6WyJST0xFX1VTRVIiXSwianRpIjoiZGI4ZjgwMzQtM2VlNy00NjBjLTk3NTEtMDJiMDA1OWI5NzA4IiwiY2xpZW50X2lkIjoid3JpdGVyIiwic2NvcGUiOlsibWVzc2FnZTp3cml0ZSJdfQ.USvpx_ntKXtchLmc93auJq0qSav6vLm4B7ItPzhrDH2xmogBP35eKeklwXK5GCb7ck1aKJV5SpguBlTCz0bZC1zAWKB6gyFIqedALPAran5QR-8WpGfl0wFqds7d8Jw3xmpUUBduRLab9hkeAhgoVgxevc8d6ITM7kRnHo5wT3VzvBU8DquedVXm5fbBnRPgG4_jOWJKbqYpqaR2z2TnZRWh3CqL82Orh1Ww1dJYF_fae1dTVV4tvN5iSndYcGxMoBaiw3kRRi6EyNxnXnt1pFtZqc1f6D9x4AHiri8_vpBp2vwG5OfQD5-rrleP_XlIB3rNQT7tu3fiqu4vUzQaEg - -curl -H "Authorization: Bearer $TOKEN" -d "my message" localhost:8080/message -``` - -Will respond this: - -```bash -Message was created. Content: my message -``` - -== 2. Testing against other Authorization Servers - -_In order to use this sample, your Authorization Server must support JWTs that either use the "scope" or "scp" attribute._ - -To change the sample to point at your Authorization Server, simply find this property in the `application.yml`: - -```yaml -spring: - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: ${mockwebserver.url}/.well-known/jwks.json -``` - -And change the property to your Authorization Server's JWK set endpoint: - -```yaml -spring: - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: https://dev-123456.oktapreview.com/oauth2/default/v1/keys -``` - -And then you can run the app the same as before: - -```bash -./gradlew bootRun -``` - -Make sure to obtain valid tokens from your Authorization Server in order to play with the sample Resource Server. -To use the `/` endpoint, any valid token from your Authorization Server will do. -To use the `/message` endpoint, the token should have the `message:read` scope. diff --git a/samples/boot/oauth2resourceserver/spring-security-samples-boot-oauth2resourceserver.gradle b/samples/boot/oauth2resourceserver/spring-security-samples-boot-oauth2resourceserver.gradle deleted file mode 100644 index 2135bb0af6..0000000000 --- a/samples/boot/oauth2resourceserver/spring-security-samples-boot-oauth2resourceserver.gradle +++ /dev/null @@ -1,13 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-oauth2-jose') - compile project(':spring-security-oauth2-resource-server') - - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'com.squareup.okhttp3:mockwebserver' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/oauth2resourceserver/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java deleted file mode 100644 index bb7de58665..0000000000 --- a/samples/boot/oauth2resourceserver/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpHeaders; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.RequestPostProcessor; - -import static org.hamcrest.Matchers.containsString; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * Integration tests for {@link OAuth2ResourceServerApplication} - * - * @author Josh Cummings - */ -@RunWith(SpringRunner.class) -@SpringBootTest -@AutoConfigureMockMvc -@ActiveProfiles("test") -public class OAuth2ResourceServerApplicationITests { - - String noScopesToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjoyMTY0MjQ1ODgwLCJhdXRob3JpdGllcyI6WyJST0xFX1VTRVIiXSwianRpIjoiMDFkOThlZWEtNjc0MC00OGRlLTk4ODAtYzM5ZjgyMGZiNzVlIiwiY2xpZW50X2lkIjoibm9zY29wZXMiLCJzY29wZSI6WyJub25lIl19.VOzgGLOUuQ_R2Ur1Ke41VaobddhKgUZgto7Y3AGxst7SuxLQ4LgWwdSSDRx-jRvypjsCgYPbjAYLhn9nCbfwtCitkymUKUNKdebvVAI0y8YvliWTL5S-GiJD9dN8SSsXUla9A4xB_9Mt5JAlRpQotQSCLojVSKQmjhMpQWmYAlKVjnlImoRwQFPI4w3Ijn4G4EMTKWUYRfrD0-WNT9ZYWBeza6QgV6sraP7ToRB3eQLy2p04cU40X-RHLeYCsMBfxsMMh89CJff-9tn7VDKi1hAGc_Lp9yS9ZaItJuFJTjf8S_vsjVB1nBhvdS_6IED_m_fOU52KiGSO2qL6shxHvg"; - String messageReadToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjoyMTY0MjQ1NjQ4LCJhdXRob3JpdGllcyI6WyJST0xFX1VTRVIiXSwianRpIjoiY2I1ZGMwNDYtMDkyMi00ZGJmLWE5MzAtOGI2M2FhZTYzZjk2IiwiY2xpZW50X2lkIjoicmVhZGVyIiwic2NvcGUiOlsibWVzc2FnZTpyZWFkIl19.Pre2ksnMiOGYWQtuIgHB0i3uTnNzD0SMFM34iyQJHK5RLlSjge08s9qHdx6uv5cZ4gZm_cB1D6f4-fLx76bCblK6mVcabbR74w_eCdSBXNXuqG-HNrOYYmmx5iJtdwx5fXPmF8TyVzsq_LvRm_LN4lWNYquT4y36Tox6ZD3feYxXvHQ3XyZn9mVKnlzv-GCwkBohCR3yPow5uVmr04qh_al52VIwKMrvJBr44igr4fTZmzwRAZmQw5rZeyep0b4nsCjadNcndHtMtYKNVuG5zbDLsB7GGvilcI9TDDnUXtwthB_3iq32DAd9x8wJmJ5K8gmX6GjZFtYzKk_zEboXoQ"; - String messageWriteToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjoyMTY0MjQzOTA0LCJhdXRob3JpdGllcyI6WyJST0xFX1VTRVIiXSwianRpIjoiZGI4ZjgwMzQtM2VlNy00NjBjLTk3NTEtMDJiMDA1OWI5NzA4IiwiY2xpZW50X2lkIjoid3JpdGVyIiwic2NvcGUiOlsibWVzc2FnZTp3cml0ZSJdfQ.USvpx_ntKXtchLmc93auJq0qSav6vLm4B7ItPzhrDH2xmogBP35eKeklwXK5GCb7ck1aKJV5SpguBlTCz0bZC1zAWKB6gyFIqedALPAran5QR-8WpGfl0wFqds7d8Jw3xmpUUBduRLab9hkeAhgoVgxevc8d6ITM7kRnHo5wT3VzvBU8DquedVXm5fbBnRPgG4_jOWJKbqYpqaR2z2TnZRWh3CqL82Orh1Ww1dJYF_fae1dTVV4tvN5iSndYcGxMoBaiw3kRRi6EyNxnXnt1pFtZqc1f6D9x4AHiri8_vpBp2vwG5OfQD5-rrleP_XlIB3rNQT7tu3fiqu4vUzQaEg"; - - @Autowired - MockMvc mvc; - - @Test - public void performWhenValidBearerTokenThenAllows() - throws Exception { - - this.mvc.perform(get("/").with(bearerToken(this.noScopesToken))) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("Hello, subject!"))); - } - - @Test - public void performWhenValidBearerTokenThenScopedRequestsAlsoWork() - throws Exception { - - this.mvc.perform(get("/message").with(bearerToken(this.messageReadToken))) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("secret message"))); - } - - @Test - public void performWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethodAccess() - throws Exception { - - this.mvc.perform(get("/message").with(bearerToken(this.noScopesToken))) - .andExpect(status().isForbidden()) - .andExpect(header().string(HttpHeaders.WWW_AUTHENTICATE, - containsString("Bearer error=\"insufficient_scope\""))); - } - - @Test - public void performPostWhenValidBearerTokenThenScopedRequestsAlsoWork() - throws Exception { - - this.mvc.perform(post("/message").content("example message") - .with(bearerToken(this.messageWriteToken))) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("Message was created"))); - } - - @Test - public void performPostWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethodAccess() - throws Exception { - - this.mvc.perform(post("/message").content("Example message") - .with(bearerToken(this.messageReadToken))) - .andExpect(status().isForbidden()) - .andExpect(header().string(HttpHeaders.WWW_AUTHENTICATE, - containsString("Bearer error=\"insufficient_scope\""))); - } - - private static class BearerTokenRequestPostProcessor implements RequestPostProcessor { - private String token; - - BearerTokenRequestPostProcessor(String token) { - this.token = token; - } - - @Override - public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { - request.addHeader("Authorization", "Bearer " + this.token); - return request; - } - } - - private static BearerTokenRequestPostProcessor bearerToken(String token) { - return new BearerTokenRequestPostProcessor(token); - } -} diff --git a/samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java b/samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java deleted file mode 100644 index 62f91d1a1f..0000000000 --- a/samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.boot.env; - -import org.springframework.beans.factory.DisposableBean; -import org.springframework.boot.SpringApplication; -import org.springframework.core.env.ConfigurableEnvironment; - -/** - * @author Rob Winch - */ -public class MockWebServerEnvironmentPostProcessor - implements EnvironmentPostProcessor, DisposableBean { - - private final MockWebServerPropertySource propertySource = new MockWebServerPropertySource(); - - @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, - SpringApplication application) { - environment.getPropertySources().addFirst(this.propertySource); - } - - @Override - public void destroy() throws Exception { - this.propertySource.destroy(); - } -} diff --git a/samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java b/samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java deleted file mode 100644 index b90ad29b91..0000000000 --- a/samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.boot.env; - -import okhttp3.mockwebserver.Dispatcher; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import okhttp3.mockwebserver.RecordedRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.core.env.PropertySource; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; - -import java.io.IOException; - -/** - * @author Rob Winch - */ -public class MockWebServerPropertySource extends PropertySource implements - DisposableBean { - - private static final MockResponse JWKS_RESPONSE = response( - "{ \"keys\": [ { \"kty\": \"RSA\", \"e\": \"AQAB\", \"n\": \"jvBtqsGCOmnYzwe_-HvgOqlKk6HPiLEzS6uCCcnVkFXrhnkPMZ-uQXTR0u-7ZklF0XC7-AMW8FQDOJS1T7IyJpCyeU4lS8RIf_Z8RX51gPGnQWkRvNw61RfiSuSA45LR5NrFTAAGoXUca_lZnbqnl0td-6hBDVeHYkkpAsSck1NPhlcsn-Pvc2Vleui_Iy1U2mzZCM1Vx6Dy7x9IeP_rTNtDhULDMFbB_JYs-Dg6Zd5Ounb3mP57tBGhLYN7zJkN1AAaBYkElsc4GUsGsUWKqgteQSXZorpf6HdSJsQMZBDd7xG8zDDJ28hGjJSgWBndRGSzQEYU09Xbtzk-8khPuw\" } ] }", - 200 - ); - - private static final MockResponse NOT_FOUND_RESPONSE = response( - "{ \"message\" : \"This mock authorization server responds to just one request: GET /.well-known/jwks.json.\" }", - 404 - ); - - /** - * Name of the random {@link PropertySource}. - */ - public static final String MOCK_WEB_SERVER_PROPERTY_SOURCE_NAME = "mockwebserver"; - - private static final String NAME = "mockwebserver.url"; - - private static final Log logger = LogFactory.getLog(MockWebServerPropertySource.class); - - private boolean started; - - public MockWebServerPropertySource() { - super(MOCK_WEB_SERVER_PROPERTY_SOURCE_NAME, new MockWebServer()); - } - - @Override - public Object getProperty(String name) { - if (!name.equals(NAME)) { - return null; - } - if (logger.isTraceEnabled()) { - logger.trace("Looking up the url for '" + name + "'"); - } - String url = getUrl(); - return url; - } - - @Override - public void destroy() throws Exception { - getSource().shutdown(); - } - - /** - * Get's the URL (i.e. "http://localhost:123456") - * @return - */ - private String getUrl() { - MockWebServer mockWebServer = getSource(); - if (!this.started) { - intializeMockWebServer(mockWebServer); - } - String url = mockWebServer.url("").url().toExternalForm(); - return url.substring(0, url.length() - 1); - } - - private void intializeMockWebServer(MockWebServer mockWebServer) { - Dispatcher dispatcher = new Dispatcher() { - @Override - public MockResponse dispatch(RecordedRequest request) { - if ("/.well-known/jwks.json".equals(request.getPath())) { - return JWKS_RESPONSE; - } - - return NOT_FOUND_RESPONSE; - } - }; - - mockWebServer.setDispatcher(dispatcher); - try { - mockWebServer.start(); - this.started = true; - } catch (IOException e) { - throw new RuntimeException("Could not start " + mockWebServer, e); - } - } - - private static MockResponse response(String body, int status) { - return new MockResponse() - .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .setResponseCode(status) - .setBody(body); - } - -} diff --git a/samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/package-info.java b/samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/package-info.java deleted file mode 100644 index 0226037822..0000000000 --- a/samples/boot/oauth2resourceserver/src/main/java/org/springframework/boot/env/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -/** - * This provides integration of a {@link okhttp3.mockwebserver.MockWebServer} and the - * {@link org.springframework.core.env.Environment} - * @author Rob Winch - */ -package org.springframework.boot.env; diff --git a/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerApplication.java b/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerApplication.java deleted file mode 100644 index a0841c00f3..0000000000 --- a/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Josh Cummings - */ -@SpringBootApplication -public class OAuth2ResourceServerApplication { - - public static void main(String[] args) { - SpringApplication.run(OAuth2ResourceServerApplication.class, args); - } -} diff --git a/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerController.java b/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerController.java deleted file mode 100644 index c761078dd8..0000000000 --- a/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerController.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.oauth2.jwt.Jwt; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author Josh Cummings - */ -@RestController -public class OAuth2ResourceServerController { - - @GetMapping("/") - public String index(@AuthenticationPrincipal Jwt jwt) { - return String.format("Hello, %s!", jwt.getSubject()); - } - - @GetMapping("/message") - public String message() { - return "secret message"; - } - - @PostMapping("/message") - public String createMessage(@RequestBody String message) { - return String.format("Message was created. Content: %s", message); - } -} diff --git a/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java b/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java deleted file mode 100644 index d7e157cfc6..0000000000 --- a/samples/boot/oauth2resourceserver/src/main/java/sample/OAuth2ResourceServerSecurityConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.http.HttpMethod; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer; -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; - -/** - * @author Josh Cummings - */ -@EnableWebSecurity -public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfigurerAdapter { - - @Value("${spring.security.oauth2.resourceserver.jwt.jwk-set-uri}") String jwkSetUri; - - @Override - protected void configure(HttpSecurity http) throws Exception { - // @formatter:off - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .antMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read") - .antMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write") - .anyRequest().authenticated() - ) - .oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt); - // @formatter:on - } - - @Bean - JwtDecoder jwtDecoder() { - return NimbusJwtDecoder.withJwkSetUri(this.jwkSetUri).build(); - } -} diff --git a/samples/boot/oauth2resourceserver/src/main/resources/META-INF/spring.factories b/samples/boot/oauth2resourceserver/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 37b447c970..0000000000 --- a/samples/boot/oauth2resourceserver/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.env.EnvironmentPostProcessor=org.springframework.boot.env.MockWebServerEnvironmentPostProcessor diff --git a/samples/boot/oauth2resourceserver/src/main/resources/application.yml b/samples/boot/oauth2resourceserver/src/main/resources/application.yml deleted file mode 100644 index 2a6d127d3f..0000000000 --- a/samples/boot/oauth2resourceserver/src/main/resources/application.yml +++ /dev/null @@ -1,6 +0,0 @@ -spring: - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: ${mockwebserver.url}/.well-known/jwks.json diff --git a/samples/boot/oauth2resourceserver/src/test/java/sample/OAuth2ResourceServerControllerTests.java b/samples/boot/oauth2resourceserver/src/test/java/sample/OAuth2ResourceServerControllerTests.java deleted file mode 100644 index 565212b073..0000000000 --- a/samples/boot/oauth2resourceserver/src/test/java/sample/OAuth2ResourceServerControllerTests.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; - -import static org.hamcrest.CoreMatchers.is; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.jwt; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * - * @author Jérôme Wacongne <ch4mp@c4-soft.com> - * @author Josh Cummings - * @since 5.2.0 - * - */ -@RunWith(SpringRunner.class) -@WebMvcTest(OAuth2ResourceServerController.class) -public class OAuth2ResourceServerControllerTests { - - @Autowired - MockMvc mockMvc; - - @Test - public void indexGreetsAuthenticatedUser() throws Exception { - mockMvc.perform(get("/").with(jwt().jwt((jwt) -> jwt.subject("ch4mpy")))) - .andExpect(content().string(is("Hello, ch4mpy!"))); - } - - @Test - public void messageCanBeReadWithScopeMessageReadAuthority() throws Exception { - mockMvc.perform(get("/message").with(jwt().jwt((jwt) -> jwt.claim("scope", "message:read")))) - .andExpect(content().string(is("secret message"))); - - mockMvc.perform(get("/message") - .with(jwt().authorities(new SimpleGrantedAuthority(("SCOPE_message:read"))))) - .andExpect(content().string(is("secret message"))); - } - - @Test - public void messageCanNotBeReadWithoutScopeMessageReadAuthority() throws Exception { - mockMvc.perform(get("/message").with(jwt())) - .andExpect(status().isForbidden()); - } - - @Test - public void messageCanNotBeCreatedWithoutAnyScope() throws Exception { - mockMvc.perform(post("/message") - .content("Hello message") - .with(jwt())) - .andExpect(status().isForbidden()); - } - - @Test - public void messageCanNotBeCreatedWithScopeMessageReadAuthority() throws Exception { - mockMvc.perform(post("/message") - .content("Hello message") - .with(jwt().jwt((jwt) -> jwt.claim("scope", "message:read")))) - .andExpect(status().isForbidden()); - } - - @Test - public void messageCanBeCreatedWithScopeMessageWriteAuthority() - throws Exception { - mockMvc.perform(post("/message") - .content("Hello message") - .with(jwt().jwt((jwt) -> jwt.claim("scope", "message:write")))) - .andExpect(status().isOk()) - .andExpect(content().string(is("Message was created. Content: Hello message"))); - } -} diff --git a/samples/boot/oauth2webclient-webflux/README.adoc b/samples/boot/oauth2webclient-webflux/README.adoc deleted file mode 100644 index ea984aa684..0000000000 --- a/samples/boot/oauth2webclient-webflux/README.adoc +++ /dev/null @@ -1,63 +0,0 @@ -= OAuth 2.0 WebClient (WebFlux) Sample - -== GitHub Repositories - -This guide provides instructions on setting up the sample application, which leverages WebClient OAuth2 integration to display a list of public GitHub repositories that are accessible to the authenticated user. - -This includes repositories owned by the authenticated user, repositories where the authenticated user is a collaborator, and repositories that the authenticated user has access to through an organization membership. - -The following sections provide detailed steps for setting up the sample and covers the following topics: - -* <> -* <> -* <> - -[[github-register-application]] -=== Register OAuth application - -To use GitHub's OAuth 2.0 authorization system, you must https://github.com/settings/applications/new[Register a new OAuth application]. - -When registering the OAuth application, ensure the *Authorization callback URL* is set to `http://localhost:8080/login/oauth2/code/client-id`. - -The Authorization callback URL (redirect URI) is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with GitHub and have granted access to the OAuth application on the _Authorize application_ page. - -[[github-application-config]] -=== Configure application.yml - -Now that you have a new OAuth application with GitHub, you need to configure the sample to use the OAuth application for the _authorization code grant flow_. -To do so: - -. Go to `application.yml` and set the following configuration: -+ -[source,yaml] ----- -spring: - security: - oauth2: - client: - registration: <1> - client-id: <2> - client-id: replace-with-client-id - client-secret: replace-with-client-secret - provider: github - scope: read:user,public_repo ----- -+ -.OAuth Client properties -==== -<1> `spring.security.oauth2.client.registration` is the base property prefix for OAuth Client properties. -<2> Following the base property prefix is the ID for the `ClientRegistration`, which is github. -==== - -. Replace the values in the `client-id` and `client-secret` property with the OAuth 2.0 credentials you created earlier. - -[[github-boot-application]] -=== Boot up the application - -Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ form login page. -Log in using *'user'* (username) and *'password'* (password) or click the link to authenticate with GitHub and then you'll be redirected to GitHub for authentication. - -After authenticating with your GitHub credentials, the next page presented to you is "Authorize application". -This page will ask you to *Authorize* the application you created in the previous step. -Click _Authorize application_ to allow the OAuth application to access and display your public repository information. diff --git a/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle b/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle deleted file mode 100644 index 286f80a581..0000000000 --- a/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle +++ /dev/null @@ -1,15 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-oauth2-client') - compile project(':spring-security-oauth2-jose') - compile 'org.springframework.boot:spring-boot-starter-thymeleaf' - compile 'org.springframework.boot:spring-boot-starter-webflux' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' - compile 'io.projectreactor.netty:reactor-netty' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile 'com.squareup.okhttp3:mockwebserver' -} diff --git a/samples/boot/oauth2webclient-webflux/src/main/java/sample/OAuth2WebClientWebFluxApplication.java b/samples/boot/oauth2webclient-webflux/src/main/java/sample/OAuth2WebClientWebFluxApplication.java deleted file mode 100644 index cdd6416f93..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/main/java/sample/OAuth2WebClientWebFluxApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Joe Grandja - */ -@SpringBootApplication -public class OAuth2WebClientWebFluxApplication { - - public static void main(String[] args) { - SpringApplication.run(OAuth2WebClientWebFluxApplication.class, args); - } -} diff --git a/samples/boot/oauth2webclient-webflux/src/main/java/sample/config/SecurityConfig.java b/samples/boot/oauth2webclient-webflux/src/main/java/sample/config/SecurityConfig.java deleted file mode 100644 index 33fb8b7867..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/main/java/sample/config/SecurityConfig.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; -import org.springframework.security.config.web.server.ServerHttpSecurity; -import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.web.server.SecurityWebFilterChain; - -import static org.springframework.security.config.Customizer.withDefaults; - -/** - * @author Rob Winch - */ -@EnableWebFluxSecurity -public class SecurityConfig { - - @Bean - SecurityWebFilterChain configure(ServerHttpSecurity http) { - http - .authorizeExchange((exchanges) -> - exchanges - .pathMatchers("/", "/public/**").permitAll() - .anyExchange().authenticated() - ) - .oauth2Login(withDefaults()) - .formLogin(withDefaults()) - .oauth2Client(withDefaults()); - return http.build(); - } - - @Bean - MapReactiveUserDetailsService userDetailsService() { - UserDetails userDetails = User.withDefaultPasswordEncoder() - .username("user") - .password("password") - .roles("USER") - .build(); - return new MapReactiveUserDetailsService(userDetails); - } -} diff --git a/samples/boot/oauth2webclient-webflux/src/main/java/sample/config/WebClientConfig.java b/samples/boot/oauth2webclient-webflux/src/main/java/sample/config/WebClientConfig.java deleted file mode 100644 index 6016aa2ef5..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/main/java/sample/config/WebClientConfig.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.config; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.oauth2.client.ReactiveOAuth2AuthorizedClientManager; -import org.springframework.security.oauth2.client.ReactiveOAuth2AuthorizedClientProvider; -import org.springframework.security.oauth2.client.ReactiveOAuth2AuthorizedClientProviderBuilder; -import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository; -import org.springframework.security.oauth2.client.web.DefaultReactiveOAuth2AuthorizedClientManager; -import org.springframework.security.oauth2.client.web.reactive.function.client.ServerOAuth2AuthorizedClientExchangeFilterFunction; -import org.springframework.security.oauth2.client.web.server.ServerOAuth2AuthorizedClientRepository; -import org.springframework.web.reactive.function.client.WebClient; - -/** - * @author Rob Winch - * @since 5.1 - */ -@Configuration -public class WebClientConfig { - - @Value("${resource-uri}") String uri; - - @Bean - WebClient webClient(ReactiveOAuth2AuthorizedClientManager authorizedClientManager) { - ServerOAuth2AuthorizedClientExchangeFilterFunction oauth = - new ServerOAuth2AuthorizedClientExchangeFilterFunction(authorizedClientManager); - oauth.setDefaultOAuth2AuthorizedClient(true); - return WebClient.builder() - .baseUrl(this.uri) - .filter(oauth) - .build(); - } - - @Bean - ReactiveOAuth2AuthorizedClientManager authorizedClientManager( - ReactiveClientRegistrationRepository clientRegistrationRepository, - ServerOAuth2AuthorizedClientRepository authorizedClientRepository) { - - ReactiveOAuth2AuthorizedClientProvider authorizedClientProvider = - ReactiveOAuth2AuthorizedClientProviderBuilder.builder() - .authorizationCode() - .refreshToken() - .clientCredentials() - .password() - .build(); - DefaultReactiveOAuth2AuthorizedClientManager authorizedClientManager = - new DefaultReactiveOAuth2AuthorizedClientManager( - clientRegistrationRepository, authorizedClientRepository); - authorizedClientManager.setAuthorizedClientProvider(authorizedClientProvider); - - return authorizedClientManager; - } -} diff --git a/samples/boot/oauth2webclient-webflux/src/main/java/sample/web/IndexController.java b/samples/boot/oauth2webclient-webflux/src/main/java/sample/web/IndexController.java deleted file mode 100644 index e1e0035ef1..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/main/java/sample/web/IndexController.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.web; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @author Rob Winch - */ -@Controller -public class IndexController { - @GetMapping("/") - String index() { - return "index"; - } -} diff --git a/samples/boot/oauth2webclient-webflux/src/main/java/sample/web/OAuth2WebClientController.java b/samples/boot/oauth2webclient-webflux/src/main/java/sample/web/OAuth2WebClientController.java deleted file mode 100644 index a1ddae90aa..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/main/java/sample/web/OAuth2WebClientController.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.web; - -import reactor.core.publisher.Mono; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.reactive.function.client.WebClient; - -import static org.springframework.security.oauth2.client.web.reactive.function.client.ServerOAuth2AuthorizedClientExchangeFilterFunction.clientRegistrationId; - -/** - * @author Joe Grandja - * @author Rob Winch - */ -@Controller -@RequestMapping(path = {"/webclient", "/public/webclient"}) -public class OAuth2WebClientController { - private final WebClient webClient; - - public OAuth2WebClientController(WebClient webClient) { - this.webClient = webClient; - } - - @GetMapping("/explicit") - String explicit(Model model) { - Mono body = this.webClient - .get() - .attributes(clientRegistrationId("client-id")) - .retrieve() - .bodyToMono(String.class); - model.addAttribute("body", body); - return "response"; - } - - @GetMapping("/implicit") - String implicit(Model model) { - Mono body = this.webClient - .get() - .retrieve() - .bodyToMono(String.class); - model.addAttribute("body", body); - return "response"; - } -} diff --git a/samples/boot/oauth2webclient-webflux/src/main/java/sample/web/RegisteredOAuth2AuthorizedClientController.java b/samples/boot/oauth2webclient-webflux/src/main/java/sample/web/RegisteredOAuth2AuthorizedClientController.java deleted file mode 100644 index 558277394f..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/main/java/sample/web/RegisteredOAuth2AuthorizedClientController.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.web; - -import reactor.core.publisher.Mono; - -import org.springframework.security.oauth2.client.OAuth2AuthorizedClient; -import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.reactive.function.client.WebClient; - -import static org.springframework.security.oauth2.client.web.reactive.function.client.ServerOAuth2AuthorizedClientExchangeFilterFunction.oauth2AuthorizedClient; - -/** - * @author Joe Grandja - * @author Rob Winch - */ -@Controller -@RequestMapping(path = {"/annotation", "/public/annotation"}) -public class RegisteredOAuth2AuthorizedClientController { - - private final WebClient webClient; - - public RegisteredOAuth2AuthorizedClientController(WebClient webClient) { - this.webClient = webClient; - } - - @GetMapping("/explicit") - String explicit(Model model, @RegisteredOAuth2AuthorizedClient("client-id") OAuth2AuthorizedClient authorizedClient) { - Mono body = this.webClient - .get() - .attributes(oauth2AuthorizedClient(authorizedClient)) - .retrieve() - .bodyToMono(String.class); - model.addAttribute("body", body); - return "response"; - } - - @GetMapping("/implicit") - String implicit(Model model, @RegisteredOAuth2AuthorizedClient OAuth2AuthorizedClient authorizedClient) { - Mono body = this.webClient - .get() - .attributes(oauth2AuthorizedClient(authorizedClient)) - .retrieve() - .bodyToMono(String.class); - model.addAttribute("body", body); - return "response"; - } -} diff --git a/samples/boot/oauth2webclient-webflux/src/main/resources/application.yml b/samples/boot/oauth2webclient-webflux/src/main/resources/application.yml deleted file mode 100644 index 8528a06d0d..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/main/resources/application.yml +++ /dev/null @@ -1,21 +0,0 @@ -logging: - level: - root: INFO - org.springframework.web: INFO - org.springframework.security: INFO -# org.springframework.boot.autoconfigure: DEBUG - -spring: - thymeleaf: - cache: false - security: - oauth2: - client: - registration: - client-id: - client-id: replace-with-client-id - client-secret: replace-with-client-secret - provider: github - scope: read:user,public_repo - -resource-uri: https://api.github.com/user/repos diff --git a/samples/boot/oauth2webclient-webflux/src/main/resources/templates/index.html b/samples/boot/oauth2webclient-webflux/src/main/resources/templates/index.html deleted file mode 100644 index 7787a75dd7..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/main/resources/templates/index.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - OAuth2 WebClient Showcase - - - -Log Out -

Examples

- -

@RegisteredOAuth2AuthorizedClient

-

-Examples on RegisteredOAuth2AuthorizedClientController -

Authenticated

-
    -
  • Explicit - Explicitly provide a Client Registration Id
    • -
  • - Implicit - Use the currently logged in user's OAuth Token. This will - only work if the user authenticates with oauth2Login and the token provided is the correct token provided at - log in is authorized.
    • -
-

Public

-
    -
  • Explicit - Explicitly provide a Client Registration Id
    • -
  • - Implicit - This will fail if the user is not authenticated. - Since it is mapped to permitAll, it is going to fail unless the user already took an action to log in and then - authenticates with oauth2Login()
    • -
- -

ServerOAuth2AuthorizedClientExchangeFilterFunction

-

- Examples on OAuth2WebClientController that demonstrate how to use ServerOAuth2AuthorizedClientExchangeFilterFunction -

Authenticated

-
    -
  • Explicit - Explicitly provide a Client Registration Id
    • -
  • - Implicit - Use the currently logged in user's OAuth Token. This will - only work if the user authenticates with oauth2Login and the token provided is the correct token provided at - log in is authorized.
    • -
-

Public

-
    -
  • Explicit - Explicitly provide a Client Registration Id
    • -
  • - Implicit - This will fail if the user is not authenticated. - Since it is mapped to permitAll, it is going to fail unless the user already took an action to log in and then - authenticates with oauth2Login()
    • -
- - diff --git a/samples/boot/oauth2webclient-webflux/src/main/resources/templates/response.html b/samples/boot/oauth2webclient-webflux/src/main/resources/templates/response.html deleted file mode 100644 index 210c18c29a..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/main/resources/templates/response.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - OAuth2 WebClient Showcase - - - -Back -

Response

-
- - - diff --git a/samples/boot/oauth2webclient-webflux/src/test/java/sample/OAuth2WebClientControllerTests.java b/samples/boot/oauth2webclient-webflux/src/test/java/sample/OAuth2WebClientControllerTests.java deleted file mode 100644 index 52445dd212..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/test/java/sample/OAuth2WebClientControllerTests.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import org.junit.AfterClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import sample.config.SecurityConfig; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; -import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest; -import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Import; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; -import org.springframework.web.reactive.function.client.WebClient; - -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockOAuth2Client; -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockOAuth2Login; - -@WebFluxTest -@Import(SecurityConfig.class) -@AutoConfigureWebTestClient -@RunWith(SpringRunner.class) -public class OAuth2WebClientControllerTests { - private static MockWebServer web = new MockWebServer(); - - @Autowired - private WebTestClient client; - - @AfterClass - public static void shutdown() throws Exception { - web.shutdown(); - } - - @Test - public void explicitWhenAuthenticatedThenUsesClientIdRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.client.mutateWith(mockOAuth2Login()) - .mutateWith(mockOAuth2Client("client-id")) - .get().uri("/webclient/explicit") - .exchange() - .expectStatus().isOk(); - } - - @Test - public void implicitWhenAuthenticatedThenUsesDefaultRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.client.mutateWith(mockOAuth2Login()) - .get().uri("/webclient/implicit") - .exchange() - .expectStatus().isOk(); - } - - @Test - public void publicExplicitWhenAuthenticatedThenUsesClientIdRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.client.mutateWith(mockOAuth2Client("client-id")) - .get().uri("/public/webclient/explicit") - .exchange() - .expectStatus().isOk(); - } - - @Test - public void publicImplicitWhenAuthenticatedThenUsesDefaultRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.client.mutateWith(mockOAuth2Login()) - .get().uri("/public/webclient/implicit") - .exchange() - .expectStatus().isOk(); - } - - @TestConfiguration - static class WebClientConfig { - @Bean - WebClient web() { - return WebClient.create(web.url("/").toString()); - } - } -} diff --git a/samples/boot/oauth2webclient-webflux/src/test/java/sample/OAuth2WebClientWebFluxApplicationTests.java b/samples/boot/oauth2webclient-webflux/src/test/java/sample/OAuth2WebClientWebFluxApplicationTests.java deleted file mode 100644 index 657a6f7a16..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/test/java/sample/OAuth2WebClientWebFluxApplicationTests.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; - -/** - * @author Rob Winch - */ -@SpringBootTest -@AutoConfigureWebTestClient -@RunWith(SpringRunner.class) -public class OAuth2WebClientWebFluxApplicationTests { - @Autowired - private WebTestClient client; - - @Test - public void annotationExplicitWhenNotAuthenticatedThenLoginRequested() { - this.client.get().uri("/annotation/explicit") - .exchange() - .expectStatus().is3xxRedirection(); - } -} diff --git a/samples/boot/oauth2webclient-webflux/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java b/samples/boot/oauth2webclient-webflux/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java deleted file mode 100644 index 32fc9095b7..0000000000 --- a/samples/boot/oauth2webclient-webflux/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import org.junit.AfterClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import sample.config.SecurityConfig; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; -import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest; -import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Import; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; -import org.springframework.web.reactive.function.client.WebClient; - -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockOAuth2Client; -import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockOAuth2Login; - -@WebFluxTest -@Import(SecurityConfig.class) -@AutoConfigureWebTestClient -@RunWith(SpringRunner.class) -public class RegisteredOAuth2AuthorizedClientControllerTests { - private static MockWebServer web = new MockWebServer(); - - @Autowired - private WebTestClient client; - - @AfterClass - public static void shutdown() throws Exception { - web.shutdown(); - } - - @Test - public void annotationExplicitWhenAuthenticatedThenUsesClientIdRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.client.mutateWith(mockOAuth2Login()) - .mutateWith(mockOAuth2Client("client-id")) - .get().uri("/annotation/explicit") - .exchange() - .expectStatus().isOk(); - } - - @Test - public void annotationImplicitWhenAuthenticatedThenUsesDefaultRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.client.mutateWith(mockOAuth2Login()) - .get().uri("/annotation/implicit") - .exchange() - .expectStatus().isOk(); - } - - @Test - public void publicAnnotationExplicitWhenAuthenticatedThenUsesClientIdRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.client.mutateWith(mockOAuth2Client("client-id")) - .get().uri("/public/annotation/explicit") - .exchange() - .expectStatus().isOk(); - } - - @Test - public void publicAnnotationImplicitWhenAuthenticatedThenUsesDefaultRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.client.mutateWith(mockOAuth2Login()) - .get().uri("/public/annotation/implicit") - .exchange() - .expectStatus().isOk(); - } - - @TestConfiguration - static class WebClientConfig { - @Bean - WebClient web() { - return WebClient.create(web.url("/").toString()); - } - } -} diff --git a/samples/boot/oauth2webclient/README.adoc b/samples/boot/oauth2webclient/README.adoc deleted file mode 100644 index b234f34f7e..0000000000 --- a/samples/boot/oauth2webclient/README.adoc +++ /dev/null @@ -1,63 +0,0 @@ -= OAuth 2.0 WebClient (Servlet) Sample - -== GitHub Repositories - -This guide provides instructions on setting up the sample application, which leverages WebClient OAuth2 integration to display a list of public GitHub repositories that are accessible to the authenticated user. - -This includes repositories owned by the authenticated user, repositories where the authenticated user is a collaborator, and repositories that the authenticated user has access to through an organization membership. - -The following sections provide detailed steps for setting up the sample and covers the following topics: - -* <> -* <> -* <> - -[[github-register-application]] -=== Register OAuth application - -To use GitHub's OAuth 2.0 authorization system, you must https://github.com/settings/applications/new[Register a new OAuth application]. - -When registering the OAuth application, ensure the *Authorization callback URL* is set to `http://localhost:8080/login/oauth2/code/client-id`. - -The Authorization callback URL (redirect URI) is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with GitHub and have granted access to the OAuth application on the _Authorize application_ page. - -[[github-application-config]] -=== Configure application.yml - -Now that you have a new OAuth application with GitHub, you need to configure the sample to use the OAuth application for the _authorization code grant flow_. -To do so: - -. Go to `application.yml` and set the following configuration: -+ -[source,yaml] ----- -spring: - security: - oauth2: - client: - registration: <1> - client-id: <2> - client-id: replace-with-client-id - client-secret: replace-with-client-secret - provider: github - scope: read:user,public_repo ----- -+ -.OAuth Client properties -==== -<1> `spring.security.oauth2.client.registration` is the base property prefix for OAuth Client properties. -<2> Following the base property prefix is the ID for the `ClientRegistration`, which is github. -==== - -. Replace the values in the `client-id` and `client-secret` property with the OAuth 2.0 credentials you created earlier. - -[[github-boot-application]] -=== Boot up the application - -Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ form login page. -Log in using *'user'* (username) and *'password'* (password) or click the link to authenticate with GitHub and then you'll be redirected to GitHub for authentication. - -After authenticating with your GitHub credentials, the next page presented to you is "Authorize application". -This page will ask you to *Authorize* the application you created in the previous step. -Click _Authorize application_ to allow the OAuth application to access and display your public repository information. diff --git a/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle b/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle deleted file mode 100644 index f65d82709c..0000000000 --- a/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle +++ /dev/null @@ -1,16 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-oauth2-client') - compile project(':spring-security-oauth2-jose') - compile 'org.springframework:spring-webflux' - compile 'org.springframework.boot:spring-boot-starter-thymeleaf' - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' - compile 'io.projectreactor.netty:reactor-netty' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile 'com.squareup.okhttp3:mockwebserver' -} diff --git a/samples/boot/oauth2webclient/src/main/java/sample/OAuth2WebClientApplication.java b/samples/boot/oauth2webclient/src/main/java/sample/OAuth2WebClientApplication.java deleted file mode 100644 index 4c4a6b7de1..0000000000 --- a/samples/boot/oauth2webclient/src/main/java/sample/OAuth2WebClientApplication.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.security.oauth2.client.reactive.ReactiveOAuth2ClientAutoConfiguration; - -/** - * @author Joe Grandja - */ -// FIXME: Work around https://github.com/spring-projects/spring-boot/issues/14463 -@SpringBootApplication(exclude = ReactiveOAuth2ClientAutoConfiguration.class) -public class OAuth2WebClientApplication { - - public static void main(String[] args) { - SpringApplication.run(OAuth2WebClientApplication.class, args); - } -} diff --git a/samples/boot/oauth2webclient/src/main/java/sample/config/SecurityConfig.java b/samples/boot/oauth2webclient/src/main/java/sample/config/SecurityConfig.java deleted file mode 100644 index e5602d812d..0000000000 --- a/samples/boot/oauth2webclient/src/main/java/sample/config/SecurityConfig.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.provisioning.InMemoryUserDetailsManager; - -import static org.springframework.security.config.Customizer.withDefaults; - -/** - * @author Joe Grandja - */ -@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .mvcMatchers("/", "/public/**").permitAll() - .anyRequest().authenticated() - ) - .formLogin(withDefaults()) - .oauth2Login(withDefaults()) - .oauth2Client(withDefaults()); - } - - @Bean - public UserDetailsService userDetailsService() { - UserDetails userDetails = User.withDefaultPasswordEncoder() - .username("user") - .password("password") - .roles("USER") - .build(); - return new InMemoryUserDetailsManager(userDetails); - } -} diff --git a/samples/boot/oauth2webclient/src/main/java/sample/config/WebClientConfig.java b/samples/boot/oauth2webclient/src/main/java/sample/config/WebClientConfig.java deleted file mode 100644 index da9510602b..0000000000 --- a/samples/boot/oauth2webclient/src/main/java/sample/config/WebClientConfig.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.config; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager; -import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProvider; -import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProviderBuilder; -import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; -import org.springframework.security.oauth2.client.web.DefaultOAuth2AuthorizedClientManager; -import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository; -import org.springframework.security.oauth2.client.web.reactive.function.client.ServletOAuth2AuthorizedClientExchangeFilterFunction; -import org.springframework.web.reactive.function.client.WebClient; - -/** - * @author Rob Winch - * @since 5.1 - */ -@Configuration -public class WebClientConfig { - - @Value("${resource-uri}") String resourceUri; - - @Bean - WebClient webClient(OAuth2AuthorizedClientManager authorizedClientManager) { - ServletOAuth2AuthorizedClientExchangeFilterFunction oauth2 = - new ServletOAuth2AuthorizedClientExchangeFilterFunction(authorizedClientManager); - oauth2.setDefaultOAuth2AuthorizedClient(true); - return WebClient.builder() - .baseUrl(this.resourceUri) - .apply(oauth2.oauth2Configuration()) - .build(); - } - - @Bean - OAuth2AuthorizedClientManager authorizedClientManager(ClientRegistrationRepository clientRegistrationRepository, - OAuth2AuthorizedClientRepository authorizedClientRepository) { - OAuth2AuthorizedClientProvider authorizedClientProvider = - OAuth2AuthorizedClientProviderBuilder.builder() - .authorizationCode() - .refreshToken() - .clientCredentials() - .password() - .build(); - DefaultOAuth2AuthorizedClientManager authorizedClientManager = new DefaultOAuth2AuthorizedClientManager( - clientRegistrationRepository, authorizedClientRepository); - authorizedClientManager.setAuthorizedClientProvider(authorizedClientProvider); - - return authorizedClientManager; - } -} diff --git a/samples/boot/oauth2webclient/src/main/java/sample/web/IndexController.java b/samples/boot/oauth2webclient/src/main/java/sample/web/IndexController.java deleted file mode 100644 index e1e0035ef1..0000000000 --- a/samples/boot/oauth2webclient/src/main/java/sample/web/IndexController.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.web; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @author Rob Winch - */ -@Controller -public class IndexController { - @GetMapping("/") - String index() { - return "index"; - } -} diff --git a/samples/boot/oauth2webclient/src/main/java/sample/web/OAuth2WebClientController.java b/samples/boot/oauth2webclient/src/main/java/sample/web/OAuth2WebClientController.java deleted file mode 100644 index f20b479d1f..0000000000 --- a/samples/boot/oauth2webclient/src/main/java/sample/web/OAuth2WebClientController.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.web; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.reactive.function.client.WebClient; - -import static org.springframework.security.oauth2.client.web.reactive.function.client.ServletOAuth2AuthorizedClientExchangeFilterFunction.clientRegistrationId; - -/** - * @author Joe Grandja - * @author Rob Winch - */ -@Controller -@RequestMapping(path = {"/webclient", "/public/webclient"}) -public class OAuth2WebClientController { - private final WebClient webClient; - - public OAuth2WebClientController(WebClient webClient) { - this.webClient = webClient; - } - - @GetMapping("/explicit") - String explicit(Model model) { - String body = this.webClient - .get() - .attributes(clientRegistrationId("client-id")) - .retrieve() - .bodyToMono(String.class) - .block(); - model.addAttribute("body", body); - return "response"; - } - - @GetMapping("/implicit") - String implicit(Model model) { - String body = this.webClient - .get() - .retrieve() - .bodyToMono(String.class) - .block(); - model.addAttribute("body", body); - return "response"; - } -} diff --git a/samples/boot/oauth2webclient/src/main/java/sample/web/RegisteredOAuth2AuthorizedClientController.java b/samples/boot/oauth2webclient/src/main/java/sample/web/RegisteredOAuth2AuthorizedClientController.java deleted file mode 100644 index 883db445d0..0000000000 --- a/samples/boot/oauth2webclient/src/main/java/sample/web/RegisteredOAuth2AuthorizedClientController.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.web; - -import org.springframework.security.oauth2.client.OAuth2AuthorizedClient; -import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.reactive.function.client.WebClient; - -import static org.springframework.security.oauth2.client.web.reactive.function.client.ServletOAuth2AuthorizedClientExchangeFilterFunction.oauth2AuthorizedClient; - -/** - * @author Joe Grandja - * @author Rob Winch - */ -@Controller -@RequestMapping(path = {"/annotation", "/public/annotation"}) -public class RegisteredOAuth2AuthorizedClientController { - private final WebClient webClient; - - public RegisteredOAuth2AuthorizedClientController(WebClient webClient) { - this.webClient = webClient; - } - - @GetMapping("/explicit") - String explicit(Model model, @RegisteredOAuth2AuthorizedClient("client-id") OAuth2AuthorizedClient authorizedClient) { - String body = this.webClient - .get() - .attributes(oauth2AuthorizedClient(authorizedClient)) - .retrieve() - .bodyToMono(String.class) - .block(); - model.addAttribute("body", body); - return "response"; - } - - @GetMapping("/implicit") - String implicit(Model model, @RegisteredOAuth2AuthorizedClient OAuth2AuthorizedClient authorizedClient) { - String body = this.webClient - .get() - .attributes(oauth2AuthorizedClient(authorizedClient)) - .retrieve() - .bodyToMono(String.class) - .block(); - model.addAttribute("body", body); - return "response"; - } -} diff --git a/samples/boot/oauth2webclient/src/main/resources/application.yml b/samples/boot/oauth2webclient/src/main/resources/application.yml deleted file mode 100644 index 8528a06d0d..0000000000 --- a/samples/boot/oauth2webclient/src/main/resources/application.yml +++ /dev/null @@ -1,21 +0,0 @@ -logging: - level: - root: INFO - org.springframework.web: INFO - org.springframework.security: INFO -# org.springframework.boot.autoconfigure: DEBUG - -spring: - thymeleaf: - cache: false - security: - oauth2: - client: - registration: - client-id: - client-id: replace-with-client-id - client-secret: replace-with-client-secret - provider: github - scope: read:user,public_repo - -resource-uri: https://api.github.com/user/repos diff --git a/samples/boot/oauth2webclient/src/main/resources/templates/index.html b/samples/boot/oauth2webclient/src/main/resources/templates/index.html deleted file mode 100644 index 07a8e68035..0000000000 --- a/samples/boot/oauth2webclient/src/main/resources/templates/index.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - OAuth2 WebClient Showcase - - - -Log Out -

Examples

- -

@RegisteredOAuth2AuthorizedClient

-

-Examples on RegisteredOAuth2AuthorizedClientController -

Authenticated

-
    -
  • Explicit - Explicitly provide a Client Registration Id
    • -
  • - Implicit - Use the currently logged in user's OAuth Token. This will - only work if the user authenticates with oauth2Login and the token provided is the correct token provided at - log in is authorized.
    • -
-

Public

-
    -
  • Explicit - Explicitly provide a Client Registration Id
    • -
  • - Implicit - This will fail if the user is not authenticated. - Since it is mapped to permitAll, it is going to fail unless the user already took an action to log in and then - authenticates with oauth2Login()
    • -
- -

ServletOAuth2AuthorizedClientExchangeFilterFunction

-

- Examples on OAuth2WebClientController that demonstrate how to use ServletOAuth2AuthorizedClientExchangeFilterFunction -

Authenticated

-
    -
  • Explicit - Explicitly provide a Client Registration Id
    • -
  • - Implicit - Use the currently logged in user's OAuth Token. This will - only work if the user authenticates with oauth2Login and the token provided is the correct token provided at - log in is authorized.
    • -
-

Public

-
    -
  • Explicit - Explicitly provide a Client Registration Id
    • -
  • - Implicit - This will fail if the user is not authenticated. - Since it is mapped to permitAll, it is going to fail unless the user already took an action to log in and then - authenticates with oauth2Login()
    • -
- - diff --git a/samples/boot/oauth2webclient/src/main/resources/templates/response.html b/samples/boot/oauth2webclient/src/main/resources/templates/response.html deleted file mode 100644 index 210c18c29a..0000000000 --- a/samples/boot/oauth2webclient/src/main/resources/templates/response.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - OAuth2 WebClient Showcase - - - -Back -

Response

-
- - - diff --git a/samples/boot/oauth2webclient/src/test/java/sample/OAuth2WebClientApplicationTests.java b/samples/boot/oauth2webclient/src/test/java/sample/OAuth2WebClientApplicationTests.java deleted file mode 100644 index 4e153b9961..0000000000 --- a/samples/boot/oauth2webclient/src/test/java/sample/OAuth2WebClientApplicationTests.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * @author Rob Winch - */ -@SpringBootTest -@AutoConfigureMockMvc -@RunWith(SpringRunner.class) -public class OAuth2WebClientApplicationTests { - @Autowired - private MockMvc mockMvc; - - @Test - public void annotationExplicitWhenNotAuthenticatedThenLoginRequested() throws Exception { - this.mockMvc.perform(get("/annotation/explicit")) - .andExpect(status().is3xxRedirection()); - } -} diff --git a/samples/boot/oauth2webclient/src/test/java/sample/OAuth2WebClientControllerTests.java b/samples/boot/oauth2webclient/src/test/java/sample/OAuth2WebClientControllerTests.java deleted file mode 100644 index 8829c00471..0000000000 --- a/samples/boot/oauth2webclient/src/test/java/sample/OAuth2WebClientControllerTests.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import org.junit.AfterClass; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.web.reactive.function.client.WebClient; - -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oauth2Client; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oauth2Login; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -@WebMvcTest -@AutoConfigureMockMvc -@RunWith(SpringRunner.class) -public class OAuth2WebClientControllerTests { - private static MockWebServer web = new MockWebServer(); - - @Autowired - private MockMvc mockMvc; - - @AfterClass - public static void shutdown() throws Exception { - web.shutdown(); - } - - @Test - public void explicitWhenAuthenticatedThenUsesClientIdRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.mockMvc.perform(get("/webclient/explicit") - .with(oauth2Login()) - .with(oauth2Client("client-id"))) - .andExpect(status().isOk()); - } - - @Test - public void implicitWhenAuthenticatedThenUsesDefaultRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.mockMvc.perform(get("/webclient/implicit") - .with(oauth2Login())) - .andExpect(status().isOk()); - } - - @Test - public void publicExplicitWhenAuthenticatedThenUsesClientIdRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.mockMvc.perform(get("/public/webclient/explicit") - .with(oauth2Client("client-id"))) - .andExpect(status().isOk()); - } - - @Test - public void publicImplicitWhenAuthenticatedThenUsesDefaultRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.mockMvc.perform(get("/public/webclient/implicit") - .with(oauth2Login())) - .andExpect(status().isOk()); - } - - @TestConfiguration - static class WebClientConfig { - @Bean - WebClient web() { - return WebClient.create(web.url("/").toString()); - } - } -} diff --git a/samples/boot/oauth2webclient/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java b/samples/boot/oauth2webclient/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java deleted file mode 100644 index 91e3a2ec91..0000000000 --- a/samples/boot/oauth2webclient/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import org.junit.AfterClass; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.web.reactive.function.client.WebClient; - -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oauth2Client; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oauth2Login; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -@WebMvcTest -@AutoConfigureMockMvc -@RunWith(SpringRunner.class) -public class RegisteredOAuth2AuthorizedClientControllerTests { - private static MockWebServer web = new MockWebServer(); - - @Autowired - private MockMvc mockMvc; - - @AfterClass - public static void shutdown() throws Exception { - web.shutdown(); - } - - @Test - public void annotationExplicitWhenAuthenticatedThenUsesClientIdRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.mockMvc.perform(get("/annotation/explicit") - .with(oauth2Login()) - .with(oauth2Client("client-id"))) - .andExpect(status().isOk()); - } - - @Test - public void annotationImplicitWhenAuthenticatedThenUsesDefaultRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.mockMvc.perform(get("/annotation/implicit") - .with(oauth2Login())) - .andExpect(status().isOk()); - } - - @Test - public void publicAnnotationExplicitWhenAuthenticatedThenUsesClientIdRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.mockMvc.perform(get("/public/annotation/explicit") - .with(oauth2Client("client-id"))) - .andExpect(status().isOk()); - } - - @Test - public void publicAnnotationImplicitWhenAuthenticatedThenUsesDefaultRegistration() throws Exception { - web.enqueue(new MockResponse().setBody("body").setResponseCode(200)); - this.mockMvc.perform(get("/public/annotation/implicit") - .with(oauth2Login())) - .andExpect(status().isOk()); - } - - @TestConfiguration - static class WebClientConfig { - @Bean - WebClient web() { - return WebClient.create(web.url("/").toString()); - } - } -} diff --git a/samples/boot/saml2login/README.adoc b/samples/boot/saml2login/README.adoc deleted file mode 100644 index d51b1bba4b..0000000000 --- a/samples/boot/saml2login/README.adoc +++ /dev/null @@ -1,38 +0,0 @@ -= SAML 2.0 Login Sample - -This guide provides instructions on setting up this SAML 2.0 Login sample application. - -The sample application uses Spring Boot and the `spring-security-saml2-service-provider` -module which is new in Spring Security 5.2. - -== Goals - -`saml2Login()` provides a very simple implementation of a Service Provider that can receive a SAML 2.0 Response via the HTTP-POST and HTTP-REDIRECT bindings against the SimpleSAMLphp SAML 2.0 reference implementation. - -The following features are implemented in the MVP: - -1. Receive and validate a SAML 2.0 Response containing an assertion, and create a corresponding authentication in Spring Security -2. Send a SAML 2.0 AuthNRequest to an Identity Provider -3. Provide a framework for components used in SAML 2.0 authentication that can be swapped by configuration -4. Work against the SimpleSAMLphp reference implementation - -== Run the Sample - -=== Start up the Sample Boot Application -``` - ./gradlew :spring-security-samples-boot-saml2login:bootRun -``` - -=== Open a Browser - -http://localhost:8080/ - -You will be redirect to the SimpleSAMLphp IDP - -=== Type in your credentials - -``` -User: user -Password: password -``` - diff --git a/samples/boot/saml2login/spring-security-samples-boot-saml2login.gradle b/samples/boot/saml2login/spring-security-samples-boot-saml2login.gradle deleted file mode 100644 index ee78e3f199..0000000000 --- a/samples/boot/saml2login/spring-security-samples-boot-saml2login.gradle +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -apply plugin: 'io.spring.convention.spring-sample-boot' - -sourceCompatibility = '11' - -repositories { - maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" } -} - -dependencies { - compile project(':spring-security-config') - compile project(':saml2-service-provider-opensaml4') - compile 'org.springframework.boot:spring-boot-starter-thymeleaf' - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' - - testCompile project(':spring-security-test') - testCompile 'net.sourceforge.htmlunit:htmlunit' - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/saml2login/src/integration-test/java/sample/Saml2LoginApplicationITests.java b/samples/boot/saml2login/src/integration-test/java/sample/Saml2LoginApplicationITests.java deleted file mode 100644 index c963ab3b2b..0000000000 --- a/samples/boot/saml2login/src/integration-test/java/sample/Saml2LoginApplicationITests.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpSession; - -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlInput; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.mock.web.MockHttpSession; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -@RunWith(SpringRunner.class) -@SpringBootTest -@AutoConfigureMockMvc -public class Saml2LoginApplicationITests { - static final String SIGNED_RESPONSE = "<samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" ID="_ce2b5855cf59ba24789528dd8d3d728db0ebf3e73b" Version="2.0" IssueInstant="2021-01-20T01:03:24Z" Destination="http://localhost:8080/login/saml2/sso/one" InResponseTo="ARQc98f200-dcf7-4df4-a522-07206208b07d"><saml:Issuer>https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php</saml:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
  <ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
    <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
  <ds:Reference URI="#_ce2b5855cf59ba24789528dd8d3d728db0ebf3e73b"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>MrT5/0u4Rq9wBc/z1Pwak5DWfmq8iNVNv6WGeageEsQ=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>Yh5PQ9pUAnI/9nm781gN4m8SKE8OUQL5N2R7fIOfkGVc3F8s6ReGxQ5agyAWbt3P4pCtVxkjnN+2NJyL8BhQ0sttJ/obELrFRWKzf2aBZKcB7BGLSmEwhPQ77pG/Jl20ah42hdrXW7LONoEY8s2cOwvmz6D6moXAjk0uvPES68TVwqSefOrp5utBdRAKzqBQCcPXRBvpy5bwBJC/dJ4NP/2ijQ77b7yhoT44GmaIGnHj4aQZxodcRn5OhChXFN2uI6amfOFX98cQvy+8CZoXaFQ2rfOgOlgsncFXc0ixX+NLJ9oJRVOhqEZccbhgxO3hiCe0zdndyhUlihc0tU69YA==</ds:SignatureValue>
<ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIEEzCCAvugAwIBAgIJAIc1qzLrv+5nMA0GCSqGSIb3DQEBCwUAMIGfMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ08xFDASBgNVBAcMC0Nhc3RsZSBSb2NrMRwwGgYDVQQKDBNTYW1sIFRlc3RpbmcgU2VydmVyMQswCQYDVQQLDAJJVDEgMB4GA1UEAwwXc2ltcGxlc2FtbHBocC5jZmFwcHMuaW8xIDAeBgkqhkiG9w0BCQEWEWZoYW5pa0BwaXZvdGFsLmlvMB4XDTE1MDIyMzIyNDUwM1oXDTI1MDIyMjIyNDUwM1owgZ8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDTzEUMBIGA1UEBwwLQ2FzdGxlIFJvY2sxHDAaBgNVBAoME1NhbWwgVGVzdGluZyBTZXJ2ZXIxCzAJBgNVBAsMAklUMSAwHgYDVQQDDBdzaW1wbGVzYW1scGhwLmNmYXBwcy5pbzEgMB4GCSqGSIb3DQEJARYRZmhhbmlrQHBpdm90YWwuaW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4cn62E1xLqpN34PmbrKBbkOXFjzWgJ9b+pXuaRft6A339uuIQeoeH5qeSKRVTl32L0gdz2ZivLwZXW+cqvftVW1tvEHvzJFyxeTW3fCUeCQsebLnA2qRa07RkxTo6Nf244mWWRDodcoHEfDUSbxfTZ6IExSojSIU2RnD6WllYWFdD1GFpBJOmQB8rAc8wJIBdHFdQnX8Ttl7hZ6rtgqEYMzYVMuJ2F2r1HSU1zSAvwpdYP6rRGFRJEfdA9mm3WKfNLSc5cljz0X/TXy0vVlAV95l9qcfFzPmrkNIst9FZSwpvB49LyAVke04FQPPwLgVH4gphiJH3jvZ7I+J5lS8VAgMBAAGjUDBOMB0GA1UdDgQWBBTTyP6Cc5HlBJ5+ucVCwGc5ogKNGzAfBgNVHSMEGDAWgBTTyP6Cc5HlBJ5+ucVCwGc5ogKNGzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAvMS4EQeP/ipV4jOG5lO6/tYCb/iJeAduOnRhkJk0DbX329lDLZhTTL/x/w/9muCVcvLrzEp6PN+VWfw5E5FWtZN0yhGtP9R+vZnrV+oc2zGD+no1/ySFOe3EiJCO5dehxKjYEmBRv5sU/LZFKZpozKN/BMEa6CqLuxbzb7ykxVr7EVFXwltPxzE9TmL9OACNNyF5eJHWMRMllarUvkcXlh4pux4ks9e6zV9DQBy2zds9f1I3qxg0eX6JnGrXi/ZiCT+lJgVe3ZFXiejiLAiKB04sXW3ti0LW3lx13Y1YlQ4/tlpgTgfIJxKV6nyPiLoK0nywbMd+vpAirDt2Oc+hk</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><samlp:Status><samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></samlp:Status><saml:Assertion xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" ID="_cb63bc36c2c03b4e1bcd5b1b0cc2e165d044546e88" Version="2.0" IssueInstant="2021-01-20T01:03:24Z"><saml:Issuer>https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php</saml:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
  <ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
    <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
  <ds:Reference URI="#_cb63bc36c2c03b4e1bcd5b1b0cc2e165d044546e88"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>Uam7cGTiBwlnD0ItgyiNJV3vgCO7+YfDqIbkXDdGxkA=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>FHiYJDL9JMs5ceyYxTUX+RwDBn9DV3TO5t1ajn+hamoW61JAcBZ610PzX33wjP72MdbgCZtyfckJKYQJOOK3FLKNBKBJa93lI/kefcMtSPlAShDJorve4SKVkoVo6KVptx/NNz0FHI5DEe6bQEceab4DU41UtJP0u2Zmzz5c4/7W8Kvkz2LLmxVfQ7Ckhvh/70aXydYPUFiwlN/WYSWrXUOh9sEL1bdeeC1dbzZyWM6WgJGQ1JInPgHgta9q1Ozxib8YKEzPIC3TFevE5cJa0T/wSs9R17BRGONrXSMd/D+xbF4gyHanDdYNaSvO7HKjxo4pbMZcNix8LNEXdkbdLw==</ds:SignatureValue>
<ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIEEzCCAvugAwIBAgIJAIc1qzLrv+5nMA0GCSqGSIb3DQEBCwUAMIGfMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ08xFDASBgNVBAcMC0Nhc3RsZSBSb2NrMRwwGgYDVQQKDBNTYW1sIFRlc3RpbmcgU2VydmVyMQswCQYDVQQLDAJJVDEgMB4GA1UEAwwXc2ltcGxlc2FtbHBocC5jZmFwcHMuaW8xIDAeBgkqhkiG9w0BCQEWEWZoYW5pa0BwaXZvdGFsLmlvMB4XDTE1MDIyMzIyNDUwM1oXDTI1MDIyMjIyNDUwM1owgZ8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDTzEUMBIGA1UEBwwLQ2FzdGxlIFJvY2sxHDAaBgNVBAoME1NhbWwgVGVzdGluZyBTZXJ2ZXIxCzAJBgNVBAsMAklUMSAwHgYDVQQDDBdzaW1wbGVzYW1scGhwLmNmYXBwcy5pbzEgMB4GCSqGSIb3DQEJARYRZmhhbmlrQHBpdm90YWwuaW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4cn62E1xLqpN34PmbrKBbkOXFjzWgJ9b+pXuaRft6A339uuIQeoeH5qeSKRVTl32L0gdz2ZivLwZXW+cqvftVW1tvEHvzJFyxeTW3fCUeCQsebLnA2qRa07RkxTo6Nf244mWWRDodcoHEfDUSbxfTZ6IExSojSIU2RnD6WllYWFdD1GFpBJOmQB8rAc8wJIBdHFdQnX8Ttl7hZ6rtgqEYMzYVMuJ2F2r1HSU1zSAvwpdYP6rRGFRJEfdA9mm3WKfNLSc5cljz0X/TXy0vVlAV95l9qcfFzPmrkNIst9FZSwpvB49LyAVke04FQPPwLgVH4gphiJH3jvZ7I+J5lS8VAgMBAAGjUDBOMB0GA1UdDgQWBBTTyP6Cc5HlBJ5+ucVCwGc5ogKNGzAfBgNVHSMEGDAWgBTTyP6Cc5HlBJ5+ucVCwGc5ogKNGzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAvMS4EQeP/ipV4jOG5lO6/tYCb/iJeAduOnRhkJk0DbX329lDLZhTTL/x/w/9muCVcvLrzEp6PN+VWfw5E5FWtZN0yhGtP9R+vZnrV+oc2zGD+no1/ySFOe3EiJCO5dehxKjYEmBRv5sU/LZFKZpozKN/BMEa6CqLuxbzb7ykxVr7EVFXwltPxzE9TmL9OACNNyF5eJHWMRMllarUvkcXlh4pux4ks9e6zV9DQBy2zds9f1I3qxg0eX6JnGrXi/ZiCT+lJgVe3ZFXiejiLAiKB04sXW3ti0LW3lx13Y1YlQ4/tlpgTgfIJxKV6nyPiLoK0nywbMd+vpAirDt2Oc+hk</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml:Subject><saml:NameID SPNameQualifier="http://localhost:8080/saml2/service-provider-metadata/one" Format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress">testuser@spring.security.saml</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2052-09-28T02:50:04Z" Recipient="http://localhost:8080/login/saml2/sso/one" InResponseTo="ARQc98f200-dcf7-4df4-a522-07206208b07d"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2021-01-20T01:02:54Z" NotOnOrAfter="2052-09-28T02:50:04Z"><saml:AudienceRestriction><saml:Audience>http://localhost:8080/saml2/service-provider-metadata/one</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AuthnStatement AuthnInstant="2021-01-20T00:48:29Z" SessionNotOnOrAfter="2021-01-20T08:48:29Z" SessionIndex="_e7a1a9e495bfe226649e8dcc37e14154495215d6eb"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement><saml:AttributeStatement><saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"><saml:AttributeValue xsi:type="xs:string">testuser@spring.security.saml</saml:AttributeValue></saml:Attribute><saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"><saml:AttributeValue xsi:type="xs:string">member</saml:AttributeValue><saml:AttributeValue xsi:type="xs:string">user</saml:AttributeValue></saml:Attribute><saml:Attribute Name="emailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"><saml:AttributeValue xsi:type="xs:string">testuser@spring.security.saml</saml:AttributeValue></saml:Attribute></saml:AttributeStatement></saml:Assertion></samlp:Response>"; - - static final Map> USER_ATTRIBUTES = new LinkedHashMap<>(); - - static { - USER_ATTRIBUTES.put("uid", Arrays.asList("testuser@spring.security.saml")); - USER_ATTRIBUTES.put("eduPersonAffiliation", Arrays.asList("member", "user")); - USER_ATTRIBUTES.put("emailAddress", Arrays.asList("testuser@spring.security.saml")); - } - - @Autowired - MockMvc mvc; - - @Autowired - WebClient webClient; - - @Test - public void indexWhenSamlResponseThenShowsUserInformation() throws Exception { - HttpSession session = this.mvc.perform(get("http://localhost:8080/")) - .andExpect(status().is3xxRedirection()) - .andExpect(redirectedUrl("http://localhost:8080/saml2/authenticate/one")) - .andReturn() - .getRequest().getSession(); - - this.mvc.perform(post("http://localhost:8080/login/saml2/sso/one") - .param("SAMLResponse", SIGNED_RESPONSE) - .session((MockHttpSession) session)) - .andExpect(redirectedUrl("http://localhost:8080/")); - - this.mvc.perform(get("http://localhost:8080/") - .session((MockHttpSession) session)) - .andExpect(model().attribute("emailAddress", "testuser@spring.security.saml")) - .andExpect(model().attribute("userAttributes", USER_ATTRIBUTES)); - } - - @Test - public void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception { - HtmlPage assertingParty = this.webClient.getPage("/"); - HtmlForm form = assertingParty.getFormByName("f"); - HtmlInput username = form.getInputByName("username"); - HtmlInput password = form.getInputByName("password"); - HtmlSubmitInput submit = assertingParty.getHtmlElementById("submit_button"); - username.setValueAttribute("user"); - password.setValueAttribute("password"); - HtmlPage relyingParty = submit.click(); - assertThat(relyingParty.asText()) - .contains("You're email address is testuser@spring.security.saml"); - } -} diff --git a/samples/boot/saml2login/src/main/java/sample/IndexController.java b/samples/boot/saml2login/src/main/java/sample/IndexController.java deleted file mode 100644 index 8da3c251eb..0000000000 --- a/samples/boot/saml2login/src/main/java/sample/IndexController.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticatedPrincipal; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; - -@Controller -public class IndexController { - - @GetMapping("/") - public String index(Model model, - @AuthenticationPrincipal Saml2AuthenticatedPrincipal principal) { - String emailAddress = principal.getFirstAttribute("emailAddress"); - model.addAttribute("emailAddress", emailAddress); - model.addAttribute("userAttributes", principal.getAttributes()); - return "index"; - } -} diff --git a/samples/boot/saml2login/src/main/java/sample/Saml2LoginApplication.java b/samples/boot/saml2login/src/main/java/sample/Saml2LoginApplication.java deleted file mode 100644 index 08202d28de..0000000000 --- a/samples/boot/saml2login/src/main/java/sample/Saml2LoginApplication.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Saml2LoginApplication { - - public static void main(String[] args) { - SpringApplication.run(Saml2LoginApplication.class, args); - } - -} diff --git a/samples/boot/saml2login/src/main/java/sample/SecurityConfig.java b/samples/boot/saml2login/src/main/java/sample/SecurityConfig.java deleted file mode 100644 index 434cf36668..0000000000 --- a/samples/boot/saml2login/src/main/java/sample/SecurityConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository; -import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration; -import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository; -import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrations; - -@Configuration -public class SecurityConfig { - @Bean - RelyingPartyRegistrationRepository relyingPartyRegistrationRepository() { - RelyingPartyRegistration relyingPartyRegistration = RelyingPartyRegistrations - .fromMetadataLocation("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php") - .registrationId("one") - .build(); - return new InMemoryRelyingPartyRegistrationRepository(relyingPartyRegistration); - } -} diff --git a/samples/boot/saml2login/src/main/resources/application.yml b/samples/boot/saml2login/src/main/resources/application.yml deleted file mode 100644 index 8b13789179..0000000000 --- a/samples/boot/saml2login/src/main/resources/application.yml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/samples/boot/saml2login/src/main/resources/templates/index.html b/samples/boot/saml2login/src/main/resources/templates/index.html deleted file mode 100644 index b72bb58ce0..0000000000 --- a/samples/boot/saml2login/src/main/resources/templates/index.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - Spring Security - SAML 2.0 Login - - - - - -

SAML 2.0 Login with Spring Security

-

You are successfully logged in as

-

You're email address is

-

All Your Attributes

-
-
-
-
- - diff --git a/samples/boot/webflux-form/spring-security-samples-boot-webflux-form.gradle b/samples/boot/webflux-form/spring-security-samples-boot-webflux-form.gradle deleted file mode 100644 index 35d9a28149..0000000000 --- a/samples/boot/webflux-form/spring-security-samples-boot-webflux-form.gradle +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-core') - compile project(':spring-security-config') - compile project(':spring-security-web') - compile 'org.springframework.boot:spring-boot-starter-thymeleaf' - compile 'org.springframework.boot:spring-boot-starter-webflux' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' - - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile 'io.projectreactor:reactor-test' - testCompile 'org.skyscreamer:jsonassert' - testCompile 'org.springframework:spring-test' - - integrationTestCompile seleniumDependencies -} - diff --git a/samples/boot/webflux-form/src/integration-test/java/sample/WebfluxFormApplicationTests.java b/samples/boot/webflux-form/src/integration-test/java/sample/WebfluxFormApplicationTests.java deleted file mode 100644 index c9062faa59..0000000000 --- a/samples/boot/webflux-form/src/integration-test/java/sample/WebfluxFormApplicationTests.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; -import org.springframework.test.context.junit4.SpringRunner; - -import com.gargoylesoftware.htmlunit.BrowserVersion; - -import sample.webdriver.IndexPage; -import sample.webdriver.LoginPage; - -/** - * @author Rob Winch - * @since 5.0 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class WebfluxFormApplicationTests { - WebDriver driver; - - @LocalServerPort - int port; - - @Before - public void setup() { - this.driver = new HtmlUnitDriver(BrowserVersion.CHROME); - } - - @Test - public void loginWhenInvalidUsernameThenError() { - LoginPage login = IndexPage.to(this.driver, this.port, LoginPage.class); - login.assertAt(); - - login - .loginForm() - .username("invalid") - .password("password") - .submit(LoginPage.class) - .assertError(); - } - - @Test - public void loginAndLogout() { - LoginPage login = IndexPage.to(this.driver, this.port, LoginPage.class); - login.assertAt(); - - IndexPage index = login - .loginForm() - .username("user") - .password("password") - .submit(IndexPage.class); - index.assertAt(); - - login = index.logout(); - login - .assertAt() - .assertLogout(); - } -} diff --git a/samples/boot/webflux-form/src/integration-test/java/sample/webdriver/IndexPage.java b/samples/boot/webflux-form/src/integration-test/java/sample/webdriver/IndexPage.java deleted file mode 100644 index 9ca07b68f7..0000000000 --- a/samples/boot/webflux-form/src/integration-test/java/sample/webdriver/IndexPage.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.webdriver; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Rob Winch - * @since 5.0 - */ -public class IndexPage { - - private WebDriver driver; - - private WebElement logout; - - public IndexPage(WebDriver webDriver) { - this.driver = webDriver; - } - - public static T to(WebDriver driver, int port, Class page) { - driver.get("http://localhost:" + port +"/"); - return PageFactory.initElements(driver, page); - } - - public IndexPage assertAt() { - assertThat(this.driver.getTitle()).isEqualTo("Secured"); - return this; - } - - public LoginPage logout() { - this.logout.click(); - return LoginPage.create(this.driver); - } -} diff --git a/samples/boot/webflux-form/src/integration-test/java/sample/webdriver/LoginPage.java b/samples/boot/webflux-form/src/integration-test/java/sample/webdriver/LoginPage.java deleted file mode 100644 index 1058533866..0000000000 --- a/samples/boot/webflux-form/src/integration-test/java/sample/webdriver/LoginPage.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.webdriver; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Rob Winch - * @since 5.0 - */ -public class LoginPage { - - private WebDriver driver; - @FindBy(css = "div[role=alert]") - private WebElement alert; - - private LoginForm loginForm; - - public LoginPage(WebDriver webDriver) { - this.driver = webDriver; - this.loginForm = PageFactory.initElements(webDriver, LoginForm.class); - } - - static LoginPage create(WebDriver driver) { - return PageFactory.initElements(driver, LoginPage.class); - } - - public LoginPage assertAt() { - assertThat(this.driver.getTitle()).isEqualTo("Please Log In"); - return this; - } - - public LoginPage assertError() { - assertThat(this.alert.getText()).isEqualTo("Invalid username and password."); - return this; - } - - public LoginPage assertLogout() { - assertThat(this.alert.getText()).isEqualTo("You have been logged out."); - return this; - } - - public LoginForm loginForm() { - return this.loginForm; - } - - public static class LoginForm { - private WebDriver driver; - private WebElement username; - private WebElement password; - @FindBy(css = "button[type=submit]") - private WebElement submit; - - public LoginForm(WebDriver driver) { - this.driver = driver; - } - - public LoginForm username(String username) { - this.username.sendKeys(username); - return this; - } - - public LoginForm password(String password) { - this.password.sendKeys(password); - return this; - } - - public T submit(Class page) { - this.submit.click(); - return PageFactory.initElements(this.driver, page); - } - } -} diff --git a/samples/boot/webflux-form/src/main/java/sample/IndexController.java b/samples/boot/webflux-form/src/main/java/sample/IndexController.java deleted file mode 100644 index d84301d78b..0000000000 --- a/samples/boot/webflux-form/src/main/java/sample/IndexController.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @author Rob Winch - * @since 5.0 - */ -@Controller -public class IndexController { - - @GetMapping("/") - public String index() { - return "index"; - } - - @GetMapping("/login") - public String login() { - return "login"; - } -} diff --git a/samples/boot/webflux-form/src/main/java/sample/WebfluxFormApplication.java b/samples/boot/webflux-form/src/main/java/sample/WebfluxFormApplication.java deleted file mode 100644 index 48ddabcdb1..0000000000 --- a/samples/boot/webflux-form/src/main/java/sample/WebfluxFormApplication.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author Rob Winch - * @since 5.0 - */ -@SpringBootApplication -public class WebfluxFormApplication { - - public static void main(String[] args) { - SpringApplication.run(WebfluxFormApplication.class, args); - } -} diff --git a/samples/boot/webflux-form/src/main/java/sample/WebfluxFormSecurityConfig.java b/samples/boot/webflux-form/src/main/java/sample/WebfluxFormSecurityConfig.java deleted file mode 100644 index 94642742dc..0000000000 --- a/samples/boot/webflux-form/src/main/java/sample/WebfluxFormSecurityConfig.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; -import org.springframework.security.config.web.server.ServerHttpSecurity; -import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.web.server.SecurityWebFilterChain; - -import static org.springframework.security.config.Customizer.withDefaults; - -/** - * @author Rob Winch - * @since 5.0 - */ -@EnableWebFluxSecurity -public class WebfluxFormSecurityConfig { - - @Bean - public MapReactiveUserDetailsService userDetailsService() { - UserDetails user = User.withDefaultPasswordEncoder() - .username("user") - .password("password") - .roles("USER") - .build(); - return new MapReactiveUserDetailsService(user); - } - - @Bean - SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - http - .authorizeExchange((exchanges) -> - exchanges - .pathMatchers("/login").permitAll() - .anyExchange().authenticated() - ) - .httpBasic(withDefaults()) - .formLogin((formLogin) -> - formLogin - .loginPage("/login") - ); - return http.build(); - } -} diff --git a/samples/boot/webflux-form/src/main/resources/logback.xml b/samples/boot/webflux-form/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/boot/webflux-form/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/boot/webflux-form/src/main/resources/templates/index.html b/samples/boot/webflux-form/src/main/resources/templates/index.html deleted file mode 100644 index 992450d43f..0000000000 --- a/samples/boot/webflux-form/src/main/resources/templates/index.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Secured - - - -
-

Secured

- -
- -
-
- - diff --git a/samples/boot/webflux-form/src/main/resources/templates/login.html b/samples/boot/webflux-form/src/main/resources/templates/login.html deleted file mode 100644 index 4fa5c65688..0000000000 --- a/samples/boot/webflux-form/src/main/resources/templates/login.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - Please Log In - - - - -
- -
- - diff --git a/samples/boot/webflux-x509/spring-security-samples-boot-webflux-x509.gradle b/samples/boot/webflux-x509/spring-security-samples-boot-webflux-x509.gradle deleted file mode 100644 index 57196d2b2b..0000000000 --- a/samples/boot/webflux-x509/spring-security-samples-boot-webflux-x509.gradle +++ /dev/null @@ -1,11 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' - -dependencies { - compile project(':spring-security-core') - compile project(':spring-security-config') - compile project(':spring-security-web') - compile 'org.springframework.boot:spring-boot-starter-webflux' - - testCompile project(':spring-security-test') - testCompile 'org.springframework.boot:spring-boot-starter-test' -} diff --git a/samples/boot/webflux-x509/src/main/java/sample/MeController.java b/samples/boot/webflux-x509/src/main/java/sample/MeController.java deleted file mode 100644 index 7c10c6aedf..0000000000 --- a/samples/boot/webflux-x509/src/main/java/sample/MeController.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.security.core.context.ReactiveSecurityContextHolder; -import org.springframework.security.core.context.SecurityContext; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import reactor.core.publisher.Mono; - -/** - * @author Alexey Nesterov - * @since 5.2 - */ -@RestController -@RequestMapping("/me") -public class MeController { - - @GetMapping - public Mono me() { - return ReactiveSecurityContextHolder.getContext() - .map(SecurityContext::getAuthentication) - .map((authentication) -> "Hello, " + authentication.getName()); - } -} diff --git a/samples/boot/webflux-x509/src/main/java/sample/WebfluxX509Application.java b/samples/boot/webflux-x509/src/main/java/sample/WebfluxX509Application.java deleted file mode 100644 index 89813d073b..0000000000 --- a/samples/boot/webflux-x509/src/main/java/sample/WebfluxX509Application.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.web.server.ServerHttpSecurity; -import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; -import org.springframework.security.core.userdetails.ReactiveUserDetailsService; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.web.server.SecurityWebFilterChain; - -import static org.springframework.security.config.Customizer.withDefaults; - -/** - * @author Alexey Nesterov - * @since 5.2 - */ -@SpringBootApplication -public class WebfluxX509Application { - - @Bean - public ReactiveUserDetailsService reactiveUserDetailsService() { - return new MapReactiveUserDetailsService( - User.withUsername("client").password("").authorities("ROLE_USER").build() - ); - } - - @Bean - public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) { - // @formatter:off - http - .x509(withDefaults()) - .authorizeExchange((exchanges) -> - exchanges - .anyExchange().authenticated() - ); - // @formatter:on - - return http.build(); - } - - public static void main(String[] args) { - SpringApplication.run(WebfluxX509Application.class); - } -} diff --git a/samples/boot/webflux-x509/src/main/resources/application.yml b/samples/boot/webflux-x509/src/main/resources/application.yml deleted file mode 100644 index cdeb85fa7b..0000000000 --- a/samples/boot/webflux-x509/src/main/resources/application.yml +++ /dev/null @@ -1,8 +0,0 @@ -server: - port: 8443 - ssl: - key-store: 'classpath:./certs/server.p12' - key-store-password: 'password' - client-auth: need - trust-store: 'classpath:./certs/server.p12' - trust-store-password: 'password' diff --git a/samples/boot/webflux-x509/src/main/resources/certs/curl_app.sh b/samples/boot/webflux-x509/src/main/resources/certs/curl_app.sh deleted file mode 100644 index dbf7af4b43..0000000000 --- a/samples/boot/webflux-x509/src/main/resources/certs/curl_app.sh +++ /dev/null @@ -1,2 +0,0 @@ - curl -vvvv --cacert out/DevCA.crt --cert out/localhost.crt --key out/localhost.key https://localhost:8443/me - diff --git a/samples/boot/webflux-x509/src/main/resources/certs/server.p12 b/samples/boot/webflux-x509/src/main/resources/certs/server.p12 deleted file mode 100644 index ec536b2f6007eac9486c0daada114fe1faf4facd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5255 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 diff --git a/samples/boot/webflux-x509/src/test/java/sample/WebfluxX509ApplicationTest.java b/samples/boot/webflux-x509/src/test/java/sample/WebfluxX509ApplicationTest.java deleted file mode 100644 index e6ed9cf200..0000000000 --- a/samples/boot/webflux-x509/src/test/java/sample/WebfluxX509ApplicationTest.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import io.netty.handler.ssl.ClientAuth; -import io.netty.handler.ssl.SslContextBuilder; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; -import org.springframework.core.io.ClassPathResource; -import org.springframework.http.client.reactive.ClientHttpConnector; -import org.springframework.http.client.reactive.ReactorClientHttpConnector; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; -import reactor.netty.http.client.HttpClient; - -import java.io.IOException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.PrivateKey; -import java.security.UnrecoverableEntryException; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; - -import static org.assertj.core.api.Assertions.assertThat; - -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class WebfluxX509ApplicationTest { - - @LocalServerPort - int port; - - @Test - public void shouldExtractAuthenticationFromCertificate() throws Exception { - WebTestClient webTestClient = createWebTestClientWithClientCertificate(); - webTestClient - .get().uri("/me") - .exchange() - .expectStatus().isOk() - .expectBody() - .consumeWith((result) -> { - String responseBody = new String(result.getResponseBody()); - assertThat(responseBody).contains("Hello, client"); - }); - } - - private WebTestClient createWebTestClientWithClientCertificate() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableEntryException { - ClassPathResource serverKeystore = new ClassPathResource("/certs/server.p12"); - - KeyStore keyStore = KeyStore.getInstance("PKCS12"); - keyStore.load(serverKeystore.getInputStream(), "password".toCharArray()); - - X509Certificate devCA = (X509Certificate) keyStore.getCertificate("DevCA"); - - X509Certificate clientCrt = (X509Certificate) keyStore.getCertificate("client"); - KeyStore.Entry keyStoreEntry = keyStore.getEntry("client", - new KeyStore.PasswordProtection("password".toCharArray())); - PrivateKey clientKey = ((KeyStore.PrivateKeyEntry) keyStoreEntry).getPrivateKey(); - - SslContextBuilder sslContextBuilder = SslContextBuilder - .forClient().clientAuth(ClientAuth.REQUIRE) - .trustManager(devCA) - .keyManager(clientKey, clientCrt); - - HttpClient httpClient = HttpClient.create().secure((sslContextSpec) -> sslContextSpec.sslContext(sslContextBuilder)); - ClientHttpConnector httpConnector = new ReactorClientHttpConnector(httpClient); - - return WebTestClient - .bindToServer(httpConnector) - .baseUrl("https://localhost:" + port) - .build(); - } -} diff --git a/samples/certificates/Readme.txt b/samples/certificates/Readme.txt deleted file mode 100644 index 64b415cf83..0000000000 --- a/samples/certificates/Readme.txt +++ /dev/null @@ -1,10 +0,0 @@ -This directory contains certificates and keys for use with SSL in the sample applications. Certificates are issued by -our "Spring Security Test CA" certificate authority. - -ca.pem - the certificate authority's certificate. -server.jks - Java keystore containing the server certificate and privatekey. It Also contains the certificate authority - file and this is used as both keystore and truststore for they jetty server when running the samples with - the maven jetty plugin ("mvn jetty:run"). - -rod.p12, dianne.p12, scott.p12 are all certificate/key combinations for client authentication and can be installed in -your browser if you want to try out support for X.509 authentication. \ No newline at end of file diff --git a/samples/certificates/ca.pem b/samples/certificates/ca.pem deleted file mode 100644 index a5b52ca9d7..0000000000 --- a/samples/certificates/ca.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDojCCAoqgAwIBAgIEMKX1dzANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMC -R0IxETAPBgNVBAgTCFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MRkwFwYDVQQK -ExBTcHJpbmcgRnJhbWV3b3JrMRgwFgYDVQQLEw9TcHJpbmcgU2VjdXJpdHkxIDAe -BgNVBAMTF1NwcmluZyBTZWN1cml0eSBUZXN0IENBMB4XDTA4MDEyNTExMTIyMVoX -DTE4MDIyNTAwMDAwMFowgYkxCzAJBgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFu -ZDEQMA4GA1UEBxMHR2xhc2dvdzEZMBcGA1UEChMQU3ByaW5nIEZyYW1ld29yazEY -MBYGA1UECxMPU3ByaW5nIFNlY3VyaXR5MSAwHgYDVQQDExdTcHJpbmcgU2VjdXJp -dHkgVGVzdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALzl/wEe -snYrwqaGZuB8hmwACtptazh1+eXCfd66FkioxlLF7yTnjCC7DT+vmMgSuThIEIsN -xlxLpEgyU3bU8GIuR8wyYIyvuSMcptdFJLV7NKYuRycxpDuqimTM7Br0nfNgKVEv -1QwguGWr6YN3aZ68/xe/D5xyPhakKu++7VFXIXw9f0+nqojdrFTqQ6l9GAVRgfX6 -h4JOaV1VFx83y2pnFj0iFneVxRcvXyWnyXlcOvJDIyVuyS/hYxb+E5rtBvp5XQ0o -5CP4OMwCZGx/jEqlL8oO7BwEgu9aEBxKvoIKJmHDTHgWIxgawTrKabmong4utnMI -yNrhsI77bmh2U7UCAwEAAaMQMA4wDAYDVR0PBAUDAwcGADANBgkqhkiG9w0BAQUF -AAOCAQEAuD8W9Ukkfyi0y65mwguFVAqBC3RSTMRXcjbLQV4rMDM/Q9kjA6acY4Ta -WgxGTwNCydqaqwDVsmn+6Je8Lp2xm9KLDLypVdNopGs+Mlfo55dhwqymXkQw1oJI -CPhR3nBmGEnSWW0UY9bPlpxRF2D5GDVwpuxDtXvWa4baPwRRI9MxwPWHA3ITl+fc -s9QVKy+pRAnuP9MSIp755cJ1CODOn2ElNCqnxxsZmcWcmI3LkHAwTmegl3PVvhrk -MKMEA/neshh/M/hWGNTFt77Hoa7pU9dv5RCWFvZPqsUgPrwGrmUvcmSDir3lSWQm -SuSED2LKVo+BFqwWS+jp49AR9b8B/Q== ------END CERTIFICATE----- diff --git a/samples/certificates/dianne.p12 b/samples/certificates/dianne.p12 deleted file mode 100755 index 6e5ba218db795c356e8c0aa5df637950e500f0d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1768 zcmV5p{H z@KGyZKM(YpXP|$!v=Z`&r_}of`Hb?dr|>EbzZ4AhI-Nr;UQ?jW$?E5B6&9x`m`5+x zek#|fKrRTLbQ*oAytH6XaiRoX#gXQ?<=~KhZ5>Ag*ytt`O5QApHH8t-nA=6|e4=*fKBLsjiY`aqwZ99UdyRcme`|(LamO0j1KRDNa5r_WH!UNrozVe$oMe*=n}Y#T-2Ql` zHrX1ab=Y|UDd zBW`LABJuJ%A-}^jpUv}td4d_BIBru*DA4Q9JG-^UJ9`&`lWBDq`569@ERD6Fpim4z z&Dr(QE_a4~qS8?md%GDQD;cS(OqPr>8xV7-Y7a`Z!52-3mDHX}$op?LWXED^^samlV-=MOuNbUPg-t9P5Mq@ zQ(vaiSG~FTD_sie|1^6yp0c4%8^V(OXe%zFa7aM+N$J-6*fJ-8--}&xXoyMpQ?ZNQ zaH?dq{MI;85ahEj1fh0<$=NLx@hydrwzOjHbBt8s6MB*`%=D{Ne1FzWTsKM0Vj|rL zadQ-`4-lmxuH%#GNl}aQsRTDnuo<$d+xdUD=pnEnCsZ_^ioO?~+5%T~%+d74-e2W{ zGIf!O1O!Z_RpD~0qa9{dB`ttSZROgKDjbuRs>c`5Ja1qZcXR*iDX#?>JL(ls(}IAt}LNVB08P}3Hl5Qwdq zO_Q@DL&%3ZT2XZ(Nzs3Z=Bqn0MeJI$!tymlL9aaUj}+#5iww?vCnq7u9KFk1#Co-^ z1eUU3a6te#K@q{o6p(>t+BqSKtpa^cy#?@bUw;HRWL4EplIOw4B>4>4@+t!0fPry2 zR*-tiB8Nj?-60br)p5xkFzTndzS<5kynQEmxj07I_?(Zw0EUV&b%`cwI60 zFgY+GFbM_)D-Ht!8U+9Z6!ipAu_Xa(fBcQjzWJh!5SV serial.txt -openssl x509 -CA ca.crt -passin pass:changeit -CAkey ca.key -CAserial serial.txt -req -in tomcat.csr -out tomcat.cer -days 36500 -rm serial.txt -keytool -storepass changeit -import -alias ca -file ca.crt -keytool -storepass changeit -import -alias tomcat -file tomcat.cer diff --git a/samples/certificates/localhost-with-ca/tomcat.cer b/samples/certificates/localhost-with-ca/tomcat.cer deleted file mode 100644 index f0569b6602..0000000000 --- a/samples/certificates/localhost-with-ca/tomcat.cer +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICkjCCAfsCAQMwDQYJKoZIhvcNAQEFBQAwPjELMAkGA1UEBhMCVVMxCzAJBgNV -BAgMAkNBMRAwDgYDVQQKDAdQaXZvdGFsMRAwDgYDVQQDDAdQaXZvdGFsMCAXDTEz -MDgwMTE0MzU1MVoYDzIxMTMwNzA4MTQzNTUxWjBfMQswCQYDVQQGEwJVUzELMAkG -A1UECBMCTU8xCzAJBgNVBAcTAktDMREwDwYDVQQKEwhTZWN1cml0eTEPMA0GA1UE -CxMGU3ByaW5nMRIwEAYDVQQDEwlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUA -A4IBDwAwggEKAoIBAQCKCyVI5D4h0lWU9D40P0kHkADWONRLQ9o0fcQvJmQaLwJN -tL0KpDiAwXiot4KKZWMGmYKoFtvhnd/t7ybZsODqsImDCZjKKvHaMTpFOyrl9SHW -PT7bvt7jBL47QqL/UJ0bApxVMmLD0DhcOmTkMmzm932F/he9w5z1nIsVl4POX+hQ -yyuuS+AvZdnUr5W2+COsvI1hsibrpnUnIvcXPHmSVrl4kD16OJ3Z/8Baia4mC3sy -pxqXCiBUeWbDsR5s9tZtMOJH7PpDbLsxGR3Zely4xWx7fmn/lW57EFyhMjXWZfUH -pTRsPWlFEYdTdnyM00MWWXrt+Y3kW9mb3w2DCf2fAgMBAAEwDQYJKoZIhvcNAQEF -BQADgYEAR1Y5IIfRrFIKTOc7gx4X2IOyByNdMYfd1+CWnEycUNuFwCE5iBJAbyN6 -yy2kViSFuTHwyJVD49QJNiFXOKZYmE8EFke1Y3nxwwe9MqfeTsrHpYGtpSZwDzv9 -64UM0qOPWxt+P9txQShcokldSt8BZ4iOJ9G6yY5EQdswE6rGkts= ------END CERTIFICATE----- diff --git a/samples/certificates/localhost-with-ca/tomcat.csr b/samples/certificates/localhost-with-ca/tomcat.csr deleted file mode 100644 index e6bbf82116..0000000000 --- a/samples/certificates/localhost-with-ca/tomcat.csr +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN NEW CERTIFICATE REQUEST----- -MIIC1DCCAbwCAQAwXzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1PMQswCQYDVQQHEwJLQzERMA8G -A1UEChMIU2VjdXJpdHkxDzANBgNVBAsTBlNwcmluZzESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjAN -BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAigslSOQ+IdJVlPQ+ND9JB5AA1jjUS0PaNH3ELyZk -Gi8CTbS9CqQ4gMF4qLeCimVjBpmCqBbb4Z3f7e8m2bDg6rCJgwmYyirx2jE6RTsq5fUh1j0+277e -4wS+O0Ki/1CdGwKcVTJiw9A4XDpk5DJs5vd9hf4XvcOc9ZyLFZeDzl/oUMsrrkvgL2XZ1K+Vtvgj -rLyNYbIm66Z1JyL3Fzx5kla5eJA9ejid2f/AWomuJgt7MqcalwogVHlmw7EebPbWbTDiR+z6Q2y7 -MRkd2XpcuMVse35p/5VuexBcoTI11mX1B6U0bD1pRRGHU3Z8jNNDFll67fmN5FvZm98Ngwn9nwID -AQABoDAwLgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQUpQODsrGvfB6TWTCIEEdx0OKB1+QwDQYJ -KoZIhvcNAQELBQADggEBACL6M4Htn6tEebOH8vj3R8cVcgebxshQV/KD7+tWUq2RSno4JndsYxEF -H3Zh3vWhh5Q0nH55s1C/kiKYNP0jQXheeAiH6hatiCpSssgvDnw653ivBgqT3mo8sy1jpw9Pdx7F -6JuCksus+aI9PUKuI3DXXyAxKJfc/JmnnCXsyZz8sVu66bMrIel0kAODN6Da35QohDuStNuplu/R -ZHoiapQi3dxmWctC30fz0y7xqRVbRUKWHE7YWXqtWjFusUjXtZJobMeEb6DLeFfRsJ50OG8kgyZy -TvWQ9kP3ODeDqq74xiy7NxwGH8ytsWEwpSC10Z35vWb++rtl963A2itoK4E= ------END NEW CERTIFICATE REQUEST----- diff --git a/samples/certificates/rod.p12 b/samples/certificates/rod.p12 deleted file mode 100755 index 4cd05644305bc4f37fed7284e3faec8d759ca607..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1784 zcmV+o2 z-1XypCipPV7v>@v0s;rnfPw}{P0Qr^yXYqvT)0wdjn7_cF52x95Oum`$&>QN;=3#q z@`4M4;%4QY6a=|1;@)l61OH1h3w2=4eQnPgJ@9_BRARM;H&rr-u!|iO^ z-E8aj3m=dQq&VCR@CO9}lU+z>(2G1^#V5Kst5$o(AFAYGwCkI^UjVR1OQVVAwjk-H zAE9(>sVC=|b(?wjWeEVzTR1hje5ZppIDtS%`xQuNw^Bh`ANJS&laAthnC$kBEEKY{ z2$c^;R-mO=Gci2~qCL>lAap+21e-M2B#s+53>!G`r2py!64;I%u>;y=vFbxPb9)h$nB%`rU-WSJ0t9G5jUGUlQG*IWxIvdew+eE ze67)6c(La76p_b6+K?pMYZQ1;t+o7vTmA^K!ScMD1gFjL4g!qsv815H$~=UcDQQjy zpib=DS-P_8lT}`C`R(&Y&MR(v)g=#*DZ(iLQyF##`$jOtQy18~i3xyg zaPvkmh~n7pk2?X2tc!_8nhX*DV=7zn^0Cv$WKC^v>a(jwXjHL^_w1($T`FMK^WIA0E6-Ibk7ftz43C-`B&E{yD2?`0T zQEXfKGg$y0eS;giVVT{@C;)^XrH)BHOc+5lxc?5O!}$ zlKck=be#ttIhf<64I^+n6Eq)$g>Bn}RX{?)b5g%e+QY2@_Kb?JqmKV+>OP%YGByf9 z(NSP7R#I#WAB%3N!;L6L57LEM1I1|VT6J$^pV@_yM2%33RnRTLCa+(ba3WwO6>g;4 z1VowM!(_>Ybrov|&JkP9W3}&c&U8XaNY>$c&d!3x-K;SJp4NFa&lWE3r2 zRY&>|Pc%LPYZM#F_{W-ECA%_3n*asGOy{QYiV`K*%6y~0(IkuVc{@8yw25y0I1dZp zNMQLOJ6X9(VqW%5LJ8~}bC+<{;U>Y4aS^^onQEX`E)LeTOdC`iwYp)&jAHe`O`?jm zQP74kvy8Q>sQOeYY-3{Xpn5M98QpNJ<;{tzB$l+92uBqbW&@%^N*5x#z&%KFMiYzS z51z3d;%f|LzHAClqV9B^-}cqq<#e-z#`5f6G}b70bg3p0@EJNA2x%BD`$-ul#xTOP z-W+%j7-*-t@p(0-{o+*M0sO5IAD^BF-vq7dF#&>vd!A`6ahmFYHObXCjtW6;m^JJg z&pWU`?~Z~g5~og{5sD2fi?_(wh5L9@RO-Qo3a=j&h|G0dHy^# zKdl2rJ=d>EghhIf^1m|%7oV{#uQc`}6%Whxo)tlWQt)xpD3SYR*3=Ha2nMX)FgY+GFbM_)D-Ht!8U+9Z6h0=3+$Ga8{-?Rpwy}ec8W~cY aA_Ne)6!9W(f=}drPhM~u0`Xu10te84%1hP& diff --git a/samples/certificates/scott.p12 b/samples/certificates/scott.p12 deleted file mode 100644 index f0a6357e730752bd6b2f05658ec8a1a85ade6de9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1768 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 diff --git a/samples/javaconfig/aspectj/spring-security-samples-javaconfig-aspectj.gradle b/samples/javaconfig/aspectj/spring-security-samples-javaconfig-aspectj.gradle deleted file mode 100644 index 6487a14d43..0000000000 --- a/samples/javaconfig/aspectj/spring-security-samples-javaconfig-aspectj.gradle +++ /dev/null @@ -1,20 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample' -apply plugin: 'io.freefair.aspectj.post-compile-weaving' - -repositories { - mavenCentral() -} - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-core') - - aspect project(':spring-security-aspects') - - runtime project(':spring-security-aspects') -} - -aspectj { - version = aspectjVersion -} - diff --git a/samples/javaconfig/aspectj/src/main/java/sample/aspectj/AspectjSecurityConfig.java b/samples/javaconfig/aspectj/src/main/java/sample/aspectj/AspectjSecurityConfig.java deleted file mode 100644 index 038b8271f3..0000000000 --- a/samples/javaconfig/aspectj/src/main/java/sample/aspectj/AspectjSecurityConfig.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.aspectj; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.AdviceMode; -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; - -/** - * @author Rob Winch - */ -@EnableGlobalMethodSecurity(mode = AdviceMode.ASPECTJ, securedEnabled = true) -public class AspectjSecurityConfig { - @Bean - public Service service() { - return new Service(); - } - - @Bean - public SecuredService securedService() { - return new SecuredService(); - } - - @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - auth.inMemoryAuthentication(); - } -} diff --git a/samples/javaconfig/aspectj/src/main/java/sample/aspectj/SecuredService.java b/samples/javaconfig/aspectj/src/main/java/sample/aspectj/SecuredService.java deleted file mode 100644 index 9f81cf1733..0000000000 --- a/samples/javaconfig/aspectj/src/main/java/sample/aspectj/SecuredService.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.aspectj; - -import org.springframework.security.access.annotation.Secured; - -/** - * Service which is secured on the class level - * - * @author Mike Wiesner - * @since 3.0 - */ -@Secured("ROLE_USER") -public class SecuredService { - - public void secureMethod() { - // nothing - } - -} diff --git a/samples/javaconfig/aspectj/src/main/java/sample/aspectj/Service.java b/samples/javaconfig/aspectj/src/main/java/sample/aspectj/Service.java deleted file mode 100644 index 70b8c0c71f..0000000000 --- a/samples/javaconfig/aspectj/src/main/java/sample/aspectj/Service.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.aspectj; - -import org.springframework.security.access.annotation.Secured; - -/** - * Service which is secured on method level - * - * @author Mike Wiesner - * @since 1.0 - */ -public class Service { - - @Secured("ROLE_USER") - public void secureMethod() { - // nothing - } - - public void publicMethod() { - // nothing - } - -} diff --git a/samples/javaconfig/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java b/samples/javaconfig/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java deleted file mode 100644 index 344de63e11..0000000000 --- a/samples/javaconfig/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.aspectj; - -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; - - -import org.springframework.security.core.Authentication; -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import java.lang.reflect.Proxy; - -import static org.assertj.core.api.Assertions.assertThat; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = AspectjSecurityConfig.class) -public class AspectJInterceptorTests { - private Authentication admin = new UsernamePasswordAuthenticationToken("test", "xxx", - AuthorityUtils.createAuthorityList("ROLE_ADMIN")); - private Authentication user = new UsernamePasswordAuthenticationToken("test", "xxx", - AuthorityUtils.createAuthorityList("ROLE_USER")); - - @Autowired - private Service service; - - @Autowired - private SecuredService securedService; - - @Test - public void publicMethod() { - service.publicMethod(); - } - - @Test(expected = AuthenticationCredentialsNotFoundException.class) - public void securedMethodNotAuthenticated() { - service.secureMethod(); - } - - @Test(expected = AccessDeniedException.class) - public void securedMethodWrongRole() { - SecurityContextHolder.getContext().setAuthentication(admin); - service.secureMethod(); - } - - @Test - public void securedMethodEverythingOk() { - SecurityContextHolder.getContext().setAuthentication(user); - service.secureMethod(); - } - - @Test(expected = AuthenticationCredentialsNotFoundException.class) - public void securedClassNotAuthenticated() { - securedService.secureMethod(); - } - - @Test(expected = AccessDeniedException.class) - public void securedClassWrongRole() { - SecurityContextHolder.getContext().setAuthentication(admin); - securedService.secureMethod(); - } - - @Test(expected = AccessDeniedException.class) - public void securedClassWrongRoleOnNewedInstance() { - SecurityContextHolder.getContext().setAuthentication(admin); - new SecuredService().secureMethod(); - } - - @Test - public void securedClassEverythingOk() { - SecurityContextHolder.getContext().setAuthentication(user); - securedService.secureMethod(); - new SecuredService().secureMethod(); - } - - // SEC-2595 - @Test - public void notProxy() { - assertThat(Proxy.isProxyClass(securedService.getClass())).isFalse(); - } - - @After - public void tearDown() { - SecurityContextHolder.clearContext(); - } -} diff --git a/samples/javaconfig/aspectj/src/test/resources/logback-test.xml b/samples/javaconfig/aspectj/src/test/resources/logback-test.xml deleted file mode 100644 index 2d51ba4180..0000000000 --- a/samples/javaconfig/aspectj/src/test/resources/logback-test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - diff --git a/samples/javaconfig/concurrency/spring-security-samples-javaconfig-concurrency.gradle b/samples/javaconfig/concurrency/spring-security-samples-javaconfig-concurrency.gradle deleted file mode 100644 index 7a8e417d8e..0000000000 --- a/samples/javaconfig/concurrency/spring-security-samples-javaconfig-concurrency.gradle +++ /dev/null @@ -1,20 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-core') - compile project(':spring-security-samples-javaconfig-messages') - compile project(':spring-security-web') - compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' - compile 'javax.validation:validation-api' - compile 'org.hibernate:hibernate-validator' - compile 'org.springframework:spring-jdbc' - compile 'org.springframework:spring-webmvc' - compile slf4jDependencies - - providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api' - providedCompile 'javax.servlet:javax.servlet-api:3.0.1' - - runtime 'ch.qos.logback:logback-classic' - runtime 'opensymphony:sitemesh' -} diff --git a/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java deleted file mode 100644 index c33dc58cf2..0000000000 --- a/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; -import org.springframework.security.web.session.HttpSessionEventPublisher; - -/** - * We customize {@link AbstractSecurityWebApplicationInitializer} to enable the - * {@link HttpSessionEventPublisher}. - * - * @author Rob Winch - */ -public class MessageSecurityWebApplicationInitializer extends - AbstractSecurityWebApplicationInitializer { - - @Override - protected boolean enableHttpSessionEventPublisher() { - return true; - } -} diff --git a/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index 45773f3eb7..0000000000 --- a/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; - -import static org.springframework.security.config.Customizer.withDefaults; - -@EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) -public class SecurityConfig extends WebSecurityConfigurerAdapter { - // @formatter:off - @Autowired - public void configureGlobal( - AuthenticationManagerBuilder auth) throws Exception { - auth - .inMemoryAuthentication() - .withUser("user").password("password").roles("USER"); - } - // @formatter:on - - // @formatter:off - @Override - protected void configure( - HttpSecurity http) throws Exception { - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .anyRequest().authenticated() - ) - .formLogin(withDefaults()) - .sessionManagement((sessionManagement) -> - sessionManagement - .sessionConcurrency((sessionConcurrency) -> - sessionConcurrency - .maximumSessions(1) - .expiredUrl("/login?expired") - ) - ); - } - // @formatter:on -} diff --git a/samples/javaconfig/concurrency/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/concurrency/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java deleted file mode 100644 index dd807f16d1..0000000000 --- a/samples/javaconfig/concurrency/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author Rob Winch - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SecurityConfig.class) -public class SecurityConfigTests { - - @Test - public void securityConfigurationLoads() { - } -} diff --git a/samples/javaconfig/data/spring-security-samples-javaconfig-data.gradle b/samples/javaconfig/data/spring-security-samples-javaconfig-data.gradle deleted file mode 100644 index 94680d9b97..0000000000 --- a/samples/javaconfig/data/spring-security-samples-javaconfig-data.gradle +++ /dev/null @@ -1,12 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-data') - compile 'javax.validation:validation-api' - compile 'org.eclipse.persistence:javax.persistence' - compile 'org.hibernate:hibernate-entitymanager' - compile 'org.hibernate:hibernate-validator' - compile 'org.hsqldb:hsqldb' - compile 'org.springframework.data:spring-data-jpa' -} diff --git a/samples/javaconfig/data/src/main/java/samples/DataConfig.java b/samples/javaconfig/data/src/main/java/samples/DataConfig.java deleted file mode 100644 index cd401a5df4..0000000000 --- a/samples/javaconfig/data/src/main/java/samples/DataConfig.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.DependsOn; -import org.springframework.core.io.ClassPathResource; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; -import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; -import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.orm.jpa.vendor.Database; -import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; -import org.springframework.security.data.repository.query.SecurityEvaluationContextExtension; -import org.springframework.transaction.PlatformTransactionManager; -import samples.data.Message; - -import javax.sql.DataSource; - -/** - * @author Rob Winch - */ -@Configuration -@ComponentScan -@EnableJpaRepositories -public class DataConfig { - - @Bean - public SecurityEvaluationContextExtension expressionEvaluationContextProvider() { - return new SecurityEvaluationContextExtension(); - } - - @Bean - public DataSource dataSource() { - EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder(); - return builder.setType(EmbeddedDatabaseType.HSQL).build(); - } - - @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactory() { - HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); - vendorAdapter.setDatabase(Database.HSQL); - vendorAdapter.setGenerateDdl(true); - - LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean(); - factory.setJpaVendorAdapter(vendorAdapter); - factory.setPackagesToScan(Message.class.getPackage().getName()); - factory.setDataSource(dataSource()); - - return factory; - } - - @Bean - @DependsOn("entityManagerFactory") - public ResourceDatabasePopulator initDatabase(DataSource dataSource) throws Exception { - ResourceDatabasePopulator populator = new ResourceDatabasePopulator(); - populator.addScript(new ClassPathResource("data.sql")); - populator.populate(dataSource.getConnection()); - return populator; - } - - @Bean - public PlatformTransactionManager transactionManager() { - JpaTransactionManager txManager = new JpaTransactionManager(); - txManager.setEntityManagerFactory(entityManagerFactory().getObject()); - return txManager; - } -} diff --git a/samples/javaconfig/data/src/main/java/samples/data/Message.java b/samples/javaconfig/data/src/main/java/samples/data/Message.java deleted file mode 100644 index 7c567e9c12..0000000000 --- a/samples/javaconfig/data/src/main/java/samples/data/Message.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.data; - -import java.util.Calendar; - -import javax.persistence.*; - -import org.hibernate.validator.constraints.NotEmpty; - -@Entity -public class Message { - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private Long id; - - @NotEmpty(message = "Message is required.") - private String text; - - @NotEmpty(message = "Summary is required.") - private String summary; - - private Calendar created = Calendar.getInstance(); - - @OneToOne - private User to; - - public User getTo() { - return to; - } - - public void setTo(User to) { - this.to = to; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Calendar getCreated() { - return created; - } - - public void setCreated(Calendar created) { - this.created = created; - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - - public String getSummary() { - return summary; - } - - public void setSummary(String summary) { - this.summary = summary; - } -} diff --git a/samples/javaconfig/data/src/main/java/samples/data/MessageRepository.java b/samples/javaconfig/data/src/main/java/samples/data/MessageRepository.java deleted file mode 100644 index c98a1d3fde..0000000000 --- a/samples/javaconfig/data/src/main/java/samples/data/MessageRepository.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.data; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** - * @author Rob Winch - */ -@Repository -public interface MessageRepository extends JpaRepository { -} diff --git a/samples/javaconfig/data/src/main/java/samples/data/SecurityMessageRepository.java b/samples/javaconfig/data/src/main/java/samples/data/SecurityMessageRepository.java deleted file mode 100644 index f6b2ac956d..0000000000 --- a/samples/javaconfig/data/src/main/java/samples/data/SecurityMessageRepository.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.data; - -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @author Rob Winch - */ -@Repository -public interface SecurityMessageRepository extends MessageRepository { - @Query("select m from Message m where m.to.id = ?#{ principal?.id }") - List findAll(); -} \ No newline at end of file diff --git a/samples/javaconfig/data/src/main/java/samples/data/User.java b/samples/javaconfig/data/src/main/java/samples/data/User.java deleted file mode 100644 index 15d4f37d77..0000000000 --- a/samples/javaconfig/data/src/main/java/samples/data/User.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.data; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; - -/** - * @author Rob Winch - */ -@Entity -public class User { - @GeneratedValue(strategy = GenerationType.AUTO) - @Id - private Long id; - - private String firstName; - - private String lastName; - - private String email; - - private String password; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } -} \ No newline at end of file diff --git a/samples/javaconfig/data/src/test/java/samples/data/SecurityMessageRepositoryTests.java b/samples/javaconfig/data/src/test/java/samples/data/SecurityMessageRepositoryTests.java deleted file mode 100644 index 9972659fd2..0000000000 --- a/samples/javaconfig/data/src/test/java/samples/data/SecurityMessageRepositoryTests.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.data; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import samples.DataConfig; - -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Rob Winch - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = DataConfig.class) -public class SecurityMessageRepositoryTests { - @Autowired - SecurityMessageRepository repository; - - User user; - - @Before - public void setup() { - user = new User(); - user.setId(0L); - List authorities = AuthorityUtils - .createAuthorityList("ROLE_USER"); - UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken( - user, "notused", authorities); - SecurityContextHolder.getContext().setAuthentication(authentication); - } - - @After - public void cleanup() { - SecurityContextHolder.clearContext(); - } - - @Test - public void findAllOnlyToCurrentUser() { - Long expectedId = user.getId(); - List messages = repository.findAll(); - assertThat(messages).hasSize(3); - for (Message m : messages) { - assertThat(m.getTo().getId()).isEqualTo(expectedId); - } - } -} diff --git a/samples/javaconfig/data/src/test/resources/data.sql b/samples/javaconfig/data/src/test/resources/data.sql deleted file mode 100644 index 97c60b155b..0000000000 --- a/samples/javaconfig/data/src/test/resources/data.sql +++ /dev/null @@ -1,10 +0,0 @@ -insert into user(id,email,password,firstName,lastName) values (0,'rob@example.com','password','Rob','Winch'); -insert into user(id,email,password,firstName,lastName) values (1,'luke@example.com','password','Luke','Taylor'); - -insert into message(id,created,to_id,summary,text) values (100,'2014-07-10 10:00:00',0,'Hello Rob','This message is for Rob'); -insert into message(id,created,to_id,summary,text) values (101,'2014-07-10 14:00:00',0,'How are you Rob?','This message is for Rob'); -insert into message(id,created,to_id,summary,text) values (102,'2014-07-11 22:00:00',0,'Is this secure?','This message is for Rob'); - -insert into message(id,created,to_id,summary,text) values (110,'2014-07-12 10:00:00',1,'Hello Luke','This message is for Luke'); -insert into message(id,created,to_id,summary,text) values (111,'2014-07-12 10:00:00',1,'Greetings Luke','This message is for Luke'); -insert into message(id,created,to_id,summary,text) values (112,'2014-07-12 10:00:00',1,'Is this secure?','This message is for Luke'); \ No newline at end of file diff --git a/samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle b/samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle deleted file mode 100644 index 3dee895966..0000000000 --- a/samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-core') - compile project(':spring-security-samples-javaconfig-messages') - compile project(':spring-security-web') - compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' - compile 'javax.validation:validation-api' - compile 'org.hibernate:hibernate-validator' - compile 'org.springframework:spring-webmvc' - compile slf4jDependencies - - compile 'javax.xml.bind:jaxb-api' - compile 'com.sun.xml.bind:jaxb-core' - compile 'com.sun.xml.bind:jaxb-impl' - - providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api' - providedCompile 'javax.servlet:javax.servlet-api' - - runtime 'opensymphony:sitemesh' - - integrationTestCompile seleniumDependencies -} diff --git a/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/FormJcTests.java b/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/FormJcTests.java deleted file mode 100644 index 1ca1e669a1..0000000000 --- a/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/FormJcTests.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import org.springframework.security.samples.pages.HomePage; -import org.springframework.security.samples.pages.LoginPage; - -/** - * @author Michael Simons - */ -public class FormJcTests { - private WebDriver driver; - - private int port; - - @Before - public void setup() { - this.port = Integer.parseInt(System.getProperty("app.httpPort")); - this.driver = new HtmlUnitDriver(); - } - - @After - public void tearDown() { - this.driver.quit(); - } - - @Test - public void accessHomePageWithUnauthenticatedUserSendsToLoginPage() { - final LoginPage loginPage = HomePage.to(this.driver, this.port); - loginPage.assertAt(); - } - - @Test - public void authenticatedUserIsSentToOriginalPage() { - final String userName = "user"; - final HomePage homePage = HomePage.to(this.driver, this.port) - .loginForm() - .username(userName) - .password("password") - .submit(); - homePage - .assertAt() - .andTheUserNameDisplayedIs(userName); - } - - @Test - public void authenticatedUserLogsOut() { - LoginPage loginPage = HomePage.to(this.driver, this.port) - .loginForm() - .username("user") - .password("password") - .submit() - .logout(); - loginPage.assertAt(); - - loginPage = HomePage.to(this.driver, this.port); - loginPage.assertAt(); - } -} diff --git a/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java b/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java deleted file mode 100644 index 22ddd1c639..0000000000 --- a/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Michael Simons - */ -public class HomePage { - private final WebDriver webDriver; - - @FindBy(css = "input[type=submit]") - private WebElement logoutButton; - - public static LoginPage to(WebDriver driver, int port) { - driver.get("http://localhost:" + port +"/"); - return PageFactory.initElements(driver, LoginPage.class); - } - - public HomePage(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public Content assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("SecureMail: View All"); - return PageFactory.initElements(this.webDriver, Content.class); - } - - public LoginPage logout() { - this.logoutButton.submit(); - return PageFactory.initElements(this.webDriver, LoginPage.class); - } - - public static class Content { - @FindBy(css = "p.navbar-text") - private WebElement message; - - public Content andTheUserNameDisplayedIs(final String userName) { - assertThat(message.getText()).isEqualTo(userName); - return this; - } - } -} diff --git a/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java b/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java deleted file mode 100644 index af6fbaa988..0000000000 --- a/samples/javaconfig/form/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Michael Simons - */ -public class LoginPage { - - private final WebDriver webDriver; - - private final LoginForm loginForm; - - public LoginPage(WebDriver webDriver) { - this.webDriver = webDriver; - this.loginForm = PageFactory.initElements(this.webDriver, LoginForm.class); - } - - public LoginPage assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("SecureMail: Please Login"); - return this; - } - - public LoginForm loginForm() { - return this.loginForm; - } - - public static class LoginForm { - private WebDriver webDriver; - private WebElement username; - private WebElement password; - @FindBy(css = "button[type=submit]") - private WebElement submit; - - public LoginForm(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public LoginForm username(String username) { - this.username.sendKeys(username); - return this; - } - - public LoginForm password(String password) { - this.password.sendKeys(password); - return this; - } - - public HomePage submit() { - this.submit.click(); - return PageFactory.initElements(this.webDriver, HomePage.class); - } - } -} diff --git a/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java deleted file mode 100644 index f851f82de0..0000000000 --- a/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; - -/** - * No customizations of {@link AbstractSecurityWebApplicationInitializer} are necessary. - * - * @author Rob Winch - */ -public class MessageSecurityWebApplicationInitializer extends - AbstractSecurityWebApplicationInitializer { -} diff --git a/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index 8f9cbba6f6..0000000000 --- a/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.core.userdetails.User; - -@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - // @formatter:off - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .antMatchers("/resources/**").permitAll() - .anyRequest().authenticated() - ) - .formLogin((formLogin) -> - formLogin - .loginPage("/login") - .permitAll() - ) - .logout((logout) -> - logout - .permitAll() - ); - } - // @formatter:on - - // @formatter:off - @Autowired - public void configureGlobal( - AuthenticationManagerBuilder auth) throws Exception { - auth - .inMemoryAuthentication() - .withUser(User.withDefaultPasswordEncoder().username("user").password("password").roles("USER")); - } - // @formatter:on -} diff --git a/samples/javaconfig/form/src/main/resources/logback.xml b/samples/javaconfig/form/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/javaconfig/form/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/javaconfig/form/src/main/resources/views/login.html b/samples/javaconfig/form/src/main/resources/views/login.html deleted file mode 100644 index c28c5b2add..0000000000 --- a/samples/javaconfig/form/src/main/resources/views/login.html +++ /dev/null @@ -1,24 +0,0 @@ - - - Please Login - - -

-
-
- Please Login -
Invalid - username and password.
-
You - have been logged out.
- - -
- -
-
-
-
- - \ No newline at end of file diff --git a/samples/javaconfig/form/src/main/webapp/WEB-INF/views/login.jspx b/samples/javaconfig/form/src/main/webapp/WEB-INF/views/login.jspx deleted file mode 100644 index 1f472ba566..0000000000 --- a/samples/javaconfig/form/src/main/webapp/WEB-INF/views/login.jspx +++ /dev/null @@ -1,36 +0,0 @@ - - - - -Please Login - - - - -
- Please Login - -
- Invalid username and password. -
- - -
- You have been logged out. -
- - - - - -
- -
-
- - - - diff --git a/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/compose.jspx b/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/compose.jspx deleted file mode 100644 index a92f7e2d6c..0000000000 --- a/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/compose.jspx +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Compose - - -
-

Messages : Create

- - - - - - -
- -
- -
- - - \ No newline at end of file diff --git a/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/inbox.jspx b/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/inbox.jspx deleted file mode 100644 index ed02d313c6..0000000000 --- a/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/inbox.jspx +++ /dev/null @@ -1,40 +0,0 @@ - - - - - Inbox - - -

Inbox

- - - - - - - - - - - - - - - - - - - - - - - -
CreatedSummary
You have not received any mail yet.
- - - \ No newline at end of file diff --git a/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/show.jspx b/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/show.jspx deleted file mode 100644 index 82007c267b..0000000000 --- a/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/show.jspx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - <c:out value="${message.summary}"/> - - -
-

Message :

-
-
Created
-
-
Message
-
-
-
- - - \ No newline at end of file diff --git a/samples/javaconfig/form/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/form/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java deleted file mode 100644 index dd807f16d1..0000000000 --- a/samples/javaconfig/form/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author Rob Winch - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SecurityConfig.class) -public class SecurityConfigTests { - - @Test - public void securityConfigurationLoads() { - } -} diff --git a/samples/javaconfig/hellojs/spring-security-samples-javaconfig-hellojs.gradle b/samples/javaconfig/hellojs/spring-security-samples-javaconfig-hellojs.gradle deleted file mode 100644 index 86700d410d..0000000000 --- a/samples/javaconfig/hellojs/spring-security-samples-javaconfig-hellojs.gradle +++ /dev/null @@ -1,20 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-core') - compile project(':spring-security-samples-javaconfig-messages') - compile project(':spring-security-web') - compile 'com.fasterxml.jackson.core:jackson-databind' - compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' - compile 'javax.validation:validation-api' - compile 'org.hibernate:hibernate-validator' - compile 'org.springframework:spring-jdbc' - compile 'org.springframework:spring-webmvc' - compile slf4jDependencies - - providedCompile 'javax.servlet:javax.servlet-api' - providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api' - - runtime 'opensymphony:sitemesh' -} diff --git a/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java deleted file mode 100644 index f851f82de0..0000000000 --- a/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; - -/** - * No customizations of {@link AbstractSecurityWebApplicationInitializer} are necessary. - * - * @author Rob Winch - */ -public class MessageSecurityWebApplicationInitializer extends - AbstractSecurityWebApplicationInitializer { -} diff --git a/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index 595d2413e0..0000000000 --- a/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; - -@EnableWebSecurity -public class SecurityConfig { - - // @formatter:off - @Autowired - public void configureGlobal( - AuthenticationManagerBuilder auth) throws Exception { - auth - .inMemoryAuthentication() - .withUser("user").password("{noop}password").roles("USER"); - } - // @formatter:on -} diff --git a/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java b/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java deleted file mode 100644 index 696d3c75e7..0000000000 --- a/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.mvc; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Optional; - -import javax.validation.Valid; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.samples.data.Message; -import org.springframework.security.samples.data.MessageRepository; -import org.springframework.stereotype.Controller; -import org.springframework.validation.BindingResult; -import org.springframework.validation.ObjectError; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -@Controller -@RequestMapping(value = "/", produces = "application/json") -public class MessageJsonController { - private MessageRepository messageRepository; - - @Autowired - public MessageJsonController(MessageRepository messageRepository) { - this.messageRepository = messageRepository; - } - - @RequestMapping - public ResponseEntity> list() { - Iterable messages = messageRepository.findAll(); - return new ResponseEntity<>(messages, HttpStatus.OK); - } - - @RequestMapping("{id}") - public ResponseEntity> view(@PathVariable Long id) { - Optional message = messageRepository.findById(id); - return new ResponseEntity<>(message, HttpStatus.OK); - } - - @RequestMapping(method = RequestMethod.POST, consumes = "application/json") - public ResponseEntity create(@Valid @RequestBody Message message, - BindingResult result, RedirectAttributes redirect) { - if (result.hasErrors()) { - List errors = new ArrayList<>(result.getErrorCount()); - for (ObjectError r : result.getAllErrors()) { - errors.add(r.getDefaultMessage()); - } - return new ResponseEntity<>(errors, HttpStatus.BAD_REQUEST); - } - message.setCreated(Calendar.getInstance()); - message = messageRepository.save(message); - return new ResponseEntity<>(message, HttpStatus.OK); - } -} diff --git a/samples/javaconfig/hellojs/src/main/resources/resources/js/bootstrap.js b/samples/javaconfig/hellojs/src/main/resources/resources/js/bootstrap.js deleted file mode 100644 index ee5a14587b..0000000000 --- a/samples/javaconfig/hellojs/src/main/resources/resources/js/bootstrap.js +++ /dev/null @@ -1,2280 +0,0 @@ -/* =================================================== - * bootstrap-transition.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CSS TRANSITION SUPPORT (https://www.modernizr.com/) - * ======================================================= */ - - $(function () { - - $.support.transition = (function () { - - var transitionEnd = (function () { - - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd otransitionend' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } - - }()) - - return transitionEnd && { - end: transitionEnd - } - - })() - - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function (el) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype.close = function (e) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent.trigger(e = $.Event('close')) - - if (e.isDefaultPrevented()) return - - $parent.removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.alert - - $.fn.alert = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT NO CONFLICT - * ================= */ - - $.fn.alert.noConflict = function () { - $.fn.alert = old - return this - } - - - /* ALERT DATA-API - * ============== */ - - $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) - -}(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype.setState = function (state) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - Button.prototype.toggle = function () { - var $parent = this.$element.closest('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - var old = $.fn.button - - $.fn.button = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON NO CONFLICT - * ================== */ - - $.fn.button.noConflict = function () { - $.fn.button = old - return this - } - - - /* BUTTON DATA-API - * =============== */ - - $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.$indicators = this.$element.find('.carousel-indicators') - this.options = options - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function (e) { - if (!e) this.paused = false - if (this.interval) clearInterval(this.interval); - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - return this - } - - , getActiveIndex: function () { - this.$active = this.$element.find('.item.active') - this.$items = this.$active.parent().children() - return this.$items.index(this.$active) - } - - , to: function (pos) { - var activeIndex = this.getActiveIndex() - , that = this - - if (pos > (this.$items.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activeIndex == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) - } - - , pause: function (e) { - if (!e) this.paused = true - if (this.$element.find('.next, .prev').length && $.support.transition.end) { - this.$element.trigger($.support.transition.end) - this.cycle(true) - } - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.item.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - , e - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - e = $.Event('slide', { - relatedTarget: $next[0] - , direction: direction - }) - - if ($next.hasClass('active')) return - - if (this.$indicators.length) { - this.$indicators.find('.active').removeClass('active') - this.$element.one('slid', function () { - var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) - $nextIndicator && $nextIndicator.addClass('active') - }) - } - - if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.carousel - - $.fn.carousel = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) - , action = typeof option == 'string' ? option : options.slide - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (action) data[action]() - else if (options.interval) data.pause().cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL NO CONFLICT - * ==================== */ - - $.fn.carousel.noConflict = function () { - $.fn.carousel = old - return this - } - - /* CAROUSEL DATA-API - * ================= */ - - $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = $.extend({}, $target.data(), $this.data()) - , slideIndex - - $target.carousel(options) - - if (slideIndex = $this.attr('data-slide-to')) { - $target.data('carousel').pause().to(slideIndex).cycle() - } - - e.preventDefault() - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options.parent) { - this.$parent = $(this.options.parent) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension - , scroll - , actives - , hasData - - if (this.transitioning || this.$element.hasClass('in')) return - - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') - - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - $.support.transition && this.$element[dimension](this.$element[0][scroll]) - } - - , hide: function () { - var dimension - if (this.transitioning || !this.$element.hasClass('in')) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } - - , reset: function (size) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } - - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - - this.transitioning = 1 - - this.$element[method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* COLLAPSE PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.collapse - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSE NO CONFLICT - * ==================== */ - - $.fn.collapse.noConflict = function () { - $.fn.collapse = old - return this - } - - - /* COLLAPSE DATA-API - * ================= */ - - $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') - $(target).collapse(option) - }) - -}(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle=dropdown]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function (e) { - var $this = $(this) - , $parent - , isActive - - if ($this.is('.disabled, :disabled')) return - - $parent = getParent($this) - - isActive = $parent.hasClass('open') - - clearMenus() - - if (!isActive) { - if ('ontouchstart' in document.documentElement) { - // if mobile we we use a backdrop because click events don't delegate - $('
').insertBefore($(this)).on('click', clearMenus) - } - $parent.toggleClass('open') - } - - $this.focus() - - return false - } - - , keydown: function (e) { - var $this - , $items - , $active - , $parent - , isActive - , index - - if (!/(38|40|27)/.test(e.keyCode)) return - - $this = $(this) - - e.preventDefault() - e.stopPropagation() - - if ($this.is('.disabled, :disabled')) return - - $parent = getParent($this) - - isActive = $parent.hasClass('open') - - if (!isActive || (isActive && e.keyCode == 27)) { - if (e.which == 27) $parent.find(toggle).focus() - return $this.click() - } - - $items = $('[role=menu] li:not(.divider):visible a', $parent) - - if (!$items.length) return - - index = $items.index($items.filter(':focus')) - - if (e.keyCode == 38 && index > 0) index-- // up - if (e.keyCode == 40 && index < $items.length - 1) index++ // down - if (!~index) index = 0 - - $items - .eq(index) - .focus() - } - - } - - function clearMenus() { - $('.dropdown-backdrop').remove() - $(toggle).each(function () { - getParent($(this)).removeClass('open') - }) - } - - function getParent($this) { - var selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = selector && $(selector) - - if (!$parent || !$parent.length) $parent = $this.parent() - - return $parent - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.dropdown - - $.fn.dropdown = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* DROPDOWN NO CONFLICT - * ==================== */ - - $.fn.dropdown.noConflict = function () { - $.fn.dropdown = old - return this - } - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(document) - .on('click.dropdown.data-api', clearMenus) - .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) - -}(window.jQuery); -/* ========================================================= - * bootstrap-modal.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ========================================================= */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function (element, options) { - this.options = options - this.$element = $(element) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - this.options.remote && this.$element.find('.modal-body').load(this.options.remote) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - , e = $.Event('show') - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - this.isShown = true - - this.escape() - - this.backdrop(function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position - } - - that.$element.show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element - .addClass('in') - .attr('aria-hidden', false) - - that.enforceFocus() - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) : - that.$element.focus().trigger('shown') - - }) - } - - , hide: function (e) { - e && e.preventDefault() - - var that = this - - e = $.Event('hide') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - this.escape() - - $(document).off('focusin.modal') - - this.$element - .removeClass('in') - .attr('aria-hidden', true) - - $.support.transition && this.$element.hasClass('fade') ? - this.hideWithTransition() : - this.hideModal() - } - - , enforceFocus: function () { - var that = this - $(document).on('focusin.modal', function (e) { - if (that.$element[0] !== e.target && !that.$element.has(e.target).length) { - that.$element.focus() - } - }) - } - - , escape: function () { - var that = this - if (this.isShown && this.options.keyboard) { - this.$element.on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - this.$element.off('keyup.dismiss.modal') - } - } - - , hideWithTransition: function () { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - that.hideModal() - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - that.hideModal() - }) - } - - , hideModal: function () { - var that = this - this.$element.hide() - this.backdrop(function () { - that.removeBackdrop() - that.$element.trigger('hidden') - }) - } - - , removeBackdrop: function () { - this.$backdrop && this.$backdrop.remove() - this.$backdrop = null - } - - , backdrop: function (callback) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
') - .appendTo(document.body) - - this.$backdrop.click( - this.options.backdrop == 'static' ? - $.proxy(this.$element[0].focus, this.$element[0]) - : $.proxy(this.hide, this) - ) - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - if (!callback) return - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (callback) { - callback() - } - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.modal - - $.fn.modal = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL NO CONFLICT - * ================= */ - - $.fn.modal.noConflict = function () { - $.fn.modal = old - return this - } - - - /* MODAL DATA-API - * ============== */ - - $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) { - var $this = $(this) - , href = $this.attr('href') - , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data()) - - e.preventDefault() - - $target - .modal(option) - .one('hide', function () { - $this.focus() - }) - }) - -}(window.jQuery); -/* =========================================================== - * bootstrap-tooltip.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function (element, options) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function (type, element, options) { - var eventIn - , eventOut - , triggers - , trigger - , i - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - triggers = this.options.trigger.split(' ') - - for (i = triggers.length; i--;) { - trigger = triggers[i] - if (trigger == 'click') { - this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) - } else if (trigger != 'manual') { - eventIn = trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) - } - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function (e) { - var defaults = $.fn[this.type].defaults - , options = {} - , self - - this._options && $.each(this._options, function (key, value) { - if (defaults[key] != value) options[key] = value - }, this) - - self = $(e.currentTarget)[this.type](options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) return self.show() - - clearTimeout(this.timeout) - self.hoverState = 'in' - this.timeout = setTimeout(function() { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } - - , leave: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (this.timeout) clearTimeout(this.timeout) - if (!self.options.delay || !self.options.delay.hide) return self.hide() - - self.hoverState = 'out' - this.timeout = setTimeout(function() { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } - - , show: function () { - var $tip - , pos - , actualWidth - , actualHeight - , placement - , tp - , e = $.Event('show') - - if (this.hasContent() && this.enabled) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - $tip - .detach() - .css({ top: 0, left: 0, display: 'block' }) - - this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) - - pos = this.getPosition() - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - this.applyPlacement(tp, placement) - this.$element.trigger('shown') - } - } - - , applyPlacement: function(offset, placement){ - var $tip = this.tip() - , width = $tip[0].offsetWidth - , height = $tip[0].offsetHeight - , actualWidth - , actualHeight - , delta - , replace - - $tip - .offset(offset) - .addClass(placement) - .addClass('in') - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - if (placement == 'top' && actualHeight != height) { - offset.top = offset.top + height - actualHeight - replace = true - } - - if (placement == 'bottom' || placement == 'top') { - delta = 0 - - if (offset.left < 0){ - delta = offset.left * -2 - offset.left = 0 - $tip.offset(offset) - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - } - - this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') - } else { - this.replaceArrow(actualHeight - height, actualHeight, 'top') - } - - if (replace) $tip.offset(offset) - } - - , replaceArrow: function(delta, dimension, position){ - this - .arrow() - .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') - } - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - - $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - , e = $.Event('hide') - - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).detach() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.detach() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.detach() - - this.$element.trigger('hidden') - - return this - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function () { - var el = this.$element[0] - return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { - width: el.offsetWidth - , height: el.offsetHeight - }, this.$element.offset()) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , arrow: function(){ - return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow") - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function (e) { - var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this - self.tip().hasClass('in') ? self.hide() : self.show() - } - - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - var old = $.fn.tooltip - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , placement: 'top' - , selector: false - , template: '
' - , trigger: 'hover focus' - , title: '' - , delay: 0 - , html: false - , container: false - } - - - /* TOOLTIP NO CONFLICT - * =================== */ - - $.fn.tooltip.noConflict = function () { - $.fn.tooltip = old - return this - } - -}(window.jQuery); -/* =========================================================== - * bootstrap-popover.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * =========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* POPOVER PUBLIC CLASS DEFINITION - * =============================== */ - - var Popover = function (element, options) { - this.init('popover', element, options) - } - - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - || $e.attr('data-content') - - return content - } - - , tip: function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.popover - - $.fn.popover = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , trigger: 'click' - , content: '' - , template: '

' - }) - - - /* POPOVER NO CONFLICT - * =================== */ - - $.fn.popover.noConflict = function () { - $.fn.popover = old - return this - } - -}(window.jQuery); -/* ============================================================= - * bootstrap-scrollspy.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ============================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy(element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body') - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - var self = this - , $targets - - this.offsets = $([]) - this.targets = $([]) - - $targets = this.$body - .find(this.selector) - .map(function () { - var $el = $(this) - , href = $el.data('target') || $el.attr('href') - , $href = /^#\w/.test(href) && $(href) - return ( $href - && $href.length - && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null - }) - .sort(function (a, b) { return a[0] - b[0] }) - .each(function () { - self.offsets.push(this[0]) - self.targets.push(this[1]) - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight - , maxScroll = scrollHeight - this.$scrollElement.height() - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - if (scrollTop >= maxScroll) { - return activeTarget != (i = targets.last()[0]) - && this.activate ( i ) - } - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - , selector - - this.activeTarget = target - - $(this.selector) - .parent('.active') - .removeClass('active') - - selector = this.selector - + '[data-target="' + target + '"],' - + this.selector + '[href="' + target + '"]' - - active = $(selector) - .parent('li') - .addClass('active') - - if (active.parent('.dropdown-menu').length) { - active = active.closest('li.dropdown').addClass('active') - } - - active.trigger('activate') - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - var old = $.fn.scrollspy - - $.fn.scrollspy = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY NO CONFLICT - * ===================== */ - - $.fn.scrollspy.noConflict = function () { - $.fn.scrollspy = old - return this - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(window).on('load', function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ======================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function (element) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - , e - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active:last a')[0] - - e = $.Event('show', { - relatedTarget: previous - }) - - $this.trigger(e) - - if (e.isDefaultPrevented()) return - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - var old = $.fn.tab - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB NO CONFLICT - * =============== */ - - $.fn.tab.noConflict = function () { - $.fn.tab = old - return this - } - - - /* TAB DATA-API - * ============ */ - - $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ============================================================ */ - - -!function($){ - - "use strict"; // jshint ;_; - - - /* TYPEAHEAD PUBLIC CLASS DEFINITION - * ================================= */ - - var Typeahead = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.updater = this.options.updater || this.updater - this.source = this.options.source - this.$menu = $(this.options.menu) - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element - .val(this.updater(val)) - .change() - return this.hide() - } - - , updater: function (item) { - return item - } - - , show: function () { - var pos = $.extend({}, this.$element.position(), { - height: this.$element[0].offsetHeight - }) - - this.$menu - .insertAfter(this.$element) - .css({ - top: pos.top + pos.height - , left: pos.left - }) - .show() - - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var items - - this.query = this.$element.val() - - if (!this.query || this.query.length < this.options.minLength) { - return this.shown ? this.hide() : this - } - - items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source - - return items ? this.process(items) : this - } - - , process: function (items) { - var that = this - - items = $.grep(items, function (item) { - return that.matcher(item) - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') - return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('focus', $.proxy(this.focus, this)) - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if (this.eventSupported('keydown')) { - this.$element.on('keydown', $.proxy(this.keydown, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - .on('mouseleave', 'li', $.proxy(this.mouseleave, this)) - } - - , eventSupported: function(eventName) { - var isSupported = eventName in this.$element - if (!isSupported) { - this.$element.setAttribute(eventName, 'return;') - isSupported = typeof this.$element[eventName] === 'function' - } - return isSupported - } - - , move: function (e) { - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - e.preventDefault() - this.prev() - break - - case 40: // down arrow - e.preventDefault() - this.next() - break - } - - e.stopPropagation() - } - - , keydown: function (e) { - this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27]) - this.move(e) - } - - , keypress: function (e) { - if (this.suppressKeyPressRepeat) return - this.move(e) - } - - , keyup: function (e) { - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - case 16: // shift - case 17: // ctrl - case 18: // alt - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - if (!this.shown) return - this.hide() - break - - default: - this.lookup() - } - - e.stopPropagation() - e.preventDefault() - } - - , focus: function (e) { - this.focused = true - } - - , blur: function (e) { - this.focused = false - if (!this.mousedover && this.shown) this.hide() - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - this.$element.focus() - } - - , mouseenter: function (e) { - this.mousedover = true - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - , mouseleave: function (e) { - this.mousedover = false - if (!this.focused && this.shown) this.hide() - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - var old = $.fn.typeahead - - $.fn.typeahead = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
    ' - , item: '
    • ' - , minLength: 1 - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD NO CONFLICT - * =================== */ - - $.fn.typeahead.noConflict = function () { - $.fn.typeahead = old - return this - } - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - $this.typeahead($this.data()) - }) - -}(window.jQuery); -/* ========================================================== - * bootstrap-affix.js v2.3.2 - * https://twitter.github.com/bootstrap/javascript.html#affix - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * 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. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* AFFIX CLASS DEFINITION - * ====================== */ - - var Affix = function (element, options) { - this.options = $.extend({}, $.fn.affix.defaults, options) - this.$window = $(window) - .on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) - .on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this)) - this.$element = $(element) - this.checkPosition() - } - - Affix.prototype.checkPosition = function () { - if (!this.$element.is(':visible')) return - - var scrollHeight = $(document).height() - , scrollTop = this.$window.scrollTop() - , position = this.$element.offset() - , offset = this.options.offset - , offsetBottom = offset.bottom - , offsetTop = offset.top - , reset = 'affix affix-top affix-bottom' - , affix - - if (typeof offset != 'object') offsetBottom = offsetTop = offset - if (typeof offsetTop == 'function') offsetTop = offset.top() - if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() - - affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? - false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? - 'bottom' : offsetTop != null && scrollTop <= offsetTop ? - 'top' : false - - if (this.affixed === affix) return - - this.affixed = affix - this.unpin = affix == 'bottom' ? position.top - scrollTop : null - - this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) - } - - - /* AFFIX PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.affix - - $.fn.affix = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('affix') - , options = typeof option == 'object' && option - if (!data) $this.data('affix', (data = new Affix(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.affix.Constructor = Affix - - $.fn.affix.defaults = { - offset: 0 - } - - - /* AFFIX NO CONFLICT - * ================= */ - - $.fn.affix.noConflict = function () { - $.fn.affix = old - return this - } - - - /* AFFIX DATA-API - * ============== */ - - $(window).on('load', function () { - $('[data-spy="affix"]').each(function () { - var $spy = $(this) - , data = $spy.data() - - data.offset = data.offset || {} - - data.offsetBottom && (data.offset.bottom = data.offsetBottom) - data.offsetTop && (data.offset.top = data.offsetTop) - - $spy.affix(data) - }) - }) - - -}(window.jQuery); \ No newline at end of file diff --git a/samples/javaconfig/hellojs/src/main/resources/resources/js/jquery-3.5.1.min.js b/samples/javaconfig/hellojs/src/main/resources/resources/js/jquery-3.5.1.min.js deleted file mode 100644 index b0614034ad..0000000000 --- a/samples/javaconfig/hellojs/src/main/resources/resources/js/jquery-3.5.1.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
    "],col:[2,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="
    ",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0a.a.k(e,b[c])&&e.push(b[c]);return e},Z:function(a,b){a=a||[];for(var e=[],c=0,d=a.length;cd?c&&b.push(e):c||b.splice(d,1)}, -extend:function(a,b){if(b)for(var e in b)b.hasOwnProperty(e)&&(a[e]=b[e]);return a},w:b,oa:function(b){for(;b.firstChild;)a.removeNode(b.firstChild)},Mb:function(b){b=a.a.N(b);for(var e=s.createElement("div"),c=0,d=b.length;ce?a.setAttribute("selected",b):a.selected=b},F:function(a){return null===a||a===q?"":a.trim?a.trim():a.toString().replace(/^[\s\xa0]+|[\s\xa0]+$/g,"")},Wb:function(b,e){for(var c=[],d=(b||"").split(e),g=0,f=d.length;ga.length?!1:a.substring(0,b.length)=== -b},yb:function(a,b){if(b.compareDocumentPosition)return 16==(b.compareDocumentPosition(a)&16);for(;null!=a;){if(a==b)return!0;a=a.parentNode}return!1},aa:function(b){return a.a.yb(b,b.ownerDocument)},pb:function(b){return!!a.a.La(b,a.a.aa)},u:function(a){return a&&a.tagName&&a.tagName.toLowerCase()},o:function(b,d,k){var f=e&&g[d];if(f||"undefined"==typeof t)if(f||"function"!=typeof b.addEventListener)if("undefined"!=typeof b.attachEvent){var n=function(a){k.call(b,a)},p="on"+d;b.attachEvent(p,n); -a.a.C.ia(b,function(){b.detachEvent(p,n)})}else throw Error("Browser doesn't support addEventListener or attachEvent");else b.addEventListener(d,k,!1);else{if(c(b,d)){var r=k;k=function(a,b){var e=this.checked;b&&(this.checked=!0!==b.sb);r.call(this,a);this.checked=e}}t(b).bind(d,k)}},Ga:function(a,b){if(!a||!a.nodeType)throw Error("element must be a DOM node when calling triggerEvent");if("undefined"!=typeof t){var e=[];c(a,b)&&e.push({sb:a.checked});t(a).trigger(b,e)}else if("function"==typeof s.createEvent)if("function"== -typeof a.dispatchEvent)e=s.createEvent(f[b]||"HTMLEvents"),e.initEvent(b,!0,!0,w,0,0,0,0,0,!1,!1,!1,!1,0,a),a.dispatchEvent(e);else throw Error("The supplied element doesn't support dispatchEvent");else if("undefined"!=typeof a.fireEvent)c(a,b)&&(a.checked=!0!==a.checked),a.fireEvent("on"+b);else throw Error("Browser doesn't support triggering events");},c:function(b){return a.T(b)?b():b},ya:function(b){return a.T(b)?b.t():b},ga:function(b,e,c){if(e){var d=/\S+/g,g=b.className.match(d)||[];a.a.p(e.match(d), -function(b){a.a.ja(g,b,c)});b.className=g.join(" ")}},ib:function(b,e){var c=a.a.c(e);if(null===c||c===q)c="";var d=a.e.firstChild(b);!d||3!=d.nodeType||a.e.nextSibling(d)?a.e.P(b,[s.createTextNode(c)]):d.data=c;a.a.Bb(b)},gb:function(a,b){a.name=b;if(7>=e)try{a.mergeAttributes(s.createElement(""),!1)}catch(c){}},Bb:function(a){9<=e&&(a=1==a.nodeType?a:a.parentNode,a.style&&(a.style.zoom=a.style.zoom))},zb:function(a){if(e){var b=a.style.width;a.style.width=0;a.style.width= -b}},Qb:function(b,e){b=a.a.c(b);e=a.a.c(e);for(var c=[],d=b;d<=e;d++)c.push(d);return c},N:function(a){for(var b=[],e=0,c=a.length;e",""]||!d.indexOf("",""]||(!d.indexOf("",""]||[0,"",""];b="ignored
    "+d[1]+b+d[2]+"
    ";for("function"==typeof w.innerShiv? -c.appendChild(w.innerShiv(b)):c.innerHTML=b;d[0]--;)c=c.lastChild;c=a.a.N(c.lastChild.childNodes)}return c};a.a.fa=function(b,c){a.a.oa(b);c=a.a.c(c);if(null!==c&&c!==q)if("string"!=typeof c&&(c=c.toString()),"undefined"!=typeof t)t(b).html(c);else for(var d=a.a.xa(c),f=0;fe;e++)b=b();return b})};a.toJSON=function(b,c,e){b=a.lb(b);return a.a.Ca(b,c,e)};d.prototype={save:function(b,c){var e=a.a.k(this.keys, -b);0<=e?this.Ha[e]=c:(this.keys.push(b),this.Ha.push(c))},get:function(b){b=a.a.k(this.keys,b);return 0<=b?this.Ha[b]:q}}})();a.b("toJS",a.lb);a.b("toJSON",a.toJSON);(function(){a.h={n:function(b){switch(a.a.u(b)){case "option":return!0===b.__ko__hasDomDataOptionValue__?a.a.f.get(b,a.d.options.wa):7>=a.a.ca?b.getAttributeNode("value")&&b.getAttributeNode("value").specified?b.value:b.text:b.value;case "select":return 0<=b.selectedIndex?a.h.n(b.options[b.selectedIndex]):q;default:return b.value}},W:function(b, -c){switch(a.a.u(b)){case "option":switch(typeof c){case "string":a.a.f.set(b,a.d.options.wa,q);"__ko__hasDomDataOptionValue__"in b&&delete b.__ko__hasDomDataOptionValue__;b.value=c;break;default:a.a.f.set(b,a.d.options.wa,c),b.__ko__hasDomDataOptionValue__=!0,b.value="number"===typeof c?c:""}break;case "select":""===c&&(c=q);if(null===c||c===q)b.selectedIndex=-1;for(var d=b.options.length-1;0<=d;d--)if(a.h.n(b.options[d])==c){b.selectedIndex=d;break}1e.length)return[];"{"===e.charAt(0)&&(e=e.substring(1,e.length- -1));c=[];for(var d=null,f,k=0;k=a.a.ca&&c in K?(c=K[c],e?b.removeAttribute(c):b[c]=d):e||b.setAttribute(c,d.toString());"name"===c&&a.a.gb(b,e?"":d.toString())})}};a.d.checked={init:function(b,c,d){a.a.o(b,"click",function(){var f;if("checkbox"==b.type)f=b.checked;else if("radio"==b.type&&b.checked)f= -b.value;else return;var g=c(),e=a.a.c(g);"checkbox"==b.type&&e instanceof Array?a.a.ja(g,b.value,b.checked):a.g.ha(g,d,"checked",f,!0)});"radio"!=b.type||b.name||a.d.uniqueName.init(b,F(!0))},update:function(b,c){var d=a.a.c(c());"checkbox"==b.type?b.checked=d instanceof Array?0<=a.a.k(d,b.value):d:"radio"==b.type&&(b.checked=b.value==d)}};a.d.css={update:function(b,c){var d=a.a.c(c());"object"==typeof d?a.a.w(d,function(c,d){d=a.a.c(d);a.a.ga(b,c,d)}):(d=String(d||""),a.a.ga(b,b.__ko__cssValue,!1), -b.__ko__cssValue=d,a.a.ga(b,d,!0))}};a.d.enable={update:function(b,c){var d=a.a.c(c());d&&b.disabled?b.removeAttribute("disabled"):d||b.disabled||(b.disabled=!0)}};a.d.disable={update:function(b,c){a.d.enable.update(b,function(){return!a.a.c(c())})}};a.d.event={init:function(b,c,d,f){var g=c()||{};a.a.w(g,function(e){"string"==typeof e&&a.a.o(b,e,function(b){var g,k=c()[e];if(k){var l=d();try{var n=a.a.N(arguments);n.unshift(f);g=k.apply(f,n)}finally{!0!==g&&(b.preventDefault?b.preventDefault():b.returnValue= -!1)}!1===l[e+"Bubble"]&&(b.cancelBubble=!0,b.stopPropagation&&b.stopPropagation())}})})}};a.d.foreach={Ya:function(b){return function(){var c=b(),d=a.a.ya(c);if(!d||"number"==typeof d.length)return{foreach:c,templateEngine:a.D.sa};a.a.c(c);return{foreach:d.data,as:d.as,includeDestroyed:d.includeDestroyed,afterAdd:d.afterAdd,beforeRemove:d.beforeRemove,afterRender:d.afterRender,beforeMove:d.beforeMove,afterMove:d.afterMove,templateEngine:a.D.sa}}},init:function(b,c){return a.d.template.init(b,a.d.foreach.Ya(c))}, -update:function(b,c,d,f,g){return a.d.template.update(b,a.d.foreach.Ya(c),d,f,g)}};a.g.S.foreach=!1;a.e.L.foreach=!0;a.d.hasfocus={init:function(b,c,d){function f(e){b.__ko_hasfocusUpdating=!0;var f=b.ownerDocument;if("activeElement"in f){var g;try{g=f.activeElement}catch(l){g=f.body}e=g===b}f=c();a.g.ha(f,d,"hasfocus",e,!0);b.__ko_hasfocusLastValue=e;b.__ko_hasfocusUpdating=!1}var g=f.bind(null,!0),e=f.bind(null,!1);a.a.o(b,"focus",g);a.a.o(b,"focusin",g);a.a.o(b,"blur",e);a.a.o(b,"focusout",e)}, -update:function(b,c){var d=!!a.a.c(c());b.__ko_hasfocusUpdating||b.__ko_hasfocusLastValue===d||(d?b.focus():b.blur(),a.q.I(a.a.Ga,null,[b,d?"focusin":"focusout"]))}};a.d.hasFocus=a.d.hasfocus;a.d.html={init:function(){return{controlsDescendantBindings:!0}},update:function(b,c){a.a.fa(b,c())}};var I="__ko_withIfBindingData";G("if");G("ifnot",!1,!0);G("with",!0,!1,function(a,c){return a.createChildContext(c)});a.d.options={init:function(b){if("select"!==a.a.u(b))throw Error("options binding applies only to SELECT elements"); -for(;0a.a.ca?0:b.nodes)?b.nodes():null;if(c)return a.a.N(c.cloneNode(!0).childNodes);b=b.text();return a.a.xa(b)};a.D.sa=new a.D;a.Ba(a.D.sa);a.b("nativeTemplateEngine",a.D);(function(){a.ua=function(){var a=this.Ib=function(){if("undefined"==typeof t||!t.tmpl)return 0;try{if(0<=t.tmpl.tag.tmpl.open.toString().indexOf("__"))return 2}catch(a){}return 1}();this.renderTemplateSource= -function(b,f,g){g=g||{};if(2>a)throw Error("Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later.");var e=b.data("precompiled");e||(e=b.text()||"",e=t.template(null,"{{ko_with $item.koBindingContext}}"+e+"{{/ko_with}}"),b.data("precompiled",e));b=[f.$data];f=t.extend({koBindingContext:f},g.templateOptions);f=t.tmpl(e,b,f);f.appendTo(s.createElement("div"));t.fragments={};return f};this.createJavaScriptEvaluatorBlock=function(a){return"{{ko_code ((function() { return "+ -a+" })()) }}"};this.addTemplate=function(a,b){s.write(" - - - - diff --git a/samples/javaconfig/hellojs/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/hellojs/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02ef..0000000000 --- a/samples/javaconfig/hellojs/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/samples/javaconfig/hellojs/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/hellojs/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java deleted file mode 100644 index dd807f16d1..0000000000 --- a/samples/javaconfig/hellojs/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author Rob Winch - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SecurityConfig.class) -public class SecurityConfigTests { - - @Test - public void securityConfigurationLoads() { - } -} diff --git a/samples/javaconfig/hellomvc/spring-security-samples-javaconfig-hellomvc.gradle b/samples/javaconfig/hellomvc/spring-security-samples-javaconfig-hellomvc.gradle deleted file mode 100644 index 3074d45935..0000000000 --- a/samples/javaconfig/hellomvc/spring-security-samples-javaconfig-hellomvc.gradle +++ /dev/null @@ -1,22 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-core') - compile project(':spring-security-samples-javaconfig-messages') - compile project(':spring-security-web') - compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' - compile 'javax.validation:validation-api' - compile 'javax.xml.bind:jaxb-api' - compile 'org.hibernate:hibernate-validator' - compile 'org.springframework:spring-jdbc' - compile 'org.springframework:spring-webmvc' - compile slf4jDependencies - - providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api' - providedCompile 'javax.servlet:javax.servlet-api' - - runtime 'opensymphony:sitemesh' - - testCompile project(':spring-security-test') -} diff --git a/samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java deleted file mode 100644 index 45f8ae8d78..0000000000 --- a/samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.core.annotation.Order; -import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; - -/** - * No customizations of {@link AbstractSecurityWebApplicationInitializer} are necessary. - * - * @author Rob Winch - */ -@Order(2) -public class MessageSecurityWebApplicationInitializer extends - AbstractSecurityWebApplicationInitializer { -} diff --git a/samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index c0719e88f8..0000000000 --- a/samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.core.userdetails.User; - -@EnableWebSecurity -public class SecurityConfig { - - // @formatter:off - @Autowired - public void configureGlobal( - AuthenticationManagerBuilder auth) throws Exception { - auth - .inMemoryAuthentication() - .withUser(User.withDefaultPasswordEncoder().username("user").password("password").roles("USER")); - } - // @formatter:on -} diff --git a/samples/javaconfig/hellomvc/src/main/resources/views/README.adoc b/samples/javaconfig/hellomvc/src/main/resources/views/README.adoc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/samples/javaconfig/hellomvc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/hellomvc/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02ef..0000000000 --- a/samples/javaconfig/hellomvc/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/samples/javaconfig/hellomvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/hellomvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java deleted file mode 100644 index f7117bf46b..0000000000 --- a/samples/javaconfig/hellomvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright 2002-2014 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.*; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.*; -import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.security.samples.mvc.config.WebMvcConfiguration; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; - -/** - * @author Rob Winch - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { RootConfiguration.class, WebMvcConfiguration.class }) -@WebAppConfiguration -public class SecurityConfigTests { - private MockMvc mvc; - - @Autowired - private WebApplicationContext context; - - - @Before - public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(context) - .apply(springSecurity()) - .defaultRequest(get("/").accept(MediaType.TEXT_HTML)).build(); - } - - @Test - public void requestProtectedResourceRequiresAuthentication() throws Exception { - mvc.perform(get("/")).andExpect(redirectedUrl("http://localhost/login")); - } - - @Test - public void loginSuccess() throws Exception { - mvc.perform(formLogin()).andExpect(redirectedUrl("/")); - } - - @Test - public void loginFailure() throws Exception { - mvc.perform(formLogin().password("invalid")).andExpect( - redirectedUrl("/login?error")); - } - - @Test - @WithMockUser - public void requestProtectedResourceWithUser() throws Exception { - mvc.perform(get("/")).andExpect(status().isOk()); - } - - @Test - @WithMockUser - public void composeMessageRequiresCsrfToken() throws Exception { - MockHttpServletRequestBuilder composeMessage = post("/").param("summary", - "New Message").param("text", "This is a new message"); - - mvc.perform(composeMessage).andExpect(status().isForbidden()); - } - - @Test - @WithMockUser - public void composeMessage() throws Exception { - MockHttpServletRequestBuilder composeMessage = post("/") - .param("summary", "New Message").param("text", "This is a new message") - .with(csrf()); - - mvc.perform(composeMessage).andExpect(redirectedUrlPattern("/*")); - } - - @Test - @WithMockUser - public void logoutRequiresCsrfToken() throws Exception { - mvc.perform(post("/logout")).andExpect(status().isForbidden()); - } - - @Test - @WithMockUser - public void logoutSuccess() throws Exception { - mvc.perform(logout()).andExpect(redirectedUrl("/login?logout")) - .andExpect(unauthenticated()); - } -} diff --git a/samples/javaconfig/helloworld/spring-security-samples-javaconfig-helloworld.gradle b/samples/javaconfig/helloworld/spring-security-samples-javaconfig-helloworld.gradle deleted file mode 100644 index 6d3e843624..0000000000 --- a/samples/javaconfig/helloworld/spring-security-samples-javaconfig-helloworld.gradle +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-web') - compile jstlDependencies - compile slf4jDependencies - - providedCompile 'javax.servlet:javax.servlet-api' - providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api' - - integrationTestCompile seleniumDependencies -} diff --git a/samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldJcTests.java b/samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldJcTests.java deleted file mode 100644 index d2f43eb8bd..0000000000 --- a/samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldJcTests.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import org.springframework.security.samples.pages.HomePage; -import org.springframework.security.samples.pages.LoginPage; - -/** - * @author Michael Simons - */ -public class HelloWorldJcTests { - - private WebDriver driver; - - private int port; - - @Before - public void setup() { - this.port = Integer.parseInt(System.getProperty("app.httpPort")); - this.driver = new HtmlUnitDriver(); - } - - @After - public void tearDown() { - this.driver.quit(); - } - - @Test - public void accessHomePageWithUnauthenticatedUserSendsToLoginPage() { - final LoginPage loginPage = HomePage.to(this.driver, this.port); - loginPage.assertAt(); - } - - @Test - public void authenticatedUserIsSentToOriginalPage() { - final HomePage homePage = HomePage.to(this.driver, this.port) - .loginForm() - .username("user") - .password("password") - .submit(); - homePage - .assertAt() - .andTheUserNameIsDisplayed(); - } - - @Test - public void authenticatedUserLogsOut() { - LoginPage loginPage = HomePage.to(this.driver, this.port) - .loginForm() - .username("user") - .password("password") - .submit() - .logout(); - loginPage.assertAt(); - - loginPage = HomePage.to(this.driver, this.port); - loginPage.assertAt(); - } -} diff --git a/samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java b/samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java deleted file mode 100644 index ed527c3957..0000000000 --- a/samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Michael Simons - */ -public class HomePage { - private final WebDriver webDriver; - - @FindBy(css = "p") - private WebElement message; - - @FindBy(css = "input[type=submit]") - private WebElement logoutButton; - - public static LoginPage to(WebDriver driver, int port) { - driver.get("http://localhost:" + port +"/"); - return PageFactory.initElements(driver, LoginPage.class); - } - - public HomePage(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public Content assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Hello Security"); - return PageFactory.initElements(this.webDriver, Content.class); - } - - public LoginPage logout() { - this.logoutButton.submit(); - return PageFactory.initElements(this.webDriver, LoginPage.class); - } - - public static class Content { - @FindBy(css = "p") - private WebElement message; - - public Content andTheUserNameIsDisplayed() { - assertThat(message.getText()).isEqualTo("Hello user"); - return this; - } - } -} diff --git a/samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java b/samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java deleted file mode 100644 index 30822ea2a9..0000000000 --- a/samples/javaconfig/helloworld/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Michael Simons - */ -public class LoginPage { - - private final WebDriver webDriver; - - private final LoginForm loginForm; - - public LoginPage(WebDriver webDriver) { - this.webDriver = webDriver; - this.loginForm = PageFactory.initElements(this.webDriver, LoginForm.class); - } - - public LoginPage assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in"); - return this; - } - - public LoginForm loginForm() { - return this.loginForm; - } - - public static class LoginForm { - private WebDriver webDriver; - private WebElement username; - private WebElement password; - @FindBy(css = "button[type=submit]") - private WebElement submit; - - public LoginForm(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public LoginForm username(String username) { - this.username.sendKeys(username); - return this; - } - - public LoginForm password(String password) { - this.password.sendKeys(password); - return this; - } - - public HomePage submit() { - this.submit.click(); - return PageFactory.initElements(this.webDriver, HomePage.class); - } - } -} diff --git a/samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index 0d80bfac16..0000000000 --- a/samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.provisioning.InMemoryUserDetailsManager; - -@EnableWebSecurity -public class SecurityConfig { - - // @formatter:off - @Bean - public UserDetailsService userDetailsService() { - UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER").build(); - return new InMemoryUserDetailsManager(user); - } - // @formatter:on -} diff --git a/samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java b/samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java deleted file mode 100644 index 008b87b870..0000000000 --- a/samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; - -/** - * No customizations of {@link AbstractSecurityWebApplicationInitializer} are necessary. - * - * @author Rob Winch - */ -public class SecurityWebApplicationInitializer extends - AbstractSecurityWebApplicationInitializer { - - public SecurityWebApplicationInitializer() { - super(SecurityConfig.class); - } -} diff --git a/samples/javaconfig/helloworld/src/main/resources/logback.xml b/samples/javaconfig/helloworld/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/javaconfig/helloworld/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/javaconfig/helloworld/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/helloworld/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02ef..0000000000 --- a/samples/javaconfig/helloworld/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/samples/javaconfig/helloworld/src/main/webapp/index.jsp b/samples/javaconfig/helloworld/src/main/webapp/index.jsp deleted file mode 100644 index 8b4d7a3983..0000000000 --- a/samples/javaconfig/helloworld/src/main/webapp/index.jsp +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - Hello Security - - - - - - - - - - - -
    -

    This is secured!

    -

    - Hello -

    - -
    - - -
    -
    - - -     diff --git a/samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css b/samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css deleted file mode 100644 index ba09bc8777..0000000000 --- a/samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css +++ /dev/null @@ -1,1092 +0,0 @@ -/*! - * Bootstrap Responsive v2.2.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -@-ms-viewport { - width: device-width; -} - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.hidden { - display: none; - visibility: hidden; -} - -.visible-phone { - display: none !important; -} - -.visible-tablet { - display: none !important; -} - -.hidden-desktop { - display: none !important; -} - -.visible-desktop { - display: inherit !important; -} - -@media (min-width: 768px) and (max-width: 979px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important ; - } - .visible-tablet { - display: inherit !important; - } - .hidden-tablet { - display: none !important; - } -} - -@media (max-width: 767px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important; - } - .visible-phone { - display: inherit !important; - } - .hidden-phone { - display: none !important; - } -} - -@media (min-width: 1200px) { - .row { - margin-left: -30px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 30px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 1170px; - } - .span12 { - width: 1170px; - } - .span11 { - width: 1070px; - } - .span10 { - width: 970px; - } - .span9 { - width: 870px; - } - .span8 { - width: 770px; - } - .span7 { - width: 670px; - } - .span6 { - width: 570px; - } - .span5 { - width: 470px; - } - .span4 { - width: 370px; - } - .span3 { - width: 270px; - } - .span2 { - width: 170px; - } - .span1 { - width: 70px; - } - .offset12 { - margin-left: 1230px; - } - .offset11 { - margin-left: 1130px; - } - .offset10 { - margin-left: 1030px; - } - .offset9 { - margin-left: 930px; - } - .offset8 { - margin-left: 830px; - } - .offset7 { - margin-left: 730px; - } - .offset6 { - margin-left: 630px; - } - .offset5 { - margin-left: 530px; - } - .offset4 { - margin-left: 430px; - } - .offset3 { - margin-left: 330px; - } - .offset2 { - margin-left: 230px; - } - .offset1 { - margin-left: 130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.564102564102564%; - *margin-left: 2.5109110747408616%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.564102564102564%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.45299145299145%; - *width: 91.39979996362975%; - } - .row-fluid .span10 { - width: 82.90598290598291%; - *width: 82.8527914166212%; - } - .row-fluid .span9 { - width: 74.35897435897436%; - *width: 74.30578286961266%; - } - .row-fluid .span8 { - width: 65.81196581196582%; - *width: 65.75877432260411%; - } - .row-fluid .span7 { - width: 57.26495726495726%; - *width: 57.21176577559556%; - } - .row-fluid .span6 { - width: 48.717948717948715%; - *width: 48.664757228587014%; - } - .row-fluid .span5 { - width: 40.17094017094017%; - *width: 40.11774868157847%; - } - .row-fluid .span4 { - width: 31.623931623931625%; - *width: 31.570740134569924%; - } - .row-fluid .span3 { - width: 23.076923076923077%; - *width: 23.023731587561375%; - } - .row-fluid .span2 { - width: 14.52991452991453%; - *width: 14.476723040552828%; - } - .row-fluid .span1 { - width: 5.982905982905983%; - *width: 5.929714493544281%; - } - .row-fluid .offset12 { - margin-left: 105.12820512820512%; - *margin-left: 105.02182214948171%; - } - .row-fluid .offset12:first-child { - margin-left: 102.56410256410257%; - *margin-left: 102.45771958537915%; - } - .row-fluid .offset11 { - margin-left: 96.58119658119658%; - *margin-left: 96.47481360247316%; - } - .row-fluid .offset11:first-child { - margin-left: 94.01709401709402%; - *margin-left: 93.91071103837061%; - } - .row-fluid .offset10 { - margin-left: 88.03418803418803%; - *margin-left: 87.92780505546462%; - } - .row-fluid .offset10:first-child { - margin-left: 85.47008547008548%; - *margin-left: 85.36370249136206%; - } - .row-fluid .offset9 { - margin-left: 79.48717948717949%; - *margin-left: 79.38079650845607%; - } - .row-fluid .offset9:first-child { - margin-left: 76.92307692307693%; - *margin-left: 76.81669394435352%; - } - .row-fluid .offset8 { - margin-left: 70.94017094017094%; - *margin-left: 70.83378796144753%; - } - .row-fluid .offset8:first-child { - margin-left: 68.37606837606839%; - *margin-left: 68.26968539734497%; - } - .row-fluid .offset7 { - margin-left: 62.393162393162385%; - *margin-left: 62.28677941443899%; - } - .row-fluid .offset7:first-child { - margin-left: 59.82905982905982%; - *margin-left: 59.72267685033642%; - } - .row-fluid .offset6 { - margin-left: 53.84615384615384%; - *margin-left: 53.739770867430444%; - } - .row-fluid .offset6:first-child { - margin-left: 51.28205128205128%; - *margin-left: 51.175668303327875%; - } - .row-fluid .offset5 { - margin-left: 45.299145299145295%; - *margin-left: 45.1927623204219%; - } - .row-fluid .offset5:first-child { - margin-left: 42.73504273504273%; - *margin-left: 42.62865975631933%; - } - .row-fluid .offset4 { - margin-left: 36.75213675213675%; - *margin-left: 36.645753773413354%; - } - .row-fluid .offset4:first-child { - margin-left: 34.18803418803419%; - *margin-left: 34.081651209310785%; - } - .row-fluid .offset3 { - margin-left: 28.205128205128204%; - *margin-left: 28.0987452264048%; - } - .row-fluid .offset3:first-child { - margin-left: 25.641025641025642%; - *margin-left: 25.53464266230224%; - } - .row-fluid .offset2 { - margin-left: 19.65811965811966%; - *margin-left: 19.551736679396257%; - } - .row-fluid .offset2:first-child { - margin-left: 17.094017094017094%; - *margin-left: 16.98763411529369%; - } - .row-fluid .offset1 { - margin-left: 11.11111111111111%; - *margin-left: 11.004728132387708%; - } - .row-fluid .offset1:first-child { - margin-left: 8.547008547008547%; - *margin-left: 8.440625568285142%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 30px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 1156px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 1056px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 956px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 856px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 756px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 656px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 556px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 456px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 356px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 256px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 156px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 56px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } - .row-fluid .thumbnails { - margin-left: 0; - } -} - -@media (min-width: 768px) and (max-width: 979px) { - .row { - margin-left: -20px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 724px; - } - .span12 { - width: 724px; - } - .span11 { - width: 662px; - } - .span10 { - width: 600px; - } - .span9 { - width: 538px; - } - .span8 { - width: 476px; - } - .span7 { - width: 414px; - } - .span6 { - width: 352px; - } - .span5 { - width: 290px; - } - .span4 { - width: 228px; - } - .span3 { - width: 166px; - } - .span2 { - width: 104px; - } - .span1 { - width: 42px; - } - .offset12 { - margin-left: 764px; - } - .offset11 { - margin-left: 702px; - } - .offset10 { - margin-left: 640px; - } - .offset9 { - margin-left: 578px; - } - .offset8 { - margin-left: 516px; - } - .offset7 { - margin-left: 454px; - } - .offset6 { - margin-left: 392px; - } - .offset5 { - margin-left: 330px; - } - .offset4 { - margin-left: 268px; - } - .offset3 { - margin-left: 206px; - } - .offset2 { - margin-left: 144px; - } - .offset1 { - margin-left: 82px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.7624309392265194%; - *margin-left: 2.709239449864817%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.7624309392265194%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.43646408839778%; - *width: 91.38327259903608%; - } - .row-fluid .span10 { - width: 82.87292817679558%; - *width: 82.81973668743387%; - } - .row-fluid .span9 { - width: 74.30939226519337%; - *width: 74.25620077583166%; - } - .row-fluid .span8 { - width: 65.74585635359117%; - *width: 65.69266486422946%; - } - .row-fluid .span7 { - width: 57.18232044198895%; - *width: 57.12912895262725%; - } - .row-fluid .span6 { - width: 48.61878453038674%; - *width: 48.56559304102504%; - } - .row-fluid .span5 { - width: 40.05524861878453%; - *width: 40.00205712942283%; - } - .row-fluid .span4 { - width: 31.491712707182323%; - *width: 31.43852121782062%; - } - .row-fluid .span3 { - width: 22.92817679558011%; - *width: 22.87498530621841%; - } - .row-fluid .span2 { - width: 14.3646408839779%; - *width: 14.311449394616199%; - } - .row-fluid .span1 { - width: 5.801104972375691%; - *width: 5.747913483013988%; - } - .row-fluid .offset12 { - margin-left: 105.52486187845304%; - *margin-left: 105.41847889972962%; - } - .row-fluid .offset12:first-child { - margin-left: 102.76243093922652%; - *margin-left: 102.6560479605031%; - } - .row-fluid .offset11 { - margin-left: 96.96132596685082%; - *margin-left: 96.8549429881274%; - } - .row-fluid .offset11:first-child { - margin-left: 94.1988950276243%; - *margin-left: 94.09251204890089%; - } - .row-fluid .offset10 { - margin-left: 88.39779005524862%; - *margin-left: 88.2914070765252%; - } - .row-fluid .offset10:first-child { - margin-left: 85.6353591160221%; - *margin-left: 85.52897613729868%; - } - .row-fluid .offset9 { - margin-left: 79.8342541436464%; - *margin-left: 79.72787116492299%; - } - .row-fluid .offset9:first-child { - margin-left: 77.07182320441989%; - *margin-left: 76.96544022569647%; - } - .row-fluid .offset8 { - margin-left: 71.2707182320442%; - *margin-left: 71.16433525332079%; - } - .row-fluid .offset8:first-child { - margin-left: 68.50828729281768%; - *margin-left: 68.40190431409427%; - } - .row-fluid .offset7 { - margin-left: 62.70718232044199%; - *margin-left: 62.600799341718584%; - } - .row-fluid .offset7:first-child { - margin-left: 59.94475138121547%; - *margin-left: 59.838368402492065%; - } - .row-fluid .offset6 { - margin-left: 54.14364640883978%; - *margin-left: 54.037263430116376%; - } - .row-fluid .offset6:first-child { - margin-left: 51.38121546961326%; - *margin-left: 51.27483249088986%; - } - .row-fluid .offset5 { - margin-left: 45.58011049723757%; - *margin-left: 45.47372751851417%; - } - .row-fluid .offset5:first-child { - margin-left: 42.81767955801105%; - *margin-left: 42.71129657928765%; - } - .row-fluid .offset4 { - margin-left: 37.01657458563536%; - *margin-left: 36.91019160691196%; - } - .row-fluid .offset4:first-child { - margin-left: 34.25414364640884%; - *margin-left: 34.14776066768544%; - } - .row-fluid .offset3 { - margin-left: 28.45303867403315%; - *margin-left: 28.346655695309746%; - } - .row-fluid .offset3:first-child { - margin-left: 25.69060773480663%; - *margin-left: 25.584224756083227%; - } - .row-fluid .offset2 { - margin-left: 19.88950276243094%; - *margin-left: 19.783119783707537%; - } - .row-fluid .offset2:first-child { - margin-left: 17.12707182320442%; - *margin-left: 17.02068884448102%; - } - .row-fluid .offset1 { - margin-left: 11.32596685082873%; - *margin-left: 11.219583872105325%; - } - .row-fluid .offset1:first-child { - margin-left: 8.56353591160221%; - *margin-left: 8.457152932878806%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 710px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 648px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 586px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 524px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 462px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 400px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 338px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 276px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 214px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 152px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 90px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 28px; - } -} - -@media (max-width: 767px) { - body { - padding-right: 20px; - padding-left: 20px; - } - .navbar-fixed-top, - .navbar-fixed-bottom, - .navbar-static-top { - margin-right: -20px; - margin-left: -20px; - } - .container-fluid { - padding: 0; - } - .dl-horizontal dt { - float: none; - width: auto; - clear: none; - text-align: left; - } - .dl-horizontal dd { - margin-left: 0; - } - .container { - width: auto; - } - .row-fluid { - width: 100%; - } - .row, - .thumbnails { - margin-left: 0; - } - .thumbnails > li { - float: none; - margin-left: 0; - } - [class*="span"], - .uneditable-input[class*="span"], - .row-fluid [class*="span"] { - display: block; - float: none; - width: 100%; - margin-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .span12, - .row-fluid .span12 { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="offset"]:first-child { - margin-left: 0; - } - .input-large, - .input-xlarge, - .input-xxlarge, - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .input-prepend input, - .input-append input, - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - display: inline-block; - width: auto; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 0; - } - .modal { - position: fixed; - top: 20px; - right: 20px; - left: 20px; - width: auto; - margin: 0; - } - .modal.fade { - top: -100px; - } - .modal.fade.in { - top: 20px; - } -} - -@media (max-width: 480px) { - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); - } - .page-header h1 small { - display: block; - line-height: 20px; - } - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - .form-horizontal .control-label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .form-horizontal .controls { - margin-left: 0; - } - .form-horizontal .control-list { - padding-top: 0; - } - .form-horizontal .form-actions { - padding-right: 10px; - padding-left: 10px; - } - .media .pull-left, - .media .pull-right { - display: block; - float: none; - margin-bottom: 10px; - } - .media-object { - margin-right: 0; - margin-left: 0; - } - .modal { - top: 10px; - right: 10px; - left: 10px; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - .carousel-caption { - position: static; - } -} - -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top, - .navbar-fixed-bottom { - position: static; - } - .navbar-fixed-top { - margin-bottom: 20px; - } - .navbar-fixed-bottom { - margin-top: 20px; - } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-right: 10px; - padding-left: 10px; - margin: 0 0 0 -5px; - } - .nav-collapse { - clear: both; - } - .nav-collapse .nav { - float: none; - margin: 0 0 10px; - } - .nav-collapse .nav > li { - float: none; - } - .nav-collapse .nav > li > a { - margin-bottom: 2px; - } - .nav-collapse .nav > .divider-vertical { - display: none; - } - .nav-collapse .nav .nav-header { - color: #777777; - text-shadow: none; - } - .nav-collapse .nav > li > a, - .nav-collapse .dropdown-menu a { - padding: 9px 15px; - font-weight: bold; - color: #777777; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .nav-collapse .btn { - padding: 4px 10px 4px; - font-weight: normal; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - } - .nav-collapse .dropdown-menu li + li a { - margin-bottom: 2px; - } - .nav-collapse .nav > li > a:hover, - .nav-collapse .dropdown-menu a:hover { - background-color: #f2f2f2; - } - .navbar-inverse .nav-collapse .nav > li > a, - .navbar-inverse .nav-collapse .dropdown-menu a { - color: #999999; - } - .navbar-inverse .nav-collapse .nav > li > a:hover, - .navbar-inverse .nav-collapse .dropdown-menu a:hover { - background-color: #111111; - } - .nav-collapse.in .btn-group { - padding: 0; - margin-top: 5px; - } - .nav-collapse .dropdown-menu { - position: static; - top: auto; - left: auto; - display: none; - float: none; - max-width: none; - padding: 0; - margin: 0 15px; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .nav-collapse .open > .dropdown-menu { - display: block; - } - .nav-collapse .dropdown-menu:before, - .nav-collapse .dropdown-menu:after { - display: none; - } - .nav-collapse .dropdown-menu .divider { - display: none; - } - .nav-collapse .nav > li > .dropdown-menu:before, - .nav-collapse .nav > li > .dropdown-menu:after { - display: none; - } - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - float: none; - padding: 10px 15px; - margin: 10px 0; - border-top: 1px solid #f2f2f2; - border-bottom: 1px solid #f2f2f2; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - } - .navbar-inverse .nav-collapse .navbar-form, - .navbar-inverse .nav-collapse .navbar-search { - border-top-color: #111111; - border-bottom-color: #111111; - } - .navbar .nav-collapse .nav.pull-right { - float: none; - margin-left: 0; - } - .nav-collapse, - .nav-collapse.collapse { - height: 0; - overflow: hidden; - } - .navbar .btn-navbar { - display: block; - } - .navbar-static .navbar-inner { - padding-right: 10px; - padding-left: 10px; - } -} - -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } -} diff --git a/samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap.css b/samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap.css deleted file mode 100644 index 22aa0c17a9..0000000000 --- a/samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap.css +++ /dev/null @@ -1,6039 +0,0 @@ -/*! - * Bootstrap v2.2.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} - -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} - -audio:not([controls]) { - display: none; -} - -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} - -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -a:hover, -a:active { - outline: 0; -} - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -img { - width: auto\9; - height: auto; - max-width: 100%; - vertical-align: middle; - border: 0; - -ms-interpolation-mode: bicubic; -} - -#map_canvas img, -.google-maps img { - max-width: none; -} - -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} - -button, -input { - *overflow: visible; - line-height: normal; -} - -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} - -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} - -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; -} - -input[type="search"] { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield; -} - -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} - -textarea { - overflow: auto; - vertical-align: top; -} - -@media print { - * { - color: #000 !important; - text-shadow: none !important; - background: transparent !important; - box-shadow: none !important; - } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - thead { - display: table-header-group; - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 0.5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - page-break-after: avoid; - } -} - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; - line-height: 20px; - color: #333333; - background-color: #ffffff; -} - -a { - color: #0088cc; - text-decoration: none; -} - -a:hover { - color: #005580; - text-decoration: underline; -} - -.img-rounded { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.img-polaroid { - padding: 4px; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -} - -.img-circle { - -webkit-border-radius: 500px; - -moz-border-radius: 500px; - border-radius: 500px; -} - -.row { - margin-left: -20px; - *zoom: 1; -} - -.row:before, -.row:after { - display: table; - line-height: 0; - content: ""; -} - -.row:after { - clear: both; -} - -[class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; -} - -.container, -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.span12 { - width: 940px; -} - -.span11 { - width: 860px; -} - -.span10 { - width: 780px; -} - -.span9 { - width: 700px; -} - -.span8 { - width: 620px; -} - -.span7 { - width: 540px; -} - -.span6 { - width: 460px; -} - -.span5 { - width: 380px; -} - -.span4 { - width: 300px; -} - -.span3 { - width: 220px; -} - -.span2 { - width: 140px; -} - -.span1 { - width: 60px; -} - -.offset12 { - margin-left: 980px; -} - -.offset11 { - margin-left: 900px; -} - -.offset10 { - margin-left: 820px; -} - -.offset9 { - margin-left: 740px; -} - -.offset8 { - margin-left: 660px; -} - -.offset7 { - margin-left: 580px; -} - -.offset6 { - margin-left: 500px; -} - -.offset5 { - margin-left: 420px; -} - -.offset4 { - margin-left: 340px; -} - -.offset3 { - margin-left: 260px; -} - -.offset2 { - margin-left: 180px; -} - -.offset1 { - margin-left: 100px; -} - -.row-fluid { - width: 100%; - *zoom: 1; -} - -.row-fluid:before, -.row-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.row-fluid:after { - clear: both; -} - -.row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.127659574468085%; - *margin-left: 2.074468085106383%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.row-fluid [class*="span"]:first-child { - margin-left: 0; -} - -.row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.127659574468085%; -} - -.row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; -} - -.row-fluid .span11 { - width: 91.48936170212765%; - *width: 91.43617021276594%; -} - -.row-fluid .span10 { - width: 82.97872340425532%; - *width: 82.92553191489361%; -} - -.row-fluid .span9 { - width: 74.46808510638297%; - *width: 74.41489361702126%; -} - -.row-fluid .span8 { - width: 65.95744680851064%; - *width: 65.90425531914893%; -} - -.row-fluid .span7 { - width: 57.44680851063829%; - *width: 57.39361702127659%; -} - -.row-fluid .span6 { - width: 48.93617021276595%; - *width: 48.88297872340425%; -} - -.row-fluid .span5 { - width: 40.42553191489362%; - *width: 40.37234042553192%; -} - -.row-fluid .span4 { - width: 31.914893617021278%; - *width: 31.861702127659576%; -} - -.row-fluid .span3 { - width: 23.404255319148934%; - *width: 23.351063829787233%; -} - -.row-fluid .span2 { - width: 14.893617021276595%; - *width: 14.840425531914894%; -} - -.row-fluid .span1 { - width: 6.382978723404255%; - *width: 6.329787234042553%; -} - -.row-fluid .offset12 { - margin-left: 104.25531914893617%; - *margin-left: 104.14893617021275%; -} - -.row-fluid .offset12:first-child { - margin-left: 102.12765957446808%; - *margin-left: 102.02127659574467%; -} - -.row-fluid .offset11 { - margin-left: 95.74468085106382%; - *margin-left: 95.6382978723404%; -} - -.row-fluid .offset11:first-child { - margin-left: 93.61702127659574%; - *margin-left: 93.51063829787232%; -} - -.row-fluid .offset10 { - margin-left: 87.23404255319149%; - *margin-left: 87.12765957446807%; -} - -.row-fluid .offset10:first-child { - margin-left: 85.1063829787234%; - *margin-left: 84.99999999999999%; -} - -.row-fluid .offset9 { - margin-left: 78.72340425531914%; - *margin-left: 78.61702127659572%; -} - -.row-fluid .offset9:first-child { - margin-left: 76.59574468085106%; - *margin-left: 76.48936170212764%; -} - -.row-fluid .offset8 { - margin-left: 70.2127659574468%; - *margin-left: 70.10638297872339%; -} - -.row-fluid .offset8:first-child { - margin-left: 68.08510638297872%; - *margin-left: 67.9787234042553%; -} - -.row-fluid .offset7 { - margin-left: 61.70212765957446%; - *margin-left: 61.59574468085106%; -} - -.row-fluid .offset7:first-child { - margin-left: 59.574468085106375%; - *margin-left: 59.46808510638297%; -} - -.row-fluid .offset6 { - margin-left: 53.191489361702125%; - *margin-left: 53.085106382978715%; -} - -.row-fluid .offset6:first-child { - margin-left: 51.063829787234035%; - *margin-left: 50.95744680851063%; -} - -.row-fluid .offset5 { - margin-left: 44.68085106382979%; - *margin-left: 44.57446808510638%; -} - -.row-fluid .offset5:first-child { - margin-left: 42.5531914893617%; - *margin-left: 42.4468085106383%; -} - -.row-fluid .offset4 { - margin-left: 36.170212765957444%; - *margin-left: 36.06382978723405%; -} - -.row-fluid .offset4:first-child { - margin-left: 34.04255319148936%; - *margin-left: 33.93617021276596%; -} - -.row-fluid .offset3 { - margin-left: 27.659574468085104%; - *margin-left: 27.5531914893617%; -} - -.row-fluid .offset3:first-child { - margin-left: 25.53191489361702%; - *margin-left: 25.425531914893618%; -} - -.row-fluid .offset2 { - margin-left: 19.148936170212764%; - *margin-left: 19.04255319148936%; -} - -.row-fluid .offset2:first-child { - margin-left: 17.02127659574468%; - *margin-left: 16.914893617021278%; -} - -.row-fluid .offset1 { - margin-left: 10.638297872340425%; - *margin-left: 10.53191489361702%; -} - -.row-fluid .offset1:first-child { - margin-left: 8.51063829787234%; - *margin-left: 8.404255319148938%; -} - -[class*="span"].hide, -.row-fluid [class*="span"].hide { - display: none; -} - -[class*="span"].pull-right, -.row-fluid [class*="span"].pull-right { - float: right; -} - -.container { - margin-right: auto; - margin-left: auto; - *zoom: 1; -} - -.container:before, -.container:after { - display: table; - line-height: 0; - content: ""; -} - -.container:after { - clear: both; -} - -.container-fluid { - padding-right: 20px; - padding-left: 20px; - *zoom: 1; -} - -.container-fluid:before, -.container-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.container-fluid:after { - clear: both; -} - -p { - margin: 0 0 10px; -} - -.lead { - margin-bottom: 20px; - font-size: 21px; - font-weight: 200; - line-height: 30px; -} - -small { - font-size: 85%; -} - -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - -cite { - font-style: normal; -} - -.muted { - color: #999999; -} - -a.muted:hover { - color: #808080; -} - -.text-warning { - color: #c09853; -} - -a.text-warning:hover { - color: #a47e3c; -} - -.text-error { - color: #b94a48; -} - -a.text-error:hover { - color: #953b39; -} - -.text-info { - color: #3a87ad; -} - -a.text-info:hover { - color: #2d6987; -} - -.text-success { - color: #468847; -} - -a.text-success:hover { - color: #356635; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 10px 0; - font-family: inherit; - font-weight: bold; - line-height: 20px; - color: inherit; - text-rendering: optimizelegibility; -} - -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - line-height: 1; - color: #999999; -} - -h1, -h2, -h3 { - line-height: 40px; -} - -h1 { - font-size: 38.5px; -} - -h2 { - font-size: 31.5px; -} - -h3 { - font-size: 24.5px; -} - -h4 { - font-size: 17.5px; -} - -h5 { - font-size: 14px; -} - -h6 { - font-size: 11.9px; -} - -h1 small { - font-size: 24.5px; -} - -h2 small { - font-size: 17.5px; -} - -h3 small { - font-size: 14px; -} - -h4 small { - font-size: 14px; -} - -.page-header { - padding-bottom: 9px; - margin: 20px 0 30px; - border-bottom: 1px solid #eeeeee; -} - -ul, -ol { - padding: 0; - margin: 0 0 10px 25px; -} - -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} - -li { - line-height: 20px; -} - -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} - -ul.inline, -ol.inline { - margin-left: 0; - list-style: none; -} - -ul.inline > li, -ol.inline > li { - display: inline-block; - padding-right: 5px; - padding-left: 5px; -} - -dl { - margin-bottom: 20px; -} - -dt, -dd { - line-height: 20px; -} - -dt { - font-weight: bold; -} - -dd { - margin-left: 10px; -} - -.dl-horizontal { - *zoom: 1; -} - -.dl-horizontal:before, -.dl-horizontal:after { - display: table; - line-height: 0; - content: ""; -} - -.dl-horizontal:after { - clear: both; -} - -.dl-horizontal dt { - float: left; - width: 160px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; -} - -.dl-horizontal dd { - margin-left: 180px; -} - -hr { - margin: 20px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; -} - -abbr[title], -abbr[data-original-title] { - cursor: help; - border-bottom: 1px dotted #999999; -} - -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} - -blockquote { - padding: 0 0 0 15px; - margin: 0 0 20px; - border-left: 5px solid #eeeeee; -} - -blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 25px; -} - -blockquote small { - display: block; - line-height: 20px; - color: #999999; -} - -blockquote small:before { - content: '\2014 \00A0'; -} - -blockquote.pull-right { - float: right; - padding-right: 15px; - padding-left: 0; - border-right: 5px solid #eeeeee; - border-left: 0; -} - -blockquote.pull-right p, -blockquote.pull-right small { - text-align: right; -} - -blockquote.pull-right small:before { - content: ''; -} - -blockquote.pull-right small:after { - content: '\00A0 \2014'; -} - -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -address { - display: block; - margin-bottom: 20px; - font-style: normal; - line-height: 20px; -} - -code, -pre { - padding: 0 3px 2px; - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -code { - padding: 2px 4px; - color: #d14; - white-space: nowrap; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} - -pre { - display: block; - padding: 9.5px; - margin: 0 0 10px; - font-size: 13px; - line-height: 20px; - word-break: break-all; - word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -pre.prettyprint { - margin-bottom: 20px; -} - -pre code { - padding: 0; - color: inherit; - white-space: pre; - white-space: pre-wrap; - background-color: transparent; - border: 0; -} - -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} - -form { - margin: 0 0 20px; -} - -fieldset { - padding: 0; - margin: 0; - border: 0; -} - -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 20px; - font-size: 21px; - line-height: 40px; - color: #333333; - border: 0; - border-bottom: 1px solid #e5e5e5; -} - -legend small { - font-size: 15px; - color: #999999; -} - -label, -input, -button, -select, -textarea { - font-size: 14px; - font-weight: normal; - line-height: 20px; -} - -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -label { - display: block; - margin-bottom: 5px; -} - -select, -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - display: inline-block; - height: 20px; - padding: 4px 6px; - margin-bottom: 10px; - font-size: 14px; - line-height: 20px; - color: #555555; - vertical-align: middle; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -input, -textarea, -.uneditable-input { - width: 206px; -} - -textarea { - height: auto; -} - -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - background-color: #ffffff; - border: 1px solid #cccccc; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} - -textarea:focus, -input[type="text"]:focus, -input[type="password"]:focus, -input[type="datetime"]:focus, -input[type="datetime-local"]:focus, -input[type="date"]:focus, -input[type="month"]:focus, -input[type="time"]:focus, -input[type="week"]:focus, -input[type="number"]:focus, -input[type="email"]:focus, -input[type="url"]:focus, -input[type="search"]:focus, -input[type="tel"]:focus, -input[type="color"]:focus, -.uneditable-input:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -} - -input[type="radio"], -input[type="checkbox"] { - margin: 4px 0 0; - margin-top: 1px \9; - *margin-top: 0; - line-height: normal; -} - -input[type="file"], -input[type="image"], -input[type="submit"], -input[type="reset"], -input[type="button"], -input[type="radio"], -input[type="checkbox"] { - width: auto; -} - -select, -input[type="file"] { - height: 30px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 30px; -} - -select { - width: 220px; - background-color: #ffffff; - border: 1px solid #cccccc; -} - -select[multiple], -select[size] { - height: auto; -} - -select:focus, -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.uneditable-input, -.uneditable-textarea { - color: #999999; - cursor: not-allowed; - background-color: #fcfcfc; - border-color: #cccccc; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} - -.uneditable-input { - overflow: hidden; - white-space: nowrap; -} - -.uneditable-textarea { - width: auto; - height: auto; -} - -input:-moz-placeholder, -textarea:-moz-placeholder { - color: #999999; -} - -input:-ms-input-placeholder, -textarea:-ms-input-placeholder { - color: #999999; -} - -input::-webkit-input-placeholder, -textarea::-webkit-input-placeholder { - color: #999999; -} - -.radio, -.checkbox { - min-height: 20px; - padding-left: 20px; -} - -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -20px; -} - -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; -} - -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} - -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; -} - -.input-mini { - width: 60px; -} - -.input-small { - width: 90px; -} - -.input-medium { - width: 150px; -} - -.input-large { - width: 210px; -} - -.input-xlarge { - width: 270px; -} - -.input-xxlarge { - width: 530px; -} - -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; -} - -.input-append input[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend input[class*="span"], -.input-prepend .uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"], -.row-fluid .input-prepend [class*="span"], -.row-fluid .input-append [class*="span"] { - display: inline-block; -} - -input, -textarea, -.uneditable-input { - margin-left: 0; -} - -.controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; -} - -input.span12, -textarea.span12, -.uneditable-input.span12 { - width: 926px; -} - -input.span11, -textarea.span11, -.uneditable-input.span11 { - width: 846px; -} - -input.span10, -textarea.span10, -.uneditable-input.span10 { - width: 766px; -} - -input.span9, -textarea.span9, -.uneditable-input.span9 { - width: 686px; -} - -input.span8, -textarea.span8, -.uneditable-input.span8 { - width: 606px; -} - -input.span7, -textarea.span7, -.uneditable-input.span7 { - width: 526px; -} - -input.span6, -textarea.span6, -.uneditable-input.span6 { - width: 446px; -} - -input.span5, -textarea.span5, -.uneditable-input.span5 { - width: 366px; -} - -input.span4, -textarea.span4, -.uneditable-input.span4 { - width: 286px; -} - -input.span3, -textarea.span3, -.uneditable-input.span3 { - width: 206px; -} - -input.span2, -textarea.span2, -.uneditable-input.span2 { - width: 126px; -} - -input.span1, -textarea.span1, -.uneditable-input.span1 { - width: 46px; -} - -.controls-row { - *zoom: 1; -} - -.controls-row:before, -.controls-row:after { - display: table; - line-height: 0; - content: ""; -} - -.controls-row:after { - clear: both; -} - -.controls-row [class*="span"], -.row-fluid .controls-row [class*="span"] { - float: left; -} - -.controls-row .checkbox[class*="span"], -.controls-row .radio[class*="span"] { - padding-top: 5px; -} - -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - cursor: not-allowed; - background-color: #eeeeee; -} - -input[type="radio"][disabled], -input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly] { - background-color: transparent; -} - -.control-group.warning .control-label, -.control-group.warning .help-block, -.control-group.warning .help-inline { - color: #c09853; -} - -.control-group.warning .checkbox, -.control-group.warning .radio, -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - color: #c09853; -} - -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - border-color: #c09853; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.warning input:focus, -.control-group.warning select:focus, -.control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; -} - -.control-group.warning .input-prepend .add-on, -.control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} - -.control-group.error .control-label, -.control-group.error .help-block, -.control-group.error .help-inline { - color: #b94a48; -} - -.control-group.error .checkbox, -.control-group.error .radio, -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - color: #b94a48; -} - -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - border-color: #b94a48; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.error input:focus, -.control-group.error select:focus, -.control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -} - -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} - -.control-group.success .control-label, -.control-group.success .help-block, -.control-group.success .help-inline { - color: #468847; -} - -.control-group.success .checkbox, -.control-group.success .radio, -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - color: #468847; -} - -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - border-color: #468847; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.success input:focus, -.control-group.success select:focus, -.control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -} - -.control-group.success .input-prepend .add-on, -.control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} - -.control-group.info .control-label, -.control-group.info .help-block, -.control-group.info .help-inline { - color: #3a87ad; -} - -.control-group.info .checkbox, -.control-group.info .radio, -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - color: #3a87ad; -} - -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - border-color: #3a87ad; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.info input:focus, -.control-group.info select:focus, -.control-group.info textarea:focus { - border-color: #2d6987; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; -} - -.control-group.info .input-prepend .add-on, -.control-group.info .input-append .add-on { - color: #3a87ad; - background-color: #d9edf7; - border-color: #3a87ad; -} - -input:focus:invalid, -textarea:focus:invalid, -select:focus:invalid { - color: #b94a48; - border-color: #ee5f5b; -} - -input:focus:invalid:focus, -textarea:focus:invalid:focus, -select:focus:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} - -.form-actions { - padding: 19px 20px 20px; - margin-top: 20px; - margin-bottom: 20px; - background-color: #f5f5f5; - border-top: 1px solid #e5e5e5; - *zoom: 1; -} - -.form-actions:before, -.form-actions:after { - display: table; - line-height: 0; - content: ""; -} - -.form-actions:after { - clear: both; -} - -.help-block, -.help-inline { - color: #595959; -} - -.help-block { - display: block; - margin-bottom: 10px; -} - -.help-inline { - display: inline-block; - *display: inline; - padding-left: 5px; - vertical-align: middle; - *zoom: 1; -} - -.input-append, -.input-prepend { - margin-bottom: 5px; - font-size: 0; - white-space: nowrap; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input, -.input-append .dropdown-menu, -.input-prepend .dropdown-menu { - font-size: 14px; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input { - position: relative; - margin-bottom: 0; - *margin-left: 0; - vertical-align: top; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-append input:focus, -.input-prepend input:focus, -.input-append select:focus, -.input-prepend select:focus, -.input-append .uneditable-input:focus, -.input-prepend .uneditable-input:focus { - z-index: 2; -} - -.input-append .add-on, -.input-prepend .add-on { - display: inline-block; - width: auto; - height: 20px; - min-width: 16px; - padding: 4px 5px; - font-size: 14px; - font-weight: normal; - line-height: 20px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - background-color: #eeeeee; - border: 1px solid #ccc; -} - -.input-append .add-on, -.input-prepend .add-on, -.input-append .btn, -.input-prepend .btn, -.input-append .btn-group > .dropdown-toggle, -.input-prepend .btn-group > .dropdown-toggle { - vertical-align: top; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-append .active, -.input-prepend .active { - background-color: #a9dba9; - border-color: #46a546; -} - -.input-prepend .add-on, -.input-prepend .btn { - margin-right: -1px; -} - -.input-prepend .add-on:first-child, -.input-prepend .btn:first-child { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input, -.input-append select, -.input-append .uneditable-input { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input + .btn-group .btn:last-child, -.input-append select + .btn-group .btn:last-child, -.input-append .uneditable-input + .btn-group .btn:last-child { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-append .add-on, -.input-append .btn, -.input-append .btn-group { - margin-left: -1px; -} - -.input-append .add-on:last-child, -.input-append .btn:last-child, -.input-append .btn-group:last-child > .dropdown-toggle { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append input, -.input-prepend.input-append select, -.input-prepend.input-append .uneditable-input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-prepend.input-append input + .btn-group .btn, -.input-prepend.input-append select + .btn-group .btn, -.input-prepend.input-append .uneditable-input + .btn-group .btn { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .btn-group:first-child { - margin-left: 0; -} - -input.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; - /* IE7-8 doesn't have border-radius, so don't indent the padding */ - - margin-bottom: 0; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -/* Allow for input prepend/append in search forms */ - -.form-search .input-append .search-query, -.form-search .input-prepend .search-query { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.form-search .input-append .search-query { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search .input-append .btn { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .search-query { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .btn { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input, -.form-search .input-prepend, -.form-inline .input-prepend, -.form-horizontal .input-prepend, -.form-search .input-append, -.form-inline .input-append, -.form-horizontal .input-append { - display: inline-block; - *display: inline; - margin-bottom: 0; - vertical-align: middle; - *zoom: 1; -} - -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { - display: none; -} - -.form-search label, -.form-inline label, -.form-search .btn-group, -.form-inline .btn-group { - display: inline-block; -} - -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} - -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} - -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; -} - -.control-group { - margin-bottom: 10px; -} - -legend + .control-group { - margin-top: 20px; - -webkit-margin-top-collapse: separate; -} - -.form-horizontal .control-group { - margin-bottom: 20px; - *zoom: 1; -} - -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { - display: table; - line-height: 0; - content: ""; -} - -.form-horizontal .control-group:after { - clear: both; -} - -.form-horizontal .control-label { - float: left; - width: 160px; - padding-top: 5px; - text-align: right; -} - -.form-horizontal .controls { - *display: inline-block; - *padding-left: 20px; - margin-left: 180px; - *margin-left: 0; -} - -.form-horizontal .controls:first-child { - *padding-left: 180px; -} - -.form-horizontal .help-block { - margin-bottom: 0; -} - -.form-horizontal input + .help-block, -.form-horizontal select + .help-block, -.form-horizontal textarea + .help-block, -.form-horizontal .uneditable-input + .help-block, -.form-horizontal .input-prepend + .help-block, -.form-horizontal .input-append + .help-block { - margin-top: 10px; -} - -.form-horizontal .form-actions { - padding-left: 180px; -} - -table { - max-width: 100%; - background-color: transparent; - border-collapse: collapse; - border-spacing: 0; -} - -.table { - width: 100%; - margin-bottom: 20px; -} - -.table th, -.table td { - padding: 8px; - line-height: 20px; - text-align: left; - vertical-align: top; - border-top: 1px solid #dddddd; -} - -.table th { - font-weight: bold; -} - -.table thead th { - vertical-align: bottom; -} - -.table caption + thead tr:first-child th, -.table caption + thead tr:first-child td, -.table colgroup + thead tr:first-child th, -.table colgroup + thead tr:first-child td, -.table thead:first-child tr:first-child th, -.table thead:first-child tr:first-child td { - border-top: 0; -} - -.table tbody + tbody { - border-top: 2px solid #dddddd; -} - -.table .table { - background-color: #ffffff; -} - -.table-condensed th, -.table-condensed td { - padding: 4px 5px; -} - -.table-bordered { - border: 1px solid #dddddd; - border-collapse: separate; - *border-collapse: collapse; - border-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.table-bordered th, -.table-bordered td { - border-left: 1px solid #dddddd; -} - -.table-bordered caption + thead tr:first-child th, -.table-bordered caption + tbody tr:first-child th, -.table-bordered caption + tbody tr:first-child td, -.table-bordered colgroup + thead tr:first-child th, -.table-bordered colgroup + tbody tr:first-child th, -.table-bordered colgroup + tbody tr:first-child td, -.table-bordered thead:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} - -.table-bordered thead:first-child tr:first-child > th:first-child, -.table-bordered tbody:first-child tr:first-child > td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered thead:first-child tr:first-child > th:last-child, -.table-bordered tbody:first-child tr:first-child > td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:first-child, -.table-bordered tbody:last-child tr:last-child > td:first-child, -.table-bordered tfoot:last-child tr:last-child > td:first-child { - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:last-child, -.table-bordered tbody:last-child tr:last-child > td:last-child, -.table-bordered tfoot:last-child tr:last-child > td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - -moz-border-radius-bottomleft: 0; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; - -moz-border-radius-bottomright: 0; -} - -.table-bordered caption + thead tr:first-child th:first-child, -.table-bordered caption + tbody tr:first-child td:first-child, -.table-bordered colgroup + thead tr:first-child th:first-child, -.table-bordered colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered caption + thead tr:first-child th:last-child, -.table-bordered caption + tbody tr:first-child td:last-child, -.table-bordered colgroup + thead tr:first-child th:last-child, -.table-bordered colgroup + tbody tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-striped tbody > tr:nth-child(odd) > td, -.table-striped tbody > tr:nth-child(odd) > th { - background-color: #f9f9f9; -} - -.table-hover tbody tr:hover td, -.table-hover tbody tr:hover th { - background-color: #f5f5f5; -} - -table td[class*="span"], -table th[class*="span"], -.row-fluid table td[class*="span"], -.row-fluid table th[class*="span"] { - display: table-cell; - float: none; - margin-left: 0; -} - -.table td.span1, -.table th.span1 { - float: none; - width: 44px; - margin-left: 0; -} - -.table td.span2, -.table th.span2 { - float: none; - width: 124px; - margin-left: 0; -} - -.table td.span3, -.table th.span3 { - float: none; - width: 204px; - margin-left: 0; -} - -.table td.span4, -.table th.span4 { - float: none; - width: 284px; - margin-left: 0; -} - -.table td.span5, -.table th.span5 { - float: none; - width: 364px; - margin-left: 0; -} - -.table td.span6, -.table th.span6 { - float: none; - width: 444px; - margin-left: 0; -} - -.table td.span7, -.table th.span7 { - float: none; - width: 524px; - margin-left: 0; -} - -.table td.span8, -.table th.span8 { - float: none; - width: 604px; - margin-left: 0; -} - -.table td.span9, -.table th.span9 { - float: none; - width: 684px; - margin-left: 0; -} - -.table td.span10, -.table th.span10 { - float: none; - width: 764px; - margin-left: 0; -} - -.table td.span11, -.table th.span11 { - float: none; - width: 844px; - margin-left: 0; -} - -.table td.span12, -.table th.span12 { - float: none; - width: 924px; - margin-left: 0; -} - -.table tbody tr.success td { - background-color: #dff0d8; -} - -.table tbody tr.error td { - background-color: #f2dede; -} - -.table tbody tr.warning td { - background-color: #fcf8e3; -} - -.table tbody tr.info td { - background-color: #d9edf7; -} - -.table-hover tbody tr.success:hover td { - background-color: #d0e9c6; -} - -.table-hover tbody tr.error:hover td { - background-color: #ebcccc; -} - -.table-hover tbody tr.warning:hover td { - background-color: #faf2cc; -} - -.table-hover tbody tr.info:hover td { - background-color: #c4e3f3; -} - -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - margin-top: 1px; - *margin-right: .3em; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; -} - -/* White icons with optional class, or on hover/active states of certain elements */ - -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); -} - -.icon-glass { - background-position: 0 0; -} - -.icon-music { - background-position: -24px 0; -} - -.icon-search { - background-position: -48px 0; -} - -.icon-envelope { - background-position: -72px 0; -} - -.icon-heart { - background-position: -96px 0; -} - -.icon-star { - background-position: -120px 0; -} - -.icon-star-empty { - background-position: -144px 0; -} - -.icon-user { - background-position: -168px 0; -} - -.icon-film { - background-position: -192px 0; -} - -.icon-th-large { - background-position: -216px 0; -} - -.icon-th { - background-position: -240px 0; -} - -.icon-th-list { - background-position: -264px 0; -} - -.icon-ok { - background-position: -288px 0; -} - -.icon-remove { - background-position: -312px 0; -} - -.icon-zoom-in { - background-position: -336px 0; -} - -.icon-zoom-out { - background-position: -360px 0; -} - -.icon-off { - background-position: -384px 0; -} - -.icon-signal { - background-position: -408px 0; -} - -.icon-cog { - background-position: -432px 0; -} - -.icon-trash { - background-position: -456px 0; -} - -.icon-home { - background-position: 0 -24px; -} - -.icon-file { - background-position: -24px -24px; -} - -.icon-time { - background-position: -48px -24px; -} - -.icon-road { - background-position: -72px -24px; -} - -.icon-download-alt { - background-position: -96px -24px; -} - -.icon-download { - background-position: -120px -24px; -} - -.icon-upload { - background-position: -144px -24px; -} - -.icon-inbox { - background-position: -168px -24px; -} - -.icon-play-circle { - background-position: -192px -24px; -} - -.icon-repeat { - background-position: -216px -24px; -} - -.icon-refresh { - background-position: -240px -24px; -} - -.icon-list-alt { - background-position: -264px -24px; -} - -.icon-lock { - background-position: -287px -24px; -} - -.icon-flag { - background-position: -312px -24px; -} - -.icon-headphones { - background-position: -336px -24px; -} - -.icon-volume-off { - background-position: -360px -24px; -} - -.icon-volume-down { - background-position: -384px -24px; -} - -.icon-volume-up { - background-position: -408px -24px; -} - -.icon-qrcode { - background-position: -432px -24px; -} - -.icon-barcode { - background-position: -456px -24px; -} - -.icon-tag { - background-position: 0 -48px; -} - -.icon-tags { - background-position: -25px -48px; -} - -.icon-book { - background-position: -48px -48px; -} - -.icon-bookmark { - background-position: -72px -48px; -} - -.icon-print { - background-position: -96px -48px; -} - -.icon-camera { - background-position: -120px -48px; -} - -.icon-font { - background-position: -144px -48px; -} - -.icon-bold { - background-position: -167px -48px; -} - -.icon-italic { - background-position: -192px -48px; -} - -.icon-text-height { - background-position: -216px -48px; -} - -.icon-text-width { - background-position: -240px -48px; -} - -.icon-align-left { - background-position: -264px -48px; -} - -.icon-align-center { - background-position: -288px -48px; -} - -.icon-align-right { - background-position: -312px -48px; -} - -.icon-align-justify { - background-position: -336px -48px; -} - -.icon-list { - background-position: -360px -48px; -} - -.icon-indent-left { - background-position: -384px -48px; -} - -.icon-indent-right { - background-position: -408px -48px; -} - -.icon-facetime-video { - background-position: -432px -48px; -} - -.icon-picture { - background-position: -456px -48px; -} - -.icon-pencil { - background-position: 0 -72px; -} - -.icon-map-marker { - background-position: -24px -72px; -} - -.icon-adjust { - background-position: -48px -72px; -} - -.icon-tint { - background-position: -72px -72px; -} - -.icon-edit { - background-position: -96px -72px; -} - -.icon-share { - background-position: -120px -72px; -} - -.icon-check { - background-position: -144px -72px; -} - -.icon-move { - background-position: -168px -72px; -} - -.icon-step-backward { - background-position: -192px -72px; -} - -.icon-fast-backward { - background-position: -216px -72px; -} - -.icon-backward { - background-position: -240px -72px; -} - -.icon-play { - background-position: -264px -72px; -} - -.icon-pause { - background-position: -288px -72px; -} - -.icon-stop { - background-position: -312px -72px; -} - -.icon-forward { - background-position: -336px -72px; -} - -.icon-fast-forward { - background-position: -360px -72px; -} - -.icon-step-forward { - background-position: -384px -72px; -} - -.icon-eject { - background-position: -408px -72px; -} - -.icon-chevron-left { - background-position: -432px -72px; -} - -.icon-chevron-right { - background-position: -456px -72px; -} - -.icon-plus-sign { - background-position: 0 -96px; -} - -.icon-minus-sign { - background-position: -24px -96px; -} - -.icon-remove-sign { - background-position: -48px -96px; -} - -.icon-ok-sign { - background-position: -72px -96px; -} - -.icon-question-sign { - background-position: -96px -96px; -} - -.icon-info-sign { - background-position: -120px -96px; -} - -.icon-screenshot { - background-position: -144px -96px; -} - -.icon-remove-circle { - background-position: -168px -96px; -} - -.icon-ok-circle { - background-position: -192px -96px; -} - -.icon-ban-circle { - background-position: -216px -96px; -} - -.icon-arrow-left { - background-position: -240px -96px; -} - -.icon-arrow-right { - background-position: -264px -96px; -} - -.icon-arrow-up { - background-position: -289px -96px; -} - -.icon-arrow-down { - background-position: -312px -96px; -} - -.icon-share-alt { - background-position: -336px -96px; -} - -.icon-resize-full { - background-position: -360px -96px; -} - -.icon-resize-small { - background-position: -384px -96px; -} - -.icon-plus { - background-position: -408px -96px; -} - -.icon-minus { - background-position: -433px -96px; -} - -.icon-asterisk { - background-position: -456px -96px; -} - -.icon-exclamation-sign { - background-position: 0 -120px; -} - -.icon-gift { - background-position: -24px -120px; -} - -.icon-leaf { - background-position: -48px -120px; -} - -.icon-fire { - background-position: -72px -120px; -} - -.icon-eye-open { - background-position: -96px -120px; -} - -.icon-eye-close { - background-position: -120px -120px; -} - -.icon-warning-sign { - background-position: -144px -120px; -} - -.icon-plane { - background-position: -168px -120px; -} - -.icon-calendar { - background-position: -192px -120px; -} - -.icon-random { - width: 16px; - background-position: -216px -120px; -} - -.icon-comment { - background-position: -240px -120px; -} - -.icon-magnet { - background-position: -264px -120px; -} - -.icon-chevron-up { - background-position: -288px -120px; -} - -.icon-chevron-down { - background-position: -313px -119px; -} - -.icon-retweet { - background-position: -336px -120px; -} - -.icon-shopping-cart { - background-position: -360px -120px; -} - -.icon-folder-close { - background-position: -384px -120px; -} - -.icon-folder-open { - width: 16px; - background-position: -408px -120px; -} - -.icon-resize-vertical { - background-position: -432px -119px; -} - -.icon-resize-horizontal { - background-position: -456px -118px; -} - -.icon-hdd { - background-position: 0 -144px; -} - -.icon-bullhorn { - background-position: -24px -144px; -} - -.icon-bell { - background-position: -48px -144px; -} - -.icon-certificate { - background-position: -72px -144px; -} - -.icon-thumbs-up { - background-position: -96px -144px; -} - -.icon-thumbs-down { - background-position: -120px -144px; -} - -.icon-hand-right { - background-position: -144px -144px; -} - -.icon-hand-left { - background-position: -168px -144px; -} - -.icon-hand-up { - background-position: -192px -144px; -} - -.icon-hand-down { - background-position: -216px -144px; -} - -.icon-circle-arrow-right { - background-position: -240px -144px; -} - -.icon-circle-arrow-left { - background-position: -264px -144px; -} - -.icon-circle-arrow-up { - background-position: -288px -144px; -} - -.icon-circle-arrow-down { - background-position: -312px -144px; -} - -.icon-globe { - background-position: -336px -144px; -} - -.icon-wrench { - background-position: -360px -144px; -} - -.icon-tasks { - background-position: -384px -144px; -} - -.icon-filter { - background-position: -408px -144px; -} - -.icon-briefcase { - background-position: -432px -144px; -} - -.icon-fullscreen { - background-position: -456px -144px; -} - -.dropup, -.dropdown { - position: relative; -} - -.dropdown-toggle { - *margin-bottom: -3px; -} - -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} - -.caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-top: 4px solid #000000; - border-right: 4px solid transparent; - border-left: 4px solid transparent; - content: ""; -} - -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} - -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; - list-style: none; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.dropdown-menu .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.dropdown-menu li > a { - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: 20px; - color: #333333; - white-space: nowrap; -} - -.dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, -.dropdown-submenu:hover > a { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -} - -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - outline: 0; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -} - -.dropdown-menu .disabled > a, -.dropdown-menu .disabled > a:hover { - color: #999999; -} - -.dropdown-menu .disabled > a:hover { - text-decoration: none; - cursor: default; - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.open { - *z-index: 1000; -} - -.open > .dropdown-menu { - display: block; -} - -.pull-right > .dropdown-menu { - right: 0; - left: auto; -} - -.dropup .caret, -.navbar-fixed-bottom .dropdown .caret { - border-top: 0; - border-bottom: 4px solid #000000; - content: ""; -} - -.dropup .dropdown-menu, -.navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; -} - -.dropdown-submenu { - position: relative; -} - -.dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; -} - -.dropdown-submenu:hover > .dropdown-menu { - display: block; -} - -.dropup .dropdown-submenu > .dropdown-menu { - top: auto; - bottom: 0; - margin-top: 0; - margin-bottom: -2px; - -webkit-border-radius: 5px 5px 5px 0; - -moz-border-radius: 5px 5px 5px 0; - border-radius: 5px 5px 5px 0; -} - -.dropdown-submenu > a:after { - display: block; - float: right; - width: 0; - height: 0; - margin-top: 5px; - margin-right: -10px; - border-color: transparent; - border-left-color: #cccccc; - border-style: solid; - border-width: 5px 0 5px 5px; - content: " "; -} - -.dropdown-submenu:hover > a:after { - border-left-color: #ffffff; -} - -.dropdown-submenu.pull-left { - float: none; -} - -.dropdown-submenu.pull-left > .dropdown-menu { - left: -100%; - margin-left: 10px; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; -} - -.dropdown .dropdown-menu .nav-header { - padding-right: 20px; - padding-left: 20px; -} - -.typeahead { - z-index: 1051; - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} - -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} - -.well-large { - padding: 24px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.well-small { - padding: 9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.fade { - opacity: 0; - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; -} - -.fade.in { - opacity: 1; -} - -.collapse { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; -} - -.collapse.in { - height: auto; -} - -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 20px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} - -.close:hover { - color: #000000; - text-decoration: none; - cursor: pointer; - opacity: 0.4; - filter: alpha(opacity=40); -} - -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} - -.btn { - display: inline-block; - *display: inline; - padding: 4px 12px; - margin-bottom: 0; - *margin-left: .3em; - font-size: 14px; - line-height: 20px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - cursor: pointer; - background-color: #f5f5f5; - *background-color: #e6e6e6; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); - background-repeat: repeat-x; - border: 1px solid #bbbbbb; - *border: 0; - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #a2a2a2; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - color: #333333; - background-color: #e6e6e6; - *background-color: #d9d9d9; -} - -.btn:active, -.btn.active { - background-color: #cccccc \9; -} - -.btn:first-child { - *margin-left: 0; -} - -.btn:hover { - color: #333333; - text-decoration: none; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} - -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.btn.active, -.btn:active { - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn.disabled, -.btn[disabled] { - cursor: default; - background-image: none; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-large { - padding: 11px 19px; - font-size: 17.5px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { - margin-top: 4px; -} - -.btn-small { - padding: 2px 10px; - font-size: 11.9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { - margin-top: 0; -} - -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { - margin-top: -1px; -} - -.btn-mini { - padding: 0 6px; - font-size: 10.5px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-block { - display: block; - width: 100%; - padding-right: 0; - padding-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.btn-block + .btn-block { - margin-top: 5px; -} - -input[type="submit"].btn-block, -input[type="reset"].btn-block, -input[type="button"].btn-block { - width: 100%; -} - -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255, 255, 255, 0.75); -} - -.btn { - border-color: #c5c5c5; - border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); -} - -.btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #006dcc; - *background-color: #0044cc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(to bottom, #0088cc, #0044cc); - background-repeat: repeat-x; - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - color: #ffffff; - background-color: #0044cc; - *background-color: #003bb3; -} - -.btn-primary:active, -.btn-primary.active { - background-color: #003399 \9; -} - -.btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - *background-color: #f89406; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - color: #ffffff; - background-color: #f89406; - *background-color: #df8505; -} - -.btn-warning:active, -.btn-warning.active { - background-color: #c67605 \9; -} - -.btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - *background-color: #bd362f; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); - background-repeat: repeat-x; - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - color: #ffffff; - background-color: #bd362f; - *background-color: #a9302a; -} - -.btn-danger:active, -.btn-danger.active { - background-color: #942a25 \9; -} - -.btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - *background-color: #51a351; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); - background-repeat: repeat-x; - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - color: #ffffff; - background-color: #51a351; - *background-color: #499249; -} - -.btn-success:active, -.btn-success.active { - background-color: #408140 \9; -} - -.btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - *background-color: #2f96b4; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); - background-repeat: repeat-x; - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - color: #ffffff; - background-color: #2f96b4; - *background-color: #2a85a0; -} - -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} - -.btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #363636; - *background-color: #222222; - background-image: -moz-linear-gradient(top, #444444, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); - background-image: -webkit-linear-gradient(top, #444444, #222222); - background-image: -o-linear-gradient(top, #444444, #222222); - background-image: linear-gradient(to bottom, #444444, #222222); - background-repeat: repeat-x; - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - color: #ffffff; - background-color: #222222; - *background-color: #151515; -} - -.btn-inverse:active, -.btn-inverse.active { - background-color: #080808 \9; -} - -button.btn, -input[type="submit"].btn { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn::-moz-focus-inner, -input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} - -button.btn.btn-large, -input[type="submit"].btn.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; -} - -button.btn.btn-small, -input[type="submit"].btn.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn.btn-mini, -input[type="submit"].btn.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; -} - -.btn-link, -.btn-link:active, -.btn-link[disabled] { - background-color: transparent; - background-image: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-link { - color: #0088cc; - cursor: pointer; - border-color: transparent; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-link:hover { - color: #005580; - text-decoration: underline; - background-color: transparent; -} - -.btn-link[disabled]:hover { - color: #333333; - text-decoration: none; -} - -.btn-group { - position: relative; - display: inline-block; - *display: inline; - *margin-left: .3em; - font-size: 0; - white-space: nowrap; - vertical-align: middle; - *zoom: 1; -} - -.btn-group:first-child { - *margin-left: 0; -} - -.btn-group + .btn-group { - margin-left: 5px; -} - -.btn-toolbar { - margin-top: 10px; - margin-bottom: 10px; - font-size: 0; -} - -.btn-toolbar > .btn + .btn, -.btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group { - margin-left: 5px; -} - -.btn-group > .btn { - position: relative; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group > .btn + .btn { - margin-left: -1px; -} - -.btn-group > .btn, -.btn-group > .dropdown-menu, -.btn-group > .popover { - font-size: 14px; -} - -.btn-group > .btn-mini { - font-size: 10.5px; -} - -.btn-group > .btn-small { - font-size: 11.9px; -} - -.btn-group > .btn-large { - font-size: 17.5px; -} - -.btn-group > .btn:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.btn-group > .btn:last-child, -.btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.btn-group > .btn.large:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.btn-group > .btn.large:last-child, -.btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.btn-group > .btn:hover, -.btn-group > .btn:focus, -.btn-group > .btn:active, -.btn-group > .btn.active { - z-index: 2; -} - -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - -.btn-group > .btn + .dropdown-toggle { - *padding-top: 5px; - padding-right: 8px; - *padding-bottom: 5px; - padding-left: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group > .btn-mini + .dropdown-toggle { - *padding-top: 2px; - padding-right: 5px; - *padding-bottom: 2px; - padding-left: 5px; -} - -.btn-group > .btn-small + .dropdown-toggle { - *padding-top: 5px; - *padding-bottom: 4px; -} - -.btn-group > .btn-large + .dropdown-toggle { - *padding-top: 7px; - padding-right: 12px; - *padding-bottom: 7px; - padding-left: 12px; -} - -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group.open .btn.dropdown-toggle { - background-color: #e6e6e6; -} - -.btn-group.open .btn-primary.dropdown-toggle { - background-color: #0044cc; -} - -.btn-group.open .btn-warning.dropdown-toggle { - background-color: #f89406; -} - -.btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; -} - -.btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; -} - -.btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; -} - -.btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; -} - -.btn .caret { - margin-top: 8px; - margin-left: 0; -} - -.btn-mini .caret, -.btn-small .caret, -.btn-large .caret { - margin-top: 6px; -} - -.btn-large .caret { - border-top-width: 5px; - border-right-width: 5px; - border-left-width: 5px; -} - -.dropup .btn-large .caret { - border-bottom-width: 5px; -} - -.btn-primary .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret, -.btn-success .caret, -.btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.btn-group-vertical { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} - -.btn-group-vertical > .btn { - display: block; - float: none; - max-width: 100%; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group-vertical > .btn + .btn { - margin-top: -1px; - margin-left: 0; -} - -.btn-group-vertical > .btn:first-child { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.btn-group-vertical > .btn:last-child { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.btn-group-vertical > .btn-large:first-child { - -webkit-border-radius: 6px 6px 0 0; - -moz-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; -} - -.btn-group-vertical > .btn-large:last-child { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 20px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.alert, -.alert h4 { - color: #c09853; -} - -.alert h4 { - margin: 0; -} - -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 20px; -} - -.alert-success { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.alert-success h4 { - color: #468847; -} - -.alert-danger, -.alert-error { - color: #b94a48; - background-color: #f2dede; - border-color: #eed3d7; -} - -.alert-danger h4, -.alert-error h4 { - color: #b94a48; -} - -.alert-info { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} - -.alert-info h4 { - color: #3a87ad; -} - -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} - -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} - -.alert-block p + p { - margin-top: 5px; -} - -.nav { - margin-bottom: 20px; - margin-left: 0; - list-style: none; -} - -.nav > li > a { - display: block; -} - -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} - -.nav > li > a > img { - max-width: none; -} - -.nav > .pull-right { - float: right; -} - -.nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 20px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} - -.nav li + .nav-header { - margin-top: 9px; -} - -.nav-list { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 0; -} - -.nav-list > li > a, -.nav-list .nav-header { - margin-right: -15px; - margin-left: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} - -.nav-list > li > a { - padding: 3px 15px; -} - -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} - -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - margin-right: 2px; -} - -.nav-list .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.nav-tabs, -.nav-pills { - *zoom: 1; -} - -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - line-height: 0; - content: ""; -} - -.nav-tabs:after, -.nav-pills:after { - clear: both; -} - -.nav-tabs > li, -.nav-pills > li { - float: left; -} - -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} - -.nav-tabs { - border-bottom: 1px solid #ddd; -} - -.nav-tabs > li { - margin-bottom: -1px; -} - -.nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: 20px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} - -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: #555555; - cursor: default; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; -} - -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} - -.nav-stacked > li { - float: none; -} - -.nav-stacked > li > a { - margin-right: 0; -} - -.nav-tabs.nav-stacked { - border-bottom: 0; -} - -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-topleft: 4px; -} - -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.nav-tabs.nav-stacked > li > a:hover { - z-index: 2; - border-color: #ddd; -} - -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} - -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} - -.nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.nav-pills .dropdown-menu { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.nav .dropdown-toggle .caret { - margin-top: 6px; - border-top-color: #0088cc; - border-bottom-color: #0088cc; -} - -.nav .dropdown-toggle:hover .caret { - border-top-color: #005580; - border-bottom-color: #005580; -} - -/* move down carets for tabs */ - -.nav-tabs .dropdown-toggle .caret { - margin-top: 8px; -} - -.nav .active .dropdown-toggle .caret { - border-top-color: #fff; - border-bottom-color: #fff; -} - -.nav-tabs .active .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.nav > .dropdown.active > a:hover { - cursor: pointer; -} - -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} - -.nav li.dropdown.open .caret, -.nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} - -.tabs-stacked .open > a:hover { - border-color: #999999; -} - -.tabbable { - *zoom: 1; -} - -.tabbable:before, -.tabbable:after { - display: table; - line-height: 0; - content: ""; -} - -.tabbable:after { - clear: both; -} - -.tab-content { - overflow: auto; -} - -.tabs-below > .nav-tabs, -.tabs-right > .nav-tabs, -.tabs-left > .nav-tabs { - border-bottom: 0; -} - -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} - -.tab-content > .active, -.pill-content > .active { - display: block; -} - -.tabs-below > .nav-tabs { - border-top: 1px solid #ddd; -} - -.tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} - -.tabs-below > .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.tabs-below > .nav-tabs > li > a:hover { - border-top-color: #ddd; - border-bottom-color: transparent; -} - -.tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} - -.tabs-left > .nav-tabs > li, -.tabs-right > .nav-tabs > li { - float: none; -} - -.tabs-left > .nav-tabs > li > a, -.tabs-right > .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} - -.tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} - -.tabs-left > .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.tabs-left > .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} - -.tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} - -.tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} - -.tabs-right > .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.tabs-right > .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} - -.tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} - -.nav > .disabled > a { - color: #999999; -} - -.nav > .disabled > a:hover { - text-decoration: none; - cursor: default; - background-color: transparent; -} - -.navbar { - *position: relative; - *z-index: 2; - margin-bottom: 20px; - overflow: visible; -} - -.navbar-inner { - min-height: 40px; - padding-right: 20px; - padding-left: 20px; - background-color: #fafafa; - background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); - background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); - background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); - background-repeat: repeat-x; - border: 1px solid #d4d4d4; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); - *zoom: 1; - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -} - -.navbar-inner:before, -.navbar-inner:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-inner:after { - clear: both; -} - -.navbar .container { - width: auto; -} - -.nav-collapse.collapse { - height: auto; - overflow: visible; -} - -.navbar .brand { - display: block; - float: left; - padding: 10px 20px 10px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - color: #777777; - text-shadow: 0 1px 0 #ffffff; -} - -.navbar .brand:hover { - text-decoration: none; -} - -.navbar-text { - margin-bottom: 0; - line-height: 40px; - color: #777777; -} - -.navbar-link { - color: #777777; -} - -.navbar-link:hover { - color: #333333; -} - -.navbar .divider-vertical { - height: 40px; - margin: 0 9px; - border-right: 1px solid #ffffff; - border-left: 1px solid #f2f2f2; -} - -.navbar .btn, -.navbar .btn-group { - margin-top: 5px; -} - -.navbar .btn-group .btn, -.navbar .input-prepend .btn, -.navbar .input-append .btn { - margin-top: 0; -} - -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} - -.navbar-form:before, -.navbar-form:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-form:after { - clear: both; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .radio, -.navbar-form .checkbox { - margin-top: 5px; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .btn { - display: inline-block; - margin-bottom: 0; -} - -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { - margin-top: 3px; -} - -.navbar-form .input-append, -.navbar-form .input-prepend { - margin-top: 5px; - white-space: nowrap; -} - -.navbar-form .input-append input, -.navbar-form .input-prepend input { - margin-top: 0; -} - -.navbar-search { - position: relative; - float: left; - margin-top: 5px; - margin-bottom: 0; -} - -.navbar-search .search-query { - padding: 4px 14px; - margin-bottom: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.navbar-static-top { - position: static; - margin-bottom: 0; -} - -.navbar-static-top .navbar-inner { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - border-width: 0 0 1px; -} - -.navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-right: 0; - padding-left: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.navbar-fixed-top { - top: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -} - -.navbar-fixed-bottom { - bottom: 0; -} - -.navbar-fixed-bottom .navbar-inner { - -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -} - -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} - -.navbar .nav.pull-right { - float: right; - margin-right: 0; -} - -.navbar .nav > li { - float: left; -} - -.navbar .nav > li > a { - float: none; - padding: 10px 15px 10px; - color: #777777; - text-decoration: none; - text-shadow: 0 1px 0 #ffffff; -} - -.navbar .nav .dropdown-toggle .caret { - margin-top: 8px; -} - -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - color: #333333; - text-decoration: none; - background-color: transparent; -} - -.navbar .nav > .active > a, -.navbar .nav > .active > a:hover, -.navbar .nav > .active > a:focus { - color: #555555; - text-decoration: none; - background-color: #e5e5e5; - -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -} - -.navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-right: 5px; - margin-left: 5px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ededed; - *background-color: #e5e5e5; - background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); - background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); - background-repeat: repeat-x; - border-color: #e5e5e5 #e5e5e5 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} - -.navbar .btn-navbar:hover, -.navbar .btn-navbar:active, -.navbar .btn-navbar.active, -.navbar .btn-navbar.disabled, -.navbar .btn-navbar[disabled] { - color: #ffffff; - background-color: #e5e5e5; - *background-color: #d9d9d9; -} - -.navbar .btn-navbar:active, -.navbar .btn-navbar.active { - background-color: #cccccc \9; -} - -.navbar .btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} - -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} - -.navbar .nav > li > .dropdown-menu:before { - position: absolute; - top: -7px; - left: 9px; - display: inline-block; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ''; -} - -.navbar .nav > li > .dropdown-menu:after { - position: absolute; - top: -6px; - left: 10px; - display: inline-block; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - content: ''; -} - -.navbar-fixed-bottom .nav > li > .dropdown-menu:before { - top: auto; - bottom: -7px; - border-top: 7px solid #ccc; - border-bottom: 0; - border-top-color: rgba(0, 0, 0, 0.2); -} - -.navbar-fixed-bottom .nav > li > .dropdown-menu:after { - top: auto; - bottom: -6px; - border-top: 6px solid #ffffff; - border-bottom: 0; -} - -.navbar .nav li.dropdown > a:hover .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { - color: #555555; - background-color: #e5e5e5; -} - -.navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - -.navbar .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar .pull-right > li > .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu:before, -.navbar .nav > li > .dropdown-menu.pull-right:before { - right: 12px; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu:after, -.navbar .nav > li > .dropdown-menu.pull-right:after { - right: 13px; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { - right: 100%; - left: auto; - margin-right: -1px; - margin-left: 0; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; -} - -.navbar-inverse .navbar-inner { - background-color: #1b1b1b; - background-image: -moz-linear-gradient(top, #222222, #111111); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); - background-image: -webkit-linear-gradient(top, #222222, #111111); - background-image: -o-linear-gradient(top, #222222, #111111); - background-image: linear-gradient(to bottom, #222222, #111111); - background-repeat: repeat-x; - border-color: #252525; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); -} - -.navbar-inverse .brand, -.navbar-inverse .nav > li > a { - color: #999999; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} - -.navbar-inverse .brand:hover, -.navbar-inverse .nav > li > a:hover { - color: #ffffff; -} - -.navbar-inverse .brand { - color: #999999; -} - -.navbar-inverse .navbar-text { - color: #999999; -} - -.navbar-inverse .nav > li > a:focus, -.navbar-inverse .nav > li > a:hover { - color: #ffffff; - background-color: transparent; -} - -.navbar-inverse .nav .active > a, -.navbar-inverse .nav .active > a:hover, -.navbar-inverse .nav .active > a:focus { - color: #ffffff; - background-color: #111111; -} - -.navbar-inverse .navbar-link { - color: #999999; -} - -.navbar-inverse .navbar-link:hover { - color: #ffffff; -} - -.navbar-inverse .divider-vertical { - border-right-color: #222222; - border-left-color: #111111; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { - color: #ffffff; - background-color: #111111; -} - -.navbar-inverse .nav li.dropdown > a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .navbar-search .search-query { - color: #ffffff; - background-color: #515151; - border-color: #111111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; -} - -.navbar-inverse .navbar-search .search-query:-moz-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:focus, -.navbar-inverse .navbar-search .search-query.focused { - padding: 5px 15px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - outline: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -} - -.navbar-inverse .btn-navbar { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e0e0e; - *background-color: #040404; - background-image: -moz-linear-gradient(top, #151515, #040404); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); - background-image: -webkit-linear-gradient(top, #151515, #040404); - background-image: -o-linear-gradient(top, #151515, #040404); - background-image: linear-gradient(to bottom, #151515, #040404); - background-repeat: repeat-x; - border-color: #040404 #040404 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.navbar-inverse .btn-navbar:hover, -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active, -.navbar-inverse .btn-navbar.disabled, -.navbar-inverse .btn-navbar[disabled] { - color: #ffffff; - background-color: #040404; - *background-color: #000000; -} - -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active { - background-color: #000000 \9; -} - -.breadcrumb { - padding: 8px 15px; - margin: 0 0 20px; - list-style: none; - background-color: #f5f5f5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.breadcrumb > li { - display: inline-block; - *display: inline; - text-shadow: 0 1px 0 #ffffff; - *zoom: 1; -} - -.breadcrumb > li > .divider { - padding: 0 5px; - color: #ccc; -} - -.breadcrumb > .active { - color: #999999; -} - -.pagination { - margin: 20px 0; -} - -.pagination ul { - display: inline-block; - *display: inline; - margin-bottom: 0; - margin-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - *zoom: 1; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.pagination ul > li { - display: inline; -} - -.pagination ul > li > a, -.pagination ul > li > span { - float: left; - padding: 4px 12px; - line-height: 20px; - text-decoration: none; - background-color: #ffffff; - border: 1px solid #dddddd; - border-left-width: 0; -} - -.pagination ul > li > a:hover, -.pagination ul > .active > a, -.pagination ul > .active > span { - background-color: #f5f5f5; -} - -.pagination ul > .active > a, -.pagination ul > .active > span { - color: #999999; - cursor: default; -} - -.pagination ul > .disabled > span, -.pagination ul > .disabled > a, -.pagination ul > .disabled > a:hover { - color: #999999; - cursor: default; - background-color: transparent; -} - -.pagination ul > li:first-child > a, -.pagination ul > li:first-child > span { - border-left-width: 1px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.pagination ul > li:last-child > a, -.pagination ul > li:last-child > span { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.pagination-centered { - text-align: center; -} - -.pagination-right { - text-align: right; -} - -.pagination-large ul > li > a, -.pagination-large ul > li > span { - padding: 11px 19px; - font-size: 17.5px; -} - -.pagination-large ul > li:first-child > a, -.pagination-large ul > li:first-child > span { - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.pagination-large ul > li:last-child > a, -.pagination-large ul > li:last-child > span { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.pagination-mini ul > li:first-child > a, -.pagination-small ul > li:first-child > a, -.pagination-mini ul > li:first-child > span, -.pagination-small ul > li:first-child > span { - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -moz-border-radius-bottomleft: 3px; - -moz-border-radius-topleft: 3px; -} - -.pagination-mini ul > li:last-child > a, -.pagination-small ul > li:last-child > a, -.pagination-mini ul > li:last-child > span, -.pagination-small ul > li:last-child > span { - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - -moz-border-radius-topright: 3px; - -moz-border-radius-bottomright: 3px; -} - -.pagination-small ul > li > a, -.pagination-small ul > li > span { - padding: 2px 10px; - font-size: 11.9px; -} - -.pagination-mini ul > li > a, -.pagination-mini ul > li > span { - padding: 0 6px; - font-size: 10.5px; -} - -.pager { - margin: 20px 0; - text-align: center; - list-style: none; - *zoom: 1; -} - -.pager:before, -.pager:after { - display: table; - line-height: 0; - content: ""; -} - -.pager:after { - clear: both; -} - -.pager li { - display: inline; -} - -.pager li > a, -.pager li > span { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.pager li > a:hover { - text-decoration: none; - background-color: #f5f5f5; -} - -.pager .next > a, -.pager .next > span { - float: right; -} - -.pager .previous > a, -.pager .previous > span { - float: left; -} - -.pager .disabled > a, -.pager .disabled > a:hover, -.pager .disabled > span { - color: #999999; - cursor: default; - background-color: #fff; -} - -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} - -.modal-backdrop.fade { - opacity: 0; -} - -.modal-backdrop, -.modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.modal { - position: fixed; - top: 10%; - left: 50%; - z-index: 1050; - width: 560px; - margin-left: -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - outline: none; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} - -.modal.fade { - top: -25%; - -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; - -moz-transition: opacity 0.3s linear, top 0.3s ease-out; - -o-transition: opacity 0.3s linear, top 0.3s ease-out; - transition: opacity 0.3s linear, top 0.3s ease-out; -} - -.modal.fade.in { - top: 10%; -} - -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} - -.modal-header .close { - margin-top: 2px; -} - -.modal-header h3 { - margin: 0; - line-height: 30px; -} - -.modal-body { - position: relative; - max-height: 400px; - padding: 15px; - overflow-y: auto; -} - -.modal-form { - margin-bottom: 0; -} - -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} - -.modal-footer:before, -.modal-footer:after { - display: table; - line-height: 0; - content: ""; -} - -.modal-footer:after { - clear: both; -} - -.modal-footer .btn + .btn { - margin-bottom: 0; - margin-left: 5px; -} - -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} - -.modal-footer .btn-block + .btn-block { - margin-left: 0; -} - -.tooltip { - position: absolute; - z-index: 1030; - display: block; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); - visibility: visible; -} - -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.tooltip.top { - margin-top: -3px; -} - -.tooltip.right { - margin-left: 3px; -} - -.tooltip.bottom { - margin-top: 3px; -} - -.tooltip.left { - margin-left: -3px; -} - -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top-color: #000000; - border-width: 5px 5px 0; -} - -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-right-color: #000000; - border-width: 5px 5px 5px 0; -} - -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-left-color: #000000; - border-width: 5px 0 5px 5px; -} - -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-bottom-color: #000000; - border-width: 0 5px 5px; -} - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - width: 236px; - padding: 1px; - text-align: left; - white-space: normal; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.popover.top { - margin-top: -10px; -} - -.popover.right { - margin-left: 10px; -} - -.popover.bottom { - margin-top: 10px; -} - -.popover.left { - margin-left: -10px; -} - -.popover-title { - padding: 8px 14px; - margin: 0; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: #f7f7f7; - border-bottom: 1px solid #ebebeb; - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} - -.popover-content { - padding: 9px 14px; -} - -.popover .arrow, -.popover .arrow:after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.popover .arrow { - border-width: 11px; -} - -.popover .arrow:after { - border-width: 10px; - content: ""; -} - -.popover.top .arrow { - bottom: -11px; - left: 50%; - margin-left: -11px; - border-top-color: #999; - border-top-color: rgba(0, 0, 0, 0.25); - border-bottom-width: 0; -} - -.popover.top .arrow:after { - bottom: 1px; - margin-left: -10px; - border-top-color: #ffffff; - border-bottom-width: 0; -} - -.popover.right .arrow { - top: 50%; - left: -11px; - margin-top: -11px; - border-right-color: #999; - border-right-color: rgba(0, 0, 0, 0.25); - border-left-width: 0; -} - -.popover.right .arrow:after { - bottom: -10px; - left: 1px; - border-right-color: #ffffff; - border-left-width: 0; -} - -.popover.bottom .arrow { - top: -11px; - left: 50%; - margin-left: -11px; - border-bottom-color: #999; - border-bottom-color: rgba(0, 0, 0, 0.25); - border-top-width: 0; -} - -.popover.bottom .arrow:after { - top: 1px; - margin-left: -10px; - border-bottom-color: #ffffff; - border-top-width: 0; -} - -.popover.left .arrow { - top: 50%; - right: -11px; - margin-top: -11px; - border-left-color: #999; - border-left-color: rgba(0, 0, 0, 0.25); - border-right-width: 0; -} - -.popover.left .arrow:after { - right: 1px; - bottom: -10px; - border-left-color: #ffffff; - border-right-width: 0; -} - -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} - -.thumbnails:before, -.thumbnails:after { - display: table; - line-height: 0; - content: ""; -} - -.thumbnails:after { - clear: both; -} - -.row-fluid .thumbnails { - margin-left: 0; -} - -.thumbnails > li { - float: left; - margin-bottom: 20px; - margin-left: 20px; -} - -.thumbnail { - display: block; - padding: 4px; - line-height: 20px; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} - -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} - -.thumbnail > img { - display: block; - max-width: 100%; - margin-right: auto; - margin-left: auto; -} - -.thumbnail .caption { - padding: 9px; - color: #555555; -} - -.media, -.media-body { - overflow: hidden; - *overflow: visible; - zoom: 1; -} - -.media, -.media .media { - margin-top: 15px; -} - -.media:first-child { - margin-top: 0; -} - -.media-object { - display: block; -} - -.media-heading { - margin: 0 0 5px; -} - -.media .pull-left { - margin-right: 10px; -} - -.media .pull-right { - margin-left: 10px; -} - -.media-list { - margin-left: 0; - list-style: none; -} - -.label, -.badge { - display: inline-block; - padding: 2px 4px; - font-size: 11.844px; - font-weight: bold; - line-height: 14px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - white-space: nowrap; - vertical-align: baseline; - background-color: #999999; -} - -.label { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.badge { - padding-right: 9px; - padding-left: 9px; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; -} - -.label:empty, -.badge:empty { - display: none; -} - -a.label:hover, -a.badge:hover { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} - -.label-important, -.badge-important { - background-color: #b94a48; -} - -.label-important[href], -.badge-important[href] { - background-color: #953b39; -} - -.label-warning, -.badge-warning { - background-color: #f89406; -} - -.label-warning[href], -.badge-warning[href] { - background-color: #c67605; -} - -.label-success, -.badge-success { - background-color: #468847; -} - -.label-success[href], -.badge-success[href] { - background-color: #356635; -} - -.label-info, -.badge-info { - background-color: #3a87ad; -} - -.label-info[href], -.badge-info[href] { - background-color: #2d6987; -} - -.label-inverse, -.badge-inverse { - background-color: #333333; -} - -.label-inverse[href], -.badge-inverse[href] { - background-color: #1a1a1a; -} - -.btn .label, -.btn .badge { - position: relative; - top: -1px; -} - -.btn-mini .label, -.btn-mini .badge { - top: 0; -} - -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-ms-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} - -@keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -.progress { - height: 20px; - margin-bottom: 20px; - overflow: hidden; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} - -.progress .bar { - float: left; - width: 0; - height: 100%; - font-size: 12px; - color: #ffffff; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(to bottom, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} - -.progress .bar + .bar { - -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); -} - -.progress-striped .bar { - background-color: #149bdf; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} - -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} - -.progress-danger .bar, -.progress .bar-danger { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); -} - -.progress-danger.progress-striped .bar, -.progress-striped .bar-danger { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-success .bar, -.progress .bar-success { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(to bottom, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); -} - -.progress-success.progress-striped .bar, -.progress-striped .bar-success { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-info .bar, -.progress .bar-info { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(to bottom, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); -} - -.progress-info.progress-striped .bar, -.progress-striped .bar-info { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-warning .bar, -.progress .bar-warning { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); -} - -.progress-warning.progress-striped .bar, -.progress-striped .bar-warning { - background-color: #fbb450; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.accordion { - margin-bottom: 20px; -} - -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.accordion-heading { - border-bottom: 0; -} - -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} - -.accordion-toggle { - cursor: pointer; -} - -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} - -.carousel { - position: relative; - margin-bottom: 20px; - line-height: 1; -} - -.carousel-inner { - position: relative; - width: 100%; - overflow: hidden; -} - -.carousel-inner > .item { - position: relative; - display: none; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} - -.carousel-inner > .item > img { - display: block; - line-height: 1; -} - -.carousel-inner > .active, -.carousel-inner > .next, -.carousel-inner > .prev { - display: block; -} - -.carousel-inner > .active { - left: 0; -} - -.carousel-inner > .next, -.carousel-inner > .prev { - position: absolute; - top: 0; - width: 100%; -} - -.carousel-inner > .next { - left: 100%; -} - -.carousel-inner > .prev { - left: -100%; -} - -.carousel-inner > .next.left, -.carousel-inner > .prev.right { - left: 0; -} - -.carousel-inner > .active.left { - left: -100%; -} - -.carousel-inner > .active.right { - left: 100%; -} - -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} - -.carousel-control.right { - right: 15px; - left: auto; -} - -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} - -.carousel-caption { - position: absolute; - right: 0; - bottom: 0; - left: 0; - padding: 15px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} - -.carousel-caption h4, -.carousel-caption p { - line-height: 20px; - color: #ffffff; -} - -.carousel-caption h4 { - margin: 0 0 5px; -} - -.carousel-caption p { - margin-bottom: 0; -} - -.hero-unit { - padding: 60px; - margin-bottom: 30px; - font-size: 18px; - font-weight: 200; - line-height: 30px; - color: inherit; - background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; - color: inherit; -} - -.hero-unit li { - line-height: 30px; -} - -.pull-right { - float: right; -} - -.pull-left { - float: left; -} - -.hide { - display: none; -} - -.show { - display: block; -} - -.invisible { - visibility: hidden; -} - -.affix { - position: fixed; -} diff --git a/samples/javaconfig/helloworld/src/main/webapp/resources/img/favicon.ico b/samples/javaconfig/helloworld/src/main/webapp/resources/img/favicon.ico deleted file mode 100644 index bfb9974019d4b8b978cf34ea67f0c6804f9b76c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYI*xFHzK2NLHVUHb1iG2*{Y zgB?lOds5VYkY4wx3IDZQ-O0jkQ{(?@bp=p{C&v8O!h&CXe)}H=o_u_bRSig==8O!i zc=x^YFzx?WUq6CX4M?xX{1U9V`}7vL{^Em6v8n;-RbSqS702#f2-g1(NLsD$!KwzN zS8ZJ%R&20o^8Y{o{{6r8@eNjaxV~+({;Q#3&F!=Q_uf49|L5O7|6hFn@<03RE(|p= zJ*s<_{YS^WcP_&H4q|}(5Orn`hB}ZwmBSk_@QDwvQS^g2lONu|PzTm~V&{JqG(7$3 zJq-P6H_u_H1L;#fa{vQto;~z`$*ZUT-~ayo|MAc7|C=7&#!v&-2UM#}0rtFhmTdiw fS5E!E^7Zq7x2tDJHpBVK>Hp`xeEbh92gs!XBi)`m diff --git a/samples/javaconfig/helloworld/src/main/webapp/resources/img/logo.png b/samples/javaconfig/helloworld/src/main/webapp/resources/img/logo.png deleted file mode 100644 index 393230883fb4e04829339f7c21b6ab6de7393891..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1123 zcmV-p1f2VcP)P000yS1^@s74{)X{0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$1xZ9fRCwBAJakr>0R&#%?*!8<7oReN z=>H6CRSb*_9RHalf3;=rzRt=3!VW|AET)fs_IS z5aXsJDqv;5UUXCgspCNG%qCu4_4m8Q8J4{_Ss=DB)G%-}OK$)A_qiv-M@As~;az|L zf?EIsP`7cheE7}?GEN=HaRK6^jLh%PvWj*xv3z@3xac)oRV-9P3=lIhyklZuIsRdC zEQk#P>`Ve}KmUCIvzcu9Tf*+YVP*hfGu{$8D7y_HfEf3kMztIrynEOQW2*Ct&A;*G zO}I7VlHICc5w;GSdsSFH1nBbCHtgWCZ;JNm@ z`XjO?7RGP?S?;`M26}|$>d$}7+Q^c380tVF%ErLJjAqwYZkA^sS%0xHF}~wxlbiD5 z`(qoR=no*41>&DbDvtqiaJE+C3lIk&fG}bK9l%ly6jZSM`Nu#MU}XG#RzRlJh~>*q zMz|m_S~GwYKiDe_40nN83W%$i`8HWIa~)&&`WqMkpMdet@v+_G7x%2~|M)9$Tk#!Y zFw1)&gOROi`~TlS|Ne#uGBU8e{?G6W7-39r7#RMspu`I>^-8__`jg@PS4KGI{tDI)dzZ%dlS>M59FF!%vUTz)~b4X4$^~`TvW7 ziIMs5zyE)kk;ES}`AIdM1t$C=P~wMS3!!9Ap!k0ap%i9haWBalIY!4O?f(oAd%r+4 zo)k2;d7%b_#Jhnp-2~zQ1Q@}XCIrw@0t|34GX2=V#dp;1>j!5(mhZn98K?y0fw-87 z<#h&!;7V3zwkKdg)?fU+ET4a(DSgvn03;_eFu%5AV7&(n_piW02N=Hpff?mLFf{&g z0%=ZYR2CvOD9l@{`Ma!o3LDu1eZb}An>(a<~Q?=8{fF=xc@W!MoZ)b z{O|{gu_$Ev|5TXe{Z}Tay7jj||2@OO@D(hD)hsRsjrwm4H=1C4P6p+J-x==O;Vpp} zelf7T{l>^3$L4GI;MZmjLQek2%+jdD-YkChTV1vRXZ6WjKj)c!`-fi-2P5B87D!gv za)A+O=YLR%j|aSGxW@31vGu^;|BMVrzfaux>)%&1LJk9(o(#_DK=28Oy@5ho@oC^@ z5m@o{&xh3zgTK{rGV>dM|NF@cm+`=a;1wp - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/javaconfig/jdbc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/jdbc/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02ef..0000000000 --- a/samples/javaconfig/jdbc/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle b/samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle deleted file mode 100644 index 87169c4ce4..0000000000 --- a/samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-core') - compile project(':spring-security-ldap') - compile project(':spring-security-samples-javaconfig-messages') - compile project(':spring-security-web') - compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' - compile 'javax.validation:validation-api' - compile 'javax.xml.bind:jaxb-api' - compile 'org.hibernate:hibernate-validator' - compile 'org.springframework:spring-webmvc' - compile 'com.unboundid:unboundid-ldapsdk' - compile slf4jDependencies - - providedCompile 'javax.servlet:javax.servlet-api' - providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api' - - runtime 'opensymphony:sitemesh' - - integrationTestCompile seleniumDependencies -} diff --git a/samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/LdapJcTests.java b/samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/LdapJcTests.java deleted file mode 100644 index 99df0ac959..0000000000 --- a/samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/LdapJcTests.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import org.springframework.security.samples.pages.HomePage; -import org.springframework.security.samples.pages.LoginPage; - -/** - * @author Michael Simons - */ -public class LdapJcTests { - private WebDriver driver; - - private int port; - - @Before - public void setup() { - this.port = Integer.parseInt(System.getProperty("app.httpPort")); - this.driver = new HtmlUnitDriver(); - } - - @After - public void tearDown() { - this.driver.quit(); - } - - @Test - public void accessHomePageWithUnauthenticatedUserSendsToLoginPage() { - final LoginPage loginPage = HomePage.to(this.driver, this.port); - loginPage.assertAt(); - } - - @Test - public void authenticatedUserIsSentToOriginalPage() { - final String userName = "user"; - // @formatter:off - final HomePage homePage = HomePage.to(this.driver, this.port) - .loginForm() - .username(userName) - .password("password") - .submit(); - // @formatter:on - homePage - .assertAt() - .andTheUserNameDisplayedIs(userName); - } - - @Test - public void authenticatedUserLogsOut() { - // @formatter:off - LoginPage loginPage = HomePage.to(this.driver, this.port) - .loginForm() - .username("user") - .password("password") - .submit() - .logout(); - // @formatter:on - loginPage.assertAt(); - - loginPage = HomePage.to(this.driver, this.port); - loginPage.assertAt(); - } -} diff --git a/samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java b/samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java deleted file mode 100644 index 22ddd1c639..0000000000 --- a/samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Michael Simons - */ -public class HomePage { - private final WebDriver webDriver; - - @FindBy(css = "input[type=submit]") - private WebElement logoutButton; - - public static LoginPage to(WebDriver driver, int port) { - driver.get("http://localhost:" + port +"/"); - return PageFactory.initElements(driver, LoginPage.class); - } - - public HomePage(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public Content assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("SecureMail: View All"); - return PageFactory.initElements(this.webDriver, Content.class); - } - - public LoginPage logout() { - this.logoutButton.submit(); - return PageFactory.initElements(this.webDriver, LoginPage.class); - } - - public static class Content { - @FindBy(css = "p.navbar-text") - private WebElement message; - - public Content andTheUserNameDisplayedIs(final String userName) { - assertThat(message.getText()).isEqualTo(userName); - return this; - } - } -} diff --git a/samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java b/samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java deleted file mode 100644 index 30822ea2a9..0000000000 --- a/samples/javaconfig/ldap/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Michael Simons - */ -public class LoginPage { - - private final WebDriver webDriver; - - private final LoginForm loginForm; - - public LoginPage(WebDriver webDriver) { - this.webDriver = webDriver; - this.loginForm = PageFactory.initElements(this.webDriver, LoginForm.class); - } - - public LoginPage assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in"); - return this; - } - - public LoginForm loginForm() { - return this.loginForm; - } - - public static class LoginForm { - private WebDriver webDriver; - private WebElement username; - private WebElement password; - @FindBy(css = "button[type=submit]") - private WebElement submit; - - public LoginForm(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public LoginForm username(String username) { - this.username.sendKeys(username); - return this; - } - - public LoginForm password(String password) { - this.password.sendKeys(password); - return this; - } - - public HomePage submit() { - this.submit.click(); - return PageFactory.initElements(this.webDriver, HomePage.class); - } - } -} diff --git a/samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java deleted file mode 100644 index f851f82de0..0000000000 --- a/samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; - -/** - * No customizations of {@link AbstractSecurityWebApplicationInitializer} are necessary. - * - * @author Rob Winch - */ -public class MessageSecurityWebApplicationInitializer extends - AbstractSecurityWebApplicationInitializer { -} diff --git a/samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index da5de6aa67..0000000000 --- a/samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; - -@EnableWebSecurity -public class SecurityConfig { - // @formatter:off - @Autowired - public void configureGlobal( - AuthenticationManagerBuilder auth) throws Exception { - auth - .ldapAuthentication() - .userDnPatterns("uid={0},ou=people") - .groupSearchBase("ou=groups") - .contextSource().port(0); - } - // @formatter:on -} diff --git a/samples/javaconfig/ldap/src/main/resources/logback.xml b/samples/javaconfig/ldap/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/javaconfig/ldap/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/javaconfig/ldap/src/main/resources/users.ldif b/samples/javaconfig/ldap/src/main/resources/users.ldif deleted file mode 100644 index e76a28db92..0000000000 --- a/samples/javaconfig/ldap/src/main/resources/users.ldif +++ /dev/null @@ -1,42 +0,0 @@ -dn: ou=groups,dc=springframework,dc=org -objectclass: top -objectclass: organizationalUnit -ou: groups - -dn: ou=people,dc=springframework,dc=org -objectclass: top -objectclass: organizationalUnit -ou: people - -dn: uid=admin,ou=people,dc=springframework,dc=org -objectclass: top -objectclass: person -objectclass: organizationalPerson -objectclass: inetOrgPerson -cn: Rod Johnson -sn: Johnson -uid: admin -userPassword: password - -dn: uid=user,ou=people,dc=springframework,dc=org -objectclass: top -objectclass: person -objectclass: organizationalPerson -objectclass: inetOrgPerson -cn: Dianne Emu -sn: Emu -uid: user -userPassword: password - -dn: cn=user,ou=groups,dc=springframework,dc=org -objectclass: top -objectclass: groupOfUniqueNames -cn: user -uniqueMember: uid=admin,ou=people,dc=springframework,dc=org -uniqueMember: uid=user,ou=people,dc=springframework,dc=org - -dn: cn=admin,ou=groups,dc=springframework,dc=org -objectclass: top -objectclass: groupOfUniqueNames -cn: admin -uniqueMember: uid=admin,ou=people,dc=springframework,dc=org diff --git a/samples/javaconfig/ldap/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/ldap/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02ef..0000000000 --- a/samples/javaconfig/ldap/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/samples/javaconfig/messages/spring-security-samples-javaconfig-messages.gradle b/samples/javaconfig/messages/spring-security-samples-javaconfig-messages.gradle deleted file mode 100644 index 43c2f49ac2..0000000000 --- a/samples/javaconfig/messages/spring-security-samples-javaconfig-messages.gradle +++ /dev/null @@ -1,31 +0,0 @@ - - -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-web') - compile 'javax.validation:validation-api' - compile 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect' - compile 'org.eclipse.persistence:javax.persistence' - compile('org.hibernate:hibernate-entitymanager') { - exclude group:'javassist', module: 'javassist' - } - compile 'org.hibernate:hibernate-validator' - compile 'org.hsqldb:hsqldb' - compile('org.springframework.data:spring-data-jpa') { - exclude group:'org.aspectj', module:'aspectjrt' - } - compile 'org.springframework:spring-aop' - compile 'org.springframework:spring-aspects' - compile 'org.springframework:spring-beans' - compile 'org.springframework:spring-context' - compile 'org.springframework:spring-core' - compile 'org.springframework:spring-instrument' - compile 'org.springframework:spring-orm' - compile 'org.springframework:spring-tx' - compile 'org.springframework:spring-webmvc' - compile 'org.thymeleaf:thymeleaf-spring5' - - providedCompile 'javax.servlet:javax.servlet-api' -} diff --git a/samples/javaconfig/messages/src/main/java/META-INF/MANIFEST.MF b/samples/javaconfig/messages/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 5e9495128c..0000000000 --- a/samples/javaconfig/messages/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/DataConfiguration.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/DataConfiguration.java deleted file mode 100644 index 9e174051d8..0000000000 --- a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/DataConfiguration.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import javax.sql.DataSource; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.DependsOn; -import org.springframework.core.io.ClassPathResource; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; -import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; -import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; -import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.orm.jpa.vendor.Database; -import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; -import org.springframework.security.samples.data.Message; -import org.springframework.transaction.PlatformTransactionManager; - -@Configuration -@EnableJpaRepositories("org.springframework.security.samples.data") -public class DataConfiguration { - - @Bean - public DataSource dataSource() { - EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder(); - return builder.setType(EmbeddedDatabaseType.HSQL).build(); - } - - @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactory() { - HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); - vendorAdapter.setDatabase(Database.HSQL); - vendorAdapter.setGenerateDdl(true); - - LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean(); - factory.setJpaVendorAdapter(vendorAdapter); - factory.setPackagesToScan(Message.class.getPackage().getName()); - factory.setDataSource(dataSource()); - - return factory; - } - - @Bean - @DependsOn("entityManagerFactory") - public ResourceDatabasePopulator initDatabase(DataSource dataSource) throws Exception { - ResourceDatabasePopulator populator = new ResourceDatabasePopulator(); - populator.addScript(new ClassPathResource("data.sql")); - populator.populate(dataSource.getConnection()); - return populator; - } - - @Bean - public PlatformTransactionManager transactionManager() { - JpaTransactionManager txManager = new JpaTransactionManager(); - txManager.setEntityManagerFactory(entityManagerFactory().getObject()); - return txManager; - } -} diff --git a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java deleted file mode 100644 index 428042060f..0000000000 --- a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import javax.servlet.Filter; - -import org.springframework.security.samples.mvc.config.WebMvcConfiguration; -import org.springframework.web.filter.HiddenHttpMethodFilter; -import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; - -public class MessageWebApplicationInitializer extends - AbstractAnnotationConfigDispatcherServletInitializer { - - @Override - protected Class[] getRootConfigClasses() { - return new Class[] { RootConfiguration.class }; - } - - @Override - protected Class[] getServletConfigClasses() { - return new Class[] { WebMvcConfiguration.class }; - } - - @Override - protected String[] getServletMappings() { - return new String[] { "/" }; - } - - @Override - protected Filter[] getServletFilters() { - return new Filter[] { new HiddenHttpMethodFilter() }; - } -} diff --git a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/RootConfiguration.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/RootConfiguration.java deleted file mode 100644 index ce3d173848..0000000000 --- a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/RootConfiguration.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ComponentScan -public class RootConfiguration { - -} \ No newline at end of file diff --git a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/Message.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/Message.java deleted file mode 100644 index 23e038f702..0000000000 --- a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/Message.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.data; - -import java.util.Calendar; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; - -import org.hibernate.validator.constraints.NotEmpty; - -@Entity -public class Message { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @NotEmpty(message = "Message is required.") - private String text; - - @NotEmpty(message = "Summary is required.") - private String summary; - - private Calendar created = Calendar.getInstance(); - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Calendar getCreated() { - return created; - } - - public void setCreated(Calendar created) { - this.created = created; - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - - public String getSummary() { - return summary; - } - - public void setSummary(String summary) { - this.summary = summary; - } -} diff --git a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/MessageRepository.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/MessageRepository.java deleted file mode 100644 index 22a417facf..0000000000 --- a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/MessageRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.data; - -import org.springframework.data.repository.CrudRepository; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.transaction.annotation.Transactional; - -public interface MessageRepository extends CrudRepository { - - @Transactional - @PreAuthorize("hasRole('ROLE_ADMIN')") - S save(S entity); -} diff --git a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/DefaultController.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/DefaultController.java deleted file mode 100644 index 62b42b489f..0000000000 --- a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/DefaultController.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.mvc; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -@Controller -public class DefaultController { - - @RequestMapping("/**") - public String notFound() { - return "errors/404"; - } -} diff --git a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/MessageController.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/MessageController.java deleted file mode 100644 index 8c909eb0a6..0000000000 --- a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/MessageController.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.mvc; - -import javax.validation.Valid; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.samples.data.Message; -import org.springframework.security.samples.data.MessageRepository; -import org.springframework.stereotype.Controller; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -@Controller -@RequestMapping("/") -public class MessageController { - private MessageRepository messageRepository; - - @Autowired - public MessageController(MessageRepository messageRepository) { - this.messageRepository = messageRepository; - } - - @RequestMapping - public ModelAndView list() { - Iterable messages = messageRepository.findAll(); - return new ModelAndView("messages/inbox", "messages", messages); - } - - @RequestMapping("{id}") - public ModelAndView view(@PathVariable("id") Message message) { - return new ModelAndView("messages/show", "message", message); - } - - @RequestMapping(value = "{id}", method = RequestMethod.DELETE) - public String delete(@PathVariable("id") Message message, RedirectAttributes redirect) { - messageRepository.delete(message); - redirect.addFlashAttribute("globalMessage", "Message removed successfully"); - return "redirect:/"; - } - - @RequestMapping(params = "form", method = RequestMethod.GET) - public String createForm(@ModelAttribute Message message) { - return "messages/compose"; - } - - @RequestMapping(method = RequestMethod.POST) - public ModelAndView create(@Valid Message message, BindingResult result, - RedirectAttributes redirect) { - if (result.hasErrors()) { - return new ModelAndView("messages/compose"); - } - message = messageRepository.save(message); - redirect.addFlashAttribute("globalMessage", "Successfully created a new message"); - return new ModelAndView("redirect:/{message.id}", "message.id", message.getId()); - } -} diff --git a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java deleted file mode 100644 index dfbef33d6c..0000000000 --- a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.mvc.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.core.Ordered; -import org.springframework.data.repository.support.DomainClassConverter; -import org.springframework.format.support.FormattingConversionService; -import org.springframework.web.servlet.ViewResolver; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.thymeleaf.spring5.SpringTemplateEngine; -import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; -import org.thymeleaf.spring5.view.ThymeleafViewResolver; -import org.thymeleaf.templatemode.TemplateMode; - -@EnableWebMvc -@ComponentScan("org.springframework.security.samples.mvc") -public class WebMvcConfiguration implements WebMvcConfigurer { - - @Autowired - private ApplicationContext applicationContext; - - @Autowired - private FormattingConversionService mvcConversionService; - - @Override - public void addViewControllers(ViewControllerRegistry registry) { - registry.addViewController("/login").setViewName("login"); - registry.setOrder(Ordered.HIGHEST_PRECEDENCE); - } - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("/resources/**").addResourceLocations("classpath:/resources/") - .setCachePeriod(31556926); - registry.setOrder(Ordered.HIGHEST_PRECEDENCE); - } - - @Bean - public ViewResolver viewResolver() { - ThymeleafViewResolver resolver = new ThymeleafViewResolver(); - resolver.setTemplateEngine(templateEngine()); - resolver.setCharacterEncoding("UTF-8"); - return resolver; - } - - @Bean - public SpringTemplateEngine templateEngine() { - SpringTemplateEngine engine = new SpringTemplateEngine(); - engine.setEnableSpringELCompiler(true); - engine.setTemplateResolver(templateResolver()); - return engine; - } - - private SpringResourceTemplateResolver templateResolver() { - SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver(); - resolver.setPrefix("classpath:/views/"); - resolver.setSuffix(".html"); - resolver.setTemplateMode(TemplateMode.HTML); - resolver.setApplicationContext(applicationContext); - return resolver; - } - - @Bean - public DomainClassConverter domainClassConverter() { - return new DomainClassConverter<>(mvcConversionService); - } -} diff --git a/samples/javaconfig/messages/src/main/resources/data.sql b/samples/javaconfig/messages/src/main/resources/data.sql deleted file mode 100644 index 7ca2b297ed..0000000000 --- a/samples/javaconfig/messages/src/main/resources/data.sql +++ /dev/null @@ -1,2 +0,0 @@ -insert into message(created,summary,text) values ('2013-10-04 10:00:00','Hello Rob','This message is for Rob'); -insert into message(created,summary,text) values ('2013-10-04 10:00:00','Hello Luke','This message is for Luke'); \ No newline at end of file diff --git a/samples/javaconfig/messages/src/main/resources/resources/css/bootstrap-responsive.css b/samples/javaconfig/messages/src/main/resources/resources/css/bootstrap-responsive.css deleted file mode 100644 index ba09bc8777..0000000000 --- a/samples/javaconfig/messages/src/main/resources/resources/css/bootstrap-responsive.css +++ /dev/null @@ -1,1092 +0,0 @@ -/*! - * Bootstrap Responsive v2.2.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -@-ms-viewport { - width: device-width; -} - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.hidden { - display: none; - visibility: hidden; -} - -.visible-phone { - display: none !important; -} - -.visible-tablet { - display: none !important; -} - -.hidden-desktop { - display: none !important; -} - -.visible-desktop { - display: inherit !important; -} - -@media (min-width: 768px) and (max-width: 979px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important ; - } - .visible-tablet { - display: inherit !important; - } - .hidden-tablet { - display: none !important; - } -} - -@media (max-width: 767px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important; - } - .visible-phone { - display: inherit !important; - } - .hidden-phone { - display: none !important; - } -} - -@media (min-width: 1200px) { - .row { - margin-left: -30px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 30px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 1170px; - } - .span12 { - width: 1170px; - } - .span11 { - width: 1070px; - } - .span10 { - width: 970px; - } - .span9 { - width: 870px; - } - .span8 { - width: 770px; - } - .span7 { - width: 670px; - } - .span6 { - width: 570px; - } - .span5 { - width: 470px; - } - .span4 { - width: 370px; - } - .span3 { - width: 270px; - } - .span2 { - width: 170px; - } - .span1 { - width: 70px; - } - .offset12 { - margin-left: 1230px; - } - .offset11 { - margin-left: 1130px; - } - .offset10 { - margin-left: 1030px; - } - .offset9 { - margin-left: 930px; - } - .offset8 { - margin-left: 830px; - } - .offset7 { - margin-left: 730px; - } - .offset6 { - margin-left: 630px; - } - .offset5 { - margin-left: 530px; - } - .offset4 { - margin-left: 430px; - } - .offset3 { - margin-left: 330px; - } - .offset2 { - margin-left: 230px; - } - .offset1 { - margin-left: 130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.564102564102564%; - *margin-left: 2.5109110747408616%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.564102564102564%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.45299145299145%; - *width: 91.39979996362975%; - } - .row-fluid .span10 { - width: 82.90598290598291%; - *width: 82.8527914166212%; - } - .row-fluid .span9 { - width: 74.35897435897436%; - *width: 74.30578286961266%; - } - .row-fluid .span8 { - width: 65.81196581196582%; - *width: 65.75877432260411%; - } - .row-fluid .span7 { - width: 57.26495726495726%; - *width: 57.21176577559556%; - } - .row-fluid .span6 { - width: 48.717948717948715%; - *width: 48.664757228587014%; - } - .row-fluid .span5 { - width: 40.17094017094017%; - *width: 40.11774868157847%; - } - .row-fluid .span4 { - width: 31.623931623931625%; - *width: 31.570740134569924%; - } - .row-fluid .span3 { - width: 23.076923076923077%; - *width: 23.023731587561375%; - } - .row-fluid .span2 { - width: 14.52991452991453%; - *width: 14.476723040552828%; - } - .row-fluid .span1 { - width: 5.982905982905983%; - *width: 5.929714493544281%; - } - .row-fluid .offset12 { - margin-left: 105.12820512820512%; - *margin-left: 105.02182214948171%; - } - .row-fluid .offset12:first-child { - margin-left: 102.56410256410257%; - *margin-left: 102.45771958537915%; - } - .row-fluid .offset11 { - margin-left: 96.58119658119658%; - *margin-left: 96.47481360247316%; - } - .row-fluid .offset11:first-child { - margin-left: 94.01709401709402%; - *margin-left: 93.91071103837061%; - } - .row-fluid .offset10 { - margin-left: 88.03418803418803%; - *margin-left: 87.92780505546462%; - } - .row-fluid .offset10:first-child { - margin-left: 85.47008547008548%; - *margin-left: 85.36370249136206%; - } - .row-fluid .offset9 { - margin-left: 79.48717948717949%; - *margin-left: 79.38079650845607%; - } - .row-fluid .offset9:first-child { - margin-left: 76.92307692307693%; - *margin-left: 76.81669394435352%; - } - .row-fluid .offset8 { - margin-left: 70.94017094017094%; - *margin-left: 70.83378796144753%; - } - .row-fluid .offset8:first-child { - margin-left: 68.37606837606839%; - *margin-left: 68.26968539734497%; - } - .row-fluid .offset7 { - margin-left: 62.393162393162385%; - *margin-left: 62.28677941443899%; - } - .row-fluid .offset7:first-child { - margin-left: 59.82905982905982%; - *margin-left: 59.72267685033642%; - } - .row-fluid .offset6 { - margin-left: 53.84615384615384%; - *margin-left: 53.739770867430444%; - } - .row-fluid .offset6:first-child { - margin-left: 51.28205128205128%; - *margin-left: 51.175668303327875%; - } - .row-fluid .offset5 { - margin-left: 45.299145299145295%; - *margin-left: 45.1927623204219%; - } - .row-fluid .offset5:first-child { - margin-left: 42.73504273504273%; - *margin-left: 42.62865975631933%; - } - .row-fluid .offset4 { - margin-left: 36.75213675213675%; - *margin-left: 36.645753773413354%; - } - .row-fluid .offset4:first-child { - margin-left: 34.18803418803419%; - *margin-left: 34.081651209310785%; - } - .row-fluid .offset3 { - margin-left: 28.205128205128204%; - *margin-left: 28.0987452264048%; - } - .row-fluid .offset3:first-child { - margin-left: 25.641025641025642%; - *margin-left: 25.53464266230224%; - } - .row-fluid .offset2 { - margin-left: 19.65811965811966%; - *margin-left: 19.551736679396257%; - } - .row-fluid .offset2:first-child { - margin-left: 17.094017094017094%; - *margin-left: 16.98763411529369%; - } - .row-fluid .offset1 { - margin-left: 11.11111111111111%; - *margin-left: 11.004728132387708%; - } - .row-fluid .offset1:first-child { - margin-left: 8.547008547008547%; - *margin-left: 8.440625568285142%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 30px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 1156px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 1056px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 956px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 856px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 756px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 656px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 556px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 456px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 356px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 256px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 156px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 56px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } - .row-fluid .thumbnails { - margin-left: 0; - } -} - -@media (min-width: 768px) and (max-width: 979px) { - .row { - margin-left: -20px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 724px; - } - .span12 { - width: 724px; - } - .span11 { - width: 662px; - } - .span10 { - width: 600px; - } - .span9 { - width: 538px; - } - .span8 { - width: 476px; - } - .span7 { - width: 414px; - } - .span6 { - width: 352px; - } - .span5 { - width: 290px; - } - .span4 { - width: 228px; - } - .span3 { - width: 166px; - } - .span2 { - width: 104px; - } - .span1 { - width: 42px; - } - .offset12 { - margin-left: 764px; - } - .offset11 { - margin-left: 702px; - } - .offset10 { - margin-left: 640px; - } - .offset9 { - margin-left: 578px; - } - .offset8 { - margin-left: 516px; - } - .offset7 { - margin-left: 454px; - } - .offset6 { - margin-left: 392px; - } - .offset5 { - margin-left: 330px; - } - .offset4 { - margin-left: 268px; - } - .offset3 { - margin-left: 206px; - } - .offset2 { - margin-left: 144px; - } - .offset1 { - margin-left: 82px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.7624309392265194%; - *margin-left: 2.709239449864817%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.7624309392265194%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.43646408839778%; - *width: 91.38327259903608%; - } - .row-fluid .span10 { - width: 82.87292817679558%; - *width: 82.81973668743387%; - } - .row-fluid .span9 { - width: 74.30939226519337%; - *width: 74.25620077583166%; - } - .row-fluid .span8 { - width: 65.74585635359117%; - *width: 65.69266486422946%; - } - .row-fluid .span7 { - width: 57.18232044198895%; - *width: 57.12912895262725%; - } - .row-fluid .span6 { - width: 48.61878453038674%; - *width: 48.56559304102504%; - } - .row-fluid .span5 { - width: 40.05524861878453%; - *width: 40.00205712942283%; - } - .row-fluid .span4 { - width: 31.491712707182323%; - *width: 31.43852121782062%; - } - .row-fluid .span3 { - width: 22.92817679558011%; - *width: 22.87498530621841%; - } - .row-fluid .span2 { - width: 14.3646408839779%; - *width: 14.311449394616199%; - } - .row-fluid .span1 { - width: 5.801104972375691%; - *width: 5.747913483013988%; - } - .row-fluid .offset12 { - margin-left: 105.52486187845304%; - *margin-left: 105.41847889972962%; - } - .row-fluid .offset12:first-child { - margin-left: 102.76243093922652%; - *margin-left: 102.6560479605031%; - } - .row-fluid .offset11 { - margin-left: 96.96132596685082%; - *margin-left: 96.8549429881274%; - } - .row-fluid .offset11:first-child { - margin-left: 94.1988950276243%; - *margin-left: 94.09251204890089%; - } - .row-fluid .offset10 { - margin-left: 88.39779005524862%; - *margin-left: 88.2914070765252%; - } - .row-fluid .offset10:first-child { - margin-left: 85.6353591160221%; - *margin-left: 85.52897613729868%; - } - .row-fluid .offset9 { - margin-left: 79.8342541436464%; - *margin-left: 79.72787116492299%; - } - .row-fluid .offset9:first-child { - margin-left: 77.07182320441989%; - *margin-left: 76.96544022569647%; - } - .row-fluid .offset8 { - margin-left: 71.2707182320442%; - *margin-left: 71.16433525332079%; - } - .row-fluid .offset8:first-child { - margin-left: 68.50828729281768%; - *margin-left: 68.40190431409427%; - } - .row-fluid .offset7 { - margin-left: 62.70718232044199%; - *margin-left: 62.600799341718584%; - } - .row-fluid .offset7:first-child { - margin-left: 59.94475138121547%; - *margin-left: 59.838368402492065%; - } - .row-fluid .offset6 { - margin-left: 54.14364640883978%; - *margin-left: 54.037263430116376%; - } - .row-fluid .offset6:first-child { - margin-left: 51.38121546961326%; - *margin-left: 51.27483249088986%; - } - .row-fluid .offset5 { - margin-left: 45.58011049723757%; - *margin-left: 45.47372751851417%; - } - .row-fluid .offset5:first-child { - margin-left: 42.81767955801105%; - *margin-left: 42.71129657928765%; - } - .row-fluid .offset4 { - margin-left: 37.01657458563536%; - *margin-left: 36.91019160691196%; - } - .row-fluid .offset4:first-child { - margin-left: 34.25414364640884%; - *margin-left: 34.14776066768544%; - } - .row-fluid .offset3 { - margin-left: 28.45303867403315%; - *margin-left: 28.346655695309746%; - } - .row-fluid .offset3:first-child { - margin-left: 25.69060773480663%; - *margin-left: 25.584224756083227%; - } - .row-fluid .offset2 { - margin-left: 19.88950276243094%; - *margin-left: 19.783119783707537%; - } - .row-fluid .offset2:first-child { - margin-left: 17.12707182320442%; - *margin-left: 17.02068884448102%; - } - .row-fluid .offset1 { - margin-left: 11.32596685082873%; - *margin-left: 11.219583872105325%; - } - .row-fluid .offset1:first-child { - margin-left: 8.56353591160221%; - *margin-left: 8.457152932878806%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 710px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 648px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 586px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 524px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 462px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 400px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 338px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 276px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 214px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 152px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 90px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 28px; - } -} - -@media (max-width: 767px) { - body { - padding-right: 20px; - padding-left: 20px; - } - .navbar-fixed-top, - .navbar-fixed-bottom, - .navbar-static-top { - margin-right: -20px; - margin-left: -20px; - } - .container-fluid { - padding: 0; - } - .dl-horizontal dt { - float: none; - width: auto; - clear: none; - text-align: left; - } - .dl-horizontal dd { - margin-left: 0; - } - .container { - width: auto; - } - .row-fluid { - width: 100%; - } - .row, - .thumbnails { - margin-left: 0; - } - .thumbnails > li { - float: none; - margin-left: 0; - } - [class*="span"], - .uneditable-input[class*="span"], - .row-fluid [class*="span"] { - display: block; - float: none; - width: 100%; - margin-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .span12, - .row-fluid .span12 { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="offset"]:first-child { - margin-left: 0; - } - .input-large, - .input-xlarge, - .input-xxlarge, - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .input-prepend input, - .input-append input, - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - display: inline-block; - width: auto; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 0; - } - .modal { - position: fixed; - top: 20px; - right: 20px; - left: 20px; - width: auto; - margin: 0; - } - .modal.fade { - top: -100px; - } - .modal.fade.in { - top: 20px; - } -} - -@media (max-width: 480px) { - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); - } - .page-header h1 small { - display: block; - line-height: 20px; - } - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - .form-horizontal .control-label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .form-horizontal .controls { - margin-left: 0; - } - .form-horizontal .control-list { - padding-top: 0; - } - .form-horizontal .form-actions { - padding-right: 10px; - padding-left: 10px; - } - .media .pull-left, - .media .pull-right { - display: block; - float: none; - margin-bottom: 10px; - } - .media-object { - margin-right: 0; - margin-left: 0; - } - .modal { - top: 10px; - right: 10px; - left: 10px; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - .carousel-caption { - position: static; - } -} - -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top, - .navbar-fixed-bottom { - position: static; - } - .navbar-fixed-top { - margin-bottom: 20px; - } - .navbar-fixed-bottom { - margin-top: 20px; - } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-right: 10px; - padding-left: 10px; - margin: 0 0 0 -5px; - } - .nav-collapse { - clear: both; - } - .nav-collapse .nav { - float: none; - margin: 0 0 10px; - } - .nav-collapse .nav > li { - float: none; - } - .nav-collapse .nav > li > a { - margin-bottom: 2px; - } - .nav-collapse .nav > .divider-vertical { - display: none; - } - .nav-collapse .nav .nav-header { - color: #777777; - text-shadow: none; - } - .nav-collapse .nav > li > a, - .nav-collapse .dropdown-menu a { - padding: 9px 15px; - font-weight: bold; - color: #777777; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .nav-collapse .btn { - padding: 4px 10px 4px; - font-weight: normal; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - } - .nav-collapse .dropdown-menu li + li a { - margin-bottom: 2px; - } - .nav-collapse .nav > li > a:hover, - .nav-collapse .dropdown-menu a:hover { - background-color: #f2f2f2; - } - .navbar-inverse .nav-collapse .nav > li > a, - .navbar-inverse .nav-collapse .dropdown-menu a { - color: #999999; - } - .navbar-inverse .nav-collapse .nav > li > a:hover, - .navbar-inverse .nav-collapse .dropdown-menu a:hover { - background-color: #111111; - } - .nav-collapse.in .btn-group { - padding: 0; - margin-top: 5px; - } - .nav-collapse .dropdown-menu { - position: static; - top: auto; - left: auto; - display: none; - float: none; - max-width: none; - padding: 0; - margin: 0 15px; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .nav-collapse .open > .dropdown-menu { - display: block; - } - .nav-collapse .dropdown-menu:before, - .nav-collapse .dropdown-menu:after { - display: none; - } - .nav-collapse .dropdown-menu .divider { - display: none; - } - .nav-collapse .nav > li > .dropdown-menu:before, - .nav-collapse .nav > li > .dropdown-menu:after { - display: none; - } - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - float: none; - padding: 10px 15px; - margin: 10px 0; - border-top: 1px solid #f2f2f2; - border-bottom: 1px solid #f2f2f2; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - } - .navbar-inverse .nav-collapse .navbar-form, - .navbar-inverse .nav-collapse .navbar-search { - border-top-color: #111111; - border-bottom-color: #111111; - } - .navbar .nav-collapse .nav.pull-right { - float: none; - margin-left: 0; - } - .nav-collapse, - .nav-collapse.collapse { - height: 0; - overflow: hidden; - } - .navbar .btn-navbar { - display: block; - } - .navbar-static .navbar-inner { - padding-right: 10px; - padding-left: 10px; - } -} - -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } -} diff --git a/samples/javaconfig/messages/src/main/resources/resources/css/bootstrap.css b/samples/javaconfig/messages/src/main/resources/resources/css/bootstrap.css deleted file mode 100644 index 22aa0c17a9..0000000000 --- a/samples/javaconfig/messages/src/main/resources/resources/css/bootstrap.css +++ /dev/null @@ -1,6039 +0,0 @@ -/*! - * Bootstrap v2.2.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} - -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} - -audio:not([controls]) { - display: none; -} - -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} - -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -a:hover, -a:active { - outline: 0; -} - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -img { - width: auto\9; - height: auto; - max-width: 100%; - vertical-align: middle; - border: 0; - -ms-interpolation-mode: bicubic; -} - -#map_canvas img, -.google-maps img { - max-width: none; -} - -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} - -button, -input { - *overflow: visible; - line-height: normal; -} - -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} - -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} - -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; -} - -input[type="search"] { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield; -} - -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} - -textarea { - overflow: auto; - vertical-align: top; -} - -@media print { - * { - color: #000 !important; - text-shadow: none !important; - background: transparent !important; - box-shadow: none !important; - } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - thead { - display: table-header-group; - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 0.5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - page-break-after: avoid; - } -} - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; - line-height: 20px; - color: #333333; - background-color: #ffffff; -} - -a { - color: #0088cc; - text-decoration: none; -} - -a:hover { - color: #005580; - text-decoration: underline; -} - -.img-rounded { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.img-polaroid { - padding: 4px; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -} - -.img-circle { - -webkit-border-radius: 500px; - -moz-border-radius: 500px; - border-radius: 500px; -} - -.row { - margin-left: -20px; - *zoom: 1; -} - -.row:before, -.row:after { - display: table; - line-height: 0; - content: ""; -} - -.row:after { - clear: both; -} - -[class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; -} - -.container, -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.span12 { - width: 940px; -} - -.span11 { - width: 860px; -} - -.span10 { - width: 780px; -} - -.span9 { - width: 700px; -} - -.span8 { - width: 620px; -} - -.span7 { - width: 540px; -} - -.span6 { - width: 460px; -} - -.span5 { - width: 380px; -} - -.span4 { - width: 300px; -} - -.span3 { - width: 220px; -} - -.span2 { - width: 140px; -} - -.span1 { - width: 60px; -} - -.offset12 { - margin-left: 980px; -} - -.offset11 { - margin-left: 900px; -} - -.offset10 { - margin-left: 820px; -} - -.offset9 { - margin-left: 740px; -} - -.offset8 { - margin-left: 660px; -} - -.offset7 { - margin-left: 580px; -} - -.offset6 { - margin-left: 500px; -} - -.offset5 { - margin-left: 420px; -} - -.offset4 { - margin-left: 340px; -} - -.offset3 { - margin-left: 260px; -} - -.offset2 { - margin-left: 180px; -} - -.offset1 { - margin-left: 100px; -} - -.row-fluid { - width: 100%; - *zoom: 1; -} - -.row-fluid:before, -.row-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.row-fluid:after { - clear: both; -} - -.row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.127659574468085%; - *margin-left: 2.074468085106383%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.row-fluid [class*="span"]:first-child { - margin-left: 0; -} - -.row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.127659574468085%; -} - -.row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; -} - -.row-fluid .span11 { - width: 91.48936170212765%; - *width: 91.43617021276594%; -} - -.row-fluid .span10 { - width: 82.97872340425532%; - *width: 82.92553191489361%; -} - -.row-fluid .span9 { - width: 74.46808510638297%; - *width: 74.41489361702126%; -} - -.row-fluid .span8 { - width: 65.95744680851064%; - *width: 65.90425531914893%; -} - -.row-fluid .span7 { - width: 57.44680851063829%; - *width: 57.39361702127659%; -} - -.row-fluid .span6 { - width: 48.93617021276595%; - *width: 48.88297872340425%; -} - -.row-fluid .span5 { - width: 40.42553191489362%; - *width: 40.37234042553192%; -} - -.row-fluid .span4 { - width: 31.914893617021278%; - *width: 31.861702127659576%; -} - -.row-fluid .span3 { - width: 23.404255319148934%; - *width: 23.351063829787233%; -} - -.row-fluid .span2 { - width: 14.893617021276595%; - *width: 14.840425531914894%; -} - -.row-fluid .span1 { - width: 6.382978723404255%; - *width: 6.329787234042553%; -} - -.row-fluid .offset12 { - margin-left: 104.25531914893617%; - *margin-left: 104.14893617021275%; -} - -.row-fluid .offset12:first-child { - margin-left: 102.12765957446808%; - *margin-left: 102.02127659574467%; -} - -.row-fluid .offset11 { - margin-left: 95.74468085106382%; - *margin-left: 95.6382978723404%; -} - -.row-fluid .offset11:first-child { - margin-left: 93.61702127659574%; - *margin-left: 93.51063829787232%; -} - -.row-fluid .offset10 { - margin-left: 87.23404255319149%; - *margin-left: 87.12765957446807%; -} - -.row-fluid .offset10:first-child { - margin-left: 85.1063829787234%; - *margin-left: 84.99999999999999%; -} - -.row-fluid .offset9 { - margin-left: 78.72340425531914%; - *margin-left: 78.61702127659572%; -} - -.row-fluid .offset9:first-child { - margin-left: 76.59574468085106%; - *margin-left: 76.48936170212764%; -} - -.row-fluid .offset8 { - margin-left: 70.2127659574468%; - *margin-left: 70.10638297872339%; -} - -.row-fluid .offset8:first-child { - margin-left: 68.08510638297872%; - *margin-left: 67.9787234042553%; -} - -.row-fluid .offset7 { - margin-left: 61.70212765957446%; - *margin-left: 61.59574468085106%; -} - -.row-fluid .offset7:first-child { - margin-left: 59.574468085106375%; - *margin-left: 59.46808510638297%; -} - -.row-fluid .offset6 { - margin-left: 53.191489361702125%; - *margin-left: 53.085106382978715%; -} - -.row-fluid .offset6:first-child { - margin-left: 51.063829787234035%; - *margin-left: 50.95744680851063%; -} - -.row-fluid .offset5 { - margin-left: 44.68085106382979%; - *margin-left: 44.57446808510638%; -} - -.row-fluid .offset5:first-child { - margin-left: 42.5531914893617%; - *margin-left: 42.4468085106383%; -} - -.row-fluid .offset4 { - margin-left: 36.170212765957444%; - *margin-left: 36.06382978723405%; -} - -.row-fluid .offset4:first-child { - margin-left: 34.04255319148936%; - *margin-left: 33.93617021276596%; -} - -.row-fluid .offset3 { - margin-left: 27.659574468085104%; - *margin-left: 27.5531914893617%; -} - -.row-fluid .offset3:first-child { - margin-left: 25.53191489361702%; - *margin-left: 25.425531914893618%; -} - -.row-fluid .offset2 { - margin-left: 19.148936170212764%; - *margin-left: 19.04255319148936%; -} - -.row-fluid .offset2:first-child { - margin-left: 17.02127659574468%; - *margin-left: 16.914893617021278%; -} - -.row-fluid .offset1 { - margin-left: 10.638297872340425%; - *margin-left: 10.53191489361702%; -} - -.row-fluid .offset1:first-child { - margin-left: 8.51063829787234%; - *margin-left: 8.404255319148938%; -} - -[class*="span"].hide, -.row-fluid [class*="span"].hide { - display: none; -} - -[class*="span"].pull-right, -.row-fluid [class*="span"].pull-right { - float: right; -} - -.container { - margin-right: auto; - margin-left: auto; - *zoom: 1; -} - -.container:before, -.container:after { - display: table; - line-height: 0; - content: ""; -} - -.container:after { - clear: both; -} - -.container-fluid { - padding-right: 20px; - padding-left: 20px; - *zoom: 1; -} - -.container-fluid:before, -.container-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.container-fluid:after { - clear: both; -} - -p { - margin: 0 0 10px; -} - -.lead { - margin-bottom: 20px; - font-size: 21px; - font-weight: 200; - line-height: 30px; -} - -small { - font-size: 85%; -} - -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - -cite { - font-style: normal; -} - -.muted { - color: #999999; -} - -a.muted:hover { - color: #808080; -} - -.text-warning { - color: #c09853; -} - -a.text-warning:hover { - color: #a47e3c; -} - -.text-error { - color: #b94a48; -} - -a.text-error:hover { - color: #953b39; -} - -.text-info { - color: #3a87ad; -} - -a.text-info:hover { - color: #2d6987; -} - -.text-success { - color: #468847; -} - -a.text-success:hover { - color: #356635; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 10px 0; - font-family: inherit; - font-weight: bold; - line-height: 20px; - color: inherit; - text-rendering: optimizelegibility; -} - -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - line-height: 1; - color: #999999; -} - -h1, -h2, -h3 { - line-height: 40px; -} - -h1 { - font-size: 38.5px; -} - -h2 { - font-size: 31.5px; -} - -h3 { - font-size: 24.5px; -} - -h4 { - font-size: 17.5px; -} - -h5 { - font-size: 14px; -} - -h6 { - font-size: 11.9px; -} - -h1 small { - font-size: 24.5px; -} - -h2 small { - font-size: 17.5px; -} - -h3 small { - font-size: 14px; -} - -h4 small { - font-size: 14px; -} - -.page-header { - padding-bottom: 9px; - margin: 20px 0 30px; - border-bottom: 1px solid #eeeeee; -} - -ul, -ol { - padding: 0; - margin: 0 0 10px 25px; -} - -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} - -li { - line-height: 20px; -} - -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} - -ul.inline, -ol.inline { - margin-left: 0; - list-style: none; -} - -ul.inline > li, -ol.inline > li { - display: inline-block; - padding-right: 5px; - padding-left: 5px; -} - -dl { - margin-bottom: 20px; -} - -dt, -dd { - line-height: 20px; -} - -dt { - font-weight: bold; -} - -dd { - margin-left: 10px; -} - -.dl-horizontal { - *zoom: 1; -} - -.dl-horizontal:before, -.dl-horizontal:after { - display: table; - line-height: 0; - content: ""; -} - -.dl-horizontal:after { - clear: both; -} - -.dl-horizontal dt { - float: left; - width: 160px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; -} - -.dl-horizontal dd { - margin-left: 180px; -} - -hr { - margin: 20px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; -} - -abbr[title], -abbr[data-original-title] { - cursor: help; - border-bottom: 1px dotted #999999; -} - -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} - -blockquote { - padding: 0 0 0 15px; - margin: 0 0 20px; - border-left: 5px solid #eeeeee; -} - -blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 25px; -} - -blockquote small { - display: block; - line-height: 20px; - color: #999999; -} - -blockquote small:before { - content: '\2014 \00A0'; -} - -blockquote.pull-right { - float: right; - padding-right: 15px; - padding-left: 0; - border-right: 5px solid #eeeeee; - border-left: 0; -} - -blockquote.pull-right p, -blockquote.pull-right small { - text-align: right; -} - -blockquote.pull-right small:before { - content: ''; -} - -blockquote.pull-right small:after { - content: '\00A0 \2014'; -} - -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -address { - display: block; - margin-bottom: 20px; - font-style: normal; - line-height: 20px; -} - -code, -pre { - padding: 0 3px 2px; - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -code { - padding: 2px 4px; - color: #d14; - white-space: nowrap; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} - -pre { - display: block; - padding: 9.5px; - margin: 0 0 10px; - font-size: 13px; - line-height: 20px; - word-break: break-all; - word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -pre.prettyprint { - margin-bottom: 20px; -} - -pre code { - padding: 0; - color: inherit; - white-space: pre; - white-space: pre-wrap; - background-color: transparent; - border: 0; -} - -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} - -form { - margin: 0 0 20px; -} - -fieldset { - padding: 0; - margin: 0; - border: 0; -} - -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 20px; - font-size: 21px; - line-height: 40px; - color: #333333; - border: 0; - border-bottom: 1px solid #e5e5e5; -} - -legend small { - font-size: 15px; - color: #999999; -} - -label, -input, -button, -select, -textarea { - font-size: 14px; - font-weight: normal; - line-height: 20px; -} - -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -label { - display: block; - margin-bottom: 5px; -} - -select, -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - display: inline-block; - height: 20px; - padding: 4px 6px; - margin-bottom: 10px; - font-size: 14px; - line-height: 20px; - color: #555555; - vertical-align: middle; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -input, -textarea, -.uneditable-input { - width: 206px; -} - -textarea { - height: auto; -} - -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - background-color: #ffffff; - border: 1px solid #cccccc; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} - -textarea:focus, -input[type="text"]:focus, -input[type="password"]:focus, -input[type="datetime"]:focus, -input[type="datetime-local"]:focus, -input[type="date"]:focus, -input[type="month"]:focus, -input[type="time"]:focus, -input[type="week"]:focus, -input[type="number"]:focus, -input[type="email"]:focus, -input[type="url"]:focus, -input[type="search"]:focus, -input[type="tel"]:focus, -input[type="color"]:focus, -.uneditable-input:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -} - -input[type="radio"], -input[type="checkbox"] { - margin: 4px 0 0; - margin-top: 1px \9; - *margin-top: 0; - line-height: normal; -} - -input[type="file"], -input[type="image"], -input[type="submit"], -input[type="reset"], -input[type="button"], -input[type="radio"], -input[type="checkbox"] { - width: auto; -} - -select, -input[type="file"] { - height: 30px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 30px; -} - -select { - width: 220px; - background-color: #ffffff; - border: 1px solid #cccccc; -} - -select[multiple], -select[size] { - height: auto; -} - -select:focus, -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.uneditable-input, -.uneditable-textarea { - color: #999999; - cursor: not-allowed; - background-color: #fcfcfc; - border-color: #cccccc; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} - -.uneditable-input { - overflow: hidden; - white-space: nowrap; -} - -.uneditable-textarea { - width: auto; - height: auto; -} - -input:-moz-placeholder, -textarea:-moz-placeholder { - color: #999999; -} - -input:-ms-input-placeholder, -textarea:-ms-input-placeholder { - color: #999999; -} - -input::-webkit-input-placeholder, -textarea::-webkit-input-placeholder { - color: #999999; -} - -.radio, -.checkbox { - min-height: 20px; - padding-left: 20px; -} - -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -20px; -} - -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; -} - -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} - -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; -} - -.input-mini { - width: 60px; -} - -.input-small { - width: 90px; -} - -.input-medium { - width: 150px; -} - -.input-large { - width: 210px; -} - -.input-xlarge { - width: 270px; -} - -.input-xxlarge { - width: 530px; -} - -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; -} - -.input-append input[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend input[class*="span"], -.input-prepend .uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"], -.row-fluid .input-prepend [class*="span"], -.row-fluid .input-append [class*="span"] { - display: inline-block; -} - -input, -textarea, -.uneditable-input { - margin-left: 0; -} - -.controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; -} - -input.span12, -textarea.span12, -.uneditable-input.span12 { - width: 926px; -} - -input.span11, -textarea.span11, -.uneditable-input.span11 { - width: 846px; -} - -input.span10, -textarea.span10, -.uneditable-input.span10 { - width: 766px; -} - -input.span9, -textarea.span9, -.uneditable-input.span9 { - width: 686px; -} - -input.span8, -textarea.span8, -.uneditable-input.span8 { - width: 606px; -} - -input.span7, -textarea.span7, -.uneditable-input.span7 { - width: 526px; -} - -input.span6, -textarea.span6, -.uneditable-input.span6 { - width: 446px; -} - -input.span5, -textarea.span5, -.uneditable-input.span5 { - width: 366px; -} - -input.span4, -textarea.span4, -.uneditable-input.span4 { - width: 286px; -} - -input.span3, -textarea.span3, -.uneditable-input.span3 { - width: 206px; -} - -input.span2, -textarea.span2, -.uneditable-input.span2 { - width: 126px; -} - -input.span1, -textarea.span1, -.uneditable-input.span1 { - width: 46px; -} - -.controls-row { - *zoom: 1; -} - -.controls-row:before, -.controls-row:after { - display: table; - line-height: 0; - content: ""; -} - -.controls-row:after { - clear: both; -} - -.controls-row [class*="span"], -.row-fluid .controls-row [class*="span"] { - float: left; -} - -.controls-row .checkbox[class*="span"], -.controls-row .radio[class*="span"] { - padding-top: 5px; -} - -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - cursor: not-allowed; - background-color: #eeeeee; -} - -input[type="radio"][disabled], -input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly] { - background-color: transparent; -} - -.control-group.warning .control-label, -.control-group.warning .help-block, -.control-group.warning .help-inline { - color: #c09853; -} - -.control-group.warning .checkbox, -.control-group.warning .radio, -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - color: #c09853; -} - -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - border-color: #c09853; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.warning input:focus, -.control-group.warning select:focus, -.control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; -} - -.control-group.warning .input-prepend .add-on, -.control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} - -.control-group.error .control-label, -.control-group.error .help-block, -.control-group.error .help-inline { - color: #b94a48; -} - -.control-group.error .checkbox, -.control-group.error .radio, -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - color: #b94a48; -} - -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - border-color: #b94a48; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.error input:focus, -.control-group.error select:focus, -.control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -} - -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} - -.control-group.success .control-label, -.control-group.success .help-block, -.control-group.success .help-inline { - color: #468847; -} - -.control-group.success .checkbox, -.control-group.success .radio, -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - color: #468847; -} - -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - border-color: #468847; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.success input:focus, -.control-group.success select:focus, -.control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -} - -.control-group.success .input-prepend .add-on, -.control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} - -.control-group.info .control-label, -.control-group.info .help-block, -.control-group.info .help-inline { - color: #3a87ad; -} - -.control-group.info .checkbox, -.control-group.info .radio, -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - color: #3a87ad; -} - -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - border-color: #3a87ad; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.info input:focus, -.control-group.info select:focus, -.control-group.info textarea:focus { - border-color: #2d6987; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; -} - -.control-group.info .input-prepend .add-on, -.control-group.info .input-append .add-on { - color: #3a87ad; - background-color: #d9edf7; - border-color: #3a87ad; -} - -input:focus:invalid, -textarea:focus:invalid, -select:focus:invalid { - color: #b94a48; - border-color: #ee5f5b; -} - -input:focus:invalid:focus, -textarea:focus:invalid:focus, -select:focus:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} - -.form-actions { - padding: 19px 20px 20px; - margin-top: 20px; - margin-bottom: 20px; - background-color: #f5f5f5; - border-top: 1px solid #e5e5e5; - *zoom: 1; -} - -.form-actions:before, -.form-actions:after { - display: table; - line-height: 0; - content: ""; -} - -.form-actions:after { - clear: both; -} - -.help-block, -.help-inline { - color: #595959; -} - -.help-block { - display: block; - margin-bottom: 10px; -} - -.help-inline { - display: inline-block; - *display: inline; - padding-left: 5px; - vertical-align: middle; - *zoom: 1; -} - -.input-append, -.input-prepend { - margin-bottom: 5px; - font-size: 0; - white-space: nowrap; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input, -.input-append .dropdown-menu, -.input-prepend .dropdown-menu { - font-size: 14px; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input { - position: relative; - margin-bottom: 0; - *margin-left: 0; - vertical-align: top; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-append input:focus, -.input-prepend input:focus, -.input-append select:focus, -.input-prepend select:focus, -.input-append .uneditable-input:focus, -.input-prepend .uneditable-input:focus { - z-index: 2; -} - -.input-append .add-on, -.input-prepend .add-on { - display: inline-block; - width: auto; - height: 20px; - min-width: 16px; - padding: 4px 5px; - font-size: 14px; - font-weight: normal; - line-height: 20px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - background-color: #eeeeee; - border: 1px solid #ccc; -} - -.input-append .add-on, -.input-prepend .add-on, -.input-append .btn, -.input-prepend .btn, -.input-append .btn-group > .dropdown-toggle, -.input-prepend .btn-group > .dropdown-toggle { - vertical-align: top; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-append .active, -.input-prepend .active { - background-color: #a9dba9; - border-color: #46a546; -} - -.input-prepend .add-on, -.input-prepend .btn { - margin-right: -1px; -} - -.input-prepend .add-on:first-child, -.input-prepend .btn:first-child { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input, -.input-append select, -.input-append .uneditable-input { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input + .btn-group .btn:last-child, -.input-append select + .btn-group .btn:last-child, -.input-append .uneditable-input + .btn-group .btn:last-child { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-append .add-on, -.input-append .btn, -.input-append .btn-group { - margin-left: -1px; -} - -.input-append .add-on:last-child, -.input-append .btn:last-child, -.input-append .btn-group:last-child > .dropdown-toggle { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append input, -.input-prepend.input-append select, -.input-prepend.input-append .uneditable-input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-prepend.input-append input + .btn-group .btn, -.input-prepend.input-append select + .btn-group .btn, -.input-prepend.input-append .uneditable-input + .btn-group .btn { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .btn-group:first-child { - margin-left: 0; -} - -input.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; - /* IE7-8 doesn't have border-radius, so don't indent the padding */ - - margin-bottom: 0; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -/* Allow for input prepend/append in search forms */ - -.form-search .input-append .search-query, -.form-search .input-prepend .search-query { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.form-search .input-append .search-query { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search .input-append .btn { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .search-query { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .btn { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input, -.form-search .input-prepend, -.form-inline .input-prepend, -.form-horizontal .input-prepend, -.form-search .input-append, -.form-inline .input-append, -.form-horizontal .input-append { - display: inline-block; - *display: inline; - margin-bottom: 0; - vertical-align: middle; - *zoom: 1; -} - -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { - display: none; -} - -.form-search label, -.form-inline label, -.form-search .btn-group, -.form-inline .btn-group { - display: inline-block; -} - -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} - -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} - -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; -} - -.control-group { - margin-bottom: 10px; -} - -legend + .control-group { - margin-top: 20px; - -webkit-margin-top-collapse: separate; -} - -.form-horizontal .control-group { - margin-bottom: 20px; - *zoom: 1; -} - -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { - display: table; - line-height: 0; - content: ""; -} - -.form-horizontal .control-group:after { - clear: both; -} - -.form-horizontal .control-label { - float: left; - width: 160px; - padding-top: 5px; - text-align: right; -} - -.form-horizontal .controls { - *display: inline-block; - *padding-left: 20px; - margin-left: 180px; - *margin-left: 0; -} - -.form-horizontal .controls:first-child { - *padding-left: 180px; -} - -.form-horizontal .help-block { - margin-bottom: 0; -} - -.form-horizontal input + .help-block, -.form-horizontal select + .help-block, -.form-horizontal textarea + .help-block, -.form-horizontal .uneditable-input + .help-block, -.form-horizontal .input-prepend + .help-block, -.form-horizontal .input-append + .help-block { - margin-top: 10px; -} - -.form-horizontal .form-actions { - padding-left: 180px; -} - -table { - max-width: 100%; - background-color: transparent; - border-collapse: collapse; - border-spacing: 0; -} - -.table { - width: 100%; - margin-bottom: 20px; -} - -.table th, -.table td { - padding: 8px; - line-height: 20px; - text-align: left; - vertical-align: top; - border-top: 1px solid #dddddd; -} - -.table th { - font-weight: bold; -} - -.table thead th { - vertical-align: bottom; -} - -.table caption + thead tr:first-child th, -.table caption + thead tr:first-child td, -.table colgroup + thead tr:first-child th, -.table colgroup + thead tr:first-child td, -.table thead:first-child tr:first-child th, -.table thead:first-child tr:first-child td { - border-top: 0; -} - -.table tbody + tbody { - border-top: 2px solid #dddddd; -} - -.table .table { - background-color: #ffffff; -} - -.table-condensed th, -.table-condensed td { - padding: 4px 5px; -} - -.table-bordered { - border: 1px solid #dddddd; - border-collapse: separate; - *border-collapse: collapse; - border-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.table-bordered th, -.table-bordered td { - border-left: 1px solid #dddddd; -} - -.table-bordered caption + thead tr:first-child th, -.table-bordered caption + tbody tr:first-child th, -.table-bordered caption + tbody tr:first-child td, -.table-bordered colgroup + thead tr:first-child th, -.table-bordered colgroup + tbody tr:first-child th, -.table-bordered colgroup + tbody tr:first-child td, -.table-bordered thead:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} - -.table-bordered thead:first-child tr:first-child > th:first-child, -.table-bordered tbody:first-child tr:first-child > td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered thead:first-child tr:first-child > th:last-child, -.table-bordered tbody:first-child tr:first-child > td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:first-child, -.table-bordered tbody:last-child tr:last-child > td:first-child, -.table-bordered tfoot:last-child tr:last-child > td:first-child { - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:last-child, -.table-bordered tbody:last-child tr:last-child > td:last-child, -.table-bordered tfoot:last-child tr:last-child > td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - -moz-border-radius-bottomleft: 0; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; - -moz-border-radius-bottomright: 0; -} - -.table-bordered caption + thead tr:first-child th:first-child, -.table-bordered caption + tbody tr:first-child td:first-child, -.table-bordered colgroup + thead tr:first-child th:first-child, -.table-bordered colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered caption + thead tr:first-child th:last-child, -.table-bordered caption + tbody tr:first-child td:last-child, -.table-bordered colgroup + thead tr:first-child th:last-child, -.table-bordered colgroup + tbody tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-striped tbody > tr:nth-child(odd) > td, -.table-striped tbody > tr:nth-child(odd) > th { - background-color: #f9f9f9; -} - -.table-hover tbody tr:hover td, -.table-hover tbody tr:hover th { - background-color: #f5f5f5; -} - -table td[class*="span"], -table th[class*="span"], -.row-fluid table td[class*="span"], -.row-fluid table th[class*="span"] { - display: table-cell; - float: none; - margin-left: 0; -} - -.table td.span1, -.table th.span1 { - float: none; - width: 44px; - margin-left: 0; -} - -.table td.span2, -.table th.span2 { - float: none; - width: 124px; - margin-left: 0; -} - -.table td.span3, -.table th.span3 { - float: none; - width: 204px; - margin-left: 0; -} - -.table td.span4, -.table th.span4 { - float: none; - width: 284px; - margin-left: 0; -} - -.table td.span5, -.table th.span5 { - float: none; - width: 364px; - margin-left: 0; -} - -.table td.span6, -.table th.span6 { - float: none; - width: 444px; - margin-left: 0; -} - -.table td.span7, -.table th.span7 { - float: none; - width: 524px; - margin-left: 0; -} - -.table td.span8, -.table th.span8 { - float: none; - width: 604px; - margin-left: 0; -} - -.table td.span9, -.table th.span9 { - float: none; - width: 684px; - margin-left: 0; -} - -.table td.span10, -.table th.span10 { - float: none; - width: 764px; - margin-left: 0; -} - -.table td.span11, -.table th.span11 { - float: none; - width: 844px; - margin-left: 0; -} - -.table td.span12, -.table th.span12 { - float: none; - width: 924px; - margin-left: 0; -} - -.table tbody tr.success td { - background-color: #dff0d8; -} - -.table tbody tr.error td { - background-color: #f2dede; -} - -.table tbody tr.warning td { - background-color: #fcf8e3; -} - -.table tbody tr.info td { - background-color: #d9edf7; -} - -.table-hover tbody tr.success:hover td { - background-color: #d0e9c6; -} - -.table-hover tbody tr.error:hover td { - background-color: #ebcccc; -} - -.table-hover tbody tr.warning:hover td { - background-color: #faf2cc; -} - -.table-hover tbody tr.info:hover td { - background-color: #c4e3f3; -} - -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - margin-top: 1px; - *margin-right: .3em; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; -} - -/* White icons with optional class, or on hover/active states of certain elements */ - -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); -} - -.icon-glass { - background-position: 0 0; -} - -.icon-music { - background-position: -24px 0; -} - -.icon-search { - background-position: -48px 0; -} - -.icon-envelope { - background-position: -72px 0; -} - -.icon-heart { - background-position: -96px 0; -} - -.icon-star { - background-position: -120px 0; -} - -.icon-star-empty { - background-position: -144px 0; -} - -.icon-user { - background-position: -168px 0; -} - -.icon-film { - background-position: -192px 0; -} - -.icon-th-large { - background-position: -216px 0; -} - -.icon-th { - background-position: -240px 0; -} - -.icon-th-list { - background-position: -264px 0; -} - -.icon-ok { - background-position: -288px 0; -} - -.icon-remove { - background-position: -312px 0; -} - -.icon-zoom-in { - background-position: -336px 0; -} - -.icon-zoom-out { - background-position: -360px 0; -} - -.icon-off { - background-position: -384px 0; -} - -.icon-signal { - background-position: -408px 0; -} - -.icon-cog { - background-position: -432px 0; -} - -.icon-trash { - background-position: -456px 0; -} - -.icon-home { - background-position: 0 -24px; -} - -.icon-file { - background-position: -24px -24px; -} - -.icon-time { - background-position: -48px -24px; -} - -.icon-road { - background-position: -72px -24px; -} - -.icon-download-alt { - background-position: -96px -24px; -} - -.icon-download { - background-position: -120px -24px; -} - -.icon-upload { - background-position: -144px -24px; -} - -.icon-inbox { - background-position: -168px -24px; -} - -.icon-play-circle { - background-position: -192px -24px; -} - -.icon-repeat { - background-position: -216px -24px; -} - -.icon-refresh { - background-position: -240px -24px; -} - -.icon-list-alt { - background-position: -264px -24px; -} - -.icon-lock { - background-position: -287px -24px; -} - -.icon-flag { - background-position: -312px -24px; -} - -.icon-headphones { - background-position: -336px -24px; -} - -.icon-volume-off { - background-position: -360px -24px; -} - -.icon-volume-down { - background-position: -384px -24px; -} - -.icon-volume-up { - background-position: -408px -24px; -} - -.icon-qrcode { - background-position: -432px -24px; -} - -.icon-barcode { - background-position: -456px -24px; -} - -.icon-tag { - background-position: 0 -48px; -} - -.icon-tags { - background-position: -25px -48px; -} - -.icon-book { - background-position: -48px -48px; -} - -.icon-bookmark { - background-position: -72px -48px; -} - -.icon-print { - background-position: -96px -48px; -} - -.icon-camera { - background-position: -120px -48px; -} - -.icon-font { - background-position: -144px -48px; -} - -.icon-bold { - background-position: -167px -48px; -} - -.icon-italic { - background-position: -192px -48px; -} - -.icon-text-height { - background-position: -216px -48px; -} - -.icon-text-width { - background-position: -240px -48px; -} - -.icon-align-left { - background-position: -264px -48px; -} - -.icon-align-center { - background-position: -288px -48px; -} - -.icon-align-right { - background-position: -312px -48px; -} - -.icon-align-justify { - background-position: -336px -48px; -} - -.icon-list { - background-position: -360px -48px; -} - -.icon-indent-left { - background-position: -384px -48px; -} - -.icon-indent-right { - background-position: -408px -48px; -} - -.icon-facetime-video { - background-position: -432px -48px; -} - -.icon-picture { - background-position: -456px -48px; -} - -.icon-pencil { - background-position: 0 -72px; -} - -.icon-map-marker { - background-position: -24px -72px; -} - -.icon-adjust { - background-position: -48px -72px; -} - -.icon-tint { - background-position: -72px -72px; -} - -.icon-edit { - background-position: -96px -72px; -} - -.icon-share { - background-position: -120px -72px; -} - -.icon-check { - background-position: -144px -72px; -} - -.icon-move { - background-position: -168px -72px; -} - -.icon-step-backward { - background-position: -192px -72px; -} - -.icon-fast-backward { - background-position: -216px -72px; -} - -.icon-backward { - background-position: -240px -72px; -} - -.icon-play { - background-position: -264px -72px; -} - -.icon-pause { - background-position: -288px -72px; -} - -.icon-stop { - background-position: -312px -72px; -} - -.icon-forward { - background-position: -336px -72px; -} - -.icon-fast-forward { - background-position: -360px -72px; -} - -.icon-step-forward { - background-position: -384px -72px; -} - -.icon-eject { - background-position: -408px -72px; -} - -.icon-chevron-left { - background-position: -432px -72px; -} - -.icon-chevron-right { - background-position: -456px -72px; -} - -.icon-plus-sign { - background-position: 0 -96px; -} - -.icon-minus-sign { - background-position: -24px -96px; -} - -.icon-remove-sign { - background-position: -48px -96px; -} - -.icon-ok-sign { - background-position: -72px -96px; -} - -.icon-question-sign { - background-position: -96px -96px; -} - -.icon-info-sign { - background-position: -120px -96px; -} - -.icon-screenshot { - background-position: -144px -96px; -} - -.icon-remove-circle { - background-position: -168px -96px; -} - -.icon-ok-circle { - background-position: -192px -96px; -} - -.icon-ban-circle { - background-position: -216px -96px; -} - -.icon-arrow-left { - background-position: -240px -96px; -} - -.icon-arrow-right { - background-position: -264px -96px; -} - -.icon-arrow-up { - background-position: -289px -96px; -} - -.icon-arrow-down { - background-position: -312px -96px; -} - -.icon-share-alt { - background-position: -336px -96px; -} - -.icon-resize-full { - background-position: -360px -96px; -} - -.icon-resize-small { - background-position: -384px -96px; -} - -.icon-plus { - background-position: -408px -96px; -} - -.icon-minus { - background-position: -433px -96px; -} - -.icon-asterisk { - background-position: -456px -96px; -} - -.icon-exclamation-sign { - background-position: 0 -120px; -} - -.icon-gift { - background-position: -24px -120px; -} - -.icon-leaf { - background-position: -48px -120px; -} - -.icon-fire { - background-position: -72px -120px; -} - -.icon-eye-open { - background-position: -96px -120px; -} - -.icon-eye-close { - background-position: -120px -120px; -} - -.icon-warning-sign { - background-position: -144px -120px; -} - -.icon-plane { - background-position: -168px -120px; -} - -.icon-calendar { - background-position: -192px -120px; -} - -.icon-random { - width: 16px; - background-position: -216px -120px; -} - -.icon-comment { - background-position: -240px -120px; -} - -.icon-magnet { - background-position: -264px -120px; -} - -.icon-chevron-up { - background-position: -288px -120px; -} - -.icon-chevron-down { - background-position: -313px -119px; -} - -.icon-retweet { - background-position: -336px -120px; -} - -.icon-shopping-cart { - background-position: -360px -120px; -} - -.icon-folder-close { - background-position: -384px -120px; -} - -.icon-folder-open { - width: 16px; - background-position: -408px -120px; -} - -.icon-resize-vertical { - background-position: -432px -119px; -} - -.icon-resize-horizontal { - background-position: -456px -118px; -} - -.icon-hdd { - background-position: 0 -144px; -} - -.icon-bullhorn { - background-position: -24px -144px; -} - -.icon-bell { - background-position: -48px -144px; -} - -.icon-certificate { - background-position: -72px -144px; -} - -.icon-thumbs-up { - background-position: -96px -144px; -} - -.icon-thumbs-down { - background-position: -120px -144px; -} - -.icon-hand-right { - background-position: -144px -144px; -} - -.icon-hand-left { - background-position: -168px -144px; -} - -.icon-hand-up { - background-position: -192px -144px; -} - -.icon-hand-down { - background-position: -216px -144px; -} - -.icon-circle-arrow-right { - background-position: -240px -144px; -} - -.icon-circle-arrow-left { - background-position: -264px -144px; -} - -.icon-circle-arrow-up { - background-position: -288px -144px; -} - -.icon-circle-arrow-down { - background-position: -312px -144px; -} - -.icon-globe { - background-position: -336px -144px; -} - -.icon-wrench { - background-position: -360px -144px; -} - -.icon-tasks { - background-position: -384px -144px; -} - -.icon-filter { - background-position: -408px -144px; -} - -.icon-briefcase { - background-position: -432px -144px; -} - -.icon-fullscreen { - background-position: -456px -144px; -} - -.dropup, -.dropdown { - position: relative; -} - -.dropdown-toggle { - *margin-bottom: -3px; -} - -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} - -.caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-top: 4px solid #000000; - border-right: 4px solid transparent; - border-left: 4px solid transparent; - content: ""; -} - -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} - -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; - list-style: none; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.dropdown-menu .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.dropdown-menu li > a { - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: 20px; - color: #333333; - white-space: nowrap; -} - -.dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, -.dropdown-submenu:hover > a { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -} - -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - outline: 0; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -} - -.dropdown-menu .disabled > a, -.dropdown-menu .disabled > a:hover { - color: #999999; -} - -.dropdown-menu .disabled > a:hover { - text-decoration: none; - cursor: default; - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.open { - *z-index: 1000; -} - -.open > .dropdown-menu { - display: block; -} - -.pull-right > .dropdown-menu { - right: 0; - left: auto; -} - -.dropup .caret, -.navbar-fixed-bottom .dropdown .caret { - border-top: 0; - border-bottom: 4px solid #000000; - content: ""; -} - -.dropup .dropdown-menu, -.navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; -} - -.dropdown-submenu { - position: relative; -} - -.dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; -} - -.dropdown-submenu:hover > .dropdown-menu { - display: block; -} - -.dropup .dropdown-submenu > .dropdown-menu { - top: auto; - bottom: 0; - margin-top: 0; - margin-bottom: -2px; - -webkit-border-radius: 5px 5px 5px 0; - -moz-border-radius: 5px 5px 5px 0; - border-radius: 5px 5px 5px 0; -} - -.dropdown-submenu > a:after { - display: block; - float: right; - width: 0; - height: 0; - margin-top: 5px; - margin-right: -10px; - border-color: transparent; - border-left-color: #cccccc; - border-style: solid; - border-width: 5px 0 5px 5px; - content: " "; -} - -.dropdown-submenu:hover > a:after { - border-left-color: #ffffff; -} - -.dropdown-submenu.pull-left { - float: none; -} - -.dropdown-submenu.pull-left > .dropdown-menu { - left: -100%; - margin-left: 10px; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; -} - -.dropdown .dropdown-menu .nav-header { - padding-right: 20px; - padding-left: 20px; -} - -.typeahead { - z-index: 1051; - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} - -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} - -.well-large { - padding: 24px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.well-small { - padding: 9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.fade { - opacity: 0; - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; -} - -.fade.in { - opacity: 1; -} - -.collapse { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; -} - -.collapse.in { - height: auto; -} - -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 20px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} - -.close:hover { - color: #000000; - text-decoration: none; - cursor: pointer; - opacity: 0.4; - filter: alpha(opacity=40); -} - -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} - -.btn { - display: inline-block; - *display: inline; - padding: 4px 12px; - margin-bottom: 0; - *margin-left: .3em; - font-size: 14px; - line-height: 20px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - cursor: pointer; - background-color: #f5f5f5; - *background-color: #e6e6e6; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); - background-repeat: repeat-x; - border: 1px solid #bbbbbb; - *border: 0; - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #a2a2a2; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - color: #333333; - background-color: #e6e6e6; - *background-color: #d9d9d9; -} - -.btn:active, -.btn.active { - background-color: #cccccc \9; -} - -.btn:first-child { - *margin-left: 0; -} - -.btn:hover { - color: #333333; - text-decoration: none; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} - -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.btn.active, -.btn:active { - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn.disabled, -.btn[disabled] { - cursor: default; - background-image: none; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-large { - padding: 11px 19px; - font-size: 17.5px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { - margin-top: 4px; -} - -.btn-small { - padding: 2px 10px; - font-size: 11.9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { - margin-top: 0; -} - -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { - margin-top: -1px; -} - -.btn-mini { - padding: 0 6px; - font-size: 10.5px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-block { - display: block; - width: 100%; - padding-right: 0; - padding-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.btn-block + .btn-block { - margin-top: 5px; -} - -input[type="submit"].btn-block, -input[type="reset"].btn-block, -input[type="button"].btn-block { - width: 100%; -} - -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255, 255, 255, 0.75); -} - -.btn { - border-color: #c5c5c5; - border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); -} - -.btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #006dcc; - *background-color: #0044cc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(to bottom, #0088cc, #0044cc); - background-repeat: repeat-x; - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - color: #ffffff; - background-color: #0044cc; - *background-color: #003bb3; -} - -.btn-primary:active, -.btn-primary.active { - background-color: #003399 \9; -} - -.btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - *background-color: #f89406; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - color: #ffffff; - background-color: #f89406; - *background-color: #df8505; -} - -.btn-warning:active, -.btn-warning.active { - background-color: #c67605 \9; -} - -.btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - *background-color: #bd362f; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); - background-repeat: repeat-x; - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - color: #ffffff; - background-color: #bd362f; - *background-color: #a9302a; -} - -.btn-danger:active, -.btn-danger.active { - background-color: #942a25 \9; -} - -.btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - *background-color: #51a351; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); - background-repeat: repeat-x; - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - color: #ffffff; - background-color: #51a351; - *background-color: #499249; -} - -.btn-success:active, -.btn-success.active { - background-color: #408140 \9; -} - -.btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - *background-color: #2f96b4; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); - background-repeat: repeat-x; - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - color: #ffffff; - background-color: #2f96b4; - *background-color: #2a85a0; -} - -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} - -.btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #363636; - *background-color: #222222; - background-image: -moz-linear-gradient(top, #444444, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); - background-image: -webkit-linear-gradient(top, #444444, #222222); - background-image: -o-linear-gradient(top, #444444, #222222); - background-image: linear-gradient(to bottom, #444444, #222222); - background-repeat: repeat-x; - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - color: #ffffff; - background-color: #222222; - *background-color: #151515; -} - -.btn-inverse:active, -.btn-inverse.active { - background-color: #080808 \9; -} - -button.btn, -input[type="submit"].btn { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn::-moz-focus-inner, -input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} - -button.btn.btn-large, -input[type="submit"].btn.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; -} - -button.btn.btn-small, -input[type="submit"].btn.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn.btn-mini, -input[type="submit"].btn.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; -} - -.btn-link, -.btn-link:active, -.btn-link[disabled] { - background-color: transparent; - background-image: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-link { - color: #0088cc; - cursor: pointer; - border-color: transparent; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-link:hover { - color: #005580; - text-decoration: underline; - background-color: transparent; -} - -.btn-link[disabled]:hover { - color: #333333; - text-decoration: none; -} - -.btn-group { - position: relative; - display: inline-block; - *display: inline; - *margin-left: .3em; - font-size: 0; - white-space: nowrap; - vertical-align: middle; - *zoom: 1; -} - -.btn-group:first-child { - *margin-left: 0; -} - -.btn-group + .btn-group { - margin-left: 5px; -} - -.btn-toolbar { - margin-top: 10px; - margin-bottom: 10px; - font-size: 0; -} - -.btn-toolbar > .btn + .btn, -.btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group { - margin-left: 5px; -} - -.btn-group > .btn { - position: relative; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group > .btn + .btn { - margin-left: -1px; -} - -.btn-group > .btn, -.btn-group > .dropdown-menu, -.btn-group > .popover { - font-size: 14px; -} - -.btn-group > .btn-mini { - font-size: 10.5px; -} - -.btn-group > .btn-small { - font-size: 11.9px; -} - -.btn-group > .btn-large { - font-size: 17.5px; -} - -.btn-group > .btn:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.btn-group > .btn:last-child, -.btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.btn-group > .btn.large:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.btn-group > .btn.large:last-child, -.btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.btn-group > .btn:hover, -.btn-group > .btn:focus, -.btn-group > .btn:active, -.btn-group > .btn.active { - z-index: 2; -} - -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - -.btn-group > .btn + .dropdown-toggle { - *padding-top: 5px; - padding-right: 8px; - *padding-bottom: 5px; - padding-left: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group > .btn-mini + .dropdown-toggle { - *padding-top: 2px; - padding-right: 5px; - *padding-bottom: 2px; - padding-left: 5px; -} - -.btn-group > .btn-small + .dropdown-toggle { - *padding-top: 5px; - *padding-bottom: 4px; -} - -.btn-group > .btn-large + .dropdown-toggle { - *padding-top: 7px; - padding-right: 12px; - *padding-bottom: 7px; - padding-left: 12px; -} - -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group.open .btn.dropdown-toggle { - background-color: #e6e6e6; -} - -.btn-group.open .btn-primary.dropdown-toggle { - background-color: #0044cc; -} - -.btn-group.open .btn-warning.dropdown-toggle { - background-color: #f89406; -} - -.btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; -} - -.btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; -} - -.btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; -} - -.btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; -} - -.btn .caret { - margin-top: 8px; - margin-left: 0; -} - -.btn-mini .caret, -.btn-small .caret, -.btn-large .caret { - margin-top: 6px; -} - -.btn-large .caret { - border-top-width: 5px; - border-right-width: 5px; - border-left-width: 5px; -} - -.dropup .btn-large .caret { - border-bottom-width: 5px; -} - -.btn-primary .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret, -.btn-success .caret, -.btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.btn-group-vertical { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} - -.btn-group-vertical > .btn { - display: block; - float: none; - max-width: 100%; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group-vertical > .btn + .btn { - margin-top: -1px; - margin-left: 0; -} - -.btn-group-vertical > .btn:first-child { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.btn-group-vertical > .btn:last-child { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.btn-group-vertical > .btn-large:first-child { - -webkit-border-radius: 6px 6px 0 0; - -moz-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; -} - -.btn-group-vertical > .btn-large:last-child { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 20px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.alert, -.alert h4 { - color: #c09853; -} - -.alert h4 { - margin: 0; -} - -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 20px; -} - -.alert-success { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.alert-success h4 { - color: #468847; -} - -.alert-danger, -.alert-error { - color: #b94a48; - background-color: #f2dede; - border-color: #eed3d7; -} - -.alert-danger h4, -.alert-error h4 { - color: #b94a48; -} - -.alert-info { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} - -.alert-info h4 { - color: #3a87ad; -} - -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} - -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} - -.alert-block p + p { - margin-top: 5px; -} - -.nav { - margin-bottom: 20px; - margin-left: 0; - list-style: none; -} - -.nav > li > a { - display: block; -} - -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} - -.nav > li > a > img { - max-width: none; -} - -.nav > .pull-right { - float: right; -} - -.nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 20px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} - -.nav li + .nav-header { - margin-top: 9px; -} - -.nav-list { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 0; -} - -.nav-list > li > a, -.nav-list .nav-header { - margin-right: -15px; - margin-left: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} - -.nav-list > li > a { - padding: 3px 15px; -} - -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} - -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - margin-right: 2px; -} - -.nav-list .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.nav-tabs, -.nav-pills { - *zoom: 1; -} - -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - line-height: 0; - content: ""; -} - -.nav-tabs:after, -.nav-pills:after { - clear: both; -} - -.nav-tabs > li, -.nav-pills > li { - float: left; -} - -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} - -.nav-tabs { - border-bottom: 1px solid #ddd; -} - -.nav-tabs > li { - margin-bottom: -1px; -} - -.nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: 20px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} - -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: #555555; - cursor: default; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; -} - -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} - -.nav-stacked > li { - float: none; -} - -.nav-stacked > li > a { - margin-right: 0; -} - -.nav-tabs.nav-stacked { - border-bottom: 0; -} - -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-topleft: 4px; -} - -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.nav-tabs.nav-stacked > li > a:hover { - z-index: 2; - border-color: #ddd; -} - -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} - -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} - -.nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.nav-pills .dropdown-menu { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.nav .dropdown-toggle .caret { - margin-top: 6px; - border-top-color: #0088cc; - border-bottom-color: #0088cc; -} - -.nav .dropdown-toggle:hover .caret { - border-top-color: #005580; - border-bottom-color: #005580; -} - -/* move down carets for tabs */ - -.nav-tabs .dropdown-toggle .caret { - margin-top: 8px; -} - -.nav .active .dropdown-toggle .caret { - border-top-color: #fff; - border-bottom-color: #fff; -} - -.nav-tabs .active .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.nav > .dropdown.active > a:hover { - cursor: pointer; -} - -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} - -.nav li.dropdown.open .caret, -.nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} - -.tabs-stacked .open > a:hover { - border-color: #999999; -} - -.tabbable { - *zoom: 1; -} - -.tabbable:before, -.tabbable:after { - display: table; - line-height: 0; - content: ""; -} - -.tabbable:after { - clear: both; -} - -.tab-content { - overflow: auto; -} - -.tabs-below > .nav-tabs, -.tabs-right > .nav-tabs, -.tabs-left > .nav-tabs { - border-bottom: 0; -} - -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} - -.tab-content > .active, -.pill-content > .active { - display: block; -} - -.tabs-below > .nav-tabs { - border-top: 1px solid #ddd; -} - -.tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} - -.tabs-below > .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.tabs-below > .nav-tabs > li > a:hover { - border-top-color: #ddd; - border-bottom-color: transparent; -} - -.tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} - -.tabs-left > .nav-tabs > li, -.tabs-right > .nav-tabs > li { - float: none; -} - -.tabs-left > .nav-tabs > li > a, -.tabs-right > .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} - -.tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} - -.tabs-left > .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.tabs-left > .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} - -.tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} - -.tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} - -.tabs-right > .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.tabs-right > .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} - -.tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} - -.nav > .disabled > a { - color: #999999; -} - -.nav > .disabled > a:hover { - text-decoration: none; - cursor: default; - background-color: transparent; -} - -.navbar { - *position: relative; - *z-index: 2; - margin-bottom: 20px; - overflow: visible; -} - -.navbar-inner { - min-height: 40px; - padding-right: 20px; - padding-left: 20px; - background-color: #fafafa; - background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); - background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); - background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); - background-repeat: repeat-x; - border: 1px solid #d4d4d4; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); - *zoom: 1; - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -} - -.navbar-inner:before, -.navbar-inner:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-inner:after { - clear: both; -} - -.navbar .container { - width: auto; -} - -.nav-collapse.collapse { - height: auto; - overflow: visible; -} - -.navbar .brand { - display: block; - float: left; - padding: 10px 20px 10px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - color: #777777; - text-shadow: 0 1px 0 #ffffff; -} - -.navbar .brand:hover { - text-decoration: none; -} - -.navbar-text { - margin-bottom: 0; - line-height: 40px; - color: #777777; -} - -.navbar-link { - color: #777777; -} - -.navbar-link:hover { - color: #333333; -} - -.navbar .divider-vertical { - height: 40px; - margin: 0 9px; - border-right: 1px solid #ffffff; - border-left: 1px solid #f2f2f2; -} - -.navbar .btn, -.navbar .btn-group { - margin-top: 5px; -} - -.navbar .btn-group .btn, -.navbar .input-prepend .btn, -.navbar .input-append .btn { - margin-top: 0; -} - -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} - -.navbar-form:before, -.navbar-form:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-form:after { - clear: both; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .radio, -.navbar-form .checkbox { - margin-top: 5px; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .btn { - display: inline-block; - margin-bottom: 0; -} - -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { - margin-top: 3px; -} - -.navbar-form .input-append, -.navbar-form .input-prepend { - margin-top: 5px; - white-space: nowrap; -} - -.navbar-form .input-append input, -.navbar-form .input-prepend input { - margin-top: 0; -} - -.navbar-search { - position: relative; - float: left; - margin-top: 5px; - margin-bottom: 0; -} - -.navbar-search .search-query { - padding: 4px 14px; - margin-bottom: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.navbar-static-top { - position: static; - margin-bottom: 0; -} - -.navbar-static-top .navbar-inner { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - border-width: 0 0 1px; -} - -.navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-right: 0; - padding-left: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.navbar-fixed-top { - top: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -} - -.navbar-fixed-bottom { - bottom: 0; -} - -.navbar-fixed-bottom .navbar-inner { - -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -} - -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} - -.navbar .nav.pull-right { - float: right; - margin-right: 0; -} - -.navbar .nav > li { - float: left; -} - -.navbar .nav > li > a { - float: none; - padding: 10px 15px 10px; - color: #777777; - text-decoration: none; - text-shadow: 0 1px 0 #ffffff; -} - -.navbar .nav .dropdown-toggle .caret { - margin-top: 8px; -} - -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - color: #333333; - text-decoration: none; - background-color: transparent; -} - -.navbar .nav > .active > a, -.navbar .nav > .active > a:hover, -.navbar .nav > .active > a:focus { - color: #555555; - text-decoration: none; - background-color: #e5e5e5; - -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -} - -.navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-right: 5px; - margin-left: 5px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ededed; - *background-color: #e5e5e5; - background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); - background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); - background-repeat: repeat-x; - border-color: #e5e5e5 #e5e5e5 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} - -.navbar .btn-navbar:hover, -.navbar .btn-navbar:active, -.navbar .btn-navbar.active, -.navbar .btn-navbar.disabled, -.navbar .btn-navbar[disabled] { - color: #ffffff; - background-color: #e5e5e5; - *background-color: #d9d9d9; -} - -.navbar .btn-navbar:active, -.navbar .btn-navbar.active { - background-color: #cccccc \9; -} - -.navbar .btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} - -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} - -.navbar .nav > li > .dropdown-menu:before { - position: absolute; - top: -7px; - left: 9px; - display: inline-block; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ''; -} - -.navbar .nav > li > .dropdown-menu:after { - position: absolute; - top: -6px; - left: 10px; - display: inline-block; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - content: ''; -} - -.navbar-fixed-bottom .nav > li > .dropdown-menu:before { - top: auto; - bottom: -7px; - border-top: 7px solid #ccc; - border-bottom: 0; - border-top-color: rgba(0, 0, 0, 0.2); -} - -.navbar-fixed-bottom .nav > li > .dropdown-menu:after { - top: auto; - bottom: -6px; - border-top: 6px solid #ffffff; - border-bottom: 0; -} - -.navbar .nav li.dropdown > a:hover .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { - color: #555555; - background-color: #e5e5e5; -} - -.navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - -.navbar .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar .pull-right > li > .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu:before, -.navbar .nav > li > .dropdown-menu.pull-right:before { - right: 12px; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu:after, -.navbar .nav > li > .dropdown-menu.pull-right:after { - right: 13px; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { - right: 100%; - left: auto; - margin-right: -1px; - margin-left: 0; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; -} - -.navbar-inverse .navbar-inner { - background-color: #1b1b1b; - background-image: -moz-linear-gradient(top, #222222, #111111); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); - background-image: -webkit-linear-gradient(top, #222222, #111111); - background-image: -o-linear-gradient(top, #222222, #111111); - background-image: linear-gradient(to bottom, #222222, #111111); - background-repeat: repeat-x; - border-color: #252525; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); -} - -.navbar-inverse .brand, -.navbar-inverse .nav > li > a { - color: #999999; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} - -.navbar-inverse .brand:hover, -.navbar-inverse .nav > li > a:hover { - color: #ffffff; -} - -.navbar-inverse .brand { - color: #999999; -} - -.navbar-inverse .navbar-text { - color: #999999; -} - -.navbar-inverse .nav > li > a:focus, -.navbar-inverse .nav > li > a:hover { - color: #ffffff; - background-color: transparent; -} - -.navbar-inverse .nav .active > a, -.navbar-inverse .nav .active > a:hover, -.navbar-inverse .nav .active > a:focus { - color: #ffffff; - background-color: #111111; -} - -.navbar-inverse .navbar-link { - color: #999999; -} - -.navbar-inverse .navbar-link:hover { - color: #ffffff; -} - -.navbar-inverse .divider-vertical { - border-right-color: #222222; - border-left-color: #111111; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { - color: #ffffff; - background-color: #111111; -} - -.navbar-inverse .nav li.dropdown > a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .navbar-search .search-query { - color: #ffffff; - background-color: #515151; - border-color: #111111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; -} - -.navbar-inverse .navbar-search .search-query:-moz-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:focus, -.navbar-inverse .navbar-search .search-query.focused { - padding: 5px 15px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - outline: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -} - -.navbar-inverse .btn-navbar { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e0e0e; - *background-color: #040404; - background-image: -moz-linear-gradient(top, #151515, #040404); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); - background-image: -webkit-linear-gradient(top, #151515, #040404); - background-image: -o-linear-gradient(top, #151515, #040404); - background-image: linear-gradient(to bottom, #151515, #040404); - background-repeat: repeat-x; - border-color: #040404 #040404 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.navbar-inverse .btn-navbar:hover, -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active, -.navbar-inverse .btn-navbar.disabled, -.navbar-inverse .btn-navbar[disabled] { - color: #ffffff; - background-color: #040404; - *background-color: #000000; -} - -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active { - background-color: #000000 \9; -} - -.breadcrumb { - padding: 8px 15px; - margin: 0 0 20px; - list-style: none; - background-color: #f5f5f5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.breadcrumb > li { - display: inline-block; - *display: inline; - text-shadow: 0 1px 0 #ffffff; - *zoom: 1; -} - -.breadcrumb > li > .divider { - padding: 0 5px; - color: #ccc; -} - -.breadcrumb > .active { - color: #999999; -} - -.pagination { - margin: 20px 0; -} - -.pagination ul { - display: inline-block; - *display: inline; - margin-bottom: 0; - margin-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - *zoom: 1; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.pagination ul > li { - display: inline; -} - -.pagination ul > li > a, -.pagination ul > li > span { - float: left; - padding: 4px 12px; - line-height: 20px; - text-decoration: none; - background-color: #ffffff; - border: 1px solid #dddddd; - border-left-width: 0; -} - -.pagination ul > li > a:hover, -.pagination ul > .active > a, -.pagination ul > .active > span { - background-color: #f5f5f5; -} - -.pagination ul > .active > a, -.pagination ul > .active > span { - color: #999999; - cursor: default; -} - -.pagination ul > .disabled > span, -.pagination ul > .disabled > a, -.pagination ul > .disabled > a:hover { - color: #999999; - cursor: default; - background-color: transparent; -} - -.pagination ul > li:first-child > a, -.pagination ul > li:first-child > span { - border-left-width: 1px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.pagination ul > li:last-child > a, -.pagination ul > li:last-child > span { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.pagination-centered { - text-align: center; -} - -.pagination-right { - text-align: right; -} - -.pagination-large ul > li > a, -.pagination-large ul > li > span { - padding: 11px 19px; - font-size: 17.5px; -} - -.pagination-large ul > li:first-child > a, -.pagination-large ul > li:first-child > span { - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.pagination-large ul > li:last-child > a, -.pagination-large ul > li:last-child > span { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.pagination-mini ul > li:first-child > a, -.pagination-small ul > li:first-child > a, -.pagination-mini ul > li:first-child > span, -.pagination-small ul > li:first-child > span { - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -moz-border-radius-bottomleft: 3px; - -moz-border-radius-topleft: 3px; -} - -.pagination-mini ul > li:last-child > a, -.pagination-small ul > li:last-child > a, -.pagination-mini ul > li:last-child > span, -.pagination-small ul > li:last-child > span { - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - -moz-border-radius-topright: 3px; - -moz-border-radius-bottomright: 3px; -} - -.pagination-small ul > li > a, -.pagination-small ul > li > span { - padding: 2px 10px; - font-size: 11.9px; -} - -.pagination-mini ul > li > a, -.pagination-mini ul > li > span { - padding: 0 6px; - font-size: 10.5px; -} - -.pager { - margin: 20px 0; - text-align: center; - list-style: none; - *zoom: 1; -} - -.pager:before, -.pager:after { - display: table; - line-height: 0; - content: ""; -} - -.pager:after { - clear: both; -} - -.pager li { - display: inline; -} - -.pager li > a, -.pager li > span { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.pager li > a:hover { - text-decoration: none; - background-color: #f5f5f5; -} - -.pager .next > a, -.pager .next > span { - float: right; -} - -.pager .previous > a, -.pager .previous > span { - float: left; -} - -.pager .disabled > a, -.pager .disabled > a:hover, -.pager .disabled > span { - color: #999999; - cursor: default; - background-color: #fff; -} - -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} - -.modal-backdrop.fade { - opacity: 0; -} - -.modal-backdrop, -.modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.modal { - position: fixed; - top: 10%; - left: 50%; - z-index: 1050; - width: 560px; - margin-left: -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - outline: none; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} - -.modal.fade { - top: -25%; - -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; - -moz-transition: opacity 0.3s linear, top 0.3s ease-out; - -o-transition: opacity 0.3s linear, top 0.3s ease-out; - transition: opacity 0.3s linear, top 0.3s ease-out; -} - -.modal.fade.in { - top: 10%; -} - -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} - -.modal-header .close { - margin-top: 2px; -} - -.modal-header h3 { - margin: 0; - line-height: 30px; -} - -.modal-body { - position: relative; - max-height: 400px; - padding: 15px; - overflow-y: auto; -} - -.modal-form { - margin-bottom: 0; -} - -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} - -.modal-footer:before, -.modal-footer:after { - display: table; - line-height: 0; - content: ""; -} - -.modal-footer:after { - clear: both; -} - -.modal-footer .btn + .btn { - margin-bottom: 0; - margin-left: 5px; -} - -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} - -.modal-footer .btn-block + .btn-block { - margin-left: 0; -} - -.tooltip { - position: absolute; - z-index: 1030; - display: block; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); - visibility: visible; -} - -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.tooltip.top { - margin-top: -3px; -} - -.tooltip.right { - margin-left: 3px; -} - -.tooltip.bottom { - margin-top: 3px; -} - -.tooltip.left { - margin-left: -3px; -} - -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top-color: #000000; - border-width: 5px 5px 0; -} - -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-right-color: #000000; - border-width: 5px 5px 5px 0; -} - -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-left-color: #000000; - border-width: 5px 0 5px 5px; -} - -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-bottom-color: #000000; - border-width: 0 5px 5px; -} - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - width: 236px; - padding: 1px; - text-align: left; - white-space: normal; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.popover.top { - margin-top: -10px; -} - -.popover.right { - margin-left: 10px; -} - -.popover.bottom { - margin-top: 10px; -} - -.popover.left { - margin-left: -10px; -} - -.popover-title { - padding: 8px 14px; - margin: 0; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: #f7f7f7; - border-bottom: 1px solid #ebebeb; - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} - -.popover-content { - padding: 9px 14px; -} - -.popover .arrow, -.popover .arrow:after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.popover .arrow { - border-width: 11px; -} - -.popover .arrow:after { - border-width: 10px; - content: ""; -} - -.popover.top .arrow { - bottom: -11px; - left: 50%; - margin-left: -11px; - border-top-color: #999; - border-top-color: rgba(0, 0, 0, 0.25); - border-bottom-width: 0; -} - -.popover.top .arrow:after { - bottom: 1px; - margin-left: -10px; - border-top-color: #ffffff; - border-bottom-width: 0; -} - -.popover.right .arrow { - top: 50%; - left: -11px; - margin-top: -11px; - border-right-color: #999; - border-right-color: rgba(0, 0, 0, 0.25); - border-left-width: 0; -} - -.popover.right .arrow:after { - bottom: -10px; - left: 1px; - border-right-color: #ffffff; - border-left-width: 0; -} - -.popover.bottom .arrow { - top: -11px; - left: 50%; - margin-left: -11px; - border-bottom-color: #999; - border-bottom-color: rgba(0, 0, 0, 0.25); - border-top-width: 0; -} - -.popover.bottom .arrow:after { - top: 1px; - margin-left: -10px; - border-bottom-color: #ffffff; - border-top-width: 0; -} - -.popover.left .arrow { - top: 50%; - right: -11px; - margin-top: -11px; - border-left-color: #999; - border-left-color: rgba(0, 0, 0, 0.25); - border-right-width: 0; -} - -.popover.left .arrow:after { - right: 1px; - bottom: -10px; - border-left-color: #ffffff; - border-right-width: 0; -} - -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} - -.thumbnails:before, -.thumbnails:after { - display: table; - line-height: 0; - content: ""; -} - -.thumbnails:after { - clear: both; -} - -.row-fluid .thumbnails { - margin-left: 0; -} - -.thumbnails > li { - float: left; - margin-bottom: 20px; - margin-left: 20px; -} - -.thumbnail { - display: block; - padding: 4px; - line-height: 20px; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} - -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} - -.thumbnail > img { - display: block; - max-width: 100%; - margin-right: auto; - margin-left: auto; -} - -.thumbnail .caption { - padding: 9px; - color: #555555; -} - -.media, -.media-body { - overflow: hidden; - *overflow: visible; - zoom: 1; -} - -.media, -.media .media { - margin-top: 15px; -} - -.media:first-child { - margin-top: 0; -} - -.media-object { - display: block; -} - -.media-heading { - margin: 0 0 5px; -} - -.media .pull-left { - margin-right: 10px; -} - -.media .pull-right { - margin-left: 10px; -} - -.media-list { - margin-left: 0; - list-style: none; -} - -.label, -.badge { - display: inline-block; - padding: 2px 4px; - font-size: 11.844px; - font-weight: bold; - line-height: 14px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - white-space: nowrap; - vertical-align: baseline; - background-color: #999999; -} - -.label { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.badge { - padding-right: 9px; - padding-left: 9px; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; -} - -.label:empty, -.badge:empty { - display: none; -} - -a.label:hover, -a.badge:hover { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} - -.label-important, -.badge-important { - background-color: #b94a48; -} - -.label-important[href], -.badge-important[href] { - background-color: #953b39; -} - -.label-warning, -.badge-warning { - background-color: #f89406; -} - -.label-warning[href], -.badge-warning[href] { - background-color: #c67605; -} - -.label-success, -.badge-success { - background-color: #468847; -} - -.label-success[href], -.badge-success[href] { - background-color: #356635; -} - -.label-info, -.badge-info { - background-color: #3a87ad; -} - -.label-info[href], -.badge-info[href] { - background-color: #2d6987; -} - -.label-inverse, -.badge-inverse { - background-color: #333333; -} - -.label-inverse[href], -.badge-inverse[href] { - background-color: #1a1a1a; -} - -.btn .label, -.btn .badge { - position: relative; - top: -1px; -} - -.btn-mini .label, -.btn-mini .badge { - top: 0; -} - -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-ms-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} - -@keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -.progress { - height: 20px; - margin-bottom: 20px; - overflow: hidden; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} - -.progress .bar { - float: left; - width: 0; - height: 100%; - font-size: 12px; - color: #ffffff; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(to bottom, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} - -.progress .bar + .bar { - -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); -} - -.progress-striped .bar { - background-color: #149bdf; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} - -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} - -.progress-danger .bar, -.progress .bar-danger { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); -} - -.progress-danger.progress-striped .bar, -.progress-striped .bar-danger { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-success .bar, -.progress .bar-success { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(to bottom, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); -} - -.progress-success.progress-striped .bar, -.progress-striped .bar-success { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-info .bar, -.progress .bar-info { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(to bottom, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); -} - -.progress-info.progress-striped .bar, -.progress-striped .bar-info { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-warning .bar, -.progress .bar-warning { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); -} - -.progress-warning.progress-striped .bar, -.progress-striped .bar-warning { - background-color: #fbb450; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.accordion { - margin-bottom: 20px; -} - -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.accordion-heading { - border-bottom: 0; -} - -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} - -.accordion-toggle { - cursor: pointer; -} - -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} - -.carousel { - position: relative; - margin-bottom: 20px; - line-height: 1; -} - -.carousel-inner { - position: relative; - width: 100%; - overflow: hidden; -} - -.carousel-inner > .item { - position: relative; - display: none; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} - -.carousel-inner > .item > img { - display: block; - line-height: 1; -} - -.carousel-inner > .active, -.carousel-inner > .next, -.carousel-inner > .prev { - display: block; -} - -.carousel-inner > .active { - left: 0; -} - -.carousel-inner > .next, -.carousel-inner > .prev { - position: absolute; - top: 0; - width: 100%; -} - -.carousel-inner > .next { - left: 100%; -} - -.carousel-inner > .prev { - left: -100%; -} - -.carousel-inner > .next.left, -.carousel-inner > .prev.right { - left: 0; -} - -.carousel-inner > .active.left { - left: -100%; -} - -.carousel-inner > .active.right { - left: 100%; -} - -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} - -.carousel-control.right { - right: 15px; - left: auto; -} - -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} - -.carousel-caption { - position: absolute; - right: 0; - bottom: 0; - left: 0; - padding: 15px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} - -.carousel-caption h4, -.carousel-caption p { - line-height: 20px; - color: #ffffff; -} - -.carousel-caption h4 { - margin: 0 0 5px; -} - -.carousel-caption p { - margin-bottom: 0; -} - -.hero-unit { - padding: 60px; - margin-bottom: 30px; - font-size: 18px; - font-weight: 200; - line-height: 30px; - color: inherit; - background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; - color: inherit; -} - -.hero-unit li { - line-height: 30px; -} - -.pull-right { - float: right; -} - -.pull-left { - float: left; -} - -.hide { - display: none; -} - -.show { - display: block; -} - -.invisible { - visibility: hidden; -} - -.affix { - position: fixed; -} diff --git a/samples/javaconfig/messages/src/main/resources/resources/img/favicon.ico b/samples/javaconfig/messages/src/main/resources/resources/img/favicon.ico deleted file mode 100644 index bfb9974019d4b8b978cf34ea67f0c6804f9b76c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYI*xFHzK2NLHVUHb1iG2*{Y zgB?lOds5VYkY4wx3IDZQ-O0jkQ{(?@bp=p{C&v8O!h&CXe)}H=o_u_bRSig==8O!i zc=x^YFzx?WUq6CX4M?xX{1U9V`}7vL{^Em6v8n;-RbSqS702#f2-g1(NLsD$!KwzN zS8ZJ%R&20o^8Y{o{{6r8@eNjaxV~+({;Q#3&F!=Q_uf49|L5O7|6hFn@<03RE(|p= zJ*s<_{YS^WcP_&H4q|}(5Orn`hB}ZwmBSk_@QDwvQS^g2lONu|PzTm~V&{JqG(7$3 zJq-P6H_u_H1L;#fa{vQto;~z`$*ZUT-~ayo|MAc7|C=7&#!v&-2UM#}0rtFhmTdiw fS5E!E^7Zq7x2tDJHpBVK>Hp`xeEbh92gs!XBi)`m diff --git a/samples/javaconfig/messages/src/main/resources/resources/img/logo.png b/samples/javaconfig/messages/src/main/resources/resources/img/logo.png deleted file mode 100644 index 393230883fb4e04829339f7c21b6ab6de7393891..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1123 zcmV-p1f2VcP)P000yS1^@s74{)X{0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$1xZ9fRCwBAJakr>0R&#%?*!8<7oReN z=>H6CRSb*_9RHalf3;=rzRt=3!VW|AET)fs_IS z5aXsJDqv;5UUXCgspCNG%qCu4_4m8Q8J4{_Ss=DB)G%-}OK$)A_qiv-M@As~;az|L zf?EIsP`7cheE7}?GEN=HaRK6^jLh%PvWj*xv3z@3xac)oRV-9P3=lIhyklZuIsRdC zEQk#P>`Ve}KmUCIvzcu9Tf*+YVP*hfGu{$8D7y_HfEf3kMztIrynEOQW2*Ct&A;*G zO}I7VlHICc5w;GSdsSFH1nBbCHtgWCZ;JNm@ z`XjO?7RGP?S?;`M26}|$>d$}7+Q^c380tVF%ErLJjAqwYZkA^sS%0xHF}~wxlbiD5 z`(qoR=no*41>&DbDvtqiaJE+C3lIk&fG}bK9l%ly6jZSM`Nu#MU}XG#RzRlJh~>*q zMz|m_S~GwYKiDe_40nN83W%$i`8HWIa~)&&`WqMkpMdet@v+_G7x%2~|M)9$Tk#!Y zFw1)&gOROi`~TlS|Ne#uGBU8e{?G6W7-39r7#RMspu`I>^-8__`jg@PS4KGI{tDI)dzZ%dlS>M59FF!%vUTz)~b4X4$^~`TvW7 ziIMs5zyE)kk;ES}`AIdM1t$C=P~wMS3!!9Ap!k0ap%i9haWBalIY!4O?f(oAd%r+4 zo)k2;d7%b_#Jhnp-2~zQ1Q@}XCIrw@0t|34GX2=V#dp;1>j!5(mhZn98K?y0fw-87 z<#h&!;7V3zwkKdg)?fU+ET4a(DSgvn03;_eFu%5AV7&(n_piW02N=Hpff?mLFf{&g z0%=ZYR2CvOD9l@{`Ma!o3LDu1eZb}An>(a<~Q?=8{fF=xc@W!MoZ)b z{O|{gu_$Ev|5TXe{Z}Tay7jj||2@OO@D(hD)hsRsjrwm4H=1C4P6p+J-x==O;Vpp} zelf7T{l>^3$L4GI;MZmjLQek2%+jdD-YkChTV1vRXZ6WjKj)c!`-fi-2P5B87D!gv za)A+O=YLR%j|aSGxW@31vGu^;|BMVrzfaux>)%&1LJk9(o(#_DK=28Oy@5ho@oC^@ z5m@o{&xh3zgTK{rGV>dM|NF@cm+`=a;1wp - - - SecureMail: <th:block th:include="${title}"></th:block> - - - - - - - - - - - - -
    -
    -
    -
    - Spring Security Sample -
    -
    -
    - -
    -

    - sample_user -

    -
    - -
    -
    -
    -
    - -
    -
    - Some Success message -
    -
    - Fake content -
    -
    - -
    -
    - - - - \ No newline at end of file diff --git a/samples/javaconfig/messages/src/main/resources/views/messages/compose.html b/samples/javaconfig/messages/src/main/resources/views/messages/compose.html deleted file mode 100644 index 4e098d306f..0000000000 --- a/samples/javaconfig/messages/src/main/resources/views/messages/compose.html +++ /dev/null @@ -1,40 +0,0 @@ - - - Create - - -
    -
    -

    Messages : Create

    -
    -
    -

    - Validation error -

    -
    - - - - -
    - -
    -
    -
    -
    - - \ No newline at end of file diff --git a/samples/javaconfig/messages/src/main/resources/views/messages/inbox.html b/samples/javaconfig/messages/src/main/resources/views/messages/inbox.html deleted file mode 100644 index 2b759bd90f..0000000000 --- a/samples/javaconfig/messages/src/main/resources/views/messages/inbox.html +++ /dev/null @@ -1,29 +0,0 @@ - - - View All - - -
    -

    Inbox

    - - - - - - - - - - - - - - - - - - -
    CreatedSummaryDelete
    No messages
    July 11, 2012 2:17:16 PM CDTThe summary
    -
    - - \ No newline at end of file diff --git a/samples/javaconfig/messages/src/main/resources/views/messages/show.html b/samples/javaconfig/messages/src/main/resources/views/messages/show.html deleted file mode 100644 index 9c04cc7ae9..0000000000 --- a/samples/javaconfig/messages/src/main/resources/views/messages/show.html +++ /dev/null @@ -1,20 +0,0 @@ - - - Create - - -
    -
    -

    Message : A short summary...

    -
    -
    ID
    -
    123
    -
    Date
    -
    July 11, 2012 2:17:16 PM CDT
    -
    Message
    -
    A detailed message that is longer than the summary.
    -
    -
    -
    - - \ No newline at end of file diff --git a/samples/javaconfig/openid/spring-security-samples-javaconfig-openid.gradle b/samples/javaconfig/openid/spring-security-samples-javaconfig-openid.gradle deleted file mode 100644 index a62026e8db..0000000000 --- a/samples/javaconfig/openid/spring-security-samples-javaconfig-openid.gradle +++ /dev/null @@ -1,22 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-core') - compile project(':spring-security-openid') - compile project(':spring-security-samples-javaconfig-messages') - compile project(':spring-security-web') - compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' - compile 'javax.validation:validation-api' - compile 'javax.xml.bind:jaxb-api' - compile 'org.hibernate:hibernate-validator' - compile 'org.springframework:spring-jdbc' - compile 'org.springframework:spring-webmvc' - compile slf4jDependencies - - providedCompile 'javax.servlet:javax.servlet-api' - providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api' - - runtime 'net.sourceforge.nekohtml:nekohtml' - runtime 'opensymphony:sitemesh' -} diff --git a/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java deleted file mode 100644 index c194eba095..0000000000 --- a/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; - -/** - * No customizations of {@link AbstractSecurityWebApplicationInitializer} are necessary. - * - * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are - * encouraged to migrate - * to OpenID Connect, which is supported by spring-security-oauth2. - * @author Rob Winch - */ -public class MessageSecurityWebApplicationInitializer extends - AbstractSecurityWebApplicationInitializer { -} diff --git a/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index 9645aac23b..0000000000 --- a/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.samples.security.CustomUserDetailsService; - -/** - * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are - * encouraged to migrate - * to OpenID Connect, which is supported by spring-security-oauth2. - */ -@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - // @formatter:off - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .antMatchers("/resources/**").permitAll() - .anyRequest().authenticated() - ) - .openidLogin((openidLogin) -> - openidLogin - .loginPage("/login") - .permitAll() - .authenticationUserDetailsService(new CustomUserDetailsService()) - .attributeExchange((googleExchange) -> - googleExchange - .identifierPattern("https://www.google.com/.*") - .attribute((emailAttribute) -> - emailAttribute - .name("email") - .type("https://axschema.org/contact/email") - .required(true) - ) - .attribute((firstnameAttribute) -> - firstnameAttribute - .name("firstname") - .type("https://axschema.org/namePerson/first") - .required(true) - ) - .attribute((lastnameAttribute) -> - lastnameAttribute - .name("lastname") - .type("https://axschema.org/namePerson/last") - .required(true) - ) - ) - .attributeExchange((yahooExchange) -> - yahooExchange - .identifierPattern(".*yahoo.com.*") - .attribute((emailAttribute) -> - emailAttribute - .name("email") - .type("https://axschema.org/contact/email") - .required(true) - ) - .attribute((fullnameAttribute) -> - fullnameAttribute - .name("fullname") - .type("https://axschema.org/namePerson") - .required(true) - ) - ) - .attributeExchange((myopenidExchange) -> - myopenidExchange - .identifierPattern(".*myopenid.com.*") - .attribute((emailAttribute) -> - emailAttribute - .name("email") - .type("https://schema.openid.net/contact/email") - .required(true) - ) - .attribute((fullnameAttribute) -> - fullnameAttribute - .name("fullname") - .type("https://schema.openid.net/namePerson") - .required(true) - ) - ) - ); - } - // @formatter:on -} diff --git a/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/mvc/UserController.java b/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/mvc/UserController.java deleted file mode 100644 index 7b20b9d788..0000000000 --- a/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/mvc/UserController.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.mvc; - -import org.springframework.security.openid.OpenIDAuthenticationToken; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -/** - * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are - * encouraged to migrate - * to OpenID Connect, which is supported by spring-security-oauth2. - */ -@Controller -@RequestMapping("/user/") -public class UserController { - - @RequestMapping(method = RequestMethod.GET) - public String show(Model model, OpenIDAuthenticationToken authentication) { - model.addAttribute("authentication", authentication); - return "user/show"; - } -} diff --git a/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java b/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java deleted file mode 100644 index 935a1efcf5..0000000000 --- a/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.security; - -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.userdetails.AuthenticationUserDetailsService; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.openid.OpenIDAuthenticationToken; - -/** - * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are - * encouraged to migrate - * to OpenID Connect, which is supported by spring-security-oauth2. - */ -public class CustomUserDetailsService implements - AuthenticationUserDetailsService { - public UserDetails loadUserDetails(OpenIDAuthenticationToken token) - throws UsernameNotFoundException { - return new User(token.getName(), "", - AuthorityUtils.createAuthorityList("ROLE_USER")); - } -} diff --git a/samples/javaconfig/openid/src/main/resources/logback.xml b/samples/javaconfig/openid/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/javaconfig/openid/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/javaconfig/openid/src/main/resources/resources/css/openid.css b/samples/javaconfig/openid/src/main/resources/resources/css/openid.css deleted file mode 100644 index 8929ff07ab..0000000000 --- a/samples/javaconfig/openid/src/main/resources/resources/css/openid.css +++ /dev/null @@ -1,45 +0,0 @@ -#openid_form { - width: 580px; -} - #openid_form legend { - font-weight: bold; - } -#openid_choice { - display: none; -} -#openid_input_area { - clear: both; - padding: 10px; -} -#openid_btns, #openid_btns br { - clear: both; -} - #openid_highlight { - padding: 3px; - background-color: #FFFCC9; - float: left; - } - .openid_large_btn { - width: 100px; - height: 60px; - border: 1px solid #DDD; - margin: 3px; - float: left; - } - .openid_small_btn { - width: 24px; - height: 24px; - border: 1px solid #DDD; - margin: 3px; - float: left; - } - a.openid_large_btn:focus { - outline: none; - } - a.openid_large_btn:focus - { - -moz-outline-style: none; - } - .openid_selected { - border: 4px solid #DDD; - } \ No newline at end of file diff --git a/samples/javaconfig/openid/src/main/resources/resources/img/aol.gif b/samples/javaconfig/openid/src/main/resources/resources/img/aol.gif deleted file mode 100644 index decc4f12362124c74e1e0b78ad4e5d132621ab23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2205 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 diff --git a/samples/javaconfig/openid/src/main/resources/resources/img/flickr.ico b/samples/javaconfig/openid/src/main/resources/resources/img/flickr.ico deleted file mode 100644 index 11f6e07f68446a858eb793ece7bd44dad957a8e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmeH_Jr06E5QQJn&W6N<+R_e7ID~KjOJm{@{ApYu)=)sD$dVm%x8e+Ke`=wY_TR8Nr~50fe7M}lw@Sx z)|sz}w0Z6jHaQ_AqDOitt<&SSea)PHxo<4{I(gaj_r1;9XTGktbGBaB{saBT0srj_ z{;~R31Lym74}$(bu>NSIe?gpv&bzYY@H?IKd diff --git a/samples/javaconfig/openid/src/main/resources/resources/img/google.gif b/samples/javaconfig/openid/src/main/resources/resources/img/google.gif deleted file mode 100644 index 1b6cd07bd8b9f27175e0a03be3b5849e0f5479c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1596 zcmc(e`#aNn0DwQcU}GKMxn#>^B<6OWQKZt-cb3xBiE^HYQf=ZKSu)*APi@FdDnu7l zbE$~JN>R#|+lE{hiz(BRl~d+uOl9Xe=bt$55AUzjP!`6aB*XlLd;L`$MA0-=oh;_@%=DSKzTW5!kkg02oxN<-;QgzZXZ6@(M)5 zb-u1@<^vWqN`U%R3CtOJuojJt|Ec%yo>_yZ%MV%ajx`i>ysy4d0^mKeNIQ#t@2y*KMj}jE8i*m zl#eQZ7!1Pfn72wr)$QwY6gabm(O6$Lylw3Pd(s%KbU5crNh3{eeZxI4(dJKB1MUAN>n;QZCCkQs_tGtJY-^iC3ja3x9v_uTP?vFVW;}s># zx;OS=;!{FWer7!3y~sj6t|9~xWcTkC-QJ+z*` z{$kU`Oy-`7hp(oZDFCEubef~t-M)K#*_S^K7T>g7T^A0(oK7oIN_s0RehD8}s1*i- z0sK!m=+Xa`J^uB-PXLSoRAEU$)j~-M#?mcPT3yt{hn6u4gKCOf&J$L|DbuOJmz+s9 z2lJ2J?sjAok}A_-F35;rl&1P$i@IJDD5Bmxks6yO#s#L4K20(2&;kgjBXbWq$Y}&> zCc!g3Y<~;U$CQlDX2nU|3Dx218gg&b%2GehXilrp4#P1y;weqVUjQptQlB1c;VO7e z@*D^wqyiQ&MP@@Eiijj!C6&AUPa6q7&lm^MToqj2ny^P9>WX^Ttd-e`;&k}6HltTz=X|A>@zzv6@ z)2r$ZZK19Hq1s>pg(Wg*yF5bqcpgSu2*Z=3Y48rhsMseSGm6D#RWnKSz*rI2&e%)U zhJ)uMj-*j*Cq6a|SR^kuis=outMPl7vPf8@-OF`fK(;t_tEV6%zOcxe#-=20Mq7|L zi=0@wEQshFjSRBhL&)v46Z=EWNGr^Y7(cjs9|q}uirjP>UklMq_Cn}BpIZ=OxlIZN zrqgmZ9Daq-5mP(tkggoG%l1Mp5`!YX9P+{9a@vc{UA@ux9w!5<$J7Qsxz)kjp9U>O zdMGwqZ?ce!P4?kRO}wMe2<(jAw{y`J9zkIp$bd;9jpjy5e7h8h$r8hU6K*}g{&bHR zc4&^sGRyCwh1g@leXv&EK^8KfI43fLjtGZ4%_yBJq-Q6Ii74-1r$U?ItVA?Z^o7I@ z6Gx_VGVMkkya7VbaJCw^O!RGWg$&GOOC(&Bu>?}_7>IP{%ivHGBI}%WA6YI2+3M9H z%iJLj*4d~I--NgTJ(9t@qodNU?AaV`YHlKR%UVir5C+OujBse~Mp}pFlaUEl5;MVK zxnv+FK^_1to@fbJn^<{1g0s+?k E17=sO82|tP diff --git a/samples/javaconfig/openid/src/main/resources/resources/img/livejournal.ico b/samples/javaconfig/openid/src/main/resources/resources/img/livejournal.ico deleted file mode 100644 index f3d21ec5e8f629b77c77615982cef929802fbde4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5222 zcmdT{3s6+o89vBPQIq*$1QbbvAP7Q0Tpmk!l@)pHf>>S> z1vbL6JXf&Eq~nt$W+Y}?NhYbg%X2}TX`y3UlPS(H)68fPIsMMP%d)ZvOQtiO{(Js= z?m7Sef9JdZJ&(JD*bxy~wQ3b%;$cU~E2vFPBC#hV6@5-lg8iE%gba#Un|TxR-jjq} zb3h#KnTHdU;W5$jSK%T=Pj@H?K_Lo-P~nPOqSb0qGXv!dp_JW0@nc==!i$LGD~{u9 zt~8U?B2Fd~qvpC~M^KA`gqqWJF*i|=E@%ujnuad%Of!pb5`P(QC7kR#SP2OTzQ<#W zlv%8aIKD~feX!6nCX`OuQ922|4;{CsbQG#}pj5FEW=E(mRL;B7LWEq0KANYW^3Y=B z_y|vmH;?ldeDaRw*8J(~hC!qOw?4H%Oa?Y1JnqbNZuG{_4-W8zh5g(k>k33gQDw%FD{ne3XB@ z!rC7_g|Gdhw<&R;HMK*r`+|J;KQGI_{V?zIn&?P3mLE&uo!9m>GUrS3pvy(U5A^kP z_$(c0u8#D!b_R{U=43cu$bYTlSjYsNjhYF)s`QQZ*3Ky}xtxmjy4jX?u^{kLVeo`r zO$S;h4E5!2dRRN72QywCwpkgq;m=hECwm&HvGsd>T}g=BENAdX&yl^G;15ZD@oDXe za5~)ny+KtH;%e1SDcr|-+q7@ZKZGT0tS19Bm$;2T93LRj8^{4y675bB zwk%H%+bJ)|KhfTK`uexou|aVjGo#E;Z%!+~BizWLXGzMgwI!$9Yp#x{^ivH+c7UV2 ztG$yM@p8QPk{Hi9qZjA|_iy0IrBz^V2FDGCt7!c=X2YVB&%j+s%GRZq6}$VIQ&2P#@0_gE zNAUFwKQH_3h_#F3ZUXmN_F>UpAnQ~Ky-mq~NZp*1ER$dEt(TrWr;qctLx_#Sm^+j7oj?A#I7DC$ zaD!T6s6Sj3{L6HyM1HcisHVO0oT2v1d(D5PMI|R99BoZLz$4vBrg+7t)3*@)h!oupL+wwg_YH%9vj*4aIjHXba4{8xkuc);A<= z{dZS2HK=KK!_1Gt{0T^;r%|h@D@A zwEWI*^|gxqvzS+eyR}HSKjd>V18&q9+tQP_E(>?D2|U7;$hbAy$_UJGbI$ekhw(yN zQ(t@t+Lp`(@GUljJClQ+q->vynK|C(jk-g{A&xDnJEp9_2N%N}naK~`m>>4s;pgp< z9QJ=jEdleAH`nptjkB2FdOtgL+Y^|;w&WZ>d7<84e)0JS>Jtat2~yqPk^=D3P?xq0 z@f7|6Jern%&D$w>p*GAGyl#LeY+CZk`Lq2)w{GZkg^@2rdyw`F-&0YZ?HMmk^)y+7 zCvI74%WRnjCpgYpE3*5H!##ZipIx~q^<9GpuZi7A2hXs1Zk~!pO}{2J>4l}(OBYOw zFj0B(Bt6hCeb>`pT-SE@^z{x5U2Ln3-?S|8w?F!!Jf|8`_0G@Mi{w$ z=X|SDy7MOoto~1%!)>|A@LPpZ)J;^~NDC9o;+|ify5q^Z+~}r~bWFtv8#b;5N6F%T zh9Q2R{a&r|U)2@;IgyF6UTmI3tzX1!nST@^QP$V_qZVtm#9wTzwZCbi{LlWU{0Anp BEK2|Y diff --git a/samples/javaconfig/openid/src/main/resources/resources/img/logo.png b/samples/javaconfig/openid/src/main/resources/resources/img/logo.png deleted file mode 100644 index 393230883fb4e04829339f7c21b6ab6de7393891..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1123 zcmV-p1f2VcP)P000yS1^@s74{)X{0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$1xZ9fRCwBAJakr>0R&#%?*!8<7oReN z=>H6CRSb*_9RHalf3;=rzRt=3!VW|AET)fs_IS z5aXsJDqv;5UUXCgspCNG%qCu4_4m8Q8J4{_Ss=DB)G%-}OK$)A_qiv-M@As~;az|L zf?EIsP`7cheE7}?GEN=HaRK6^jLh%PvWj*xv3z@3xac)oRV-9P3=lIhyklZuIsRdC zEQk#P>`Ve}KmUCIvzcu9Tf*+YVP*hfGu{$8D7y_HfEf3kMztIrynEOQW2*Ct&A;*G zO}I7VlHICc5w;GSdsSFH1nBbCHtgWCZ;JNm@ z`XjO?7RGP?S?;`M26}|$>d$}7+Q^c380tVF%ErLJjAqwYZkA^sS%0xHF}~wxlbiD5 z`(qoR=no*41>&DbDvtqiaJE+C3lIk&fG}bK9l%ly6jZSM`Nu#MU}XG#RzRlJh~>*q zMz|m_S~GwYKiDe_40nN83W%$i`8HWIa~)&&`WqMkpMdet@v+_G7x%2~|M)9$Tk#!Y zFw1)&gOROi`~TlS|Ne#uGBU8e{?G6W7-39r7#RMspu`I>^-8__`jg@PS4KGI{tDI)dzZ%dlS>M59FF!%vUTz)~b4X4$^~`TvW7 ziIMs5zyE)kk;ES}`AIdM1t$C=P~wMS3!!9Ap!k0ap%i9haWBalIY!4O?f(oAd%r+4 zo)k2;d7%b_#Jhnp-2~zQ1Q@}XCIrw@0t|34GX2=V#dp;1>j!5(mhZn98K?y0fw-87 z<#h&!;7V3zwkKdg)?fU+ET4a(DSgvn03;_eFu%5AV7&(n_piW02N=Hpff?mLFf{&g z0%=ZYR2CvOD9l@{`Ma!o3LDu1eZb}An>(a<~Q?=8{fF=xc@W!MoZ)b z{O|{gu_$Ev|5TXe{Z}Tay7jj||2@OO@D(hD)hsRsjrwm4H=1C4P6p+J-x==O;Vpp} zelf7T{l>^3$L4GI;MZmjLQek2%+jdD-YkChTV1vRXZ6WjKj)c!`-fi-2P5B87D!gv za)A+O=YLR%j|aSGxW@31vGu^;|BMVrzfaux>)%&1LJk9(o(#_DK=28Oy@5ho@oC^@ z5m@o{&xh3zgTK{rGV>dM|NF@cm+`=a;1wpY5S@6ZrZbS)owhjA&;jnXfl*X745tmMB3MrBW$)n`RP3b417qd6J6bL?UM{+)q(3xlv0Ik%T7j-l59$8$m>#ard~jq(8yIciUu?j(!>?&WKIe?G5c$>` zV+r!H1WS-ha)=*H^!uZEl>O1BP8%xc=fconk~~4DvKCYWn4`b_pUnoZ788}%mc>uh z9HV;s)r}P~NWtqf_p5&HGjTJoZI|S8n)uf0l05g}rdhqaIBpnv^myAWbI*7E=&N3x z95xI+0zR;x-|08c&;6Ul#XdjZARV+no-wSN`};1(+>)AIisPc*P@H*_1Kd%ys#()H z>NUmL)tL6ccj9UxPF`{LG^Rc9JypwV>?^N0yvK~LBc9f{#^OA9dQUv#8Tz7oxfa(K u#=%<%_2}PpAb{bmUKcqz}))c5uC(7v?)v4a2P)ZNa- z@$&T2)z|&~{r~^}A^8LV00000EC2ui01yBW000GQ;3tk`X`bk)Wk@<6#nZYULKH{p zEx|?+kif!I0vIL|#ZMubBmjWH2OtmxIFVa~6JQ7!1CK!f5W#StOTv&C3=E8h2vI1s n+#cd5;2fT3B_0kF0v!+!GARoV78n&7dMN`JIW(4+BOw4gP{MS* diff --git a/samples/javaconfig/openid/src/main/resources/resources/img/openid.gif b/samples/javaconfig/openid/src/main/resources/resources/img/openid.gif deleted file mode 100644 index c718b0e6f37012db6c9c10d9d21c4dea0d0c01bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 740 zcmZ?wbhEHb^k$G`xXQrrKS$vIw-5i{JotZf!T-qt{~ulWe{RG7ST3!;kh({9A)7tlU&$%5*g$f^Ar># z6BXsynVh) zJ?osJf(s)D10z?npvQi179P(djPk7Va&pI%NfVlv<{V@&c*Q1S?C^%corz71;ll+1P9`Sd{~>qE3OQZcJ(5}z4)|O#`p@vJ zr9;Fsp~HjOs*vv^`}=;ISs7Cf1bMkUpV%Pi{6*$qgF{F5!;-XxTBi=%eG5gPtV^!wdin~r1kkVO&vN=8Ce+Xv z$*|MCqlY(ACp$%vPrNeV;U*4lo)c<`?yngdvl5)QWEV6rHbi?!)@MOEE;CkPT#L!!@77y7u K{UjJ!7_0#i2pVPp diff --git a/samples/javaconfig/openid/src/main/resources/resources/img/technorati.ico b/samples/javaconfig/openid/src/main/resources/resources/img/technorati.ico deleted file mode 100644 index fa1083c116527de7cdbf5897976aae8807fce878..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2294 zcmeH}ze^lZ5XZl}d+sirdNzWcsg4x+2g0RLIAWPjuoD!tN}VeB7eq*vB1MXHX)Xi{ zAytZyMi86WScxK7SO|(gE|<@|cRuzut2sy&xMBC*%tj+A zE!c_l2H#`zaX;dYlru_mk^31KdcB@L9&W3#wIFp`YJOeP`OSr1{CK6O-`2Es@?E#T zy1MFK>-Ep~I=Vd7%e_s#J@}-Zvwh`X=4ClX_h=7BXW;)k1Ifb@+v7M5AZI7aYkiNm z$KjX;Qm=X2(~a>=Zn(6-IG8mv>sbkaBEroVrCFBdHr=3XM61uF&u!`5GI1u;Qf<+zMxU!sr1q{f@m!ic#&7x4 zjcDZqv{&NU85cGO2UiL7I^;$4kVpqJ@-E;pjlK(>l3v2Y;e5IS@q=)?(5+CX;*7LwCwnlxopJBahPURBFV+~&J eFF>coTp;}_7zqbJAQuX63TM^f{)_Klzq8-HK65Pq diff --git a/samples/javaconfig/openid/src/main/resources/resources/img/verisign.gif b/samples/javaconfig/openid/src/main/resources/resources/img/verisign.gif deleted file mode 100644 index faa6aaafbda1d73ac221dcac5cb6e227cc773e73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2550 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 X0PU5rU|_JTL0}LcBo2~?sfE!1%eOAT diff --git a/samples/javaconfig/openid/src/main/resources/resources/img/wordpress.ico b/samples/javaconfig/openid/src/main/resources/resources/img/wordpress.ico deleted file mode 100644 index 31b7d2c2b77c039342854190a90a8d8436992b47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmaKqJxT*n6op^J!coBi!TOa}allq&O3PWo1c^ULbO>qe21^@jt1Q7KOpyh+ge)Q1 zK|J4huRH_#zwbc3UEA;R9AO!H&d%roag-+O5 zO!N95T@?S*G}Sgw{mN!=VmhZ5Rzf4>LLtlrZUAWLgGPY+oVrG5xo^yW`xZU-Q@wk~@ zYxS@D)yH#t7kvCm!TtK*mFh-7(+TYB+*i5pa!nc|Jf3SU=XN{`fjrfux$lA7e}n0{ zlfCqFi>Z(M`wVVG>yKK1*9rZ1`iw}=W^iIUOLNU?<8e1$!1FrglCO_u)5YTUvK?eu yI~YIj#-~XLO;hd+o2#A2S^08*UB1qS`QCUE52vFxJ9}scm-~xFcCkL1j=lhFMR`a7 diff --git a/samples/javaconfig/openid/src/main/resources/resources/img/yahoo.gif b/samples/javaconfig/openid/src/main/resources/resources/img/yahoo.gif deleted file mode 100644 index 42adbfa57f86b8b2df5aa1b7fe90510a7d1fdfdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1682 zcmV;D25tFANk%w1VN?JR0QUd@mU^Y$)Z(Fuu9$+OiD{W+I(v?Bo^?%%^Y8SKa-f%f zrJRAP?db1@W|sQ-`{?5AU^RD{eyHu}@MAc6Y)F84S&#er{JEpU(8JfsyU}JneZsZL zSS)eo;OgSr=DVrI-qz#a*5rX-lZrIb?D>k<=p7w-06N?k+!11Z%BingssxX*~`Jx%e>NQL4U@#&si&Ry{X0d`1)-{ zg6ib$l60Y~mAI;tw^}Z8;o0SWTajTmc&LxG+tT3I%-z$;*=0U@n}Df z_WAbn_i93aS}k+@`~3Iy_*yJ-{r&yp+~-;?aeZ2la7u;o?eq2W_P3J0;iQSMZ9#_O-sRiQ;BHNT`1AO8Qj6r> z=!+x&Fkmx*3aAJ-s-85w)XV*n|rAH`~33k^Rb@1vYox} z>+;~*+x%&C>Lw4uMvz|_vc)vS@X=;7?8j0^uVyl!LrHg=Iz3>%W_GG_VoC(sJZv``HXa* zrIxkU(csd>*m+iriD#Si^7g{9%5+bN>E!JE{QaMVtz9y8td_W5GInuEg!AzAjBA~X zY@AsvasU7SA^8LV00000EC2ui08{`F000R80L>t9BSw)JIS9nHVe#jm!-o(fN}Ncs zqD6~fM)VmW02LY`Stc0KkV8WON`_FRxX7}l%ZU3P9D0C2ViSKjMS*eC!QC5NWc*24 z$ACo`hlu15G!rIFqD1JxyfmSQfQkeLyuEbT;aCwDIQ`|T5~at(emLt$WH9QCKO?Fj z!YZJpKo=h-$7uT!(ZdXCA3nU9VnV{d0N()k(Y5u#B%yvAamGe5)veXFd%|B&z}{E8T{37 zh=$XgAq(IDLK-DxqXs0h{KJhuWN1QBJY)EyRU!TiVM;~maN!RZP&~xT1YQjCP&*>v zG{z^SKvar9Z%BlLKM^>@P9t6rA<+h8P*4UH{%m1KMF#8;qhgZOW6=OR_%lH)|M;QC z8ZSfy%{eR3AQ2<}h+xkGOhf{J3Vrwkz(32laK<*D3lQa{dk%K=0FpwEPj!g6c z8PB|?!Vn>}!~`5T1t5_zE=)iG0UUIK4SoL5A(0aP5b%#W8tjnDD-wa@&pQ_U;|wMK zP_awA|9s&=3UeHwj6-G|f<{Y6;N(Ia64h{zIqvjAj2hSc^NKS(WVVJ5CDigyFgPgS zk0p~ZbHfV$&=8I(61-3X6MR?_!$S{5GXw`Ytg(h5N(#^hz#+8og#&*SW6=pXX^~7s zFkB+QLkzgEL@`eIumT%^WMK#(^!)R|8hsQ|gbd{TLyHi#R)~`zC)5;?9Um+JL^Gdc zPzgiQO?9dAYKu|J14=HfQCJs5ExCItCfU89hC~?OkX(YSVLmi;d zz!!K_6YW}g;8BGXI9aiX4Mdod4IRil;>SO66v75h2HbJ^?H7Hao9>T4MsJEFFH&Hw-a diff --git a/samples/javaconfig/openid/src/main/resources/resources/js/jquery-1.2.6.min.js b/samples/javaconfig/openid/src/main/resources/resources/js/jquery-1.2.6.min.js deleted file mode 100644 index 82b98e1d76..0000000000 --- a/samples/javaconfig/openid/src/main/resources/resources/js/jquery-1.2.6.min.js +++ /dev/null @@ -1,32 +0,0 @@ -/* - * jQuery 1.2.6 - New Wave Javascript - * - * Copyright (c) 2008 John Resig (jquery.com) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $ - * $Rev: 5685 $ - */ -(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else -return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else -return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else -selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else -this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else -return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else -jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else -jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("",""]||!tags.indexOf("",""]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
    "]||!tags.indexOf("",""]||(!tags.indexOf("",""]||!tags.indexOf("",""]||jQuery.browser.msie&&[1,"div
    ","
    "]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf(""&&tags.indexOf("=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else -ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&¬xml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&¬xml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&¬xml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else -while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return im[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else -for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("
    ").append(res.responseText.replace(//g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else -xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else -jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else -for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else -s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else -e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;ithis.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})(); \ No newline at end of file diff --git a/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/jquery.query-2.1.3.js b/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/jquery.query-2.1.3.js deleted file mode 100644 index e4320a7622..0000000000 --- a/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/jquery.query-2.1.3.js +++ /dev/null @@ -1,220 +0,0 @@ -/** - * jQuery.query - Query String Modification and Creation for jQuery - * Written by Blair Mitchelmore (blair DOT mitchelmore AT gmail DOT com) - * Licensed under the WTFPL (https://www.wtfpl.net/). - * Date: 2009/02/08 - * - * @author Blair Mitchelmore - * @version 2.1.3 - * - **/ -new function(settings) { - // Various Settings - var $separator = settings.separator || '&'; - var $spaces = settings.spaces === false ? false : true; - var $suffix = settings.suffix === false ? '' : '[]'; - var $prefix = settings.prefix === false ? false : true; - var $hash = $prefix ? settings.hash === true ? "#" : "?" : ""; - var $numbers = settings.numbers === false ? false : true; - - jQuery.query = new function() { - var is = function(o, t) { - return o != undefined && o !== null && (!!t ? o.constructor == t : true); - }; - var parse = function(path) { - var m, rx = /\[([^[]*)\]/g, match = /^(\S+?)(\[\S*\])?$/.exec(path), base = match[1], tokens = []; - while (m = rx.exec(match[2])) tokens.push(m[1]); - return [base, tokens]; - }; - var set = function(target, tokens, value) { - var o, token = tokens.shift(); - if (typeof target != 'object') target = null; - if (token === "") { - if (!target) target = []; - if (is(target, Array)) { - target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value)); - } else if (is(target, Object)) { - var i = 0; - while (target[i++] != null); - target[--i] = tokens.length == 0 ? value : set(target[i], tokens.slice(0), value); - } else { - target = []; - target.push(tokens.length == 0 ? value : set(null, tokens.slice(0), value)); - } - } else if (token && token.match(/^\s*[0-9]+\s*$/)) { - var index = parseInt(token, 10); - if (!target) target = []; - target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value); - } else if (token) { - var index = token.replace(/^\s*|\s*$/g, ""); - if (!target) target = {}; - if (is(target, Array)) { - var temp = {}; - for (var i = 0; i < target.length; ++i) { - temp[i] = target[i]; - } - target = temp; - } - target[index] = tokens.length == 0 ? value : set(target[index], tokens.slice(0), value); - } else { - return value; - } - return target; - }; - - var queryObject = function(a) { - var self = this; - self.keys = {}; - - if (a.queryObject) { - jQuery.each(a.get(), function(key, val) { - self.SET(key, val); - }); - } else { - jQuery.each(arguments, function() { - var q = "" + this; - q = decodeURIComponent(q); - q = q.replace(/^[?#]/,''); // remove any leading ? || # - q = q.replace(/[;&]$/,''); // remove any trailing & || ; - if ($spaces) q = q.replace(/[+]/g,' '); // replace +'s with spaces - - jQuery.each(q.split(/[&;]/), function(){ - var key = this.split('=')[0]; - var val = this.split('=')[1]; - - if (!key) return; - - if ($numbers) { - if (/^[+-]?[0-9]+\.[0-9]*$/.test(val)) // simple float regex - val = parseFloat(val); - else if (/^[+-]?[0-9]+$/.test(val)) // simple int regex - val = parseInt(val, 10); - } - - val = (!val && val !== 0) ? true : val; - - if (val !== false && val !== true && typeof val != 'number') - val = val; - - self.SET(key, val); - }); - }); - } - return self; - }; - - queryObject.prototype = { - queryObject: true, - has: function(key, type) { - var value = this.get(key); - return is(value, type); - }, - GET: function(key) { - if (!is(key)) return this.keys; - var parsed = parse(key), base = parsed[0], tokens = parsed[1]; - var target = this.keys[base]; - while (target != null && tokens.length != 0) { - target = target[tokens.shift()]; - } - return typeof target == 'number' ? target : target || ""; - }, - get: function(key) { - var target = this.GET(key); - if (is(target, Object)) - return jQuery.extend(true, {}, target); - else if (is(target, Array)) - return target.slice(0); - return target; - }, - SET: function(key, val) { - var value = !is(val) ? null : val; - var parsed = parse(key), base = parsed[0], tokens = parsed[1]; - var target = this.keys[base]; - this.keys[base] = set(target, tokens.slice(0), value); - return this; - }, - set: function(key, val) { - return this.copy().SET(key, val); - }, - REMOVE: function(key) { - return this.SET(key, null).COMPACT(); - }, - remove: function(key) { - return this.copy().REMOVE(key); - }, - EMPTY: function() { - var self = this; - jQuery.each(self.keys, function(key, value) { - delete self.keys[key]; - }); - return self; - }, - load: function(url) { - var hash = url.replace(/^.*?[#](.+?)(?:\?.+)?$/, "$1"); - var search = url.replace(/^.*?[?](.+?)(?:#.+)?$/, "$1"); - return new queryObject(url.length == search.length ? '' : search, url.length == hash.length ? '' : hash); - }, - empty: function() { - return this.copy().EMPTY(); - }, - copy: function() { - return new queryObject(this); - }, - COMPACT: function() { - function build(orig) { - var obj = typeof orig == "object" ? is(orig, Array) ? [] : {} : orig; - if (typeof orig == 'object') { - function add(o, key, value) { - if (is(o, Array)) - o.push(value); - else - o[key] = value; - } - jQuery.each(orig, function(key, value) { - if (!is(value)) return true; - add(obj, key, build(value)); - }); - } - return obj; - } - this.keys = build(this.keys); - return this; - }, - compact: function() { - return this.copy().COMPACT(); - }, - toString: function() { - var i = 0, queryString = [], chunks = [], self = this; - var addFields = function(arr, key, value) { - if (!is(value) || value === false) return; - var o = [encodeURIComponent(key)]; - if (value !== true) { - o.push("="); - o.push(encodeURIComponent(value)); - } - arr.push(o.join("")); - }; - var build = function(obj, base) { - var newKey = function(key) { - return !base || base == "" ? [key].join("") : [base, "[", key, "]"].join(""); - }; - jQuery.each(obj, function(key, value) { - if (typeof value == 'object') - build(value, newKey(key)); - else - addFields(chunks, newKey(key), value); - }); - }; - - build(this.keys); - - if (chunks.length > 0) queryString.push($hash); - queryString.push(chunks.join($separator)); - - return queryString.join(""); - } - }; - - return new queryObject(location.search, location.hash); - }; -}(jQuery.query || {}); // Pass in jQuery.query as settings object diff --git a/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client-config.js b/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client-config.js deleted file mode 100644 index 4cb0920c8e..0000000000 --- a/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client-config.js +++ /dev/null @@ -1,20 +0,0 @@ -/* -Defines the base of where the OpenID Provider redirects its response to. - */ -var server_root = "https://openid-selector.googlecode.com/svn/trunk/" - -/* -On the server-side you'd accept an OpenID URL and perform discovery -on it to find out the actual OpenID endpoint to send the authentication -request to. On the client side it isn't possible to lookup the endpoint -from the target server due to XSS restrictions. The endpoint for each -provider is therefore cached in this static file. If an endpoint isn't -specified for a provider then authentication on the client side cannot -proceed. -*/ -var providers_endpoint = { - google: 'https://www.google.com/accounts/o8/ud', - yahoo: 'https://open.login.yahooapis.com/openid/op/auth', - aol: 'https://api.screenname.aol.com/auth/openidServer', - verisign: 'https://pip.verisignlabs.com/server' -} \ No newline at end of file diff --git a/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client.js b/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client.js deleted file mode 100644 index 63f4f75bf6..0000000000 --- a/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client.js +++ /dev/null @@ -1,63 +0,0 @@ -var claimedID; -var providerID; -var openIDPopup; - -function OpenID_iframe_then_popup_handler(provider, claimed) { - providerID = provider; - claimedID = claimed; - var immediateiframe = document.getElementById("openid_immediate_iframe"); - - var iframeurl = getBaseOpenIDProviderURL(providerID, claimedID, true); - - immediateiframe.innerHTML = ""; -} - -function processOpenIDImmediateResponse(responseURL) { - var immediateiframe = document.getElementById("openid_immediate_iframe"); - immediateiframe.innerHTML = responseURL; - - var failure = new RegExp("openid.mode=setup_needed"); - if(failure.test(responseURL)) { - var popupurl = getBaseOpenIDProviderURL(providerID, claimedID, false); - openIDPopup = window.open(popupurl, "OpenIDPopup"); - } else { - alert("Success without popup!"); - } -} - -function processOpenIDSetupResponse(responseURL) { - openIDPopup.close(); - - var results = ""; - var responseQuery = $.query.load(responseURL); - $.each(responseQuery.get(), function(key, value) { - results += "
    " + key + "=" + value; - }); - - document.getElementById("openid_status").innerHTML = "
    Result of authentication is: " + results; -} - -function getBaseOpenIDProviderURL(provider, claimed, immediate) { - var providerEndpoint = providers_endpoint[provider]; - var providerURL = providerEndpoint; //From previous discovery - providerURL += "?"; - providerURL += "openid.ns=" + encodeURIComponent("https://specs.openid.net/auth/2.0"); - if(providers[provider].label) { - providerURL += "&openid.claimed_id=" + encodeURIComponent(claimed); - providerURL += "&openid.identity=" + encodeURIComponent(claimed); - } - else { - providerURL += "&openid.claimed_id=" + encodeURIComponent("https://specs.openid.net/auth/2.0/identifier_select"); - providerURL += "&openid.identity=" + encodeURIComponent("https://specs.openid.net/auth/2.0/identifier_select"); - } - if(immediate) { - providerURL += "&openid.return_to=" + encodeURIComponent(server_root + "openid-client/checkid_immediate_response.html"); - providerURL += "&openid.realm=" + encodeURIComponent(server_root + "openid-client/checkid_immediate_response.html"); - providerURL += "&openid.mode=checkid_immediate"; - } else { - providerURL += "&openid.return_to=" + encodeURIComponent(server_root + "openid-client/checkid_setup_response.html"); - providerURL += "&openid.realm=" + encodeURIComponent(server_root + "openid-client/checkid_setup_response.html"); - providerURL += "&openid.mode=checkid_setup"; - } - return providerURL; -} \ No newline at end of file diff --git a/samples/javaconfig/openid/src/main/resources/resources/js/openid-jquery.js b/samples/javaconfig/openid/src/main/resources/resources/js/openid-jquery.js deleted file mode 100644 index e46d233e33..0000000000 --- a/samples/javaconfig/openid/src/main/resources/resources/js/openid-jquery.js +++ /dev/null @@ -1,240 +0,0 @@ -/* -Simple OpenID Plugin -https://code.google.com/p/openid-selector/ - -This code is licenced under the New BSD License. -*/ - -var providers_large = { - google: { - name: 'Google', - url: 'https://www.google.com/accounts/o8/id' - }, - yahoo: { - name: 'Yahoo', - url: 'https://me.yahoo.com/' - }, - aol: { - name: 'AOL', - label: 'Enter your AOL screenname.', - url: 'https://openid.aol.com/{username}' - }, - verisign: { - name: 'Verisign', - label: 'Your Verisign username', - url: 'http://{username}.pip.verisignlabs.com/' - }, - openid: { - name: 'OpenID', - label: 'Enter your OpenID.', - url: null - } -}; -var providers_small = { - myopenid: { - name: 'MyOpenID', - label: 'Enter your MyOpenID username.', - url: 'http://{username}.myopenid.com/' - }, - livejournal: { - name: 'LiveJournal', - label: 'Enter your Livejournal username.', - url: 'http://{username}.livejournal.com/' - }, - flickr: { - name: 'Flickr', - label: 'Enter your Flickr username.', - url: 'https://flickr.com/{username}/' - }, - technorati: { - name: 'Technorati', - label: 'Enter your Technorati username.', - url: 'https://technorati.com/people/technorati/{username}/' - }, - wordpress: { - name: 'Wordpress', - label: 'Enter your Wordpress.com username.', - url: 'http://{username}.wordpress.com/' - }, - blogger: { - name: 'Blogger', - label: 'Your Blogger account', - url: 'http://{username}.blogspot.com/' - }, - vidoop: { - name: 'Vidoop', - label: 'Your Vidoop username', - url: 'http://{username}.myvidoop.com/' - }, - claimid: { - name: 'ClaimID', - label: 'Your ClaimID username', - url: 'https://claimid.com/{username}' - } -}; -var providers = $.extend({}, providers_large, providers_small); - -var openid = { - - demo: false, - ajaxHandler: null, - cookie_expires: 6*30, // 6 months. - cookie_name: 'openid_provider', - cookie_path: '/', - - img_path: 'resources/img/', - - input_id: null, - provider_url: null, - provider_id: null, - - init: function(input_id) { - - var openid_btns = $('#openid_btns'); - - this.input_id = input_id; - - $('#openid_choice').show(); - $('#openid_input_area').empty(); - - // add box for each provider - for (id in providers_large) { - - openid_btns.append(this.getBoxHTML(providers_large[id], 'large', '.gif')); - } - if (providers_small) { - openid_btns.append('
    '); - - for (id in providers_small) { - - openid_btns.append(this.getBoxHTML(providers_small[id], 'small', '.ico')); - } - } - - $('#openid_form').submit(this.submit); - - var box_id = this.readCookie(); - if (box_id) { - this.signin(box_id, true); - } - }, - getBoxHTML: function(provider, box_size, image_ext) { - - var box_id = provider["name"].toLowerCase(); - return ''; - - }, - /* Provider image click */ - signin: function(box_id, onload) { - - var provider = providers[box_id]; - if (! provider) { - return; - } - - this.highlight(box_id); - this.setCookie(box_id); - - this.provider_id = box_id; - this.provider_url = provider['url']; - - // prompt user for input? - if (provider['label']) { - this.useInputBox(provider); - } else { - $('#openid_input_area').empty(); - if (! onload) { - $('#openid_form').submit(); - } - } - }, - /* Sign-in button click */ - submit: function() { - - var url = openid.provider_url; - if (url) { - url = url.replace('{username}', $('#openid_username').val()); - openid.setOpenIdUrl(url); - } - if(openid.ajaxHandler) { - openid.ajaxHandler(openid.provider_id, document.getElementById(openid.input_id).value); - return false; - } - if(openid.demo) { - alert("In client demo mode. Normally would have submitted OpenID:\r\n" + document.getElementById(openid.input_id).value); - return false; - } - return true; - }, - setOpenIdUrl: function (url) { - - var hidden = document.getElementById(this.input_id); - if (hidden != null) { - hidden.value = url; - } else { - $('#openid_form').append(''); - } - }, - highlight: function (box_id) { - - // remove previous highlight. - var highlight = $('#openid_highlight'); - if (highlight) { - highlight.replaceWith($('#openid_highlight a')[0]); - } - // add new highlight. - $('.'+box_id).wrap('
    '); - }, - setCookie: function (value) { - - var date = new Date(); - date.setTime(date.getTime()+(this.cookie_expires*24*60*60*1000)); - var expires = "; expires="+date.toGMTString(); - - document.cookie = this.cookie_name+"="+value+expires+"; path=" + this.cookie_path; - }, - readCookie: function () { - var nameEQ = this.cookie_name + "="; - var ca = document.cookie.split(';'); - for(var i=0;i < ca.length;i++) { - var c = ca[i]; - while (c.charAt(0)==' ') c = c.substring(1,c.length); - if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); - } - return null; - }, - useInputBox: function (provider) { - - var input_area = $('#openid_input_area'); - - var html = ''; - var id = 'openid_username'; - var value = ''; - var label = provider['label']; - var style = ''; - - if (label) { - html = '

    ' + label + '

    '; - } - if (provider['name'] == 'OpenID') { - id = this.input_id; - value = 'http://'; - style = 'background:#FFF url('+this.img_path+'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;'; - } - html += '' + - ''; - - input_area.empty(); - input_area.append(html); - - $('#'+id).focus(); - }, - setDemoMode: function (demoMode) { - this.demo = demoMode; - }, - setAjaxHandler: function (ajaxFunction) { - this.ajaxHandler = ajaxFunction; - } -}; diff --git a/samples/javaconfig/openid/src/main/resources/users.ldif b/samples/javaconfig/openid/src/main/resources/users.ldif deleted file mode 100644 index ae43438b1c..0000000000 --- a/samples/javaconfig/openid/src/main/resources/users.ldif +++ /dev/null @@ -1,42 +0,0 @@ -dn: ou=groups,dc=springframework,dc=org -objectclass: top -objectclass: organizationalUnit -ou: groups - -dn: ou=people,dc=springframework,dc=org -objectclass: top -objectclass: organizationalUnit -ou: people - -dn: uid=admin,ou=people,dc=springframework,dc=org -objectclass: top -objectclass: person -objectclass: organizationalPerson -objectclass: inetOrgPerson -cn: Rod Johnson -sn: Johnson -uid: admin -userPassword: password - -dn: uid=user,ou=people,dc=springframework,dc=org -objectclass: top -objectclass: person -objectclass: organizationalPerson -objectclass: inetOrgPerson -cn: Dianne Emu -sn: Emu -uid: user -userPassword: password - -dn: cn=user,ou=groups,dc=springframework,dc=org -objectclass: top -objectclass: groupOfNames -cn: user -member: uid=admin,ou=people,dc=springframework,dc=org -member: uid=user,ou=people,dc=springframework,dc=org - -dn: cn=admin,ou=groups,dc=springframework,dc=org -objectclass: top -objectclass: groupOfNames -cn: admin -member: uid=admin,ou=people,dc=springframework,dc=org \ No newline at end of file diff --git a/samples/javaconfig/openid/src/main/resources/views/login.html b/samples/javaconfig/openid/src/main/resources/views/login.html deleted file mode 100644 index 4c6f86c51a..0000000000 --- a/samples/javaconfig/openid/src/main/resources/views/login.html +++ /dev/null @@ -1,51 +0,0 @@ - - - Messages : Login - - - - -
    -
    -

    - NOTE: The OpenID 1.0 and 2.0 protocols have been deprecated and users are - encouraged to migrate - to OpenID Connect, which is supported by spring-security-oauth2. -

    - -
    - Sign-in or Create New Account -
    - Invalid username and password. -
    -
    - You have been logged out. -
    -
    -

    Please click your account provider:

    -
    - -
    - -
    - - -
    - -
    -
    - - - - -
    - - diff --git a/samples/javaconfig/openid/src/main/resources/views/user/show.html b/samples/javaconfig/openid/src/main/resources/views/user/show.html deleted file mode 100644 index d2a14f7ad4..0000000000 --- a/samples/javaconfig/openid/src/main/resources/views/user/show.html +++ /dev/null @@ -1,34 +0,0 @@ - - - Messages : Login - - - - -
    -

    User Attributes

    - - - - - - - - - - - - - - - - - -
    Attribute NameAttribute Value
    IDhttps://example.com/user/id
    Attribute Name -
    -
    Attribute Value
    -
    -
    -
    - - \ No newline at end of file diff --git a/samples/javaconfig/openid/src/main/resources/views/user/show.jspx b/samples/javaconfig/openid/src/main/resources/views/user/show.jspx deleted file mode 100644 index c72fcfc3cf..0000000000 --- a/samples/javaconfig/openid/src/main/resources/views/user/show.jspx +++ /dev/null @@ -1,42 +0,0 @@ - - - - - User - - -

    User Attributes

    - - - - - - - - - - - - - - - - - - - -
    Attribute NameAttribute Value
    ID
    -
    - -
    -     -
    -
    - - -     \ No newline at end of file diff --git a/samples/javaconfig/openid/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/openid/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02ef..0000000000 --- a/samples/javaconfig/openid/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/samples/javaconfig/openid/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/openid/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java deleted file mode 100644 index 776fa09e04..0000000000 --- a/samples/javaconfig/openid/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.web.FilterChainProxy; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -/** - * @author Rob Winch - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration -@WebAppConfiguration -public class SecurityConfigTests { - @Configuration - @ComponentScan(basePackages = "org.springframework.security.samples.config") - public static class Config { - } - - @Autowired - private FilterChainProxy springSecurityFilterChain; - - @Test - public void securityConfigurationLoads() { - } -} diff --git a/samples/javaconfig/preauth/spring-security-samples-javaconfig-preauth.gradle b/samples/javaconfig/preauth/spring-security-samples-javaconfig-preauth.gradle deleted file mode 100644 index 646b6878d0..0000000000 --- a/samples/javaconfig/preauth/spring-security-samples-javaconfig-preauth.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-core') - compile project(':spring-security-samples-javaconfig-messages') - compile project(':spring-security-web') - compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' - compile 'javax.validation:validation-api' - compile 'org.hibernate:hibernate-validator' - compile 'org.springframework:spring-jdbc' - compile 'org.springframework:spring-webmvc' - compile slf4jDependencies - - providedCompile 'javax.servlet:javax.servlet-api' - providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api' - - runtime 'opensymphony:sitemesh' -} diff --git a/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java deleted file mode 100644 index f851f82de0..0000000000 --- a/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; - -/** - * No customizations of {@link AbstractSecurityWebApplicationInitializer} are necessary. - * - * @author Rob Winch - */ -public class MessageSecurityWebApplicationInitializer extends - AbstractSecurityWebApplicationInitializer { -} diff --git a/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index 512365bcf0..0000000000 --- a/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; - -@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - // @formatter:off - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .antMatchers("/login", "/resources/**").permitAll() - .anyRequest().authenticated() - ) - .jee((jee) -> - jee - .mappableRoles("USER", "ADMIN") - ); - } - // @formatter:on -} diff --git a/samples/javaconfig/preauth/src/main/resources/logback.xml b/samples/javaconfig/preauth/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/javaconfig/preauth/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/javaconfig/preauth/src/main/resources/views/login.html b/samples/javaconfig/preauth/src/main/resources/views/login.html deleted file mode 100644 index 225e08832b..0000000000 --- a/samples/javaconfig/preauth/src/main/resources/views/login.html +++ /dev/null @@ -1,24 +0,0 @@ - - - Please Login - - -
    -
    -
    - Please Login -
    Invalid - username and password.
    -
    You - have been logged out.
    - - -
    - -
    -
    -
    -
    - - \ No newline at end of file diff --git a/samples/javaconfig/preauth/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/preauth/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02ef..0000000000 --- a/samples/javaconfig/preauth/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/samples/javaconfig/preauth/src/main/webapp/WEB-INF/web.xml b/samples/javaconfig/preauth/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index c2fd6603b9..0000000000 --- a/samples/javaconfig/preauth/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - FORM - - /login - /login?error - - - - - ROLE_USER - - - - Public - Matches unconstrained pages - /login - /logout - /resources/* - - - - - Secured Areas - /* - - - ROLE_USER - - - diff --git a/samples/javaconfig/preauth/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/preauth/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java deleted file mode 100644 index dd807f16d1..0000000000 --- a/samples/javaconfig/preauth/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author Rob Winch - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SecurityConfig.class) -public class SecurityConfigTests { - - @Test - public void securityConfigurationLoads() { - } -} diff --git a/samples/javaconfig/rememberme/spring-security-samples-javaconfig-rememberme.gradle b/samples/javaconfig/rememberme/spring-security-samples-javaconfig-rememberme.gradle deleted file mode 100644 index 4d52c8ec1e..0000000000 --- a/samples/javaconfig/rememberme/spring-security-samples-javaconfig-rememberme.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-core') - compile project(':spring-security-samples-javaconfig-messages') - compile project(':spring-security-web') - compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' - compile 'javax.validation:validation-api' - compile 'org.hibernate:hibernate-validator' - compile 'org.springframework:spring-jdbc' - compile 'org.springframework:spring-webmvc' - compile slf4jDependencies - - providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api' - providedCompile 'javax.servlet:javax.servlet-api' - - runtime 'opensymphony:sitemesh' -} diff --git a/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java deleted file mode 100644 index f851f82de0..0000000000 --- a/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; - -/** - * No customizations of {@link AbstractSecurityWebApplicationInitializer} are necessary. - * - * @author Rob Winch - */ -public class MessageSecurityWebApplicationInitializer extends - AbstractSecurityWebApplicationInitializer { -} diff --git a/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index 2570717394..0000000000 --- a/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; - -import static org.springframework.security.config.Customizer.withDefaults; - -@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - // @formatter:off - @Autowired - public void configureGlobal( - AuthenticationManagerBuilder auth) throws Exception { - auth - .inMemoryAuthentication() - .withUser("user").password("password").roles("USER").and() - .withUser("admin").password("password").roles("USER", "ADMIN"); - } - // @formatter:on - - // @formatter:off - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .antMatchers("/resources/**").permitAll() - .anyRequest().authenticated() - ) - .formLogin((formLogin) -> - formLogin - .loginPage("/login") - .permitAll() - ) - .rememberMe(withDefaults()); - } - // @formatter:on -} diff --git a/samples/javaconfig/rememberme/src/main/resources/logback.xml b/samples/javaconfig/rememberme/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/javaconfig/rememberme/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/javaconfig/rememberme/src/main/resources/views/login.html b/samples/javaconfig/rememberme/src/main/resources/views/login.html deleted file mode 100644 index 55b40468e3..0000000000 --- a/samples/javaconfig/rememberme/src/main/resources/views/login.html +++ /dev/null @@ -1,26 +0,0 @@ - - - Please Login - - -
    -
    -
    - Please Login -
    Invalid - username and password.
    -
    You - have been logged out.
    - - -
    - -
    -
    -
    -
    - - \ No newline at end of file diff --git a/samples/javaconfig/rememberme/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/rememberme/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02ef..0000000000 --- a/samples/javaconfig/rememberme/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/samples/javaconfig/rememberme/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/rememberme/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java deleted file mode 100644 index dd807f16d1..0000000000 --- a/samples/javaconfig/rememberme/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author Rob Winch - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SecurityConfig.class) -public class SecurityConfigTests { - - @Test - public void securityConfigurationLoads() { - } -} diff --git a/samples/javaconfig/saml2login/spring-security-samples-javaconfig-saml2login.gradle b/samples/javaconfig/saml2login/spring-security-samples-javaconfig-saml2login.gradle deleted file mode 100644 index beccb62a10..0000000000 --- a/samples/javaconfig/saml2login/spring-security-samples-javaconfig-saml2login.gradle +++ /dev/null @@ -1,13 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -repositories { - maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" } -} - -dependencies { - compile project(':saml2-service-provider-opensaml3') - compile project(':spring-security-config') - compile slf4jDependencies - - testCompile 'org.springframework:spring-test' -} diff --git a/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java deleted file mode 100644 index c7044c5192..0000000000 --- a/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; -import org.springframework.security.web.session.HttpSessionEventPublisher; - -/** - * We customize {@link AbstractSecurityWebApplicationInitializer} to enable the - * {@link HttpSessionEventPublisher}. - * - * @author Rob Winch - */ -public class MessageSecurityWebApplicationInitializer extends - AbstractSecurityWebApplicationInitializer { - - public MessageSecurityWebApplicationInitializer() { - super(SecurityConfig.class); - } - - @Override - protected boolean enableHttpSessionEventPublisher() { - return true; - } -} diff --git a/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index bc9172d65a..0000000000 --- a/samples/javaconfig/saml2login/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import java.security.cert.X509Certificate; - -import org.opensaml.security.x509.X509Support; - -import org.springframework.context.annotation.Bean; -import org.springframework.security.config.Customizer; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.saml2.core.Saml2X509Credential; -import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository; -import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration; -import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository; - -@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - @Bean - RelyingPartyRegistrationRepository relyingPartyRegistrationRepository() { - RelyingPartyRegistration relyingPartyRegistration = RelyingPartyRegistration.withRegistrationId("one") - .assertingPartyDetails((party) -> party - .entityId("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php") - .verificationX509Credentials((c) -> c.add(assertingPartyVerifyingCredential())) - .singleSignOnServiceLocation("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SSOService.php") - .wantAuthnRequestsSigned(false) - ) - .build(); - return new InMemoryRelyingPartyRegistrationRepository(relyingPartyRegistration); - } - - @Override - protected void configure(HttpSecurity http) throws Exception { - // @formatter:off - http - .authorizeRequests((authz) -> authz - .anyRequest().authenticated() - ) - .saml2Login(Customizer.withDefaults()); - // @formatter:on - } - - Saml2X509Credential assertingPartyVerifyingCredential() { - String bits = - "MIIEEzCCAvugAwIBAgIJAIc1qzLrv+5nMA0GCSqGSIb3DQEBCwUAMIGfMQswCQYD\n" + - "VQQGEwJVUzELMAkGA1UECAwCQ08xFDASBgNVBAcMC0Nhc3RsZSBSb2NrMRwwGgYD\n" + - "VQQKDBNTYW1sIFRlc3RpbmcgU2VydmVyMQswCQYDVQQLDAJJVDEgMB4GA1UEAwwX\n" + - "c2ltcGxlc2FtbHBocC5jZmFwcHMuaW8xIDAeBgkqhkiG9w0BCQEWEWZoYW5pa0Bw\n" + - "aXZvdGFsLmlvMB4XDTE1MDIyMzIyNDUwM1oXDTI1MDIyMjIyNDUwM1owgZ8xCzAJ\n" + - "BgNVBAYTAlVTMQswCQYDVQQIDAJDTzEUMBIGA1UEBwwLQ2FzdGxlIFJvY2sxHDAa\n" + - "BgNVBAoME1NhbWwgVGVzdGluZyBTZXJ2ZXIxCzAJBgNVBAsMAklUMSAwHgYDVQQD\n" + - "DBdzaW1wbGVzYW1scGhwLmNmYXBwcy5pbzEgMB4GCSqGSIb3DQEJARYRZmhhbmlr\n" + - "QHBpdm90YWwuaW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4cn62\n" + - "E1xLqpN34PmbrKBbkOXFjzWgJ9b+pXuaRft6A339uuIQeoeH5qeSKRVTl32L0gdz\n" + - "2ZivLwZXW+cqvftVW1tvEHvzJFyxeTW3fCUeCQsebLnA2qRa07RkxTo6Nf244mWW\n" + - "RDodcoHEfDUSbxfTZ6IExSojSIU2RnD6WllYWFdD1GFpBJOmQB8rAc8wJIBdHFdQ\n" + - "nX8Ttl7hZ6rtgqEYMzYVMuJ2F2r1HSU1zSAvwpdYP6rRGFRJEfdA9mm3WKfNLSc5\n" + - "cljz0X/TXy0vVlAV95l9qcfFzPmrkNIst9FZSwpvB49LyAVke04FQPPwLgVH4gph\n" + - "iJH3jvZ7I+J5lS8VAgMBAAGjUDBOMB0GA1UdDgQWBBTTyP6Cc5HlBJ5+ucVCwGc5\n" + - "ogKNGzAfBgNVHSMEGDAWgBTTyP6Cc5HlBJ5+ucVCwGc5ogKNGzAMBgNVHRMEBTAD\n" + - "AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAvMS4EQeP/ipV4jOG5lO6/tYCb/iJeAduO\n" + - "nRhkJk0DbX329lDLZhTTL/x/w/9muCVcvLrzEp6PN+VWfw5E5FWtZN0yhGtP9R+v\n" + - "ZnrV+oc2zGD+no1/ySFOe3EiJCO5dehxKjYEmBRv5sU/LZFKZpozKN/BMEa6CqLu\n" + - "xbzb7ykxVr7EVFXwltPxzE9TmL9OACNNyF5eJHWMRMllarUvkcXlh4pux4ks9e6z\n" + - "V9DQBy2zds9f1I3qxg0eX6JnGrXi/ZiCT+lJgVe3ZFXiejiLAiKB04sXW3ti0LW3\n" + - "lx13Y1YlQ4/tlpgTgfIJxKV6nyPiLoK0nywbMd+vpAirDt2Oc+hk"; - try { - X509Certificate certificate = X509Support.decodeCertificate(bits); - return Saml2X509Credential.verification(certificate); - } catch (Exception e) { - throw new IllegalStateException(e); - } - } -} diff --git a/samples/javaconfig/saml2login/src/main/resources/logback.xml b/samples/javaconfig/saml2login/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/javaconfig/saml2login/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/javaconfig/saml2login/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/saml2login/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java deleted file mode 100644 index 0e2bdba1d5..0000000000 --- a/samples/javaconfig/saml2login/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SecurityConfig.class) -public class SecurityConfigTests { - - @Test - public void securityConfigurationLoads() { - } -} diff --git a/samples/javaconfig/x509/spring-security-samples-javaconfig-x509.gradle b/samples/javaconfig/x509/spring-security-samples-javaconfig-x509.gradle deleted file mode 100644 index 7150dd3291..0000000000 --- a/samples/javaconfig/x509/spring-security-samples-javaconfig-x509.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-core') - compile project(':spring-security-samples-javaconfig-messages') - compile project(':spring-security-web') - compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' - compile 'javax.validation:validation-api' - compile 'org.hibernate:hibernate-validator' - compile 'ch.qos.logback:logback-classic' - compile 'org.springframework:spring-jdbc' - compile 'org.springframework:spring-webmvc' - - providedCompile 'javax.servlet:javax.servlet-api' - providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api' - - runtime 'opensymphony:sitemesh' -} diff --git a/samples/javaconfig/x509/src/etc/ca.pem b/samples/javaconfig/x509/src/etc/ca.pem deleted file mode 100644 index a5b52ca9d7..0000000000 --- a/samples/javaconfig/x509/src/etc/ca.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDojCCAoqgAwIBAgIEMKX1dzANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMC -R0IxETAPBgNVBAgTCFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MRkwFwYDVQQK -ExBTcHJpbmcgRnJhbWV3b3JrMRgwFgYDVQQLEw9TcHJpbmcgU2VjdXJpdHkxIDAe -BgNVBAMTF1NwcmluZyBTZWN1cml0eSBUZXN0IENBMB4XDTA4MDEyNTExMTIyMVoX -DTE4MDIyNTAwMDAwMFowgYkxCzAJBgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFu -ZDEQMA4GA1UEBxMHR2xhc2dvdzEZMBcGA1UEChMQU3ByaW5nIEZyYW1ld29yazEY -MBYGA1UECxMPU3ByaW5nIFNlY3VyaXR5MSAwHgYDVQQDExdTcHJpbmcgU2VjdXJp -dHkgVGVzdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALzl/wEe -snYrwqaGZuB8hmwACtptazh1+eXCfd66FkioxlLF7yTnjCC7DT+vmMgSuThIEIsN -xlxLpEgyU3bU8GIuR8wyYIyvuSMcptdFJLV7NKYuRycxpDuqimTM7Br0nfNgKVEv -1QwguGWr6YN3aZ68/xe/D5xyPhakKu++7VFXIXw9f0+nqojdrFTqQ6l9GAVRgfX6 -h4JOaV1VFx83y2pnFj0iFneVxRcvXyWnyXlcOvJDIyVuyS/hYxb+E5rtBvp5XQ0o -5CP4OMwCZGx/jEqlL8oO7BwEgu9aEBxKvoIKJmHDTHgWIxgawTrKabmong4utnMI -yNrhsI77bmh2U7UCAwEAAaMQMA4wDAYDVR0PBAUDAwcGADANBgkqhkiG9w0BAQUF -AAOCAQEAuD8W9Ukkfyi0y65mwguFVAqBC3RSTMRXcjbLQV4rMDM/Q9kjA6acY4Ta -WgxGTwNCydqaqwDVsmn+6Je8Lp2xm9KLDLypVdNopGs+Mlfo55dhwqymXkQw1oJI -CPhR3nBmGEnSWW0UY9bPlpxRF2D5GDVwpuxDtXvWa4baPwRRI9MxwPWHA3ITl+fc -s9QVKy+pRAnuP9MSIp755cJ1CODOn2ElNCqnxxsZmcWcmI3LkHAwTmegl3PVvhrk -MKMEA/neshh/M/hWGNTFt77Hoa7pU9dv5RCWFvZPqsUgPrwGrmUvcmSDir3lSWQm -SuSED2LKVo+BFqwWS+jp49AR9b8B/Q== ------END CERTIFICATE----- diff --git a/samples/javaconfig/x509/src/etc/dianne.p12 b/samples/javaconfig/x509/src/etc/dianne.p12 deleted file mode 100644 index 6e5ba218db795c356e8c0aa5df637950e500f0d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1768 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 aA_Ne)6!9W(f=}drPhM~u0`Xu10te84%1hP& diff --git a/samples/javaconfig/x509/src/etc/scott.p12 b/samples/javaconfig/x509/src/etc/scott.p12 deleted file mode 100644 index f0a6357e730752bd6b2f05658ec8a1a85ade6de9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1768 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 diff --git a/samples/javaconfig/x509/src/etc/server.xml b/samples/javaconfig/x509/src/etc/server.xml deleted file mode 100644 index 0a38efa0fd..0000000000 --- a/samples/javaconfig/x509/src/etc/server.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java deleted file mode 100644 index f851f82de0..0000000000 --- a/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; - -/** - * No customizations of {@link AbstractSecurityWebApplicationInitializer} are necessary. - * - * @author Rob Winch - */ -public class MessageSecurityWebApplicationInitializer extends - AbstractSecurityWebApplicationInitializer { -} diff --git a/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/SecurityConfig.java deleted file mode 100644 index 040dd75762..0000000000 --- a/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/SecurityConfig.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2002-2019 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; - -import static org.springframework.security.config.Customizer.withDefaults; - -@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - // @formatter:off - @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) - throws Exception { - auth. - inMemoryAuthentication() - .withUser("dianne").password("password").roles("USER").and() - .withUser("rod").password("password").roles("USER", "ADMIN").and() - .withUser("scott").password("password").roles("USER"); - } - // @formatter:on - - // @formatter:off - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .authorizeRequests((authorizeRequests) -> - authorizeRequests - .anyRequest().authenticated() - ) - .x509(withDefaults()); - } - // @formatter:on -} diff --git a/samples/javaconfig/x509/src/main/resources/logback.xml b/samples/javaconfig/x509/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/javaconfig/x509/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/javaconfig/x509/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/x509/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02ef..0000000000 --- a/samples/javaconfig/x509/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators.xml b/samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators.xml deleted file mode 100644 index 7df83f1950..0000000000 --- a/samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - /* - - diff --git a/samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators/main.jsp deleted file mode 100644 index 20726cb81e..0000000000 --- a/samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators/main.jsp +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - SecureMail: <decorator:title/> - - - - - - - - - - - - - - -

    - - - - - \ No newline at end of file diff --git a/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/login.jspx b/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/login.jspx deleted file mode 100644 index 5b56e9b8cc..0000000000 --- a/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/login.jspx +++ /dev/null @@ -1,36 +0,0 @@ - - - - -Please Login - - - -
    -
    - Please Login - -
    - Failed to login. -
    -     - -
    - You have been logged out. -
    -     - - - - -
    - -
    -
    -
    - - -     diff --git a/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/compose.jspx b/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/compose.jspx deleted file mode 100644 index a92f7e2d6c..0000000000 --- a/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/compose.jspx +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Compose - - -
    -

    Messages : Create

    - - - - - - -
    - -
    -     -
    - - -     \ No newline at end of file diff --git a/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/inbox.jspx b/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/inbox.jspx deleted file mode 100644 index ed02d313c6..0000000000 --- a/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/inbox.jspx +++ /dev/null @@ -1,40 +0,0 @@ - - - - - Inbox - - -

    Inbox

    - - - - - - - - - - - - - - - - - - - - - - - -
    CreatedSummary
    You have not received any mail yet.
    - - -     \ No newline at end of file diff --git a/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/show.jspx b/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/show.jspx deleted file mode 100644 index 82007c267b..0000000000 --- a/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/show.jspx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - <c:out value="${message.summary}"/> - - -
    -

    Message :

    -
    -
    Created
    -
    -
    Message
    -
    -
    -
    - - -     \ No newline at end of file diff --git a/samples/javaconfig/x509/src/main/webapp/WEB-INF/web.xml- b/samples/javaconfig/x509/src/main/webapp/WEB-INF/web.xml- deleted file mode 100644 index b87ff75318..0000000000 --- a/samples/javaconfig/x509/src/main/webapp/WEB-INF/web.xml- +++ /dev/null @@ -1,35 +0,0 @@ - - - - - FORM - - /login - /login?error - - - - - ROLE_USER - - - - Public - Matches unconstrained pages - /login - /logout - /resources/* - - - - - Secured Areas - /* - - - ROLE_USER - - - diff --git a/samples/javaconfig/x509/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/x509/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java deleted file mode 100644 index dd807f16d1..0000000000 --- a/samples/javaconfig/x509/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.config; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author Rob Winch - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SecurityConfig.class) -public class SecurityConfigTests { - - @Test - public void securityConfigurationLoads() { - } -} diff --git a/samples/xml/aspectj/spring-security-samples-xml-aspectj.gradle b/samples/xml/aspectj/spring-security-samples-xml-aspectj.gradle deleted file mode 100644 index dfc2b98418..0000000000 --- a/samples/xml/aspectj/spring-security-samples-xml-aspectj.gradle +++ /dev/null @@ -1,16 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' -apply plugin: 'io.freefair.aspectj.post-compile-weaving' - -dependencies { - compile project(':spring-security-core') - - aspect project(':spring-security-aspects') - - runtime project(':spring-security-aspects') - runtime project(':spring-security-config') -} - -aspectj { - version = aspectjVersion -} - diff --git a/samples/xml/aspectj/src/main/java/sample/aspectj/SecuredService.java b/samples/xml/aspectj/src/main/java/sample/aspectj/SecuredService.java deleted file mode 100644 index 9f81cf1733..0000000000 --- a/samples/xml/aspectj/src/main/java/sample/aspectj/SecuredService.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.aspectj; - -import org.springframework.security.access.annotation.Secured; - -/** - * Service which is secured on the class level - * - * @author Mike Wiesner - * @since 3.0 - */ -@Secured("ROLE_USER") -public class SecuredService { - - public void secureMethod() { - // nothing - } - -} diff --git a/samples/xml/aspectj/src/main/java/sample/aspectj/Service.java b/samples/xml/aspectj/src/main/java/sample/aspectj/Service.java deleted file mode 100644 index 70b8c0c71f..0000000000 --- a/samples/xml/aspectj/src/main/java/sample/aspectj/Service.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.aspectj; - -import org.springframework.security.access.annotation.Secured; - -/** - * Service which is secured on method level - * - * @author Mike Wiesner - * @since 1.0 - */ -public class Service { - - @Secured("ROLE_USER") - public void secureMethod() { - // nothing - } - - public void publicMethod() { - // nothing - } - -} diff --git a/samples/xml/aspectj/src/main/resources/aspectj-context.xml b/samples/xml/aspectj/src/main/resources/aspectj-context.xml deleted file mode 100644 index 31ee923494..0000000000 --- a/samples/xml/aspectj/src/main/resources/aspectj-context.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - diff --git a/samples/xml/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java b/samples/xml/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java deleted file mode 100644 index 5e78a92108..0000000000 --- a/samples/xml/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.aspectj; - -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = "classpath:aspectj-context.xml") -public class AspectJInterceptorTests { - private Authentication admin = new UsernamePasswordAuthenticationToken("test", "xxx", - AuthorityUtils.createAuthorityList("ROLE_ADMIN")); - private Authentication user = new UsernamePasswordAuthenticationToken("test", "xxx", - AuthorityUtils.createAuthorityList("ROLE_USER")); - - @Autowired - private Service service; - - @Autowired - private SecuredService securedService; - - @Test - public void testPublicMethod() { - service.publicMethod(); - } - - @Test(expected = AuthenticationCredentialsNotFoundException.class) - public void testSecuredMethodNotAuthenticated() { - service.secureMethod(); - } - - @Test(expected = AccessDeniedException.class) - public void testSecuredMethodWrongRole() { - SecurityContextHolder.getContext().setAuthentication(admin); - service.secureMethod(); - } - - @Test - public void testSecuredMethodEverythingOk() { - SecurityContextHolder.getContext().setAuthentication(user); - service.secureMethod(); - } - - @Test(expected = AuthenticationCredentialsNotFoundException.class) - public void testSecuredClassNotAuthenticated() { - securedService.secureMethod(); - } - - @Test(expected = AccessDeniedException.class) - public void testSecuredClassWrongRole() { - SecurityContextHolder.getContext().setAuthentication(admin); - securedService.secureMethod(); - } - - @Test(expected = AccessDeniedException.class) - public void testSecuredClassWrongRoleOnNewedInstance() { - SecurityContextHolder.getContext().setAuthentication(admin); - new SecuredService().secureMethod(); - } - - @Test - public void testSecuredClassEverythingOk() { - SecurityContextHolder.getContext().setAuthentication(user); - securedService.secureMethod(); - new SecuredService().secureMethod(); - } - - @After - public void tearDown() { - SecurityContextHolder.clearContext(); - } - -} diff --git a/samples/xml/aspectj/src/test/resources/logback-test.xml b/samples/xml/aspectj/src/test/resources/logback-test.xml deleted file mode 100644 index 2d51ba4180..0000000000 --- a/samples/xml/aspectj/src/test/resources/logback-test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - diff --git a/samples/xml/cas/Readme.txt b/samples/xml/cas/Readme.txt deleted file mode 100644 index cfa67e6ad7..0000000000 --- a/samples/xml/cas/Readme.txt +++ /dev/null @@ -1,12 +0,0 @@ -To run a CAS server and client application, just execute the command - -./gradlew cas - -from the project root directory. You should then be able to point your browser at - -https://localhost:8443/cas-sample/ - -to view the sample application. On attempting to access a secure page, -you'll be redirected to the CAS server where you can log in with one of -the usernames from the sample application context (enter the username in the -password field too, to authenticate to CAS in testing mode). diff --git a/samples/xml/cas/cassample/spring-security-samples-xml-cassample.gradle b/samples/xml/cas/cassample/spring-security-samples-xml-cassample.gradle deleted file mode 100644 index 9fedcea3bd..0000000000 --- a/samples/xml/cas/cassample/spring-security-samples-xml-cassample.gradle +++ /dev/null @@ -1,61 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -def keystore = "$rootDir/samples/certificates/server.jks" -def password = 'password' - -dependencies { - compile project(':spring-security-cas') - compile project(':spring-security-core') - compile 'org.jasig.cas.client:cas-client-core' - - providedCompile 'javax.servlet:javax.servlet-api' - - runtime project(':spring-security-config') - runtime project(':spring-security-web') - runtime 'ch.qos.logback:logback-classic' - runtime 'net.sf.ehcache:ehcache' - runtime 'org.slf4j:jcl-over-slf4j' - runtime 'org.springframework:spring-context-support' - - integrationTestCompile project(':spring-security-cas') - integrationTestCompile seleniumDependencies - integrationTestCompile 'org.eclipse.jetty:jetty-server' - integrationTestCompile 'org.eclipse.jetty:jetty-servlet' - integrationTestCompile 'org.slf4j:jcl-over-slf4j' -} - -integrationTest { - dependsOn { casServer().tasks.appBeforeIntegrationTest } - doFirst { - def casServiceHost = 'localhost:' + gretty.httpsPort - def casServerHost = 'localhost:' + casServer().gretty.httpsPort - systemProperties['cas.server.host'] = casServerHost - systemProperties['cas.service.host'] = casServiceHost - systemProperties['jar.path'] = jar.archivePath - systemProperties['javax.net.ssl.trustStore'] = keystore - systemProperties['javax.net.ssl.trustStorePassword'] = password - } - finalizedBy { casServer().tasks.appAfterIntegrationTest } -} - -prepareAppServerForIntegrationTests { - dependsOn { casServer().tasks.appBeforeIntegrationTest } - doLast { - def casServiceHost = 'localhost:' + project.gretty.httpsPort - def casServerHost = 'localhost:' + casServer().gretty.httpsPort - gretty.jvmArgs += ["-Dcas.server.host=${casServerHost}", "-Dcas.service.host=${casServiceHost}"] - } -} - -gretty { - contextPath = '/cas-sample/' - httpsEnabled = true - httpsPort = 8443 - sslKeyStorePath = keystore - sslKeyStorePassword = password - jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"] -} - -def casServer() { - project(':spring-security-samples-xml-casserver') -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleProxyTests.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleProxyTests.java deleted file mode 100644 index 906952cb63..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleProxyTests.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas; - -import java.util.HashMap; -import java.util.Map; - -import org.jasig.cas.client.proxy.Cas20ProxyRetriever; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; - -import org.springframework.security.samples.cas.pages.AccessDeniedPage; -import org.springframework.security.samples.cas.pages.ExtremelySecurePage; -import org.springframework.security.samples.cas.pages.LoginPage; -import org.springframework.security.samples.cas.pages.ProxyTicketSamplePage; -import org.springframework.security.samples.cas.pages.SecurePage; -import org.springframework.security.samples.cas.pages.UnauthorizedPage; - -/** - * Tests authenticating to the CAS Sample application using Proxy Tickets. Geb is used to authenticate the {@link JettyCasService} - * to the CAS Server in order to obtain the Ticket Granting Ticket. Afterwards HttpClient is used for accessing the CAS Sample application - * using Proxy Tickets obtained using the Proxy Granting Ticket. - * - * @author Rob Winch - * @author Josh Cummings - */ -public class CasSampleProxyTests { - private static String serverUrl; - private static String serviceUrl; - private static JettyCasService service; - private static Cas20ProxyRetriever retriever; - - private WebDriver driver = new HtmlUnitDriver(); - - private LoginPage login; - private SecurePage secure; - private ExtremelySecurePage extremelySecure; - private ProxyTicketSamplePage proxyTicketSample; - private AccessDeniedPage accessDenied; - private UnauthorizedPage unauthorized; - - @BeforeClass - public static void setupClass() { - String serverHost = System.getProperty("cas.server.host", "localhost:8443"); - serverUrl = "https://" + serverHost + "/cas"; - String serviceHost = System.getProperty("cas.service.host", "localhost:8443"); - serviceUrl = "https://" + serviceHost + "/cas-sample"; - service = new JettyCasService().init(serverUrl); - retriever = new Cas20ProxyRetriever(serverUrl, "UTF-8"); - } - - @AfterClass - public static void teardownClass() throws Exception { - service.stop(); - } - - @Before - public void setup() { - this.login = new LoginPage(this.driver, serverUrl); - this.secure = new SecurePage(this.driver, serviceUrl); - this.extremelySecure = new ExtremelySecurePage(this.driver, serviceUrl); - this.proxyTicketSample = new ProxyTicketSamplePage(this.driver, serviceUrl); - this.accessDenied = new AccessDeniedPage(this.driver); - this.unauthorized = new UnauthorizedPage(this.driver); - } - - @After - public void teardown() { - this.driver.close(); - } - - @Test - public void securePageWhenRoleUserThenDisplays() { - this.login.to(this::serviceParam).assertAt().login("scott"); - this.secure.to(this::ticketParam).assertAt(); - } - - @Test - public void proxyTicketSamplePageWhenRoleUserThenDisplays() { - this.login.to(this::serviceParam).assertAt().login("scott"); - this.proxyTicketSample.to(this::ticketParam).assertAt(); - } - - @Test - public void extremelySecurePageWhenRoleUserThenDenies() { - this.login.to(this::serviceParam).assertAt().login("scott"); - this.extremelySecure.to(this::ticketParam); - this.accessDenied.assertAt(); - } - - @Test - public void extremelySecurePageWhenRoleSupervisorThenDisplays() { - this.login.to(this::serviceParam).assertAt().login("rod"); - this.extremelySecure.to(this::ticketParam).assertAt(); - } - - @Test - public void extremelySecurePageWhenReusingTicketThenDisplays() { - this.login.to(this::serviceParam).assertAt().login("rod"); - Map ptCache = new HashMap<>(); - this.extremelySecure.to((url) -> url + "?ticket=" + ptCache.computeIfAbsent(url, this::getPt)).assertAt(); - this.extremelySecure.to((url) -> url + "?ticket=" + ptCache.get(url)).assertAt(); - } - - @Test - public void securePageWhenInvalidTicketThenFails() { - this.login.to(this::serviceParam).assertAt().login("scott"); - this.secure.to((url) -> url + "?ticket=invalid"); - this.unauthorized.assertAt(); - } - - private String serviceParam(String url) { - return url + "?service=" + service.serviceUrl(); - } - - private String ticketParam(String url) { - return url + "?ticket=" + getPt(url); - } - - /** - * Obtains a proxy ticket using the pgt from the {@link #service}. - * @param targetService the targetService that the proxy ticket will be valid for - * @return a proxy ticket for targetService - */ - String getPt(String targetService) { - assert service.pgt != null; - return retriever.getProxyTicketIdFor(service.pgt, targetService); - } -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleTests.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleTests.java deleted file mode 100644 index e820531969..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/CasSampleTests.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; - -import org.springframework.security.samples.cas.pages.AccessDeniedPage; -import org.springframework.security.samples.cas.pages.ExtremelySecurePage; -import org.springframework.security.samples.cas.pages.HomePage; -import org.springframework.security.samples.cas.pages.LocalLogoutPage; -import org.springframework.security.samples.cas.pages.LoginPage; -import org.springframework.security.samples.cas.pages.ProxyTicketSamplePage; -import org.springframework.security.samples.cas.pages.SecurePage; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Tests the CAS sample application using service tickets. - * - * @author Rob Winch - * @author Josh Cummings - */ -public class CasSampleTests { - private WebDriver driver = new HtmlUnitDriver(); - - private String serviceUrl; - private String serverUrl; - - private LoginPage login; - - private HomePage home; - private SecurePage secure; - private ExtremelySecurePage extremelySecure; - private ProxyTicketSamplePage proxyTicketSample; - private LocalLogoutPage localLogout; - private AccessDeniedPage accessDenied; - - @Before - public void setup() { - String serverHost = System.getProperty("cas.server.host", "localhost:8443"); - this.serverUrl = "https://" + serverHost + "/cas"; - String serviceHost = System.getProperty("cas.service.host", "localhost:8443"); - this.serviceUrl = "https://" + serviceHost + "/cas-sample"; - this.login = new LoginPage(this.driver, this.serverUrl); - this.home = new HomePage(this.driver, this.serviceUrl); - this.secure = new SecurePage(this.driver, this.serviceUrl); - this.extremelySecure = new ExtremelySecurePage(this.driver, this.serviceUrl); - this.proxyTicketSample = new ProxyTicketSamplePage(this.driver, this.serviceUrl); - this.localLogout = new LocalLogoutPage(this.driver, this.serviceUrl); - this.accessDenied = new AccessDeniedPage(this.driver); - } - - @After - public void tearDown() { - this.driver.close(); - } - - @Test - public void homePageWhenUnauthenticatedUserThenSucceeds() { - this.home.to().assertAt(); - } - - @Test - public void extremelySecurePageWhenUnauthenticatedThenRequiresLogin() { - this.extremelySecure.to(); - this.login.assertAt(); - } - - @Test - public void authenticateWhenInvalidTicketThenFails() { - this.driver.get(this.serviceUrl + "/login/cas?ticket=invalid"); - assertThat(this.driver.findElement(By.tagName("h2")).getText()) - .isEqualTo("Login to CAS failed!"); - } - - @Test - public void securePageWhenUnauthenticatedThenRequiresLogin() { - this.secure.to(); - this.login.assertAt(); - } - - @Test - public void securePageWhenRoleUserThenDisplays() { - this.login.to().login("scott"); - this.secure.to().assertAt(); - } - - @Test - public void proxyTicketSamplePageWhenRoleUserThenDisplays() { - this.login.to().login("scott"); - this.proxyTicketSample.to().assertAt(); - } - - @Test - public void extremelySecurePageWhenRoleUserThenDenies() { - this.login.to().login("scott"); - this.extremelySecure.to(); - this.accessDenied.assertAt(); - } - - @Test - public void localLogoutLinkWhenClickedThenRedirectsToLocalLogoutPage() { - this.login.to().login("scott"); - this.secure.to().logout(); - this.localLogout.assertAt(); - } - - @Test - public void casLogoutWhenClickedThenPerformsCompleteLogout() { - this.login.to().login("scott"); - this.driver.get(this.serverUrl + "/logout"); - this.secure.to(); - this.login.assertAt(); - } - - @Test - public void extremelySecureWhenRoleSupervisorThenDisplays() { - this.login.to().login("rod"); - this.extremelySecure.to().assertAt(); - } - - @Test - public void casLogoutWhenClickedThenExtremelySecurePageRequiresLogin() { - this.login.to().login("scott"); - this.driver.get(this.serverUrl + "/logout"); - this.extremelySecure.to(); - this.login.assertAt(); - } - - @Test - public void casLogoutWhenVisitedThenLogsOutSample() { - this.secure.to(); - this.login.assertAt().login("rod"); - this.secure.assertAt(); - this.driver.get(this.serverUrl + "/logout"); - this.secure.to(); - this.login.assertAt(); - } -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/JettyCasService.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/JettyCasService.java deleted file mode 100644 index dc9454b7e0..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/JettyCasService.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas; - -import java.io.File; -import java.io.IOException; -import java.net.ServerSocket; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.eclipse.jetty.http.HttpVersion; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.server.handler.AbstractHandler; -import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.jasig.cas.client.proxy.ProxyGrantingTicketStorage; -import org.jasig.cas.client.proxy.ProxyGrantingTicketStorageImpl; -import org.jasig.cas.client.validation.Cas20ProxyTicketValidator; -import org.jasig.cas.client.validation.TicketValidationException; - -import org.springframework.util.StringUtils; - -/** - * A CAS Service that allows a PGT to be obtained. This is useful for testing use of proxy tickets. - * - * @author Rob Winch - */ -public class JettyCasService extends Server { - private Cas20ProxyTicketValidator validator; - private int port = availablePort(); - - /** - * The Proxy Granting Ticket. To initialize pgt, authenticate to the CAS Server with the service parameter - * equal to {@link #serviceUrl()}. - */ - String pgt; - - /** - * Start the CAS Service which will be available at {@link #serviceUrl()}. - * - * @param casServerUrl - * @return - */ - JettyCasService init(String casServerUrl) { - System.out.println("Initializing to " + casServerUrl); - ProxyGrantingTicketStorage storage = new ProxyGrantingTicketStorageImpl(); - this.validator = new Cas20ProxyTicketValidator(casServerUrl); - this.validator.setAcceptAnyProxy(true); - this.validator.setProxyGrantingTicketStorage(storage); - this.validator.setProxyCallbackUrl(absoluteUrl("callback")); - - String password = System.getProperty("javax.net.ssl.trustStorePassword", "password"); - - SslContextFactory sslContextFactory = new SslContextFactory.Server(); - sslContextFactory.setKeyStorePath(getTrustStore()); - sslContextFactory.setKeyStorePassword(password); - sslContextFactory.setKeyManagerPassword(password); - - HttpConfiguration http_config = new HttpConfiguration(); - http_config.setSecureScheme("https"); - http_config.setSecurePort(availablePort()); - http_config.setOutputBufferSize(32768); - - HttpConfiguration https_config = new HttpConfiguration(http_config); - SecureRequestCustomizer src = new SecureRequestCustomizer(); - src.setStsMaxAge(2000); - src.setStsIncludeSubDomains(true); - https_config.addCustomizer(src); - - ServerConnector https = new ServerConnector(this, - new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()), - new HttpConnectionFactory(https_config)); - https.setPort(port); - https.setIdleTimeout(500000); - - addConnector(https); - setHandler(new AbstractHandler() { - public void handle(String target, Request baseRequest, - HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { - String st = request.getParameter("ticket"); - if (StringUtils.hasText(st)) { - try { - JettyCasService.this.validator.validate(st, JettyCasService.this.serviceUrl()); - } catch (TicketValidationException e) { - throw new IllegalArgumentException(e); - } - } - String pgt = request.getParameter("pgtId"); - if (StringUtils.hasText(pgt)) { - JettyCasService.this.pgt = pgt; - } - response.setStatus(HttpServletResponse.SC_OK); - baseRequest.setHandled(true); - } - }); - - try { - start(); - } catch (Exception e) { - throw new IllegalStateException(e); - } - return this; - } - - /** - * Returns the absolute URL that this CAS service is available at. - * @return - */ - String serviceUrl() { - return absoluteUrl("service"); - } - - /** - * Given a relative url, will provide an absolute url for this CAS Service. - * @param relativeUrl the relative url (i.e. service, callback, etc) - * @return - */ - private String absoluteUrl(String relativeUrl) { - return "https://localhost:" + port + "/" + relativeUrl; - } - - private static String getTrustStore() { - String trustStoreLocation = System.getProperty("javax.net.ssl.trustStore"); - if (trustStoreLocation == null || !new File(trustStoreLocation).isFile()) { - throw new IllegalStateException("Could not find the trust store at path \"" + trustStoreLocation + - "\". Specify the location using the javax.net.ssl.trustStore system property."); - } - return trustStoreLocation; - } - - /** - * Obtains a random available port (i.e. one that is not in use) - * @return - */ - private static int availablePort() { - try (ServerSocket server = new ServerSocket(0)) { - return server.getLocalPort(); - } catch (IOException e) { - throw new IllegalStateException(e); - } - } -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/AccessDeniedPage.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/AccessDeniedPage.java deleted file mode 100644 index cb143f14ff..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/AccessDeniedPage.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Represents the access denied page - * - * @author Rob Winch - * @author Josh Cummings - */ -public class AccessDeniedPage { - - private final Content content; - - public AccessDeniedPage(WebDriver driver) { - this.content = PageFactory.initElements(driver, Content.class); - } - - public AccessDeniedPage assertAt() { - assertThat(this.content.header()).contains("403 - Access Denied"); - return this; - } - - public static class Content { - @FindBy(tagName="h1") - WebElement header; - - public String header() { - return this.header.getText(); - } - } -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/ExtremelySecurePage.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/ExtremelySecurePage.java deleted file mode 100644 index 1524396506..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/ExtremelySecurePage.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Represents the extremely secure page of the CAS Sample application. - * - * @author Rob Winch - * @author Josh Cummings - */ -public class ExtremelySecurePage extends Page { - private final Content content; - - public ExtremelySecurePage(WebDriver driver, String baseUrl) { - super(driver, baseUrl + "/secure/extreme"); - this.content = PageFactory.initElements(driver, Content.class); - } - - @Override - public ExtremelySecurePage assertAt() { - assertThat(this.content.getText()).isEqualTo("VERY Secure Page"); - return this; - } - - public static class Content { - @FindBy(tagName="h1") - WebElement header; - - public String getText() { - return this.header.getText(); - } - } -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/HomePage.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/HomePage.java deleted file mode 100644 index 87317329d7..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/HomePage.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Represents the Home page of the CAS sample application - * - * @author Rob Winch - * @author Josh Cummings - */ -public class HomePage extends Page { - private final Content content; - - public HomePage(WebDriver driver, String baseUrl) { - super(driver, baseUrl); - this.content = PageFactory.initElements(driver, Content.class); - } - - @Override - public HomePage assertAt() { - assertThat(this.content.header()).isEqualTo("Home Page"); - return this; - } - - public static class Content { - @FindBy(tagName="h1") - WebElement header; - - public String header() { - return this.header.getText(); - } - } -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/LocalLogoutPage.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/LocalLogoutPage.java deleted file mode 100644 index 7cac6aad53..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/LocalLogoutPage.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas.pages; - -import org.openqa.selenium.WebDriver; - -/** - * This represents the local logout page. This page is where the user is logged out of the CAS Sample application, but - * since the user is still logged into the CAS Server accessing a protected page within the CAS Sample application would result - * in SSO occurring again. To fully logout, the user should click the cas server logout url which logs out of the cas server and performs - * single logout on the other services. - * - * @author Rob Winch - * @author Josh Cummings - */ -public class LocalLogoutPage extends Page { - public LocalLogoutPage(WebDriver driver, String baseUrl) { - super(driver, baseUrl + "/cas-logout.jsp"); - } -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/LoginPage.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/LoginPage.java deleted file mode 100644 index 436e39eb8b..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/LoginPage.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -/** - * The CAS login page. - * - * @author Rob Winch - * @author Josh Cummings - */ -public class LoginPage extends Page { - private final Content content; - - public LoginPage(WebDriver driver, String baseUrl) { - super(driver, baseUrl + "/login"); - this.content = PageFactory.initElements(driver, Content.class); - } - - public void login(String user) { - login(user, user); - } - - public void login(String user, String password) { - this.content.username(user).password(password).submit(); - } - - public static class Content { - private WebElement username; - private WebElement password; - @FindBy(css = "input[type=submit]") - private WebElement submit; - - public Content username(String username) { - this.username.sendKeys(username); - return this; - } - - public Content password(String password) { - this.password.sendKeys(password); - return this; - } - - public void submit() { - this.submit.click(); - } - } -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/Page.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/Page.java deleted file mode 100644 index 1e7d4e40c3..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/Page.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas.pages; - -import java.util.function.Function; - -import org.openqa.selenium.WebDriver; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Josh Cummings - */ -public abstract class Page> { - private final WebDriver driver; - private final String url; - - protected Page(WebDriver driver, String url) { - this.driver = driver; - this.url = url; - } - - public T assertAt() { - assertThat(this.driver.getCurrentUrl()).startsWith(this.url); - return (T) this; - } - - public T to() { - this.driver.get(this.url); - return (T) this; - } - - public T to(Function urlPostProcessor) { - this.driver.get(urlPostProcessor.apply(this.url)); - return (T) this; - } -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.java deleted file mode 100644 index c570414f3a..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Represents the proxy ticket sample page within the CAS Sample application. - * - * @author Rob Winch - * @author Josh Cummings - */ -public class ProxyTicketSamplePage extends Page { - private final Content content; - - public ProxyTicketSamplePage(WebDriver driver, String baseUrl) { - super(driver, baseUrl + "/secure/ptSample"); - this.content = PageFactory.initElements(driver, Content.class); - } - - @Override - public ProxyTicketSamplePage assertAt() { - assertThat(this.content.getText()).isEqualTo("Secure Page using a Proxy Ticket"); - return this; - } - - public static class Content { - @FindBy(tagName="h1") - WebElement header; - - public String getText() { - return this.header.getText(); - } - } -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/SecurePage.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/SecurePage.java deleted file mode 100644 index 338ce55ccf..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/SecurePage.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Represents the secure page within the CAS Sample application. - * - * @author Rob Winch - * @author Josh Cummings - */ -public class SecurePage extends Page { - private final Content content; - - public SecurePage(WebDriver driver, String baseUrl) { - super(driver, baseUrl + "/secure"); - this.content = PageFactory.initElements(driver, Content.class); - } - - @Override - public SecurePage assertAt() { - assertThat(this.content.header()).isEqualTo("Secure Page"); - return this; - } - - public SecurePage logout() { - this.content.logout(); - return this; - } - - public static class Content { - @FindBy(tagName="h1") - WebElement header; - - WebElement logout; - - public String header() { - return this.header.getText(); - } - - public void logout() { - this.logout.click(); - } - } - - // had nav -} diff --git a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/UnauthorizedPage.java b/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/UnauthorizedPage.java deleted file mode 100644 index 90b967d5b6..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/java/org/springframework/security/samples/cas/pages/UnauthorizedPage.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Represents the unauthorized page - * - * @author Josh Cummings - */ -public class UnauthorizedPage { - - private final Content content; - - public UnauthorizedPage(WebDriver driver) { - this.content = PageFactory.initElements(driver, Content.class); - } - - public UnauthorizedPage assertAt() { - assertThat(this.content.header()).contains("401 - Unauthorized"); - return this; - } - - public static class Content { - @FindBy(tagName="h1") - WebElement header; - - public String header() { - return this.header.getText(); - } - } -} diff --git a/samples/xml/cas/cassample/src/integration-test/resources/logback-test.xml b/samples/xml/cas/cassample/src/integration-test/resources/logback-test.xml deleted file mode 100644 index fc35a34be1..0000000000 --- a/samples/xml/cas/cassample/src/integration-test/resources/logback-test.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - - diff --git a/samples/xml/cas/cassample/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java b/samples/xml/cas/cassample/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java deleted file mode 100644 index 6b66a0b871..0000000000 --- a/samples/xml/cas/cassample/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright 2011-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.cas.web; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URLEncoder; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jasig.cas.client.util.CommonUtils; -import org.springframework.security.cas.authentication.CasAuthenticationToken; - -/** - *

    - * {@link ProxyTicketSampleServlet} demonstrates how to obtain a proxy ticket and then use - * it to make a remote call. To learn how proxy tickets work, see the Proxy CAS - * Walkthrough - *

    - * - * @author Rob Winch - */ -public final class ProxyTicketSampleServlet extends HttpServlet { - /** - * This is the URL that will be called and authenticate a proxy ticket. - */ - private String targetUrl; - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws IOException { - // NOTE: The CasAuthenticationToken can also be obtained using - // SecurityContextHolder.getContext().getAuthentication() - final CasAuthenticationToken token = (CasAuthenticationToken) request - .getUserPrincipal(); - // proxyTicket could be reused to make calls to the CAS service even if the - // target url differs - final String proxyTicket = token.getAssertion().getPrincipal() - .getProxyTicketFor(targetUrl); - - // Make a remote call to ourself. This is a bit silly, but it works well to - // demonstrate how to use proxy tickets. - final String serviceUrl = targetUrl + "?ticket=" - + URLEncoder.encode(proxyTicket, "UTF-8"); - String proxyResponse = CommonUtils.getResponseFromServer(serviceUrl, "UTF-8"); - - // modify the response and write it out to inform the user that it was obtained - // using a proxy ticket. - proxyResponse = proxyResponse.replaceFirst("Secure Page", - "Secure Page using a Proxy Ticket"); - proxyResponse = proxyResponse.replaceFirst("

    ", "

    This page is rendered by " - + getClass().getSimpleName() - + " by making a remote call to the Secure Page using a proxy ticket (" - + proxyTicket + ") and inserts this message. "); - final PrintWriter writer = response.getWriter(); - writer.write(proxyResponse); - } - - /** - * Initialize the target URL. It allows for the host to change based upon the - * "cas.service.host" system property. If the property is not set, the default is - * "localhost:8443". - */ - @Override - public void init() throws ServletException { - super.init(); - String casServiceHost = System.getProperty("cas.service.host", "localhost:8443"); - targetUrl = "https://" + casServiceHost + "/cas-sample/secure/"; - } - - private static final long serialVersionUID = -7720161771819727775L; -} diff --git a/samples/xml/cas/cassample/src/main/webapp/401.jsp b/samples/xml/cas/cassample/src/main/webapp/401.jsp deleted file mode 100644 index db1a4a1f3e..0000000000 --- a/samples/xml/cas/cassample/src/main/webapp/401.jsp +++ /dev/null @@ -1,8 +0,0 @@ - - -401 - Unauthorized - - -

    401 - Unauthorized

    - - diff --git a/samples/xml/cas/cassample/src/main/webapp/403.jsp b/samples/xml/cas/cassample/src/main/webapp/403.jsp deleted file mode 100644 index f893421dbd..0000000000 --- a/samples/xml/cas/cassample/src/main/webapp/403.jsp +++ /dev/null @@ -1,8 +0,0 @@ - - -403 - Access Denied - - -

    403 - Access Denied

    - - \ No newline at end of file diff --git a/samples/xml/cas/cassample/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/cas/cassample/src/main/webapp/WEB-INF/applicationContext-security.xml deleted file mode 100644 index bc8a2d8524..0000000000 --- a/samples/xml/cas/cassample/src/main/webapp/WEB-INF/applicationContext-security.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - localhost:8443 - localhost:9443 - - diff --git a/samples/xml/cas/cassample/src/main/webapp/WEB-INF/web.xml b/samples/xml/cas/cassample/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 0cf03709fc..0000000000 --- a/samples/xml/cas/cassample/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - Spring Security CAS Demo Application - - - - contextConfigLocation - - /WEB-INF/applicationContext-security.xml - - - - - webAppRootKey - cas.root - - - - - characterEncodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - characterEncodingFilter - /* - - - springSecurityFilterChain - /* - - - - - org.jasig.cas.client.session.SingleSignOutHttpSessionListener - - - - - org.springframework.web.context.ContextLoaderListener - - - - ptSampleServlet - org.springframework.security.samples.cas.web.ProxyTicketSampleServlet - - - - ptSampleServlet - /secure/ptSample - - - 401 - /401.jsp - - - 403 - /403.jsp - - diff --git a/samples/xml/cas/cassample/src/main/webapp/cas-logout.jsp b/samples/xml/cas/cassample/src/main/webapp/cas-logout.jsp deleted file mode 100644 index 5658e5d38b..0000000000 --- a/samples/xml/cas/cassample/src/main/webapp/cas-logout.jsp +++ /dev/null @@ -1,15 +0,0 @@ - - - - Single-sign out? - - - -

    Do you want to log out of CAS?

    - -

    You have logged out of this application, but may still have an active single-sign on session with CAS.

    - -

    Logout of CAS

    - - - diff --git a/samples/xml/cas/cassample/src/main/webapp/casfailed.jsp b/samples/xml/cas/cassample/src/main/webapp/casfailed.jsp deleted file mode 100644 index 3dabc8c62b..0000000000 --- a/samples/xml/cas/cassample/src/main/webapp/casfailed.jsp +++ /dev/null @@ -1,17 +0,0 @@ -<%@ page import="org.springframework.security.core.AuthenticationException" %> -<%@ page import="org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter" %> - - - - Login to CAS failed! - - - -

    Login to CAS failed!

    - - - Your CAS credentials were rejected.
    -     - - - diff --git a/samples/xml/cas/cassample/src/main/webapp/index.jsp b/samples/xml/cas/cassample/src/main/webapp/index.jsp deleted file mode 100644 index e7d6dc7802..0000000000 --- a/samples/xml/cas/cassample/src/main/webapp/index.jsp +++ /dev/null @@ -1,12 +0,0 @@ - - -

    Home Page

    -

    Anyone can view this page.

    - -

    Your principal object is....: <%= request.getUserPrincipal() %>

    - -

    Secure page

    -

    Proxy Ticket Sample page

    -

    Extremely secure page

    - - diff --git a/samples/xml/cas/cassample/src/main/webapp/secure/extreme/index.jsp b/samples/xml/cas/cassample/src/main/webapp/secure/extreme/index.jsp deleted file mode 100644 index 376cbe5fd9..0000000000 --- a/samples/xml/cas/cassample/src/main/webapp/secure/extreme/index.jsp +++ /dev/null @@ -1,12 +0,0 @@ - - -

    VERY Secure Page

    -This is a protected page. You can only see me if you are a supervisor. - -

    Home -

    Secure page

    -

    Proxy Ticket Sample page

    -

    Logout - - - diff --git a/samples/xml/cas/cassample/src/main/webapp/secure/index.jsp b/samples/xml/cas/cassample/src/main/webapp/secure/index.jsp deleted file mode 100644 index ea4c7240d1..0000000000 --- a/samples/xml/cas/cassample/src/main/webapp/secure/index.jsp +++ /dev/null @@ -1,15 +0,0 @@ - - -

    Secure Page

    -

    This is a protected page. You can get to me if you've been remembered, -or if you've authenticated this session.

    - -<%if (request.isUserInRole("ROLE_SUPERVISOR")) { %> -

    You are a supervisor! You can therefore see the extremely secure page.

    -<% } %> - -

    Home -

    Proxy Ticket Sample page

    -

    Logout - - diff --git a/samples/xml/cas/casserver/spring-security-samples-xml-casserver.gradle b/samples/xml/cas/casserver/spring-security-samples-xml-casserver.gradle deleted file mode 100644 index ad7c2f96ff..0000000000 --- a/samples/xml/cas/casserver/spring-security-samples-xml-casserver.gradle +++ /dev/null @@ -1,56 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -def keystore = "$rootDir/samples/certificates/server.jks" -def password = 'password' - -dependencies { - compile "org.jasig.cas:cas-server-webapp:4.0.7@war" - compile slf4jDependencies - runtime 'org.aspectj:aspectjrt' - runtime 'org.aspectj:aspectjtools' - runtime 'org.aspectj:aspectjweaver' -} - -project.tasks.withType(org.gradle.api.tasks.bundling.War) { war -> - war.duplicatesStrategy = DuplicatesStrategy.EXCLUDE - project.tasks.war.doFirst { - war.classpath = war.classpath.filter { !it.name.endsWith(".war") } - - war.project.configurations.runtime.each { - if (it.name.endsWith(".war")) { - def fileList = war.project.zipTree(it) - war.from fileList - } - } - } -} - -project.tasks.withType(org.akhikhl.gretty.StartBaseTask).all { task -> - task.doFirst { - def destinationDir = project.file("$buildDir/inplaceWebapp") - project.configurations.runtime.each { dependency -> - if (dependency.name.endsWith(".war")) { - def warTree = project.zipTree(dependency) - project.copy { - from warTree - into destinationDir - eachFile { - if (it.relativePath.getFile(destinationDir).exists()) { - it.exclude() - } - } - } - } - } - } -} - -gretty { - contextPath = '/cas' - httpsEnabled = true - httpPort = 9090 - httpsPort = 9443 - sslKeyStorePath = keystore - sslKeyStorePassword = password - jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"] -} diff --git a/samples/xml/cas/casserver/src/main/webapp/WEB-INF/classes/log4j.xml b/samples/xml/cas/casserver/src/main/webapp/WEB-INF/classes/log4j.xml deleted file mode 100644 index bb38a82ef0..0000000000 --- a/samples/xml/cas/casserver/src/main/webapp/WEB-INF/classes/log4j.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/samples/xml/cas/casserver/src/main/webapp/WEB-INF/deployerConfigContext.xml b/samples/xml/cas/casserver/src/main/webapp/WEB-INF/deployerConfigContext.xml deleted file mode 100644 index ffb983051b..0000000000 --- a/samples/xml/cas/casserver/src/main/webapp/WEB-INF/deployerConfigContext.xml +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/cas/casserver/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml b/samples/xml/cas/casserver/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml deleted file mode 100644 index d07ef7be6a..0000000000 --- a/samples/xml/cas/casserver/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - This is the main Spring configuration file with some of the main "core" classes defined. You shouldn't really - modify this unless you - know what you're doing! - - - - - - - - - - - - - - classpath:custom_messages - classpath:messages - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/xml/cas/spring-security-samples-xml-cas.gradle b/samples/xml/cas/spring-security-samples-xml-cas.gradle deleted file mode 100644 index a39d857e39..0000000000 --- a/samples/xml/cas/spring-security-samples-xml-cas.gradle +++ /dev/null @@ -1,25 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -def keystore = "$rootDir/samples/certificates/server.jks" -def password = 'password' - -gretty { - httpsEnabled = true - httpsPort = 8443 - sslKeyStorePath = keystore - sslKeyStorePassword = password - jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", - "-Djavax.net.ssl.trustStorePassword=${password}", - "-Dcas.server.host=localhost:$httpsPort", - "-Dcas.service.host=localhost:$httpsPort"] -} - -farm { - webapp ':spring-security-samples-xml-casserver' - webapp ':spring-security-samples-xml-cassample' -} - -task cas(dependsOn: 'farmRunWar') { - group 'Gretty tasks' - description 'Run CAS Server and Sample' -} diff --git a/samples/xml/contacts/client/client.properties b/samples/xml/contacts/client/client.properties deleted file mode 100644 index 9f3feee9ea..0000000000 --- a/samples/xml/contacts/client/client.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Properties file with server URL settings for remote access. -# Applied by PropertyPlaceholderConfigurer from "clientContext.xml". -# - -serverName=localhost -httpPort=8080 -contextPath=/spring-security-sample-contacts-filter -rmiPort=1099 diff --git a/samples/xml/contacts/client/clientContext.xml b/samples/xml/contacts/client/clientContext.xml deleted file mode 100644 index f30d1728a5..0000000000 --- a/samples/xml/contacts/client/clientContext.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - client.properties - - - - - - - - - - sample.contact.ContactManager - - - http://${serverName}:${httpPort}${contextPath}/remoting/ContactManager-httpinvoker - - - - - - - - - - - - - - diff --git a/samples/xml/contacts/spring-security-samples-xml-contacts.gradle b/samples/xml/contacts/spring-security-samples-xml-contacts.gradle deleted file mode 100644 index 46f2eccde5..0000000000 --- a/samples/xml/contacts/spring-security-samples-xml-contacts.gradle +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-acl') - compile project(':spring-security-core') - compile slf4jDependencies - compile 'org.springframework:spring-aop' - compile 'org.springframework:spring-beans' - compile 'org.springframework:spring-context' - compile 'org.springframework:spring-jdbc' - compile 'org.springframework:spring-tx' - compile 'org.springframework:spring-web' - compile 'org.springframework:spring-webmvc' - - providedCompile 'javax.servlet:javax.servlet-api' - - runtime project(':spring-security-config') - runtime project(':spring-security-taglibs') - runtime project(':spring-security-web') - runtime jstlDependencies - runtime 'ch.qos.logback:logback-classic' - runtime 'net.sf.ehcache:ehcache' - runtime 'org.hsqldb:hsqldb' - runtime 'org.slf4j:jcl-over-slf4j' - runtime 'org.springframework:spring-context-support' - - integrationTestCompile seleniumDependencies -} diff --git a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/ContactsTests.java b/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/ContactsTests.java deleted file mode 100644 index db1e4e2e33..0000000000 --- a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/ContactsTests.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import org.springframework.security.samples.pages.ContactsPage; -import org.springframework.security.samples.pages.HomePage; - -/** - * @author Michael Simons - */ -public class ContactsTests { - private WebDriver driver; - - private int port; - - @Before - public void setup() { - this.port = Integer.parseInt(System.getProperty("app.httpPort")); - this.driver = new HtmlUnitDriver(); - } - - @After - public void tearDown() { - this.driver.quit(); - } - - @Test - public void accessHomePageWithUnauthenticatedUserSuccess() { - final HomePage homePage = HomePage.to(this.driver, this.port); - homePage.assertAt(); - } - - @Test - public void authenticatedUserCanAddContacts() { - final String name = "Rob Winch"; - final String email = "rob@example.com"; - - // @formatter:off - ContactsPage.accessManagePageWithUnauthenticatedUser(this.driver, this.port) - .sendsToLoginPage() - .username("rod") - .password("koala") - .submit() - .isAtContactsPage() - .addContact() - .name(name) - .email(email) - .submit() - .andHasContact(name, email) - .delete() - .andConfirmDeletion() - .isAtContactsPage() - .andConctactHasBeenRemoved(name, email); - // @formatter:on - } - - - @Test - public void authenticatedUserLogsOut() { - // @formatter:off - final HomePage homePage = ContactsPage.accessManagePageWithUnauthenticatedUser(this.driver, this.port) - .sendsToLoginPage() - .username("rod") - .password("koala") - .submit() - .isAtContactsPage() - .logout(); - // @formatter:on - homePage.assertAt(); - - ContactsPage.accessManagePageWithUnauthenticatedUser(this.driver, this.port) - .sendsToLoginPage(); - } -} diff --git a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/AddPage.java b/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/AddPage.java deleted file mode 100644 index 303e426375..0000000000 --- a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/AddPage.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Michael Simons - */ -public class AddPage { - - private final WebDriver webDriver; - - private final AddForm addForm; - - public AddPage(WebDriver webDriver) { - this.webDriver = webDriver; - this.addForm = PageFactory.initElements(this.webDriver, AddForm.class); - } - - AddForm addForm() { - assertThat(this.webDriver.getTitle()).isEqualTo("Add New Contact"); - return this.addForm; - } - - public static class AddForm { - private WebDriver webDriver; - private WebElement name; - private WebElement email; - @FindBy(css = "input[type=submit]") - private WebElement submit; - - public AddForm(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public AddForm name(String name) { - this.name.sendKeys(name); - return this; - } - - public AddForm email(String email) { - this.email.sendKeys(email); - return this; - } - - public ContactsPage submit() { - this.submit.click(); - return PageFactory.initElements(this.webDriver, ContactsPage.class); - } - } -} diff --git a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/ContactsPage.java b/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/ContactsPage.java deleted file mode 100644 index a6b4ff5d6f..0000000000 --- a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/ContactsPage.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; -import org.springframework.security.samples.pages.AddPage.AddForm; - -import java.util.List; -import java.util.function.Predicate; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * The contacts / manage page. - * - * @author Michael Simons - */ -public class ContactsPage { - public static LoginPage accessManagePageWithUnauthenticatedUser(WebDriver driver, int port) { - driver.get("http://localhost:" + port +"/secure/"); - return PageFactory.initElements(driver, LoginPage.class); - } - - private final WebDriver webDriver; - - @FindBy(linkText = "Add") - private WebElement a; - - @FindBy(css = "table tr") - private List contacts; - - @FindBy(xpath = "//input[@type='submit' and @value='Logoff']") - private WebElement logout; - - public ContactsPage(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public ContactsPage isAtContactsPage() { - assertThat(this.webDriver.getTitle()).isEqualTo("Your Contacts"); - return this; - } - - public AddForm addContact() { - a.click(); - final AddPage addPage = PageFactory.initElements(this.webDriver, AddPage.class); - return addPage.addForm(); - } - - Predicate byEmail(final String val) { - return (e) -> e.findElements(By.xpath("td[position()=3 and normalize-space()='" + val + "']")).size() == 1; - } - - Predicate byName(final String val) { - return (e) -> e.findElements(By.xpath("td[position()=2 and normalize-space()='" + val + "']")).size() == 1; - } - - public DeleteContactLink andHasContact(final String name, final String email) { - return this.contacts.stream() - .filter(byEmail(email).and(byName(name))) - .map((e) -> e.findElement(By.cssSelector("td:nth-child(4) > a"))) - .findFirst() - .map((e) -> new DeleteContactLink(webDriver, e)) - .get(); - } - - public ContactsPage andConctactHasBeenRemoved(final String name, final String email) { - assertThat(this.contacts.stream() - .filter(byEmail(email).and(byName(name))) - .findAny()).isEmpty(); - return this; - } - - public HomePage logout() { - this.logout.click(); - return PageFactory.initElements(this.webDriver, HomePage.class); - } - - public static class DeleteContactLink { - - private final WebDriver webDriver; - - private final WebElement a; - - public DeleteContactLink(WebDriver webDriver, WebElement a) { - this.webDriver = webDriver; - this.a = a; - } - - public DeleteConfirmationPage delete() { - this.a.click(); - return PageFactory.initElements(this.webDriver, DeleteConfirmationPage.class); - } - } - - public static class DeleteConfirmationPage { - private final WebDriver webDriver; - - @FindBy(linkText = "Manage") - private WebElement a; - - - public DeleteConfirmationPage(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public ContactsPage andConfirmDeletion() { - assertThat(this.webDriver.getTitle()).isEqualTo("Deletion completed"); - this.a.click(); - return PageFactory.initElements(this.webDriver, ContactsPage.class); - } - } -} diff --git a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java b/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java deleted file mode 100644 index 8c985c8d83..0000000000 --- a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; -import org.springframework.security.samples.pages.LoginPage; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * The home page. - * - * @author Michael Simons - */ -public class HomePage { - - public static HomePage to(WebDriver driver, int port) { - driver.get("http://localhost:" + port +"/"); - return PageFactory.initElements(driver, HomePage.class); - } - - private final WebDriver webDriver; - - @FindBy(css = "p") - private WebElement message; - - @FindBy(css = "input[type=submit]") - private WebElement logoutButton; - - public HomePage(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public Content assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Contacts Security Demo"); - return PageFactory.initElements(this.webDriver, Content.class); - } - - public LoginPage logout() { - this.logoutButton.submit(); - return PageFactory.initElements(this.webDriver, LoginPage.class); - } - - public static class Content { - @FindBy(css = "p") - private WebElement message; - - public Content andTheUserNameIsDisplayed() { - assertThat(message.getText()).isEqualTo("Hello user"); - return this; - } - } -} diff --git a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java b/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java deleted file mode 100644 index d0f9efefbf..0000000000 --- a/samples/xml/contacts/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * The login page. - * - * @author Michael Simons - */ -public class LoginPage { - - private final WebDriver webDriver; - - private final LoginForm loginForm; - - public LoginPage(WebDriver webDriver) { - this.webDriver = webDriver; - this.loginForm = PageFactory.initElements(this.webDriver, LoginForm.class); - } - - public LoginForm sendsToLoginPage() { - assertThat(this.webDriver.getTitle()).isEqualTo("Login"); - return this.loginForm; - } - - public static class LoginForm { - private WebDriver webDriver; - private WebElement username; - private WebElement password; - @FindBy(css = "input[type=submit]") - private WebElement submit; - - public LoginForm(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public LoginForm username(String username) { - this.username.sendKeys(username); - return this; - } - - public LoginForm password(String password) { - this.password.sendKeys(password); - return this; - } - - public ContactsPage submit() { - this.submit.click(); - return PageFactory.initElements(this.webDriver, ContactsPage.class); - } - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/AddDeleteContactController.java b/samples/xml/contacts/src/main/java/sample/contact/AddDeleteContactController.java deleted file mode 100644 index 8c6ca3c256..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/AddDeleteContactController.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.contact; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Validator; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - -/** - * - * @author Luke Taylor - * @since 3.0 - */ -@Controller -public class AddDeleteContactController { - @Autowired - private ContactManager contactManager; - private final Validator validator = new WebContactValidator(); - - /** - * Displays the "add contact" form. - */ - @RequestMapping(value = "/secure/add.htm", method = RequestMethod.GET) - public ModelAndView addContactDisplay() { - return new ModelAndView("add", "webContact", new WebContact()); - } - - @InitBinder - public void initBinder(WebDataBinder binder) { - System.out.println("A binder for object: " + binder.getObjectName()); - } - - /** - * Handles the submission of the contact form, creating a new instance if the username - * and email are valid. - */ - @RequestMapping(value = "/secure/add.htm", method = RequestMethod.POST) - public String addContact(WebContact form, BindingResult result) { - validator.validate(form, result); - - if (result.hasErrors()) { - return "add"; - } - - Contact contact = new Contact(form.getName(), form.getEmail()); - contactManager.create(contact); - - return "redirect:/secure/index.htm"; - } - - @RequestMapping(value = "/secure/del.htm", method = RequestMethod.GET) - public ModelAndView delContact(@RequestParam("contactId") int contactId) { - Contact contact = contactManager.getById((long) contactId); - contactManager.delete(contact); - - return new ModelAndView("deleted", "contact", contact); - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/AddPermission.java b/samples/xml/contacts/src/main/java/sample/contact/AddPermission.java deleted file mode 100644 index 254841e42e..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/AddPermission.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -import org.springframework.security.acls.domain.BasePermission; - -/** - * Model object for add permission use case. - * - * @author Ben Alex - */ -public class AddPermission { - - - public Contact contact; - public Integer permission = BasePermission.READ.getMask(); - public String recipient; - - - public Contact getContact() { - return contact; - } - - public Integer getPermission() { - return permission; - } - - public String getRecipient() { - return recipient; - } - - public void setContact(Contact contact) { - this.contact = contact; - } - - public void setPermission(Integer permission) { - this.permission = permission; - } - - public void setRecipient(String recipient) { - this.recipient = recipient; - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java b/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java deleted file mode 100644 index f56b7647e2..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -import org.springframework.security.acls.domain.BasePermission; - -import org.springframework.validation.Errors; -import org.springframework.validation.ValidationUtils; -import org.springframework.validation.Validator; - -/** - * Validates {@link AddPermission}. - * - * @author Ben Alex - */ -public class AddPermissionValidator implements Validator { - - - @SuppressWarnings("unchecked") - public boolean supports(Class clazz) { - return clazz.equals(AddPermission.class); - } - - public void validate(Object obj, Errors errors) { - AddPermission addPermission = (AddPermission) obj; - - ValidationUtils.rejectIfEmptyOrWhitespace(errors, "permission", "err.permission", - "Permission is required. *"); - ValidationUtils.rejectIfEmptyOrWhitespace(errors, "recipient", "err.recipient", - "Recipient is required. *"); - - if (addPermission.getPermission() != null) { - int permission = addPermission.getPermission(); - - if ((permission != BasePermission.ADMINISTRATION.getMask()) - && (permission != BasePermission.READ.getMask()) - && (permission != BasePermission.DELETE.getMask())) { - errors.rejectValue("permission", "err.permission.invalid", - "The indicated permission is invalid. *"); - } - } - - if (addPermission.getRecipient() != null) { - if (addPermission.getRecipient().length() > 100) { - errors.rejectValue("recipient", "err.recipient.length", - "The recipient is too long (maximum 100 characters). *"); - } - } - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/AdminPermissionController.java b/samples/xml/contacts/src/main/java/sample/contact/AdminPermissionController.java deleted file mode 100644 index 7f048f1666..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/AdminPermissionController.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.contact; - -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.MessageSource; -import org.springframework.context.MessageSourceAware; -import org.springframework.context.support.MessageSourceAccessor; -import org.springframework.dao.DataAccessException; -import org.springframework.security.acls.domain.BasePermission; -import org.springframework.security.acls.domain.DefaultPermissionFactory; -import org.springframework.security.acls.domain.ObjectIdentityImpl; -import org.springframework.security.acls.domain.PermissionFactory; -import org.springframework.security.acls.domain.PrincipalSid; -import org.springframework.security.acls.model.Acl; -import org.springframework.security.acls.model.AclService; -import org.springframework.security.acls.model.Permission; -import org.springframework.security.acls.model.Sid; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Validator; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.SessionAttributes; -import org.springframework.web.servlet.ModelAndView; - -/** - * Web controller to handle Permission administration functions - adding and - * deleting permissions for contacts. - * - * @author Luke Taylor - * @since 3.0 - */ -@Controller -@SessionAttributes("addPermission") -public final class AdminPermissionController implements MessageSourceAware { - @Autowired - private AclService aclService; - @Autowired - private ContactManager contactManager; - private MessageSourceAccessor messages; - private final Validator addPermissionValidator = new AddPermissionValidator(); - private final PermissionFactory permissionFactory = new DefaultPermissionFactory(); - - /** - * Displays the permission admin page for a particular contact. - */ - @RequestMapping(value = "/secure/adminPermission.htm", method = RequestMethod.GET) - public ModelAndView displayAdminPage(@RequestParam("contactId") int contactId) { - Contact contact = contactManager.getById((long) contactId); - Acl acl = aclService.readAclById(new ObjectIdentityImpl(contact)); - - Map model = new HashMap<>(); - model.put("contact", contact); - model.put("acl", acl); - - return new ModelAndView("adminPermission", "model", model); - } - - /** - * Displays the "add permission" page for a contact. - */ - @RequestMapping(value = "/secure/addPermission.htm", method = RequestMethod.GET) - public ModelAndView displayAddPermissionPageForContact( - @RequestParam("contactId") long contactId) { - Contact contact = contactManager.getById(contactId); - - AddPermission addPermission = new AddPermission(); - addPermission.setContact(contact); - - Map model = new HashMap<>(); - model.put("addPermission", addPermission); - model.put("recipients", listRecipients()); - model.put("permissions", listPermissions()); - - return new ModelAndView("addPermission", model); - } - - @InitBinder("addPermission") - public void initBinder(WebDataBinder binder) { - binder.setAllowedFields("recipient", "permission"); - } - - /** - * Handles submission of the "add permission" form. - */ - @RequestMapping(value = "/secure/addPermission.htm", method = RequestMethod.POST) - public String addPermission(AddPermission addPermission, BindingResult result, - ModelMap model) { - addPermissionValidator.validate(addPermission, result); - - if (result.hasErrors()) { - model.put("recipients", listRecipients()); - model.put("permissions", listPermissions()); - - return "addPermission"; - } - - PrincipalSid sid = new PrincipalSid(addPermission.getRecipient()); - Permission permission = permissionFactory.buildFromMask(addPermission - .getPermission()); - - try { - contactManager.addPermission(addPermission.getContact(), sid, permission); - } - catch (DataAccessException existingPermission) { - existingPermission.printStackTrace(); - result.rejectValue("recipient", "err.recipientExistsForContact", - "Addition failure."); - - model.put("recipients", listRecipients()); - model.put("permissions", listPermissions()); - return "addPermission"; - } - - return "redirect:/secure/index.htm"; - } - - /** - * Deletes a permission - */ - @RequestMapping(value = "/secure/deletePermission.htm") - public ModelAndView deletePermission(@RequestParam("contactId") long contactId, - @RequestParam("sid") String sid, @RequestParam("permission") int mask) { - - Contact contact = contactManager.getById(contactId); - - Sid sidObject = new PrincipalSid(sid); - Permission permission = permissionFactory.buildFromMask(mask); - - contactManager.deletePermission(contact, sidObject, permission); - - Map model = new HashMap<>(); - model.put("contact", contact); - model.put("sid", sidObject); - model.put("permission", permission); - - return new ModelAndView("deletePermission", "model", model); - } - - private Map listPermissions() { - Map map = new LinkedHashMap<>(); - map.put(BasePermission.ADMINISTRATION.getMask(), - messages.getMessage("select.administer", "Administer")); - map.put(BasePermission.READ.getMask(), - messages.getMessage("select.read", "Read")); - map.put(BasePermission.DELETE.getMask(), - messages.getMessage("select.delete", "Delete")); - - return map; - } - - private Map listRecipients() { - Map map = new LinkedHashMap<>(); - map.put("", messages.getMessage("select.pleaseSelect", "-- please select --")); - - for (String recipient : contactManager.getAllRecipients()) { - map.put(recipient, recipient); - } - - return map; - } - - public void setMessageSource(MessageSource messageSource) { - this.messages = new MessageSourceAccessor(messageSource); - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/ClientApplication.java b/samples/xml/contacts/src/main/java/sample/contact/ClientApplication.java deleted file mode 100644 index 1203b77e1a..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/ClientApplication.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.ListableBeanFactory; -import org.springframework.context.support.FileSystemXmlApplicationContext; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.util.StopWatch; - -/** - * Demonstrates accessing the {@link ContactManager} via remoting protocols. - *

    - * Based on Spring's JPetStore sample, written by Juergen Hoeller. - * - * @author Ben Alex - */ -public class ClientApplication { - - - private final ListableBeanFactory beanFactory; - - - public ClientApplication(ListableBeanFactory beanFactory) { - this.beanFactory = beanFactory; - } - - - public void invokeContactManager(Authentication authentication, int nrOfCalls) { - StopWatch stopWatch = new StopWatch(nrOfCalls + " ContactManager call(s)"); - Map contactServices = this.beanFactory.getBeansOfType( - ContactManager.class, true, true); - - SecurityContextHolder.getContext().setAuthentication(authentication); - - for (Map.Entry entry : contactServices.entrySet()) { - String beanName = entry.getKey(); - ContactManager remoteContactManager = entry.getValue(); - Object object = this.beanFactory.getBean("&" + beanName); - - try { - System.out.println("Trying to find setUsername(String) method on: " - + object.getClass().getName()); - - Method method = object.getClass().getMethod("setUsername", - new Class[] { String.class }); - System.out.println("Found; Trying to setUsername(String) to " - + authentication.getPrincipal()); - method.invoke(object, authentication.getPrincipal()); - } - catch (NoSuchMethodException ignored) { - System.out - .println("This client proxy factory does not have a setUsername(String) method"); - } - catch (IllegalAccessException | InvocationTargetException ignored) { - ignored.printStackTrace(); - } - - try { - System.out.println("Trying to find setPassword(String) method on: " - + object.getClass().getName()); - - Method method = object.getClass().getMethod("setPassword", - new Class[] { String.class }); - method.invoke(object, authentication.getCredentials()); - System.out.println("Found; Trying to setPassword(String) to " - + authentication.getCredentials()); - } - catch (NoSuchMethodException ignored) { - System.out - .println("This client proxy factory does not have a setPassword(String) method"); - } - catch (IllegalAccessException | InvocationTargetException ignored) { - } - - System.out.println("Calling ContactManager '" + beanName + "'"); - - stopWatch.start(beanName); - - List contacts = null; - - for (int i = 0; i < nrOfCalls; i++) { - contacts = remoteContactManager.getAll(); - } - - stopWatch.stop(); - - if (contacts.size() != 0) { - for (Contact contact : contacts) { - System.out.println("Contact: " + contact); - } - } - else { - System.out.println("No contacts found which this user has permission to"); - } - - System.out.println(); - System.out.println(stopWatch.prettyPrint()); - } - - SecurityContextHolder.clearContext(); - } - - public static void main(String[] args) { - String username = System.getProperty("username", ""); - String password = System.getProperty("password", ""); - String nrOfCallsString = System.getProperty("nrOfCalls", ""); - - if ("".equals(username) || "".equals(password)) { - System.out - .println("You need to specify the user ID to use, the password to use, and optionally a number of calls " - + "using the username, password, and nrOfCalls system properties respectively. eg for user rod, " - + "use: -Dusername=rod -Dpassword=koala' for a single call per service and " - + "use: -Dusername=rod -Dpassword=koala -DnrOfCalls=10 for ten calls per service."); - System.exit(-1); - } - else { - int nrOfCalls = 1; - - if (!"".equals(nrOfCallsString)) { - nrOfCalls = Integer.parseInt(nrOfCallsString); - } - - ListableBeanFactory beanFactory = new FileSystemXmlApplicationContext( - "clientContext.xml"); - ClientApplication client = new ClientApplication(beanFactory); - - client.invokeContactManager(new UsernamePasswordAuthenticationToken(username, - password), nrOfCalls); - System.exit(0); - } - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/Contact.java b/samples/xml/contacts/src/main/java/sample/contact/Contact.java deleted file mode 100644 index ec719e856b..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/Contact.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -import java.io.Serializable; - -/** - * Represents a contact. - * - * @author Ben Alex - */ -public class Contact implements Serializable { - - - private Long id; - private String email; - private String name; - - - public Contact(String name, String email) { - this.name = name; - this.email = email; - } - - public Contact() { - } - - - /** - * @return Returns the email. - */ - public String getEmail() { - return email; - } - - /** - * @return Returns the id. - */ - public Long getId() { - return id; - } - - /** - * @return Returns the name. - */ - public String getName() { - return name; - } - - /** - * @param email The email to set. - */ - public void setEmail(String email) { - this.email = email; - } - - public void setId(Long id) { - this.id = id; - } - - /** - * @param name The name to set. - */ - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(super.toString() + ": "); - sb.append("Id: " + this.getId() + "; "); - sb.append("Name: " + this.getName() + "; "); - sb.append("Email: " + this.getEmail()); - - return sb.toString(); - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java b/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java deleted file mode 100644 index 9f245582d2..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -import java.util.List; - -/** - * Provides access to the application's persistence layer. - * - * @author Ben Alex - */ -public interface ContactDao { - - - void create(Contact contact); - - void delete(Long contactId); - - List findAll(); - - List findAllPrincipals(); - - List findAllRoles(); - - Contact getById(Long id); - - void update(Contact contact); -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java b/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java deleted file mode 100644 index f2b8029516..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; - -import org.springframework.jdbc.core.support.JdbcDaoSupport; - -/** - * Base implementation of {@link ContactDao} that uses Spring's JdbcTemplate. - * - * @author Ben Alex - * @author Luke Taylor - */ -public class ContactDaoSpring extends JdbcDaoSupport implements ContactDao { - - - public void create(final Contact contact) { - getJdbcTemplate().update("insert into contacts values (?, ?, ?)", - (ps) -> { - ps.setLong(1, contact.getId()); - ps.setString(2, contact.getName()); - ps.setString(3, contact.getEmail()); - }); - } - - public void delete(final Long contactId) { - getJdbcTemplate().update("delete from contacts where id = ?", - (ps) -> ps.setLong(1, contactId)); - } - - public void update(final Contact contact) { - getJdbcTemplate().update( - "update contacts set contact_name = ?, address = ? where id = ?", - (ps) -> { - ps.setString(1, contact.getName()); - ps.setString(2, contact.getEmail()); - ps.setLong(3, contact.getId()); - }); - } - - public List findAll() { - return getJdbcTemplate().query( - "select id, contact_name, email from contacts order by id", - (rs, rowNum) -> mapContact(rs)); - } - - public List findAllPrincipals() { - return getJdbcTemplate().queryForList( - "select username from users order by username", String.class); - } - - public List findAllRoles() { - return getJdbcTemplate().queryForList( - "select distinct authority from authorities order by authority", - String.class); - } - - public Contact getById(Long id) { - List list = getJdbcTemplate().query( - "select id, contact_name, email from contacts where id = ? order by id", - (rs, rowNum) -> mapContact(rs), id); - - if (list.size() == 0) { - return null; - } - else { - return list.get(0); - } - } - - private Contact mapContact(ResultSet rs) throws SQLException { - Contact contact = new Contact(); - contact.setId(rs.getLong("id")); - contact.setName(rs.getString("contact_name")); - contact.setEmail(rs.getString("email")); - - return contact; - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java b/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java deleted file mode 100644 index 5d3ff14a47..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -import org.springframework.security.access.prepost.PostFilter; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.acls.model.Permission; -import org.springframework.security.acls.model.Sid; - -import java.util.List; - -/** - * Interface for the application's services layer. - * - * @author Ben Alex - */ -public interface ContactManager { - - @PreAuthorize("hasPermission(#contact, admin)") - void addPermission(Contact contact, Sid recipient, Permission permission); - - @PreAuthorize("hasPermission(#contact, admin)") - void deletePermission(Contact contact, Sid recipient, Permission permission); - - @PreAuthorize("hasRole('ROLE_USER')") - void create(Contact contact); - - @PreAuthorize("hasPermission(#contact, 'delete') or hasPermission(#contact, admin)") - void delete(Contact contact); - - @PreAuthorize("hasRole('ROLE_USER')") - @PostFilter("hasPermission(filterObject, 'read') or hasPermission(filterObject, admin)") - List getAll(); - - @PreAuthorize("hasRole('ROLE_USER')") - List getAllRecipients(); - - @PreAuthorize("hasPermission(#id, 'sample.contact.Contact', read) or " - + "hasPermission(#id, 'sample.contact.Contact', admin)") - Contact getById(Long id); - - Contact getRandomContact(); -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactManagerBackend.java b/samples/xml/contacts/src/main/java/sample/contact/ContactManagerBackend.java deleted file mode 100644 index 3ba1a7dbf2..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactManagerBackend.java +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -import org.springframework.security.acls.domain.BasePermission; -import org.springframework.security.acls.domain.ObjectIdentityImpl; -import org.springframework.security.acls.domain.PrincipalSid; -import org.springframework.security.acls.model.AccessControlEntry; -import org.springframework.security.acls.model.MutableAcl; -import org.springframework.security.acls.model.MutableAclService; -import org.springframework.security.acls.model.NotFoundException; -import org.springframework.security.acls.model.ObjectIdentity; -import org.springframework.security.acls.model.Permission; -import org.springframework.security.acls.model.Sid; - -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; - -import org.springframework.transaction.annotation.Transactional; - -import org.springframework.beans.factory.InitializingBean; - -import org.springframework.context.support.ApplicationObjectSupport; - -import org.springframework.util.Assert; - -import java.util.List; -import java.util.Random; - -/** - * Concrete implementation of {@link ContactManager}. - * - * @author Ben Alex - */ -@Transactional -public class ContactManagerBackend extends ApplicationObjectSupport implements - ContactManager, InitializingBean { - - - private ContactDao contactDao; - private MutableAclService mutableAclService; - private int counter = 1000; - - - public void afterPropertiesSet() { - Assert.notNull(contactDao, "contactDao required"); - Assert.notNull(mutableAclService, "mutableAclService required"); - } - - public void addPermission(Contact contact, Sid recipient, Permission permission) { - MutableAcl acl; - ObjectIdentity oid = new ObjectIdentityImpl(Contact.class, contact.getId()); - - try { - acl = (MutableAcl) mutableAclService.readAclById(oid); - } - catch (NotFoundException nfe) { - acl = mutableAclService.createAcl(oid); - } - - acl.insertAce(acl.getEntries().size(), permission, recipient, true); - mutableAclService.updateAcl(acl); - - logger.debug("Added permission " + permission + " for Sid " + recipient - + " contact " + contact); - } - - public void create(Contact contact) { - // Create the Contact itself - contact.setId((long) counter++); - contactDao.create(contact); - - // Grant the current principal administrative permission to the contact - addPermission(contact, new PrincipalSid(getUsername()), - BasePermission.ADMINISTRATION); - - if (logger.isDebugEnabled()) { - logger.debug("Created contact " + contact - + " and granted admin permission to recipient " + getUsername()); - } - } - - public void delete(Contact contact) { - contactDao.delete(contact.getId()); - - // Delete the ACL information as well - ObjectIdentity oid = new ObjectIdentityImpl(Contact.class, contact.getId()); - mutableAclService.deleteAcl(oid, false); - - if (logger.isDebugEnabled()) { - logger.debug("Deleted contact " + contact + " including ACL permissions"); - } - } - - public void deletePermission(Contact contact, Sid recipient, Permission permission) { - ObjectIdentity oid = new ObjectIdentityImpl(Contact.class, contact.getId()); - MutableAcl acl = (MutableAcl) mutableAclService.readAclById(oid); - - // Remove all permissions associated with this particular recipient (string - // equality to KISS) - List entries = acl.getEntries(); - - for (int i = 0; i < entries.size(); i++) { - if (entries.get(i).getSid().equals(recipient) - && entries.get(i).getPermission().equals(permission)) { - acl.deleteAce(i); - } - } - - mutableAclService.updateAcl(acl); - - if (logger.isDebugEnabled()) { - logger.debug("Deleted contact " + contact + " ACL permissions for recipient " - + recipient); - } - } - - @Transactional(readOnly = true) - public List getAll() { - logger.debug("Returning all contacts"); - - return contactDao.findAll(); - } - - @Transactional(readOnly = true) - public List getAllRecipients() { - logger.debug("Returning all recipients"); - - return contactDao.findAllPrincipals(); - } - - @Transactional(readOnly = true) - public Contact getById(Long id) { - if (logger.isDebugEnabled()) { - logger.debug("Returning contact with id: " + id); - } - - return contactDao.getById(id); - } - - /** - * This is a public method. - */ - @Transactional(readOnly = true) - public Contact getRandomContact() { - logger.debug("Returning random contact"); - - Random rnd = new Random(); - List contacts = contactDao.findAll(); - int getNumber = rnd.nextInt(contacts.size()); - - return contacts.get(getNumber); - } - - protected String getUsername() { - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - - if (auth.getPrincipal() instanceof UserDetails) { - return ((UserDetails) auth.getPrincipal()).getUsername(); - } - else { - return auth.getPrincipal().toString(); - } - } - - public void setContactDao(ContactDao contactDao) { - this.contactDao = contactDao; - } - - public void setMutableAclService(MutableAclService mutableAclService) { - this.mutableAclService = mutableAclService; - } - - public void update(Contact contact) { - contactDao.update(contact); - - logger.debug("Updated contact " + contact); - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java b/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java deleted file mode 100644 index 2315426909..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java +++ /dev/null @@ -1,276 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -import java.util.Random; - -import javax.sql.DataSource; - -import org.springframework.beans.factory.InitializingBean; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.security.acls.domain.AclImpl; -import org.springframework.security.acls.domain.BasePermission; -import org.springframework.security.acls.domain.ObjectIdentityImpl; -import org.springframework.security.acls.domain.PrincipalSid; -import org.springframework.security.acls.model.MutableAcl; -import org.springframework.security.acls.model.MutableAclService; -import org.springframework.security.acls.model.ObjectIdentity; -import org.springframework.security.acls.model.Permission; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.support.TransactionTemplate; -import org.springframework.util.Assert; - -/** - * Populates the Contacts in-memory database with contact and ACL information. - * - * @author Ben Alex - */ -public class DataSourcePopulator implements InitializingBean { - - - JdbcTemplate template; - private MutableAclService mutableAclService; - final Random rnd = new Random(); - TransactionTemplate tt; - final String[] firstNames = { "Bob", "Mary", "James", "Jane", "Kristy", "Kirsty", - "Kate", "Jeni", "Angela", "Melanie", "Kent", "William", "Geoff", "Jeff", - "Adrian", "Amanda", "Lisa", "Elizabeth", "Prue", "Richard", "Darin", - "Phillip", "Michael", "Belinda", "Samantha", "Brian", "Greg", "Matthew" }; - final String[] lastNames = { "Smith", "Williams", "Jackson", "Rictor", "Nelson", - "Fitzgerald", "McAlpine", "Sutherland", "Abbott", "Hall", "Edwards", "Gates", - "Black", "Brown", "Gray", "Marwell", "Booch", "Johnson", "McTaggart", - "Parklin", "Findlay", "Robinson", "Giugni", "Lang", "Chi", "Carmichael" }; - private int createEntities = 50; - - - public void afterPropertiesSet() { - Assert.notNull(mutableAclService, "mutableAclService required"); - Assert.notNull(template, "dataSource required"); - Assert.notNull(tt, "platformTransactionManager required"); - - // Set a user account that will initially own all the created data - Authentication authRequest = new UsernamePasswordAuthenticationToken("rod", - "koala", AuthorityUtils.createAuthorityList("ROLE_IGNORED")); - SecurityContextHolder.getContext().setAuthentication(authRequest); - - try { - template.execute("DROP TABLE CONTACTS"); - template.execute("DROP TABLE AUTHORITIES"); - template.execute("DROP TABLE USERS"); - template.execute("DROP TABLE ACL_ENTRY"); - template.execute("DROP TABLE ACL_OBJECT_IDENTITY"); - template.execute("DROP TABLE ACL_CLASS"); - template.execute("DROP TABLE ACL_SID"); - } - catch (Exception e) { - System.out.println("Failed to drop tables: " + e.getMessage()); - } - - template.execute("CREATE TABLE ACL_SID(" - + "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY," - + "PRINCIPAL BOOLEAN NOT NULL," + "SID VARCHAR_IGNORECASE(100) NOT NULL," - + "CONSTRAINT UNIQUE_UK_1 UNIQUE(SID,PRINCIPAL));"); - template.execute("CREATE TABLE ACL_CLASS(" - + "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY," - + "CLASS VARCHAR_IGNORECASE(100) NOT NULL," - + "CLASS_ID_TYPE VARCHAR_IGNORECASE(100)," - + "CONSTRAINT UNIQUE_UK_2 UNIQUE(CLASS));"); - template.execute("CREATE TABLE ACL_OBJECT_IDENTITY(" - + "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY," - + "OBJECT_ID_CLASS BIGINT NOT NULL," - + "OBJECT_ID_IDENTITY VARCHAR_IGNORECASE(36) NOT NULL," - + "PARENT_OBJECT BIGINT," - + "OWNER_SID BIGINT," - + "ENTRIES_INHERITING BOOLEAN NOT NULL," - + "CONSTRAINT UNIQUE_UK_3 UNIQUE(OBJECT_ID_CLASS,OBJECT_ID_IDENTITY)," - + "CONSTRAINT FOREIGN_FK_1 FOREIGN KEY(PARENT_OBJECT)REFERENCES ACL_OBJECT_IDENTITY(ID)," - + "CONSTRAINT FOREIGN_FK_2 FOREIGN KEY(OBJECT_ID_CLASS)REFERENCES ACL_CLASS(ID)," - + "CONSTRAINT FOREIGN_FK_3 FOREIGN KEY(OWNER_SID)REFERENCES ACL_SID(ID));"); - template.execute("CREATE TABLE ACL_ENTRY(" - + "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY," - + "ACL_OBJECT_IDENTITY BIGINT NOT NULL,ACE_ORDER INT NOT NULL,SID BIGINT NOT NULL," - + "MASK INTEGER NOT NULL,GRANTING BOOLEAN NOT NULL,AUDIT_SUCCESS BOOLEAN NOT NULL," - + "AUDIT_FAILURE BOOLEAN NOT NULL,CONSTRAINT UNIQUE_UK_4 UNIQUE(ACL_OBJECT_IDENTITY,ACE_ORDER)," - + "CONSTRAINT FOREIGN_FK_4 FOREIGN KEY(ACL_OBJECT_IDENTITY) REFERENCES ACL_OBJECT_IDENTITY(ID)," - + "CONSTRAINT FOREIGN_FK_5 FOREIGN KEY(SID) REFERENCES ACL_SID(ID));"); - - template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);"); - template.execute("CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));"); - template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);"); - - template.execute("CREATE TABLE CONTACTS(ID BIGINT NOT NULL PRIMARY KEY, CONTACT_NAME VARCHAR_IGNORECASE(50) NOT NULL, EMAIL VARCHAR_IGNORECASE(50) NOT NULL)"); - - /* - * Passwords encoded using MD5, NOT in Base64 format, with null as salt Encoded - * password for rod is "koala" Encoded password for dianne is "emu" Encoded - * password for scott is "wombat" Encoded password for peter is "opal" (but user - * is disabled) Encoded password for bill is "wombat" Encoded password for bob is - * "wombat" Encoded password for jane is "wombat" - */ - template.execute("INSERT INTO USERS VALUES('rod','$2a$10$75pBjapg4Nl8Pzd.3JRnUe7PDJmk9qBGwNEJDAlA3V.dEJxcDKn5O',TRUE);"); - template.execute("INSERT INTO USERS VALUES('dianne','$2a$04$bCMEyxrdF/7sgfUiUJ6Ose2vh9DAMaVBldS1Bw2fhi1jgutZrr9zm',TRUE);"); - template.execute("INSERT INTO USERS VALUES('scott','$2a$06$eChwvzAu3TSexnC3ynw4LOSw1qiEbtNItNeYv5uI40w1i3paoSfLu',TRUE);"); - template.execute("INSERT INTO USERS VALUES('peter','$2a$04$8.H8bCMROLF4CIgd7IpeQ.tcBXLP5w8iplO0n.kCIkISwrIgX28Ii',FALSE);"); - template.execute("INSERT INTO USERS VALUES('bill','$2a$04$8.H8bCMROLF4CIgd7IpeQ.3khQlPVNWbp8kzSQqidQHGFurim7P8O',TRUE);"); - template.execute("INSERT INTO USERS VALUES('bob','$2a$06$zMgxlMf01SfYNcdx7n4NpeFlAGU8apCETz/i2C7VlYWu6IcNyn4Ay',TRUE);"); - template.execute("INSERT INTO USERS VALUES('jane','$2a$05$ZrdS7yMhCZ1J.AAidXZhCOxdjD8LO/dhlv4FJzkXA6xh9gdEbBT/u',TRUE);"); - template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR');"); - template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('bill','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('bob','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('jane','ROLE_USER');"); - - template.execute("INSERT INTO contacts VALUES (1, 'John Smith', 'john@somewhere.com');"); - template.execute("INSERT INTO contacts VALUES (2, 'Michael Citizen', 'michael@xyz.com');"); - template.execute("INSERT INTO contacts VALUES (3, 'Joe Bloggs', 'joe@demo.com');"); - template.execute("INSERT INTO contacts VALUES (4, 'Karen Sutherland', 'karen@sutherland.com');"); - template.execute("INSERT INTO contacts VALUES (5, 'Mitchell Howard', 'mitchell@abcdef.com');"); - template.execute("INSERT INTO contacts VALUES (6, 'Rose Costas', 'rose@xyz.com');"); - template.execute("INSERT INTO contacts VALUES (7, 'Amanda Smith', 'amanda@abcdef.com');"); - template.execute("INSERT INTO contacts VALUES (8, 'Cindy Smith', 'cindy@smith.com');"); - template.execute("INSERT INTO contacts VALUES (9, 'Jonathan Citizen', 'jonathan@xyz.com');"); - - for (int i = 10; i < createEntities; i++) { - String[] person = selectPerson(); - template.execute("INSERT INTO contacts VALUES (" + i + ", '" + person[2] - + "', '" + person[0].toLowerCase() + "@" + person[1].toLowerCase() - + ".com');"); - } - - // Create acl_object_identity rows (and also acl_class rows as needed - for (int i = 1; i < createEntities; i++) { - final ObjectIdentity objectIdentity = new ObjectIdentityImpl(Contact.class, - (long) i); - tt.execute((arg0) -> { - mutableAclService.createAcl(objectIdentity); - - return null; - }); - } - - // Now grant some permissions - grantPermissions(1, "rod", BasePermission.ADMINISTRATION); - grantPermissions(2, "rod", BasePermission.READ); - grantPermissions(3, "rod", BasePermission.READ); - grantPermissions(3, "rod", BasePermission.WRITE); - grantPermissions(3, "rod", BasePermission.DELETE); - grantPermissions(4, "rod", BasePermission.ADMINISTRATION); - grantPermissions(4, "dianne", BasePermission.ADMINISTRATION); - grantPermissions(4, "scott", BasePermission.READ); - grantPermissions(5, "dianne", BasePermission.ADMINISTRATION); - grantPermissions(5, "dianne", BasePermission.READ); - grantPermissions(6, "dianne", BasePermission.READ); - grantPermissions(6, "dianne", BasePermission.WRITE); - grantPermissions(6, "dianne", BasePermission.DELETE); - grantPermissions(6, "scott", BasePermission.READ); - grantPermissions(7, "scott", BasePermission.ADMINISTRATION); - grantPermissions(8, "dianne", BasePermission.ADMINISTRATION); - grantPermissions(8, "dianne", BasePermission.READ); - grantPermissions(8, "scott", BasePermission.READ); - grantPermissions(9, "scott", BasePermission.ADMINISTRATION); - grantPermissions(9, "scott", BasePermission.READ); - grantPermissions(9, "scott", BasePermission.WRITE); - grantPermissions(9, "scott", BasePermission.DELETE); - - // Now expressly change the owner of the first ten contacts - // We have to do this last, because "rod" owns all of them (doing it sooner would - // prevent ACL updates) - // Note that ownership has no impact on permissions - they're separate (ownership - // only allows ACl editing) - changeOwner(5, "dianne"); - changeOwner(6, "dianne"); - changeOwner(7, "scott"); - changeOwner(8, "dianne"); - changeOwner(9, "scott"); - - String[] users = { "bill", "bob", "jane" }; // don't want to mess around with - // consistent sample data - Permission[] permissions = { BasePermission.ADMINISTRATION, BasePermission.READ, - BasePermission.DELETE }; - - for (int i = 10; i < createEntities; i++) { - String user = users[rnd.nextInt(users.length)]; - Permission permission = permissions[rnd.nextInt(permissions.length)]; - grantPermissions(i, user, permission); - - String user2 = users[rnd.nextInt(users.length)]; - Permission permission2 = permissions[rnd.nextInt(permissions.length)]; - grantPermissions(i, user2, permission2); - } - - SecurityContextHolder.clearContext(); - } - - private void changeOwner(int contactNumber, String newOwnerUsername) { - AclImpl acl = (AclImpl) mutableAclService.readAclById(new ObjectIdentityImpl( - Contact.class, (long) contactNumber)); - acl.setOwner(new PrincipalSid(newOwnerUsername)); - updateAclInTransaction(acl); - } - - public int getCreateEntities() { - return createEntities; - } - - private void grantPermissions(int contactNumber, String recipientUsername, - Permission permission) { - AclImpl acl = (AclImpl) mutableAclService.readAclById(new ObjectIdentityImpl( - Contact.class, (long) contactNumber)); - acl.insertAce(acl.getEntries().size(), permission, new PrincipalSid( - recipientUsername), true); - updateAclInTransaction(acl); - } - - private String[] selectPerson() { - String firstName = firstNames[rnd.nextInt(firstNames.length)]; - String lastName = lastNames[rnd.nextInt(lastNames.length)]; - - return new String[] { firstName, lastName, firstName + " " + lastName }; - } - - public void setCreateEntities(int createEntities) { - this.createEntities = createEntities; - } - - public void setDataSource(DataSource dataSource) { - this.template = new JdbcTemplate(dataSource); - } - - public void setMutableAclService(MutableAclService mutableAclService) { - this.mutableAclService = mutableAclService; - } - - public void setPlatformTransactionManager( - PlatformTransactionManager platformTransactionManager) { - this.tt = new TransactionTemplate(platformTransactionManager); - } - - private void updateAclInTransaction(final MutableAcl acl) { - tt.execute((arg0) -> { - mutableAclService.updateAcl(acl); - - return null; - }); - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/IndexController.java b/samples/xml/contacts/src/main/java/sample/contact/IndexController.java deleted file mode 100644 index b46b4e9810..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/IndexController.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.contact; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.PermissionEvaluator; -import org.springframework.security.acls.AclPermissionEvaluator; -import org.springframework.security.acls.domain.BasePermission; -import org.springframework.security.acls.model.Permission; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.servlet.ModelAndView; - -/** - * Controller which handles simple, single request use cases such as index pages and - * contact deletion. - * - * @author Luke Taylor - * @since 3.0 - */ -@Controller -public class IndexController { - private final static Permission[] HAS_DELETE = new Permission[] { - BasePermission.DELETE, BasePermission.ADMINISTRATION }; - private final static Permission[] HAS_ADMIN = new Permission[] { BasePermission.ADMINISTRATION }; - - - @Autowired - private ContactManager contactManager; - @Autowired - private PermissionEvaluator permissionEvaluator; - - - /** - * The public index page, used for unauthenticated users. - */ - @RequestMapping(value = "/hello.htm", method = RequestMethod.GET) - public ModelAndView displayPublicIndex() { - Contact rnd = contactManager.getRandomContact(); - - return new ModelAndView("hello", "contact", rnd); - } - - /** - * The index page for an authenticated user. - *

    - * This controller displays a list of all the contacts for which the current user has - * read or admin permissions. It makes a call to {@link ContactManager#getAll()} which - * automatically filters the returned list using Spring Security's ACL mechanism (see - * the expression annotations on this interface for the details). - *

    - * In addition to rendering the list of contacts, the view will also include a "Del" - * or "Admin" link beside the contact, depending on whether the user has the - * corresponding permissions (admin permission is assumed to imply delete here). This - * information is stored in the model using the injected {@link PermissionEvaluator} - * instance. The implementation should be an instance of - * {@link AclPermissionEvaluator} or one which is compatible with Spring Security's - * ACL module. - */ - @RequestMapping(value = "/secure/index.htm", method = RequestMethod.GET) - public ModelAndView displayUserContacts() { - List myContactsList = contactManager.getAll(); - Map hasDelete = new HashMap<>( - myContactsList.size()); - Map hasAdmin = new HashMap<>( - myContactsList.size()); - - Authentication user = SecurityContextHolder.getContext().getAuthentication(); - - for (Contact contact : myContactsList) { - hasDelete.put(contact, permissionEvaluator.hasPermission( - user, contact, HAS_DELETE)); - hasAdmin.put(contact, permissionEvaluator.hasPermission(user, - contact, HAS_ADMIN)); - } - - Map model = new HashMap<>(); - model.put("contacts", myContactsList); - model.put("hasDeletePermission", hasDelete); - model.put("hasAdminPermission", hasAdmin); - - return new ModelAndView("index", "model", model); - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/WebContact.java b/samples/xml/contacts/src/main/java/sample/contact/WebContact.java deleted file mode 100644 index c4ae49df67..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/WebContact.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -/** - * An object that represents user-editable sections of a {@link Contact}. - * - * @author Ben Alex - */ -public class WebContact { - - - private String email; - private String name; - - - public String getEmail() { - return email; - } - - public String getName() { - return name; - } - - public void setEmail(String email) { - this.email = email; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/samples/xml/contacts/src/main/java/sample/contact/WebContactValidator.java b/samples/xml/contacts/src/main/java/sample/contact/WebContactValidator.java deleted file mode 100644 index 8d0b754489..0000000000 --- a/samples/xml/contacts/src/main/java/sample/contact/WebContactValidator.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -import org.springframework.validation.Errors; -import org.springframework.validation.Validator; - -/** - * Validates {@link WebContact}. - * - * @author Ben Alex - */ -public class WebContactValidator implements Validator { - - - @SuppressWarnings("unchecked") - public boolean supports(Class clazz) { - return clazz.equals(WebContact.class); - } - - public void validate(Object obj, Errors errors) { - WebContact wc = (WebContact) obj; - - if ((wc.getName() == null) || (wc.getName().length() < 3) - || (wc.getName().length() > 50)) { - errors.rejectValue("name", "err.name", "Name 3-50 characters is required. *"); - } - - if ((wc.getEmail() == null) || (wc.getEmail().length() < 3) - || (wc.getEmail().length() > 50)) { - errors.rejectValue("email", "err.email", - "Email 3-50 characters is required. *"); - } - } -} diff --git a/samples/xml/contacts/src/main/resources/applicationContext-common-authorization.xml b/samples/xml/contacts/src/main/resources/applicationContext-common-authorization.xml deleted file mode 100644 index 397b39ec0a..0000000000 --- a/samples/xml/contacts/src/main/resources/applicationContext-common-authorization.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/contacts/src/main/resources/applicationContext-common-business.xml b/samples/xml/contacts/src/main/resources/applicationContext-common-business.xml deleted file mode 100644 index 28ebc0a800..0000000000 --- a/samples/xml/contacts/src/main/resources/applicationContext-common-business.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/contacts/src/main/resources/applicationContext-security.xml b/samples/xml/contacts/src/main/resources/applicationContext-security.xml deleted file mode 100644 index 40ff54396b..0000000000 --- a/samples/xml/contacts/src/main/resources/applicationContext-security.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/contacts/src/main/resources/logback.xml b/samples/xml/contacts/src/main/resources/logback.xml deleted file mode 100644 index b0b65dbb15..0000000000 --- a/samples/xml/contacts/src/main/resources/logback.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - diff --git a/samples/xml/contacts/src/main/resources/messages.properties b/samples/xml/contacts/src/main/resources/messages.properties deleted file mode 100644 index 058905c6c1..0000000000 --- a/samples/xml/contacts/src/main/resources/messages.properties +++ /dev/null @@ -1,6 +0,0 @@ -err.name=Name 3-50 characters is required. -err.email=Email 3-50 characters is required. -err.permission=Permission is required. -err.recipient=Recipient is required. -err.permission.invalid=The indicated permission is invalid. -err.recipient.length=The recipient is too long (maximum 100 characters). \ No newline at end of file diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/contacts-servlet.xml b/samples/xml/contacts/src/main/webapp/WEB-INF/contacts-servlet.xml deleted file mode 100644 index 1ec14d631e..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/contacts-servlet.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/add.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/add.jsp deleted file mode 100644 index 02630f9858..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/add.jsp +++ /dev/null @@ -1,42 +0,0 @@ -<%@ include file="/WEB-INF/jsp/include.jsp" %> - -Add New Contact - -

    Add Contact

    -
    - - - - - - - - - - - - - - - -
    Name: - "> - - -
    Email: - "> - - -
    -
    - - Please fix all errors! - -

    - - " value=""/> - - -">Home - - diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/addPermission.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/addPermission.jsp deleted file mode 100644 index dfd2476c64..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/addPermission.jsp +++ /dev/null @@ -1,56 +0,0 @@ -<%@ include file="/WEB-INF/jsp/include.jsp" %> - -Add Permission - -

    Add Permission

    -
    - - - - - - - - - - - - - - - - - - - -
    Contact:
    Recipient: - - - -
    Permission: - - - -
    -
    - - Please fix all errors! - -

    - " value=""/> - - -

    -">Admin Permission ">Manage - - diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/adminPermission.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/adminPermission.jsp deleted file mode 100644 index 2e0d43fae4..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/adminPermission.jsp +++ /dev/null @@ -1,30 +0,0 @@ -<%@ include file="/WEB-INF/jsp/include.jsp" %> - - -Administer Permissions - -

    Administer Permissions

    -

    - - - -

    - - - - - - - -
    - - - - - ">Del -
    -

    -">Add Permission ">Manage -

    - - diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deletePermission.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deletePermission.jsp deleted file mode 100644 index 85a71a2b6b..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deletePermission.jsp +++ /dev/null @@ -1,20 +0,0 @@ -<%@ include file="/WEB-INF/jsp/include.jsp" %> - - -Permission Deleted - -

    Permission Deleted

    -

    - - - -

    - - - - - - -

    ">Manage - - diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deleted.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deleted.jsp deleted file mode 100644 index 8fed87c4fd..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deleted.jsp +++ /dev/null @@ -1,13 +0,0 @@ -<%@ include file="/WEB-INF/jsp/include.jsp" %> - - -Deletion completed - -

    Deleted

    -

    - - - -

    ">Manage - - diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/frames.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/frames.jsp deleted file mode 100644 index cf3ad2066a..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/frames.jsp +++ /dev/null @@ -1,10 +0,0 @@ - - -Frames - - -

    This contains frames, but the frames will not be loaded due to the X-Frame-Options -being specified as denied. This protects against clickjacking attacks

    - - - \ No newline at end of file diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/hello.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/hello.jsp deleted file mode 100644 index 8713e0af0c..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/hello.jsp +++ /dev/null @@ -1,52 +0,0 @@ -<%@ include file="/WEB-INF/jsp/include.jsp" %> - - -Contacts Security Demo - -

    Contacts Security Demo

    -

    Contacts demonstrates the following central Spring Security capabilities: -

      -
    • Role-based security. Each principal is a member of certain roles, - which are used to restrict access to certain secure objects.
      • -
    • Domain object instance security. The Contact, the - main domain object in the application, has an access control list (ACL) - that indicates who is allowed read, administer and delete the object.
      • -
    • Method invocation security. The ContactManager service - layer bean has a number of secured (protected) and public (unprotected) - methods.
      • -
    • Web request security. The /secure URI path is protected - by Spring Security from principals not holding the - ROLE_USER granted authority.
      • -
    • Security unaware application objects. None of the objects - are aware of the security being implemented by Spring Security. *
      • -
    • Security taglib usage. All of the JSPs use Spring Security's - taglib to evaluate security information. *
      • -
    • Fully declarative security. Every capability is configured in - the application context using standard Spring Security classes. *
      • -
    • Database-sourced security data. All of the user, role and ACL - information is obtained from an in-memory JDBC-compliant database.
      • -
    • Integrated form-based and BASIC authentication. Any BASIC - authentication header is detected and used for authentication. Normal - interactive form-based authentication is used by default.
      • -
    • Remember-me services. Spring Security's pluggable remember-me - strategy is demonstrated, with a corresponding checkbox on the login form.
      • -
    - -* As the application provides an "ACL Administration" use case, those -classes are necessarily aware of security. But no business use cases are. - -

    Please excuse the lack of look 'n' feel polish in this application. -It is about security, after all! :-) - -

    To demonstrate a public method on ContactManager, -here's a random Contact: -

    - - - -

    Get started by clicking "Manage"... -

    ">Manage -">Debug -">Frames - - diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/include.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/include.jsp deleted file mode 100644 index 3b31878e13..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/include.jsp +++ /dev/null @@ -1,6 +0,0 @@ -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ page pageEncoding="UTF-8" %> diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/index.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/index.jsp deleted file mode 100644 index 10dc023d2f..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/index.jsp +++ /dev/null @@ -1,37 +0,0 @@ -<%@ include file="/WEB-INF/jsp/include.jsp" %> - - -Your Contacts - -

    's Contacts

    -

    - - - - - - - - - - - - - - - -
    idNameEmail
    - - - - - - ">Del">Admin Permission
    -

    ">Add

    - -
    " method="post"> - (also clears any remember-me cookie) - - - - diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml b/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml deleted file mode 100644 index f3f25bd504..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld b/samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld deleted file mode 100644 index 895f80affc..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - 1.1.1 - - 1.2 - - Spring - - http://www.springframework.org/tags - - Spring Framework JSP Tag Library. Authors: Rod Johnson, Juergen Hoeller - - - - - htmlEscape - org.springframework.web.servlet.tags.HtmlEscapeTag - JSP - - - Sets default HTML escape value for the current page. - Overrides a "defaultHtmlEscape" context-param in web.xml, if any. - - - - defaultHtmlEscape - true - true - - - - - - - - escapeBody - org.springframework.web.servlet.tags.EscapeBodyTag - JSP - - - Escapes its enclosed body content, applying HTML escaping and/or JavaScript escaping. - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - htmlEscape - false - true - - - - javaScriptEscape - false - true - - - - - - - - message - org.springframework.web.servlet.tags.MessageTag - JSP - - - Retrieves the message with the given code, or text if code isn't resolvable. - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - code - false - true - - - - arguments - false - true - - - - text - false - true - - - - var - false - true - - - - scope - false - true - - - - htmlEscape - false - true - - - - javaScriptEscape - false - true - - - - - - - - theme - org.springframework.web.servlet.tags.ThemeTag - JSP - - - Retrieves the theme message with the given code, or text if code isn't resolvable. - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - code - false - true - - - - arguments - false - true - - - - text - false - true - - - - var - false - true - - - - scope - false - true - - - - htmlEscape - false - true - - - - javaScriptEscape - false - true - - - - - - - - hasBindErrors - org.springframework.web.servlet.tags.BindErrorsTag - JSP - - - Provides Errors instance in case of bind errors. - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - errors - org.springframework.validation.Errors - - - - name - true - true - - - - htmlEscape - false - true - - - - - - - - nestedPath - org.springframework.web.servlet.tags.NestedPathTag - JSP - - - Sets a nested path to be used by the bind tag's path. - - - - nestedPath - java.lang.String - - - - path - true - true - - - - - - - - bind - org.springframework.web.servlet.tags.BindTag - JSP - - - Provides BindStatus object for the given bind path. - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - status - org.springframework.web.servlet.support.BindStatus - - - - path - true - true - - - - ignoreNestedPath - false - true - - - - htmlEscape - false - true - - - - - - - - transform - org.springframework.web.servlet.tags.TransformTag - JSP - - - Provides transformation of variables to Strings, using an appropriate - custom PropertyEditor from BindTag (can only be used inside BindTag). - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - value - true - true - - - - var - false - true - - - - scope - false - true - - - - htmlEscape - false - true - - - - - diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/web.xml b/samples/xml/contacts/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 7b4f0d9c4f..0000000000 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - Contacts Sample Application - - - - contextConfigLocation - - classpath:applicationContext-common-business.xml - classpath:applicationContext-common-authorization.xml - classpath:applicationContext-security.xml - - - - - - - webAppRootKey - contacts.root - - - - localizationFilter - org.springframework.web.filter.RequestContextFilter - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - localizationFilter - /* - - - - springSecurityFilterChain - /* - - - - - org.springframework.web.context.ContextLoaderListener - - - - - contacts - org.springframework.web.servlet.DispatcherServlet - 1 - - - - - remoting - org.springframework.web.servlet.DispatcherServlet - 2 - - - - contacts - *.htm - - - - remoting - /remoting/* - - - - index.jsp - - - - 403 - /error.html - - - diff --git a/samples/xml/contacts/src/main/webapp/accessDenied.jsp b/samples/xml/contacts/src/main/webapp/accessDenied.jsp deleted file mode 100644 index c94ae99b60..0000000000 --- a/samples/xml/contacts/src/main/webapp/accessDenied.jsp +++ /dev/null @@ -1,22 +0,0 @@ -<%@ page import="org.springframework.security.core.context.SecurityContextHolder" %> -<%@ page import="org.springframework.security.core.Authentication" %> - - - - Access Denied - - - -

    Sorry, access is denied

    - -

    -<%= request.getAttribute("SPRING_SECURITY_403_EXCEPTION")%> -

    -

    -<% Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (auth != null) { %> - Authentication object as a String: <%= auth.toString() %>

    -<% } %> -

    - - diff --git a/samples/xml/contacts/src/main/webapp/error.html b/samples/xml/contacts/src/main/webapp/error.html deleted file mode 100644 index 3c58108da5..0000000000 --- a/samples/xml/contacts/src/main/webapp/error.html +++ /dev/null @@ -1,5 +0,0 @@ - - Access denied! -

    Access Denied

    -

    We're sorry, but you are not authorized to perform the requested operation.

    - \ No newline at end of file diff --git a/samples/xml/contacts/src/main/webapp/exitUser.jsp b/samples/xml/contacts/src/main/webapp/exitUser.jsp deleted file mode 100644 index 5f9e33b31d..0000000000 --- a/samples/xml/contacts/src/main/webapp/exitUser.jsp +++ /dev/null @@ -1,39 +0,0 @@ -<%@ taglib prefix='c' uri='http://java.sun.com/jsp/jstl/core' %> - -<%@ page import="org.springframework.security.core.Authentication" %> -<%@ page import="org.springframework.security.core.context.SecurityContextHolder" %> -<%@ page pageEncoding="UTF-8" %> - - - - Exit User - - - -

    Exit User

    - - - - Your 'Exit User' attempt was not successful, try again.

    - Reason: -     -     - -
    - - - -
    Current User: - -<% - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (auth != null) { %> - - <%= auth.getPrincipal().toString() %> - - <% } %> -
    - " value=""/> - - - diff --git a/samples/xml/contacts/src/main/webapp/index.jsp b/samples/xml/contacts/src/main/webapp/index.jsp deleted file mode 100644 index 4c86e33093..0000000000 --- a/samples/xml/contacts/src/main/webapp/index.jsp +++ /dev/null @@ -1,4 +0,0 @@ -<%@ include file="/WEB-INF/jsp/include.jsp" %> - -<%-- Redirected because we can't set the welcome page to a virtual URL. --%> - diff --git a/samples/xml/contacts/src/main/webapp/login.jsp b/samples/xml/contacts/src/main/webapp/login.jsp deleted file mode 100644 index ed072882b9..0000000000 --- a/samples/xml/contacts/src/main/webapp/login.jsp +++ /dev/null @@ -1,47 +0,0 @@ -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ page pageEncoding="UTF-8" %> - - - - Login - - - -

    Login

    - -

    Valid users: -

    -

    username rod, password koala -

    username dianne, password emu -

    username scott, password wombat -

    username peter, password opal (user disabled) -

    username bill, password wombat -

    username bob, password wombat -

    username jane, password wombat -

    - -

    Locale is: <%= request.getLocale() %>

    - <%-- this form-login-page form is also used as the - form-error-page to ask for a login again. - --%> - - - Your login attempt was not successful, try again.

    - Reason: . -     -     - -
    - - - - - - - -
    User:
    Password:
    Don't ask for my password for two weeks
    - " value=""/> - - - - diff --git a/samples/xml/contacts/src/main/webapp/secure/debug.jsp b/samples/xml/contacts/src/main/webapp/secure/debug.jsp deleted file mode 100644 index 553bc3a15a..0000000000 --- a/samples/xml/contacts/src/main/webapp/secure/debug.jsp +++ /dev/null @@ -1,40 +0,0 @@ -<%@ page import="org.springframework.security.core.context.SecurityContextHolder" %> -<%@ page import="org.springframework.security.core.Authentication" %> -<%@ page import="org.springframework.security.core.GrantedAuthority" %> - - - -Security Debug Information - - - -

    Security Debug Information

    - -<% - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (auth != null) { %> -

    - Authentication object is of type: <%= auth.getClass().getName() %> -

    -

    - Authentication object as a String:

    <%= auth.toString() %> -

    - - Authentication object holds the following granted authorities:

    -<% - for (GrantedAuthority authority : auth.getAuthorities()) { %> - <%= authority %> (getAuthority(): <%= authority.getAuthority() %>)
    -<% } -%> - -

    Success! Your web filters appear to be properly configured!

    -<% - } else { -%> - Authentication object is null.
    - This is an error and your Spring Security application will not operate properly until corrected.

    -<% } -%> - - - diff --git a/samples/xml/contacts/src/main/webapp/switchUser.jsp b/samples/xml/contacts/src/main/webapp/switchUser.jsp deleted file mode 100644 index a8d3e15204..0000000000 --- a/samples/xml/contacts/src/main/webapp/switchUser.jsp +++ /dev/null @@ -1,42 +0,0 @@ -<%@ taglib prefix='c' uri='http://java.sun.com/jstl/core' %> -<%@ page import="org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter" %> -<%@ page import="org.springframework.security.core.AuthenticationException" %> -<%@ page pageEncoding="UTF-8" %> - - - - Switch User - - - -

    Switch to User

    - -

    Valid users:

    - -

    username rod, password koala

    -

    username dianne, password emu

    -

    username scott, password wombat

    -

    username bill, password wombat

    -

    username bob, password wombat

    -

    username jane, password wombat

    - <%-- this form-login-page form is also used as the - form-error-page to ask for a login again. - --%> - -

    - - Your 'su' attempt was not successful, try again.
    -     -

    -     - -
    - - - -
    User:
    - " value=""/> - - - - diff --git a/samples/xml/contacts/src/site/resources/logback-test.xml b/samples/xml/contacts/src/site/resources/logback-test.xml deleted file mode 100644 index 2d51ba4180..0000000000 --- a/samples/xml/contacts/src/site/resources/logback-test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - diff --git a/samples/xml/contacts/src/site/resources/sslhowto.txt b/samples/xml/contacts/src/site/resources/sslhowto.txt deleted file mode 100644 index 9e073a6dd4..0000000000 --- a/samples/xml/contacts/src/site/resources/sslhowto.txt +++ /dev/null @@ -1,99 +0,0 @@ -$Id$ - -CAS requires HTTPS be used for all operations, with the certificate used -having been signed by a certificate in the cacerts files shipped with Java. - -If you're using a HTTPS certificate signed by a well known authority -(like Verisign), you can safely ignore the procedure below (although you -might find the troubleshooting section at the end helpful). - -The following demonstrates how to create a self-signed certificate and add -it to the cacerts file. If you just want to use the certificate we have -already created and shipped with Spring Security, you -can skip directly to step 3. - - -1. keytool -keystore keystore -alias acegisecurity -genkey -keyalg RSA -validity 9999 -storepass password -keypass password - -What is your first and last name? - [Unknown]: localhost -What is the name of your organizational unit? - [Unknown]: Spring Security -What is the name of your organization? - [Unknown]: TEST CERTIFICATE ONLY. DO NOT USE IN PRODUCTION. -What is the name of your City or Locality? - [Unknown]: -What is the name of your State or Province? - [Unknown]: -What is the two-letter country code for this unit? - [Unknown]: -Is CN=localhost, OU=Spring Security, O=TEST CERTIFICATE ONLY. D -O NOT USE IN PRODUCTION., L=Unknown, ST=Unknown, C=Unknown correct? - [no]: yes - - -2. keytool -export -v -rfc -alias acegisecurity -file acegisecurity.txt -keystore keystore -storepass password - -3. copy acegisecurity.txt %JAVA_HOME%\lib\security - -4. copy keystore %YOUR_WEB_CONTAINER_LOCATION% - - NOTE: You will need to configure your web container as appropriate. - We recommend you test the certificate works by visiting - https://localhost:8443. When prompted by your browser, select to - install the certificate. - -5. cd %JAVA_HOME%\lib\security - -6. keytool -import -v -file acegisecurity.txt -keypass password -keystore cacerts -storepass changeit -alias acegisecurity - -Owner: CN=localhost, OU=Spring Security, O=TEST CERTIFICATE ONL -Y. DO NOT USE IN PRODUCTION., L=Unknown, ST=Unknown, C=Unknown -Issuer: CN=localhost, OU=Spring Security, O=TEST CERTIFICATE ON -LY. DO NOT USE IN PRODUCTION., L=Unknown, ST=Unknown, C=Unknown -Serial number: 4080daf4 -Valid from: Sat Apr 17 07:21:24 GMT 2004 until: Tue Sep 02 07:21:24 GMT 2031 -Certificate fingerprints: - MD5: B4:AC:A8:24:34:99:F1:A9:F8:1D:A5:6C:BF:0A:34:FA - SHA1: F1:E6:B1:3A:01:39:2D:CF:06:FA:82:AB:86:0D:77:9D:06:93:D6:B0 -Trust this certificate? [no]: yes -Certificate was added to keystore -[Saving cacerts] - - -7. Finished. You can now run the sample application as if you purchased a - properly signed certificate. For production applications, of course you should - use an appropriately signed certificate so your web visitors will trust it - (such as issued by Thawte, Verisign etc). - -TROUBLESHOOTING - -* First of all, most CAS-Acegi Security problems are because of untrusted - SSL certificates. So it's important to understand why. Most people can - load the Acegi Security webapp, get redirected to the CAS server, then - after login they get redirected back to the Acegi Security webapp and - receive a failure. This is because the CAS server redirects to something - like https://server3.company.com/webapp/login/cas?ticket=ST-0-ER94xMJmn6pha35CQRoZ - which causes the "service ticket" (the "ticket" parameter) to be validated. - net.sf.acegisecurity.providers.cas.ticketvalidator.CasProxyTicketValidator - performs service ticket validation by delegation to CAS' - ProxyTicketValidator class. The ProxyTicketValidator class will perform a - HTTPS connection from the web server running the Acegi Security webapp - (server3.company.com) above to the CAS server. If for some reason the - web server keystore does not trust the HTTPS certificate presented by the - CAS server, you will receive various failures as discussed below. NB: This - has NOTHING to do with client-side (browser) certificates. You need to - correct the trust between the two webserver keystores alone. - -* A "sun.security.validator.ValidatorException: No trusted certificate - found" indicates the cacerts is not being used or it did not correctly - import the certificate. To rule out your web container replacing or in - some way modifying the trust manager, set the - CasProxyTicketValidator.trustStore property to the full file system - location to your cacerts file. - -* If your web container is ignoring your cacerts file, double-check it - is stored in $JAVA_HOME\lib\security\cacerts. $JAVA_HOME might be - pointing to the SDK, not JRE. In that case, copy - $JAVA_HOME\jre\lib\security\cacerts to $JAVA_HOME\lib\security\cacerts - diff --git a/samples/xml/contacts/src/test/java/sample/contact/ContactManagerTests.java b/samples/xml/contacts/src/test/java/sample/contact/ContactManagerTests.java deleted file mode 100644 index 2c64395c1d..0000000000 --- a/samples/xml/contacts/src/test/java/sample/contact/ContactManagerTests.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * 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 - * - * 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, - * 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 sample.contact; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - -import java.util.List; - -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.acls.domain.BasePermission; -import org.springframework.security.acls.domain.PrincipalSid; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * Tests {@link ContactManager}. - * - * @author David Leal - * @author Ben Alex - * @author Luke Taylor - */ -@ContextConfiguration(locations = { "/applicationContext-security.xml", - "/applicationContext-common-authorization.xml", - "/applicationContext-common-business.xml" }) -@RunWith(SpringJUnit4ClassRunner.class) -public class ContactManagerTests { - - - @Autowired - protected ContactManager contactManager; - - - void assertContainsContact(long id, List contacts) { - for (Contact contact : contacts) { - if (contact.getId().equals(id)) { - return; - } - } - - fail("List of contacts should have contained: " + id); - } - - void assertDoestNotContainContact(long id, List contacts) { - for (Contact contact : contacts) { - if (contact.getId().equals(id)) { - fail("List of contact should NOT (but did) contain: " + id); - } - } - } - - /** - * Locates the first Contact of the exact name specified. - *

    - * Uses the {@link ContactManager#getAll()} method. - * - * @param id Identify of the contact to locate (must be an exact match) - * - * @return the domain or null if not found - */ - Contact getContact(String id) { - for (Contact contact : contactManager.getAll()) { - if (contact.getId().equals(id)) { - return contact; - } - } - - return null; - } - - private void makeActiveUser(String username) { - String password = ""; - - if ("rod".equals(username)) { - password = "koala"; - } - else if ("dianne".equals(username)) { - password = "emu"; - } - else if ("scott".equals(username)) { - password = "wombat"; - } - else if ("peter".equals(username)) { - password = "opal"; - } - - Authentication authRequest = new UsernamePasswordAuthenticationToken(username, - password); - SecurityContextHolder.getContext().setAuthentication(authRequest); - } - - @After - public void clearContext() { - SecurityContextHolder.clearContext(); - } - - @Test - public void testDianne() { - makeActiveUser("dianne"); // has ROLE_USER - - List contacts = contactManager.getAll(); - assertThat(contacts).hasSize(4); - - assertContainsContact(4, contacts); - assertContainsContact(5, contacts); - assertContainsContact(6, contacts); - assertContainsContact(8, contacts); - - assertDoestNotContainContact(1, contacts); - assertDoestNotContainContact(2, contacts); - assertDoestNotContainContact(3, contacts); - } - - @Test - public void testrod() { - makeActiveUser("rod"); // has ROLE_SUPERVISOR - - List contacts = contactManager.getAll(); - - assertThat(contacts).hasSize(4); - - assertContainsContact(1, contacts); - assertContainsContact(2, contacts); - assertContainsContact(3, contacts); - assertContainsContact(4, contacts); - - assertDoestNotContainContact(5, contacts); - - Contact c1 = contactManager.getById(4L); - - contactManager.deletePermission(c1, new PrincipalSid("bob"), - BasePermission.ADMINISTRATION); - contactManager.addPermission(c1, new PrincipalSid("bob"), - BasePermission.ADMINISTRATION); - } - - @Test - public void testScott() { - makeActiveUser("scott"); // has ROLE_USER - - List contacts = contactManager.getAll(); - - assertThat(contacts).hasSize(5); - - assertContainsContact(4, contacts); - assertContainsContact(6, contacts); - assertContainsContact(7, contacts); - assertContainsContact(8, contacts); - assertContainsContact(9, contacts); - - assertDoestNotContainContact(1, contacts); - } -} diff --git a/samples/xml/contacts/src/test/resources/logback-test.xml b/samples/xml/contacts/src/test/resources/logback-test.xml deleted file mode 100644 index 2d51ba4180..0000000000 --- a/samples/xml/contacts/src/test/resources/logback-test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - diff --git a/samples/xml/dms/spring-security-samples-xml-dms.gradle b/samples/xml/dms/spring-security-samples-xml-dms.gradle deleted file mode 100644 index 51a003853b..0000000000 --- a/samples/xml/dms/spring-security-samples-xml-dms.gradle +++ /dev/null @@ -1,17 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-acl') - compile project(':spring-security-core') - compile 'org.springframework:spring-beans' - compile 'org.springframework:spring-jdbc' - compile 'org.springframework:spring-tx' - - optional 'net.sf.ehcache:ehcache' - - runtime project(':spring-security-config') - runtime 'org.hsqldb:hsqldb' - runtime 'org.springframework:spring-context-support' - - testCompile 'org.springframework:spring-context' -} diff --git a/samples/xml/dms/src/main/java/sample/dms/AbstractElement.java b/samples/xml/dms/src/main/java/sample/dms/AbstractElement.java deleted file mode 100755 index a65f334179..0000000000 --- a/samples/xml/dms/src/main/java/sample/dms/AbstractElement.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.dms; - -import java.util.ArrayList; -import java.util.List; - -import org.springframework.util.Assert; - -/** - * @author Ben Alex - * - */ -public abstract class AbstractElement { - /** The name of this token (a filename or directory segment name */ - private String name; - - /** The parent of this token (a directory, or null if referring to root) */ - private AbstractElement parent; - - /** The database identifier for this object (null if not persisted) */ - private Long id; - - /** - * Constructor to use to represent a root element. A root element has an id of -1. - */ - protected AbstractElement() { - this.name = "/"; - this.parent = null; - this.id = -1L; - } - - /** - * Constructor to use to represent a non-root element. - * - * @param name name for this element (required, cannot be "/") - * @param parent for this element (required, cannot be null) - */ - protected AbstractElement(String name, AbstractElement parent) { - Assert.hasText(name, "Name required"); - Assert.notNull(parent, "Parent required"); - Assert.notNull(parent.getId(), - "The parent must have been saved in order to create a child"); - this.name = name; - this.parent = parent; - } - - public Long getId() { - return id; - } - - /** - * @return the name of this token (never null, although will be "/" if root, otherwise - * it won't include separators) - */ - public String getName() { - return name; - } - - public AbstractElement getParent() { - return parent; - } - - /** - * @return the fully-qualified name of this element, including any parents - */ - public String getFullName() { - List strings = new ArrayList<>(); - AbstractElement currentElement = this; - while (currentElement != null) { - strings.add(0, currentElement.getName()); - currentElement = currentElement.getParent(); - } - - StringBuilder sb = new StringBuilder(); - String lastCharacter = null; - for (String token : strings) { - if (!"/".equals(lastCharacter) && lastCharacter != null) { - sb.append("/"); - } - sb.append(token); - lastCharacter = token.substring(token.length() - 1); - } - return sb.toString(); - } -} diff --git a/samples/xml/dms/src/main/java/sample/dms/DataSourcePopulator.java b/samples/xml/dms/src/main/java/sample/dms/DataSourcePopulator.java deleted file mode 100755 index 476a73dd91..0000000000 --- a/samples/xml/dms/src/main/java/sample/dms/DataSourcePopulator.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.dms; - -import javax.sql.DataSource; - -import org.springframework.beans.factory.InitializingBean; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.util.Assert; - -/** - * Populates the DMS in-memory database with document and ACL information. - * - * @author Ben Alex - */ -public class DataSourcePopulator implements InitializingBean { - protected static final int LEVEL_NEGATE_READ = 0; - protected static final int LEVEL_GRANT_READ = 1; - protected static final int LEVEL_GRANT_WRITE = 2; - protected static final int LEVEL_GRANT_ADMIN = 3; - protected JdbcTemplate template; - protected DocumentDao documentDao; - - public DataSourcePopulator(DataSource dataSource, DocumentDao documentDao) { - Assert.notNull(dataSource, "DataSource required"); - Assert.notNull(documentDao, "DocumentDao required"); - this.template = new JdbcTemplate(dataSource); - this.documentDao = documentDao; - } - - public void afterPropertiesSet() { - // ACL tables - template.execute("CREATE TABLE ACL_SID(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,PRINCIPAL BOOLEAN NOT NULL,SID VARCHAR_IGNORECASE(100) NOT NULL,CONSTRAINT UNIQUE_UK_1 UNIQUE(SID,PRINCIPAL));"); - template.execute("CREATE TABLE ACL_CLASS(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,CLASS VARCHAR_IGNORECASE(100) NOT NULL,CLASS_ID_TYPE VARCHAR_IGNORECASE(100),CONSTRAINT UNIQUE_UK_2 UNIQUE(CLASS));"); - template.execute("CREATE TABLE ACL_OBJECT_IDENTITY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,OBJECT_ID_CLASS BIGINT NOT NULL,OBJECT_ID_IDENTITY VARCHAR_IGNORECASE(36) NOT NULL,PARENT_OBJECT BIGINT,OWNER_SID BIGINT,ENTRIES_INHERITING BOOLEAN NOT NULL,CONSTRAINT UNIQUE_UK_3 UNIQUE(OBJECT_ID_CLASS,OBJECT_ID_IDENTITY),CONSTRAINT FOREIGN_FK_1 FOREIGN KEY(PARENT_OBJECT)REFERENCES ACL_OBJECT_IDENTITY(ID),CONSTRAINT FOREIGN_FK_2 FOREIGN KEY(OBJECT_ID_CLASS)REFERENCES ACL_CLASS(ID),CONSTRAINT FOREIGN_FK_3 FOREIGN KEY(OWNER_SID)REFERENCES ACL_SID(ID));"); - template.execute("CREATE TABLE ACL_ENTRY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,ACL_OBJECT_IDENTITY BIGINT NOT NULL,ACE_ORDER INT NOT NULL,SID BIGINT NOT NULL,MASK INTEGER NOT NULL,GRANTING BOOLEAN NOT NULL,AUDIT_SUCCESS BOOLEAN NOT NULL,AUDIT_FAILURE BOOLEAN NOT NULL,CONSTRAINT UNIQUE_UK_4 UNIQUE(ACL_OBJECT_IDENTITY,ACE_ORDER),CONSTRAINT FOREIGN_FK_4 FOREIGN KEY(ACL_OBJECT_IDENTITY) REFERENCES ACL_OBJECT_IDENTITY(ID),CONSTRAINT FOREIGN_FK_5 FOREIGN KEY(SID) REFERENCES ACL_SID(ID));"); - - // Normal authentication tables - template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);"); - template.execute("CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));"); - template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);"); - - // Document management system business tables - template.execute("CREATE TABLE DIRECTORY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY, DIRECTORY_NAME VARCHAR_IGNORECASE(50) NOT NULL, PARENT_DIRECTORY_ID BIGINT)"); - template.execute("CREATE TABLE FILE(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY, FILE_NAME VARCHAR_IGNORECASE(50) NOT NULL, CONTENT VARCHAR_IGNORECASE(1024), PARENT_DIRECTORY_ID BIGINT)"); - - // Populate the authentication and role tables - template.execute("INSERT INTO USERS VALUES('rod','$2a$10$75pBjapg4Nl8Pzd.3JRnUe7PDJmk9qBGwNEJDAlA3V.dEJxcDKn5O',TRUE);"); - template.execute("INSERT INTO USERS VALUES('dianne','$2a$04$bCMEyxrdF/7sgfUiUJ6Ose2vh9DAMaVBldS1Bw2fhi1jgutZrr9zm',TRUE);"); - template.execute("INSERT INTO USERS VALUES('scott','$2a$06$eChwvzAu3TSexnC3ynw4LOSw1qiEbtNItNeYv5uI40w1i3paoSfLu',TRUE);"); - template.execute("INSERT INTO USERS VALUES('peter','$2a$04$8.H8bCMROLF4CIgd7IpeQ.tcBXLP5w8iplO0n.kCIkISwrIgX28Ii',FALSE);"); - template.execute("INSERT INTO USERS VALUES('bill','$2a$04$8.H8bCMROLF4CIgd7IpeQ.3khQlPVNWbp8kzSQqidQHGFurim7P8O',TRUE);"); - template.execute("INSERT INTO USERS VALUES('bob','$2a$06$zMgxlMf01SfYNcdx7n4NpeFlAGU8apCETz/i2C7VlYWu6IcNyn4Ay',TRUE);"); - template.execute("INSERT INTO USERS VALUES('jane','$2a$05$ZrdS7yMhCZ1J.AAidXZhCOxdjD8LO/dhlv4FJzkXA6xh9gdEbBT/u',TRUE);"); - template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR');"); - template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('bill','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('bob','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('jane','ROLE_USER');"); - - // Now create an ACL entry for the root directory - SecurityContextHolder.getContext().setAuthentication( - new UsernamePasswordAuthenticationToken("rod", "ignored", AuthorityUtils - .createAuthorityList(("ROLE_IGNORED")))); - - addPermission(documentDao, Directory.ROOT_DIRECTORY, "ROLE_USER", - LEVEL_GRANT_WRITE); - - // Now go off and create some directories and files for our users - createSampleData("rod", "koala"); - createSampleData("dianne", "emu"); - createSampleData("scott", "wombat"); - - } - - /** - * Creates a directory for the user, and a series of sub-directories. The root - * directory is the parent for the user directory. The sub-directories are - * "confidential" and "shared". The ROLE_USER will be given read and write access to - * "shared". - */ - private void createSampleData(String username, String password) { - Assert.notNull(documentDao, "DocumentDao required"); - Assert.hasText(username, "Username required"); - - Authentication auth = new UsernamePasswordAuthenticationToken(username, password); - - try { - // Set the SecurityContextHolder ThreadLocal so any subclasses - // automatically know which user is operating - SecurityContextHolder.getContext().setAuthentication(auth); - - // Create the home directory first - Directory home = new Directory(username, Directory.ROOT_DIRECTORY); - documentDao.create(home); - addPermission(documentDao, home, username, LEVEL_GRANT_ADMIN); - addPermission(documentDao, home, "ROLE_USER", LEVEL_GRANT_READ); - createFiles(documentDao, home); - - // Now create the confidential directory - Directory confid = new Directory("confidential", home); - documentDao.create(confid); - addPermission(documentDao, confid, "ROLE_USER", LEVEL_NEGATE_READ); - createFiles(documentDao, confid); - - // Now create the shared directory - Directory shared = new Directory("shared", home); - documentDao.create(shared); - addPermission(documentDao, shared, "ROLE_USER", LEVEL_GRANT_READ); - addPermission(documentDao, shared, "ROLE_USER", LEVEL_GRANT_WRITE); - createFiles(documentDao, shared); - } - finally { - // Clear the SecurityContextHolder ThreadLocal so future calls are - // guaranteed to be clean - SecurityContextHolder.clearContext(); - } - } - - private void createFiles(DocumentDao documentDao, Directory parent) { - Assert.notNull(documentDao, "DocumentDao required"); - Assert.notNull(parent, "Parent required"); - int countBeforeInsert = documentDao.findElements(parent).length; - for (int i = 0; i < 10; i++) { - File file = new File("file_" + i + ".txt", parent); - documentDao.create(file); - } - Assert.isTrue(countBeforeInsert + 10 == documentDao.findElements(parent).length, - "Failed to increase count by 10"); - } - - /** - * Allows subclass to add permissions. - * - * @param documentDao that will presumably offer methods to enable the operation to be - * completed - * @param element to the subject of the new permissions - * @param recipient to receive permission (if it starts with ROLE_ it is assumed to be - * a GrantedAuthority, else it is a username) - * @param level based on the static final integer fields on this class - */ - protected void addPermission(DocumentDao documentDao, AbstractElement element, - String recipient, int level) { - } -} diff --git a/samples/xml/dms/src/main/java/sample/dms/Directory.java b/samples/xml/dms/src/main/java/sample/dms/Directory.java deleted file mode 100755 index 06a0b20991..0000000000 --- a/samples/xml/dms/src/main/java/sample/dms/Directory.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.dms; - -/** - * - * @author Ben Alex - * - */ -public class Directory extends AbstractElement { - public static final Directory ROOT_DIRECTORY = new Directory(); - - private Directory() { - } - - public Directory(String name, Directory parent) { - super(name, parent); - } - - @Override - public String toString() { - return "Directory[fullName='" + getFullName() + "'; name='" + getName() - + "'; id='" + getId() + "'; parent='" + getParent() + "']"; - } - -} diff --git a/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java b/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java deleted file mode 100755 index 1419d02808..0000000000 --- a/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.dms; - -/** - * - * @author Ben Alex - * - */ -public interface DocumentDao { - /** - * Creates an entry in the database for the element. - * - * @param element an unsaved element (the "id" will be updated after method is - * invoked) - */ - void create(AbstractElement element); - - /** - * Removes a file from the database for the specified element. - * - * @param file the file to remove (cannot be null) - */ - void delete(File file); - - /** - * Modifies a file in the database. - * - * @param file the file to update (cannot be null) - */ - void update(File file); - - /** - * Locates elements in the database which appear under the presented directory - * - * @param directory the directory (cannot be null - use - * {@link Directory#ROOT_DIRECTORY} for root) - * @return zero or more elements in the directory (an empty array may be returned - - * never null) - */ - AbstractElement[] findElements(Directory directory); -} diff --git a/samples/xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java b/samples/xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java deleted file mode 100755 index 0d83bf75f7..0000000000 --- a/samples/xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.dms; - -import java.util.List; - -import org.springframework.jdbc.core.support.JdbcDaoSupport; -import org.springframework.security.util.FieldUtils; -import org.springframework.transaction.support.TransactionSynchronizationManager; -import org.springframework.util.Assert; - -/** - * Basic JDBC implementation of {@link DocumentDao}. - * - * @author Ben Alex - */ -public class DocumentDaoImpl extends JdbcDaoSupport implements DocumentDao { - - private static final String INSERT_INTO_DIRECTORY = "insert into directory(directory_name, parent_directory_id) values (?,?)"; - private static final String INSERT_INTO_FILE = "insert into file(file_name, content, parent_directory_id) values (?,?,?)"; - private static final String SELECT_FROM_DIRECTORY = "select id from directory where parent_directory_id = ?"; - private static final String SELECT_FROM_DIRECTORY_NULL = "select id from directory where parent_directory_id is null"; - private static final String SELECT_FROM_FILE = "select id, file_name, content, parent_directory_id from file where parent_directory_id = ?"; - private static final String SELECT_FROM_DIRECTORY_SINGLE = "select id, directory_name, parent_directory_id from directory where id = ?"; - private static final String DELETE_FROM_FILE = "delete from file where id = ?"; - private static final String UPDATE_FILE = "update file set content = ? where id = ?"; - private static final String SELECT_IDENTITY = "call identity()"; - - private Long obtainPrimaryKey() { - Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(), - "Transaction must be running"); - return getJdbcTemplate().queryForObject(SELECT_IDENTITY, Long.class); - } - - public void create(AbstractElement element) { - Assert.notNull(element, "Element required"); - Assert.isNull(element.getId(), "Element has previously been saved"); - if (element instanceof Directory) { - Directory directory = (Directory) element; - Long parentId = directory.getParent() == null ? null : directory.getParent() - .getId(); - getJdbcTemplate().update(INSERT_INTO_DIRECTORY, - new Object[] { directory.getName(), parentId }); - FieldUtils.setProtectedFieldValue("id", directory, obtainPrimaryKey()); - } - else if (element instanceof File) { - File file = (File) element; - Long parentId = file.getParent() == null ? null : file.getParent().getId(); - getJdbcTemplate().update(INSERT_INTO_FILE, - new Object[] { file.getName(), file.getContent(), parentId }); - FieldUtils.setProtectedFieldValue("id", file, obtainPrimaryKey()); - } - else { - throw new IllegalArgumentException("Unsupported AbstractElement"); - } - } - - public void delete(File file) { - Assert.notNull(file, "File required"); - Assert.notNull(file.getId(), "File ID required"); - getJdbcTemplate().update(DELETE_FROM_FILE, new Object[] { file.getId() }); - } - - /** Executes recursive SQL as needed to build a full Directory hierarchy of objects */ - private Directory getDirectoryWithImmediateParentPopulated(final Long id) { - return getJdbcTemplate().queryForObject(SELECT_FROM_DIRECTORY_SINGLE, - new Object[] { id }, (rs, rowNumber) -> { - Long parentDirectoryId = rs - .getLong("parent_directory_id"); - Directory parentDirectory = Directory.ROOT_DIRECTORY; - if (parentDirectoryId != null - && !parentDirectoryId.equals(-1L)) { - // Need to go and lookup the parent, so do that first - parentDirectory = getDirectoryWithImmediateParentPopulated(parentDirectoryId); - } - Directory directory = new Directory(rs - .getString("directory_name"), parentDirectory); - FieldUtils.setProtectedFieldValue("id", directory, - rs.getLong("id")); - return directory; - }); - } - - public AbstractElement[] findElements(Directory directory) { - Assert.notNull(directory, - "Directory required (the ID can be null to refer to root)"); - if (directory.getId() == null) { - List directories = getJdbcTemplate().query( - SELECT_FROM_DIRECTORY_NULL, (rs, rowNumber) -> getDirectoryWithImmediateParentPopulated(rs - .getLong("id"))); - return directories.toArray(new AbstractElement[] {}); - } - List directories = getJdbcTemplate().query( - SELECT_FROM_DIRECTORY, new Object[] { directory.getId() }, - (rs, rowNumber) -> getDirectoryWithImmediateParentPopulated(rs - .getLong("id"))); - List files = getJdbcTemplate().query(SELECT_FROM_FILE, - new Object[] { directory.getId() }, (rs, rowNumber) -> { - Long parentDirectoryId = rs - .getLong("parent_directory_id"); - Directory parentDirectory = null; - if (parentDirectoryId != null) { - parentDirectory = getDirectoryWithImmediateParentPopulated(parentDirectoryId); - } - File file = new File(rs.getString("file_name"), parentDirectory); - FieldUtils.setProtectedFieldValue("id", file, - rs.getLong("id")); - return file; - }); - // Add the File elements after the Directory elements - directories.addAll(files); - return directories.toArray(new AbstractElement[] {}); - } - - public void update(File file) { - Assert.notNull(file, "File required"); - Assert.notNull(file.getId(), "File ID required"); - getJdbcTemplate().update(UPDATE_FILE, - new Object[] { file.getContent(), file.getId() }); - } - -} diff --git a/samples/xml/dms/src/main/java/sample/dms/File.java b/samples/xml/dms/src/main/java/sample/dms/File.java deleted file mode 100755 index 1ceaf8ecdb..0000000000 --- a/samples/xml/dms/src/main/java/sample/dms/File.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.dms; - -import org.springframework.util.Assert; - -/** - * - * @author Ben Alex - */ -public class File extends AbstractElement { - /** Content of the file, which can be null */ - private String content; - - public File(String name, Directory parent) { - super(name, parent); - Assert.isTrue(!parent.equals(Directory.ROOT_DIRECTORY), - "Cannot insert File into root directory"); - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - @Override - public String toString() { - return "File[fullName='" + getFullName() + "'; name='" + getName() + "'; id='" - + getId() + "'; content=" + getContent() + "'; parent='" + getParent() - + "']"; - } - -} diff --git a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java deleted file mode 100755 index 7487c73db7..0000000000 --- a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.dms.secured; - -import javax.sql.DataSource; - -import org.springframework.security.acls.domain.BasePermission; -import org.springframework.security.acls.domain.GrantedAuthoritySid; -import org.springframework.security.acls.domain.ObjectIdentityImpl; -import org.springframework.security.acls.domain.PrincipalSid; -import org.springframework.security.acls.model.MutableAcl; -import org.springframework.security.acls.model.MutableAclService; -import org.springframework.security.acls.model.NotFoundException; -import org.springframework.security.acls.model.ObjectIdentity; -import org.springframework.security.acls.model.Permission; -import org.springframework.security.acls.model.Sid; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.util.Assert; - -import sample.dms.AbstractElement; -import sample.dms.DataSourcePopulator; -import sample.dms.DocumentDao; - -public class SecureDataSourcePopulator extends DataSourcePopulator { - - private MutableAclService aclService; - - public SecureDataSourcePopulator(DataSource dataSource, - SecureDocumentDao documentDao, MutableAclService aclService) { - super(dataSource, documentDao); - Assert.notNull(aclService, "MutableAclService required"); - this.aclService = aclService; - } - - protected void addPermission(DocumentDao documentDao, AbstractElement element, - String recipient, int level) { - Assert.notNull(documentDao, "DocumentDao required"); - Assert.isInstanceOf(SecureDocumentDao.class, documentDao, - "DocumentDao should have been a SecureDocumentDao"); - Assert.notNull(element, "Element required"); - Assert.hasText(recipient, "Recipient required"); - Assert.notNull(SecurityContextHolder.getContext().getAuthentication(), - "SecurityContextHolder must contain an Authentication"); - - // We need SecureDocumentDao to assign different permissions - // SecureDocumentDao dao = (SecureDocumentDao) documentDao; - - // We need to construct an ACL-specific Sid. Note the prefix contract is defined - // on the superclass method's JavaDocs - Sid sid = null; - if (recipient.startsWith("ROLE_")) { - sid = new GrantedAuthoritySid(recipient); - } - else { - sid = new PrincipalSid(recipient); - } - - // We need to identify the target domain object and create an ObjectIdentity for - // it - // This works because AbstractElement has a "getId()" method - ObjectIdentity identity = new ObjectIdentityImpl(element); - // ObjectIdentity identity = new ObjectIdentityImpl(element.getClass(), - // element.getId()); // equivalent - - // Next we need to create a Permission - Permission permission = null; - if (level == LEVEL_NEGATE_READ || level == LEVEL_GRANT_READ) { - permission = BasePermission.READ; - } - else if (level == LEVEL_GRANT_WRITE) { - permission = BasePermission.WRITE; - } - else if (level == LEVEL_GRANT_ADMIN) { - permission = BasePermission.ADMINISTRATION; - } - else { - throw new IllegalArgumentException("Unsupported LEVEL_"); - } - - // Attempt to retrieve the existing ACL, creating an ACL if it doesn't already - // exist for this ObjectIdentity - MutableAcl acl = null; - try { - acl = (MutableAcl) aclService.readAclById(identity); - } - catch (NotFoundException nfe) { - acl = aclService.createAcl(identity); - Assert.notNull(acl, "Acl could not be retrieved or created"); - } - - // Now we have an ACL, add another ACE to it - if (level == LEVEL_NEGATE_READ) { - acl.insertAce(acl.getEntries().size(), permission, sid, false); // not - // granting - } - else { - acl.insertAce(acl.getEntries().size(), permission, sid, true); // granting - } - - // Finally, persist the modified ACL - aclService.updateAcl(acl); - } - -} diff --git a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java deleted file mode 100755 index d4132d2979..0000000000 --- a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.dms.secured; - -import sample.dms.DocumentDao; - -/** - * Extends the {@link DocumentDao} and introduces ACL-related methods. - * - * @author Ben Alex - * - */ -public interface SecureDocumentDao extends DocumentDao { - /** - * @return all the usernames existing in the system. - */ - String[] getUsers(); -} diff --git a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java deleted file mode 100755 index caae4574b3..0000000000 --- a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.dms.secured; - -import org.springframework.security.acls.domain.BasePermission; -import org.springframework.security.acls.domain.ObjectIdentityImpl; -import org.springframework.security.acls.domain.PrincipalSid; -import org.springframework.security.acls.model.MutableAcl; -import org.springframework.security.acls.model.MutableAclService; -import org.springframework.security.acls.model.ObjectIdentity; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.util.Assert; - -import sample.dms.AbstractElement; -import sample.dms.DocumentDaoImpl; - -/** - * Adds extra {@link SecureDocumentDao} methods. - * - * @author Ben Alex - * - */ -public class SecureDocumentDaoImpl extends DocumentDaoImpl implements SecureDocumentDao { - - private static final String SELECT_FROM_USERS = "SELECT USERNAME FROM USERS ORDER BY USERNAME"; - private MutableAclService mutableAclService; - - public SecureDocumentDaoImpl(MutableAclService mutableAclService) { - Assert.notNull(mutableAclService, "MutableAclService required"); - this.mutableAclService = mutableAclService; - } - - public String[] getUsers() { - return getJdbcTemplate().query(SELECT_FROM_USERS, - (rs, rowNumber) -> rs.getString("USERNAME")).toArray(new String[] {}); - } - - public void create(AbstractElement element) { - super.create(element); - - // Create an ACL identity for this element - ObjectIdentity identity = new ObjectIdentityImpl(element); - MutableAcl acl = mutableAclService.createAcl(identity); - - // If the AbstractElement has a parent, go and retrieve its identity (it should - // already exist) - if (element.getParent() != null) { - ObjectIdentity parentIdentity = new ObjectIdentityImpl(element.getParent()); - MutableAcl aclParent = (MutableAcl) mutableAclService - .readAclById(parentIdentity); - acl.setParent(aclParent); - } - acl.insertAce(acl.getEntries().size(), BasePermission.ADMINISTRATION, - new PrincipalSid(SecurityContextHolder.getContext().getAuthentication()), - true); - - mutableAclService.updateAcl(acl); - } -} diff --git a/samples/xml/dms/src/main/resources/applicationContext-dms-insecure.xml b/samples/xml/dms/src/main/resources/applicationContext-dms-insecure.xml deleted file mode 100755 index 4ad7faf023..0000000000 --- a/samples/xml/dms/src/main/resources/applicationContext-dms-insecure.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - sample.dms.DocumentDao.*=PROPAGATION_REQUIRED - - - - - - - - - - - - - - - diff --git a/samples/xml/dms/src/main/resources/applicationContext-dms-secure.xml b/samples/xml/dms/src/main/resources/applicationContext-dms-secure.xml deleted file mode 100755 index 5a291d3844..0000000000 --- a/samples/xml/dms/src/main/resources/applicationContext-dms-secure.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - sample.dms.secured.SecureDocumentDao.*=PROPAGATION_REQUIRED - sample.dms.DocumentDao.*=PROPAGATION_REQUIRED - org.springframework.security.acls.model.AclService.*=PROPAGATION_REQUIRED - org.springframework.security.acls.model.MutableAclService.*=PROPAGATION_REQUIRED - org.springframework.security.acls.jdbc.JdbcMutableAclService.*=PROPAGATION_REQUIRED - org.springframework.security.acls.jdbc.JdbcAclService.*=PROPAGATION_REQUIRED - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/dms/src/main/resources/applicationContext-dms-shared.xml b/samples/xml/dms/src/main/resources/applicationContext-dms-shared.xml deleted file mode 100755 index e65da9baf5..0000000000 --- a/samples/xml/dms/src/main/resources/applicationContext-dms-shared.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - diff --git a/samples/xml/dms/src/test/java/sample/DmsIntegrationTests.java b/samples/xml/dms/src/test/java/sample/DmsIntegrationTests.java deleted file mode 100644 index 11fbd3f6a6..0000000000 --- a/samples/xml/dms/src/test/java/sample/DmsIntegrationTests.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -import org.junit.After; -import org.junit.Test; -import sample.dms.AbstractElement; -import sample.dms.Directory; -import sample.dms.DocumentDao; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Basic integration test for DMS sample. - * - * @author Ben Alex - * - */ -@ContextConfiguration(locations = { "classpath:applicationContext-dms-shared.xml", - "classpath:applicationContext-dms-insecure.xml" }) -public class DmsIntegrationTests extends AbstractTransactionalJUnit4SpringContextTests { - - @Autowired - protected JdbcTemplate jdbcTemplate; - - @Autowired - protected DocumentDao documentDao; - - @After - public void clearContext() { - SecurityContextHolder.clearContext(); - } - - public void setDocumentDao(DocumentDao documentDao) { - this.documentDao = documentDao; - } - - @Test - public void testBasePopulation() { - assertThat(this.jdbcTemplate.queryForObject("select count(id) from DIRECTORY", - Integer.class)).isEqualTo(9); - assertThat((int) this.jdbcTemplate.queryForObject("select count(id) from FILE", - Integer.class)).isEqualTo(90); - assertThat(this.documentDao.findElements(Directory.ROOT_DIRECTORY).length) - .isEqualTo(3); - } - - @Test - public void testMarissaRetrieval() { - process("rod", "koala", false); - } - - @Test - public void testScottRetrieval() { - process("scott", "wombat", false); - } - - @Test - public void testDianneRetrieval() { - process("dianne", "emu", false); - } - - protected void process(String username, String password, boolean shouldBeFiltered) { - SecurityContextHolder.getContext().setAuthentication( - new UsernamePasswordAuthenticationToken(username, password)); - System.out.println("------ Test for username: " + username + " ------"); - AbstractElement[] rootElements = this.documentDao - .findElements(Directory.ROOT_DIRECTORY); - assertThat(rootElements).hasSize(3); - Directory homeDir = null; - Directory nonHomeDir = null; - for (AbstractElement rootElement : rootElements) { - if (rootElement.getName().equals(username)) { - homeDir = (Directory) rootElement; - } - else { - nonHomeDir = (Directory) rootElement; - } - } - System.out.println("Home directory......: " + homeDir.getFullName()); - System.out.println("Non-home directory..: " + nonHomeDir.getFullName()); - - AbstractElement[] homeElements = this.documentDao.findElements(homeDir); - assertThat(homeElements).hasSize(12); // confidential and shared - // directories, - // plus 10 files - - AbstractElement[] nonHomeElements = this.documentDao.findElements(nonHomeDir); - assertThat(nonHomeElements).hasSize(shouldBeFiltered ? 11 : 12); - - // cannot see the user's "confidential" sub-directory when filtering - - // Attempt to read the other user's confidential directory from the returned - // results - // Of course, we shouldn't find a "confidential" directory in the results if we're - // filtering - Directory nonHomeConfidentialDir = null; - for (AbstractElement nonHomeElement : nonHomeElements) { - if (nonHomeElement.getName().equals("confidential")) { - nonHomeConfidentialDir = (Directory) nonHomeElement; - } - } - - if (shouldBeFiltered) { - assertThat(nonHomeConfidentialDir) - .withFailMessage( - "Found confidential directory when we should not have") - .isNull(); - } - else { - System.out.println( - "Inaccessible dir....: " + nonHomeConfidentialDir.getFullName()); - assertThat(this.documentDao.findElements(nonHomeConfidentialDir).length) - .isEqualTo(10); // 10 - // files - // (no - // sub-directories) - } - - SecurityContextHolder.clearContext(); - } - -} diff --git a/samples/xml/dms/src/test/java/sample/SecureDmsIntegrationTests.java b/samples/xml/dms/src/test/java/sample/SecureDmsIntegrationTests.java deleted file mode 100644 index 63965afb26..0000000000 --- a/samples/xml/dms/src/test/java/sample/SecureDmsIntegrationTests.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; - -import org.springframework.test.context.ContextConfiguration; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Basic integration test for DMS sample when security has been added. - * - * @author Ben Alex - * - */ -@ContextConfiguration(locations = { "classpath:applicationContext-dms-shared.xml", - "classpath:applicationContext-dms-secure.xml" }) -public class SecureDmsIntegrationTests extends DmsIntegrationTests { - - @Override - @Test - public void testBasePopulation() { - assertThat(this.jdbcTemplate.queryForObject("select count(id) from DIRECTORY", - Integer.class)).isEqualTo(9); - assertThat(this.jdbcTemplate.queryForObject("select count(id) from FILE", - Integer.class)).isEqualTo(90); - assertThat(this.jdbcTemplate.queryForObject("select count(id) from ACL_SID", - Integer.class)).isEqualTo(4); // 3 users + 1 role - assertThat(this.jdbcTemplate.queryForObject("select count(id) from ACL_CLASS", - Integer.class)).isEqualTo(2); // Directory - // and - // File - assertThat(this.jdbcTemplate.queryForObject( - "select count(id) from ACL_OBJECT_IDENTITY", Integer.class)) - .isEqualTo(100); - assertThat(this.jdbcTemplate.queryForObject("select count(id) from ACL_ENTRY", - Integer.class)).isEqualTo(115); - } - - @Override - public void testMarissaRetrieval() { - process("rod", "koala", true); - } - - @Override - public void testScottRetrieval() { - process("scott", "wombat", true); - } - - @Override - public void testDianneRetrieval() { - process("dianne", "emu", true); - } -} diff --git a/samples/xml/dms/src/test/resources/logback-test.xml b/samples/xml/dms/src/test/resources/logback-test.xml deleted file mode 100644 index 2d51ba4180..0000000000 --- a/samples/xml/dms/src/test/resources/logback-test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - diff --git a/samples/xml/gae/README.adoc b/samples/xml/gae/README.adoc deleted file mode 100644 index fd3f646b98..0000000000 --- a/samples/xml/gae/README.adoc +++ /dev/null @@ -1,5 +0,0 @@ -A sample using Google App Engine. To run it use: - ----- -$ ../../gradlew appengineRun ----- \ No newline at end of file diff --git a/samples/xml/gae/spring-security-samples-xml-gae.gradle b/samples/xml/gae/spring-security-samples-xml-gae.gradle deleted file mode 100644 index 01c5e86f45..0000000000 --- a/samples/xml/gae/spring-security-samples-xml-gae.gradle +++ /dev/null @@ -1,44 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' -apply plugin: 'com.google.cloud.tools.appengine' - -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.5' - } -} - - -// Remove logback as it causes security issues with GAE. -configurations.runtime.exclude(group: 'ch.qos.logback') - -dependencies { - compile "com.google.appengine:appengine:$gaeVersion" - - compile project(':spring-security-core') - compile project(':spring-security-taglibs') - compile project(':spring-security-web') - compile jstlDependencies - compile slf4jDependencies - compile "com.google.appengine:appengine-api-1.0-sdk:$gaeVersion" - compile "com.google.appengine:appengine-api-stubs:$gaeVersion" - compile 'javax.validation:validation-api' - compile 'org.hibernate:hibernate-validator' - compile 'org.springframework:spring-beans' - compile 'org.springframework:spring-context' - compile 'org.springframework:spring-context-support' - compile 'org.springframework:spring-web' - compile 'org.springframework:spring-webmvc' - - providedCompile 'javax.servlet:javax.servlet-api' - - runtime project(':spring-security-config') - - testCompile "com.google.appengine:appengine-testing:$gaeVersion" - - testRuntime "com.google.appengine:appengine-api-labs:$gaeVersion" -} - -appengineRun.onlyIf { !gradle.taskGraph.hasTask(appengineFunctionalTest) } diff --git a/samples/xml/gae/src/main/java/samples/gae/security/AppRole.java b/samples/xml/gae/src/main/java/samples/gae/security/AppRole.java deleted file mode 100644 index 84743e6044..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/security/AppRole.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.security; - -import org.springframework.security.core.GrantedAuthority; - -/** - * @author Luke Taylor - */ -public enum AppRole implements GrantedAuthority { - ADMIN(0), NEW_USER(1), USER(2); - - private final int bit; - - /** - * Creates an authority with a specific bit representation. It's important that this - * doesn't change as it will be used in the database. The enum ordinal is less - * reliable as the enum may be reordered or have new roles inserted which would change - * the ordinal values. - * - * @param bit the permission bit which will represent this authority in the datastore. - */ - AppRole(int bit) { - this.bit = bit; - } - - public int getBit() { - return bit; - } - - public String getAuthority() { - return "ROLE_"+toString(); - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/security/GaeAuthenticationFilter.java b/samples/xml/gae/src/main/java/samples/gae/security/GaeAuthenticationFilter.java deleted file mode 100644 index 838529efe3..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/security/GaeAuthenticationFilter.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.security; - -import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.google.appengine.api.users.User; -import com.google.appengine.api.users.UserServiceFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.authentication.AuthenticationDetailsSource; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.web.authentication.AuthenticationFailureHandler; -import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; -import org.springframework.security.web.authentication.WebAuthenticationDetails; -import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; -import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken; -import org.springframework.util.Assert; -import org.springframework.web.filter.GenericFilterBean; -import samples.gae.users.GaeUser; - -/** - * @author Luke Taylor - */ -public class GaeAuthenticationFilter extends GenericFilterBean { - private static final String REGISTRATION_URL = "/register.htm"; - - private final Logger logger = LoggerFactory.getLogger(getClass()); - - private final AuthenticationDetailsSource ads = new WebAuthenticationDetailsSource(); - private AuthenticationManager authenticationManager; - private AuthenticationFailureHandler failureHandler = new SimpleUrlAuthenticationFailureHandler(); - - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - Authentication authentication = SecurityContextHolder.getContext() - .getAuthentication(); - User googleUser = UserServiceFactory.getUserService().getCurrentUser(); - - if (authentication != null - && !loggedInUserMatchesGaeUser(authentication, googleUser)) { - SecurityContextHolder.clearContext(); - authentication = null; - ((HttpServletRequest) request).getSession().invalidate(); - } - - if (authentication == null) { - if (googleUser != null) { - logger.debug("Currently logged on to GAE as user " + googleUser); - logger.debug("Authenticating to Spring Security"); - // User has returned after authenticating via GAE. Need to authenticate - // through Spring Security. - PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken( - googleUser, null); - token.setDetails(ads.buildDetails((HttpServletRequest) request)); - - try { - authentication = authenticationManager.authenticate(token); - SecurityContextHolder.getContext().setAuthentication(authentication); - - if (authentication.getAuthorities().contains(AppRole.NEW_USER)) { - logger.debug("New user authenticated. Redirecting to registration page"); - ((HttpServletResponse) response).sendRedirect(REGISTRATION_URL); - - return; - } - - } - catch (AuthenticationException e) { - failureHandler.onAuthenticationFailure((HttpServletRequest) request, - (HttpServletResponse) response, e); - - return; - } - } - } - - chain.doFilter(request, response); - } - - private boolean loggedInUserMatchesGaeUser(Authentication authentication, - User googleUser) { - assert authentication != null; - - if (googleUser == null) { - // User has logged out of GAE but is still logged into application - return false; - } - - GaeUser gaeUser = (GaeUser) authentication.getPrincipal(); - - if (!gaeUser.getEmail().equals(googleUser.getEmail())) { - return false; - } - - return true; - - } - - @Override - public void afterPropertiesSet() { - Assert.notNull(authenticationManager, "AuthenticationManager must be set"); - } - - public void setAuthenticationManager(AuthenticationManager authenticationManager) { - this.authenticationManager = authenticationManager; - } - - public void setFailureHandler(AuthenticationFailureHandler failureHandler) { - this.failureHandler = failureHandler; - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/security/GaeUserAuthentication.java b/samples/xml/gae/src/main/java/samples/gae/security/GaeUserAuthentication.java deleted file mode 100644 index 961ea99952..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/security/GaeUserAuthentication.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.security; - -import java.util.Collection; -import java.util.HashSet; - -import org.springframework.security.core.Authentication; -import org.springframework.security.core.GrantedAuthority; -import samples.gae.users.GaeUser; - -/** - * Authentication object representing a fully-authenticated user. - * - * @author Luke Taylor - */ -public class GaeUserAuthentication implements Authentication { - private final GaeUser principal; - private final Object details; - private boolean authenticated; - - public GaeUserAuthentication(GaeUser principal, Object details) { - this.principal = principal; - this.details = details; - authenticated = true; - } - - public Collection getAuthorities() { - return new HashSet<>(principal.getAuthorities()); - } - - public Object getCredentials() { - throw new UnsupportedOperationException(); - } - - public Object getDetails() { - return null; - } - - public Object getPrincipal() { - return principal; - } - - public boolean isAuthenticated() { - return authenticated; - } - - public void setAuthenticated(boolean isAuthenticated) { - authenticated = isAuthenticated; - } - - public String getName() { - return principal.getUserId(); - } - - @Override - public String toString() { - return "GaeUserAuthentication{" + "principal=" + principal + ", details=" - + details + ", authenticated=" + authenticated + '}'; - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java b/samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java deleted file mode 100644 index 4929c73cc4..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.security; - -import java.io.IOException; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.AuthenticationEntryPoint; - -import com.google.appengine.api.users.UserService; -import com.google.appengine.api.users.UserServiceFactory; - -public class GoogleAccountsAuthenticationEntryPoint implements AuthenticationEntryPoint { - - public void commence(HttpServletRequest request, HttpServletResponse response, - AuthenticationException authException) throws IOException { - UserService userService = UserServiceFactory.getUserService(); - - response.sendRedirect(userService.createLoginURL(request.getRequestURI())); - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java b/samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java deleted file mode 100644 index 6a8f1a37ae..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.security; - -import com.google.appengine.api.users.User; -import org.springframework.context.MessageSource; -import org.springframework.context.MessageSourceAware; -import org.springframework.context.support.MessageSourceAccessor; -import org.springframework.security.authentication.AuthenticationProvider; -import org.springframework.security.authentication.DisabledException; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.SpringSecurityMessageSource; -import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken; -import samples.gae.users.GaeUser; -import samples.gae.users.UserRegistry; - -/** - * A simple authentication provider which interacts with {@code User} returned by the GAE - * {@code UserService}, and also the local persistent {@code UserRegistry} to build an - * application user principal. - *

    - * If the user has been authenticated through google accounts, it will check if they are - * already registered and either load the existing user information or assign them a - * temporary identity with limited access until they have registered. - *

    - * If the account has been disabled, a {@code DisabledException} will be raised. - * - * @author Luke Taylor - */ -public class GoogleAccountsAuthenticationProvider implements AuthenticationProvider, - MessageSourceAware { - protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); - - private UserRegistry userRegistry; - - public Authentication authenticate(Authentication authentication) - throws AuthenticationException { - User googleUser = (User) authentication.getPrincipal(); - - GaeUser user = userRegistry.findUser(googleUser.getUserId()); - - if (user == null) { - // User not in registry. Needs to register - user = new GaeUser(googleUser.getUserId(), googleUser.getNickname(), - googleUser.getEmail()); - } - - if (!user.isEnabled()) { - throw new DisabledException("Account is disabled"); - } - - return new GaeUserAuthentication(user, authentication.getDetails()); - } - - /** - * Indicate that this provider only supports PreAuthenticatedAuthenticationToken - * (sub)classes. - */ - public final boolean supports(Class authentication) { - return PreAuthenticatedAuthenticationToken.class.isAssignableFrom(authentication); - } - - public void setUserRegistry(UserRegistry userRegistry) { - this.userRegistry = userRegistry; - } - - public void setMessageSource(MessageSource messageSource) { - this.messages = new MessageSourceAccessor(messageSource); - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java b/samples/xml/gae/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java deleted file mode 100644 index ea5b5c29b4..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.users; - -import com.google.appengine.api.datastore.DatastoreService; -import com.google.appengine.api.datastore.DatastoreServiceFactory; -import com.google.appengine.api.datastore.Entity; -import com.google.appengine.api.datastore.EntityNotFoundException; -import com.google.appengine.api.datastore.Key; -import com.google.appengine.api.datastore.KeyFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import samples.gae.security.AppRole; - -import java.util.*; - -/** - * UserRegistry implementation which uses GAE's low-level Datastore APIs. - * - * @author Luke Taylor - */ -public class GaeDatastoreUserRegistry implements UserRegistry { - private final Logger logger = LoggerFactory.getLogger(getClass()); - - private static final String USER_TYPE = "GaeUser"; - private static final String USER_FORENAME = "forename"; - private static final String USER_SURNAME = "surname"; - private static final String USER_NICKNAME = "nickname"; - private static final String USER_EMAIL = "email"; - private static final String USER_ENABLED = "enabled"; - private static final String USER_AUTHORITIES = "authorities"; - - public GaeUser findUser(String userId) { - Key key = KeyFactory.createKey(USER_TYPE, userId); - DatastoreService datastore = DatastoreServiceFactory.getDatastoreService(); - - try { - Entity user = datastore.get(key); - - long binaryAuthorities = (Long) user.getProperty(USER_AUTHORITIES); - Set roles = EnumSet.noneOf(AppRole.class); - - for (AppRole r : AppRole.values()) { - if ((binaryAuthorities & (1 << r.getBit())) != 0) { - roles.add(r); - } - } - - GaeUser gaeUser = new GaeUser(user.getKey().getName(), - (String) user.getProperty(USER_NICKNAME), - (String) user.getProperty(USER_EMAIL), - (String) user.getProperty(USER_FORENAME), - (String) user.getProperty(USER_SURNAME), roles, - (Boolean) user.getProperty(USER_ENABLED)); - - return gaeUser; - - } - catch (EntityNotFoundException e) { - logger.debug(userId + " not found in datastore"); - return null; - } - } - - public void registerUser(GaeUser newUser) { - logger.debug("Attempting to create new user " + newUser); - - Key key = KeyFactory.createKey(USER_TYPE, newUser.getUserId()); - Entity user = new Entity(key); - user.setProperty(USER_EMAIL, newUser.getEmail()); - user.setProperty(USER_NICKNAME, newUser.getNickname()); - user.setProperty(USER_FORENAME, newUser.getForename()); - user.setProperty(USER_SURNAME, newUser.getSurname()); - user.setUnindexedProperty(USER_ENABLED, newUser.isEnabled()); - - Collection roles = newUser.getAuthorities(); - - long binaryAuthorities = 0; - - for (AppRole r : roles) { - binaryAuthorities |= 1 << r.getBit(); - } - - user.setUnindexedProperty(USER_AUTHORITIES, binaryAuthorities); - - DatastoreService datastore = DatastoreServiceFactory.getDatastoreService(); - datastore.put(user); - } - - public void removeUser(String userId) { - DatastoreService datastore = DatastoreServiceFactory.getDatastoreService(); - Key key = KeyFactory.createKey(USER_TYPE, userId); - - datastore.delete(key); - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/users/GaeUser.java b/samples/xml/gae/src/main/java/samples/gae/users/GaeUser.java deleted file mode 100644 index 0d167aa5d7..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/users/GaeUser.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.users; - -import java.io.Serializable; -import java.util.Collection; -import java.util.EnumSet; -import java.util.Set; - -import samples.gae.security.AppRole; - -/** - * Custom user object for the application. - * - * @author Luke Taylor - */ -public class GaeUser implements Serializable { - private final String userId; - private final String email; - private final String nickname; - private final String forename; - private final String surname; - private final Set authorities; - private final boolean enabled; - - /** - * Pre-registration constructor. - * - * Assigns the user the "NEW_USER" role only. - */ - public GaeUser(String userId, String nickname, String email) { - this.userId = userId; - this.nickname = nickname; - this.authorities = EnumSet.of(AppRole.NEW_USER); - this.forename = null; - this.surname = null; - this.email = email; - this.enabled = true; - } - - /** - * Post-registration constructor - */ - public GaeUser(String userId, String nickname, String email, String forename, - String surname, Set authorities, boolean enabled) { - this.userId = userId; - this.nickname = nickname; - this.email = email; - this.authorities = authorities; - this.forename = forename; - this.surname = surname; - this.enabled = enabled; - } - - public String getUserId() { - return userId; - } - - public String getNickname() { - return nickname; - } - - public String getEmail() { - return email; - } - - public String getForename() { - return forename; - } - - public String getSurname() { - return surname; - } - - public boolean isEnabled() { - return enabled; - } - - public Collection getAuthorities() { - return authorities; - } - - @Override - public String toString() { - return "GaeUser{" + "userId='" + userId + '\'' + ", nickname='" + nickname + '\'' - + ", forename='" + forename + '\'' + ", surname='" + surname + '\'' - + ", authorities=" + authorities + '}'; - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java b/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java deleted file mode 100644 index be1e481b3f..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.users; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.util.Assert; - -/** - * @author Luke Taylor - */ -public class InMemoryUserRegistry implements UserRegistry { - private final Logger logger = LoggerFactory.getLogger(getClass()); - - private final Map users = Collections - .synchronizedMap(new HashMap<>()); - - public GaeUser findUser(String userId) { - return users.get(userId); - } - - public void registerUser(GaeUser newUser) { - logger.debug("Attempting to create new user " + newUser); - - Assert.isTrue(!users.containsKey(newUser.getUserId()), "user should not exist"); - - users.put(newUser.getUserId(), newUser); - } - - public void removeUser(String userId) { - users.remove(userId); - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/users/UserRegistry.java b/samples/xml/gae/src/main/java/samples/gae/users/UserRegistry.java deleted file mode 100644 index 8a53378e54..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/users/UserRegistry.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.users; - -/** - * - * Service used to maintain a list of users who are registered with the application. - * - * @author Luke Taylor - */ -public interface UserRegistry { - - GaeUser findUser(String userId); - - void registerUser(GaeUser newUser); - - void removeUser(String userId); -} diff --git a/samples/xml/gae/src/main/java/samples/gae/validation/Forename.java b/samples/xml/gae/src/main/java/samples/gae/validation/Forename.java deleted file mode 100644 index 3028c73c3c..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/validation/Forename.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.validation; - -import static java.lang.annotation.ElementType.*; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; - -/** - * @author Luke Taylor - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Constraint(validatedBy = ForenameValidator.class) -public @interface Forename { - String message() default "{samples.gae.forename}"; - - Class[] groups() default {}; - - Class[] payload() default {}; -} diff --git a/samples/xml/gae/src/main/java/samples/gae/validation/ForenameValidator.java b/samples/xml/gae/src/main/java/samples/gae/validation/ForenameValidator.java deleted file mode 100644 index 0e4d56bc31..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/validation/ForenameValidator.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.validation; - -import java.util.regex.Pattern; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -/** - * @author Luke Taylor - */ -public class ForenameValidator implements ConstraintValidator { - private static final Pattern VALID = Pattern.compile("[\\p{L}'\\-,.]+"); - - public void initialize(Forename constraintAnnotation) { - } - - public boolean isValid(String value, ConstraintValidatorContext context) { - return VALID.matcher(value).matches(); - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/validation/Surname.java b/samples/xml/gae/src/main/java/samples/gae/validation/Surname.java deleted file mode 100644 index 5f10e8f4c9..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/validation/Surname.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.validation; - -import static java.lang.annotation.ElementType.*; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; - -/** - * @author Luke Taylor - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RetentionPolicy.RUNTIME) -@Constraint(validatedBy = SurnameValidator.class) -public @interface Surname { - String message() default "{samples.gae.surname}"; - - Class[] groups() default {}; - - Class[] payload() default {}; -} diff --git a/samples/xml/gae/src/main/java/samples/gae/validation/SurnameValidator.java b/samples/xml/gae/src/main/java/samples/gae/validation/SurnameValidator.java deleted file mode 100644 index a894922c7f..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/validation/SurnameValidator.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.validation; - -import java.util.regex.Pattern; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -/** - * @author Luke Taylor - */ -public class SurnameValidator implements ConstraintValidator { - private static final Pattern VALID = Pattern.compile("[\\p{L}'\\-,.]+"); - - public void initialize(Surname constraintAnnotation) { - } - - public boolean isValid(String value, ConstraintValidatorContext context) { - return VALID.matcher(value).matches(); - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/web/GaeAppController.java b/samples/xml/gae/src/main/java/samples/gae/web/GaeAppController.java deleted file mode 100644 index c19ffb4194..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/web/GaeAppController.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.web; - -import java.io.IOException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.google.appengine.api.users.UserServiceFactory; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -/** - * - * @author Luke Taylor - * - */ -@Controller -public class GaeAppController { - - @RequestMapping(value = "/", method = RequestMethod.GET) - public String landing() { - return "landing"; - } - - @RequestMapping(value = "/home.htm", method = RequestMethod.GET) - public String home() { - return "home"; - } - - @RequestMapping(value = "/disabled.htm", method = RequestMethod.GET) - public String disabled() { - return "disabled"; - } - - @RequestMapping(value = "/logout.htm", method = RequestMethod.GET) - public void logout(HttpServletRequest request, HttpServletResponse response) - throws IOException { - request.getSession().invalidate(); - - String logoutUrl = UserServiceFactory.getUserService().createLogoutURL( - "/loggedout.htm"); - - response.sendRedirect(logoutUrl); - } - - @RequestMapping(value = "/loggedout.htm", method = RequestMethod.GET) - public String loggedOut() { - return "loggedout"; - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/web/RegistrationController.java b/samples/xml/gae/src/main/java/samples/gae/web/RegistrationController.java deleted file mode 100644 index 0a535a2a23..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/web/RegistrationController.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.web; - -import java.util.EnumSet; -import java.util.Set; - -import javax.validation.Valid; - -import com.google.appengine.api.users.UserServiceFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Controller; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import samples.gae.security.AppRole; -import samples.gae.security.GaeUserAuthentication; -import samples.gae.users.GaeUser; -import samples.gae.users.UserRegistry; - -/** - * @author Luke Taylor - */ -@Controller -@RequestMapping(value = "/register.htm") -public class RegistrationController { - - @Autowired - private UserRegistry registry; - - @RequestMapping(method = RequestMethod.GET) - public RegistrationForm registrationForm() { - return new RegistrationForm(); - } - - @RequestMapping(method = RequestMethod.POST) - public String register(@Valid RegistrationForm form, BindingResult result) { - if (result.hasErrors()) { - return null; - } - - Authentication authentication = SecurityContextHolder.getContext() - .getAuthentication(); - GaeUser currentUser = (GaeUser) authentication.getPrincipal(); - Set roles = EnumSet.of(AppRole.USER); - - if (UserServiceFactory.getUserService().isUserAdmin()) { - roles.add(AppRole.ADMIN); - } - - GaeUser user = new GaeUser(currentUser.getUserId(), currentUser.getNickname(), - currentUser.getEmail(), form.getForename(), form.getSurname(), roles, - true); - - registry.registerUser(user); - - // Update the context with the full authentication - SecurityContextHolder.getContext().setAuthentication( - new GaeUserAuthentication(user, authentication.getDetails())); - - return "redirect:/home.htm"; - } -} diff --git a/samples/xml/gae/src/main/java/samples/gae/web/RegistrationForm.java b/samples/xml/gae/src/main/java/samples/gae/web/RegistrationForm.java deleted file mode 100644 index 6001e532f0..0000000000 --- a/samples/xml/gae/src/main/java/samples/gae/web/RegistrationForm.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.web; - -import samples.gae.validation.Forename; -import samples.gae.validation.Surname; - -/** - * @author Luke Taylor - */ -public class RegistrationForm { - @Forename - private String forename; - @Surname - private String surname; - - public String getForename() { - return forename; - } - - public void setForename(String forename) { - this.forename = forename; - } - - public String getSurname() { - return surname; - } - - public void setSurname(String surname) { - this.surname = surname; - } -} diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/appengine-web.xml b/samples/xml/gae/src/main/webapp/WEB-INF/appengine-web.xml deleted file mode 100644 index 7dbd5e9820..0000000000 --- a/samples/xml/gae/src/main/webapp/WEB-INF/appengine-web.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - gaespringsec - 1 - true - true - - - - - diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml deleted file mode 100644 index 7153f5058f..0000000000 --- a/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/classes/ValidationMessages.properties b/samples/xml/gae/src/main/webapp/WEB-INF/classes/ValidationMessages.properties deleted file mode 100644 index d728550595..0000000000 --- a/samples/xml/gae/src/main/webapp/WEB-INF/classes/ValidationMessages.properties +++ /dev/null @@ -1,2 +0,0 @@ -samples.gae.forename=Must be a valid forename -samples.gae.surname=Must be a valid surname diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml b/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml deleted file mode 100644 index 573eef4dd7..0000000000 --- a/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/jsp/disabled.jsp b/samples/xml/gae/src/main/webapp/WEB-INF/jsp/disabled.jsp deleted file mode 100644 index 390c0f008e..0000000000 --- a/samples/xml/gae/src/main/webapp/WEB-INF/jsp/disabled.jsp +++ /dev/null @@ -1,16 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - -<%@page session="false" %> - - - - - - Disabled Account - -

    -

    Sorry, it looks like your account has been disabled for some reason...

    -
    - - - diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/jsp/home.jsp b/samples/xml/gae/src/main/webapp/WEB-INF/jsp/home.jsp deleted file mode 100644 index eb7bf065b7..0000000000 --- a/samples/xml/gae/src/main/webapp/WEB-INF/jsp/home.jsp +++ /dev/null @@ -1,26 +0,0 @@ -<%@ page import="com.google.appengine.api.users.UserServiceFactory" %> -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - - - - - Home Page - - -
    -

    The Home Page

    -

    Welcome back .

    -

    - You can get to this page if you have authenticated and are a registered user. - You are registered as - . -

    -

    - Logout. -

    -
    - - diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/jsp/landing.jsp b/samples/xml/gae/src/main/webapp/WEB-INF/jsp/landing.jsp deleted file mode 100644 index f9b305203d..0000000000 --- a/samples/xml/gae/src/main/webapp/WEB-INF/jsp/landing.jsp +++ /dev/null @@ -1,33 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@page session="false" %> - - - - - - - Spring Security GAE Sample - - - -
    -

    Spring Security GAE Application

    - -

    - This application demonstrates the integration of Spring Security - with the services provided by Google App Engine. It shows how to: -

      -
    • Authenticate using Google Accounts.
      • -
    • Implement "on–demand" authentication when a user accesses a secured resource.
      • -
    • Supplement the information from Google Accounts with application–specific roles.
      • -
    • Store user account data in an App Engine datastore using the native API.
      • -
    • Setup access-control restrictions based on the roles assigned to users.
      • -
    • Disable the accounts of specfic users to prevent access.
      • -
    -

    -

    - Go to the home page. -

    -
    - - diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/jsp/loggedout.jsp b/samples/xml/gae/src/main/webapp/WEB-INF/jsp/loggedout.jsp deleted file mode 100644 index 4bfb44537f..0000000000 --- a/samples/xml/gae/src/main/webapp/WEB-INF/jsp/loggedout.jsp +++ /dev/null @@ -1,17 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@page session="false" %> - - - - - - - Spring Security GAE Sample - - - -
    -

    You've been logged out of the application. Log back in.

    -
    - - diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/jsp/register.jsp b/samples/xml/gae/src/main/webapp/WEB-INF/jsp/register.jsp deleted file mode 100644 index 8aaf625afe..0000000000 --- a/samples/xml/gae/src/main/webapp/WEB-INF/jsp/register.jsp +++ /dev/null @@ -1,40 +0,0 @@ -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - - - -Registration - - -
    -

    -Welcome to the Spring Security GAE sample application, . -Please enter your registration details in order to use the application. -

    -

    -The data you enter here will be registered in the application's GAE data store, keyed under your unique -Google Accounts identifier. It doesn't have to be accurate. When you log in again, the information will be automatically -retrieved. -

    - - -
    - - Forename: -
    -
    - - - Surname: -
    -
    -
    - -     - -
    - diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/logging.properties b/samples/xml/gae/src/main/webapp/WEB-INF/logging.properties deleted file mode 100644 index 204b09d9c2..0000000000 --- a/samples/xml/gae/src/main/webapp/WEB-INF/logging.properties +++ /dev/null @@ -1,5 +0,0 @@ -.level = INFO - -samples.gae.level = FINER -org.springframework.level = INFO -org.springframework.security.level = FINER diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/web.xml b/samples/xml/gae/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index c123a5fef6..0000000000 --- a/samples/xml/gae/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - contextConfigLocation - - /WEB-INF/applicationContext-security.xml - - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - /* - - - - org.springframework.web.context.ContextLoaderListener - - - - gae - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - /WEB-INF/gae-servlet.xml - - - - - gae - / - - - - gae - *.htm - - - diff --git a/samples/xml/gae/src/main/webapp/favicon.ico b/samples/xml/gae/src/main/webapp/favicon.ico deleted file mode 100644 index 54371328f654e8dea8b34c7dee5c96f7402a9144..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmd5)El9P=;L{!Z(p`uk$Dk`6dKaVB(6qQH8(dq z0sa55y8A0*g1x9sI=2TVczv!SRlh)@`z-}OEn5~J>Su^g*AZRqAbh-p*4r3sY`M^& z4f{9HvrEM1n^-ztE43D%?tato$yF`t+4;<;F8g3#?T0hFCdv7B{D)5+_G4)bo6fKH zweZph=R&O_p7S~HGFG>zMs&Sb*5-UqIcXiQn&bJ!JjpMX*6?nrQ=Mn6ZozG`s>vRy zKU5$`_TM#e?Ywe#bAD>)ruCK2Ud*)he^m#xLZEH@*3rm!fPr*eBi-0Y;20T+ksgf9 X#P4z#VDJWfx;=cITmWVRxc~SDx#oF# diff --git a/samples/xml/gae/src/main/webapp/static/css/gae.css b/samples/xml/gae/src/main/webapp/static/css/gae.css deleted file mode 100644 index 40051c14af..0000000000 --- a/samples/xml/gae/src/main/webapp/static/css/gae.css +++ /dev/null @@ -1,26 +0,0 @@ - -body { - font-family:"Palatino Linotype","Book Antiqua",Palatino,serif; -} - -#content { - margin: 5em auto; - width: 40em; -} - -form { - width: 25em; - margin: 0 2em; -} - -form fieldset { - margin-bottom: 0.5em; -} - -fieldset input { - margin: 0.6em 0; -} - -.fieldError { - color: red; -} diff --git a/samples/xml/gae/src/test/java/samples/gae/security/AppRoleTests.java b/samples/xml/gae/src/test/java/samples/gae/security/AppRoleTests.java deleted file mode 100644 index 8db7aea192..0000000000 --- a/samples/xml/gae/src/test/java/samples/gae/security/AppRoleTests.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.security; - -import static org.assertj.core.api.Assertions.*; -import static samples.gae.security.AppRole.*; - -import org.junit.Test; -import org.springframework.security.core.GrantedAuthority; - -/** - * @author Luke Taylor - */ -public class AppRoleTests { - - @Test - public void getAuthorityReturnsRoleName() { - GrantedAuthority admin = ADMIN; - - assertThat(admin.getAuthority()).isEqualTo("ROLE_ADMIN"); - } - - @Test - public void bitsAreCorrect() { - // If this fails, someone has modified the Enum and the Datastore is probably - // corrupt! - assertThat(ADMIN.getBit()).isZero(); - assertThat(NEW_USER.getBit()).isEqualTo(1); - assertThat(USER.getBit()).isEqualTo(2); - } -} diff --git a/samples/xml/gae/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java b/samples/xml/gae/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java deleted file mode 100644 index 69e24d47a7..0000000000 --- a/samples/xml/gae/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.gae.users; - -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.EnumSet; -import java.util.Set; - -import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig; -import com.google.appengine.tools.development.testing.LocalServiceTestHelper; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import samples.gae.security.AppRole; - -/** - * @author Luke Taylor - */ -public class GaeDataStoreUserRegistryTests { - private final LocalServiceTestHelper helper = new LocalServiceTestHelper( - new LocalDatastoreServiceTestConfig()); - - @Before - public void setUp() { - helper.setUp(); - } - - @After - public void tearDown() { - helper.tearDown(); - } - - @Test - public void correctDataIsRetrievedAfterInsert() { - GaeDatastoreUserRegistry registry = new GaeDatastoreUserRegistry(); - - Set roles = EnumSet.of(AppRole.ADMIN, AppRole.USER); - String userId = "someUserId"; - - GaeUser origUser = new GaeUser(userId, "nick", "nick@blah.com", "Forename", - "Surname", roles, true); - - registry.registerUser(origUser); - - GaeUser loadedUser = registry.findUser(userId); - - assertThat(origUser.getUserId()).isEqualTo(loadedUser.getUserId()); - assertThat(loadedUser.isEnabled()).isEqualTo(true); - assertThat(loadedUser.getAuthorities()).isEqualTo(roles); - assertThat(loadedUser.getNickname()).isEqualTo("nick"); - assertThat(loadedUser.getEmail()).isEqualTo("nick@blah.com"); - assertThat(loadedUser.getForename()).isEqualTo("Forename"); - assertThat(loadedUser.getSurname()).isEqualTo("Surname"); - } -} diff --git a/samples/xml/gae/src/test/resources/logback-test.xml b/samples/xml/gae/src/test/resources/logback-test.xml deleted file mode 100644 index 2d51ba4180..0000000000 --- a/samples/xml/gae/src/test/resources/logback-test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - diff --git a/samples/xml/helloworld/spring-security-samples-xml-helloworld.gradle b/samples/xml/helloworld/spring-security-samples-xml-helloworld.gradle deleted file mode 100644 index 5bd5b1fd09..0000000000 --- a/samples/xml/helloworld/spring-security-samples-xml-helloworld.gradle +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ - -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-config') - compile project(':spring-security-web') - compile jstlDependencies - compile slf4jDependencies - compile 'javax.servlet.jsp:javax.servlet.jsp-api' - - providedCompile 'javax.servlet:javax.servlet-api' - - testCompile project(':spring-security-test') - testCompile 'org.skyscreamer:jsonassert' - testCompile 'org.springframework:spring-test' - - integrationTestCompile seleniumDependencies -} diff --git a/samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldXmlTests.java b/samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldXmlTests.java deleted file mode 100644 index 68abc3a173..0000000000 --- a/samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/HelloWorldXmlTests.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import org.springframework.security.samples.pages.HomePage; -import org.springframework.security.samples.pages.LoginPage; - -/** - * @author Michael Simons - */ -public class HelloWorldXmlTests { - - private WebDriver driver; - - private int port; - - @Before - public void setup() { - this.port = Integer.parseInt(System.getProperty("app.httpPort")); - this.driver = new HtmlUnitDriver(); - } - - @After - public void tearDown() { - this.driver.quit(); - } - - @Test - public void accessHomePageWithUnauthenticatedUserSendsToLoginPage() { - final LoginPage loginPage = HomePage.to(this.driver, this.port); - loginPage.assertAt(); - } - - @Test - public void authenticatedUserIsSentToOriginalPage() { - final HomePage homePage = HomePage.to(this.driver, this.port) - .loginForm() - .username("user") - .password("password") - .submit(); - homePage - .assertAt() - .andTheUserNameIsDisplayed(); - } - - @Test - public void authenticatedUserLogsOut() { - LoginPage loginPage = HomePage.to(this.driver, this.port) - .loginForm() - .username("user") - .password("password") - .submit() - .logout(); - loginPage.assertAt(); - - loginPage = HomePage.to(this.driver, this.port); - loginPage.assertAt(); - } -} diff --git a/samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java b/samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java deleted file mode 100644 index ed527c3957..0000000000 --- a/samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Michael Simons - */ -public class HomePage { - private final WebDriver webDriver; - - @FindBy(css = "p") - private WebElement message; - - @FindBy(css = "input[type=submit]") - private WebElement logoutButton; - - public static LoginPage to(WebDriver driver, int port) { - driver.get("http://localhost:" + port +"/"); - return PageFactory.initElements(driver, LoginPage.class); - } - - public HomePage(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public Content assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Hello Security"); - return PageFactory.initElements(this.webDriver, Content.class); - } - - public LoginPage logout() { - this.logoutButton.submit(); - return PageFactory.initElements(this.webDriver, LoginPage.class); - } - - public static class Content { - @FindBy(css = "p") - private WebElement message; - - public Content andTheUserNameIsDisplayed() { - assertThat(message.getText()).isEqualTo("Hello user"); - return this; - } - } -} diff --git a/samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java b/samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java deleted file mode 100644 index 30822ea2a9..0000000000 --- a/samples/xml/helloworld/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Michael Simons - */ -public class LoginPage { - - private final WebDriver webDriver; - - private final LoginForm loginForm; - - public LoginPage(WebDriver webDriver) { - this.webDriver = webDriver; - this.loginForm = PageFactory.initElements(this.webDriver, LoginForm.class); - } - - public LoginPage assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in"); - return this; - } - - public LoginForm loginForm() { - return this.loginForm; - } - - public static class LoginForm { - private WebDriver webDriver; - private WebElement username; - private WebElement password; - @FindBy(css = "button[type=submit]") - private WebElement submit; - - public LoginForm(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public LoginForm username(String username) { - this.username.sendKeys(username); - return this; - } - - public LoginForm password(String password) { - this.password.sendKeys(password); - return this; - } - - public HomePage submit() { - this.submit.click(); - return PageFactory.initElements(this.webDriver, HomePage.class); - } - } -} diff --git a/samples/xml/helloworld/src/main/resources/logback.xml b/samples/xml/helloworld/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/xml/helloworld/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/xml/helloworld/src/main/webapp/META-INF/MANIFEST.MF b/samples/xml/helloworld/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02ef..0000000000 --- a/samples/xml/helloworld/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml b/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml deleted file mode 100644 index f006442e92..0000000000 --- a/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml b/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 5e99e51420..0000000000 --- a/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - contextConfigLocation - - /WEB-INF/spring/*.xml - - - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - springSecurityFilterChain - /* - - - - - org.springframework.web.context.ContextLoaderListener - - diff --git a/samples/xml/helloworld/src/main/webapp/index.jsp b/samples/xml/helloworld/src/main/webapp/index.jsp deleted file mode 100644 index 8b4d7a3983..0000000000 --- a/samples/xml/helloworld/src/main/webapp/index.jsp +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - Hello Security - - - - - - - - - - - -
    -

    This is secured!

    -

    - Hello -

    - -
    - - -
    -
    - - -     diff --git a/samples/xml/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css b/samples/xml/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css deleted file mode 100644 index ba09bc8777..0000000000 --- a/samples/xml/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css +++ /dev/null @@ -1,1092 +0,0 @@ -/*! - * Bootstrap Responsive v2.2.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -@-ms-viewport { - width: device-width; -} - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.hidden { - display: none; - visibility: hidden; -} - -.visible-phone { - display: none !important; -} - -.visible-tablet { - display: none !important; -} - -.hidden-desktop { - display: none !important; -} - -.visible-desktop { - display: inherit !important; -} - -@media (min-width: 768px) and (max-width: 979px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important ; - } - .visible-tablet { - display: inherit !important; - } - .hidden-tablet { - display: none !important; - } -} - -@media (max-width: 767px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important; - } - .visible-phone { - display: inherit !important; - } - .hidden-phone { - display: none !important; - } -} - -@media (min-width: 1200px) { - .row { - margin-left: -30px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 30px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 1170px; - } - .span12 { - width: 1170px; - } - .span11 { - width: 1070px; - } - .span10 { - width: 970px; - } - .span9 { - width: 870px; - } - .span8 { - width: 770px; - } - .span7 { - width: 670px; - } - .span6 { - width: 570px; - } - .span5 { - width: 470px; - } - .span4 { - width: 370px; - } - .span3 { - width: 270px; - } - .span2 { - width: 170px; - } - .span1 { - width: 70px; - } - .offset12 { - margin-left: 1230px; - } - .offset11 { - margin-left: 1130px; - } - .offset10 { - margin-left: 1030px; - } - .offset9 { - margin-left: 930px; - } - .offset8 { - margin-left: 830px; - } - .offset7 { - margin-left: 730px; - } - .offset6 { - margin-left: 630px; - } - .offset5 { - margin-left: 530px; - } - .offset4 { - margin-left: 430px; - } - .offset3 { - margin-left: 330px; - } - .offset2 { - margin-left: 230px; - } - .offset1 { - margin-left: 130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.564102564102564%; - *margin-left: 2.5109110747408616%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.564102564102564%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.45299145299145%; - *width: 91.39979996362975%; - } - .row-fluid .span10 { - width: 82.90598290598291%; - *width: 82.8527914166212%; - } - .row-fluid .span9 { - width: 74.35897435897436%; - *width: 74.30578286961266%; - } - .row-fluid .span8 { - width: 65.81196581196582%; - *width: 65.75877432260411%; - } - .row-fluid .span7 { - width: 57.26495726495726%; - *width: 57.21176577559556%; - } - .row-fluid .span6 { - width: 48.717948717948715%; - *width: 48.664757228587014%; - } - .row-fluid .span5 { - width: 40.17094017094017%; - *width: 40.11774868157847%; - } - .row-fluid .span4 { - width: 31.623931623931625%; - *width: 31.570740134569924%; - } - .row-fluid .span3 { - width: 23.076923076923077%; - *width: 23.023731587561375%; - } - .row-fluid .span2 { - width: 14.52991452991453%; - *width: 14.476723040552828%; - } - .row-fluid .span1 { - width: 5.982905982905983%; - *width: 5.929714493544281%; - } - .row-fluid .offset12 { - margin-left: 105.12820512820512%; - *margin-left: 105.02182214948171%; - } - .row-fluid .offset12:first-child { - margin-left: 102.56410256410257%; - *margin-left: 102.45771958537915%; - } - .row-fluid .offset11 { - margin-left: 96.58119658119658%; - *margin-left: 96.47481360247316%; - } - .row-fluid .offset11:first-child { - margin-left: 94.01709401709402%; - *margin-left: 93.91071103837061%; - } - .row-fluid .offset10 { - margin-left: 88.03418803418803%; - *margin-left: 87.92780505546462%; - } - .row-fluid .offset10:first-child { - margin-left: 85.47008547008548%; - *margin-left: 85.36370249136206%; - } - .row-fluid .offset9 { - margin-left: 79.48717948717949%; - *margin-left: 79.38079650845607%; - } - .row-fluid .offset9:first-child { - margin-left: 76.92307692307693%; - *margin-left: 76.81669394435352%; - } - .row-fluid .offset8 { - margin-left: 70.94017094017094%; - *margin-left: 70.83378796144753%; - } - .row-fluid .offset8:first-child { - margin-left: 68.37606837606839%; - *margin-left: 68.26968539734497%; - } - .row-fluid .offset7 { - margin-left: 62.393162393162385%; - *margin-left: 62.28677941443899%; - } - .row-fluid .offset7:first-child { - margin-left: 59.82905982905982%; - *margin-left: 59.72267685033642%; - } - .row-fluid .offset6 { - margin-left: 53.84615384615384%; - *margin-left: 53.739770867430444%; - } - .row-fluid .offset6:first-child { - margin-left: 51.28205128205128%; - *margin-left: 51.175668303327875%; - } - .row-fluid .offset5 { - margin-left: 45.299145299145295%; - *margin-left: 45.1927623204219%; - } - .row-fluid .offset5:first-child { - margin-left: 42.73504273504273%; - *margin-left: 42.62865975631933%; - } - .row-fluid .offset4 { - margin-left: 36.75213675213675%; - *margin-left: 36.645753773413354%; - } - .row-fluid .offset4:first-child { - margin-left: 34.18803418803419%; - *margin-left: 34.081651209310785%; - } - .row-fluid .offset3 { - margin-left: 28.205128205128204%; - *margin-left: 28.0987452264048%; - } - .row-fluid .offset3:first-child { - margin-left: 25.641025641025642%; - *margin-left: 25.53464266230224%; - } - .row-fluid .offset2 { - margin-left: 19.65811965811966%; - *margin-left: 19.551736679396257%; - } - .row-fluid .offset2:first-child { - margin-left: 17.094017094017094%; - *margin-left: 16.98763411529369%; - } - .row-fluid .offset1 { - margin-left: 11.11111111111111%; - *margin-left: 11.004728132387708%; - } - .row-fluid .offset1:first-child { - margin-left: 8.547008547008547%; - *margin-left: 8.440625568285142%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 30px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 1156px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 1056px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 956px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 856px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 756px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 656px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 556px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 456px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 356px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 256px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 156px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 56px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } - .row-fluid .thumbnails { - margin-left: 0; - } -} - -@media (min-width: 768px) and (max-width: 979px) { - .row { - margin-left: -20px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 724px; - } - .span12 { - width: 724px; - } - .span11 { - width: 662px; - } - .span10 { - width: 600px; - } - .span9 { - width: 538px; - } - .span8 { - width: 476px; - } - .span7 { - width: 414px; - } - .span6 { - width: 352px; - } - .span5 { - width: 290px; - } - .span4 { - width: 228px; - } - .span3 { - width: 166px; - } - .span2 { - width: 104px; - } - .span1 { - width: 42px; - } - .offset12 { - margin-left: 764px; - } - .offset11 { - margin-left: 702px; - } - .offset10 { - margin-left: 640px; - } - .offset9 { - margin-left: 578px; - } - .offset8 { - margin-left: 516px; - } - .offset7 { - margin-left: 454px; - } - .offset6 { - margin-left: 392px; - } - .offset5 { - margin-left: 330px; - } - .offset4 { - margin-left: 268px; - } - .offset3 { - margin-left: 206px; - } - .offset2 { - margin-left: 144px; - } - .offset1 { - margin-left: 82px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.7624309392265194%; - *margin-left: 2.709239449864817%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.7624309392265194%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.43646408839778%; - *width: 91.38327259903608%; - } - .row-fluid .span10 { - width: 82.87292817679558%; - *width: 82.81973668743387%; - } - .row-fluid .span9 { - width: 74.30939226519337%; - *width: 74.25620077583166%; - } - .row-fluid .span8 { - width: 65.74585635359117%; - *width: 65.69266486422946%; - } - .row-fluid .span7 { - width: 57.18232044198895%; - *width: 57.12912895262725%; - } - .row-fluid .span6 { - width: 48.61878453038674%; - *width: 48.56559304102504%; - } - .row-fluid .span5 { - width: 40.05524861878453%; - *width: 40.00205712942283%; - } - .row-fluid .span4 { - width: 31.491712707182323%; - *width: 31.43852121782062%; - } - .row-fluid .span3 { - width: 22.92817679558011%; - *width: 22.87498530621841%; - } - .row-fluid .span2 { - width: 14.3646408839779%; - *width: 14.311449394616199%; - } - .row-fluid .span1 { - width: 5.801104972375691%; - *width: 5.747913483013988%; - } - .row-fluid .offset12 { - margin-left: 105.52486187845304%; - *margin-left: 105.41847889972962%; - } - .row-fluid .offset12:first-child { - margin-left: 102.76243093922652%; - *margin-left: 102.6560479605031%; - } - .row-fluid .offset11 { - margin-left: 96.96132596685082%; - *margin-left: 96.8549429881274%; - } - .row-fluid .offset11:first-child { - margin-left: 94.1988950276243%; - *margin-left: 94.09251204890089%; - } - .row-fluid .offset10 { - margin-left: 88.39779005524862%; - *margin-left: 88.2914070765252%; - } - .row-fluid .offset10:first-child { - margin-left: 85.6353591160221%; - *margin-left: 85.52897613729868%; - } - .row-fluid .offset9 { - margin-left: 79.8342541436464%; - *margin-left: 79.72787116492299%; - } - .row-fluid .offset9:first-child { - margin-left: 77.07182320441989%; - *margin-left: 76.96544022569647%; - } - .row-fluid .offset8 { - margin-left: 71.2707182320442%; - *margin-left: 71.16433525332079%; - } - .row-fluid .offset8:first-child { - margin-left: 68.50828729281768%; - *margin-left: 68.40190431409427%; - } - .row-fluid .offset7 { - margin-left: 62.70718232044199%; - *margin-left: 62.600799341718584%; - } - .row-fluid .offset7:first-child { - margin-left: 59.94475138121547%; - *margin-left: 59.838368402492065%; - } - .row-fluid .offset6 { - margin-left: 54.14364640883978%; - *margin-left: 54.037263430116376%; - } - .row-fluid .offset6:first-child { - margin-left: 51.38121546961326%; - *margin-left: 51.27483249088986%; - } - .row-fluid .offset5 { - margin-left: 45.58011049723757%; - *margin-left: 45.47372751851417%; - } - .row-fluid .offset5:first-child { - margin-left: 42.81767955801105%; - *margin-left: 42.71129657928765%; - } - .row-fluid .offset4 { - margin-left: 37.01657458563536%; - *margin-left: 36.91019160691196%; - } - .row-fluid .offset4:first-child { - margin-left: 34.25414364640884%; - *margin-left: 34.14776066768544%; - } - .row-fluid .offset3 { - margin-left: 28.45303867403315%; - *margin-left: 28.346655695309746%; - } - .row-fluid .offset3:first-child { - margin-left: 25.69060773480663%; - *margin-left: 25.584224756083227%; - } - .row-fluid .offset2 { - margin-left: 19.88950276243094%; - *margin-left: 19.783119783707537%; - } - .row-fluid .offset2:first-child { - margin-left: 17.12707182320442%; - *margin-left: 17.02068884448102%; - } - .row-fluid .offset1 { - margin-left: 11.32596685082873%; - *margin-left: 11.219583872105325%; - } - .row-fluid .offset1:first-child { - margin-left: 8.56353591160221%; - *margin-left: 8.457152932878806%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 710px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 648px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 586px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 524px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 462px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 400px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 338px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 276px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 214px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 152px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 90px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 28px; - } -} - -@media (max-width: 767px) { - body { - padding-right: 20px; - padding-left: 20px; - } - .navbar-fixed-top, - .navbar-fixed-bottom, - .navbar-static-top { - margin-right: -20px; - margin-left: -20px; - } - .container-fluid { - padding: 0; - } - .dl-horizontal dt { - float: none; - width: auto; - clear: none; - text-align: left; - } - .dl-horizontal dd { - margin-left: 0; - } - .container { - width: auto; - } - .row-fluid { - width: 100%; - } - .row, - .thumbnails { - margin-left: 0; - } - .thumbnails > li { - float: none; - margin-left: 0; - } - [class*="span"], - .uneditable-input[class*="span"], - .row-fluid [class*="span"] { - display: block; - float: none; - width: 100%; - margin-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .span12, - .row-fluid .span12 { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="offset"]:first-child { - margin-left: 0; - } - .input-large, - .input-xlarge, - .input-xxlarge, - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .input-prepend input, - .input-append input, - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - display: inline-block; - width: auto; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 0; - } - .modal { - position: fixed; - top: 20px; - right: 20px; - left: 20px; - width: auto; - margin: 0; - } - .modal.fade { - top: -100px; - } - .modal.fade.in { - top: 20px; - } -} - -@media (max-width: 480px) { - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); - } - .page-header h1 small { - display: block; - line-height: 20px; - } - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - .form-horizontal .control-label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .form-horizontal .controls { - margin-left: 0; - } - .form-horizontal .control-list { - padding-top: 0; - } - .form-horizontal .form-actions { - padding-right: 10px; - padding-left: 10px; - } - .media .pull-left, - .media .pull-right { - display: block; - float: none; - margin-bottom: 10px; - } - .media-object { - margin-right: 0; - margin-left: 0; - } - .modal { - top: 10px; - right: 10px; - left: 10px; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - .carousel-caption { - position: static; - } -} - -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top, - .navbar-fixed-bottom { - position: static; - } - .navbar-fixed-top { - margin-bottom: 20px; - } - .navbar-fixed-bottom { - margin-top: 20px; - } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-right: 10px; - padding-left: 10px; - margin: 0 0 0 -5px; - } - .nav-collapse { - clear: both; - } - .nav-collapse .nav { - float: none; - margin: 0 0 10px; - } - .nav-collapse .nav > li { - float: none; - } - .nav-collapse .nav > li > a { - margin-bottom: 2px; - } - .nav-collapse .nav > .divider-vertical { - display: none; - } - .nav-collapse .nav .nav-header { - color: #777777; - text-shadow: none; - } - .nav-collapse .nav > li > a, - .nav-collapse .dropdown-menu a { - padding: 9px 15px; - font-weight: bold; - color: #777777; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .nav-collapse .btn { - padding: 4px 10px 4px; - font-weight: normal; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - } - .nav-collapse .dropdown-menu li + li a { - margin-bottom: 2px; - } - .nav-collapse .nav > li > a:hover, - .nav-collapse .dropdown-menu a:hover { - background-color: #f2f2f2; - } - .navbar-inverse .nav-collapse .nav > li > a, - .navbar-inverse .nav-collapse .dropdown-menu a { - color: #999999; - } - .navbar-inverse .nav-collapse .nav > li > a:hover, - .navbar-inverse .nav-collapse .dropdown-menu a:hover { - background-color: #111111; - } - .nav-collapse.in .btn-group { - padding: 0; - margin-top: 5px; - } - .nav-collapse .dropdown-menu { - position: static; - top: auto; - left: auto; - display: none; - float: none; - max-width: none; - padding: 0; - margin: 0 15px; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .nav-collapse .open > .dropdown-menu { - display: block; - } - .nav-collapse .dropdown-menu:before, - .nav-collapse .dropdown-menu:after { - display: none; - } - .nav-collapse .dropdown-menu .divider { - display: none; - } - .nav-collapse .nav > li > .dropdown-menu:before, - .nav-collapse .nav > li > .dropdown-menu:after { - display: none; - } - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - float: none; - padding: 10px 15px; - margin: 10px 0; - border-top: 1px solid #f2f2f2; - border-bottom: 1px solid #f2f2f2; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - } - .navbar-inverse .nav-collapse .navbar-form, - .navbar-inverse .nav-collapse .navbar-search { - border-top-color: #111111; - border-bottom-color: #111111; - } - .navbar .nav-collapse .nav.pull-right { - float: none; - margin-left: 0; - } - .nav-collapse, - .nav-collapse.collapse { - height: 0; - overflow: hidden; - } - .navbar .btn-navbar { - display: block; - } - .navbar-static .navbar-inner { - padding-right: 10px; - padding-left: 10px; - } -} - -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } -} diff --git a/samples/xml/helloworld/src/main/webapp/resources/css/bootstrap.css b/samples/xml/helloworld/src/main/webapp/resources/css/bootstrap.css deleted file mode 100644 index 22aa0c17a9..0000000000 --- a/samples/xml/helloworld/src/main/webapp/resources/css/bootstrap.css +++ /dev/null @@ -1,6039 +0,0 @@ -/*! - * Bootstrap v2.2.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} - -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} - -audio:not([controls]) { - display: none; -} - -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} - -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -a:hover, -a:active { - outline: 0; -} - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -img { - width: auto\9; - height: auto; - max-width: 100%; - vertical-align: middle; - border: 0; - -ms-interpolation-mode: bicubic; -} - -#map_canvas img, -.google-maps img { - max-width: none; -} - -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} - -button, -input { - *overflow: visible; - line-height: normal; -} - -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} - -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} - -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; -} - -input[type="search"] { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield; -} - -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} - -textarea { - overflow: auto; - vertical-align: top; -} - -@media print { - * { - color: #000 !important; - text-shadow: none !important; - background: transparent !important; - box-shadow: none !important; - } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - thead { - display: table-header-group; - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 0.5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - page-break-after: avoid; - } -} - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; - line-height: 20px; - color: #333333; - background-color: #ffffff; -} - -a { - color: #0088cc; - text-decoration: none; -} - -a:hover { - color: #005580; - text-decoration: underline; -} - -.img-rounded { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.img-polaroid { - padding: 4px; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -} - -.img-circle { - -webkit-border-radius: 500px; - -moz-border-radius: 500px; - border-radius: 500px; -} - -.row { - margin-left: -20px; - *zoom: 1; -} - -.row:before, -.row:after { - display: table; - line-height: 0; - content: ""; -} - -.row:after { - clear: both; -} - -[class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; -} - -.container, -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.span12 { - width: 940px; -} - -.span11 { - width: 860px; -} - -.span10 { - width: 780px; -} - -.span9 { - width: 700px; -} - -.span8 { - width: 620px; -} - -.span7 { - width: 540px; -} - -.span6 { - width: 460px; -} - -.span5 { - width: 380px; -} - -.span4 { - width: 300px; -} - -.span3 { - width: 220px; -} - -.span2 { - width: 140px; -} - -.span1 { - width: 60px; -} - -.offset12 { - margin-left: 980px; -} - -.offset11 { - margin-left: 900px; -} - -.offset10 { - margin-left: 820px; -} - -.offset9 { - margin-left: 740px; -} - -.offset8 { - margin-left: 660px; -} - -.offset7 { - margin-left: 580px; -} - -.offset6 { - margin-left: 500px; -} - -.offset5 { - margin-left: 420px; -} - -.offset4 { - margin-left: 340px; -} - -.offset3 { - margin-left: 260px; -} - -.offset2 { - margin-left: 180px; -} - -.offset1 { - margin-left: 100px; -} - -.row-fluid { - width: 100%; - *zoom: 1; -} - -.row-fluid:before, -.row-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.row-fluid:after { - clear: both; -} - -.row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.127659574468085%; - *margin-left: 2.074468085106383%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.row-fluid [class*="span"]:first-child { - margin-left: 0; -} - -.row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.127659574468085%; -} - -.row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; -} - -.row-fluid .span11 { - width: 91.48936170212765%; - *width: 91.43617021276594%; -} - -.row-fluid .span10 { - width: 82.97872340425532%; - *width: 82.92553191489361%; -} - -.row-fluid .span9 { - width: 74.46808510638297%; - *width: 74.41489361702126%; -} - -.row-fluid .span8 { - width: 65.95744680851064%; - *width: 65.90425531914893%; -} - -.row-fluid .span7 { - width: 57.44680851063829%; - *width: 57.39361702127659%; -} - -.row-fluid .span6 { - width: 48.93617021276595%; - *width: 48.88297872340425%; -} - -.row-fluid .span5 { - width: 40.42553191489362%; - *width: 40.37234042553192%; -} - -.row-fluid .span4 { - width: 31.914893617021278%; - *width: 31.861702127659576%; -} - -.row-fluid .span3 { - width: 23.404255319148934%; - *width: 23.351063829787233%; -} - -.row-fluid .span2 { - width: 14.893617021276595%; - *width: 14.840425531914894%; -} - -.row-fluid .span1 { - width: 6.382978723404255%; - *width: 6.329787234042553%; -} - -.row-fluid .offset12 { - margin-left: 104.25531914893617%; - *margin-left: 104.14893617021275%; -} - -.row-fluid .offset12:first-child { - margin-left: 102.12765957446808%; - *margin-left: 102.02127659574467%; -} - -.row-fluid .offset11 { - margin-left: 95.74468085106382%; - *margin-left: 95.6382978723404%; -} - -.row-fluid .offset11:first-child { - margin-left: 93.61702127659574%; - *margin-left: 93.51063829787232%; -} - -.row-fluid .offset10 { - margin-left: 87.23404255319149%; - *margin-left: 87.12765957446807%; -} - -.row-fluid .offset10:first-child { - margin-left: 85.1063829787234%; - *margin-left: 84.99999999999999%; -} - -.row-fluid .offset9 { - margin-left: 78.72340425531914%; - *margin-left: 78.61702127659572%; -} - -.row-fluid .offset9:first-child { - margin-left: 76.59574468085106%; - *margin-left: 76.48936170212764%; -} - -.row-fluid .offset8 { - margin-left: 70.2127659574468%; - *margin-left: 70.10638297872339%; -} - -.row-fluid .offset8:first-child { - margin-left: 68.08510638297872%; - *margin-left: 67.9787234042553%; -} - -.row-fluid .offset7 { - margin-left: 61.70212765957446%; - *margin-left: 61.59574468085106%; -} - -.row-fluid .offset7:first-child { - margin-left: 59.574468085106375%; - *margin-left: 59.46808510638297%; -} - -.row-fluid .offset6 { - margin-left: 53.191489361702125%; - *margin-left: 53.085106382978715%; -} - -.row-fluid .offset6:first-child { - margin-left: 51.063829787234035%; - *margin-left: 50.95744680851063%; -} - -.row-fluid .offset5 { - margin-left: 44.68085106382979%; - *margin-left: 44.57446808510638%; -} - -.row-fluid .offset5:first-child { - margin-left: 42.5531914893617%; - *margin-left: 42.4468085106383%; -} - -.row-fluid .offset4 { - margin-left: 36.170212765957444%; - *margin-left: 36.06382978723405%; -} - -.row-fluid .offset4:first-child { - margin-left: 34.04255319148936%; - *margin-left: 33.93617021276596%; -} - -.row-fluid .offset3 { - margin-left: 27.659574468085104%; - *margin-left: 27.5531914893617%; -} - -.row-fluid .offset3:first-child { - margin-left: 25.53191489361702%; - *margin-left: 25.425531914893618%; -} - -.row-fluid .offset2 { - margin-left: 19.148936170212764%; - *margin-left: 19.04255319148936%; -} - -.row-fluid .offset2:first-child { - margin-left: 17.02127659574468%; - *margin-left: 16.914893617021278%; -} - -.row-fluid .offset1 { - margin-left: 10.638297872340425%; - *margin-left: 10.53191489361702%; -} - -.row-fluid .offset1:first-child { - margin-left: 8.51063829787234%; - *margin-left: 8.404255319148938%; -} - -[class*="span"].hide, -.row-fluid [class*="span"].hide { - display: none; -} - -[class*="span"].pull-right, -.row-fluid [class*="span"].pull-right { - float: right; -} - -.container { - margin-right: auto; - margin-left: auto; - *zoom: 1; -} - -.container:before, -.container:after { - display: table; - line-height: 0; - content: ""; -} - -.container:after { - clear: both; -} - -.container-fluid { - padding-right: 20px; - padding-left: 20px; - *zoom: 1; -} - -.container-fluid:before, -.container-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.container-fluid:after { - clear: both; -} - -p { - margin: 0 0 10px; -} - -.lead { - margin-bottom: 20px; - font-size: 21px; - font-weight: 200; - line-height: 30px; -} - -small { - font-size: 85%; -} - -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - -cite { - font-style: normal; -} - -.muted { - color: #999999; -} - -a.muted:hover { - color: #808080; -} - -.text-warning { - color: #c09853; -} - -a.text-warning:hover { - color: #a47e3c; -} - -.text-error { - color: #b94a48; -} - -a.text-error:hover { - color: #953b39; -} - -.text-info { - color: #3a87ad; -} - -a.text-info:hover { - color: #2d6987; -} - -.text-success { - color: #468847; -} - -a.text-success:hover { - color: #356635; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 10px 0; - font-family: inherit; - font-weight: bold; - line-height: 20px; - color: inherit; - text-rendering: optimizelegibility; -} - -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - line-height: 1; - color: #999999; -} - -h1, -h2, -h3 { - line-height: 40px; -} - -h1 { - font-size: 38.5px; -} - -h2 { - font-size: 31.5px; -} - -h3 { - font-size: 24.5px; -} - -h4 { - font-size: 17.5px; -} - -h5 { - font-size: 14px; -} - -h6 { - font-size: 11.9px; -} - -h1 small { - font-size: 24.5px; -} - -h2 small { - font-size: 17.5px; -} - -h3 small { - font-size: 14px; -} - -h4 small { - font-size: 14px; -} - -.page-header { - padding-bottom: 9px; - margin: 20px 0 30px; - border-bottom: 1px solid #eeeeee; -} - -ul, -ol { - padding: 0; - margin: 0 0 10px 25px; -} - -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} - -li { - line-height: 20px; -} - -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} - -ul.inline, -ol.inline { - margin-left: 0; - list-style: none; -} - -ul.inline > li, -ol.inline > li { - display: inline-block; - padding-right: 5px; - padding-left: 5px; -} - -dl { - margin-bottom: 20px; -} - -dt, -dd { - line-height: 20px; -} - -dt { - font-weight: bold; -} - -dd { - margin-left: 10px; -} - -.dl-horizontal { - *zoom: 1; -} - -.dl-horizontal:before, -.dl-horizontal:after { - display: table; - line-height: 0; - content: ""; -} - -.dl-horizontal:after { - clear: both; -} - -.dl-horizontal dt { - float: left; - width: 160px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; -} - -.dl-horizontal dd { - margin-left: 180px; -} - -hr { - margin: 20px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; -} - -abbr[title], -abbr[data-original-title] { - cursor: help; - border-bottom: 1px dotted #999999; -} - -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} - -blockquote { - padding: 0 0 0 15px; - margin: 0 0 20px; - border-left: 5px solid #eeeeee; -} - -blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 25px; -} - -blockquote small { - display: block; - line-height: 20px; - color: #999999; -} - -blockquote small:before { - content: '\2014 \00A0'; -} - -blockquote.pull-right { - float: right; - padding-right: 15px; - padding-left: 0; - border-right: 5px solid #eeeeee; - border-left: 0; -} - -blockquote.pull-right p, -blockquote.pull-right small { - text-align: right; -} - -blockquote.pull-right small:before { - content: ''; -} - -blockquote.pull-right small:after { - content: '\00A0 \2014'; -} - -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -address { - display: block; - margin-bottom: 20px; - font-style: normal; - line-height: 20px; -} - -code, -pre { - padding: 0 3px 2px; - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -code { - padding: 2px 4px; - color: #d14; - white-space: nowrap; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} - -pre { - display: block; - padding: 9.5px; - margin: 0 0 10px; - font-size: 13px; - line-height: 20px; - word-break: break-all; - word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -pre.prettyprint { - margin-bottom: 20px; -} - -pre code { - padding: 0; - color: inherit; - white-space: pre; - white-space: pre-wrap; - background-color: transparent; - border: 0; -} - -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} - -form { - margin: 0 0 20px; -} - -fieldset { - padding: 0; - margin: 0; - border: 0; -} - -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 20px; - font-size: 21px; - line-height: 40px; - color: #333333; - border: 0; - border-bottom: 1px solid #e5e5e5; -} - -legend small { - font-size: 15px; - color: #999999; -} - -label, -input, -button, -select, -textarea { - font-size: 14px; - font-weight: normal; - line-height: 20px; -} - -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -label { - display: block; - margin-bottom: 5px; -} - -select, -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - display: inline-block; - height: 20px; - padding: 4px 6px; - margin-bottom: 10px; - font-size: 14px; - line-height: 20px; - color: #555555; - vertical-align: middle; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -input, -textarea, -.uneditable-input { - width: 206px; -} - -textarea { - height: auto; -} - -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - background-color: #ffffff; - border: 1px solid #cccccc; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} - -textarea:focus, -input[type="text"]:focus, -input[type="password"]:focus, -input[type="datetime"]:focus, -input[type="datetime-local"]:focus, -input[type="date"]:focus, -input[type="month"]:focus, -input[type="time"]:focus, -input[type="week"]:focus, -input[type="number"]:focus, -input[type="email"]:focus, -input[type="url"]:focus, -input[type="search"]:focus, -input[type="tel"]:focus, -input[type="color"]:focus, -.uneditable-input:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -} - -input[type="radio"], -input[type="checkbox"] { - margin: 4px 0 0; - margin-top: 1px \9; - *margin-top: 0; - line-height: normal; -} - -input[type="file"], -input[type="image"], -input[type="submit"], -input[type="reset"], -input[type="button"], -input[type="radio"], -input[type="checkbox"] { - width: auto; -} - -select, -input[type="file"] { - height: 30px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 30px; -} - -select { - width: 220px; - background-color: #ffffff; - border: 1px solid #cccccc; -} - -select[multiple], -select[size] { - height: auto; -} - -select:focus, -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.uneditable-input, -.uneditable-textarea { - color: #999999; - cursor: not-allowed; - background-color: #fcfcfc; - border-color: #cccccc; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} - -.uneditable-input { - overflow: hidden; - white-space: nowrap; -} - -.uneditable-textarea { - width: auto; - height: auto; -} - -input:-moz-placeholder, -textarea:-moz-placeholder { - color: #999999; -} - -input:-ms-input-placeholder, -textarea:-ms-input-placeholder { - color: #999999; -} - -input::-webkit-input-placeholder, -textarea::-webkit-input-placeholder { - color: #999999; -} - -.radio, -.checkbox { - min-height: 20px; - padding-left: 20px; -} - -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -20px; -} - -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; -} - -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} - -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; -} - -.input-mini { - width: 60px; -} - -.input-small { - width: 90px; -} - -.input-medium { - width: 150px; -} - -.input-large { - width: 210px; -} - -.input-xlarge { - width: 270px; -} - -.input-xxlarge { - width: 530px; -} - -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; -} - -.input-append input[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend input[class*="span"], -.input-prepend .uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"], -.row-fluid .input-prepend [class*="span"], -.row-fluid .input-append [class*="span"] { - display: inline-block; -} - -input, -textarea, -.uneditable-input { - margin-left: 0; -} - -.controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; -} - -input.span12, -textarea.span12, -.uneditable-input.span12 { - width: 926px; -} - -input.span11, -textarea.span11, -.uneditable-input.span11 { - width: 846px; -} - -input.span10, -textarea.span10, -.uneditable-input.span10 { - width: 766px; -} - -input.span9, -textarea.span9, -.uneditable-input.span9 { - width: 686px; -} - -input.span8, -textarea.span8, -.uneditable-input.span8 { - width: 606px; -} - -input.span7, -textarea.span7, -.uneditable-input.span7 { - width: 526px; -} - -input.span6, -textarea.span6, -.uneditable-input.span6 { - width: 446px; -} - -input.span5, -textarea.span5, -.uneditable-input.span5 { - width: 366px; -} - -input.span4, -textarea.span4, -.uneditable-input.span4 { - width: 286px; -} - -input.span3, -textarea.span3, -.uneditable-input.span3 { - width: 206px; -} - -input.span2, -textarea.span2, -.uneditable-input.span2 { - width: 126px; -} - -input.span1, -textarea.span1, -.uneditable-input.span1 { - width: 46px; -} - -.controls-row { - *zoom: 1; -} - -.controls-row:before, -.controls-row:after { - display: table; - line-height: 0; - content: ""; -} - -.controls-row:after { - clear: both; -} - -.controls-row [class*="span"], -.row-fluid .controls-row [class*="span"] { - float: left; -} - -.controls-row .checkbox[class*="span"], -.controls-row .radio[class*="span"] { - padding-top: 5px; -} - -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - cursor: not-allowed; - background-color: #eeeeee; -} - -input[type="radio"][disabled], -input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly] { - background-color: transparent; -} - -.control-group.warning .control-label, -.control-group.warning .help-block, -.control-group.warning .help-inline { - color: #c09853; -} - -.control-group.warning .checkbox, -.control-group.warning .radio, -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - color: #c09853; -} - -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - border-color: #c09853; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.warning input:focus, -.control-group.warning select:focus, -.control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; -} - -.control-group.warning .input-prepend .add-on, -.control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} - -.control-group.error .control-label, -.control-group.error .help-block, -.control-group.error .help-inline { - color: #b94a48; -} - -.control-group.error .checkbox, -.control-group.error .radio, -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - color: #b94a48; -} - -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - border-color: #b94a48; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.error input:focus, -.control-group.error select:focus, -.control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -} - -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} - -.control-group.success .control-label, -.control-group.success .help-block, -.control-group.success .help-inline { - color: #468847; -} - -.control-group.success .checkbox, -.control-group.success .radio, -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - color: #468847; -} - -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - border-color: #468847; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.success input:focus, -.control-group.success select:focus, -.control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -} - -.control-group.success .input-prepend .add-on, -.control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} - -.control-group.info .control-label, -.control-group.info .help-block, -.control-group.info .help-inline { - color: #3a87ad; -} - -.control-group.info .checkbox, -.control-group.info .radio, -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - color: #3a87ad; -} - -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - border-color: #3a87ad; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.info input:focus, -.control-group.info select:focus, -.control-group.info textarea:focus { - border-color: #2d6987; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; -} - -.control-group.info .input-prepend .add-on, -.control-group.info .input-append .add-on { - color: #3a87ad; - background-color: #d9edf7; - border-color: #3a87ad; -} - -input:focus:invalid, -textarea:focus:invalid, -select:focus:invalid { - color: #b94a48; - border-color: #ee5f5b; -} - -input:focus:invalid:focus, -textarea:focus:invalid:focus, -select:focus:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} - -.form-actions { - padding: 19px 20px 20px; - margin-top: 20px; - margin-bottom: 20px; - background-color: #f5f5f5; - border-top: 1px solid #e5e5e5; - *zoom: 1; -} - -.form-actions:before, -.form-actions:after { - display: table; - line-height: 0; - content: ""; -} - -.form-actions:after { - clear: both; -} - -.help-block, -.help-inline { - color: #595959; -} - -.help-block { - display: block; - margin-bottom: 10px; -} - -.help-inline { - display: inline-block; - *display: inline; - padding-left: 5px; - vertical-align: middle; - *zoom: 1; -} - -.input-append, -.input-prepend { - margin-bottom: 5px; - font-size: 0; - white-space: nowrap; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input, -.input-append .dropdown-menu, -.input-prepend .dropdown-menu { - font-size: 14px; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input { - position: relative; - margin-bottom: 0; - *margin-left: 0; - vertical-align: top; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-append input:focus, -.input-prepend input:focus, -.input-append select:focus, -.input-prepend select:focus, -.input-append .uneditable-input:focus, -.input-prepend .uneditable-input:focus { - z-index: 2; -} - -.input-append .add-on, -.input-prepend .add-on { - display: inline-block; - width: auto; - height: 20px; - min-width: 16px; - padding: 4px 5px; - font-size: 14px; - font-weight: normal; - line-height: 20px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - background-color: #eeeeee; - border: 1px solid #ccc; -} - -.input-append .add-on, -.input-prepend .add-on, -.input-append .btn, -.input-prepend .btn, -.input-append .btn-group > .dropdown-toggle, -.input-prepend .btn-group > .dropdown-toggle { - vertical-align: top; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-append .active, -.input-prepend .active { - background-color: #a9dba9; - border-color: #46a546; -} - -.input-prepend .add-on, -.input-prepend .btn { - margin-right: -1px; -} - -.input-prepend .add-on:first-child, -.input-prepend .btn:first-child { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input, -.input-append select, -.input-append .uneditable-input { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input + .btn-group .btn:last-child, -.input-append select + .btn-group .btn:last-child, -.input-append .uneditable-input + .btn-group .btn:last-child { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-append .add-on, -.input-append .btn, -.input-append .btn-group { - margin-left: -1px; -} - -.input-append .add-on:last-child, -.input-append .btn:last-child, -.input-append .btn-group:last-child > .dropdown-toggle { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append input, -.input-prepend.input-append select, -.input-prepend.input-append .uneditable-input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-prepend.input-append input + .btn-group .btn, -.input-prepend.input-append select + .btn-group .btn, -.input-prepend.input-append .uneditable-input + .btn-group .btn { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .btn-group:first-child { - margin-left: 0; -} - -input.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; - /* IE7-8 doesn't have border-radius, so don't indent the padding */ - - margin-bottom: 0; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -/* Allow for input prepend/append in search forms */ - -.form-search .input-append .search-query, -.form-search .input-prepend .search-query { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.form-search .input-append .search-query { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search .input-append .btn { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .search-query { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .btn { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input, -.form-search .input-prepend, -.form-inline .input-prepend, -.form-horizontal .input-prepend, -.form-search .input-append, -.form-inline .input-append, -.form-horizontal .input-append { - display: inline-block; - *display: inline; - margin-bottom: 0; - vertical-align: middle; - *zoom: 1; -} - -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { - display: none; -} - -.form-search label, -.form-inline label, -.form-search .btn-group, -.form-inline .btn-group { - display: inline-block; -} - -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} - -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} - -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; -} - -.control-group { - margin-bottom: 10px; -} - -legend + .control-group { - margin-top: 20px; - -webkit-margin-top-collapse: separate; -} - -.form-horizontal .control-group { - margin-bottom: 20px; - *zoom: 1; -} - -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { - display: table; - line-height: 0; - content: ""; -} - -.form-horizontal .control-group:after { - clear: both; -} - -.form-horizontal .control-label { - float: left; - width: 160px; - padding-top: 5px; - text-align: right; -} - -.form-horizontal .controls { - *display: inline-block; - *padding-left: 20px; - margin-left: 180px; - *margin-left: 0; -} - -.form-horizontal .controls:first-child { - *padding-left: 180px; -} - -.form-horizontal .help-block { - margin-bottom: 0; -} - -.form-horizontal input + .help-block, -.form-horizontal select + .help-block, -.form-horizontal textarea + .help-block, -.form-horizontal .uneditable-input + .help-block, -.form-horizontal .input-prepend + .help-block, -.form-horizontal .input-append + .help-block { - margin-top: 10px; -} - -.form-horizontal .form-actions { - padding-left: 180px; -} - -table { - max-width: 100%; - background-color: transparent; - border-collapse: collapse; - border-spacing: 0; -} - -.table { - width: 100%; - margin-bottom: 20px; -} - -.table th, -.table td { - padding: 8px; - line-height: 20px; - text-align: left; - vertical-align: top; - border-top: 1px solid #dddddd; -} - -.table th { - font-weight: bold; -} - -.table thead th { - vertical-align: bottom; -} - -.table caption + thead tr:first-child th, -.table caption + thead tr:first-child td, -.table colgroup + thead tr:first-child th, -.table colgroup + thead tr:first-child td, -.table thead:first-child tr:first-child th, -.table thead:first-child tr:first-child td { - border-top: 0; -} - -.table tbody + tbody { - border-top: 2px solid #dddddd; -} - -.table .table { - background-color: #ffffff; -} - -.table-condensed th, -.table-condensed td { - padding: 4px 5px; -} - -.table-bordered { - border: 1px solid #dddddd; - border-collapse: separate; - *border-collapse: collapse; - border-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.table-bordered th, -.table-bordered td { - border-left: 1px solid #dddddd; -} - -.table-bordered caption + thead tr:first-child th, -.table-bordered caption + tbody tr:first-child th, -.table-bordered caption + tbody tr:first-child td, -.table-bordered colgroup + thead tr:first-child th, -.table-bordered colgroup + tbody tr:first-child th, -.table-bordered colgroup + tbody tr:first-child td, -.table-bordered thead:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} - -.table-bordered thead:first-child tr:first-child > th:first-child, -.table-bordered tbody:first-child tr:first-child > td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered thead:first-child tr:first-child > th:last-child, -.table-bordered tbody:first-child tr:first-child > td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:first-child, -.table-bordered tbody:last-child tr:last-child > td:first-child, -.table-bordered tfoot:last-child tr:last-child > td:first-child { - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:last-child, -.table-bordered tbody:last-child tr:last-child > td:last-child, -.table-bordered tfoot:last-child tr:last-child > td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - -moz-border-radius-bottomleft: 0; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; - -moz-border-radius-bottomright: 0; -} - -.table-bordered caption + thead tr:first-child th:first-child, -.table-bordered caption + tbody tr:first-child td:first-child, -.table-bordered colgroup + thead tr:first-child th:first-child, -.table-bordered colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered caption + thead tr:first-child th:last-child, -.table-bordered caption + tbody tr:first-child td:last-child, -.table-bordered colgroup + thead tr:first-child th:last-child, -.table-bordered colgroup + tbody tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-striped tbody > tr:nth-child(odd) > td, -.table-striped tbody > tr:nth-child(odd) > th { - background-color: #f9f9f9; -} - -.table-hover tbody tr:hover td, -.table-hover tbody tr:hover th { - background-color: #f5f5f5; -} - -table td[class*="span"], -table th[class*="span"], -.row-fluid table td[class*="span"], -.row-fluid table th[class*="span"] { - display: table-cell; - float: none; - margin-left: 0; -} - -.table td.span1, -.table th.span1 { - float: none; - width: 44px; - margin-left: 0; -} - -.table td.span2, -.table th.span2 { - float: none; - width: 124px; - margin-left: 0; -} - -.table td.span3, -.table th.span3 { - float: none; - width: 204px; - margin-left: 0; -} - -.table td.span4, -.table th.span4 { - float: none; - width: 284px; - margin-left: 0; -} - -.table td.span5, -.table th.span5 { - float: none; - width: 364px; - margin-left: 0; -} - -.table td.span6, -.table th.span6 { - float: none; - width: 444px; - margin-left: 0; -} - -.table td.span7, -.table th.span7 { - float: none; - width: 524px; - margin-left: 0; -} - -.table td.span8, -.table th.span8 { - float: none; - width: 604px; - margin-left: 0; -} - -.table td.span9, -.table th.span9 { - float: none; - width: 684px; - margin-left: 0; -} - -.table td.span10, -.table th.span10 { - float: none; - width: 764px; - margin-left: 0; -} - -.table td.span11, -.table th.span11 { - float: none; - width: 844px; - margin-left: 0; -} - -.table td.span12, -.table th.span12 { - float: none; - width: 924px; - margin-left: 0; -} - -.table tbody tr.success td { - background-color: #dff0d8; -} - -.table tbody tr.error td { - background-color: #f2dede; -} - -.table tbody tr.warning td { - background-color: #fcf8e3; -} - -.table tbody tr.info td { - background-color: #d9edf7; -} - -.table-hover tbody tr.success:hover td { - background-color: #d0e9c6; -} - -.table-hover tbody tr.error:hover td { - background-color: #ebcccc; -} - -.table-hover tbody tr.warning:hover td { - background-color: #faf2cc; -} - -.table-hover tbody tr.info:hover td { - background-color: #c4e3f3; -} - -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - margin-top: 1px; - *margin-right: .3em; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; -} - -/* White icons with optional class, or on hover/active states of certain elements */ - -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); -} - -.icon-glass { - background-position: 0 0; -} - -.icon-music { - background-position: -24px 0; -} - -.icon-search { - background-position: -48px 0; -} - -.icon-envelope { - background-position: -72px 0; -} - -.icon-heart { - background-position: -96px 0; -} - -.icon-star { - background-position: -120px 0; -} - -.icon-star-empty { - background-position: -144px 0; -} - -.icon-user { - background-position: -168px 0; -} - -.icon-film { - background-position: -192px 0; -} - -.icon-th-large { - background-position: -216px 0; -} - -.icon-th { - background-position: -240px 0; -} - -.icon-th-list { - background-position: -264px 0; -} - -.icon-ok { - background-position: -288px 0; -} - -.icon-remove { - background-position: -312px 0; -} - -.icon-zoom-in { - background-position: -336px 0; -} - -.icon-zoom-out { - background-position: -360px 0; -} - -.icon-off { - background-position: -384px 0; -} - -.icon-signal { - background-position: -408px 0; -} - -.icon-cog { - background-position: -432px 0; -} - -.icon-trash { - background-position: -456px 0; -} - -.icon-home { - background-position: 0 -24px; -} - -.icon-file { - background-position: -24px -24px; -} - -.icon-time { - background-position: -48px -24px; -} - -.icon-road { - background-position: -72px -24px; -} - -.icon-download-alt { - background-position: -96px -24px; -} - -.icon-download { - background-position: -120px -24px; -} - -.icon-upload { - background-position: -144px -24px; -} - -.icon-inbox { - background-position: -168px -24px; -} - -.icon-play-circle { - background-position: -192px -24px; -} - -.icon-repeat { - background-position: -216px -24px; -} - -.icon-refresh { - background-position: -240px -24px; -} - -.icon-list-alt { - background-position: -264px -24px; -} - -.icon-lock { - background-position: -287px -24px; -} - -.icon-flag { - background-position: -312px -24px; -} - -.icon-headphones { - background-position: -336px -24px; -} - -.icon-volume-off { - background-position: -360px -24px; -} - -.icon-volume-down { - background-position: -384px -24px; -} - -.icon-volume-up { - background-position: -408px -24px; -} - -.icon-qrcode { - background-position: -432px -24px; -} - -.icon-barcode { - background-position: -456px -24px; -} - -.icon-tag { - background-position: 0 -48px; -} - -.icon-tags { - background-position: -25px -48px; -} - -.icon-book { - background-position: -48px -48px; -} - -.icon-bookmark { - background-position: -72px -48px; -} - -.icon-print { - background-position: -96px -48px; -} - -.icon-camera { - background-position: -120px -48px; -} - -.icon-font { - background-position: -144px -48px; -} - -.icon-bold { - background-position: -167px -48px; -} - -.icon-italic { - background-position: -192px -48px; -} - -.icon-text-height { - background-position: -216px -48px; -} - -.icon-text-width { - background-position: -240px -48px; -} - -.icon-align-left { - background-position: -264px -48px; -} - -.icon-align-center { - background-position: -288px -48px; -} - -.icon-align-right { - background-position: -312px -48px; -} - -.icon-align-justify { - background-position: -336px -48px; -} - -.icon-list { - background-position: -360px -48px; -} - -.icon-indent-left { - background-position: -384px -48px; -} - -.icon-indent-right { - background-position: -408px -48px; -} - -.icon-facetime-video { - background-position: -432px -48px; -} - -.icon-picture { - background-position: -456px -48px; -} - -.icon-pencil { - background-position: 0 -72px; -} - -.icon-map-marker { - background-position: -24px -72px; -} - -.icon-adjust { - background-position: -48px -72px; -} - -.icon-tint { - background-position: -72px -72px; -} - -.icon-edit { - background-position: -96px -72px; -} - -.icon-share { - background-position: -120px -72px; -} - -.icon-check { - background-position: -144px -72px; -} - -.icon-move { - background-position: -168px -72px; -} - -.icon-step-backward { - background-position: -192px -72px; -} - -.icon-fast-backward { - background-position: -216px -72px; -} - -.icon-backward { - background-position: -240px -72px; -} - -.icon-play { - background-position: -264px -72px; -} - -.icon-pause { - background-position: -288px -72px; -} - -.icon-stop { - background-position: -312px -72px; -} - -.icon-forward { - background-position: -336px -72px; -} - -.icon-fast-forward { - background-position: -360px -72px; -} - -.icon-step-forward { - background-position: -384px -72px; -} - -.icon-eject { - background-position: -408px -72px; -} - -.icon-chevron-left { - background-position: -432px -72px; -} - -.icon-chevron-right { - background-position: -456px -72px; -} - -.icon-plus-sign { - background-position: 0 -96px; -} - -.icon-minus-sign { - background-position: -24px -96px; -} - -.icon-remove-sign { - background-position: -48px -96px; -} - -.icon-ok-sign { - background-position: -72px -96px; -} - -.icon-question-sign { - background-position: -96px -96px; -} - -.icon-info-sign { - background-position: -120px -96px; -} - -.icon-screenshot { - background-position: -144px -96px; -} - -.icon-remove-circle { - background-position: -168px -96px; -} - -.icon-ok-circle { - background-position: -192px -96px; -} - -.icon-ban-circle { - background-position: -216px -96px; -} - -.icon-arrow-left { - background-position: -240px -96px; -} - -.icon-arrow-right { - background-position: -264px -96px; -} - -.icon-arrow-up { - background-position: -289px -96px; -} - -.icon-arrow-down { - background-position: -312px -96px; -} - -.icon-share-alt { - background-position: -336px -96px; -} - -.icon-resize-full { - background-position: -360px -96px; -} - -.icon-resize-small { - background-position: -384px -96px; -} - -.icon-plus { - background-position: -408px -96px; -} - -.icon-minus { - background-position: -433px -96px; -} - -.icon-asterisk { - background-position: -456px -96px; -} - -.icon-exclamation-sign { - background-position: 0 -120px; -} - -.icon-gift { - background-position: -24px -120px; -} - -.icon-leaf { - background-position: -48px -120px; -} - -.icon-fire { - background-position: -72px -120px; -} - -.icon-eye-open { - background-position: -96px -120px; -} - -.icon-eye-close { - background-position: -120px -120px; -} - -.icon-warning-sign { - background-position: -144px -120px; -} - -.icon-plane { - background-position: -168px -120px; -} - -.icon-calendar { - background-position: -192px -120px; -} - -.icon-random { - width: 16px; - background-position: -216px -120px; -} - -.icon-comment { - background-position: -240px -120px; -} - -.icon-magnet { - background-position: -264px -120px; -} - -.icon-chevron-up { - background-position: -288px -120px; -} - -.icon-chevron-down { - background-position: -313px -119px; -} - -.icon-retweet { - background-position: -336px -120px; -} - -.icon-shopping-cart { - background-position: -360px -120px; -} - -.icon-folder-close { - background-position: -384px -120px; -} - -.icon-folder-open { - width: 16px; - background-position: -408px -120px; -} - -.icon-resize-vertical { - background-position: -432px -119px; -} - -.icon-resize-horizontal { - background-position: -456px -118px; -} - -.icon-hdd { - background-position: 0 -144px; -} - -.icon-bullhorn { - background-position: -24px -144px; -} - -.icon-bell { - background-position: -48px -144px; -} - -.icon-certificate { - background-position: -72px -144px; -} - -.icon-thumbs-up { - background-position: -96px -144px; -} - -.icon-thumbs-down { - background-position: -120px -144px; -} - -.icon-hand-right { - background-position: -144px -144px; -} - -.icon-hand-left { - background-position: -168px -144px; -} - -.icon-hand-up { - background-position: -192px -144px; -} - -.icon-hand-down { - background-position: -216px -144px; -} - -.icon-circle-arrow-right { - background-position: -240px -144px; -} - -.icon-circle-arrow-left { - background-position: -264px -144px; -} - -.icon-circle-arrow-up { - background-position: -288px -144px; -} - -.icon-circle-arrow-down { - background-position: -312px -144px; -} - -.icon-globe { - background-position: -336px -144px; -} - -.icon-wrench { - background-position: -360px -144px; -} - -.icon-tasks { - background-position: -384px -144px; -} - -.icon-filter { - background-position: -408px -144px; -} - -.icon-briefcase { - background-position: -432px -144px; -} - -.icon-fullscreen { - background-position: -456px -144px; -} - -.dropup, -.dropdown { - position: relative; -} - -.dropdown-toggle { - *margin-bottom: -3px; -} - -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} - -.caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-top: 4px solid #000000; - border-right: 4px solid transparent; - border-left: 4px solid transparent; - content: ""; -} - -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} - -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; - list-style: none; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.dropdown-menu .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.dropdown-menu li > a { - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: 20px; - color: #333333; - white-space: nowrap; -} - -.dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, -.dropdown-submenu:hover > a { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -} - -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - outline: 0; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -} - -.dropdown-menu .disabled > a, -.dropdown-menu .disabled > a:hover { - color: #999999; -} - -.dropdown-menu .disabled > a:hover { - text-decoration: none; - cursor: default; - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.open { - *z-index: 1000; -} - -.open > .dropdown-menu { - display: block; -} - -.pull-right > .dropdown-menu { - right: 0; - left: auto; -} - -.dropup .caret, -.navbar-fixed-bottom .dropdown .caret { - border-top: 0; - border-bottom: 4px solid #000000; - content: ""; -} - -.dropup .dropdown-menu, -.navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; -} - -.dropdown-submenu { - position: relative; -} - -.dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; -} - -.dropdown-submenu:hover > .dropdown-menu { - display: block; -} - -.dropup .dropdown-submenu > .dropdown-menu { - top: auto; - bottom: 0; - margin-top: 0; - margin-bottom: -2px; - -webkit-border-radius: 5px 5px 5px 0; - -moz-border-radius: 5px 5px 5px 0; - border-radius: 5px 5px 5px 0; -} - -.dropdown-submenu > a:after { - display: block; - float: right; - width: 0; - height: 0; - margin-top: 5px; - margin-right: -10px; - border-color: transparent; - border-left-color: #cccccc; - border-style: solid; - border-width: 5px 0 5px 5px; - content: " "; -} - -.dropdown-submenu:hover > a:after { - border-left-color: #ffffff; -} - -.dropdown-submenu.pull-left { - float: none; -} - -.dropdown-submenu.pull-left > .dropdown-menu { - left: -100%; - margin-left: 10px; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; -} - -.dropdown .dropdown-menu .nav-header { - padding-right: 20px; - padding-left: 20px; -} - -.typeahead { - z-index: 1051; - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} - -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} - -.well-large { - padding: 24px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.well-small { - padding: 9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.fade { - opacity: 0; - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; -} - -.fade.in { - opacity: 1; -} - -.collapse { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; -} - -.collapse.in { - height: auto; -} - -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 20px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} - -.close:hover { - color: #000000; - text-decoration: none; - cursor: pointer; - opacity: 0.4; - filter: alpha(opacity=40); -} - -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} - -.btn { - display: inline-block; - *display: inline; - padding: 4px 12px; - margin-bottom: 0; - *margin-left: .3em; - font-size: 14px; - line-height: 20px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - cursor: pointer; - background-color: #f5f5f5; - *background-color: #e6e6e6; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); - background-repeat: repeat-x; - border: 1px solid #bbbbbb; - *border: 0; - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #a2a2a2; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - color: #333333; - background-color: #e6e6e6; - *background-color: #d9d9d9; -} - -.btn:active, -.btn.active { - background-color: #cccccc \9; -} - -.btn:first-child { - *margin-left: 0; -} - -.btn:hover { - color: #333333; - text-decoration: none; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} - -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.btn.active, -.btn:active { - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn.disabled, -.btn[disabled] { - cursor: default; - background-image: none; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-large { - padding: 11px 19px; - font-size: 17.5px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { - margin-top: 4px; -} - -.btn-small { - padding: 2px 10px; - font-size: 11.9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { - margin-top: 0; -} - -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { - margin-top: -1px; -} - -.btn-mini { - padding: 0 6px; - font-size: 10.5px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-block { - display: block; - width: 100%; - padding-right: 0; - padding-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.btn-block + .btn-block { - margin-top: 5px; -} - -input[type="submit"].btn-block, -input[type="reset"].btn-block, -input[type="button"].btn-block { - width: 100%; -} - -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255, 255, 255, 0.75); -} - -.btn { - border-color: #c5c5c5; - border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); -} - -.btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #006dcc; - *background-color: #0044cc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(to bottom, #0088cc, #0044cc); - background-repeat: repeat-x; - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - color: #ffffff; - background-color: #0044cc; - *background-color: #003bb3; -} - -.btn-primary:active, -.btn-primary.active { - background-color: #003399 \9; -} - -.btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - *background-color: #f89406; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - color: #ffffff; - background-color: #f89406; - *background-color: #df8505; -} - -.btn-warning:active, -.btn-warning.active { - background-color: #c67605 \9; -} - -.btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - *background-color: #bd362f; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); - background-repeat: repeat-x; - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - color: #ffffff; - background-color: #bd362f; - *background-color: #a9302a; -} - -.btn-danger:active, -.btn-danger.active { - background-color: #942a25 \9; -} - -.btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - *background-color: #51a351; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); - background-repeat: repeat-x; - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - color: #ffffff; - background-color: #51a351; - *background-color: #499249; -} - -.btn-success:active, -.btn-success.active { - background-color: #408140 \9; -} - -.btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - *background-color: #2f96b4; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); - background-repeat: repeat-x; - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - color: #ffffff; - background-color: #2f96b4; - *background-color: #2a85a0; -} - -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} - -.btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #363636; - *background-color: #222222; - background-image: -moz-linear-gradient(top, #444444, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); - background-image: -webkit-linear-gradient(top, #444444, #222222); - background-image: -o-linear-gradient(top, #444444, #222222); - background-image: linear-gradient(to bottom, #444444, #222222); - background-repeat: repeat-x; - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - color: #ffffff; - background-color: #222222; - *background-color: #151515; -} - -.btn-inverse:active, -.btn-inverse.active { - background-color: #080808 \9; -} - -button.btn, -input[type="submit"].btn { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn::-moz-focus-inner, -input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} - -button.btn.btn-large, -input[type="submit"].btn.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; -} - -button.btn.btn-small, -input[type="submit"].btn.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn.btn-mini, -input[type="submit"].btn.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; -} - -.btn-link, -.btn-link:active, -.btn-link[disabled] { - background-color: transparent; - background-image: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-link { - color: #0088cc; - cursor: pointer; - border-color: transparent; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-link:hover { - color: #005580; - text-decoration: underline; - background-color: transparent; -} - -.btn-link[disabled]:hover { - color: #333333; - text-decoration: none; -} - -.btn-group { - position: relative; - display: inline-block; - *display: inline; - *margin-left: .3em; - font-size: 0; - white-space: nowrap; - vertical-align: middle; - *zoom: 1; -} - -.btn-group:first-child { - *margin-left: 0; -} - -.btn-group + .btn-group { - margin-left: 5px; -} - -.btn-toolbar { - margin-top: 10px; - margin-bottom: 10px; - font-size: 0; -} - -.btn-toolbar > .btn + .btn, -.btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group { - margin-left: 5px; -} - -.btn-group > .btn { - position: relative; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group > .btn + .btn { - margin-left: -1px; -} - -.btn-group > .btn, -.btn-group > .dropdown-menu, -.btn-group > .popover { - font-size: 14px; -} - -.btn-group > .btn-mini { - font-size: 10.5px; -} - -.btn-group > .btn-small { - font-size: 11.9px; -} - -.btn-group > .btn-large { - font-size: 17.5px; -} - -.btn-group > .btn:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.btn-group > .btn:last-child, -.btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.btn-group > .btn.large:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.btn-group > .btn.large:last-child, -.btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.btn-group > .btn:hover, -.btn-group > .btn:focus, -.btn-group > .btn:active, -.btn-group > .btn.active { - z-index: 2; -} - -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - -.btn-group > .btn + .dropdown-toggle { - *padding-top: 5px; - padding-right: 8px; - *padding-bottom: 5px; - padding-left: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group > .btn-mini + .dropdown-toggle { - *padding-top: 2px; - padding-right: 5px; - *padding-bottom: 2px; - padding-left: 5px; -} - -.btn-group > .btn-small + .dropdown-toggle { - *padding-top: 5px; - *padding-bottom: 4px; -} - -.btn-group > .btn-large + .dropdown-toggle { - *padding-top: 7px; - padding-right: 12px; - *padding-bottom: 7px; - padding-left: 12px; -} - -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group.open .btn.dropdown-toggle { - background-color: #e6e6e6; -} - -.btn-group.open .btn-primary.dropdown-toggle { - background-color: #0044cc; -} - -.btn-group.open .btn-warning.dropdown-toggle { - background-color: #f89406; -} - -.btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; -} - -.btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; -} - -.btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; -} - -.btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; -} - -.btn .caret { - margin-top: 8px; - margin-left: 0; -} - -.btn-mini .caret, -.btn-small .caret, -.btn-large .caret { - margin-top: 6px; -} - -.btn-large .caret { - border-top-width: 5px; - border-right-width: 5px; - border-left-width: 5px; -} - -.dropup .btn-large .caret { - border-bottom-width: 5px; -} - -.btn-primary .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret, -.btn-success .caret, -.btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.btn-group-vertical { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} - -.btn-group-vertical > .btn { - display: block; - float: none; - max-width: 100%; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group-vertical > .btn + .btn { - margin-top: -1px; - margin-left: 0; -} - -.btn-group-vertical > .btn:first-child { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.btn-group-vertical > .btn:last-child { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.btn-group-vertical > .btn-large:first-child { - -webkit-border-radius: 6px 6px 0 0; - -moz-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; -} - -.btn-group-vertical > .btn-large:last-child { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 20px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.alert, -.alert h4 { - color: #c09853; -} - -.alert h4 { - margin: 0; -} - -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 20px; -} - -.alert-success { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.alert-success h4 { - color: #468847; -} - -.alert-danger, -.alert-error { - color: #b94a48; - background-color: #f2dede; - border-color: #eed3d7; -} - -.alert-danger h4, -.alert-error h4 { - color: #b94a48; -} - -.alert-info { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} - -.alert-info h4 { - color: #3a87ad; -} - -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} - -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} - -.alert-block p + p { - margin-top: 5px; -} - -.nav { - margin-bottom: 20px; - margin-left: 0; - list-style: none; -} - -.nav > li > a { - display: block; -} - -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} - -.nav > li > a > img { - max-width: none; -} - -.nav > .pull-right { - float: right; -} - -.nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 20px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} - -.nav li + .nav-header { - margin-top: 9px; -} - -.nav-list { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 0; -} - -.nav-list > li > a, -.nav-list .nav-header { - margin-right: -15px; - margin-left: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} - -.nav-list > li > a { - padding: 3px 15px; -} - -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} - -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - margin-right: 2px; -} - -.nav-list .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.nav-tabs, -.nav-pills { - *zoom: 1; -} - -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - line-height: 0; - content: ""; -} - -.nav-tabs:after, -.nav-pills:after { - clear: both; -} - -.nav-tabs > li, -.nav-pills > li { - float: left; -} - -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} - -.nav-tabs { - border-bottom: 1px solid #ddd; -} - -.nav-tabs > li { - margin-bottom: -1px; -} - -.nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: 20px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} - -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: #555555; - cursor: default; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; -} - -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} - -.nav-stacked > li { - float: none; -} - -.nav-stacked > li > a { - margin-right: 0; -} - -.nav-tabs.nav-stacked { - border-bottom: 0; -} - -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-topleft: 4px; -} - -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.nav-tabs.nav-stacked > li > a:hover { - z-index: 2; - border-color: #ddd; -} - -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} - -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} - -.nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.nav-pills .dropdown-menu { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.nav .dropdown-toggle .caret { - margin-top: 6px; - border-top-color: #0088cc; - border-bottom-color: #0088cc; -} - -.nav .dropdown-toggle:hover .caret { - border-top-color: #005580; - border-bottom-color: #005580; -} - -/* move down carets for tabs */ - -.nav-tabs .dropdown-toggle .caret { - margin-top: 8px; -} - -.nav .active .dropdown-toggle .caret { - border-top-color: #fff; - border-bottom-color: #fff; -} - -.nav-tabs .active .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.nav > .dropdown.active > a:hover { - cursor: pointer; -} - -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} - -.nav li.dropdown.open .caret, -.nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} - -.tabs-stacked .open > a:hover { - border-color: #999999; -} - -.tabbable { - *zoom: 1; -} - -.tabbable:before, -.tabbable:after { - display: table; - line-height: 0; - content: ""; -} - -.tabbable:after { - clear: both; -} - -.tab-content { - overflow: auto; -} - -.tabs-below > .nav-tabs, -.tabs-right > .nav-tabs, -.tabs-left > .nav-tabs { - border-bottom: 0; -} - -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} - -.tab-content > .active, -.pill-content > .active { - display: block; -} - -.tabs-below > .nav-tabs { - border-top: 1px solid #ddd; -} - -.tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} - -.tabs-below > .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.tabs-below > .nav-tabs > li > a:hover { - border-top-color: #ddd; - border-bottom-color: transparent; -} - -.tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} - -.tabs-left > .nav-tabs > li, -.tabs-right > .nav-tabs > li { - float: none; -} - -.tabs-left > .nav-tabs > li > a, -.tabs-right > .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} - -.tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} - -.tabs-left > .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.tabs-left > .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} - -.tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} - -.tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} - -.tabs-right > .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.tabs-right > .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} - -.tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} - -.nav > .disabled > a { - color: #999999; -} - -.nav > .disabled > a:hover { - text-decoration: none; - cursor: default; - background-color: transparent; -} - -.navbar { - *position: relative; - *z-index: 2; - margin-bottom: 20px; - overflow: visible; -} - -.navbar-inner { - min-height: 40px; - padding-right: 20px; - padding-left: 20px; - background-color: #fafafa; - background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); - background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); - background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); - background-repeat: repeat-x; - border: 1px solid #d4d4d4; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); - *zoom: 1; - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -} - -.navbar-inner:before, -.navbar-inner:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-inner:after { - clear: both; -} - -.navbar .container { - width: auto; -} - -.nav-collapse.collapse { - height: auto; - overflow: visible; -} - -.navbar .brand { - display: block; - float: left; - padding: 10px 20px 10px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - color: #777777; - text-shadow: 0 1px 0 #ffffff; -} - -.navbar .brand:hover { - text-decoration: none; -} - -.navbar-text { - margin-bottom: 0; - line-height: 40px; - color: #777777; -} - -.navbar-link { - color: #777777; -} - -.navbar-link:hover { - color: #333333; -} - -.navbar .divider-vertical { - height: 40px; - margin: 0 9px; - border-right: 1px solid #ffffff; - border-left: 1px solid #f2f2f2; -} - -.navbar .btn, -.navbar .btn-group { - margin-top: 5px; -} - -.navbar .btn-group .btn, -.navbar .input-prepend .btn, -.navbar .input-append .btn { - margin-top: 0; -} - -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} - -.navbar-form:before, -.navbar-form:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-form:after { - clear: both; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .radio, -.navbar-form .checkbox { - margin-top: 5px; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .btn { - display: inline-block; - margin-bottom: 0; -} - -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { - margin-top: 3px; -} - -.navbar-form .input-append, -.navbar-form .input-prepend { - margin-top: 5px; - white-space: nowrap; -} - -.navbar-form .input-append input, -.navbar-form .input-prepend input { - margin-top: 0; -} - -.navbar-search { - position: relative; - float: left; - margin-top: 5px; - margin-bottom: 0; -} - -.navbar-search .search-query { - padding: 4px 14px; - margin-bottom: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.navbar-static-top { - position: static; - margin-bottom: 0; -} - -.navbar-static-top .navbar-inner { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - border-width: 0 0 1px; -} - -.navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-right: 0; - padding-left: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.navbar-fixed-top { - top: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -} - -.navbar-fixed-bottom { - bottom: 0; -} - -.navbar-fixed-bottom .navbar-inner { - -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -} - -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} - -.navbar .nav.pull-right { - float: right; - margin-right: 0; -} - -.navbar .nav > li { - float: left; -} - -.navbar .nav > li > a { - float: none; - padding: 10px 15px 10px; - color: #777777; - text-decoration: none; - text-shadow: 0 1px 0 #ffffff; -} - -.navbar .nav .dropdown-toggle .caret { - margin-top: 8px; -} - -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - color: #333333; - text-decoration: none; - background-color: transparent; -} - -.navbar .nav > .active > a, -.navbar .nav > .active > a:hover, -.navbar .nav > .active > a:focus { - color: #555555; - text-decoration: none; - background-color: #e5e5e5; - -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -} - -.navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-right: 5px; - margin-left: 5px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ededed; - *background-color: #e5e5e5; - background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); - background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); - background-repeat: repeat-x; - border-color: #e5e5e5 #e5e5e5 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} - -.navbar .btn-navbar:hover, -.navbar .btn-navbar:active, -.navbar .btn-navbar.active, -.navbar .btn-navbar.disabled, -.navbar .btn-navbar[disabled] { - color: #ffffff; - background-color: #e5e5e5; - *background-color: #d9d9d9; -} - -.navbar .btn-navbar:active, -.navbar .btn-navbar.active { - background-color: #cccccc \9; -} - -.navbar .btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} - -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} - -.navbar .nav > li > .dropdown-menu:before { - position: absolute; - top: -7px; - left: 9px; - display: inline-block; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ''; -} - -.navbar .nav > li > .dropdown-menu:after { - position: absolute; - top: -6px; - left: 10px; - display: inline-block; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - content: ''; -} - -.navbar-fixed-bottom .nav > li > .dropdown-menu:before { - top: auto; - bottom: -7px; - border-top: 7px solid #ccc; - border-bottom: 0; - border-top-color: rgba(0, 0, 0, 0.2); -} - -.navbar-fixed-bottom .nav > li > .dropdown-menu:after { - top: auto; - bottom: -6px; - border-top: 6px solid #ffffff; - border-bottom: 0; -} - -.navbar .nav li.dropdown > a:hover .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { - color: #555555; - background-color: #e5e5e5; -} - -.navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - -.navbar .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar .pull-right > li > .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu:before, -.navbar .nav > li > .dropdown-menu.pull-right:before { - right: 12px; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu:after, -.navbar .nav > li > .dropdown-menu.pull-right:after { - right: 13px; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { - right: 100%; - left: auto; - margin-right: -1px; - margin-left: 0; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; -} - -.navbar-inverse .navbar-inner { - background-color: #1b1b1b; - background-image: -moz-linear-gradient(top, #222222, #111111); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); - background-image: -webkit-linear-gradient(top, #222222, #111111); - background-image: -o-linear-gradient(top, #222222, #111111); - background-image: linear-gradient(to bottom, #222222, #111111); - background-repeat: repeat-x; - border-color: #252525; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); -} - -.navbar-inverse .brand, -.navbar-inverse .nav > li > a { - color: #999999; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} - -.navbar-inverse .brand:hover, -.navbar-inverse .nav > li > a:hover { - color: #ffffff; -} - -.navbar-inverse .brand { - color: #999999; -} - -.navbar-inverse .navbar-text { - color: #999999; -} - -.navbar-inverse .nav > li > a:focus, -.navbar-inverse .nav > li > a:hover { - color: #ffffff; - background-color: transparent; -} - -.navbar-inverse .nav .active > a, -.navbar-inverse .nav .active > a:hover, -.navbar-inverse .nav .active > a:focus { - color: #ffffff; - background-color: #111111; -} - -.navbar-inverse .navbar-link { - color: #999999; -} - -.navbar-inverse .navbar-link:hover { - color: #ffffff; -} - -.navbar-inverse .divider-vertical { - border-right-color: #222222; - border-left-color: #111111; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { - color: #ffffff; - background-color: #111111; -} - -.navbar-inverse .nav li.dropdown > a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .navbar-search .search-query { - color: #ffffff; - background-color: #515151; - border-color: #111111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; -} - -.navbar-inverse .navbar-search .search-query:-moz-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:focus, -.navbar-inverse .navbar-search .search-query.focused { - padding: 5px 15px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - outline: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -} - -.navbar-inverse .btn-navbar { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e0e0e; - *background-color: #040404; - background-image: -moz-linear-gradient(top, #151515, #040404); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); - background-image: -webkit-linear-gradient(top, #151515, #040404); - background-image: -o-linear-gradient(top, #151515, #040404); - background-image: linear-gradient(to bottom, #151515, #040404); - background-repeat: repeat-x; - border-color: #040404 #040404 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.navbar-inverse .btn-navbar:hover, -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active, -.navbar-inverse .btn-navbar.disabled, -.navbar-inverse .btn-navbar[disabled] { - color: #ffffff; - background-color: #040404; - *background-color: #000000; -} - -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active { - background-color: #000000 \9; -} - -.breadcrumb { - padding: 8px 15px; - margin: 0 0 20px; - list-style: none; - background-color: #f5f5f5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.breadcrumb > li { - display: inline-block; - *display: inline; - text-shadow: 0 1px 0 #ffffff; - *zoom: 1; -} - -.breadcrumb > li > .divider { - padding: 0 5px; - color: #ccc; -} - -.breadcrumb > .active { - color: #999999; -} - -.pagination { - margin: 20px 0; -} - -.pagination ul { - display: inline-block; - *display: inline; - margin-bottom: 0; - margin-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - *zoom: 1; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.pagination ul > li { - display: inline; -} - -.pagination ul > li > a, -.pagination ul > li > span { - float: left; - padding: 4px 12px; - line-height: 20px; - text-decoration: none; - background-color: #ffffff; - border: 1px solid #dddddd; - border-left-width: 0; -} - -.pagination ul > li > a:hover, -.pagination ul > .active > a, -.pagination ul > .active > span { - background-color: #f5f5f5; -} - -.pagination ul > .active > a, -.pagination ul > .active > span { - color: #999999; - cursor: default; -} - -.pagination ul > .disabled > span, -.pagination ul > .disabled > a, -.pagination ul > .disabled > a:hover { - color: #999999; - cursor: default; - background-color: transparent; -} - -.pagination ul > li:first-child > a, -.pagination ul > li:first-child > span { - border-left-width: 1px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.pagination ul > li:last-child > a, -.pagination ul > li:last-child > span { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.pagination-centered { - text-align: center; -} - -.pagination-right { - text-align: right; -} - -.pagination-large ul > li > a, -.pagination-large ul > li > span { - padding: 11px 19px; - font-size: 17.5px; -} - -.pagination-large ul > li:first-child > a, -.pagination-large ul > li:first-child > span { - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.pagination-large ul > li:last-child > a, -.pagination-large ul > li:last-child > span { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.pagination-mini ul > li:first-child > a, -.pagination-small ul > li:first-child > a, -.pagination-mini ul > li:first-child > span, -.pagination-small ul > li:first-child > span { - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -moz-border-radius-bottomleft: 3px; - -moz-border-radius-topleft: 3px; -} - -.pagination-mini ul > li:last-child > a, -.pagination-small ul > li:last-child > a, -.pagination-mini ul > li:last-child > span, -.pagination-small ul > li:last-child > span { - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - -moz-border-radius-topright: 3px; - -moz-border-radius-bottomright: 3px; -} - -.pagination-small ul > li > a, -.pagination-small ul > li > span { - padding: 2px 10px; - font-size: 11.9px; -} - -.pagination-mini ul > li > a, -.pagination-mini ul > li > span { - padding: 0 6px; - font-size: 10.5px; -} - -.pager { - margin: 20px 0; - text-align: center; - list-style: none; - *zoom: 1; -} - -.pager:before, -.pager:after { - display: table; - line-height: 0; - content: ""; -} - -.pager:after { - clear: both; -} - -.pager li { - display: inline; -} - -.pager li > a, -.pager li > span { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.pager li > a:hover { - text-decoration: none; - background-color: #f5f5f5; -} - -.pager .next > a, -.pager .next > span { - float: right; -} - -.pager .previous > a, -.pager .previous > span { - float: left; -} - -.pager .disabled > a, -.pager .disabled > a:hover, -.pager .disabled > span { - color: #999999; - cursor: default; - background-color: #fff; -} - -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} - -.modal-backdrop.fade { - opacity: 0; -} - -.modal-backdrop, -.modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.modal { - position: fixed; - top: 10%; - left: 50%; - z-index: 1050; - width: 560px; - margin-left: -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - outline: none; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} - -.modal.fade { - top: -25%; - -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; - -moz-transition: opacity 0.3s linear, top 0.3s ease-out; - -o-transition: opacity 0.3s linear, top 0.3s ease-out; - transition: opacity 0.3s linear, top 0.3s ease-out; -} - -.modal.fade.in { - top: 10%; -} - -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} - -.modal-header .close { - margin-top: 2px; -} - -.modal-header h3 { - margin: 0; - line-height: 30px; -} - -.modal-body { - position: relative; - max-height: 400px; - padding: 15px; - overflow-y: auto; -} - -.modal-form { - margin-bottom: 0; -} - -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} - -.modal-footer:before, -.modal-footer:after { - display: table; - line-height: 0; - content: ""; -} - -.modal-footer:after { - clear: both; -} - -.modal-footer .btn + .btn { - margin-bottom: 0; - margin-left: 5px; -} - -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} - -.modal-footer .btn-block + .btn-block { - margin-left: 0; -} - -.tooltip { - position: absolute; - z-index: 1030; - display: block; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); - visibility: visible; -} - -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.tooltip.top { - margin-top: -3px; -} - -.tooltip.right { - margin-left: 3px; -} - -.tooltip.bottom { - margin-top: 3px; -} - -.tooltip.left { - margin-left: -3px; -} - -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top-color: #000000; - border-width: 5px 5px 0; -} - -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-right-color: #000000; - border-width: 5px 5px 5px 0; -} - -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-left-color: #000000; - border-width: 5px 0 5px 5px; -} - -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-bottom-color: #000000; - border-width: 0 5px 5px; -} - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - width: 236px; - padding: 1px; - text-align: left; - white-space: normal; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.popover.top { - margin-top: -10px; -} - -.popover.right { - margin-left: 10px; -} - -.popover.bottom { - margin-top: 10px; -} - -.popover.left { - margin-left: -10px; -} - -.popover-title { - padding: 8px 14px; - margin: 0; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: #f7f7f7; - border-bottom: 1px solid #ebebeb; - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} - -.popover-content { - padding: 9px 14px; -} - -.popover .arrow, -.popover .arrow:after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.popover .arrow { - border-width: 11px; -} - -.popover .arrow:after { - border-width: 10px; - content: ""; -} - -.popover.top .arrow { - bottom: -11px; - left: 50%; - margin-left: -11px; - border-top-color: #999; - border-top-color: rgba(0, 0, 0, 0.25); - border-bottom-width: 0; -} - -.popover.top .arrow:after { - bottom: 1px; - margin-left: -10px; - border-top-color: #ffffff; - border-bottom-width: 0; -} - -.popover.right .arrow { - top: 50%; - left: -11px; - margin-top: -11px; - border-right-color: #999; - border-right-color: rgba(0, 0, 0, 0.25); - border-left-width: 0; -} - -.popover.right .arrow:after { - bottom: -10px; - left: 1px; - border-right-color: #ffffff; - border-left-width: 0; -} - -.popover.bottom .arrow { - top: -11px; - left: 50%; - margin-left: -11px; - border-bottom-color: #999; - border-bottom-color: rgba(0, 0, 0, 0.25); - border-top-width: 0; -} - -.popover.bottom .arrow:after { - top: 1px; - margin-left: -10px; - border-bottom-color: #ffffff; - border-top-width: 0; -} - -.popover.left .arrow { - top: 50%; - right: -11px; - margin-top: -11px; - border-left-color: #999; - border-left-color: rgba(0, 0, 0, 0.25); - border-right-width: 0; -} - -.popover.left .arrow:after { - right: 1px; - bottom: -10px; - border-left-color: #ffffff; - border-right-width: 0; -} - -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} - -.thumbnails:before, -.thumbnails:after { - display: table; - line-height: 0; - content: ""; -} - -.thumbnails:after { - clear: both; -} - -.row-fluid .thumbnails { - margin-left: 0; -} - -.thumbnails > li { - float: left; - margin-bottom: 20px; - margin-left: 20px; -} - -.thumbnail { - display: block; - padding: 4px; - line-height: 20px; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} - -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} - -.thumbnail > img { - display: block; - max-width: 100%; - margin-right: auto; - margin-left: auto; -} - -.thumbnail .caption { - padding: 9px; - color: #555555; -} - -.media, -.media-body { - overflow: hidden; - *overflow: visible; - zoom: 1; -} - -.media, -.media .media { - margin-top: 15px; -} - -.media:first-child { - margin-top: 0; -} - -.media-object { - display: block; -} - -.media-heading { - margin: 0 0 5px; -} - -.media .pull-left { - margin-right: 10px; -} - -.media .pull-right { - margin-left: 10px; -} - -.media-list { - margin-left: 0; - list-style: none; -} - -.label, -.badge { - display: inline-block; - padding: 2px 4px; - font-size: 11.844px; - font-weight: bold; - line-height: 14px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - white-space: nowrap; - vertical-align: baseline; - background-color: #999999; -} - -.label { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.badge { - padding-right: 9px; - padding-left: 9px; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; -} - -.label:empty, -.badge:empty { - display: none; -} - -a.label:hover, -a.badge:hover { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} - -.label-important, -.badge-important { - background-color: #b94a48; -} - -.label-important[href], -.badge-important[href] { - background-color: #953b39; -} - -.label-warning, -.badge-warning { - background-color: #f89406; -} - -.label-warning[href], -.badge-warning[href] { - background-color: #c67605; -} - -.label-success, -.badge-success { - background-color: #468847; -} - -.label-success[href], -.badge-success[href] { - background-color: #356635; -} - -.label-info, -.badge-info { - background-color: #3a87ad; -} - -.label-info[href], -.badge-info[href] { - background-color: #2d6987; -} - -.label-inverse, -.badge-inverse { - background-color: #333333; -} - -.label-inverse[href], -.badge-inverse[href] { - background-color: #1a1a1a; -} - -.btn .label, -.btn .badge { - position: relative; - top: -1px; -} - -.btn-mini .label, -.btn-mini .badge { - top: 0; -} - -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-ms-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} - -@keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -.progress { - height: 20px; - margin-bottom: 20px; - overflow: hidden; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} - -.progress .bar { - float: left; - width: 0; - height: 100%; - font-size: 12px; - color: #ffffff; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(to bottom, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} - -.progress .bar + .bar { - -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); -} - -.progress-striped .bar { - background-color: #149bdf; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} - -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} - -.progress-danger .bar, -.progress .bar-danger { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); -} - -.progress-danger.progress-striped .bar, -.progress-striped .bar-danger { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-success .bar, -.progress .bar-success { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(to bottom, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); -} - -.progress-success.progress-striped .bar, -.progress-striped .bar-success { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-info .bar, -.progress .bar-info { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(to bottom, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); -} - -.progress-info.progress-striped .bar, -.progress-striped .bar-info { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-warning .bar, -.progress .bar-warning { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); -} - -.progress-warning.progress-striped .bar, -.progress-striped .bar-warning { - background-color: #fbb450; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.accordion { - margin-bottom: 20px; -} - -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.accordion-heading { - border-bottom: 0; -} - -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} - -.accordion-toggle { - cursor: pointer; -} - -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} - -.carousel { - position: relative; - margin-bottom: 20px; - line-height: 1; -} - -.carousel-inner { - position: relative; - width: 100%; - overflow: hidden; -} - -.carousel-inner > .item { - position: relative; - display: none; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} - -.carousel-inner > .item > img { - display: block; - line-height: 1; -} - -.carousel-inner > .active, -.carousel-inner > .next, -.carousel-inner > .prev { - display: block; -} - -.carousel-inner > .active { - left: 0; -} - -.carousel-inner > .next, -.carousel-inner > .prev { - position: absolute; - top: 0; - width: 100%; -} - -.carousel-inner > .next { - left: 100%; -} - -.carousel-inner > .prev { - left: -100%; -} - -.carousel-inner > .next.left, -.carousel-inner > .prev.right { - left: 0; -} - -.carousel-inner > .active.left { - left: -100%; -} - -.carousel-inner > .active.right { - left: 100%; -} - -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} - -.carousel-control.right { - right: 15px; - left: auto; -} - -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} - -.carousel-caption { - position: absolute; - right: 0; - bottom: 0; - left: 0; - padding: 15px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} - -.carousel-caption h4, -.carousel-caption p { - line-height: 20px; - color: #ffffff; -} - -.carousel-caption h4 { - margin: 0 0 5px; -} - -.carousel-caption p { - margin-bottom: 0; -} - -.hero-unit { - padding: 60px; - margin-bottom: 30px; - font-size: 18px; - font-weight: 200; - line-height: 30px; - color: inherit; - background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; - color: inherit; -} - -.hero-unit li { - line-height: 30px; -} - -.pull-right { - float: right; -} - -.pull-left { - float: left; -} - -.hide { - display: none; -} - -.show { - display: block; -} - -.invisible { - visibility: hidden; -} - -.affix { - position: fixed; -} diff --git a/samples/xml/helloworld/src/main/webapp/resources/img/favicon.ico b/samples/xml/helloworld/src/main/webapp/resources/img/favicon.ico deleted file mode 100644 index bfb9974019d4b8b978cf34ea67f0c6804f9b76c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYI*xFHzK2NLHVUHb1iG2*{Y zgB?lOds5VYkY4wx3IDZQ-O0jkQ{(?@bp=p{C&v8O!h&CXe)}H=o_u_bRSig==8O!i zc=x^YFzx?WUq6CX4M?xX{1U9V`}7vL{^Em6v8n;-RbSqS702#f2-g1(NLsD$!KwzN zS8ZJ%R&20o^8Y{o{{6r8@eNjaxV~+({;Q#3&F!=Q_uf49|L5O7|6hFn@<03RE(|p= zJ*s<_{YS^WcP_&H4q|}(5Orn`hB}ZwmBSk_@QDwvQS^g2lONu|PzTm~V&{JqG(7$3 zJq-P6H_u_H1L;#fa{vQto;~z`$*ZUT-~ayo|MAc7|C=7&#!v&-2UM#}0rtFhmTdiw fS5E!E^7Zq7x2tDJHpBVK>Hp`xeEbh92gs!XBi)`m diff --git a/samples/xml/helloworld/src/main/webapp/resources/img/logo.png b/samples/xml/helloworld/src/main/webapp/resources/img/logo.png deleted file mode 100644 index 393230883fb4e04829339f7c21b6ab6de7393891..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1123 zcmV-p1f2VcP)P000yS1^@s74{)X{0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$1xZ9fRCwBAJakr>0R&#%?*!8<7oReN z=>H6CRSb*_9RHalf3;=rzRt=3!VW|AET)fs_IS z5aXsJDqv;5UUXCgspCNG%qCu4_4m8Q8J4{_Ss=DB)G%-}OK$)A_qiv-M@As~;az|L zf?EIsP`7cheE7}?GEN=HaRK6^jLh%PvWj*xv3z@3xac)oRV-9P3=lIhyklZuIsRdC zEQk#P>`Ve}KmUCIvzcu9Tf*+YVP*hfGu{$8D7y_HfEf3kMztIrynEOQW2*Ct&A;*G zO}I7VlHICc5w;GSdsSFH1nBbCHtgWCZ;JNm@ z`XjO?7RGP?S?;`M26}|$>d$}7+Q^c380tVF%ErLJjAqwYZkA^sS%0xHF}~wxlbiD5 z`(qoR=no*41>&DbDvtqiaJE+C3lIk&fG}bK9l%ly6jZSM`Nu#MU}XG#RzRlJh~>*q zMz|m_S~GwYKiDe_40nN83W%$i`8HWIa~)&&`WqMkpMdet@v+_G7x%2~|M)9$Tk#!Y zFw1)&gOROi`~TlS|Ne#uGBU8e{?G6W7-39r7#RMspu`I>^-8__`jg@PS4KGI{tDI)dzZ%dlS>M59FF!%vUTz)~b4X4$^~`TvW7 ziIMs5zyE)kk;ES}`AIdM1t$C=P~wMS3!!9Ap!k0ap%i9haWBalIY!4O?f(oAd%r+4 zo)k2;d7%b_#Jhnp-2~zQ1Q@}XCIrw@0t|34GX2=V#dp;1>j!5(mhZn98K?y0fw-87 z<#h&!;7V3zwkKdg)?fU+ET4a(DSgvn03;_eFu%5AV7&(n_piW02N=Hpff?mLFf{&g z0%=ZYR2CvOD9l@{`Ma!o3LDu1eZb}An>(a<~Q?=8{fF=xc@W!MoZ)b z{O|{gu_$Ev|5TXe{Z}Tay7jj||2@OO@D(hD)hsRsjrwm4H=1C4P6p+J-x==O;Vpp} zelf7T{l>^3$L4GI;MZmjLQek2%+jdD-YkChTV1vRXZ6WjKj)c!`-fi-2P5B87D!gv za)A+O=YLR%j|aSGxW@31vGu^;|BMVrzfaux>)%&1LJk9(o(#_DK=28Oy@5ho@oC^@ z5m@o{&xh3zgTK{rGV>dM|NF@cm+`=a;1wp - - - - - - - - Hello World - - - - - - - - - - - -
    -

    TODO Secure this

    -

    We would like to secure this page

    -
    - - -     diff --git a/samples/xml/insecure/src/main/webapp/resources/css/bootstrap-responsive.css b/samples/xml/insecure/src/main/webapp/resources/css/bootstrap-responsive.css deleted file mode 100644 index ba09bc8777..0000000000 --- a/samples/xml/insecure/src/main/webapp/resources/css/bootstrap-responsive.css +++ /dev/null @@ -1,1092 +0,0 @@ -/*! - * Bootstrap Responsive v2.2.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -@-ms-viewport { - width: device-width; -} - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.hidden { - display: none; - visibility: hidden; -} - -.visible-phone { - display: none !important; -} - -.visible-tablet { - display: none !important; -} - -.hidden-desktop { - display: none !important; -} - -.visible-desktop { - display: inherit !important; -} - -@media (min-width: 768px) and (max-width: 979px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important ; - } - .visible-tablet { - display: inherit !important; - } - .hidden-tablet { - display: none !important; - } -} - -@media (max-width: 767px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important; - } - .visible-phone { - display: inherit !important; - } - .hidden-phone { - display: none !important; - } -} - -@media (min-width: 1200px) { - .row { - margin-left: -30px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 30px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 1170px; - } - .span12 { - width: 1170px; - } - .span11 { - width: 1070px; - } - .span10 { - width: 970px; - } - .span9 { - width: 870px; - } - .span8 { - width: 770px; - } - .span7 { - width: 670px; - } - .span6 { - width: 570px; - } - .span5 { - width: 470px; - } - .span4 { - width: 370px; - } - .span3 { - width: 270px; - } - .span2 { - width: 170px; - } - .span1 { - width: 70px; - } - .offset12 { - margin-left: 1230px; - } - .offset11 { - margin-left: 1130px; - } - .offset10 { - margin-left: 1030px; - } - .offset9 { - margin-left: 930px; - } - .offset8 { - margin-left: 830px; - } - .offset7 { - margin-left: 730px; - } - .offset6 { - margin-left: 630px; - } - .offset5 { - margin-left: 530px; - } - .offset4 { - margin-left: 430px; - } - .offset3 { - margin-left: 330px; - } - .offset2 { - margin-left: 230px; - } - .offset1 { - margin-left: 130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.564102564102564%; - *margin-left: 2.5109110747408616%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.564102564102564%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.45299145299145%; - *width: 91.39979996362975%; - } - .row-fluid .span10 { - width: 82.90598290598291%; - *width: 82.8527914166212%; - } - .row-fluid .span9 { - width: 74.35897435897436%; - *width: 74.30578286961266%; - } - .row-fluid .span8 { - width: 65.81196581196582%; - *width: 65.75877432260411%; - } - .row-fluid .span7 { - width: 57.26495726495726%; - *width: 57.21176577559556%; - } - .row-fluid .span6 { - width: 48.717948717948715%; - *width: 48.664757228587014%; - } - .row-fluid .span5 { - width: 40.17094017094017%; - *width: 40.11774868157847%; - } - .row-fluid .span4 { - width: 31.623931623931625%; - *width: 31.570740134569924%; - } - .row-fluid .span3 { - width: 23.076923076923077%; - *width: 23.023731587561375%; - } - .row-fluid .span2 { - width: 14.52991452991453%; - *width: 14.476723040552828%; - } - .row-fluid .span1 { - width: 5.982905982905983%; - *width: 5.929714493544281%; - } - .row-fluid .offset12 { - margin-left: 105.12820512820512%; - *margin-left: 105.02182214948171%; - } - .row-fluid .offset12:first-child { - margin-left: 102.56410256410257%; - *margin-left: 102.45771958537915%; - } - .row-fluid .offset11 { - margin-left: 96.58119658119658%; - *margin-left: 96.47481360247316%; - } - .row-fluid .offset11:first-child { - margin-left: 94.01709401709402%; - *margin-left: 93.91071103837061%; - } - .row-fluid .offset10 { - margin-left: 88.03418803418803%; - *margin-left: 87.92780505546462%; - } - .row-fluid .offset10:first-child { - margin-left: 85.47008547008548%; - *margin-left: 85.36370249136206%; - } - .row-fluid .offset9 { - margin-left: 79.48717948717949%; - *margin-left: 79.38079650845607%; - } - .row-fluid .offset9:first-child { - margin-left: 76.92307692307693%; - *margin-left: 76.81669394435352%; - } - .row-fluid .offset8 { - margin-left: 70.94017094017094%; - *margin-left: 70.83378796144753%; - } - .row-fluid .offset8:first-child { - margin-left: 68.37606837606839%; - *margin-left: 68.26968539734497%; - } - .row-fluid .offset7 { - margin-left: 62.393162393162385%; - *margin-left: 62.28677941443899%; - } - .row-fluid .offset7:first-child { - margin-left: 59.82905982905982%; - *margin-left: 59.72267685033642%; - } - .row-fluid .offset6 { - margin-left: 53.84615384615384%; - *margin-left: 53.739770867430444%; - } - .row-fluid .offset6:first-child { - margin-left: 51.28205128205128%; - *margin-left: 51.175668303327875%; - } - .row-fluid .offset5 { - margin-left: 45.299145299145295%; - *margin-left: 45.1927623204219%; - } - .row-fluid .offset5:first-child { - margin-left: 42.73504273504273%; - *margin-left: 42.62865975631933%; - } - .row-fluid .offset4 { - margin-left: 36.75213675213675%; - *margin-left: 36.645753773413354%; - } - .row-fluid .offset4:first-child { - margin-left: 34.18803418803419%; - *margin-left: 34.081651209310785%; - } - .row-fluid .offset3 { - margin-left: 28.205128205128204%; - *margin-left: 28.0987452264048%; - } - .row-fluid .offset3:first-child { - margin-left: 25.641025641025642%; - *margin-left: 25.53464266230224%; - } - .row-fluid .offset2 { - margin-left: 19.65811965811966%; - *margin-left: 19.551736679396257%; - } - .row-fluid .offset2:first-child { - margin-left: 17.094017094017094%; - *margin-left: 16.98763411529369%; - } - .row-fluid .offset1 { - margin-left: 11.11111111111111%; - *margin-left: 11.004728132387708%; - } - .row-fluid .offset1:first-child { - margin-left: 8.547008547008547%; - *margin-left: 8.440625568285142%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 30px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 1156px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 1056px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 956px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 856px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 756px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 656px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 556px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 456px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 356px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 256px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 156px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 56px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } - .row-fluid .thumbnails { - margin-left: 0; - } -} - -@media (min-width: 768px) and (max-width: 979px) { - .row { - margin-left: -20px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 724px; - } - .span12 { - width: 724px; - } - .span11 { - width: 662px; - } - .span10 { - width: 600px; - } - .span9 { - width: 538px; - } - .span8 { - width: 476px; - } - .span7 { - width: 414px; - } - .span6 { - width: 352px; - } - .span5 { - width: 290px; - } - .span4 { - width: 228px; - } - .span3 { - width: 166px; - } - .span2 { - width: 104px; - } - .span1 { - width: 42px; - } - .offset12 { - margin-left: 764px; - } - .offset11 { - margin-left: 702px; - } - .offset10 { - margin-left: 640px; - } - .offset9 { - margin-left: 578px; - } - .offset8 { - margin-left: 516px; - } - .offset7 { - margin-left: 454px; - } - .offset6 { - margin-left: 392px; - } - .offset5 { - margin-left: 330px; - } - .offset4 { - margin-left: 268px; - } - .offset3 { - margin-left: 206px; - } - .offset2 { - margin-left: 144px; - } - .offset1 { - margin-left: 82px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.7624309392265194%; - *margin-left: 2.709239449864817%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.7624309392265194%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.43646408839778%; - *width: 91.38327259903608%; - } - .row-fluid .span10 { - width: 82.87292817679558%; - *width: 82.81973668743387%; - } - .row-fluid .span9 { - width: 74.30939226519337%; - *width: 74.25620077583166%; - } - .row-fluid .span8 { - width: 65.74585635359117%; - *width: 65.69266486422946%; - } - .row-fluid .span7 { - width: 57.18232044198895%; - *width: 57.12912895262725%; - } - .row-fluid .span6 { - width: 48.61878453038674%; - *width: 48.56559304102504%; - } - .row-fluid .span5 { - width: 40.05524861878453%; - *width: 40.00205712942283%; - } - .row-fluid .span4 { - width: 31.491712707182323%; - *width: 31.43852121782062%; - } - .row-fluid .span3 { - width: 22.92817679558011%; - *width: 22.87498530621841%; - } - .row-fluid .span2 { - width: 14.3646408839779%; - *width: 14.311449394616199%; - } - .row-fluid .span1 { - width: 5.801104972375691%; - *width: 5.747913483013988%; - } - .row-fluid .offset12 { - margin-left: 105.52486187845304%; - *margin-left: 105.41847889972962%; - } - .row-fluid .offset12:first-child { - margin-left: 102.76243093922652%; - *margin-left: 102.6560479605031%; - } - .row-fluid .offset11 { - margin-left: 96.96132596685082%; - *margin-left: 96.8549429881274%; - } - .row-fluid .offset11:first-child { - margin-left: 94.1988950276243%; - *margin-left: 94.09251204890089%; - } - .row-fluid .offset10 { - margin-left: 88.39779005524862%; - *margin-left: 88.2914070765252%; - } - .row-fluid .offset10:first-child { - margin-left: 85.6353591160221%; - *margin-left: 85.52897613729868%; - } - .row-fluid .offset9 { - margin-left: 79.8342541436464%; - *margin-left: 79.72787116492299%; - } - .row-fluid .offset9:first-child { - margin-left: 77.07182320441989%; - *margin-left: 76.96544022569647%; - } - .row-fluid .offset8 { - margin-left: 71.2707182320442%; - *margin-left: 71.16433525332079%; - } - .row-fluid .offset8:first-child { - margin-left: 68.50828729281768%; - *margin-left: 68.40190431409427%; - } - .row-fluid .offset7 { - margin-left: 62.70718232044199%; - *margin-left: 62.600799341718584%; - } - .row-fluid .offset7:first-child { - margin-left: 59.94475138121547%; - *margin-left: 59.838368402492065%; - } - .row-fluid .offset6 { - margin-left: 54.14364640883978%; - *margin-left: 54.037263430116376%; - } - .row-fluid .offset6:first-child { - margin-left: 51.38121546961326%; - *margin-left: 51.27483249088986%; - } - .row-fluid .offset5 { - margin-left: 45.58011049723757%; - *margin-left: 45.47372751851417%; - } - .row-fluid .offset5:first-child { - margin-left: 42.81767955801105%; - *margin-left: 42.71129657928765%; - } - .row-fluid .offset4 { - margin-left: 37.01657458563536%; - *margin-left: 36.91019160691196%; - } - .row-fluid .offset4:first-child { - margin-left: 34.25414364640884%; - *margin-left: 34.14776066768544%; - } - .row-fluid .offset3 { - margin-left: 28.45303867403315%; - *margin-left: 28.346655695309746%; - } - .row-fluid .offset3:first-child { - margin-left: 25.69060773480663%; - *margin-left: 25.584224756083227%; - } - .row-fluid .offset2 { - margin-left: 19.88950276243094%; - *margin-left: 19.783119783707537%; - } - .row-fluid .offset2:first-child { - margin-left: 17.12707182320442%; - *margin-left: 17.02068884448102%; - } - .row-fluid .offset1 { - margin-left: 11.32596685082873%; - *margin-left: 11.219583872105325%; - } - .row-fluid .offset1:first-child { - margin-left: 8.56353591160221%; - *margin-left: 8.457152932878806%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 710px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 648px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 586px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 524px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 462px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 400px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 338px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 276px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 214px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 152px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 90px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 28px; - } -} - -@media (max-width: 767px) { - body { - padding-right: 20px; - padding-left: 20px; - } - .navbar-fixed-top, - .navbar-fixed-bottom, - .navbar-static-top { - margin-right: -20px; - margin-left: -20px; - } - .container-fluid { - padding: 0; - } - .dl-horizontal dt { - float: none; - width: auto; - clear: none; - text-align: left; - } - .dl-horizontal dd { - margin-left: 0; - } - .container { - width: auto; - } - .row-fluid { - width: 100%; - } - .row, - .thumbnails { - margin-left: 0; - } - .thumbnails > li { - float: none; - margin-left: 0; - } - [class*="span"], - .uneditable-input[class*="span"], - .row-fluid [class*="span"] { - display: block; - float: none; - width: 100%; - margin-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .span12, - .row-fluid .span12 { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="offset"]:first-child { - margin-left: 0; - } - .input-large, - .input-xlarge, - .input-xxlarge, - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .input-prepend input, - .input-append input, - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - display: inline-block; - width: auto; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 0; - } - .modal { - position: fixed; - top: 20px; - right: 20px; - left: 20px; - width: auto; - margin: 0; - } - .modal.fade { - top: -100px; - } - .modal.fade.in { - top: 20px; - } -} - -@media (max-width: 480px) { - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); - } - .page-header h1 small { - display: block; - line-height: 20px; - } - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - .form-horizontal .control-label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .form-horizontal .controls { - margin-left: 0; - } - .form-horizontal .control-list { - padding-top: 0; - } - .form-horizontal .form-actions { - padding-right: 10px; - padding-left: 10px; - } - .media .pull-left, - .media .pull-right { - display: block; - float: none; - margin-bottom: 10px; - } - .media-object { - margin-right: 0; - margin-left: 0; - } - .modal { - top: 10px; - right: 10px; - left: 10px; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - .carousel-caption { - position: static; - } -} - -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top, - .navbar-fixed-bottom { - position: static; - } - .navbar-fixed-top { - margin-bottom: 20px; - } - .navbar-fixed-bottom { - margin-top: 20px; - } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-right: 10px; - padding-left: 10px; - margin: 0 0 0 -5px; - } - .nav-collapse { - clear: both; - } - .nav-collapse .nav { - float: none; - margin: 0 0 10px; - } - .nav-collapse .nav > li { - float: none; - } - .nav-collapse .nav > li > a { - margin-bottom: 2px; - } - .nav-collapse .nav > .divider-vertical { - display: none; - } - .nav-collapse .nav .nav-header { - color: #777777; - text-shadow: none; - } - .nav-collapse .nav > li > a, - .nav-collapse .dropdown-menu a { - padding: 9px 15px; - font-weight: bold; - color: #777777; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .nav-collapse .btn { - padding: 4px 10px 4px; - font-weight: normal; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - } - .nav-collapse .dropdown-menu li + li a { - margin-bottom: 2px; - } - .nav-collapse .nav > li > a:hover, - .nav-collapse .dropdown-menu a:hover { - background-color: #f2f2f2; - } - .navbar-inverse .nav-collapse .nav > li > a, - .navbar-inverse .nav-collapse .dropdown-menu a { - color: #999999; - } - .navbar-inverse .nav-collapse .nav > li > a:hover, - .navbar-inverse .nav-collapse .dropdown-menu a:hover { - background-color: #111111; - } - .nav-collapse.in .btn-group { - padding: 0; - margin-top: 5px; - } - .nav-collapse .dropdown-menu { - position: static; - top: auto; - left: auto; - display: none; - float: none; - max-width: none; - padding: 0; - margin: 0 15px; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .nav-collapse .open > .dropdown-menu { - display: block; - } - .nav-collapse .dropdown-menu:before, - .nav-collapse .dropdown-menu:after { - display: none; - } - .nav-collapse .dropdown-menu .divider { - display: none; - } - .nav-collapse .nav > li > .dropdown-menu:before, - .nav-collapse .nav > li > .dropdown-menu:after { - display: none; - } - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - float: none; - padding: 10px 15px; - margin: 10px 0; - border-top: 1px solid #f2f2f2; - border-bottom: 1px solid #f2f2f2; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - } - .navbar-inverse .nav-collapse .navbar-form, - .navbar-inverse .nav-collapse .navbar-search { - border-top-color: #111111; - border-bottom-color: #111111; - } - .navbar .nav-collapse .nav.pull-right { - float: none; - margin-left: 0; - } - .nav-collapse, - .nav-collapse.collapse { - height: 0; - overflow: hidden; - } - .navbar .btn-navbar { - display: block; - } - .navbar-static .navbar-inner { - padding-right: 10px; - padding-left: 10px; - } -} - -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } -} diff --git a/samples/xml/insecure/src/main/webapp/resources/css/bootstrap.css b/samples/xml/insecure/src/main/webapp/resources/css/bootstrap.css deleted file mode 100644 index 22aa0c17a9..0000000000 --- a/samples/xml/insecure/src/main/webapp/resources/css/bootstrap.css +++ /dev/null @@ -1,6039 +0,0 @@ -/*! - * Bootstrap v2.2.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} - -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} - -audio:not([controls]) { - display: none; -} - -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} - -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -a:hover, -a:active { - outline: 0; -} - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -img { - width: auto\9; - height: auto; - max-width: 100%; - vertical-align: middle; - border: 0; - -ms-interpolation-mode: bicubic; -} - -#map_canvas img, -.google-maps img { - max-width: none; -} - -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} - -button, -input { - *overflow: visible; - line-height: normal; -} - -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} - -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} - -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; -} - -input[type="search"] { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield; -} - -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} - -textarea { - overflow: auto; - vertical-align: top; -} - -@media print { - * { - color: #000 !important; - text-shadow: none !important; - background: transparent !important; - box-shadow: none !important; - } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - thead { - display: table-header-group; - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 0.5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - page-break-after: avoid; - } -} - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; - line-height: 20px; - color: #333333; - background-color: #ffffff; -} - -a { - color: #0088cc; - text-decoration: none; -} - -a:hover { - color: #005580; - text-decoration: underline; -} - -.img-rounded { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.img-polaroid { - padding: 4px; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -} - -.img-circle { - -webkit-border-radius: 500px; - -moz-border-radius: 500px; - border-radius: 500px; -} - -.row { - margin-left: -20px; - *zoom: 1; -} - -.row:before, -.row:after { - display: table; - line-height: 0; - content: ""; -} - -.row:after { - clear: both; -} - -[class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; -} - -.container, -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.span12 { - width: 940px; -} - -.span11 { - width: 860px; -} - -.span10 { - width: 780px; -} - -.span9 { - width: 700px; -} - -.span8 { - width: 620px; -} - -.span7 { - width: 540px; -} - -.span6 { - width: 460px; -} - -.span5 { - width: 380px; -} - -.span4 { - width: 300px; -} - -.span3 { - width: 220px; -} - -.span2 { - width: 140px; -} - -.span1 { - width: 60px; -} - -.offset12 { - margin-left: 980px; -} - -.offset11 { - margin-left: 900px; -} - -.offset10 { - margin-left: 820px; -} - -.offset9 { - margin-left: 740px; -} - -.offset8 { - margin-left: 660px; -} - -.offset7 { - margin-left: 580px; -} - -.offset6 { - margin-left: 500px; -} - -.offset5 { - margin-left: 420px; -} - -.offset4 { - margin-left: 340px; -} - -.offset3 { - margin-left: 260px; -} - -.offset2 { - margin-left: 180px; -} - -.offset1 { - margin-left: 100px; -} - -.row-fluid { - width: 100%; - *zoom: 1; -} - -.row-fluid:before, -.row-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.row-fluid:after { - clear: both; -} - -.row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.127659574468085%; - *margin-left: 2.074468085106383%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.row-fluid [class*="span"]:first-child { - margin-left: 0; -} - -.row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.127659574468085%; -} - -.row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; -} - -.row-fluid .span11 { - width: 91.48936170212765%; - *width: 91.43617021276594%; -} - -.row-fluid .span10 { - width: 82.97872340425532%; - *width: 82.92553191489361%; -} - -.row-fluid .span9 { - width: 74.46808510638297%; - *width: 74.41489361702126%; -} - -.row-fluid .span8 { - width: 65.95744680851064%; - *width: 65.90425531914893%; -} - -.row-fluid .span7 { - width: 57.44680851063829%; - *width: 57.39361702127659%; -} - -.row-fluid .span6 { - width: 48.93617021276595%; - *width: 48.88297872340425%; -} - -.row-fluid .span5 { - width: 40.42553191489362%; - *width: 40.37234042553192%; -} - -.row-fluid .span4 { - width: 31.914893617021278%; - *width: 31.861702127659576%; -} - -.row-fluid .span3 { - width: 23.404255319148934%; - *width: 23.351063829787233%; -} - -.row-fluid .span2 { - width: 14.893617021276595%; - *width: 14.840425531914894%; -} - -.row-fluid .span1 { - width: 6.382978723404255%; - *width: 6.329787234042553%; -} - -.row-fluid .offset12 { - margin-left: 104.25531914893617%; - *margin-left: 104.14893617021275%; -} - -.row-fluid .offset12:first-child { - margin-left: 102.12765957446808%; - *margin-left: 102.02127659574467%; -} - -.row-fluid .offset11 { - margin-left: 95.74468085106382%; - *margin-left: 95.6382978723404%; -} - -.row-fluid .offset11:first-child { - margin-left: 93.61702127659574%; - *margin-left: 93.51063829787232%; -} - -.row-fluid .offset10 { - margin-left: 87.23404255319149%; - *margin-left: 87.12765957446807%; -} - -.row-fluid .offset10:first-child { - margin-left: 85.1063829787234%; - *margin-left: 84.99999999999999%; -} - -.row-fluid .offset9 { - margin-left: 78.72340425531914%; - *margin-left: 78.61702127659572%; -} - -.row-fluid .offset9:first-child { - margin-left: 76.59574468085106%; - *margin-left: 76.48936170212764%; -} - -.row-fluid .offset8 { - margin-left: 70.2127659574468%; - *margin-left: 70.10638297872339%; -} - -.row-fluid .offset8:first-child { - margin-left: 68.08510638297872%; - *margin-left: 67.9787234042553%; -} - -.row-fluid .offset7 { - margin-left: 61.70212765957446%; - *margin-left: 61.59574468085106%; -} - -.row-fluid .offset7:first-child { - margin-left: 59.574468085106375%; - *margin-left: 59.46808510638297%; -} - -.row-fluid .offset6 { - margin-left: 53.191489361702125%; - *margin-left: 53.085106382978715%; -} - -.row-fluid .offset6:first-child { - margin-left: 51.063829787234035%; - *margin-left: 50.95744680851063%; -} - -.row-fluid .offset5 { - margin-left: 44.68085106382979%; - *margin-left: 44.57446808510638%; -} - -.row-fluid .offset5:first-child { - margin-left: 42.5531914893617%; - *margin-left: 42.4468085106383%; -} - -.row-fluid .offset4 { - margin-left: 36.170212765957444%; - *margin-left: 36.06382978723405%; -} - -.row-fluid .offset4:first-child { - margin-left: 34.04255319148936%; - *margin-left: 33.93617021276596%; -} - -.row-fluid .offset3 { - margin-left: 27.659574468085104%; - *margin-left: 27.5531914893617%; -} - -.row-fluid .offset3:first-child { - margin-left: 25.53191489361702%; - *margin-left: 25.425531914893618%; -} - -.row-fluid .offset2 { - margin-left: 19.148936170212764%; - *margin-left: 19.04255319148936%; -} - -.row-fluid .offset2:first-child { - margin-left: 17.02127659574468%; - *margin-left: 16.914893617021278%; -} - -.row-fluid .offset1 { - margin-left: 10.638297872340425%; - *margin-left: 10.53191489361702%; -} - -.row-fluid .offset1:first-child { - margin-left: 8.51063829787234%; - *margin-left: 8.404255319148938%; -} - -[class*="span"].hide, -.row-fluid [class*="span"].hide { - display: none; -} - -[class*="span"].pull-right, -.row-fluid [class*="span"].pull-right { - float: right; -} - -.container { - margin-right: auto; - margin-left: auto; - *zoom: 1; -} - -.container:before, -.container:after { - display: table; - line-height: 0; - content: ""; -} - -.container:after { - clear: both; -} - -.container-fluid { - padding-right: 20px; - padding-left: 20px; - *zoom: 1; -} - -.container-fluid:before, -.container-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.container-fluid:after { - clear: both; -} - -p { - margin: 0 0 10px; -} - -.lead { - margin-bottom: 20px; - font-size: 21px; - font-weight: 200; - line-height: 30px; -} - -small { - font-size: 85%; -} - -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - -cite { - font-style: normal; -} - -.muted { - color: #999999; -} - -a.muted:hover { - color: #808080; -} - -.text-warning { - color: #c09853; -} - -a.text-warning:hover { - color: #a47e3c; -} - -.text-error { - color: #b94a48; -} - -a.text-error:hover { - color: #953b39; -} - -.text-info { - color: #3a87ad; -} - -a.text-info:hover { - color: #2d6987; -} - -.text-success { - color: #468847; -} - -a.text-success:hover { - color: #356635; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 10px 0; - font-family: inherit; - font-weight: bold; - line-height: 20px; - color: inherit; - text-rendering: optimizelegibility; -} - -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - line-height: 1; - color: #999999; -} - -h1, -h2, -h3 { - line-height: 40px; -} - -h1 { - font-size: 38.5px; -} - -h2 { - font-size: 31.5px; -} - -h3 { - font-size: 24.5px; -} - -h4 { - font-size: 17.5px; -} - -h5 { - font-size: 14px; -} - -h6 { - font-size: 11.9px; -} - -h1 small { - font-size: 24.5px; -} - -h2 small { - font-size: 17.5px; -} - -h3 small { - font-size: 14px; -} - -h4 small { - font-size: 14px; -} - -.page-header { - padding-bottom: 9px; - margin: 20px 0 30px; - border-bottom: 1px solid #eeeeee; -} - -ul, -ol { - padding: 0; - margin: 0 0 10px 25px; -} - -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} - -li { - line-height: 20px; -} - -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} - -ul.inline, -ol.inline { - margin-left: 0; - list-style: none; -} - -ul.inline > li, -ol.inline > li { - display: inline-block; - padding-right: 5px; - padding-left: 5px; -} - -dl { - margin-bottom: 20px; -} - -dt, -dd { - line-height: 20px; -} - -dt { - font-weight: bold; -} - -dd { - margin-left: 10px; -} - -.dl-horizontal { - *zoom: 1; -} - -.dl-horizontal:before, -.dl-horizontal:after { - display: table; - line-height: 0; - content: ""; -} - -.dl-horizontal:after { - clear: both; -} - -.dl-horizontal dt { - float: left; - width: 160px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; -} - -.dl-horizontal dd { - margin-left: 180px; -} - -hr { - margin: 20px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; -} - -abbr[title], -abbr[data-original-title] { - cursor: help; - border-bottom: 1px dotted #999999; -} - -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} - -blockquote { - padding: 0 0 0 15px; - margin: 0 0 20px; - border-left: 5px solid #eeeeee; -} - -blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 25px; -} - -blockquote small { - display: block; - line-height: 20px; - color: #999999; -} - -blockquote small:before { - content: '\2014 \00A0'; -} - -blockquote.pull-right { - float: right; - padding-right: 15px; - padding-left: 0; - border-right: 5px solid #eeeeee; - border-left: 0; -} - -blockquote.pull-right p, -blockquote.pull-right small { - text-align: right; -} - -blockquote.pull-right small:before { - content: ''; -} - -blockquote.pull-right small:after { - content: '\00A0 \2014'; -} - -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -address { - display: block; - margin-bottom: 20px; - font-style: normal; - line-height: 20px; -} - -code, -pre { - padding: 0 3px 2px; - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -code { - padding: 2px 4px; - color: #d14; - white-space: nowrap; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} - -pre { - display: block; - padding: 9.5px; - margin: 0 0 10px; - font-size: 13px; - line-height: 20px; - word-break: break-all; - word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -pre.prettyprint { - margin-bottom: 20px; -} - -pre code { - padding: 0; - color: inherit; - white-space: pre; - white-space: pre-wrap; - background-color: transparent; - border: 0; -} - -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} - -form { - margin: 0 0 20px; -} - -fieldset { - padding: 0; - margin: 0; - border: 0; -} - -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 20px; - font-size: 21px; - line-height: 40px; - color: #333333; - border: 0; - border-bottom: 1px solid #e5e5e5; -} - -legend small { - font-size: 15px; - color: #999999; -} - -label, -input, -button, -select, -textarea { - font-size: 14px; - font-weight: normal; - line-height: 20px; -} - -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -label { - display: block; - margin-bottom: 5px; -} - -select, -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - display: inline-block; - height: 20px; - padding: 4px 6px; - margin-bottom: 10px; - font-size: 14px; - line-height: 20px; - color: #555555; - vertical-align: middle; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -input, -textarea, -.uneditable-input { - width: 206px; -} - -textarea { - height: auto; -} - -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - background-color: #ffffff; - border: 1px solid #cccccc; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} - -textarea:focus, -input[type="text"]:focus, -input[type="password"]:focus, -input[type="datetime"]:focus, -input[type="datetime-local"]:focus, -input[type="date"]:focus, -input[type="month"]:focus, -input[type="time"]:focus, -input[type="week"]:focus, -input[type="number"]:focus, -input[type="email"]:focus, -input[type="url"]:focus, -input[type="search"]:focus, -input[type="tel"]:focus, -input[type="color"]:focus, -.uneditable-input:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -} - -input[type="radio"], -input[type="checkbox"] { - margin: 4px 0 0; - margin-top: 1px \9; - *margin-top: 0; - line-height: normal; -} - -input[type="file"], -input[type="image"], -input[type="submit"], -input[type="reset"], -input[type="button"], -input[type="radio"], -input[type="checkbox"] { - width: auto; -} - -select, -input[type="file"] { - height: 30px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 30px; -} - -select { - width: 220px; - background-color: #ffffff; - border: 1px solid #cccccc; -} - -select[multiple], -select[size] { - height: auto; -} - -select:focus, -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.uneditable-input, -.uneditable-textarea { - color: #999999; - cursor: not-allowed; - background-color: #fcfcfc; - border-color: #cccccc; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} - -.uneditable-input { - overflow: hidden; - white-space: nowrap; -} - -.uneditable-textarea { - width: auto; - height: auto; -} - -input:-moz-placeholder, -textarea:-moz-placeholder { - color: #999999; -} - -input:-ms-input-placeholder, -textarea:-ms-input-placeholder { - color: #999999; -} - -input::-webkit-input-placeholder, -textarea::-webkit-input-placeholder { - color: #999999; -} - -.radio, -.checkbox { - min-height: 20px; - padding-left: 20px; -} - -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -20px; -} - -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; -} - -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} - -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; -} - -.input-mini { - width: 60px; -} - -.input-small { - width: 90px; -} - -.input-medium { - width: 150px; -} - -.input-large { - width: 210px; -} - -.input-xlarge { - width: 270px; -} - -.input-xxlarge { - width: 530px; -} - -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; -} - -.input-append input[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend input[class*="span"], -.input-prepend .uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"], -.row-fluid .input-prepend [class*="span"], -.row-fluid .input-append [class*="span"] { - display: inline-block; -} - -input, -textarea, -.uneditable-input { - margin-left: 0; -} - -.controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; -} - -input.span12, -textarea.span12, -.uneditable-input.span12 { - width: 926px; -} - -input.span11, -textarea.span11, -.uneditable-input.span11 { - width: 846px; -} - -input.span10, -textarea.span10, -.uneditable-input.span10 { - width: 766px; -} - -input.span9, -textarea.span9, -.uneditable-input.span9 { - width: 686px; -} - -input.span8, -textarea.span8, -.uneditable-input.span8 { - width: 606px; -} - -input.span7, -textarea.span7, -.uneditable-input.span7 { - width: 526px; -} - -input.span6, -textarea.span6, -.uneditable-input.span6 { - width: 446px; -} - -input.span5, -textarea.span5, -.uneditable-input.span5 { - width: 366px; -} - -input.span4, -textarea.span4, -.uneditable-input.span4 { - width: 286px; -} - -input.span3, -textarea.span3, -.uneditable-input.span3 { - width: 206px; -} - -input.span2, -textarea.span2, -.uneditable-input.span2 { - width: 126px; -} - -input.span1, -textarea.span1, -.uneditable-input.span1 { - width: 46px; -} - -.controls-row { - *zoom: 1; -} - -.controls-row:before, -.controls-row:after { - display: table; - line-height: 0; - content: ""; -} - -.controls-row:after { - clear: both; -} - -.controls-row [class*="span"], -.row-fluid .controls-row [class*="span"] { - float: left; -} - -.controls-row .checkbox[class*="span"], -.controls-row .radio[class*="span"] { - padding-top: 5px; -} - -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - cursor: not-allowed; - background-color: #eeeeee; -} - -input[type="radio"][disabled], -input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly] { - background-color: transparent; -} - -.control-group.warning .control-label, -.control-group.warning .help-block, -.control-group.warning .help-inline { - color: #c09853; -} - -.control-group.warning .checkbox, -.control-group.warning .radio, -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - color: #c09853; -} - -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - border-color: #c09853; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.warning input:focus, -.control-group.warning select:focus, -.control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; -} - -.control-group.warning .input-prepend .add-on, -.control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} - -.control-group.error .control-label, -.control-group.error .help-block, -.control-group.error .help-inline { - color: #b94a48; -} - -.control-group.error .checkbox, -.control-group.error .radio, -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - color: #b94a48; -} - -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - border-color: #b94a48; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.error input:focus, -.control-group.error select:focus, -.control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -} - -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} - -.control-group.success .control-label, -.control-group.success .help-block, -.control-group.success .help-inline { - color: #468847; -} - -.control-group.success .checkbox, -.control-group.success .radio, -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - color: #468847; -} - -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - border-color: #468847; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.success input:focus, -.control-group.success select:focus, -.control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -} - -.control-group.success .input-prepend .add-on, -.control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} - -.control-group.info .control-label, -.control-group.info .help-block, -.control-group.info .help-inline { - color: #3a87ad; -} - -.control-group.info .checkbox, -.control-group.info .radio, -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - color: #3a87ad; -} - -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - border-color: #3a87ad; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.info input:focus, -.control-group.info select:focus, -.control-group.info textarea:focus { - border-color: #2d6987; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; -} - -.control-group.info .input-prepend .add-on, -.control-group.info .input-append .add-on { - color: #3a87ad; - background-color: #d9edf7; - border-color: #3a87ad; -} - -input:focus:invalid, -textarea:focus:invalid, -select:focus:invalid { - color: #b94a48; - border-color: #ee5f5b; -} - -input:focus:invalid:focus, -textarea:focus:invalid:focus, -select:focus:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} - -.form-actions { - padding: 19px 20px 20px; - margin-top: 20px; - margin-bottom: 20px; - background-color: #f5f5f5; - border-top: 1px solid #e5e5e5; - *zoom: 1; -} - -.form-actions:before, -.form-actions:after { - display: table; - line-height: 0; - content: ""; -} - -.form-actions:after { - clear: both; -} - -.help-block, -.help-inline { - color: #595959; -} - -.help-block { - display: block; - margin-bottom: 10px; -} - -.help-inline { - display: inline-block; - *display: inline; - padding-left: 5px; - vertical-align: middle; - *zoom: 1; -} - -.input-append, -.input-prepend { - margin-bottom: 5px; - font-size: 0; - white-space: nowrap; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input, -.input-append .dropdown-menu, -.input-prepend .dropdown-menu { - font-size: 14px; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input { - position: relative; - margin-bottom: 0; - *margin-left: 0; - vertical-align: top; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-append input:focus, -.input-prepend input:focus, -.input-append select:focus, -.input-prepend select:focus, -.input-append .uneditable-input:focus, -.input-prepend .uneditable-input:focus { - z-index: 2; -} - -.input-append .add-on, -.input-prepend .add-on { - display: inline-block; - width: auto; - height: 20px; - min-width: 16px; - padding: 4px 5px; - font-size: 14px; - font-weight: normal; - line-height: 20px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - background-color: #eeeeee; - border: 1px solid #ccc; -} - -.input-append .add-on, -.input-prepend .add-on, -.input-append .btn, -.input-prepend .btn, -.input-append .btn-group > .dropdown-toggle, -.input-prepend .btn-group > .dropdown-toggle { - vertical-align: top; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-append .active, -.input-prepend .active { - background-color: #a9dba9; - border-color: #46a546; -} - -.input-prepend .add-on, -.input-prepend .btn { - margin-right: -1px; -} - -.input-prepend .add-on:first-child, -.input-prepend .btn:first-child { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input, -.input-append select, -.input-append .uneditable-input { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input + .btn-group .btn:last-child, -.input-append select + .btn-group .btn:last-child, -.input-append .uneditable-input + .btn-group .btn:last-child { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-append .add-on, -.input-append .btn, -.input-append .btn-group { - margin-left: -1px; -} - -.input-append .add-on:last-child, -.input-append .btn:last-child, -.input-append .btn-group:last-child > .dropdown-toggle { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append input, -.input-prepend.input-append select, -.input-prepend.input-append .uneditable-input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-prepend.input-append input + .btn-group .btn, -.input-prepend.input-append select + .btn-group .btn, -.input-prepend.input-append .uneditable-input + .btn-group .btn { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .btn-group:first-child { - margin-left: 0; -} - -input.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; - /* IE7-8 doesn't have border-radius, so don't indent the padding */ - - margin-bottom: 0; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -/* Allow for input prepend/append in search forms */ - -.form-search .input-append .search-query, -.form-search .input-prepend .search-query { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.form-search .input-append .search-query { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search .input-append .btn { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .search-query { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .btn { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input, -.form-search .input-prepend, -.form-inline .input-prepend, -.form-horizontal .input-prepend, -.form-search .input-append, -.form-inline .input-append, -.form-horizontal .input-append { - display: inline-block; - *display: inline; - margin-bottom: 0; - vertical-align: middle; - *zoom: 1; -} - -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { - display: none; -} - -.form-search label, -.form-inline label, -.form-search .btn-group, -.form-inline .btn-group { - display: inline-block; -} - -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} - -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} - -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; -} - -.control-group { - margin-bottom: 10px; -} - -legend + .control-group { - margin-top: 20px; - -webkit-margin-top-collapse: separate; -} - -.form-horizontal .control-group { - margin-bottom: 20px; - *zoom: 1; -} - -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { - display: table; - line-height: 0; - content: ""; -} - -.form-horizontal .control-group:after { - clear: both; -} - -.form-horizontal .control-label { - float: left; - width: 160px; - padding-top: 5px; - text-align: right; -} - -.form-horizontal .controls { - *display: inline-block; - *padding-left: 20px; - margin-left: 180px; - *margin-left: 0; -} - -.form-horizontal .controls:first-child { - *padding-left: 180px; -} - -.form-horizontal .help-block { - margin-bottom: 0; -} - -.form-horizontal input + .help-block, -.form-horizontal select + .help-block, -.form-horizontal textarea + .help-block, -.form-horizontal .uneditable-input + .help-block, -.form-horizontal .input-prepend + .help-block, -.form-horizontal .input-append + .help-block { - margin-top: 10px; -} - -.form-horizontal .form-actions { - padding-left: 180px; -} - -table { - max-width: 100%; - background-color: transparent; - border-collapse: collapse; - border-spacing: 0; -} - -.table { - width: 100%; - margin-bottom: 20px; -} - -.table th, -.table td { - padding: 8px; - line-height: 20px; - text-align: left; - vertical-align: top; - border-top: 1px solid #dddddd; -} - -.table th { - font-weight: bold; -} - -.table thead th { - vertical-align: bottom; -} - -.table caption + thead tr:first-child th, -.table caption + thead tr:first-child td, -.table colgroup + thead tr:first-child th, -.table colgroup + thead tr:first-child td, -.table thead:first-child tr:first-child th, -.table thead:first-child tr:first-child td { - border-top: 0; -} - -.table tbody + tbody { - border-top: 2px solid #dddddd; -} - -.table .table { - background-color: #ffffff; -} - -.table-condensed th, -.table-condensed td { - padding: 4px 5px; -} - -.table-bordered { - border: 1px solid #dddddd; - border-collapse: separate; - *border-collapse: collapse; - border-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.table-bordered th, -.table-bordered td { - border-left: 1px solid #dddddd; -} - -.table-bordered caption + thead tr:first-child th, -.table-bordered caption + tbody tr:first-child th, -.table-bordered caption + tbody tr:first-child td, -.table-bordered colgroup + thead tr:first-child th, -.table-bordered colgroup + tbody tr:first-child th, -.table-bordered colgroup + tbody tr:first-child td, -.table-bordered thead:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} - -.table-bordered thead:first-child tr:first-child > th:first-child, -.table-bordered tbody:first-child tr:first-child > td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered thead:first-child tr:first-child > th:last-child, -.table-bordered tbody:first-child tr:first-child > td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:first-child, -.table-bordered tbody:last-child tr:last-child > td:first-child, -.table-bordered tfoot:last-child tr:last-child > td:first-child { - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:last-child, -.table-bordered tbody:last-child tr:last-child > td:last-child, -.table-bordered tfoot:last-child tr:last-child > td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - -moz-border-radius-bottomleft: 0; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; - -moz-border-radius-bottomright: 0; -} - -.table-bordered caption + thead tr:first-child th:first-child, -.table-bordered caption + tbody tr:first-child td:first-child, -.table-bordered colgroup + thead tr:first-child th:first-child, -.table-bordered colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered caption + thead tr:first-child th:last-child, -.table-bordered caption + tbody tr:first-child td:last-child, -.table-bordered colgroup + thead tr:first-child th:last-child, -.table-bordered colgroup + tbody tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-striped tbody > tr:nth-child(odd) > td, -.table-striped tbody > tr:nth-child(odd) > th { - background-color: #f9f9f9; -} - -.table-hover tbody tr:hover td, -.table-hover tbody tr:hover th { - background-color: #f5f5f5; -} - -table td[class*="span"], -table th[class*="span"], -.row-fluid table td[class*="span"], -.row-fluid table th[class*="span"] { - display: table-cell; - float: none; - margin-left: 0; -} - -.table td.span1, -.table th.span1 { - float: none; - width: 44px; - margin-left: 0; -} - -.table td.span2, -.table th.span2 { - float: none; - width: 124px; - margin-left: 0; -} - -.table td.span3, -.table th.span3 { - float: none; - width: 204px; - margin-left: 0; -} - -.table td.span4, -.table th.span4 { - float: none; - width: 284px; - margin-left: 0; -} - -.table td.span5, -.table th.span5 { - float: none; - width: 364px; - margin-left: 0; -} - -.table td.span6, -.table th.span6 { - float: none; - width: 444px; - margin-left: 0; -} - -.table td.span7, -.table th.span7 { - float: none; - width: 524px; - margin-left: 0; -} - -.table td.span8, -.table th.span8 { - float: none; - width: 604px; - margin-left: 0; -} - -.table td.span9, -.table th.span9 { - float: none; - width: 684px; - margin-left: 0; -} - -.table td.span10, -.table th.span10 { - float: none; - width: 764px; - margin-left: 0; -} - -.table td.span11, -.table th.span11 { - float: none; - width: 844px; - margin-left: 0; -} - -.table td.span12, -.table th.span12 { - float: none; - width: 924px; - margin-left: 0; -} - -.table tbody tr.success td { - background-color: #dff0d8; -} - -.table tbody tr.error td { - background-color: #f2dede; -} - -.table tbody tr.warning td { - background-color: #fcf8e3; -} - -.table tbody tr.info td { - background-color: #d9edf7; -} - -.table-hover tbody tr.success:hover td { - background-color: #d0e9c6; -} - -.table-hover tbody tr.error:hover td { - background-color: #ebcccc; -} - -.table-hover tbody tr.warning:hover td { - background-color: #faf2cc; -} - -.table-hover tbody tr.info:hover td { - background-color: #c4e3f3; -} - -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - margin-top: 1px; - *margin-right: .3em; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; -} - -/* White icons with optional class, or on hover/active states of certain elements */ - -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); -} - -.icon-glass { - background-position: 0 0; -} - -.icon-music { - background-position: -24px 0; -} - -.icon-search { - background-position: -48px 0; -} - -.icon-envelope { - background-position: -72px 0; -} - -.icon-heart { - background-position: -96px 0; -} - -.icon-star { - background-position: -120px 0; -} - -.icon-star-empty { - background-position: -144px 0; -} - -.icon-user { - background-position: -168px 0; -} - -.icon-film { - background-position: -192px 0; -} - -.icon-th-large { - background-position: -216px 0; -} - -.icon-th { - background-position: -240px 0; -} - -.icon-th-list { - background-position: -264px 0; -} - -.icon-ok { - background-position: -288px 0; -} - -.icon-remove { - background-position: -312px 0; -} - -.icon-zoom-in { - background-position: -336px 0; -} - -.icon-zoom-out { - background-position: -360px 0; -} - -.icon-off { - background-position: -384px 0; -} - -.icon-signal { - background-position: -408px 0; -} - -.icon-cog { - background-position: -432px 0; -} - -.icon-trash { - background-position: -456px 0; -} - -.icon-home { - background-position: 0 -24px; -} - -.icon-file { - background-position: -24px -24px; -} - -.icon-time { - background-position: -48px -24px; -} - -.icon-road { - background-position: -72px -24px; -} - -.icon-download-alt { - background-position: -96px -24px; -} - -.icon-download { - background-position: -120px -24px; -} - -.icon-upload { - background-position: -144px -24px; -} - -.icon-inbox { - background-position: -168px -24px; -} - -.icon-play-circle { - background-position: -192px -24px; -} - -.icon-repeat { - background-position: -216px -24px; -} - -.icon-refresh { - background-position: -240px -24px; -} - -.icon-list-alt { - background-position: -264px -24px; -} - -.icon-lock { - background-position: -287px -24px; -} - -.icon-flag { - background-position: -312px -24px; -} - -.icon-headphones { - background-position: -336px -24px; -} - -.icon-volume-off { - background-position: -360px -24px; -} - -.icon-volume-down { - background-position: -384px -24px; -} - -.icon-volume-up { - background-position: -408px -24px; -} - -.icon-qrcode { - background-position: -432px -24px; -} - -.icon-barcode { - background-position: -456px -24px; -} - -.icon-tag { - background-position: 0 -48px; -} - -.icon-tags { - background-position: -25px -48px; -} - -.icon-book { - background-position: -48px -48px; -} - -.icon-bookmark { - background-position: -72px -48px; -} - -.icon-print { - background-position: -96px -48px; -} - -.icon-camera { - background-position: -120px -48px; -} - -.icon-font { - background-position: -144px -48px; -} - -.icon-bold { - background-position: -167px -48px; -} - -.icon-italic { - background-position: -192px -48px; -} - -.icon-text-height { - background-position: -216px -48px; -} - -.icon-text-width { - background-position: -240px -48px; -} - -.icon-align-left { - background-position: -264px -48px; -} - -.icon-align-center { - background-position: -288px -48px; -} - -.icon-align-right { - background-position: -312px -48px; -} - -.icon-align-justify { - background-position: -336px -48px; -} - -.icon-list { - background-position: -360px -48px; -} - -.icon-indent-left { - background-position: -384px -48px; -} - -.icon-indent-right { - background-position: -408px -48px; -} - -.icon-facetime-video { - background-position: -432px -48px; -} - -.icon-picture { - background-position: -456px -48px; -} - -.icon-pencil { - background-position: 0 -72px; -} - -.icon-map-marker { - background-position: -24px -72px; -} - -.icon-adjust { - background-position: -48px -72px; -} - -.icon-tint { - background-position: -72px -72px; -} - -.icon-edit { - background-position: -96px -72px; -} - -.icon-share { - background-position: -120px -72px; -} - -.icon-check { - background-position: -144px -72px; -} - -.icon-move { - background-position: -168px -72px; -} - -.icon-step-backward { - background-position: -192px -72px; -} - -.icon-fast-backward { - background-position: -216px -72px; -} - -.icon-backward { - background-position: -240px -72px; -} - -.icon-play { - background-position: -264px -72px; -} - -.icon-pause { - background-position: -288px -72px; -} - -.icon-stop { - background-position: -312px -72px; -} - -.icon-forward { - background-position: -336px -72px; -} - -.icon-fast-forward { - background-position: -360px -72px; -} - -.icon-step-forward { - background-position: -384px -72px; -} - -.icon-eject { - background-position: -408px -72px; -} - -.icon-chevron-left { - background-position: -432px -72px; -} - -.icon-chevron-right { - background-position: -456px -72px; -} - -.icon-plus-sign { - background-position: 0 -96px; -} - -.icon-minus-sign { - background-position: -24px -96px; -} - -.icon-remove-sign { - background-position: -48px -96px; -} - -.icon-ok-sign { - background-position: -72px -96px; -} - -.icon-question-sign { - background-position: -96px -96px; -} - -.icon-info-sign { - background-position: -120px -96px; -} - -.icon-screenshot { - background-position: -144px -96px; -} - -.icon-remove-circle { - background-position: -168px -96px; -} - -.icon-ok-circle { - background-position: -192px -96px; -} - -.icon-ban-circle { - background-position: -216px -96px; -} - -.icon-arrow-left { - background-position: -240px -96px; -} - -.icon-arrow-right { - background-position: -264px -96px; -} - -.icon-arrow-up { - background-position: -289px -96px; -} - -.icon-arrow-down { - background-position: -312px -96px; -} - -.icon-share-alt { - background-position: -336px -96px; -} - -.icon-resize-full { - background-position: -360px -96px; -} - -.icon-resize-small { - background-position: -384px -96px; -} - -.icon-plus { - background-position: -408px -96px; -} - -.icon-minus { - background-position: -433px -96px; -} - -.icon-asterisk { - background-position: -456px -96px; -} - -.icon-exclamation-sign { - background-position: 0 -120px; -} - -.icon-gift { - background-position: -24px -120px; -} - -.icon-leaf { - background-position: -48px -120px; -} - -.icon-fire { - background-position: -72px -120px; -} - -.icon-eye-open { - background-position: -96px -120px; -} - -.icon-eye-close { - background-position: -120px -120px; -} - -.icon-warning-sign { - background-position: -144px -120px; -} - -.icon-plane { - background-position: -168px -120px; -} - -.icon-calendar { - background-position: -192px -120px; -} - -.icon-random { - width: 16px; - background-position: -216px -120px; -} - -.icon-comment { - background-position: -240px -120px; -} - -.icon-magnet { - background-position: -264px -120px; -} - -.icon-chevron-up { - background-position: -288px -120px; -} - -.icon-chevron-down { - background-position: -313px -119px; -} - -.icon-retweet { - background-position: -336px -120px; -} - -.icon-shopping-cart { - background-position: -360px -120px; -} - -.icon-folder-close { - background-position: -384px -120px; -} - -.icon-folder-open { - width: 16px; - background-position: -408px -120px; -} - -.icon-resize-vertical { - background-position: -432px -119px; -} - -.icon-resize-horizontal { - background-position: -456px -118px; -} - -.icon-hdd { - background-position: 0 -144px; -} - -.icon-bullhorn { - background-position: -24px -144px; -} - -.icon-bell { - background-position: -48px -144px; -} - -.icon-certificate { - background-position: -72px -144px; -} - -.icon-thumbs-up { - background-position: -96px -144px; -} - -.icon-thumbs-down { - background-position: -120px -144px; -} - -.icon-hand-right { - background-position: -144px -144px; -} - -.icon-hand-left { - background-position: -168px -144px; -} - -.icon-hand-up { - background-position: -192px -144px; -} - -.icon-hand-down { - background-position: -216px -144px; -} - -.icon-circle-arrow-right { - background-position: -240px -144px; -} - -.icon-circle-arrow-left { - background-position: -264px -144px; -} - -.icon-circle-arrow-up { - background-position: -288px -144px; -} - -.icon-circle-arrow-down { - background-position: -312px -144px; -} - -.icon-globe { - background-position: -336px -144px; -} - -.icon-wrench { - background-position: -360px -144px; -} - -.icon-tasks { - background-position: -384px -144px; -} - -.icon-filter { - background-position: -408px -144px; -} - -.icon-briefcase { - background-position: -432px -144px; -} - -.icon-fullscreen { - background-position: -456px -144px; -} - -.dropup, -.dropdown { - position: relative; -} - -.dropdown-toggle { - *margin-bottom: -3px; -} - -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} - -.caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-top: 4px solid #000000; - border-right: 4px solid transparent; - border-left: 4px solid transparent; - content: ""; -} - -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} - -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; - list-style: none; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.dropdown-menu .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.dropdown-menu li > a { - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: 20px; - color: #333333; - white-space: nowrap; -} - -.dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, -.dropdown-submenu:hover > a { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -} - -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - outline: 0; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -} - -.dropdown-menu .disabled > a, -.dropdown-menu .disabled > a:hover { - color: #999999; -} - -.dropdown-menu .disabled > a:hover { - text-decoration: none; - cursor: default; - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.open { - *z-index: 1000; -} - -.open > .dropdown-menu { - display: block; -} - -.pull-right > .dropdown-menu { - right: 0; - left: auto; -} - -.dropup .caret, -.navbar-fixed-bottom .dropdown .caret { - border-top: 0; - border-bottom: 4px solid #000000; - content: ""; -} - -.dropup .dropdown-menu, -.navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; -} - -.dropdown-submenu { - position: relative; -} - -.dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; -} - -.dropdown-submenu:hover > .dropdown-menu { - display: block; -} - -.dropup .dropdown-submenu > .dropdown-menu { - top: auto; - bottom: 0; - margin-top: 0; - margin-bottom: -2px; - -webkit-border-radius: 5px 5px 5px 0; - -moz-border-radius: 5px 5px 5px 0; - border-radius: 5px 5px 5px 0; -} - -.dropdown-submenu > a:after { - display: block; - float: right; - width: 0; - height: 0; - margin-top: 5px; - margin-right: -10px; - border-color: transparent; - border-left-color: #cccccc; - border-style: solid; - border-width: 5px 0 5px 5px; - content: " "; -} - -.dropdown-submenu:hover > a:after { - border-left-color: #ffffff; -} - -.dropdown-submenu.pull-left { - float: none; -} - -.dropdown-submenu.pull-left > .dropdown-menu { - left: -100%; - margin-left: 10px; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; -} - -.dropdown .dropdown-menu .nav-header { - padding-right: 20px; - padding-left: 20px; -} - -.typeahead { - z-index: 1051; - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} - -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} - -.well-large { - padding: 24px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.well-small { - padding: 9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.fade { - opacity: 0; - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; -} - -.fade.in { - opacity: 1; -} - -.collapse { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; -} - -.collapse.in { - height: auto; -} - -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 20px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} - -.close:hover { - color: #000000; - text-decoration: none; - cursor: pointer; - opacity: 0.4; - filter: alpha(opacity=40); -} - -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} - -.btn { - display: inline-block; - *display: inline; - padding: 4px 12px; - margin-bottom: 0; - *margin-left: .3em; - font-size: 14px; - line-height: 20px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - cursor: pointer; - background-color: #f5f5f5; - *background-color: #e6e6e6; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); - background-repeat: repeat-x; - border: 1px solid #bbbbbb; - *border: 0; - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #a2a2a2; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - color: #333333; - background-color: #e6e6e6; - *background-color: #d9d9d9; -} - -.btn:active, -.btn.active { - background-color: #cccccc \9; -} - -.btn:first-child { - *margin-left: 0; -} - -.btn:hover { - color: #333333; - text-decoration: none; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} - -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.btn.active, -.btn:active { - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn.disabled, -.btn[disabled] { - cursor: default; - background-image: none; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-large { - padding: 11px 19px; - font-size: 17.5px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { - margin-top: 4px; -} - -.btn-small { - padding: 2px 10px; - font-size: 11.9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { - margin-top: 0; -} - -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { - margin-top: -1px; -} - -.btn-mini { - padding: 0 6px; - font-size: 10.5px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-block { - display: block; - width: 100%; - padding-right: 0; - padding-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.btn-block + .btn-block { - margin-top: 5px; -} - -input[type="submit"].btn-block, -input[type="reset"].btn-block, -input[type="button"].btn-block { - width: 100%; -} - -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255, 255, 255, 0.75); -} - -.btn { - border-color: #c5c5c5; - border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); -} - -.btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #006dcc; - *background-color: #0044cc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(to bottom, #0088cc, #0044cc); - background-repeat: repeat-x; - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - color: #ffffff; - background-color: #0044cc; - *background-color: #003bb3; -} - -.btn-primary:active, -.btn-primary.active { - background-color: #003399 \9; -} - -.btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - *background-color: #f89406; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - color: #ffffff; - background-color: #f89406; - *background-color: #df8505; -} - -.btn-warning:active, -.btn-warning.active { - background-color: #c67605 \9; -} - -.btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - *background-color: #bd362f; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); - background-repeat: repeat-x; - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - color: #ffffff; - background-color: #bd362f; - *background-color: #a9302a; -} - -.btn-danger:active, -.btn-danger.active { - background-color: #942a25 \9; -} - -.btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - *background-color: #51a351; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); - background-repeat: repeat-x; - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - color: #ffffff; - background-color: #51a351; - *background-color: #499249; -} - -.btn-success:active, -.btn-success.active { - background-color: #408140 \9; -} - -.btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - *background-color: #2f96b4; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); - background-repeat: repeat-x; - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - color: #ffffff; - background-color: #2f96b4; - *background-color: #2a85a0; -} - -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} - -.btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #363636; - *background-color: #222222; - background-image: -moz-linear-gradient(top, #444444, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); - background-image: -webkit-linear-gradient(top, #444444, #222222); - background-image: -o-linear-gradient(top, #444444, #222222); - background-image: linear-gradient(to bottom, #444444, #222222); - background-repeat: repeat-x; - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - color: #ffffff; - background-color: #222222; - *background-color: #151515; -} - -.btn-inverse:active, -.btn-inverse.active { - background-color: #080808 \9; -} - -button.btn, -input[type="submit"].btn { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn::-moz-focus-inner, -input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} - -button.btn.btn-large, -input[type="submit"].btn.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; -} - -button.btn.btn-small, -input[type="submit"].btn.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn.btn-mini, -input[type="submit"].btn.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; -} - -.btn-link, -.btn-link:active, -.btn-link[disabled] { - background-color: transparent; - background-image: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-link { - color: #0088cc; - cursor: pointer; - border-color: transparent; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-link:hover { - color: #005580; - text-decoration: underline; - background-color: transparent; -} - -.btn-link[disabled]:hover { - color: #333333; - text-decoration: none; -} - -.btn-group { - position: relative; - display: inline-block; - *display: inline; - *margin-left: .3em; - font-size: 0; - white-space: nowrap; - vertical-align: middle; - *zoom: 1; -} - -.btn-group:first-child { - *margin-left: 0; -} - -.btn-group + .btn-group { - margin-left: 5px; -} - -.btn-toolbar { - margin-top: 10px; - margin-bottom: 10px; - font-size: 0; -} - -.btn-toolbar > .btn + .btn, -.btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group { - margin-left: 5px; -} - -.btn-group > .btn { - position: relative; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group > .btn + .btn { - margin-left: -1px; -} - -.btn-group > .btn, -.btn-group > .dropdown-menu, -.btn-group > .popover { - font-size: 14px; -} - -.btn-group > .btn-mini { - font-size: 10.5px; -} - -.btn-group > .btn-small { - font-size: 11.9px; -} - -.btn-group > .btn-large { - font-size: 17.5px; -} - -.btn-group > .btn:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.btn-group > .btn:last-child, -.btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.btn-group > .btn.large:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.btn-group > .btn.large:last-child, -.btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.btn-group > .btn:hover, -.btn-group > .btn:focus, -.btn-group > .btn:active, -.btn-group > .btn.active { - z-index: 2; -} - -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - -.btn-group > .btn + .dropdown-toggle { - *padding-top: 5px; - padding-right: 8px; - *padding-bottom: 5px; - padding-left: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group > .btn-mini + .dropdown-toggle { - *padding-top: 2px; - padding-right: 5px; - *padding-bottom: 2px; - padding-left: 5px; -} - -.btn-group > .btn-small + .dropdown-toggle { - *padding-top: 5px; - *padding-bottom: 4px; -} - -.btn-group > .btn-large + .dropdown-toggle { - *padding-top: 7px; - padding-right: 12px; - *padding-bottom: 7px; - padding-left: 12px; -} - -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group.open .btn.dropdown-toggle { - background-color: #e6e6e6; -} - -.btn-group.open .btn-primary.dropdown-toggle { - background-color: #0044cc; -} - -.btn-group.open .btn-warning.dropdown-toggle { - background-color: #f89406; -} - -.btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; -} - -.btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; -} - -.btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; -} - -.btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; -} - -.btn .caret { - margin-top: 8px; - margin-left: 0; -} - -.btn-mini .caret, -.btn-small .caret, -.btn-large .caret { - margin-top: 6px; -} - -.btn-large .caret { - border-top-width: 5px; - border-right-width: 5px; - border-left-width: 5px; -} - -.dropup .btn-large .caret { - border-bottom-width: 5px; -} - -.btn-primary .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret, -.btn-success .caret, -.btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.btn-group-vertical { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} - -.btn-group-vertical > .btn { - display: block; - float: none; - max-width: 100%; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group-vertical > .btn + .btn { - margin-top: -1px; - margin-left: 0; -} - -.btn-group-vertical > .btn:first-child { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.btn-group-vertical > .btn:last-child { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.btn-group-vertical > .btn-large:first-child { - -webkit-border-radius: 6px 6px 0 0; - -moz-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; -} - -.btn-group-vertical > .btn-large:last-child { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 20px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.alert, -.alert h4 { - color: #c09853; -} - -.alert h4 { - margin: 0; -} - -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 20px; -} - -.alert-success { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.alert-success h4 { - color: #468847; -} - -.alert-danger, -.alert-error { - color: #b94a48; - background-color: #f2dede; - border-color: #eed3d7; -} - -.alert-danger h4, -.alert-error h4 { - color: #b94a48; -} - -.alert-info { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} - -.alert-info h4 { - color: #3a87ad; -} - -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} - -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} - -.alert-block p + p { - margin-top: 5px; -} - -.nav { - margin-bottom: 20px; - margin-left: 0; - list-style: none; -} - -.nav > li > a { - display: block; -} - -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} - -.nav > li > a > img { - max-width: none; -} - -.nav > .pull-right { - float: right; -} - -.nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 20px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} - -.nav li + .nav-header { - margin-top: 9px; -} - -.nav-list { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 0; -} - -.nav-list > li > a, -.nav-list .nav-header { - margin-right: -15px; - margin-left: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} - -.nav-list > li > a { - padding: 3px 15px; -} - -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} - -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - margin-right: 2px; -} - -.nav-list .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.nav-tabs, -.nav-pills { - *zoom: 1; -} - -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - line-height: 0; - content: ""; -} - -.nav-tabs:after, -.nav-pills:after { - clear: both; -} - -.nav-tabs > li, -.nav-pills > li { - float: left; -} - -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} - -.nav-tabs { - border-bottom: 1px solid #ddd; -} - -.nav-tabs > li { - margin-bottom: -1px; -} - -.nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: 20px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} - -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: #555555; - cursor: default; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; -} - -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} - -.nav-stacked > li { - float: none; -} - -.nav-stacked > li > a { - margin-right: 0; -} - -.nav-tabs.nav-stacked { - border-bottom: 0; -} - -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-topleft: 4px; -} - -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.nav-tabs.nav-stacked > li > a:hover { - z-index: 2; - border-color: #ddd; -} - -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} - -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} - -.nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.nav-pills .dropdown-menu { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.nav .dropdown-toggle .caret { - margin-top: 6px; - border-top-color: #0088cc; - border-bottom-color: #0088cc; -} - -.nav .dropdown-toggle:hover .caret { - border-top-color: #005580; - border-bottom-color: #005580; -} - -/* move down carets for tabs */ - -.nav-tabs .dropdown-toggle .caret { - margin-top: 8px; -} - -.nav .active .dropdown-toggle .caret { - border-top-color: #fff; - border-bottom-color: #fff; -} - -.nav-tabs .active .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.nav > .dropdown.active > a:hover { - cursor: pointer; -} - -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} - -.nav li.dropdown.open .caret, -.nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} - -.tabs-stacked .open > a:hover { - border-color: #999999; -} - -.tabbable { - *zoom: 1; -} - -.tabbable:before, -.tabbable:after { - display: table; - line-height: 0; - content: ""; -} - -.tabbable:after { - clear: both; -} - -.tab-content { - overflow: auto; -} - -.tabs-below > .nav-tabs, -.tabs-right > .nav-tabs, -.tabs-left > .nav-tabs { - border-bottom: 0; -} - -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} - -.tab-content > .active, -.pill-content > .active { - display: block; -} - -.tabs-below > .nav-tabs { - border-top: 1px solid #ddd; -} - -.tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} - -.tabs-below > .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.tabs-below > .nav-tabs > li > a:hover { - border-top-color: #ddd; - border-bottom-color: transparent; -} - -.tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} - -.tabs-left > .nav-tabs > li, -.tabs-right > .nav-tabs > li { - float: none; -} - -.tabs-left > .nav-tabs > li > a, -.tabs-right > .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} - -.tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} - -.tabs-left > .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.tabs-left > .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} - -.tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} - -.tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} - -.tabs-right > .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.tabs-right > .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} - -.tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} - -.nav > .disabled > a { - color: #999999; -} - -.nav > .disabled > a:hover { - text-decoration: none; - cursor: default; - background-color: transparent; -} - -.navbar { - *position: relative; - *z-index: 2; - margin-bottom: 20px; - overflow: visible; -} - -.navbar-inner { - min-height: 40px; - padding-right: 20px; - padding-left: 20px; - background-color: #fafafa; - background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); - background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); - background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); - background-repeat: repeat-x; - border: 1px solid #d4d4d4; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); - *zoom: 1; - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -} - -.navbar-inner:before, -.navbar-inner:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-inner:after { - clear: both; -} - -.navbar .container { - width: auto; -} - -.nav-collapse.collapse { - height: auto; - overflow: visible; -} - -.navbar .brand { - display: block; - float: left; - padding: 10px 20px 10px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - color: #777777; - text-shadow: 0 1px 0 #ffffff; -} - -.navbar .brand:hover { - text-decoration: none; -} - -.navbar-text { - margin-bottom: 0; - line-height: 40px; - color: #777777; -} - -.navbar-link { - color: #777777; -} - -.navbar-link:hover { - color: #333333; -} - -.navbar .divider-vertical { - height: 40px; - margin: 0 9px; - border-right: 1px solid #ffffff; - border-left: 1px solid #f2f2f2; -} - -.navbar .btn, -.navbar .btn-group { - margin-top: 5px; -} - -.navbar .btn-group .btn, -.navbar .input-prepend .btn, -.navbar .input-append .btn { - margin-top: 0; -} - -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} - -.navbar-form:before, -.navbar-form:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-form:after { - clear: both; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .radio, -.navbar-form .checkbox { - margin-top: 5px; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .btn { - display: inline-block; - margin-bottom: 0; -} - -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { - margin-top: 3px; -} - -.navbar-form .input-append, -.navbar-form .input-prepend { - margin-top: 5px; - white-space: nowrap; -} - -.navbar-form .input-append input, -.navbar-form .input-prepend input { - margin-top: 0; -} - -.navbar-search { - position: relative; - float: left; - margin-top: 5px; - margin-bottom: 0; -} - -.navbar-search .search-query { - padding: 4px 14px; - margin-bottom: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.navbar-static-top { - position: static; - margin-bottom: 0; -} - -.navbar-static-top .navbar-inner { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - border-width: 0 0 1px; -} - -.navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-right: 0; - padding-left: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.navbar-fixed-top { - top: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -} - -.navbar-fixed-bottom { - bottom: 0; -} - -.navbar-fixed-bottom .navbar-inner { - -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -} - -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} - -.navbar .nav.pull-right { - float: right; - margin-right: 0; -} - -.navbar .nav > li { - float: left; -} - -.navbar .nav > li > a { - float: none; - padding: 10px 15px 10px; - color: #777777; - text-decoration: none; - text-shadow: 0 1px 0 #ffffff; -} - -.navbar .nav .dropdown-toggle .caret { - margin-top: 8px; -} - -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - color: #333333; - text-decoration: none; - background-color: transparent; -} - -.navbar .nav > .active > a, -.navbar .nav > .active > a:hover, -.navbar .nav > .active > a:focus { - color: #555555; - text-decoration: none; - background-color: #e5e5e5; - -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -} - -.navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-right: 5px; - margin-left: 5px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ededed; - *background-color: #e5e5e5; - background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); - background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); - background-repeat: repeat-x; - border-color: #e5e5e5 #e5e5e5 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} - -.navbar .btn-navbar:hover, -.navbar .btn-navbar:active, -.navbar .btn-navbar.active, -.navbar .btn-navbar.disabled, -.navbar .btn-navbar[disabled] { - color: #ffffff; - background-color: #e5e5e5; - *background-color: #d9d9d9; -} - -.navbar .btn-navbar:active, -.navbar .btn-navbar.active { - background-color: #cccccc \9; -} - -.navbar .btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} - -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} - -.navbar .nav > li > .dropdown-menu:before { - position: absolute; - top: -7px; - left: 9px; - display: inline-block; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ''; -} - -.navbar .nav > li > .dropdown-menu:after { - position: absolute; - top: -6px; - left: 10px; - display: inline-block; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - content: ''; -} - -.navbar-fixed-bottom .nav > li > .dropdown-menu:before { - top: auto; - bottom: -7px; - border-top: 7px solid #ccc; - border-bottom: 0; - border-top-color: rgba(0, 0, 0, 0.2); -} - -.navbar-fixed-bottom .nav > li > .dropdown-menu:after { - top: auto; - bottom: -6px; - border-top: 6px solid #ffffff; - border-bottom: 0; -} - -.navbar .nav li.dropdown > a:hover .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { - color: #555555; - background-color: #e5e5e5; -} - -.navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - -.navbar .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar .pull-right > li > .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu:before, -.navbar .nav > li > .dropdown-menu.pull-right:before { - right: 12px; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu:after, -.navbar .nav > li > .dropdown-menu.pull-right:after { - right: 13px; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { - right: 100%; - left: auto; - margin-right: -1px; - margin-left: 0; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; -} - -.navbar-inverse .navbar-inner { - background-color: #1b1b1b; - background-image: -moz-linear-gradient(top, #222222, #111111); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); - background-image: -webkit-linear-gradient(top, #222222, #111111); - background-image: -o-linear-gradient(top, #222222, #111111); - background-image: linear-gradient(to bottom, #222222, #111111); - background-repeat: repeat-x; - border-color: #252525; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); -} - -.navbar-inverse .brand, -.navbar-inverse .nav > li > a { - color: #999999; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} - -.navbar-inverse .brand:hover, -.navbar-inverse .nav > li > a:hover { - color: #ffffff; -} - -.navbar-inverse .brand { - color: #999999; -} - -.navbar-inverse .navbar-text { - color: #999999; -} - -.navbar-inverse .nav > li > a:focus, -.navbar-inverse .nav > li > a:hover { - color: #ffffff; - background-color: transparent; -} - -.navbar-inverse .nav .active > a, -.navbar-inverse .nav .active > a:hover, -.navbar-inverse .nav .active > a:focus { - color: #ffffff; - background-color: #111111; -} - -.navbar-inverse .navbar-link { - color: #999999; -} - -.navbar-inverse .navbar-link:hover { - color: #ffffff; -} - -.navbar-inverse .divider-vertical { - border-right-color: #222222; - border-left-color: #111111; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { - color: #ffffff; - background-color: #111111; -} - -.navbar-inverse .nav li.dropdown > a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .navbar-search .search-query { - color: #ffffff; - background-color: #515151; - border-color: #111111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; -} - -.navbar-inverse .navbar-search .search-query:-moz-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:focus, -.navbar-inverse .navbar-search .search-query.focused { - padding: 5px 15px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - outline: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -} - -.navbar-inverse .btn-navbar { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e0e0e; - *background-color: #040404; - background-image: -moz-linear-gradient(top, #151515, #040404); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); - background-image: -webkit-linear-gradient(top, #151515, #040404); - background-image: -o-linear-gradient(top, #151515, #040404); - background-image: linear-gradient(to bottom, #151515, #040404); - background-repeat: repeat-x; - border-color: #040404 #040404 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.navbar-inverse .btn-navbar:hover, -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active, -.navbar-inverse .btn-navbar.disabled, -.navbar-inverse .btn-navbar[disabled] { - color: #ffffff; - background-color: #040404; - *background-color: #000000; -} - -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active { - background-color: #000000 \9; -} - -.breadcrumb { - padding: 8px 15px; - margin: 0 0 20px; - list-style: none; - background-color: #f5f5f5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.breadcrumb > li { - display: inline-block; - *display: inline; - text-shadow: 0 1px 0 #ffffff; - *zoom: 1; -} - -.breadcrumb > li > .divider { - padding: 0 5px; - color: #ccc; -} - -.breadcrumb > .active { - color: #999999; -} - -.pagination { - margin: 20px 0; -} - -.pagination ul { - display: inline-block; - *display: inline; - margin-bottom: 0; - margin-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - *zoom: 1; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.pagination ul > li { - display: inline; -} - -.pagination ul > li > a, -.pagination ul > li > span { - float: left; - padding: 4px 12px; - line-height: 20px; - text-decoration: none; - background-color: #ffffff; - border: 1px solid #dddddd; - border-left-width: 0; -} - -.pagination ul > li > a:hover, -.pagination ul > .active > a, -.pagination ul > .active > span { - background-color: #f5f5f5; -} - -.pagination ul > .active > a, -.pagination ul > .active > span { - color: #999999; - cursor: default; -} - -.pagination ul > .disabled > span, -.pagination ul > .disabled > a, -.pagination ul > .disabled > a:hover { - color: #999999; - cursor: default; - background-color: transparent; -} - -.pagination ul > li:first-child > a, -.pagination ul > li:first-child > span { - border-left-width: 1px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.pagination ul > li:last-child > a, -.pagination ul > li:last-child > span { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.pagination-centered { - text-align: center; -} - -.pagination-right { - text-align: right; -} - -.pagination-large ul > li > a, -.pagination-large ul > li > span { - padding: 11px 19px; - font-size: 17.5px; -} - -.pagination-large ul > li:first-child > a, -.pagination-large ul > li:first-child > span { - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.pagination-large ul > li:last-child > a, -.pagination-large ul > li:last-child > span { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.pagination-mini ul > li:first-child > a, -.pagination-small ul > li:first-child > a, -.pagination-mini ul > li:first-child > span, -.pagination-small ul > li:first-child > span { - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -moz-border-radius-bottomleft: 3px; - -moz-border-radius-topleft: 3px; -} - -.pagination-mini ul > li:last-child > a, -.pagination-small ul > li:last-child > a, -.pagination-mini ul > li:last-child > span, -.pagination-small ul > li:last-child > span { - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - -moz-border-radius-topright: 3px; - -moz-border-radius-bottomright: 3px; -} - -.pagination-small ul > li > a, -.pagination-small ul > li > span { - padding: 2px 10px; - font-size: 11.9px; -} - -.pagination-mini ul > li > a, -.pagination-mini ul > li > span { - padding: 0 6px; - font-size: 10.5px; -} - -.pager { - margin: 20px 0; - text-align: center; - list-style: none; - *zoom: 1; -} - -.pager:before, -.pager:after { - display: table; - line-height: 0; - content: ""; -} - -.pager:after { - clear: both; -} - -.pager li { - display: inline; -} - -.pager li > a, -.pager li > span { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.pager li > a:hover { - text-decoration: none; - background-color: #f5f5f5; -} - -.pager .next > a, -.pager .next > span { - float: right; -} - -.pager .previous > a, -.pager .previous > span { - float: left; -} - -.pager .disabled > a, -.pager .disabled > a:hover, -.pager .disabled > span { - color: #999999; - cursor: default; - background-color: #fff; -} - -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} - -.modal-backdrop.fade { - opacity: 0; -} - -.modal-backdrop, -.modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.modal { - position: fixed; - top: 10%; - left: 50%; - z-index: 1050; - width: 560px; - margin-left: -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - outline: none; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} - -.modal.fade { - top: -25%; - -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; - -moz-transition: opacity 0.3s linear, top 0.3s ease-out; - -o-transition: opacity 0.3s linear, top 0.3s ease-out; - transition: opacity 0.3s linear, top 0.3s ease-out; -} - -.modal.fade.in { - top: 10%; -} - -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} - -.modal-header .close { - margin-top: 2px; -} - -.modal-header h3 { - margin: 0; - line-height: 30px; -} - -.modal-body { - position: relative; - max-height: 400px; - padding: 15px; - overflow-y: auto; -} - -.modal-form { - margin-bottom: 0; -} - -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} - -.modal-footer:before, -.modal-footer:after { - display: table; - line-height: 0; - content: ""; -} - -.modal-footer:after { - clear: both; -} - -.modal-footer .btn + .btn { - margin-bottom: 0; - margin-left: 5px; -} - -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} - -.modal-footer .btn-block + .btn-block { - margin-left: 0; -} - -.tooltip { - position: absolute; - z-index: 1030; - display: block; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); - visibility: visible; -} - -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.tooltip.top { - margin-top: -3px; -} - -.tooltip.right { - margin-left: 3px; -} - -.tooltip.bottom { - margin-top: 3px; -} - -.tooltip.left { - margin-left: -3px; -} - -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top-color: #000000; - border-width: 5px 5px 0; -} - -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-right-color: #000000; - border-width: 5px 5px 5px 0; -} - -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-left-color: #000000; - border-width: 5px 0 5px 5px; -} - -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-bottom-color: #000000; - border-width: 0 5px 5px; -} - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - width: 236px; - padding: 1px; - text-align: left; - white-space: normal; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.popover.top { - margin-top: -10px; -} - -.popover.right { - margin-left: 10px; -} - -.popover.bottom { - margin-top: 10px; -} - -.popover.left { - margin-left: -10px; -} - -.popover-title { - padding: 8px 14px; - margin: 0; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: #f7f7f7; - border-bottom: 1px solid #ebebeb; - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} - -.popover-content { - padding: 9px 14px; -} - -.popover .arrow, -.popover .arrow:after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.popover .arrow { - border-width: 11px; -} - -.popover .arrow:after { - border-width: 10px; - content: ""; -} - -.popover.top .arrow { - bottom: -11px; - left: 50%; - margin-left: -11px; - border-top-color: #999; - border-top-color: rgba(0, 0, 0, 0.25); - border-bottom-width: 0; -} - -.popover.top .arrow:after { - bottom: 1px; - margin-left: -10px; - border-top-color: #ffffff; - border-bottom-width: 0; -} - -.popover.right .arrow { - top: 50%; - left: -11px; - margin-top: -11px; - border-right-color: #999; - border-right-color: rgba(0, 0, 0, 0.25); - border-left-width: 0; -} - -.popover.right .arrow:after { - bottom: -10px; - left: 1px; - border-right-color: #ffffff; - border-left-width: 0; -} - -.popover.bottom .arrow { - top: -11px; - left: 50%; - margin-left: -11px; - border-bottom-color: #999; - border-bottom-color: rgba(0, 0, 0, 0.25); - border-top-width: 0; -} - -.popover.bottom .arrow:after { - top: 1px; - margin-left: -10px; - border-bottom-color: #ffffff; - border-top-width: 0; -} - -.popover.left .arrow { - top: 50%; - right: -11px; - margin-top: -11px; - border-left-color: #999; - border-left-color: rgba(0, 0, 0, 0.25); - border-right-width: 0; -} - -.popover.left .arrow:after { - right: 1px; - bottom: -10px; - border-left-color: #ffffff; - border-right-width: 0; -} - -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} - -.thumbnails:before, -.thumbnails:after { - display: table; - line-height: 0; - content: ""; -} - -.thumbnails:after { - clear: both; -} - -.row-fluid .thumbnails { - margin-left: 0; -} - -.thumbnails > li { - float: left; - margin-bottom: 20px; - margin-left: 20px; -} - -.thumbnail { - display: block; - padding: 4px; - line-height: 20px; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} - -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} - -.thumbnail > img { - display: block; - max-width: 100%; - margin-right: auto; - margin-left: auto; -} - -.thumbnail .caption { - padding: 9px; - color: #555555; -} - -.media, -.media-body { - overflow: hidden; - *overflow: visible; - zoom: 1; -} - -.media, -.media .media { - margin-top: 15px; -} - -.media:first-child { - margin-top: 0; -} - -.media-object { - display: block; -} - -.media-heading { - margin: 0 0 5px; -} - -.media .pull-left { - margin-right: 10px; -} - -.media .pull-right { - margin-left: 10px; -} - -.media-list { - margin-left: 0; - list-style: none; -} - -.label, -.badge { - display: inline-block; - padding: 2px 4px; - font-size: 11.844px; - font-weight: bold; - line-height: 14px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - white-space: nowrap; - vertical-align: baseline; - background-color: #999999; -} - -.label { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.badge { - padding-right: 9px; - padding-left: 9px; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; -} - -.label:empty, -.badge:empty { - display: none; -} - -a.label:hover, -a.badge:hover { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} - -.label-important, -.badge-important { - background-color: #b94a48; -} - -.label-important[href], -.badge-important[href] { - background-color: #953b39; -} - -.label-warning, -.badge-warning { - background-color: #f89406; -} - -.label-warning[href], -.badge-warning[href] { - background-color: #c67605; -} - -.label-success, -.badge-success { - background-color: #468847; -} - -.label-success[href], -.badge-success[href] { - background-color: #356635; -} - -.label-info, -.badge-info { - background-color: #3a87ad; -} - -.label-info[href], -.badge-info[href] { - background-color: #2d6987; -} - -.label-inverse, -.badge-inverse { - background-color: #333333; -} - -.label-inverse[href], -.badge-inverse[href] { - background-color: #1a1a1a; -} - -.btn .label, -.btn .badge { - position: relative; - top: -1px; -} - -.btn-mini .label, -.btn-mini .badge { - top: 0; -} - -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-ms-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} - -@keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -.progress { - height: 20px; - margin-bottom: 20px; - overflow: hidden; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} - -.progress .bar { - float: left; - width: 0; - height: 100%; - font-size: 12px; - color: #ffffff; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(to bottom, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} - -.progress .bar + .bar { - -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); -} - -.progress-striped .bar { - background-color: #149bdf; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} - -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} - -.progress-danger .bar, -.progress .bar-danger { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); -} - -.progress-danger.progress-striped .bar, -.progress-striped .bar-danger { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-success .bar, -.progress .bar-success { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(to bottom, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); -} - -.progress-success.progress-striped .bar, -.progress-striped .bar-success { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-info .bar, -.progress .bar-info { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(to bottom, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); -} - -.progress-info.progress-striped .bar, -.progress-striped .bar-info { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-warning .bar, -.progress .bar-warning { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); -} - -.progress-warning.progress-striped .bar, -.progress-striped .bar-warning { - background-color: #fbb450; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.accordion { - margin-bottom: 20px; -} - -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.accordion-heading { - border-bottom: 0; -} - -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} - -.accordion-toggle { - cursor: pointer; -} - -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} - -.carousel { - position: relative; - margin-bottom: 20px; - line-height: 1; -} - -.carousel-inner { - position: relative; - width: 100%; - overflow: hidden; -} - -.carousel-inner > .item { - position: relative; - display: none; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} - -.carousel-inner > .item > img { - display: block; - line-height: 1; -} - -.carousel-inner > .active, -.carousel-inner > .next, -.carousel-inner > .prev { - display: block; -} - -.carousel-inner > .active { - left: 0; -} - -.carousel-inner > .next, -.carousel-inner > .prev { - position: absolute; - top: 0; - width: 100%; -} - -.carousel-inner > .next { - left: 100%; -} - -.carousel-inner > .prev { - left: -100%; -} - -.carousel-inner > .next.left, -.carousel-inner > .prev.right { - left: 0; -} - -.carousel-inner > .active.left { - left: -100%; -} - -.carousel-inner > .active.right { - left: 100%; -} - -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} - -.carousel-control.right { - right: 15px; - left: auto; -} - -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} - -.carousel-caption { - position: absolute; - right: 0; - bottom: 0; - left: 0; - padding: 15px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} - -.carousel-caption h4, -.carousel-caption p { - line-height: 20px; - color: #ffffff; -} - -.carousel-caption h4 { - margin: 0 0 5px; -} - -.carousel-caption p { - margin-bottom: 0; -} - -.hero-unit { - padding: 60px; - margin-bottom: 30px; - font-size: 18px; - font-weight: 200; - line-height: 30px; - color: inherit; - background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; - color: inherit; -} - -.hero-unit li { - line-height: 30px; -} - -.pull-right { - float: right; -} - -.pull-left { - float: left; -} - -.hide { - display: none; -} - -.show { - display: block; -} - -.invisible { - visibility: hidden; -} - -.affix { - position: fixed; -} diff --git a/samples/xml/insecure/src/main/webapp/resources/img/favicon.ico b/samples/xml/insecure/src/main/webapp/resources/img/favicon.ico deleted file mode 100644 index bfb9974019d4b8b978cf34ea67f0c6804f9b76c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYI*xFHzK2NLHVUHb1iG2*{Y zgB?lOds5VYkY4wx3IDZQ-O0jkQ{(?@bp=p{C&v8O!h&CXe)}H=o_u_bRSig==8O!i zc=x^YFzx?WUq6CX4M?xX{1U9V`}7vL{^Em6v8n;-RbSqS702#f2-g1(NLsD$!KwzN zS8ZJ%R&20o^8Y{o{{6r8@eNjaxV~+({;Q#3&F!=Q_uf49|L5O7|6hFn@<03RE(|p= zJ*s<_{YS^WcP_&H4q|}(5Orn`hB}ZwmBSk_@QDwvQS^g2lONu|PzTm~V&{JqG(7$3 zJq-P6H_u_H1L;#fa{vQto;~z`$*ZUT-~ayo|MAc7|C=7&#!v&-2UM#}0rtFhmTdiw fS5E!E^7Zq7x2tDJHpBVK>Hp`xeEbh92gs!XBi)`m diff --git a/samples/xml/insecure/src/main/webapp/resources/img/logo.png b/samples/xml/insecure/src/main/webapp/resources/img/logo.png deleted file mode 100644 index 393230883fb4e04829339f7c21b6ab6de7393891..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1123 zcmV-p1f2VcP)P000yS1^@s74{)X{0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$1xZ9fRCwBAJakr>0R&#%?*!8<7oReN z=>H6CRSb*_9RHalf3;=rzRt=3!VW|AET)fs_IS z5aXsJDqv;5UUXCgspCNG%qCu4_4m8Q8J4{_Ss=DB)G%-}OK$)A_qiv-M@As~;az|L zf?EIsP`7cheE7}?GEN=HaRK6^jLh%PvWj*xv3z@3xac)oRV-9P3=lIhyklZuIsRdC zEQk#P>`Ve}KmUCIvzcu9Tf*+YVP*hfGu{$8D7y_HfEf3kMztIrynEOQW2*Ct&A;*G zO}I7VlHICc5w;GSdsSFH1nBbCHtgWCZ;JNm@ z`XjO?7RGP?S?;`M26}|$>d$}7+Q^c380tVF%ErLJjAqwYZkA^sS%0xHF}~wxlbiD5 z`(qoR=no*41>&DbDvtqiaJE+C3lIk&fG}bK9l%ly6jZSM`Nu#MU}XG#RzRlJh~>*q zMz|m_S~GwYKiDe_40nN83W%$i`8HWIa~)&&`WqMkpMdet@v+_G7x%2~|M)9$Tk#!Y zFw1)&gOROi`~TlS|Ne#uGBU8e{?G6W7-39r7#RMspu`I>^-8__`jg@PS4KGI{tDI)dzZ%dlS>M59FF!%vUTz)~b4X4$^~`TvW7 ziIMs5zyE)kk;ES}`AIdM1t$C=P~wMS3!!9Ap!k0ap%i9haWBalIY!4O?f(oAd%r+4 zo)k2;d7%b_#Jhnp-2~zQ1Q@}XCIrw@0t|34GX2=V#dp;1>j!5(mhZn98K?y0fw-87 z<#h&!;7V3zwkKdg)?fU+ET4a(DSgvn03;_eFu%5AV7&(n_piW02N=Hpff?mLFf{&g z0%=ZYR2CvOD9l@{`Ma!o3LDu1eZb}An>(a<~Q?=8{fF=xc@W!MoZ)b z{O|{gu_$Ev|5TXe{Z}Tay7jj||2@OO@D(hD)hsRsjrwm4H=1C4P6p+J-x==O;Vpp} zelf7T{l>^3$L4GI;MZmjLQek2%+jdD-YkChTV1vRXZ6WjKj)c!`-fi-2P5B87D!gv za)A+O=YLR%j|aSGxW@31vGu^;|BMVrzfaux>)%&1LJk9(o(#_DK=28Oy@5ho@oC^@ z5m@o{&xh3zgTK{rGV>dM|NF@cm+`=a;1wp - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - diff --git a/samples/xml/jaas/spring-security-samples-xml-jaas.gradle b/samples/xml/jaas/spring-security-samples-xml-jaas.gradle deleted file mode 100644 index a986704ef2..0000000000 --- a/samples/xml/jaas/spring-security-samples-xml-jaas.gradle +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-core') - compile 'org.springframework:spring-beans' - compile 'org.springframework:spring-context' - compile 'org.springframework:spring-web' - - providedCompile 'javax.servlet:javax.servlet-api' - - runtime project(':spring-security-config') - runtime project(':spring-security-taglibs') - runtime project(':spring-security-web') - runtime jstlDependencies - runtime slf4jDependencies - - integrationTestCompile seleniumDependencies -} diff --git a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/JaasXmlTests.java b/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/JaasXmlTests.java deleted file mode 100644 index a6345a8221..0000000000 --- a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/JaasXmlTests.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import org.springframework.security.samples.pages.HomePage; -import org.springframework.security.samples.pages.LoginPage; -import org.springframework.security.samples.pages.LogoutPage; -import org.springframework.security.samples.pages.SecurePage; - -/** - * @author Michael Simons - */ -public class JaasXmlTests { - private WebDriver driver; - - private int port; - - @Before - public void setup() { - this.port = Integer.parseInt(System.getProperty("app.httpPort")); - this.driver = new HtmlUnitDriver(); - } - - @After - public void tearDown() { - this.driver.quit(); - } - - @Test - public void accessHomePageWithUnauthenticatedWorks() { - final HomePage homePage = HomePage.to(this.driver, this.port); - homePage.assertAt(); - } - - @Test - public void accessSecurePageWithUnauthenticatedRequiresLogin() { - final LoginPage loginPage = SecurePage.to(this.driver, this.port); - loginPage.assertAt(); - } - - @Test - public void authenticatedUserIsSentToOriginalPage() { - final SecurePage securePage = SecurePage.to(this.driver, this.port) - .loginForm() - .username("user") - .password("user") - .submit(); - securePage - .assertAt(); - } - - @Test - public void authenticatedUserLogsOut() { - final LogoutPage logoutPage = SecurePage.to(this.driver, this.port) - .loginForm() - .username("user") - .password("user") - .submit() - .logout(); - logoutPage.assertAt(); - - final LoginPage loginPage = SecurePage.to(this.driver, this.port); - loginPage.assertAt(); - } -} diff --git a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java b/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java deleted file mode 100644 index 69625fe8d2..0000000000 --- a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * The home page. - * - * @author Michael Simons - */ -public class HomePage { - - public static HomePage to(WebDriver driver, int port) { - driver.get("http://localhost:" + port +"/"); - return PageFactory.initElements(driver, HomePage.class); - } - - private final WebDriver webDriver; - - @FindBy(css = "p") - private WebElement message; - - @FindBy(css = "input[type=submit]") - private WebElement logoutButton; - - public HomePage(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public Content assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Home Page"); - return PageFactory.initElements(this.webDriver, Content.class); - } - - public LoginPage logout() { - this.logoutButton.submit(); - return PageFactory.initElements(this.webDriver, LoginPage.class); - } - - public static class Content { - @FindBy(css = "p") - private WebElement message; - - public Content andTheUserNameIsDisplayed() { - assertThat(message.getText()).isEqualTo("Hello user"); - return this; - } - } -} diff --git a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java b/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java deleted file mode 100644 index 9aa9fea10f..0000000000 --- a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * The login page. - * - * @author Michael Simons - */ -public class LoginPage { - - private final WebDriver webDriver; - - private final LoginForm loginForm; - - public LoginPage(WebDriver webDriver) { - this.webDriver = webDriver; - this.loginForm = PageFactory.initElements(this.webDriver, LoginForm.class); - } - - public LoginPage assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in"); - return this; - } - - public LoginForm loginForm() { - return this.loginForm; - } - - public static class LoginForm { - private WebDriver webDriver; - private WebElement username; - private WebElement password; - @FindBy(css = "button[type=submit]") - private WebElement submit; - - public LoginForm(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public LoginForm username(String username) { - this.username.sendKeys(username); - return this; - } - - public LoginForm password(String password) { - this.password.sendKeys(password); - return this; - } - - public SecurePage submit() { - this.submit.click(); - return PageFactory.initElements(this.webDriver, SecurePage.class); - } - } -} diff --git a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/LogoutPage.java b/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/LogoutPage.java deleted file mode 100644 index 819ad73e04..0000000000 --- a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/LogoutPage.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Logout Page is the same as login page with an additional message. - * - * @author Michael Simons - */ -public class LogoutPage extends LoginPage { - @FindBy(css = "div[role=alert]") - private WebElement alert; - - public LogoutPage(WebDriver webDriver) { - super(webDriver); - } - - @Override - public LogoutPage assertAt() { - super.assertAt(); - - assertThat(this.alert.getText()).isEqualTo("You have been signed out"); - return this; - } -} diff --git a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java b/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java deleted file mode 100644 index d2e067cb23..0000000000 --- a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * A secure page. - * - * @author Michael Simons - */ -public class SecurePage { - - public static LoginPage to(WebDriver driver, int port) { - driver.get("http://localhost:" + port + "/secure"); - return PageFactory.initElements(driver, LoginPage.class); - } - - private final WebDriver webDriver; - - @FindBy(css = "input[type=submit]") - private WebElement submit; - - public SecurePage(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public SecurePage assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Security Debug Information"); - return this; - } - - public LogoutPage logout() { - this.submit.click(); - return PageFactory.initElements(this.webDriver, LogoutPage.class); - } -} diff --git a/samples/xml/jaas/src/main/java/samples/jaas/RoleUserAuthorityGranter.java b/samples/xml/jaas/src/main/java/samples/jaas/RoleUserAuthorityGranter.java deleted file mode 100644 index 8f1fee9841..0000000000 --- a/samples/xml/jaas/src/main/java/samples/jaas/RoleUserAuthorityGranter.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2010-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.jaas; - -import java.security.Principal; -import java.util.Collections; -import java.util.Set; - -import org.springframework.security.authentication.jaas.AuthorityGranter; - -/** - * An AuthorityGranter that always grants "ROLE_USER". - * - * @author Rob Winch - */ -public class RoleUserAuthorityGranter implements AuthorityGranter { - - public Set grant(Principal principal) { - return Collections.singleton("ROLE_USER"); - } -} diff --git a/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java b/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java deleted file mode 100644 index c390c8cbc1..0000000000 --- a/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright 2010-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 samples.jaas; - -import java.io.Serializable; -import java.security.Principal; -import java.util.Map; - -import javax.security.auth.Subject; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.login.LoginException; -import javax.security.auth.spi.LoginModule; - -/** - * A LoginModule that will allow login if the username equals the password. Upon - * successful authentication it adds the username as a Principal. - * - * @author Rob Winch - */ -public class UsernameEqualsPasswordLoginModule implements LoginModule { - - - private String password; - private String username; - private Subject subject; - - - @Override - public boolean abort() { - return true; - } - - @Override - public boolean commit() { - return true; - } - - @Override - public void initialize(Subject subject, CallbackHandler callbackHandler, - Map sharedState, Map options) { - this.subject = subject; - - try { - NameCallback nameCallback = new NameCallback("prompt"); - PasswordCallback passwordCallback = new PasswordCallback("prompt", false); - - callbackHandler.handle(new Callback[] { nameCallback, passwordCallback }); - - password = new String(passwordCallback.getPassword()); - username = nameCallback.getName(); - } - catch (Exception e) { - throw new RuntimeException(e); - } - } - - @Override - public boolean login() throws LoginException { - if (username == null || !username.equals(password)) { - throw new LoginException("username is not equal to password"); - } - if ("".equals(username)) { - throw new LoginException("username cannot be empty string"); - } - - subject.getPrincipals().add(new UsernamePrincipal(username)); - return true; - } - - @Override - public boolean logout() { - return true; - } - - private static class UsernamePrincipal implements Principal, Serializable { - private final String username; - - UsernamePrincipal(String username) { - this.username = username; - } - - @Override - public String getName() { - return username; - } - - @Override - public String toString() { - return "Principal [name=" + getName() + "]"; - } - - private static final long serialVersionUID = 8049681145355488137L; - } -} diff --git a/samples/xml/jaas/src/main/resources/applicationContext-security.xml b/samples/xml/jaas/src/main/resources/applicationContext-security.xml deleted file mode 100644 index 98b5383c1b..0000000000 --- a/samples/xml/jaas/src/main/resources/applicationContext-security.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/jaas/src/main/resources/logback.xml b/samples/xml/jaas/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/xml/jaas/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/xml/jaas/src/main/webapp/WEB-INF/web.xml b/samples/xml/jaas/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 0a385e23d9..0000000000 --- a/samples/xml/jaas/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - JAAS Sample Application - - - - contextConfigLocation - - classpath:applicationContext-security.xml - - - - - - - webAppRootKey - jaas.root - - - - localizationFilter - org.springframework.web.filter.RequestContextFilter - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - localizationFilter - /* - - - - springSecurityFilterChain - /* - - - - - org.springframework.web.context.ContextLoaderListener - - - - index.jsp - - diff --git a/samples/xml/jaas/src/main/webapp/index.jsp b/samples/xml/jaas/src/main/webapp/index.jsp deleted file mode 100644 index 5389880ec1..0000000000 --- a/samples/xml/jaas/src/main/webapp/index.jsp +++ /dev/null @@ -1,24 +0,0 @@ -<%@ page import="javax.security.auth.Subject" %> -<%@ page import="java.security.AccessController" %> -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> - -Home Page - -

    Home Page

    -

    -Anyone can view this page. -

    -

    -Your principal object is....: <%= request.getUserPrincipal() %> -

    -

    -Subject.getSubject(AccessController.getContext()) is....: <%= Subject.getSubject(AccessController.getContext()) %> -

    -

    -You can currently access "/secure" URLs. -

    - -

    -Secure page

    - - diff --git a/samples/xml/jaas/src/main/webapp/secure/index.jsp b/samples/xml/jaas/src/main/webapp/secure/index.jsp deleted file mode 100644 index 70dfa1fa38..0000000000 --- a/samples/xml/jaas/src/main/webapp/secure/index.jsp +++ /dev/null @@ -1,58 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> -<%@ page import="javax.security.auth.Subject" %> -<%@ page import="java.security.AccessController" %> -<%@ page import="org.springframework.security.core.context.SecurityContextHolder" %> -<%@ page import="org.springframework.security.core.Authentication" %> -<%@ page import="org.springframework.security.core.GrantedAuthority" %> - - - -Security Debug Information - - - -

    Security Debug Information

    - -<% - - Subject subject = Subject.getSubject(AccessController.getContext()); - if(subject != null) { %> -

    - Subject.getSubject(AccessController.getContext()) is....: <%= subject %> -

    - <%} %> - -<% - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (auth != null) { %> -

    - Authentication object is of type: <%= auth.getClass().getName() %> -

    -

    - Authentication object as a String:

    <%= auth.toString() %> -

    - - Authentication object holds the following granted authorities:

    -<% - for (GrantedAuthority authority : auth.getAuthorities()) { %> - <%= authority %> (getAuthority(): <%= authority.getAuthority() %>)
    -<% } -%> - -

    Success! Your web filters appear to be properly configured!

    -<% - } else { -%> - Authentication object is null.
    - This is an error and your Spring Security application will not operate properly until corrected.

    -<% } -%> - -
    " method="post"> - - - - - - diff --git a/samples/xml/ldap/spring-security-samples-xml-ldap.gradle b/samples/xml/ldap/spring-security-samples-xml-ldap.gradle deleted file mode 100644 index 4670def5aa..0000000000 --- a/samples/xml/ldap/spring-security-samples-xml-ldap.gradle +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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. - */ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-taglibs') - compile jstlDependencies - - runtime project(':spring-security-web') - runtime project(':spring-security-config') - runtime project(':spring-security-ldap') - runtime 'com.unboundid:unboundid-ldapsdk' - runtime slf4jDependencies - - providedCompile 'javax.servlet:javax.servlet-api' - - integrationTestCompile seleniumDependencies -} diff --git a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/LdapXmlTests.java b/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/LdapXmlTests.java deleted file mode 100644 index 29f44441ea..0000000000 --- a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/LdapXmlTests.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import org.springframework.security.samples.pages.HomePage; -import org.springframework.security.samples.pages.LoginPage; -import org.springframework.security.samples.pages.LogoutPage; -import org.springframework.security.samples.pages.SecurePage; - -/** - * @author Michael Simons - */ -public class LdapXmlTests { - private WebDriver driver; - - private int port; - - @Before - public void setup() { - this.port = Integer.parseInt(System.getProperty("app.httpPort")); - this.driver = new HtmlUnitDriver(); - } - - @After - public void tearDown() { - this.driver.quit(); - } - - @Test - public void accessHomepageWithUnauthenticatedUserSuccess() { - final HomePage homePage = HomePage.to(this.driver, this.port); - homePage.assertAt(); - } - - @Test - public void accessManagePageWithUnauthenticatedUserSendsToLoginPage() { - final LoginPage loginPage = SecurePage.to(this.driver, this.port); - loginPage.assertAt(); - } - - @Test - public void authenticatedUserIsSentToOriginalPage() { - final SecurePage securePage = SecurePage.to(this.driver, this.port) - .loginForm() - .username("rod") - .password("koala") - .submit(); - securePage - .assertAt(); - } - - @Test - public void authenticatedUserLogsOut() { - final LogoutPage logoutPage = SecurePage.to(this.driver, this.port) - .loginForm() - .username("rod") - .password("koala") - .submit() - .logout(); - logoutPage.assertAt(); - - final LoginPage loginPage = SecurePage.to(this.driver, this.port); - loginPage.assertAt(); - } -} diff --git a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java b/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java deleted file mode 100644 index 69625fe8d2..0000000000 --- a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/HomePage.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * The home page. - * - * @author Michael Simons - */ -public class HomePage { - - public static HomePage to(WebDriver driver, int port) { - driver.get("http://localhost:" + port +"/"); - return PageFactory.initElements(driver, HomePage.class); - } - - private final WebDriver webDriver; - - @FindBy(css = "p") - private WebElement message; - - @FindBy(css = "input[type=submit]") - private WebElement logoutButton; - - public HomePage(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public Content assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Home Page"); - return PageFactory.initElements(this.webDriver, Content.class); - } - - public LoginPage logout() { - this.logoutButton.submit(); - return PageFactory.initElements(this.webDriver, LoginPage.class); - } - - public static class Content { - @FindBy(css = "p") - private WebElement message; - - public Content andTheUserNameIsDisplayed() { - assertThat(message.getText()).isEqualTo("Hello user"); - return this; - } - } -} diff --git a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java b/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java deleted file mode 100644 index 9aa9fea10f..0000000000 --- a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/LoginPage.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * The login page. - * - * @author Michael Simons - */ -public class LoginPage { - - private final WebDriver webDriver; - - private final LoginForm loginForm; - - public LoginPage(WebDriver webDriver) { - this.webDriver = webDriver; - this.loginForm = PageFactory.initElements(this.webDriver, LoginForm.class); - } - - public LoginPage assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in"); - return this; - } - - public LoginForm loginForm() { - return this.loginForm; - } - - public static class LoginForm { - private WebDriver webDriver; - private WebElement username; - private WebElement password; - @FindBy(css = "button[type=submit]") - private WebElement submit; - - public LoginForm(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public LoginForm username(String username) { - this.username.sendKeys(username); - return this; - } - - public LoginForm password(String password) { - this.password.sendKeys(password); - return this; - } - - public SecurePage submit() { - this.submit.click(); - return PageFactory.initElements(this.webDriver, SecurePage.class); - } - } -} diff --git a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/LogoutPage.java b/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/LogoutPage.java deleted file mode 100644 index 819ad73e04..0000000000 --- a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/LogoutPage.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Logout Page is the same as login page with an additional message. - * - * @author Michael Simons - */ -public class LogoutPage extends LoginPage { - @FindBy(css = "div[role=alert]") - private WebElement alert; - - public LogoutPage(WebDriver webDriver) { - super(webDriver); - } - - @Override - public LogoutPage assertAt() { - super.assertAt(); - - assertThat(this.alert.getText()).isEqualTo("You have been signed out"); - return this; - } -} diff --git a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java b/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java deleted file mode 100644 index 81c7cb4050..0000000000 --- a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.pages; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * A secure page. - * - * @author Michael Simons - */ -public class SecurePage { - - public static LoginPage to(WebDriver driver, int port) { - driver.get("http://localhost:" + port + "/secure"); - return PageFactory.initElements(driver, LoginPage.class); - } - - private final WebDriver webDriver; - - @FindBy(css = "input[type=submit]") - private WebElement submit; - - public SecurePage(WebDriver webDriver) { - this.webDriver = webDriver; - } - - public SecurePage assertAt() { - assertThat(this.webDriver.getTitle()).isEqualTo("Secure Page"); - return this; - } - - public LogoutPage logout() { - this.submit.click(); - return PageFactory.initElements(this.webDriver, LogoutPage.class); - } -} diff --git a/samples/xml/ldap/src/main/resources/logback.xml b/samples/xml/ldap/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/xml/ldap/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/xml/ldap/src/main/resources/users.ldif b/samples/xml/ldap/src/main/resources/users.ldif deleted file mode 100644 index 222e03793c..0000000000 --- a/samples/xml/ldap/src/main/resources/users.ldif +++ /dev/null @@ -1,60 +0,0 @@ -dn: ou=groups,dc=springframework,dc=org -objectclass: top -objectclass: organizationalUnit -ou: groups - -dn: ou=people,dc=springframework,dc=org -objectclass: top -objectclass: organizationalUnit -ou: people - -dn: uid=rod,ou=people,dc=springframework,dc=org -objectclass: top -objectclass: person -objectclass: organizationalPerson -objectclass: inetOrgPerson -cn: Rod Johnson -sn: Johnson -uid: rod -userPassword: koala - -dn: uid=dianne,ou=people,dc=springframework,dc=org -objectclass: top -objectclass: person -objectclass: organizationalPerson -objectclass: inetOrgPerson -cn: Dianne Emu -sn: Emu -uid: dianne -userPassword: emu - -dn: uid=scott,ou=people,dc=springframework,dc=org -objectclass: top -objectclass: person -objectclass: organizationalPerson -objectclass: inetOrgPerson -cn: Scott -sn: Wombat -uid: scott -userPassword: wombat - -dn: cn=user,ou=groups,dc=springframework,dc=org -objectclass: top -objectclass: groupOfNames -cn: user -member: uid=rod,ou=people,dc=springframework,dc=org -member: uid=dianne,ou=people,dc=springframework,dc=org -member: uid=scott,ou=people,dc=springframework,dc=org - -dn: cn=teller,ou=groups,dc=springframework,dc=org -objectclass: top -objectclass: groupOfNames -cn: teller -member: uid=rod,ou=people,dc=springframework,dc=org -member: uid=dianne,ou=people,dc=springframework,dc=org - -dn: cn=supervisor,ou=groups,dc=springframework,dc=org -objectclass: top -objectclass: groupOfNames -cn: supervisor -member: uid=rod,ou=people,dc=springframework,dc=org diff --git a/samples/xml/ldap/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/ldap/src/main/webapp/WEB-INF/applicationContext-security.xml deleted file mode 100644 index 1448f21d21..0000000000 --- a/samples/xml/ldap/src/main/webapp/WEB-INF/applicationContext-security.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/ldap/src/main/webapp/WEB-INF/web.xml b/samples/xml/ldap/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 41ffbf0e8b..0000000000 --- a/samples/xml/ldap/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - Spring Security LDAP Demo Application - - - - contextConfigLocation - - /WEB-INF/applicationContext-security.xml - - - - - webAppRootKey - ldap.root - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - /* - - - - - org.springframework.web.context.ContextLoaderListener - - - diff --git a/samples/xml/ldap/src/main/webapp/index.jsp b/samples/xml/ldap/src/main/webapp/index.jsp deleted file mode 100644 index 4e98804d9d..0000000000 --- a/samples/xml/ldap/src/main/webapp/index.jsp +++ /dev/null @@ -1,12 +0,0 @@ - -Home Page - -

    Home Page

    -

    Anyone can view this page.

    - -

    Your principal object is....: <%= request.getUserPrincipal() %>

    - -

    Secure page

    -

    Extremely secure page

    - - \ No newline at end of file diff --git a/samples/xml/ldap/src/main/webapp/secure/extreme/index.jsp b/samples/xml/ldap/src/main/webapp/secure/extreme/index.jsp deleted file mode 100644 index 47028ce0c7..0000000000 --- a/samples/xml/ldap/src/main/webapp/secure/extreme/index.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> - - - -

    VERY Secure Page

    -This is a protected page. You can only see me if you are a supervisor. - -

    Home -

    " method="post"> - - - - - \ No newline at end of file diff --git a/samples/xml/ldap/src/main/webapp/secure/index.jsp b/samples/xml/ldap/src/main/webapp/secure/index.jsp deleted file mode 100644 index dbb887ceb7..0000000000 --- a/samples/xml/ldap/src/main/webapp/secure/index.jsp +++ /dev/null @@ -1,21 +0,0 @@ -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> - -Secure Page - -

    Secure Page

    -This is a protected page. You can get to me if you've been remembered, -or if you've authenticated this session.

    - -<%if (request.isUserInRole("ROLE_SUPERVISOR")) { %> - You are a supervisor! You can therefore see the extremely secure page.

    -<% } %> - - -

    Home -

    " method="post"> - (also clears any remember-me cookie) - - - - \ No newline at end of file diff --git a/samples/xml/oauth2login/README.adoc b/samples/xml/oauth2login/README.adoc deleted file mode 100644 index f18124e148..0000000000 --- a/samples/xml/oauth2login/README.adoc +++ /dev/null @@ -1,278 +0,0 @@ -= OAuth 2.0 Login Sample - -This guide provides instructions on setting up the sample application with OAuth 2.0 Login using an OAuth 2.0 Provider or OpenID Connect 1.0 Provider. - -The following sections provide detailed steps for setting up OAuth 2.0 Login for these Providers: - -* <> -* <> -* <> -* <> - -[[google-login]] -== Login with Google - -This section shows how to configure the sample application using Google as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> -* <> - -[[google-initial-setup]] -=== Initial setup - -To use Google's OAuth 2.0 authentication system for login, you must set up a project in the Google API Console to obtain OAuth 2.0 credentials. - -NOTE: https://developers.google.com/identity/protocols/OpenIDConnect[Google's OAuth 2.0 implementation] for authentication conforms to the - https://openid.net/connect/[OpenID Connect 1.0] specification and is https://openid.net/certification/[OpenID Certified]. - -Follow the instructions on the https://developers.google.com/identity/protocols/OpenIDConnect[OpenID Connect] page, starting in the section, "Setting up OAuth 2.0". - -After completing the "Obtain OAuth 2.0 credentials" instructions, you should have a new OAuth Client with credentials consisting of a Client ID and a Client Secret. - -[[google-redirect-uri]] -=== Setting the redirect URI - -The redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Google -and have granted access to the OAuth Client _(created in the previous step)_ on the Consent page. - -In the "Set a redirect URI" sub-section, ensure that the *Authorized redirect URIs* field is set to `http://localhost:8080/login/oauth2/code/google`. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[google-application-config]] -=== Configure security.xml - -Now that you have a new OAuth Client with Google, you need to configure the application to use the OAuth Client for the _authentication flow_. To do so: - -. Go to `security.xml` and set the following configuration: -+ -[source,xml] ----- - ----- - -. Replace the values in the `client-id` and `client-secret` attributes with the OAuth 2.0 credentials you created earlier. - -[[google-boot-application]] -=== Deploy and start the application - -Deploy the WAR to a `Servlet` container and then go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for Google. - -Click on the Google link, and you are then redirected to Google for authentication. - -After authenticating with your Google account credentials, the next page presented to you is the Consent screen. -The Consent screen asks you to either allow or deny access to the OAuth Client you created earlier. -Click *Allow* to authorize the OAuth Client to access your email address and basic profile information. - -At this point, the OAuth Client retrieves your email address and basic profile information -from the https://openid.net/specs/openid-connect-core-1_0.html#UserInfo[UserInfo Endpoint] and establishes an authenticated session. - -[[github-login]] -== Login with GitHub - -This section shows how to configure the sample application using GitHub as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> - -[[github-register-application]] -=== Register OAuth application - -To use GitHub's OAuth 2.0 authentication system for login, you must https://github.com/settings/applications/new[Register a new OAuth application]. - -When registering the OAuth application, ensure the *Authorization callback URL* is set to `http://localhost:8080/login/oauth2/code/github`. - -The Authorization callback URL (redirect URI) is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with GitHub -and have granted access to the OAuth application on the _Authorize application_ page. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[github-application-config]] -=== Configure security.xml - -Now that you have a new OAuth application with GitHub, you need to configure the application to use the OAuth application for the _authentication flow_. To do so: - -. Go to `security.xml` and set the following configuration: -+ -[source,xml] ----- - ----- - -. Replace the values in the `client-id` and `client-secret` attributes with the OAuth 2.0 credentials you created earlier. - -[[github-boot-application]] -=== Deploy and start the application - -Deploy the WAR to a `Servlet` container and then go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for GitHub. - -Click on the GitHub link, and you are then redirected to GitHub for authentication. - -After authenticating with your GitHub credentials, the next page presented to you is "Authorize application". -This page will ask you to *Authorize* the application you created in the previous step. -Click _Authorize application_ to allow the OAuth application to access your personal user data information. - -At this point, the OAuth Client retrieves your personal user information -from the UserInfo Endpoint and establishes an authenticated session. - -[TIP] -For detailed information returned from the UserInfo Endpoint, see the API documentation -for https://developer.github.com/v3/users/#get-the-authenticated-user["Get the authenticated user"]. - -[[facebook-login]] -== Login with Facebook - -This section shows how to configure the sample application using Facebook as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> - -[[facebook-register-application]] -=== Add a New App - -To use Facebook's OAuth 2.0 authentication system for login, you must first https://developers.facebook.com/apps[Add a New App]. - -Select "Create a New App" and then the "Create a New App ID" page is presented. Enter the Display Name, Contact Email, Category and then click "Create App ID". - -NOTE: The selection for the _Category_ field is not relevant but it's a required field - select "Local". - -The next page presented is "Product Setup". Click the "Get Started" button for the *Facebook Login* product. -In the left sidebar, under _Products -> Facebook Login_, select _Settings_. - -For the field *Valid OAuth redirect URIs*, enter `http://localhost:8080/login/oauth2/code/facebook` then click _Save Changes_. - -The OAuth redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Facebook -and have granted access to the application on the _Authorize application_ page. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[facebook-application-config]] -=== Configure security.xml - -Now that you have created a new application with Facebook, you need to configure the sample application to use the application for the _authentication flow_. To do so: - -. Go to `security.xml` and set the following configuration: -+ -[source,xml] ----- - ----- - -. Replace the values in the `client-id` and `client-secret` attributes with the OAuth 2.0 credentials you created earlier. - -[[facebook-boot-application]] -=== Deploy and start the application - -Deploy the WAR to a `Servlet` container and then go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for Facebook. - -Click on the Facebook link, and you are then redirected to Facebook for authentication. - -After authenticating with your Facebook credentials, the next page presented to you is "Authorize application". -This page will ask you to *Authorize* the application you created in the previous step. -Click _Authorize application_ to allow the OAuth application to access your _public profile_ and _email address_ information. - -At this point, the OAuth Client retrieves your personal user information -from the UserInfo Endpoint and establishes an authenticated session. - -[[okta-login]] -== Login with Okta - -This section shows how to configure the sample application using Okta as the Authentication Provider and covers the following topics: - -* <> -* <> -* <> -* <> - -[[okta-register-application]] -=== Add Application - -To use Okta's OAuth 2.0 authentication system for login, you must first https://www.okta.com/developer/signup[create a developer account]. - -Sign in to your account sub-domain and navigate to _Applications -> Applications_ and then select the "Add Application" button. -From the "Add Application" page, select the "Create New App" button and enter the following: - -* *Platform:* Web -* *Sign on method:* OpenID Connect - -Select the _Create_ button. -On the "General Settings" page, enter the Application Name (for example, "Spring Security Okta Login") and then select the _Next_ button. -On the "Configure OpenID Connect" page, enter `http://localhost:8080/login/oauth2/code/okta` for the field *Redirect URIs* and then select _Finish_. - -The redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Okta -and have granted access to the application on the _Authorize application_ page. - -TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`. - The *_registrationId_* is a unique identifier for the `ClientRegistration`. - -IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured. -Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`. - -[[okta-assign-application-people]] -=== Assign Application to People - -From the "General" tab of the application, select the "Assignments" tab and then select the _Assign_ button. -Select _Assign to People_ and assign your account to the application. Then select the _Save and Go Back_ button. - -[[okta-application-config]] -=== Configure security.xml - -Now that you have created a new application with Okta, you need to configure the sample application to use the application for the _authentication flow_. To do so: - -. Go to `security.xml` and set the following configuration: -+ -[source,xml] ----- - - - ----- - -. Replace the values in the `client-id` and `client-secret` attributes with the OAuth 2.0 credentials you created earlier. -As well, replace `https://your-subdomain.oktapreview.com` in `authorization-uri`, `token-uri`, `user-info-uri` and `jwk-set-uri` with the sub-domain assigned to your account during the registration process. - -[[okta-boot-application]] -=== Deploy and start the application - -Deploy the WAR to a `Servlet` container and then go to `http://localhost:8080`. -You are then redirected to the default _auto-generated_ login page, which displays a link for Okta. - -Click on the Okta link, and you are then redirected to Okta for authentication. - -After authenticating with your Okta account credentials, the OAuth Client retrieves your email address and basic profile information -from the https://openid.net/specs/openid-connect-core-1_0.html#UserInfo[UserInfo Endpoint] and establishes an authenticated session. diff --git a/samples/xml/oauth2login/spring-security-samples-xml-oauth2login.gradle b/samples/xml/oauth2login/spring-security-samples-xml-oauth2login.gradle deleted file mode 100644 index 29b8ef486b..0000000000 --- a/samples/xml/oauth2login/spring-security-samples-xml-oauth2login.gradle +++ /dev/null @@ -1,15 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile 'org.springframework:spring-context' - compile 'org.springframework:spring-webmvc' - compile project(':spring-security-config') - compile project(':spring-security-web') - compile project(':spring-security-oauth2-client') - compile project(':spring-security-oauth2-jose') - compile 'com.fasterxml.jackson.core:jackson-databind' - compile 'org.thymeleaf:thymeleaf-spring5' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.0.4.RELEASE' - - testCompile project(':spring-security-test') -} diff --git a/samples/xml/oauth2login/src/main/java/sample/config/WebConfig.java b/samples/xml/oauth2login/src/main/java/sample/config/WebConfig.java deleted file mode 100644 index 53db0361a8..0000000000 --- a/samples/xml/oauth2login/src/main/java/sample/config/WebConfig.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.config; - -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.expression.BeanFactoryResolver; -import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; -import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository; -import org.springframework.security.oauth2.client.web.method.annotation.OAuth2AuthorizedClientArgumentResolver; -import org.springframework.security.web.method.annotation.AuthenticationPrincipalArgumentResolver; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.thymeleaf.spring5.SpringTemplateEngine; -import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; -import org.thymeleaf.spring5.view.ThymeleafViewResolver; -import org.thymeleaf.templatemode.TemplateMode; - -import java.util.List; - -/** - * @author Joe Grandja - */ -@Configuration -@EnableWebMvc -public class WebConfig implements WebMvcConfigurer, ApplicationContextAware { - private ApplicationContext context; - private ClientRegistrationRepository clientRegistrationRepository; - private OAuth2AuthorizedClientRepository authorizedClientRepository; - - @Override - public void addArgumentResolvers(List resolvers) { - // @AuthenticationPrincipal - AuthenticationPrincipalArgumentResolver principalArgumentResolver = - new AuthenticationPrincipalArgumentResolver(); - principalArgumentResolver.setBeanResolver(new BeanFactoryResolver( - this.context.getAutowireCapableBeanFactory())); - resolvers.add(principalArgumentResolver); - - // @RegisteredOAuth2AuthorizedClient - resolvers.add(new OAuth2AuthorizedClientArgumentResolver( - this.clientRegistrationRepository, this.authorizedClientRepository)); - } - - @Override - public void setApplicationContext(ApplicationContext context) throws BeansException { - this.context = context; - } - - @Autowired - public void setClientRegistrationRepository(ClientRegistrationRepository clientRegistrationRepository) { - this.clientRegistrationRepository = clientRegistrationRepository; - } - - @Autowired - public void setAuthorizedClientRepository(OAuth2AuthorizedClientRepository authorizedClientRepository) { - this.authorizedClientRepository = authorizedClientRepository; - } - - @Bean - public SpringResourceTemplateResolver templateResolver() { - SpringResourceTemplateResolver templateResolver = new SpringResourceTemplateResolver(); - templateResolver.setApplicationContext(this.context); - templateResolver.setPrefix("/WEB-INF/templates/"); - templateResolver.setSuffix(".html"); - templateResolver.setTemplateMode(TemplateMode.HTML); - templateResolver.setCacheable(true); - return templateResolver; - } - - @Bean - public SpringTemplateEngine templateEngine() { - SpringTemplateEngine templateEngine = new SpringTemplateEngine(); - templateEngine.setTemplateResolver(templateResolver()); - templateEngine.setEnableSpringELCompiler(true); - return templateEngine; - } - - @Bean - public ThymeleafViewResolver viewResolver() { - ThymeleafViewResolver viewResolver = new ThymeleafViewResolver(); - viewResolver.setTemplateEngine(templateEngine()); - return viewResolver; - } -} diff --git a/samples/xml/oauth2login/src/main/java/sample/web/OAuth2LoginController.java b/samples/xml/oauth2login/src/main/java/sample/web/OAuth2LoginController.java deleted file mode 100644 index 4165428145..0000000000 --- a/samples/xml/oauth2login/src/main/java/sample/web/OAuth2LoginController.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2002-2020 the original author or authors. - * - * 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 - * - * 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, - * 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 sample.web; - -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.oauth2.client.OAuth2AuthorizedClient; -import org.springframework.security.oauth2.client.annotation.RegisteredOAuth2AuthorizedClient; -import org.springframework.security.oauth2.core.user.OAuth2User; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @author Joe Grandja - */ -@Controller -public class OAuth2LoginController { - - @GetMapping("/") - public String index(Model model, - @RegisteredOAuth2AuthorizedClient OAuth2AuthorizedClient authorizedClient, - @AuthenticationPrincipal OAuth2User oauth2User) { - model.addAttribute("userName", oauth2User.getName()); - model.addAttribute("clientName", authorizedClient.getClientRegistration().getClientName()); - model.addAttribute("userAttributes", oauth2User.getAttributes()); - return "index"; - } -} diff --git a/samples/xml/oauth2login/src/main/webapp/WEB-INF/security.xml b/samples/xml/oauth2login/src/main/webapp/WEB-INF/security.xml deleted file mode 100644 index 078e9f2c43..0000000000 --- a/samples/xml/oauth2login/src/main/webapp/WEB-INF/security.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/oauth2login/src/main/webapp/WEB-INF/spring-servlet.xml b/samples/xml/oauth2login/src/main/webapp/WEB-INF/spring-servlet.xml deleted file mode 100644 index a55d96616c..0000000000 --- a/samples/xml/oauth2login/src/main/webapp/WEB-INF/spring-servlet.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/samples/xml/oauth2login/src/main/webapp/WEB-INF/templates/index.html b/samples/xml/oauth2login/src/main/webapp/WEB-INF/templates/index.html deleted file mode 100644 index 629d8ac8ee..0000000000 --- a/samples/xml/oauth2login/src/main/webapp/WEB-INF/templates/index.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - Spring Security - OAuth 2.0 Login - - - -
    -
    - User: -
    -
     
    -
    -
    - -
    -
    -
    -

    OAuth 2.0 Login with Spring Security

    -
    - You are successfully logged in - via the OAuth 2.0 Client -
    -
     
    -
    - User Attributes: -
      -
    • - : -
      • -
    -
    - - diff --git a/samples/xml/oauth2login/src/main/webapp/WEB-INF/web.xml b/samples/xml/oauth2login/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index b88e476eff..0000000000 --- a/samples/xml/oauth2login/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - contextConfigLocation - /WEB-INF/security.xml - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - springSecurityFilterChain - /* - - - - org.springframework.web.context.ContextLoaderListener - - - - spring - org.springframework.web.servlet.DispatcherServlet - - - - spring - / - - - \ No newline at end of file diff --git a/samples/xml/openid/spring-security-samples-xml-openid.gradle b/samples/xml/openid/spring-security-samples-xml-openid.gradle deleted file mode 100644 index f6af367680..0000000000 --- a/samples/xml/openid/spring-security-samples-xml-openid.gradle +++ /dev/null @@ -1,14 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-core') - compile project(':spring-security-openid') - compile 'org.springframework:spring-webmvc' - - providedCompile 'javax.servlet:javax.servlet-api' - - runtime project(':spring-security-config') - runtime project(':spring-security-taglibs') - runtime jstlDependencies - runtime slf4jDependencies -} diff --git a/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java b/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java deleted file mode 100644 index 066eb0bbdc..0000000000 --- a/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.openid; - -import java.util.Collection; - -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.User; - -/** - * Customized {@code UserDetails} implementation. - * - * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are - * encouraged to migrate - * to OpenID Connect, which is supported by spring-security-oauth2. - * @author Luke Taylor - * @since 3.1 - */ -public class CustomUserDetails extends User { - private String email; - private String name; - private boolean newUser; - - public CustomUserDetails(String username, Collection authorities) { - super(username, "unused", authorities); - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public boolean isNewUser() { - return newUser; - } - - public void setNewUser(boolean newUser) { - this.newUser = newUser; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java b/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java deleted file mode 100644 index b92fe9b556..0000000000 --- a/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.openid; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.userdetails.AuthenticationUserDetailsService; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.openid.OpenIDAttribute; -import org.springframework.security.openid.OpenIDAuthenticationToken; - -/** - * Custom UserDetailsService which accepts any OpenID user, "registering" new users in a - * map so they can be welcomed back to the site on subsequent logins. - * - * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are - * encouraged to migrate - * to OpenID Connect, which is supported by spring-security-oauth2. - * @author Luke Taylor - * @since 3.1 - */ -public class CustomUserDetailsService implements UserDetailsService, - AuthenticationUserDetailsService { - - private final Map registeredUsers = new HashMap<>(); - - private static final List DEFAULT_AUTHORITIES = AuthorityUtils - .createAuthorityList("ROLE_USER"); - - /** - * Implementation of {@code UserDetailsService}. We only need this to satisfy the - * {@code RememberMeServices} requirements. - */ - public UserDetails loadUserByUsername(String id) throws UsernameNotFoundException { - UserDetails user = registeredUsers.get(id); - - if (user == null) { - throw new UsernameNotFoundException(id); - } - - return user; - } - - /** - * Implementation of {@code AuthenticationUserDetailsService} which allows full access - * to the submitted {@code Authentication} object. Used by the - * OpenIDAuthenticationProvider. - */ - public UserDetails loadUserDetails(OpenIDAuthenticationToken token) { - String id = token.getIdentityUrl(); - - CustomUserDetails user = registeredUsers.get(id); - - if (user != null) { - return user; - } - - String email = null; - String firstName = null; - String lastName = null; - String fullName = null; - - List attributes = token.getAttributes(); - - for (OpenIDAttribute attribute : attributes) { - if (attribute.getName().equals("email")) { - email = attribute.getValues().get(0); - } - - if (attribute.getName().equals("firstname")) { - firstName = attribute.getValues().get(0); - } - - if (attribute.getName().equals("lastname")) { - lastName = attribute.getValues().get(0); - } - - if (attribute.getName().equals("fullname")) { - fullName = attribute.getValues().get(0); - } - } - - if (fullName == null) { - StringBuilder fullNameBldr = new StringBuilder(); - - if (firstName != null) { - fullNameBldr.append(firstName); - } - - if (lastName != null) { - fullNameBldr.append(" ").append(lastName); - } - fullName = fullNameBldr.toString(); - } - - user = new CustomUserDetails(id, DEFAULT_AUTHORITIES); - user.setEmail(email); - user.setName(fullName); - - registeredUsers.put(id, user); - - user = new CustomUserDetails(id, DEFAULT_AUTHORITIES); - user.setEmail(email); - user.setName(fullName); - user.setNewUser(true); - - return user; - } -} diff --git a/samples/xml/openid/src/main/resources/logback.xml b/samples/xml/openid/src/main/resources/logback.xml deleted file mode 100644 index 1f54c08753..0000000000 --- a/samples/xml/openid/src/main/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/xml/openid/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/openid/src/main/webapp/WEB-INF/applicationContext-security.xml deleted file mode 100644 index c79478c922..0000000000 --- a/samples/xml/openid/src/main/webapp/WEB-INF/applicationContext-security.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/openid/src/main/webapp/WEB-INF/web.xml b/samples/xml/openid/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 38f1ffc789..0000000000 --- a/samples/xml/openid/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - Spring Security OpenID Demo Application - - - - contextConfigLocation - - /WEB-INF/applicationContext-security.xml - - - - - webAppRootKey - openid.root - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - /* - - - - - org.springframework.web.context.ContextLoaderListener - - - diff --git a/samples/xml/openid/src/main/webapp/css/openid.css b/samples/xml/openid/src/main/webapp/css/openid.css deleted file mode 100644 index 8929ff07ab..0000000000 --- a/samples/xml/openid/src/main/webapp/css/openid.css +++ /dev/null @@ -1,45 +0,0 @@ -#openid_form { - width: 580px; -} - #openid_form legend { - font-weight: bold; - } -#openid_choice { - display: none; -} -#openid_input_area { - clear: both; - padding: 10px; -} -#openid_btns, #openid_btns br { - clear: both; -} - #openid_highlight { - padding: 3px; - background-color: #FFFCC9; - float: left; - } - .openid_large_btn { - width: 100px; - height: 60px; - border: 1px solid #DDD; - margin: 3px; - float: left; - } - .openid_small_btn { - width: 24px; - height: 24px; - border: 1px solid #DDD; - margin: 3px; - float: left; - } - a.openid_large_btn:focus { - outline: none; - } - a.openid_large_btn:focus - { - -moz-outline-style: none; - } - .openid_selected { - border: 4px solid #DDD; - } \ No newline at end of file diff --git a/samples/xml/openid/src/main/webapp/images/aol.gif b/samples/xml/openid/src/main/webapp/images/aol.gif deleted file mode 100644 index decc4f12362124c74e1e0b78ad4e5d132621ab23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2205 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 diff --git a/samples/xml/openid/src/main/webapp/images/google.gif b/samples/xml/openid/src/main/webapp/images/google.gif deleted file mode 100644 index 1b6cd07bd8b9f27175e0a03be3b5849e0f5479c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1596 zcmc(e`#aNn0DwQcU}GKMxn#>^B<6OWQKZt-cb3xBiE^HYQf=ZKSu)*APi@FdDnu7l zbE$~JN>R#|+lE{hiz(BRl~d+uOl9Xe=bt$55AUzjP!`6aB*XlLd;L`$MA0-=oh;_@%=DSKzTW5!kkg02oxN<-;QgzZXZ6@(M)5 zb-u1@<^vWqN`U%R3CtOJuojJt|Ec%yo>_yZ%MV%ajx`i>ysy4d0^mKeNIQ#t@2y*KMj}jE8i*m zl#eQZ7!1Pfn72wr)$QwY6gabm(O6$Lylw3Pd(s%KbU5crNh3{eeZxI4(dJKB1MUAN>n;QZCCkQs_tGtJY-^iC3ja3x9v_uTP?vFVW;}s># zx;OS=;!{FWer7!3y~sj6t|9~xWcTkC-QJ+z*` z{$kU`Oy-`7hp(oZDFCEubef~t-M)K#*_S^K7T>g7T^A0(oK7oIN_s0RehD8}s1*i- z0sK!m=+Xa`J^uB-PXLSoRAEU$)j~-M#?mcPT3yt{hn6u4gKCOf&J$L|DbuOJmz+s9 z2lJ2J?sjAok}A_-F35;rl&1P$i@IJDD5Bmxks6yO#s#L4K20(2&;kgjBXbWq$Y}&> zCc!g3Y<~;U$CQlDX2nU|3Dx218gg&b%2GehXilrp4#P1y;weqVUjQptQlB1c;VO7e z@*D^wqyiQ&MP@@Eiijj!C6&AUPa6q7&lm^MToqj2ny^P9>WX^Ttd-e`;&k}6HltTz=X|A>@zzv6@ z)2r$ZZK19Hq1s>pg(Wg*yF5bqcpgSu2*Z=3Y48rhsMseSGm6D#RWnKSz*rI2&e%)U zhJ)uMj-*j*Cq6a|SR^kuis=outMPl7vPf8@-OF`fK(;t_tEV6%zOcxe#-=20Mq7|L zi=0@wEQshFjSRBhL&)v46Z=EWNGr^Y7(cjs9|q}uirjP>UklMq_Cn}BpIZ=OxlIZN zrqgmZ9Daq-5mP(tkggoG%l1Mp5`!YX9P+{9a@vc{UA@ux9w!5<$J7Qsxz)kjp9U>O zdMGwqZ?ce!P4?kRO}wMe2<(jAw{y`J9zkIp$bd;9jpjy5e7h8h$r8hU6K*}g{&bHR zc4&^sGRyCwh1g@leXv&EK^8KfI43fLjtGZ4%_yBJq-Q6Ii74-1r$U?ItVA?Z^o7I@ z6Gx_VGVMkkya7VbaJCw^O!RGWg$&GOOC(&Bu>?}_7>IP{%ivHGBI}%WA6YI2+3M9H z%iJLj*4d~I--NgTJ(9t@qodNU?AaV`YHlKR%UVir5C+OujBse~Mp}pFlaUEl5;MVK zxnv+FK^_1to@fbJn^<{1g0s+?k E17=sO82|tP diff --git a/samples/xml/openid/src/main/webapp/images/livejournal.ico b/samples/xml/openid/src/main/webapp/images/livejournal.ico deleted file mode 100644 index f3d21ec5e8f629b77c77615982cef929802fbde4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5222 zcmdT{3s6+o89vBPQIq*$1QbbvAP7Q0Tpmk!l@)pHf>>S> z1vbL6JXf&Eq~nt$W+Y}?NhYbg%X2}TX`y3UlPS(H)68fPIsMMP%d)ZvOQtiO{(Js= z?m7Sef9JdZJ&(JD*bxy~wQ3b%;$cU~E2vFPBC#hV6@5-lg8iE%gba#Un|TxR-jjq} zb3h#KnTHdU;W5$jSK%T=Pj@H?K_Lo-P~nPOqSb0qGXv!dp_JW0@nc==!i$LGD~{u9 zt~8U?B2Fd~qvpC~M^KA`gqqWJF*i|=E@%ujnuad%Of!pb5`P(QC7kR#SP2OTzQ<#W zlv%8aIKD~feX!6nCX`OuQ922|4;{CsbQG#}pj5FEW=E(mRL;B7LWEq0KANYW^3Y=B z_y|vmH;?ldeDaRw*8J(~hC!qOw?4H%Oa?Y1JnqbNZuG{_4-W8zh5g(k>k33gQDw%FD{ne3XB@ z!rC7_g|Gdhw<&R;HMK*r`+|J;KQGI_{V?zIn&?P3mLE&uo!9m>GUrS3pvy(U5A^kP z_$(c0u8#D!b_R{U=43cu$bYTlSjYsNjhYF)s`QQZ*3Ky}xtxmjy4jX?u^{kLVeo`r zO$S;h4E5!2dRRN72QywCwpkgq;m=hECwm&HvGsd>T}g=BENAdX&yl^G;15ZD@oDXe za5~)ny+KtH;%e1SDcr|-+q7@ZKZGT0tS19Bm$;2T93LRj8^{4y675bB zwk%H%+bJ)|KhfTK`uexou|aVjGo#E;Z%!+~BizWLXGzMgwI!$9Yp#x{^ivH+c7UV2 ztG$yM@p8QPk{Hi9qZjA|_iy0IrBz^V2FDGCt7!c=X2YVB&%j+s%GRZq6}$VIQ&2P#@0_gE zNAUFwKQH_3h_#F3ZUXmN_F>UpAnQ~Ky-mq~NZp*1ER$dEt(TrWr;qctLx_#Sm^+j7oj?A#I7DC$ zaD!T6s6Sj3{L6HyM1HcisHVO0oT2v1d(D5PMI|R99BoZLz$4vBrg+7t)3*@)h!oupL+wwg_YH%9vj*4aIjHXba4{8xkuc);A<= z{dZS2HK=KK!_1Gt{0T^;r%|h@D@A zwEWI*^|gxqvzS+eyR}HSKjd>V18&q9+tQP_E(>?D2|U7;$hbAy$_UJGbI$ekhw(yN zQ(t@t+Lp`(@GUljJClQ+q->vynK|C(jk-g{A&xDnJEp9_2N%N}naK~`m>>4s;pgp< z9QJ=jEdleAH`nptjkB2FdOtgL+Y^|;w&WZ>d7<84e)0JS>Jtat2~yqPk^=D3P?xq0 z@f7|6Jern%&D$w>p*GAGyl#LeY+CZk`Lq2)w{GZkg^@2rdyw`F-&0YZ?HMmk^)y+7 zCvI74%WRnjCpgYpE3*5H!##ZipIx~q^<9GpuZi7A2hXs1Zk~!pO}{2J>4l}(OBYOw zFj0B(Bt6hCeb>`pT-SE@^z{x5U2Ln3-?S|8w?F!!Jf|8`_0G@Mi{w$ z=X|SDy7MOoto~1%!)>|A@LPpZ)J;^~NDC9o;+|ify5q^Z+~}r~bWFtv8#b;5N6F%T zh9Q2R{a&r|U)2@;IgyF6UTmI3tzX1!nST@^QP$V_qZVtm#9wTzwZCbi{LlWU{0Anp BEK2|Y diff --git a/samples/xml/openid/src/main/webapp/images/myopenid.ico b/samples/xml/openid/src/main/webapp/images/myopenid.ico deleted file mode 100644 index ceb06e6a3f0d88fb97cf10475a3062fb0edab33e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2862 zcmeHJJxc>Y5S@6ZrZbS)owhjA&;jnXfl*X745tmMB3MrBW$)n`RP3b417qd6J6bL?UM{+)q(3xlv0Ik%T7j-l59$8$m>#ard~jq(8yIciUu?j(!>?&WKIe?G5c$>` zV+r!H1WS-ha)=*H^!uZEl>O1BP8%xc=fconk~~4DvKCYWn4`b_pUnoZ788}%mc>uh z9HV;s)r}P~NWtqf_p5&HGjTJoZI|S8n)uf0l05g}rdhqaIBpnv^myAWbI*7E=&N3x z95xI+0zR;x-|08c&;6Ul#XdjZARV+no-wSN`};1(+>)AIisPc*P@H*_1Kd%ys#()H z>NUmL)tL6ccj9UxPF`{LG^Rc9JypwV>?^N0yvK~LBc9f{#^OA9dQUv#8Tz7oxfa(K u#=%<%_2}PpAb{bmUKcqz}))c5uC(7v?)v4a2P)ZNa- z@$&T2)z|&~{r~^}A^8LV00000EC2ui01yBW000GQ;3tk`X`bk)Wk@<6#nZYULKH{p zEx|?+kif!I0vIL|#ZMubBmjWH2OtmxIFVa~6JQ7!1CK!f5W#StOTv&C3=E8h2vI1s n+#cd5;2fT3B_0kF0v!+!GARoV78n&7dMN`JIW(4+BOw4gP{MS* diff --git a/samples/xml/openid/src/main/webapp/images/openid.gif b/samples/xml/openid/src/main/webapp/images/openid.gif deleted file mode 100644 index c718b0e6f37012db6c9c10d9d21c4dea0d0c01bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 740 zcmZ?wbhEHb^k$G`xXQrrKS$vIw-5i{JotZf!T-qt{~ulWe{RG7ST3!;kh({9A)7tlU&$%5*g$f^Ar># z6BXsynVh) zJ?osJf(s)D10z?npvQi179P(djPk7Va&pI%NfVlv<{V@&c*Q1S?C^%corz71;ll+1P9`Sd{~>qE3OQZcJ(5}z4)|O#`p@vJ zr9;Fsp~HjOs*vv^`}=;ISs7Cf1bMkUpV%Pi{6*$qgF{F5!;-XxTBi=%eG5gPtV^!wdin~r1kkVO&vN=8Ce+Xv z$*|MCqlY(ACp$%vPrNeV;U*4lo)c<`?yngdvl5)QWEV6rHbi?!)@MOEE;CkPT#L!!@77y7u K{UjJ!7_0#i2pVPp diff --git a/samples/xml/openid/src/main/webapp/images/technorati.ico b/samples/xml/openid/src/main/webapp/images/technorati.ico deleted file mode 100644 index fa1083c116527de7cdbf5897976aae8807fce878..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2294 zcmeH}ze^lZ5XZl}d+sirdNzWcsg4x+2g0RLIAWPjuoD!tN}VeB7eq*vB1MXHX)Xi{ zAytZyMi86WScxK7SO|(gE|<@|cRuzut2sy&xMBC*%tj+A zE!c_l2H#`zaX;dYlru_mk^31KdcB@L9&W3#wIFp`YJOeP`OSr1{CK6O-`2Es@?E#T zy1MFK>-Ep~I=Vd7%e_s#J@}-Zvwh`X=4ClX_h=7BXW;)k1Ifb@+v7M5AZI7aYkiNm z$KjX;Qm=X2(~a>=Zn(6-IG8mv>sbkaBEroVrCFBdHr=3XM61uF&u!`5GI1u;Qf<+zMxU!sr1q{f@m!ic#&7x4 zjcDZqv{&NU85cGO2UiL7I^;$4kVpqJ@-E;pjlK(>l3v2Y;e5IS@q=)?(5+CX;*7LwCwnlxopJBahPURBFV+~&J eFF>coTp;}_7zqbJAQuX63TM^f{)_Klzq8-HK65Pq diff --git a/samples/xml/openid/src/main/webapp/images/verisign.gif b/samples/xml/openid/src/main/webapp/images/verisign.gif deleted file mode 100644 index faa6aaafbda1d73ac221dcac5cb6e227cc773e73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2550 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 X0PU5rU|_JTL0}LcBo2~?sfE!1%eOAT diff --git a/samples/xml/openid/src/main/webapp/images/wordpress.ico b/samples/xml/openid/src/main/webapp/images/wordpress.ico deleted file mode 100644 index 31b7d2c2b77c039342854190a90a8d8436992b47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmaKqJxT*n6op^J!coBi!TOa}allq&O3PWo1c^ULbO>qe21^@jt1Q7KOpyh+ge)Q1 zK|J4huRH_#zwbc3UEA;R9AO!H&d%roag-+O5 zO!N95T@?S*G}Sgw{mN!=VmhZ5Rzf4>LLtlrZUAWLgGPY+oVrG5xo^yW`xZU-Q@wk~@ zYxS@D)yH#t7kvCm!TtK*mFh-7(+TYB+*i5pa!nc|Jf3SU=XN{`fjrfux$lA7e}n0{ zlfCqFi>Z(M`wVVG>yKK1*9rZ1`iw}=W^iIUOLNU?<8e1$!1FrglCO_u)5YTUvK?eu yI~YIj#-~XLO;hd+o2#A2S^08*UB1qS`QCUE52vFxJ9}scm-~xFcCkL1j=lhFMR`a7 diff --git a/samples/xml/openid/src/main/webapp/images/yahoo.gif b/samples/xml/openid/src/main/webapp/images/yahoo.gif deleted file mode 100644 index 42adbfa57f86b8b2df5aa1b7fe90510a7d1fdfdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1682 zcmV;D25tFANk%w1VN?JR0QUd@mU^Y$)Z(Fuu9$+OiD{W+I(v?Bo^?%%^Y8SKa-f%f zrJRAP?db1@W|sQ-`{?5AU^RD{eyHu}@MAc6Y)F84S&#er{JEpU(8JfsyU}JneZsZL zSS)eo;OgSr=DVrI-qz#a*5rX-lZrIb?D>k<=p7w-06N?k+!11Z%BingssxX*~`Jx%e>NQL4U@#&si&Ry{X0d`1)-{ zg6ib$l60Y~mAI;tw^}Z8;o0SWTajTmc&LxG+tT3I%-z$;*=0U@n}Df z_WAbn_i93aS}k+@`~3Iy_*yJ-{r&yp+~-;?aeZ2la7u;o?eq2W_P3J0;iQSMZ9#_O-sRiQ;BHNT`1AO8Qj6r> z=!+x&Fkmx*3aAJ-s-85w)XV*n|rAH`~33k^Rb@1vYox} z>+;~*+x%&C>Lw4uMvz|_vc)vS@X=;7?8j0^uVyl!LrHg=Iz3>%W_GG_VoC(sJZv``HXa* zrIxkU(csd>*m+iriD#Si^7g{9%5+bN>E!JE{QaMVtz9y8td_W5GInuEg!AzAjBA~X zY@AsvasU7SA^8LV00000EC2ui08{`F000R80L>t9BSw)JIS9nHVe#jm!-o(fN}Ncs zqD6~fM)VmW02LY`Stc0KkV8WON`_FRxX7}l%ZU3P9D0C2ViSKjMS*eC!QC5NWc*24 z$ACo`hlu15G!rIFqD1JxyfmSQfQkeLyuEbT;aCwDIQ`|T5~at(emLt$WH9QCKO?Fj z!YZJpKo=h-$7uT!(ZdXCA3nU9VnV{d0N()k(Y5u#B%yvAamGe5)veXFd%|B&z}{E8T{37 zh=$XgAq(IDLK-DxqXs0h{KJhuWN1QBJY)EyRU!TiVM;~maN!RZP&~xT1YQjCP&*>v zG{z^SKvar9Z%BlLKM^>@P9t6rA<+h8P*4UH{%m1KMF#8;qhgZOW6=OR_%lH)|M;QC z8ZSfy%{eR3AQ2<}h+xkGOhf{J3Vrwkz(32laK<*D3lQa{dk%K=0FpwEPj!g6c z8PB|?!Vn>}!~`5T1t5_zE=)iG0UUIK4SoL5A(0aP5b%#W8tjnDD-wa@&pQ_U;|wMK zP_awA|9s&=3UeHwj6-G|f<{Y6;N(Ia64h{zIqvjAj2hSc^NKS(WVVJ5CDigyFgPgS zk0p~ZbHfV$&=8I(61-3X6MR?_!$S{5GXw`Ytg(h5N(#^hz#+8og#&*SW6=pXX^~7s zFkB+QLkzgEL@`eIumT%^WMK#(^!)R|8hsQ|gbd{TLyHi#R)~`zC)5;?9Um+JL^Gdc zPzgiQO?9dAYKu|J14=HfQCJs5ExCItCfU89hC~?OkX(YSVLmi;d zz!!K_6YW}g;8BGXI9aiX4Mdod4IRil;>SO66v75h2HbJ^?H7Hao9>T4MsJEFFH&Hw-a diff --git a/samples/xml/openid/src/main/webapp/index.jsp b/samples/xml/openid/src/main/webapp/index.jsp deleted file mode 100644 index 868f99600e..0000000000 --- a/samples/xml/openid/src/main/webapp/index.jsp +++ /dev/null @@ -1,38 +0,0 @@ -<%@ page import="org.springframework.security.web.csrf.CsrfToken" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> - - - - -

    OpenID Sample Home Page

    - -

    -NOTE: The OpenID 1.0 and 2.0 protocols have been deprecated and users are -encouraged to migrate -to OpenID Connect, which is supported by spring-security-oauth2. -

    - - -

    -Welcome back, ! -

    - -

    -As a first time user of this site, your OpenID identity has been registered -by the application and will be recognized if you return. -

    -     - -

    Technical Information

    -

    -Your principal object is....: <%= request.getUserPrincipal() %> -

    -<% CsrfToken token = (CsrfToken) request.getAttribute(CsrfToken.class.getName()); %> -
    - -
    -

    Logout

    - - diff --git a/samples/xml/openid/src/main/webapp/js/jquery-3.5.1.min.js b/samples/xml/openid/src/main/webapp/js/jquery-3.5.1.min.js deleted file mode 100644 index b0614034ad..0000000000 --- a/samples/xml/openid/src/main/webapp/js/jquery-3.5.1.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
    "],col:[2,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="
    ",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0 0) queryString.push($hash); - queryString.push(chunks.join($separator)); - - return queryString.join(""); - } - }; - - return new queryObject(location.search, location.hash); - }; -}(jQuery.query || {}); // Pass in jQuery.query as settings object diff --git a/samples/xml/openid/src/main/webapp/js/openid-client/openid-client-config.js b/samples/xml/openid/src/main/webapp/js/openid-client/openid-client-config.js deleted file mode 100644 index 4cb0920c8e..0000000000 --- a/samples/xml/openid/src/main/webapp/js/openid-client/openid-client-config.js +++ /dev/null @@ -1,20 +0,0 @@ -/* -Defines the base of where the OpenID Provider redirects its response to. - */ -var server_root = "https://openid-selector.googlecode.com/svn/trunk/" - -/* -On the server-side you'd accept an OpenID URL and perform discovery -on it to find out the actual OpenID endpoint to send the authentication -request to. On the client side it isn't possible to lookup the endpoint -from the target server due to XSS restrictions. The endpoint for each -provider is therefore cached in this static file. If an endpoint isn't -specified for a provider then authentication on the client side cannot -proceed. -*/ -var providers_endpoint = { - google: 'https://www.google.com/accounts/o8/ud', - yahoo: 'https://open.login.yahooapis.com/openid/op/auth', - aol: 'https://api.screenname.aol.com/auth/openidServer', - verisign: 'https://pip.verisignlabs.com/server' -} \ No newline at end of file diff --git a/samples/xml/openid/src/main/webapp/js/openid-client/openid-client.js b/samples/xml/openid/src/main/webapp/js/openid-client/openid-client.js deleted file mode 100644 index 63f4f75bf6..0000000000 --- a/samples/xml/openid/src/main/webapp/js/openid-client/openid-client.js +++ /dev/null @@ -1,63 +0,0 @@ -var claimedID; -var providerID; -var openIDPopup; - -function OpenID_iframe_then_popup_handler(provider, claimed) { - providerID = provider; - claimedID = claimed; - var immediateiframe = document.getElementById("openid_immediate_iframe"); - - var iframeurl = getBaseOpenIDProviderURL(providerID, claimedID, true); - - immediateiframe.innerHTML = ""; -} - -function processOpenIDImmediateResponse(responseURL) { - var immediateiframe = document.getElementById("openid_immediate_iframe"); - immediateiframe.innerHTML = responseURL; - - var failure = new RegExp("openid.mode=setup_needed"); - if(failure.test(responseURL)) { - var popupurl = getBaseOpenIDProviderURL(providerID, claimedID, false); - openIDPopup = window.open(popupurl, "OpenIDPopup"); - } else { - alert("Success without popup!"); - } -} - -function processOpenIDSetupResponse(responseURL) { - openIDPopup.close(); - - var results = ""; - var responseQuery = $.query.load(responseURL); - $.each(responseQuery.get(), function(key, value) { - results += "
    " + key + "=" + value; - }); - - document.getElementById("openid_status").innerHTML = "
    Result of authentication is: " + results; -} - -function getBaseOpenIDProviderURL(provider, claimed, immediate) { - var providerEndpoint = providers_endpoint[provider]; - var providerURL = providerEndpoint; //From previous discovery - providerURL += "?"; - providerURL += "openid.ns=" + encodeURIComponent("https://specs.openid.net/auth/2.0"); - if(providers[provider].label) { - providerURL += "&openid.claimed_id=" + encodeURIComponent(claimed); - providerURL += "&openid.identity=" + encodeURIComponent(claimed); - } - else { - providerURL += "&openid.claimed_id=" + encodeURIComponent("https://specs.openid.net/auth/2.0/identifier_select"); - providerURL += "&openid.identity=" + encodeURIComponent("https://specs.openid.net/auth/2.0/identifier_select"); - } - if(immediate) { - providerURL += "&openid.return_to=" + encodeURIComponent(server_root + "openid-client/checkid_immediate_response.html"); - providerURL += "&openid.realm=" + encodeURIComponent(server_root + "openid-client/checkid_immediate_response.html"); - providerURL += "&openid.mode=checkid_immediate"; - } else { - providerURL += "&openid.return_to=" + encodeURIComponent(server_root + "openid-client/checkid_setup_response.html"); - providerURL += "&openid.realm=" + encodeURIComponent(server_root + "openid-client/checkid_setup_response.html"); - providerURL += "&openid.mode=checkid_setup"; - } - return providerURL; -} \ No newline at end of file diff --git a/samples/xml/openid/src/main/webapp/js/openid-jquery.js b/samples/xml/openid/src/main/webapp/js/openid-jquery.js deleted file mode 100644 index e64a7ea90a..0000000000 --- a/samples/xml/openid/src/main/webapp/js/openid-jquery.js +++ /dev/null @@ -1,240 +0,0 @@ -/* -Simple OpenID Plugin -https://code.google.com/p/openid-selector/ - -This code is licenced under the New BSD License. -*/ - -var providers_large = { - google: { - name: 'Google', - url: 'https://www.google.com/accounts/o8/id' - }, - yahoo: { - name: 'Yahoo', - url: 'https://me.yahoo.com/' - }, - aol: { - name: 'AOL', - label: 'Enter your AOL screenname.', - url: 'https://openid.aol.com/{username}' - }, - verisign: { - name: 'Verisign', - label: 'Your Verisign username', - url: 'http://{username}.pip.verisignlabs.com/' - }, - openid: { - name: 'OpenID', - label: 'Enter your OpenID.', - url: null - } -}; -var providers_small = { - myopenid: { - name: 'MyOpenID', - label: 'Enter your MyOpenID username.', - url: 'http://{username}.myopenid.com/' - }, - livejournal: { - name: 'LiveJournal', - label: 'Enter your Livejournal username.', - url: 'http://{username}.livejournal.com/' - }, - flickr: { - name: 'Flickr', - label: 'Enter your Flickr username.', - url: 'https://flickr.com/{username}/' - }, - technorati: { - name: 'Technorati', - label: 'Enter your Technorati username.', - url: 'https://technorati.com/people/technorati/{username}/' - }, - wordpress: { - name: 'Wordpress', - label: 'Enter your Wordpress.com username.', - url: 'http://{username}.wordpress.com/' - }, - blogger: { - name: 'Blogger', - label: 'Your Blogger account', - url: 'http://{username}.blogspot.com/' - }, - vidoop: { - name: 'Vidoop', - label: 'Your Vidoop username', - url: 'http://{username}.myvidoop.com/' - }, - claimid: { - name: 'ClaimID', - label: 'Your ClaimID username', - url: 'https://claimid.com/{username}' - } -}; -var providers = $.extend({}, providers_large, providers_small); - -var openid = { - - demo: false, - ajaxHandler: null, - cookie_expires: 6*30, // 6 months. - cookie_name: 'openid_provider', - cookie_path: '/', - - img_path: 'images/', - - input_id: null, - provider_url: null, - provider_id: null, - - init: function(input_id) { - - var openid_btns = $('#openid_btns'); - - this.input_id = input_id; - - $('#openid_choice').show(); - $('#openid_input_area').empty(); - - // add box for each provider - for (id in providers_large) { - - openid_btns.append(this.getBoxHTML(providers_large[id], 'large', '.gif')); - } - if (providers_small) { - openid_btns.append('
    '); - - for (id in providers_small) { - - openid_btns.append(this.getBoxHTML(providers_small[id], 'small', '.ico')); - } - } - - $('#openid_form').submit(this.submit); - - var box_id = this.readCookie(); - if (box_id) { - this.signin(box_id, true); - } - }, - getBoxHTML: function(provider, box_size, image_ext) { - - var box_id = provider["name"].toLowerCase(); - return ''; - - }, - /* Provider image click */ - signin: function(box_id, onload) { - - var provider = providers[box_id]; - if (! provider) { - return; - } - - this.highlight(box_id); - this.setCookie(box_id); - - this.provider_id = box_id; - this.provider_url = provider['url']; - - // prompt user for input? - if (provider['label']) { - this.useInputBox(provider); - } else { - $('#openid_input_area').empty(); - if (! onload) { - $('#openid_form').submit(); - } - } - }, - /* Sign-in button click */ - submit: function() { - - var url = openid.provider_url; - if (url) { - url = url.replace('{username}', $('#openid_username').val()); - openid.setOpenIdUrl(url); - } - if(openid.ajaxHandler) { - openid.ajaxHandler(openid.provider_id, document.getElementById(openid.input_id).value); - return false; - } - if(openid.demo) { - alert("In client demo mode. Normally would have submitted OpenID:\r\n" + document.getElementById(openid.input_id).value); - return false; - } - return true; - }, - setOpenIdUrl: function (url) { - - var hidden = document.getElementById(this.input_id); - if (hidden != null) { - hidden.value = url; - } else { - $('#openid_form').append(''); - } - }, - highlight: function (box_id) { - - // remove previous highlight. - var highlight = $('#openid_highlight'); - if (highlight) { - highlight.replaceWith($('#openid_highlight a')[0]); - } - // add new highlight. - $('.'+box_id).wrap('
    '); - }, - setCookie: function (value) { - - var date = new Date(); - date.setTime(date.getTime()+(this.cookie_expires*24*60*60*1000)); - var expires = "; expires="+date.toGMTString(); - - document.cookie = this.cookie_name+"="+value+expires+"; path=" + this.cookie_path; - }, - readCookie: function () { - var nameEQ = this.cookie_name + "="; - var ca = document.cookie.split(';'); - for(var i=0;i < ca.length;i++) { - var c = ca[i]; - while (c.charAt(0)==' ') c = c.substring(1,c.length); - if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); - } - return null; - }, - useInputBox: function (provider) { - - var input_area = $('#openid_input_area'); - - var html = ''; - var id = 'openid_username'; - var value = ''; - var label = provider['label']; - var style = ''; - - if (label) { - html = '

    ' + label + '

    '; - } - if (provider['name'] == 'OpenID') { - id = this.input_id; - value = 'http://'; - style = 'background:#FFF url('+this.img_path+'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;'; - } - html += '' + - ''; - - input_area.empty(); - input_area.append(html); - - $('#'+id).focus(); - }, - setDemoMode: function (demoMode) { - this.demo = demoMode; - }, - setAjaxHandler: function (ajaxFunction) { - this.ajaxHandler = ajaxFunction; - } -}; diff --git a/samples/xml/openid/src/main/webapp/openidlogin.jsp b/samples/xml/openid/src/main/webapp/openidlogin.jsp deleted file mode 100644 index 6f719ca9b9..0000000000 --- a/samples/xml/openid/src/main/webapp/openidlogin.jsp +++ /dev/null @@ -1,71 +0,0 @@ -<%@ taglib prefix='c' uri='http://java.sun.com/jsp/jstl/core' %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - - - - OpenID Login - - - - - - - - - - - - - - -

    -NOTE: The OpenID 1.0 and 2.0 protocols have been deprecated and users are -encouraged to migrate -to OpenID Connect, which is supported by spring-security-oauth2. -

    - - - - Your login attempt was not successful, try again.

    - Reason: . -     -     - - - - - -
    - Sign-in or Create New Account - -
    -

    Please click your account provider:

    -
    - -
    - -
    - - -
    - -
    -     - - - - diff --git a/samples/xml/preauth/realm.properties b/samples/xml/preauth/realm.properties deleted file mode 100644 index 91ec2184ec..0000000000 --- a/samples/xml/preauth/realm.properties +++ /dev/null @@ -1,3 +0,0 @@ -rod: koala,ROLE_SUPERVISOR,ROLE_USER -bob: bobspassword,ROLE_USER -user: password \ No newline at end of file diff --git a/samples/xml/preauth/spring-security-samples-xml-preauth.gradle b/samples/xml/preauth/spring-security-samples-xml-preauth.gradle deleted file mode 100644 index 6645d9e605..0000000000 --- a/samples/xml/preauth/spring-security-samples-xml-preauth.gradle +++ /dev/null @@ -1,16 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - providedCompile 'javax.servlet:javax.servlet-api' - - runtime project(':spring-security-config') - runtime project(':spring-security-web') - runtime slf4jDependencies - - testCompile project(':spring-security-config') - testCompile project(':spring-security-web') -} - -//jettyRun { -// userRealms = [jettyRun.class.classLoader.loadClass('org.mortbay.jetty.security.HashUserRealm').newInstance('Preauth Realm' '$projectDir/realm.properties')] -//} diff --git a/samples/xml/preauth/src/main/resources/logback.xml b/samples/xml/preauth/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/xml/preauth/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml deleted file mode 100644 index b9d5ed061d..0000000000 --- a/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml b/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 5bac977c9f..0000000000 --- a/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - Spring Security Preauthentication Demo Application - - - - contextConfigLocation - - /WEB-INF/applicationContext-security.xml - - - - - filterChainProxy - org.springframework.web.filter.DelegatingFilterProxy - - - - filterChainProxy - /* - - - - - org.springframework.web.context.ContextLoaderListener - - - - BASIC - Preauth Realm - - - - ROLE_USER - - - ROLE_SUPERVISOR - - - - All areas - /* - - - ROLE_USER - - - - diff --git a/samples/xml/preauth/src/main/webapp/index.jsp b/samples/xml/preauth/src/main/webapp/index.jsp deleted file mode 100644 index c815d484a3..0000000000 --- a/samples/xml/preauth/src/main/webapp/index.jsp +++ /dev/null @@ -1,11 +0,0 @@ - - -

    Home Page

    -

    Anyone can view this page.

    - -

    Your principal object is....: <%= request.getUserPrincipal() %>

    - -

    Secure page

    -

    Extremely secure page

    - - \ No newline at end of file diff --git a/samples/xml/preauth/src/main/webapp/secure/extreme/index.jsp b/samples/xml/preauth/src/main/webapp/secure/extreme/index.jsp deleted file mode 100644 index a2c81f204f..0000000000 --- a/samples/xml/preauth/src/main/webapp/secure/extreme/index.jsp +++ /dev/null @@ -1,10 +0,0 @@ - - - -

    VERY Secure Page

    -This is a protected page. You can only see me if you are a supervisor. - -

    Home -

    Logout - - \ No newline at end of file diff --git a/samples/xml/preauth/src/main/webapp/secure/index.jsp b/samples/xml/preauth/src/main/webapp/secure/index.jsp deleted file mode 100644 index 4fc9f78277..0000000000 --- a/samples/xml/preauth/src/main/webapp/secure/index.jsp +++ /dev/null @@ -1,15 +0,0 @@ - - -

    Secure Page

    -This is a protected page. You can get to me if you've been remembered, -or if you've authenticated this session.

    - -<%if (request.isUserInRole("ROLE_SUPERVISOR")) { %> - You are a supervisor! You can therefore see the extremely secure page.

    -<% } %> - - -

    Home -

    Logout - - \ No newline at end of file diff --git a/samples/xml/preauth/src/test/java/sample/PreAuthXmlTests.java b/samples/xml/preauth/src/test/java/sample/PreAuthXmlTests.java deleted file mode 100644 index d5875080c6..0000000000 --- a/samples/xml/preauth/src/test/java/sample/PreAuthXmlTests.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 sample; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.web.FilterChainProxy; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -/** - * @author Rob Winch - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration("file:src/main/webapp/WEB-INF/applicationContext-security.xml") -@WebAppConfiguration -public class PreAuthXmlTests { - @Autowired - FilterChainProxy filterChainProxy; - - @Test - public void configLoads() {} -} diff --git a/samples/xml/preauth/src/test/resources/logback-test.xml b/samples/xml/preauth/src/test/resources/logback-test.xml deleted file mode 100644 index 2d51ba4180..0000000000 --- a/samples/xml/preauth/src/test/resources/logback-test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - diff --git a/samples/xml/servletapi/spring-security-samples-xml-servletapi.gradle b/samples/xml/servletapi/spring-security-samples-xml-servletapi.gradle deleted file mode 100644 index e3a9e76e1d..0000000000 --- a/samples/xml/servletapi/spring-security-samples-xml-servletapi.gradle +++ /dev/null @@ -1,21 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-core') - compile project(':spring-security-web') - compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api' - compile 'org.springframework:spring-beans' - compile 'org.springframework:spring-context' - compile 'org.springframework:spring-web' - compile 'org.springframework:spring-webmvc' - - providedCompile 'javax.servlet:javax.servlet-api' - - runtime project(':spring-security-config') - runtime project(':spring-security-taglibs') - runtime jstlDependencies - runtime slf4jDependencies - runtime 'org.springframework:spring-context-support' -} - -eclipse.wtp.component.contextPath = 'servletapi' diff --git a/samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java b/samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java deleted file mode 100644 index f635fb2f25..0000000000 --- a/samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.servletapi.mvc; - -/** - * - * @author Rob Winch - * - */ -public class LoginForm { - private String username; - private String password; - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } -} \ No newline at end of file diff --git a/samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java b/samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java deleted file mode 100644 index bdfd1a6988..0000000000 --- a/samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java +++ /dev/null @@ -1,211 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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.samples.servletapi.mvc; - -import java.io.IOException; -import java.security.Principal; - -import javax.naming.AuthenticationException; -import javax.servlet.AsyncContext; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContext; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.web.access.ExceptionTranslationFilter; -import org.springframework.stereotype.Controller; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -/** - * A Spring MVC Controller that demonstrates Spring Security's integration with the - * standard Servlet API's. Specifically it demonstrates the following: - *

      - *
    • {@link #authenticate(HttpServletRequest, HttpServletResponse)} - Integration with - * {@link HttpServletRequest#authenticate(HttpServletResponse)}
      • - *
    • {@link #login(HttpServletRequest, HttpServletResponse, LoginForm, BindingResult)} - - * Integration with {@link HttpServletRequest#login(String, String)}
      • - *
    • {@link #logout(HttpServletRequest, HttpServletResponse, RedirectAttributes)} - Integration with - * {@link HttpServletRequest#logout()}
      • - *
    • {@link #remoteUser(HttpServletRequest)} - Integration with - * {@link HttpServletRequest#getRemoteUser()}
      • - *
    • {@link #userPrincipal(HttpServletRequest)} - Integration with - * {@link HttpServletRequest#getUserPrincipal()}
      • - *
    • {@link #authentication(Authentication)} - Spring MVC's ability to resolve the - * {@link Authentication} since it is found on - * {@link HttpServletRequest#getUserPrincipal()}
      • - *
    - * - * @author Rob Winch - * - */ -@Controller -public class ServletApiController { - /** - * Demonstrates that {@link HttpServletRequest#authenticate(HttpServletResponse)} will - * send the user to the log in page configured within Spring Security if the user is - * not already authenticated. - * - * @param request - * @param response - * @return - * @throws ServletException - * @throws IOException - */ - @RequestMapping("/authenticate") - public String authenticate(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - boolean authenticate = request.authenticate(response); - return authenticate ? "index" : null; - } - - /** - * Demonstrates that you can authenticate with Spring Security using - * {@link HttpServletRequest#login(String, String)}. - * - *

    - * If we fail to authenticate, a {@link ServletException} is thrown that wraps the - * original {@link AuthenticationException} from Spring Security. This means we can - * catch the {@link ServletException} to display the error message. Alternatively, we - * could allow the {@link ServletException} to propegate and Spring Security's - * {@link ExceptionTranslationFilter} would catch it and process it appropriately. - *

    - *

    - * In this method we choose to use Spring MVC's {@link ModelAttribute} to make things - * easier for our form. However, this is not necessary. We could have just as easily - * obtained the request parameters from the {@link HttpServletRequest} object. - * Remember all of these examples would work in a standard {@link Servlet} or anything - * with access to the {@link HttpServletRequest} and {@link HttpServletResponse}. - *

    - * - * @param request - * @param response - * @param loginForm - * @param result - * @return - */ - @RequestMapping(value = "/login", method = RequestMethod.POST) - public String login(HttpServletRequest request, HttpServletResponse response, - @ModelAttribute LoginForm loginForm, BindingResult result) { - try { - request.login(loginForm.getUsername(), loginForm.getPassword()); - } - catch (ServletException authenticationFailed) { - result.rejectValue(null, "authentication.failed", - authenticationFailed.getMessage()); - return "login"; - } - return "redirect:/"; - } - - /** - * Demonstrates that invoking {@link HttpServletRequest#logout()} will log the user - * out. Note that the response does not get processed, so you need to write something - * to the response. - * @param request - * @param response - * @param redirect - * @return - * @throws ServletException - */ - @RequestMapping("/logout") - public String logout(HttpServletRequest request, HttpServletResponse response, - RedirectAttributes redirect) throws ServletException { - request.logout(); - return "redirect:/"; - } - - /** - * Demonstrates Spring Security with {@link AsyncContext#start(Runnable)}. Spring - * Security will automatically transfer the {@link SecurityContext} from the thread - * that {@link AsyncContext#start(Runnable)} is invoked to the new Thread that invokes - * the {@link Runnable}. - * @param request - * @param response - */ - @RequestMapping("/async") - public void asynch(HttpServletRequest request, HttpServletResponse response) { - final AsyncContext async = request.startAsync(); - async.start(() -> { - Authentication authentication = SecurityContextHolder.getContext() - .getAuthentication(); - try { - final HttpServletResponse asyncResponse = (HttpServletResponse) async - .getResponse(); - asyncResponse.setStatus(HttpServletResponse.SC_OK); - asyncResponse.getWriter().write(String.valueOf(authentication)); - async.complete(); - } - catch (Exception e) { - throw new RuntimeException(e); - } - }); - } - - /** - * Demonstrates that Spring Security automatically populates - * {@link HttpServletRequest#getRemoteUser()} with the current username. - * @param request - * @return - */ - @ModelAttribute("remoteUser") - public String remoteUser(HttpServletRequest request) { - return request.getRemoteUser(); - } - - /** - * Demonstrates that Spring Security automatically populates - * {@link HttpServletRequest#getUserPrincipal()} with the {@link Authentication} that - * is present on {@link SecurityContextHolder#getContext()} - * @param request - * @return - */ - @ModelAttribute("userPrincipal") - public Principal userPrincipal(HttpServletRequest request) { - return request.getUserPrincipal(); - } - - /** - * Spring MVC will automatically resolve any object that implements {@link Principal} - * using {@link HttpServletRequest#getUserPrincipal()}. This means you can easily - * resolve the {@link Authentication} just by adding it as an argument to your MVC - * controller. Alternatively, you could also have an argument of type - * {@link Principal} which would not couple your controller to Spring Security. - * @param authentication - * @return - */ - @ModelAttribute - public Authentication authentication(Authentication authentication) { - return authentication; - } - - @RequestMapping("/") - public String welcome() { - return "index"; - } - - @RequestMapping(value = "/login", method = RequestMethod.GET) - public String login(@ModelAttribute LoginForm loginForm) { - return "login"; - } -} diff --git a/samples/xml/servletapi/src/main/resources/applicationContext-security.xml b/samples/xml/servletapi/src/main/resources/applicationContext-security.xml deleted file mode 100644 index cdaef7ea0f..0000000000 --- a/samples/xml/servletapi/src/main/resources/applicationContext-security.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/samples/xml/servletapi/src/main/resources/logback.xml b/samples/xml/servletapi/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/xml/servletapi/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml b/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml deleted file mode 100644 index c8962958fb..0000000000 --- a/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/samples/xml/servletapi/src/main/webapp/WEB-INF/views/index.jsp b/samples/xml/servletapi/src/main/webapp/WEB-INF/views/index.jsp deleted file mode 100644 index 8d829bf930..0000000000 --- a/samples/xml/servletapi/src/main/webapp/WEB-INF/views/index.jsp +++ /dev/null @@ -1,44 +0,0 @@ -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - -Welcome - - -

    Home Page

    -

    - Anyone can view this page. -

    - - - -

    You are currently authenticated

    -
    -
    HttpServletRequest.getRemoteUser()
    -
    -
    HttpServletRequest.getUserPrincipal()
    -
    -
    Authentication
    -
    -
    -     - - - diff --git a/samples/xml/servletapi/src/main/webapp/WEB-INF/views/login.jsp b/samples/xml/servletapi/src/main/webapp/WEB-INF/views/login.jsp deleted file mode 100644 index 671a34634e..0000000000 --- a/samples/xml/servletapi/src/main/webapp/WEB-INF/views/login.jsp +++ /dev/null @@ -1,26 +0,0 @@ -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - -Please Log In - - -

    Please Log In

    -

    This page demonstrates the use of HttpServletRequest.login(String,String) integration with Spring Security.

    - - -

    - - -

    -

    - - -

    -

    - -

    -     - - diff --git a/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml b/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index f9baaac4d9..0000000000 --- a/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - contextConfigLocation - - classpath:applicationContext-security.xml - - - - - - - webAppRootKey - servletapi.root - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - true - - - - springSecurityFilterChain - /* - REQUEST - ASYNC - - - - - org.springframework.web.context.ContextLoaderListener - - - - spring - org.springframework.web.servlet.DispatcherServlet - 1 - true - - - spring - / - - diff --git a/samples/xml/tutorial/readme.txt b/samples/xml/tutorial/readme.txt deleted file mode 100644 index bfa6a48f5d..0000000000 --- a/samples/xml/tutorial/readme.txt +++ /dev/null @@ -1,10 +0,0 @@ -This is the most basic sample web application for Spring Security. - -If you have gradle installed, you can run the application directly from the checked out source tree, using the command - -gradle jettyRun - -This will start jetty on port 8080, with SSL support on port 8443. - -The 'scripts' directory contains simple Unix command-line scripts for exercising the application and displaying the results. - diff --git a/samples/xml/tutorial/scripts/exec-list-as-peter b/samples/xml/tutorial/scripts/exec-list-as-peter deleted file mode 100755 index 04e85f122f..0000000000 --- a/samples/xml/tutorial/scripts/exec-list-as-peter +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -rm -rf work -mkdir work -wget --http-user=peter --http-password=opal --directory-prefix=work --output-file=work/log.txt http://localhost:8080/spring-security-samples-tutorial/listAccounts.html -cat -n work/* | less diff --git a/samples/xml/tutorial/scripts/exec-list-as-rod b/samples/xml/tutorial/scripts/exec-list-as-rod deleted file mode 100755 index 84d5549cee..0000000000 --- a/samples/xml/tutorial/scripts/exec-list-as-rod +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -rm -rf work -mkdir work -wget --http-user=rod --http-password=koala --directory-prefix=work --output-file=work/log.txt http://localhost:8080/spring-security-samples-tutorial/listAccounts.html -cat -n work/* | less diff --git a/samples/xml/tutorial/scripts/exec-list-no-auth b/samples/xml/tutorial/scripts/exec-list-no-auth deleted file mode 100755 index 343bcfcf6c..0000000000 --- a/samples/xml/tutorial/scripts/exec-list-no-auth +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -rm -rf work -mkdir work -wget --directory-prefix=work --output-file=work/log.txt http://localhost:8080/spring-security-samples-tutorial/listAccounts.html -cat -n work/* | less diff --git a/samples/xml/tutorial/scripts/exec-list-wrong-password b/samples/xml/tutorial/scripts/exec-list-wrong-password deleted file mode 100755 index 426f98db57..0000000000 --- a/samples/xml/tutorial/scripts/exec-list-wrong-password +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -rm -rf work -mkdir work -wget --http-user=rod --http-password=WRONG-PASSWORD --directory-prefix=work --output-file=work/log.txt http://localhost:8080/spring-security-samples-tutorial/listAccounts.html -cat -n work/* | less diff --git a/samples/xml/tutorial/scripts/exec-post-as-peter b/samples/xml/tutorial/scripts/exec-post-as-peter deleted file mode 100755 index ab4b7f03b3..0000000000 --- a/samples/xml/tutorial/scripts/exec-post-as-peter +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -rm -rf work -mkdir work -wget --http-user=peter --http-password=opal --directory-prefix=work --output-file=work/log.txt http://localhost:8080/spring-security-samples-tutorial/post.html?id=1\&amount=5.00 -cat -n work/* | less diff --git a/samples/xml/tutorial/scripts/exec-post-as-rod b/samples/xml/tutorial/scripts/exec-post-as-rod deleted file mode 100755 index 7a9ce7f379..0000000000 --- a/samples/xml/tutorial/scripts/exec-post-as-rod +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -rm -rf work -mkdir work -wget --http-user=rod --http-password=koala --directory-prefix=work --output-file=work/log.txt http://localhost:8080/spring-security-samples-tutorial/post.html?id=1\&amount=5.00 -cat -n work/* | less diff --git a/samples/xml/tutorial/scripts/exec-post-no-auth b/samples/xml/tutorial/scripts/exec-post-no-auth deleted file mode 100755 index 7b702cb0a2..0000000000 --- a/samples/xml/tutorial/scripts/exec-post-no-auth +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -rm -rf work -mkdir work -wget --directory-prefix=work --output-file=work/log.txt http://localhost:8080/spring-security-samples-tutorial/post.html?id=1\&amount=5.00 -cat -n work/* | less diff --git a/samples/xml/tutorial/scripts/exec-post-wrong-password b/samples/xml/tutorial/scripts/exec-post-wrong-password deleted file mode 100755 index 17b64aa095..0000000000 --- a/samples/xml/tutorial/scripts/exec-post-wrong-password +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -rm -rf work -mkdir work -wget --http-user=rod --http-password=WRONG_PASSWORD --directory-prefix=work --output-file=work/log.txt http://localhost:8080/spring-security-samples-tutorial/post.html?id=1\&amount=5.00 -cat -n work/* | less diff --git a/samples/xml/tutorial/spring-security-samples-xml-tutorial.gradle b/samples/xml/tutorial/spring-security-samples-xml-tutorial.gradle deleted file mode 100644 index 8c520fdb2b..0000000000 --- a/samples/xml/tutorial/spring-security-samples-xml-tutorial.gradle +++ /dev/null @@ -1,16 +0,0 @@ -apply plugin: 'io.spring.convention.spring-sample-war' - -dependencies { - compile project(':spring-security-core') - compile slf4jDependencies - compile 'org.springframework:spring-beans' - compile 'org.springframework:spring-web' - compile 'org.springframework:spring-webmvc' - - providedCompile 'javax.servlet:javax.servlet-api' - - runtime project(':spring-security-config') - runtime project(':spring-security-taglibs') - runtime project(':spring-security-web') - runtime jstlDependencies -} diff --git a/samples/xml/tutorial/src/main/java/bigbank/Account.java b/samples/xml/tutorial/src/main/java/bigbank/Account.java deleted file mode 100644 index 438df6aa77..0000000000 --- a/samples/xml/tutorial/src/main/java/bigbank/Account.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 bigbank; - -/** - * Note this class does not represent best practice, as we are failing to encapsulate - * business logic (methods) and state in the domain object. Nevertheless, this demo is - * intended to reflect what people usually do, as opposed to what they ideally would be - * doing. - * - * @author Ben Alex - */ -public class Account { - private long id = -1; - private String holder; - private double balance; - private double overdraft = 100.00; - - public Account(String holder) { - this.holder = holder; - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getHolder() { - return holder; - } - - public void setHolder(String holder) { - this.holder = holder; - } - - public double getBalance() { - return balance; - } - - public void setBalance(double balance) { - this.balance = balance; - } - - public double getOverdraft() { - return overdraft; - } - - public void setOverdraft(double overdraft) { - this.overdraft = overdraft; - } - - @Override - public String toString() { - return "Account[id=" + id + ",balance=" + balance + ",holder=" + holder - + ", overdraft=" + overdraft + "]"; - } -} diff --git a/samples/xml/tutorial/src/main/java/bigbank/BankDao.java b/samples/xml/tutorial/src/main/java/bigbank/BankDao.java deleted file mode 100644 index 84ebc6c077..0000000000 --- a/samples/xml/tutorial/src/main/java/bigbank/BankDao.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 bigbank; - -public interface BankDao { - Account readAccount(Long id); - - void createOrUpdateAccount(Account account); - - Account[] findAccounts(); -} diff --git a/samples/xml/tutorial/src/main/java/bigbank/BankDaoStub.java b/samples/xml/tutorial/src/main/java/bigbank/BankDaoStub.java deleted file mode 100644 index 0a782379fd..0000000000 --- a/samples/xml/tutorial/src/main/java/bigbank/BankDaoStub.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 bigbank; - -import java.util.HashMap; -import java.util.Map; - -public class BankDaoStub implements BankDao { - private long id = 0; - private final Map accounts = new HashMap<>(); - - public void createOrUpdateAccount(Account account) { - if (account.getId() == -1) { - id++; - account.setId(id); - } - accounts.put(account.getId(), account); - System.out.println("SAVE: " + account); - } - - public Account[] findAccounts() { - Account[] accounts = this.accounts.values().toArray(new Account[] {}); - System.out.println("Returning " + accounts.length + " account(s):"); - for (Account account : accounts) { - System.out.println(" > " + account); - } - return accounts; - } - - public Account readAccount(Long id) { - return accounts.get(id); - } - -} diff --git a/samples/xml/tutorial/src/main/java/bigbank/BankService.java b/samples/xml/tutorial/src/main/java/bigbank/BankService.java deleted file mode 100644 index 5f76bb98f3..0000000000 --- a/samples/xml/tutorial/src/main/java/bigbank/BankService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 bigbank; - -import org.springframework.security.access.prepost.PreAuthorize; - -public interface BankService { - - Account readAccount(Long id); - - Account[] findAccounts(); - - @PreAuthorize("hasAuthority('supervisor') or " - + "hasAuthority('teller') and (#account.balance + #amount >= -#account.overdraft)") - Account post(Account account, double amount); -} diff --git a/samples/xml/tutorial/src/main/java/bigbank/BankServiceImpl.java b/samples/xml/tutorial/src/main/java/bigbank/BankServiceImpl.java deleted file mode 100644 index e12f22845a..0000000000 --- a/samples/xml/tutorial/src/main/java/bigbank/BankServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 bigbank; - -import org.springframework.util.Assert; - -public class BankServiceImpl implements BankService { - private final BankDao bankDao; - - public BankServiceImpl(BankDao bankDao) { - Assert.notNull(bankDao, "bankDao cannot be null"); - this.bankDao = bankDao; - } - - public Account[] findAccounts() { - return this.bankDao.findAccounts(); - } - - public Account post(Account account, double amount) { - Assert.notNull(account, "account cannot be null"); - - // We read account back from DAO so it reflects the latest balance - Account a = bankDao.readAccount(account.getId()); - if (a == null) { - throw new IllegalArgumentException("Couldn't find requested account"); - } - - a.setBalance(a.getBalance() + amount); - bankDao.createOrUpdateAccount(a); - return a; - } - - public Account readAccount(Long id) { - return bankDao.readAccount(id); - } -} diff --git a/samples/xml/tutorial/src/main/java/bigbank/SeedData.java b/samples/xml/tutorial/src/main/java/bigbank/SeedData.java deleted file mode 100644 index e4b15389e9..0000000000 --- a/samples/xml/tutorial/src/main/java/bigbank/SeedData.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 bigbank; - -import org.springframework.beans.factory.InitializingBean; -import org.springframework.util.Assert; - -public class SeedData implements InitializingBean { - private BankDao bankDao; - - public void afterPropertiesSet() { - Assert.notNull(bankDao, "bankDao cannot be null"); - bankDao.createOrUpdateAccount(new Account("rod")); - bankDao.createOrUpdateAccount(new Account("dianne")); - bankDao.createOrUpdateAccount(new Account("scott")); - bankDao.createOrUpdateAccount(new Account("peter")); - } - - public void setBankDao(BankDao bankDao) { - this.bankDao = bankDao; - } - -} diff --git a/samples/xml/tutorial/src/main/java/bigbank/web/ListAccounts.java b/samples/xml/tutorial/src/main/java/bigbank/web/ListAccounts.java deleted file mode 100644 index 7fd239b140..0000000000 --- a/samples/xml/tutorial/src/main/java/bigbank/web/ListAccounts.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 bigbank.web; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.util.Assert; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.Controller; - -import bigbank.BankService; - -public class ListAccounts implements Controller { - - private final BankService bankService; - - public ListAccounts(BankService bankService) { - Assert.notNull(bankService, "bankService cannot be null"); - this.bankService = bankService; - } - - public ModelAndView handleRequest(HttpServletRequest request, - HttpServletResponse response) { - // Security check (this is unnecessary if Spring Security is performing the - // authorization) - // if (request.getUserPrincipal() == null) { - // throw new - // AuthenticationCredentialsNotFoundException("You must login to view the account list (Spring Security message)"); - // // only for Spring Security managed authentication - // } - - // Actual business logic - ModelAndView mav = new ModelAndView("listAccounts"); - mav.addObject("accounts", bankService.findAccounts()); - return mav; - } - -} diff --git a/samples/xml/tutorial/src/main/java/bigbank/web/PostAccounts.java b/samples/xml/tutorial/src/main/java/bigbank/web/PostAccounts.java deleted file mode 100644 index e32ea4a0b7..0000000000 --- a/samples/xml/tutorial/src/main/java/bigbank/web/PostAccounts.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2002-2016 the original author or authors. - * - * 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 - * - * 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, - * 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 bigbank.web; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.util.Assert; -import org.springframework.web.bind.ServletRequestUtils; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.Controller; - -import bigbank.Account; -import bigbank.BankService; - -public class PostAccounts implements Controller { - - private final BankService bankService; - - public PostAccounts(BankService bankService) { - Assert.notNull(bankService, "bankService cannot be null"); - this.bankService = bankService; - } - - public ModelAndView handleRequest(HttpServletRequest request, - HttpServletResponse response) throws Exception { - // Security check (this is unnecessary if Spring Security is performing the - // authorization) - // if (!request.isUserInRole("ROLE_TELLER")) { - // throw new - // AccessDeniedException("You must be a teller to post transactions (Spring Security message)"); - // } - - // Actual business logic - Long id = ServletRequestUtils.getRequiredLongParameter(request, "id"); - Double amount = ServletRequestUtils.getRequiredDoubleParameter(request, "amount"); - Account a = bankService.readAccount(id); - bankService.post(a, amount); - - return new ModelAndView("redirect:listAccounts.html"); - } - -} diff --git a/samples/xml/tutorial/src/main/resources/applicationContext-business.xml b/samples/xml/tutorial/src/main/resources/applicationContext-business.xml deleted file mode 100644 index 34bc4502ad..0000000000 --- a/samples/xml/tutorial/src/main/resources/applicationContext-business.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/samples/xml/tutorial/src/main/resources/logback.xml b/samples/xml/tutorial/src/main/resources/logback.xml deleted file mode 100644 index 3ebbcc0ddd..0000000000 --- a/samples/xml/tutorial/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/samples/xml/tutorial/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/tutorial/src/main/webapp/WEB-INF/applicationContext-security.xml deleted file mode 100644 index 295a81d73b..0000000000 --- a/samples/xml/tutorial/src/main/webapp/WEB-INF/applicationContext-security.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/tutorial/src/main/webapp/WEB-INF/bank-servlet.xml b/samples/xml/tutorial/src/main/webapp/WEB-INF/bank-servlet.xml deleted file mode 100644 index 32ba61339d..0000000000 --- a/samples/xml/tutorial/src/main/webapp/WEB-INF/bank-servlet.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/samples/xml/tutorial/src/main/webapp/WEB-INF/jsp/listAccounts.jsp b/samples/xml/tutorial/src/main/webapp/WEB-INF/jsp/listAccounts.jsp deleted file mode 100644 index 74eaf5d3f7..0000000000 --- a/samples/xml/tutorial/src/main/webapp/WEB-INF/jsp/listAccounts.jsp +++ /dev/null @@ -1,58 +0,0 @@ -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> - - - - - - - - Accounts - - -
    - -

    Accounts

    -

    -Anyone can view this page, but posting to an Account requires login and must be authorized. Below are some users to try posting to Accounts with. -

    -
      -
    • rod/koala - can post to any Account
      • -
    • dianne/emu - can post to Accounts as long as the balance remains above the overdraft amount
      • -
    • scott/wombat - cannot post to any Accounts
      • -
    - -Home

    - - - - - - - - - - - - - - - - - - -
    IDHolderBalanceOverdraftOperations
    ${account.id}${account.holder}${account.balance}${account.overdraft} - -$20 - -$5 - +$5 - +$20 -
    - -

    -

    - - - -
    - - diff --git a/samples/xml/tutorial/src/main/webapp/WEB-INF/web.xml b/samples/xml/tutorial/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index adeb2030bd..0000000000 --- a/samples/xml/tutorial/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - Spring Security Tutorial Application - - - - contextConfigLocation - - classpath:applicationContext-business.xml - /WEB-INF/applicationContext-security.xml - - - - - webAppRootKey - tutorial.root - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - /* - - - - - org.springframework.web.context.ContextLoaderListener - - - - - org.springframework.security.web.session.HttpSessionEventPublisher - - - - - bank - org.springframework.web.servlet.DispatcherServlet - 1 - - - - bank - *.html - - - - index.jsp - - - diff --git a/samples/xml/tutorial/src/main/webapp/index.jsp b/samples/xml/tutorial/src/main/webapp/index.jsp deleted file mode 100644 index cf102f3111..0000000000 --- a/samples/xml/tutorial/src/main/webapp/index.jsp +++ /dev/null @@ -1,42 +0,0 @@ -<%@ page session="false" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> - - - - - - - - Home Page - - -
    -

    Home Page

    -

    -Anyone can view this page. -

    -

    -While anyone can also view the list accounts page, you must be authorized to post to an Account from the list accounts page. -

    -

    -Your principal object is....: <%= request.getUserPrincipal() %> -

    - -

    -You can currently access "/secure" URLs. -

    -     - -

    -You can currently access "/secure/extreme" URLs. -

    -     - -

    -Secure page

    -

    Extremely secure page

    -
    - - diff --git a/samples/xml/tutorial/src/main/webapp/loggedout.jsp b/samples/xml/tutorial/src/main/webapp/loggedout.jsp deleted file mode 100644 index 14063b04e1..0000000000 --- a/samples/xml/tutorial/src/main/webapp/loggedout.jsp +++ /dev/null @@ -1,20 +0,0 @@ -<%@page session="false" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - Logged Out - - -
    -

    Logged Out

    -

    -You have been logged out. Start again. -

    -
    - - diff --git a/samples/xml/tutorial/src/main/webapp/secure/extreme/index.jsp b/samples/xml/tutorial/src/main/webapp/secure/extreme/index.jsp deleted file mode 100644 index 6553fe6c84..0000000000 --- a/samples/xml/tutorial/src/main/webapp/secure/extreme/index.jsp +++ /dev/null @@ -1,29 +0,0 @@ -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - Secure Page - - -
    -

    VERY Secure Page

    -This is a protected page. You can only see me if you are a supervisor. - - -You have authority "supervisor" (this text is surrounded by <sec:authorize> tags). - - -

    Home

    - -
    - - - -
    - - diff --git a/samples/xml/tutorial/src/main/webapp/secure/index.jsp b/samples/xml/tutorial/src/main/webapp/secure/index.jsp deleted file mode 100644 index e41003a808..0000000000 --- a/samples/xml/tutorial/src/main/webapp/secure/index.jsp +++ /dev/null @@ -1,53 +0,0 @@ -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - Secure Page - - -
    - -

    Secure Page

    -

    -This is a protected page. You can get to me if you've been remembered, -or if you've authenticated this session. -

    -

    - - You are a supervisor! You can therefore see the extremely secure page.

    -     -

    -

    Properties obtained using <sec:authentication /> tag

    - - - - - - - - - - - - - - - - -
    TagValue
    <sec:authentication property='name' />
    <sec:authentication property='principal.username' />
    <sec:authentication property='principal.enabled' />
    <sec:authentication property='principal.accountNonLocked' />
    - - -

    Home

    - -
    - - - -
    - - diff --git a/samples/xml/tutorial/src/main/webapp/static/css/tutorial.css b/samples/xml/tutorial/src/main/webapp/static/css/tutorial.css deleted file mode 100644 index 4d98a2a9da..0000000000 --- a/samples/xml/tutorial/src/main/webapp/static/css/tutorial.css +++ /dev/null @@ -1,13 +0,0 @@ - -body { - font-family:"Palatino Linotype","Book Antiqua",Palatino,serif; -} - -#content { - margin: 5em auto; - width: 40em; -} - -.securityHiddenUI, .securityHiddenUI * { - background-color: #ff4500; -} diff --git a/samples/xml/tutorial/src/main/webapp/timeout.jsp b/samples/xml/tutorial/src/main/webapp/timeout.jsp deleted file mode 100644 index e699a3b2bc..0000000000 --- a/samples/xml/tutorial/src/main/webapp/timeout.jsp +++ /dev/null @@ -1,20 +0,0 @@ -<%@page session="false" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - Session Timeout - - -
    -

    Invalid Session

    - -

    -Your session appears to have timed out. Please start again. -

    -
    - -
    -
    -
    -
    - - - - - - - - Spring Security Sample -
    - - - -

    - -

    -     - -
    -
    -
    -
    - -
    - -
    - -
    -