From 87a52ffbfdb481d754ae0eb4609c561a08a4d6e5 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 8 Dec 2014 13:18:45 -0600 Subject: [PATCH] SEC-2784: Update to Gradle 2.2.1 --- build.gradle | 5 +- .../main/groovy/aspectj/AspectJPlugin.groovy | 8 +- .../src/main/groovy/emma/EmmaPlugin.groovy | 4 +- .../src/main/groovy/trang/TrangPlugin.groovy | 2 +- .../config/doc/XsdDocumentedTests.groovy | 2 +- docs/docs.gradle | 6 +- docs/guides/build.gradle | 2 +- docs/manual/src/asciidoc/faq.adoc | 463 ------------------ docs/manual/src/{ => docs}/asciidoc/Guardfile | 0 .../src/docs/asciidoc/_includes/content.adoc | 9 + .../asciidoc/images/Authentication.gif | Bin .../images/access-decision-voting.graffle | Bin .../images/access-decision-voting.png | Bin .../asciidoc/images/after-invocation.graffle | Bin .../asciidoc/images/after-invocation.png | Bin .../src/{ => docs}/asciidoc/images/note.png | Bin .../asciidoc/images/s2-banner-rhs.png | Bin .../asciidoc/images/s2_box_logo.png | Bin .../images/security-interception.graffle | Bin .../asciidoc/images/security-interception.png | Bin .../src/{ => docs}/asciidoc/images/tip.png | Bin .../manual/src/{ => docs}/asciidoc/index.adoc | 8 +- gradle/maven-deployment.gradle | 39 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 24 files changed, 48 insertions(+), 502 deletions(-) delete mode 100644 docs/manual/src/asciidoc/faq.adoc rename docs/manual/src/{ => docs}/asciidoc/Guardfile (100%) create mode 100644 docs/manual/src/docs/asciidoc/_includes/content.adoc rename docs/manual/src/{ => docs}/asciidoc/images/Authentication.gif (100%) rename docs/manual/src/{ => docs}/asciidoc/images/access-decision-voting.graffle (100%) rename docs/manual/src/{ => docs}/asciidoc/images/access-decision-voting.png (100%) rename docs/manual/src/{ => docs}/asciidoc/images/after-invocation.graffle (100%) rename docs/manual/src/{ => docs}/asciidoc/images/after-invocation.png (100%) rename docs/manual/src/{ => docs}/asciidoc/images/note.png (100%) rename docs/manual/src/{ => docs}/asciidoc/images/s2-banner-rhs.png (100%) rename docs/manual/src/{ => docs}/asciidoc/images/s2_box_logo.png (100%) rename docs/manual/src/{ => docs}/asciidoc/images/security-interception.graffle (100%) rename docs/manual/src/{ => docs}/asciidoc/images/security-interception.png (100%) rename docs/manual/src/{ => docs}/asciidoc/images/tip.png (100%) rename docs/manual/src/{ => docs}/asciidoc/index.adoc (99%) diff --git a/build.gradle b/build.gradle index 330fb1f6ba..0cdc1b2eed 100644 --- a/build.gradle +++ b/build.gradle @@ -5,12 +5,11 @@ buildscript { maven { url "https://repo.spring.io/plugins-release" } } dependencies { - classpath("org.springframework.build.gradle:propdeps-plugin:0.0.6") + classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7") classpath("org.springframework.build.gradle:spring-io-plugin:0.0.3.RELEASE") classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3") classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1') - classpath('org.asciidoctor:asciidoctor-gradle-plugin:0.7.0') - classpath('org.asciidoctor:asciidoctor-java-integration:0.1.4.preview.1') + classpath('org.asciidoctor:asciidoctor-gradle-plugin:1.5.1') } } diff --git a/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy b/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy index 1396ab5ea8..5be354aed3 100644 --- a/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy +++ b/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy @@ -30,7 +30,7 @@ class AspectJPlugin implements Plugin { } if (project.configurations.findByName('ajtools') == null) { - project.configurations.add('ajtools') + project.configurations.create('ajtools') project.dependencies { ajtools "org.aspectj:aspectjtools:${project.aspectjVersion}" optional "org.aspectj:aspectjrt:${project.aspectjVersion}" @@ -38,10 +38,10 @@ class AspectJPlugin implements Plugin { } if (project.configurations.findByName('aspectpath') == null) { - project.configurations.add('aspectpath') + project.configurations.create('aspectpath') } - project.tasks.add(name: 'compileAspect', overwrite: true, description: 'Compiles AspectJ Source', type: Ajc) { + project.tasks.create(name: 'compileAspect', overwrite: true, description: 'Compiles AspectJ Source', type: Ajc) { dependsOn project.configurations*.getTaskDependencyFromProjectDependency(true, "compileJava") dependsOn project.processResources @@ -54,7 +54,7 @@ class AspectJPlugin implements Plugin { project.tasks.compileJava.dependsOn project.tasks.compileAspect - project.tasks.add(name: 'compileTestAspect', overwrite: true, description: 'Compiles AspectJ Test Source', type: Ajc) { + project.tasks.create(name: 'compileTestAspect', overwrite: true, description: 'Compiles AspectJ Test Source', type: Ajc) { dependsOn project.processTestResources, project.compileJava, project.jar sourceSet = project.sourceSets.test inputs.files(sourceSet.allSource) diff --git a/buildSrc/src/main/groovy/emma/EmmaPlugin.groovy b/buildSrc/src/main/groovy/emma/EmmaPlugin.groovy index f325019468..e79202efee 100644 --- a/buildSrc/src/main/groovy/emma/EmmaPlugin.groovy +++ b/buildSrc/src/main/groovy/emma/EmmaPlugin.groovy @@ -21,7 +21,7 @@ class EmmaPlugin implements Plugin { def emmaCoverageFile = "${rootProject.buildDir}/emma/emma.ec" if (project.configurations.findByName('emma_rt') == null) { - project.configurations.add('emma_rt') + project.configurations.create('emma_rt') project.dependencies { emma_rt 'emma:emma:2.0.5312' } @@ -64,7 +64,7 @@ class EmmaPlugin implements Plugin { CoverageReport task; if (reportTasks.isEmpty()) { - task = rootProject.tasks.add('coverageReport', CoverageReport.class); + task = rootProject.tasks.create('coverageReport', CoverageReport.class); task.dataPath = [emmaMetaDataFile, emmaCoverageFile]; } else { task = reportTasks[0]; diff --git a/buildSrc/src/main/groovy/trang/TrangPlugin.groovy b/buildSrc/src/main/groovy/trang/TrangPlugin.groovy index 83bdb11fc7..198630f9cd 100644 --- a/buildSrc/src/main/groovy/trang/TrangPlugin.groovy +++ b/buildSrc/src/main/groovy/trang/TrangPlugin.groovy @@ -17,7 +17,7 @@ import org.gradle.api.file.FileCollection */ class TrangPlugin implements Plugin { public void apply(Project project) { - Task rncToXsd = project.tasks.add('rncToXsd', RncToXsd.class) + Task rncToXsd = project.tasks.create('rncToXsd', RncToXsd.class) rncToXsd.description = 'Converts .rnc to .xsd' rncToXsd.group = 'Build' } diff --git a/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedTests.groovy b/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedTests.groovy index db4c02ceb6..cb5171566a 100644 --- a/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedTests.groovy +++ b/config/src/test/groovy/org/springframework/security/config/doc/XsdDocumentedTests.groovy @@ -30,7 +30,7 @@ import spock.lang.* class XsdDocumentedTests extends Specification { def ignoredIds = ['nsa-any-user-service','nsa-any-user-service-parents','nsa-authentication','nsa-message-security','nsa-ldap','nsa-method-security','nsa-web'] - @Shared def reference = new File('../docs/manual/src/asciidoc/index.adoc') + @Shared def reference = new File('../docs/manual/src/docs/asciidoc/index.adoc') @Shared File schema31xDocument = new File('src/main/resources/org/springframework/security/config/spring-security-3.1.xsd') @Shared File schemaDocument = new File('src/main/resources/org/springframework/security/config/spring-security-4.0.xsd') diff --git a/docs/docs.gradle b/docs/docs.gradle index f56302045c..d6063772f1 100644 --- a/docs/docs.gradle +++ b/docs/docs.gradle @@ -7,10 +7,14 @@ task docs { project('manual') { apply plugin: 'base' - apply plugin: 'asciidoctor' + apply plugin: 'org.asciidoctor.gradle.asciidoctor' ext.expandPlaceholders = "" + asciidoctorj { + version = '1.5.2' + } + asciidoctor { options = [ eruby: 'erubis', diff --git a/docs/guides/build.gradle b/docs/guides/build.gradle index bab74cf7cb..8d91cb9726 100644 --- a/docs/guides/build.gradle +++ b/docs/guides/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'asciidoctor' +apply plugin: 'org.asciidoctor.gradle.asciidoctor' asciidoctor { baseDir = file('src/asciidoc') diff --git a/docs/manual/src/asciidoc/faq.adoc b/docs/manual/src/asciidoc/faq.adoc deleted file mode 100644 index 17b2c74ee0..0000000000 --- a/docs/manual/src/asciidoc/faq.adoc +++ /dev/null @@ -1,463 +0,0 @@ -= Spring Security FAQ - -== General Questions - -. <> -. <> -. <> -. <> - - -[[faq-other-concerns]] -=== Will Spring Security take care of all my application security requirements? - -Spring Security provides you with a very flexible framework for your authentication and authorization requirements, but there are many other considerations for building a secure application that are outside its scope. Web applications are vulnerable to all kinds of attacks which you should be familiar with, preferably before you start development so you can design and code with them in mind from the beginning. Check out thehttp://www.owasp.org/[OWASP web site] for information on the major issues facing web application developers and the countermeasures you can use against them. - - -[[faq-web-xml]] -=== Why not just use web.xml security? - -Let's assume you're developing an enterprise application based on Spring. There are four security concerns you typically need to address: authentication, web request security, service layer security (i.e. your methods that implement business logic), and domain object instance security (i.e. different domain objects have different permissions). With these typical requirements in mind: - -. __Authentication__: The servlet specification provides an approach to authentication. However, you will need to configure the container to perform authentication which typically requires editing of container-specific "realm" settings. This makes a non-portable configuration, and if you need to write an actual Java class to implement the container's authentication interface, it becomes even more non-portable. With Spring Security you achieve complete portability - right down to the WAR level. Also, Spring Security offers a choice of production-proven authentication providers and mechanisms, meaning you can switch your authentication approaches at deployment time. This is particularly valuable for software vendors writing products that need to work in an unknown target environment. - -. __Web request security:__ The servlet specification provides an approach to secure your request URIs. However, these URIs can only be expressed in the servlet specification's own limited URI path format. Spring Security provides a far more comprehensive approach. For instance, you can use Ant paths or regular expressions, you can consider parts of the URI other than simply the requested page (e.g. you can consider HTTP GET parameters) and you can implement your own runtime source of configuration data. This means your web request security can be dynamically changed during the actual execution of your webapp. - -. __Service layer and domain object security:__ The absence of support in the servlet specification for services layer security or domain object instance security represent serious limitations for multi-tiered applications. Typically developers either ignore these requirements, or implement security logic within their MVC controller code (or even worse, inside the views). There are serious disadvantages with this approach: - -.. __Separation of concerns:__ Authorization is a crosscutting concern and should be implemented as such. MVC controllers or views implementing authorization code makes it more difficult to test both the controller and authorization logic, more difficult to debug, and will often lead to code duplication. - -.. __Support for rich clients and web services:__ If an additional client type must ultimately be supported, any authorization code embedded within the web layer is non-reusable. It should be considered that Spring remoting exporters only export service layer beans (not MVC controllers). As such authorization logic needs to be located in the services layer to support a multitude of client types. - -.. __Layering issues:__ An MVC controller or view is simply the incorrect architectural layer to implement authorization decisions concerning services layer methods or domain object instances. Whilst the Principal may be passed to the services layer to enable it to make the authorization decision, doing so would introduce an additional argument on every services layer method. A more elegant approach is to use a ThreadLocal to hold the Principal, although this would likely increase development time to a point where it would become more economical (on a cost-benefit basis) to simply use a dedicated security framework. - -.. __Authorisation code quality:__ It is often said of web frameworks that they "make it easier to do the right things, and harder to do the wrong things". Security frameworks are the same, because they are designed in an abstract manner for a wide range of purposes. Writing your own authorization code from scratch does not provide the "design check" a framework would offer, and in-house authorization code will typically lack the improvements that emerge from widespread deployment, peer review and new versions. - -For simple applications, servlet specification security may just be enough. Although when considered within the context of web container portability, configuration requirements, limited web request security flexibility, and non-existent services layer and domain object instance security, it becomes clear why developers often look to alternative solutions. - - -[[faq-requirements]] -=== What Java and Spring Framework versions are required? - -Spring Security 3.0 and 3.1 require at least JDK 1.5 and also require Spring 3.0.3 as a minimum. Ideally you should be using the latest release versions to avoid problems. - -Spring Security 2.0.x requires a minimum JDK version of 1.4 and is built against Spring 2.0.x. It should also be compatible with applications using Spring 2.5.x. - - -[[faq-start-simple]] -=== I'm new to Spring Security and I need to build an application that supports CAS single sign-on over HTTPS, while allowing Basic authentication locally for certain URLs, authenticating against multiple back end user information sources (LDAP and JDBC). I've copied some configuration files I found but it doesn't work. What could be wrong? - -Or subsititute an alternative complex scenario... - -Realistically, you need an understanding of the technolgies you are intending to use before you can successfully build applications with them. Security is complicated. Setting up a simple configuration using a login form and some hard-coded users using Spring Security's namespace is reasonably straightforward. Moving to using a backed JDBC database is also easy enough. But if you try and jump straight to a complicated deployment scenario like this you will almost certainly be frustrated. There is a big jump in the learning curve required to set up systems like CAS, configure LDAP servers and install SSL certificates properly. So you need to take things one step at a time. - -From a Spring Security perspective, the first thing you should do is follow the "Getting Started" guide on the web site. This will take you through a series of steps to get up and running and get some idea of how the framework operates. If you are using other technologies which you aren't familiar with then you should do some research and try to make sure you can use them in isolation before combining them in a complex system. - - -== Common Problems - -. Authentication -.. <> -.. <> -.. <> -.. <> -.. <> -.. <> -. Session Management -.. <> -.. <> -.. <> -.. <> -.. <> -. Miscellaneous -.. <<403-csrf>> -.. <> -.. <> -.. <> - -[[faq-bad-credentials]] -=== When I try to log in, I get an error message that says "Bad Credentials". What's wrong? - -This means that authentication has failed. It doesn't say why, as it is good practice to avoid giving details which might help an attacker guess account names or passwords. - -This also means that if you ask this question in the forum, you will not get an answer unless you provide additional information. As with any issue you should check the output from the debug log, note any exception stacktraces and related messages. Step through the code in a debugger to see where the authentication fails and why. Write a test case which exercises your authentication configuration outside of the application. More often than not, the failure is due to a difference in the password data stored in a database and that entered by the user. If you are using hashed passwords, make sure the value stored in your database is __exactly__ the same as the value produced by the `PasswordEncoder` configured in your application. - - -[[faq-login-loop]] -=== My application goes into an "endless loop" when I try to login, what's going on? - -A common user problem with infinite loop and redirecting to the login page is caused by accidently configuring the login page as a "secured" resource. Make sure your configuration allows anonymous access to the login page, either by excluding it from the security filter chain or marking it as requiring ROLE_ANONYMOUS. - -If your AccessDecisionManager includes an AuthenticatedVoter, you can use the attribute "IS_AUTHENTICATED_ANONYMOUSLY". This is automatically available if you are using the standard namespace configuration setup. - -From Spring Security 2.0.1 onwards, when you are using namespace-based configuration, a check will be made on loading the application context and a warning message logged if your login page appears to be protected. - - -[[faq-anon-access-denied]] -=== I get an exception with the message "Access is denied (user is anonymous);". What's wrong? - -This is a debug level message which occurs the first time an anonymous user attempts to access a protected resource. - -[source] ----- - -DEBUG [ExceptionTranslationFilter] - Access is denied (user is anonymous); redirecting to authentication entry point -org.springframework.security.AccessDeniedException: Access is denied -at org.springframework.security.vote.AffirmativeBased.decide(AffirmativeBased.java:68) -at org.springframework.security.intercept.AbstractSecurityInterceptor.beforeInvocation(AbstractSecurityInterceptor.java:262) - ----- - -It is normal and shouldn't be anything to worry about. - - -[[faq-cached-secure-page]] -=== Why can I still see a secured page even after I've logged out of my application? - -The most common reason for this is that your browser has cached the page and you are seeing a copy which is being retrieved from the browsers cache. Verify this by checking whether the browser is actually sending the request (check your server access logs, the debug log or use a suitable browser debugging plugin such as "Tamper Data" for Firefox). This has nothing to do with Spring Security and you should configure your application or server to set the appropriate`Cache-Control` response headers. Note that SSL requests are never cached. - - -[[auth-exception-credentials-not-found]] -=== I get an exception with the message "An Authentication object was not found in the SecurityContext". What's wrong? - -This is a another debug level message which occurs the first time an anonymous user attempts to access a protected resource, but when you do not have an `AnonymousAuthenticationFilter` in your filter chain configuration. - -[source] ----- - -DEBUG [ExceptionTranslationFilter] - Authentication exception occurred; redirecting to authentication entry point -org.springframework.security.AuthenticationCredentialsNotFoundException: - An Authentication object was not found in the SecurityContext -at org.springframework.security.intercept.AbstractSecurityInterceptor.credentialsNotFound(AbstractSecurityInterceptor.java:342) -at org.springframework.security.intercept.AbstractSecurityInterceptor.beforeInvocation(AbstractSecurityInterceptor.java:254) ----- - -It is normal and shouldn't be anything to worry about. - - -[[faq-ldap-authentication]] -=== I can't get LDAP authentication to work. What's wrong with my configuration? - -Note that the permissions for an LDAP directory often do not allow you to read the password for a user. Hence it is often not possible to use the <> where Spring Security compares the stored password with the one submitted by the user. The most common approach is to use LDAP "bind", which is one of the operations supported by http://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol[the LDAP protocol]. With this approach, Spring Security validates the password by attempting to authenticate to the directory as the user. - -The most common problem with LDAP authentication is a lack of knowledge of the directory server tree structure and configuration. This will be different in different companies, so you have to find it out yourself. Before adding a Spring Security LDAP configuration to an application, it's a good idea to write a simple test using standard Java LDAP code (without Spring Security involved), and make sure you can get that to work first. For example, to authenticate a user, you could use the following code: - -[source,java] ----- - -@Test -public void ldapAuthenticationIsSuccessful() throws Exception { - Hashtable env = new Hashtable(); - env.put(Context.SECURITY_AUTHENTICATION, "simple"); - env.put(Context.SECURITY_PRINCIPAL, "cn=joe,ou=users,dc=mycompany,dc=com"); - env.put(Context.PROVIDER_URL, "ldap://mycompany.com:389/dc=mycompany,dc=com"); - env.put(Context.SECURITY_CREDENTIALS, "joespassword"); - env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); - - InitialLdapContext ctx = new InitialLdapContext(env, null); - -} - ----- - -=== Session Management - -Session management issues are a common source of forum questions. If you are developing Java web applications, you should understand how the session is maintained between the servlet container and the user's browser. You should also understand the difference between secure and non-secure cookies and the implications of using HTTP/HTTPS and switching between the two. Spring Security has nothing to do with maintaining the session or providing session identifiers. This is entirely handled by the servlet container. - - -[[faq-concurrent-session-same-browser]] -=== I'm using Spring Security's concurrent session control to prevent users from logging in more than once at a time. When I open another browser window after logging in, it doesn't stop me from logging in again. Why can I log in more than once? - -Browsers generally maintain a single session per browser instance. You cannot have two separate sessions at once. So if you log in again in another window or tab you are just reauthenticating in the same session. The server doesn't know anything about tabs, windows or browser instances. All it sees are HTTP requests and it ties those to a particular session according to the value of the the JSESSIONID cookie that they contain. When a user authenticates during a session, Spring Security's concurrent session control checks the number of__other authenticated sessions__ that they have. If they are already authenticated with the same session, then re-authenticating will have no effect. - - -[[faq-new-session-on-authentication]] -=== Why does the session Id change when I authenticate through Spring Security? - -With the default configuration, Spring Security changes the session ID when the user authenticates. If you're using a Servlet 3.1 or newer container, the session ID is simply changed. If you're using an older container, Spring Security invalidates the existing session, creates a new session, and transfers the session data to the new session. Changing the session identifier in this manner prevents"session-fixation" attacks. You can find more about this online and in the reference manual. - - -[[faq-tomcat-https-session]] -=== I'm using Tomcat (or some other servlet container) and have enabled HTTPS for my login page, switching back to HTTP afterwards. It doesn't work - I just end up back at the login page after authenticating. - -This happens because sessions created under HTTPS, for which the session cookie is marked as "secure", cannot subsequently be used under HTTP. The browser will not send the cookie back to the server and any session state will be lost (including the security context information). Starting a session in HTTP first should work as the session cookie won't be marked as secure. However, Spring Security's http://static.springsource.org/spring-security/site/docs/3.1.x/reference/springsecurity-single.html#ns-session-fixation[Session Fixation Protection] can interfere with this because it results in a new session ID cookie being sent back to the user's browser, usually with the secure flag. To get around this, you can disable session fixation protection, but in newer Servlet containers you can also configure session cookies to never use the secure flag. Note that switching between HTTP and HTTPS is not a good idea in general, as any application which uses HTTP at all is vulnerable to man-in-the-middle attacks. To be truly secure, the user should begin accessing your site in HTTPS and continue using it until they log out. Even clicking on an HTTPS link from a page accessed over HTTP is potentially risky. If you need more convincing, check out a tool like http://www.thoughtcrime.org/software/sslstrip/[sslstrip]. - - -=== I'm not switching between HTTP and HTTPS but my session is still getting lost - -Sessions are maintained either by exchanging a session cookie or by adding the a `jsessionid` parameter to URLs (this happens automatically if you are using JSTL to output URLs, or if you call `HttpServletResponse.encodeUrl` on URLs (before a redirect, for example). If clients have cookies disabled, and you are not rewriting URLs to include the `jsessionid`, then the session will be lost. Note that the use of cookies is preferred for security reasons, as it does not expose the session information in the URL. - -[[faq-session-listener-missing]] -=== I'm trying to use the concurrent session-control support but it won't let me log back in, even if I'm sure I've logged out and haven't exceeded the allowed sessions. - -Make sure you have added the listener to your web.xml file. It is essential to make sure that the Spring Security session registry is notified when a session is destroyed. Without it, the session information will not be removed from the registry. - - -[source,xml] ----- - - org.springframework.security.web.session.HttpSessionEventPublisher - ----- - -[[faq-unwanted-session-creation]] -=== Spring Security is creating a session somewhere, even though I've configured it not to, by setting the create-session attribute to never. - -This usually means that the user's application is creating a session somewhere, but that they aren't aware of it. The most common culprit is a JSP. Many people aren't aware that JSPs create sessions by default. To prevent a JSP from creating a session, add the directive `<%@ page session="false" %>` to the top of the page. - -If you are having trouble working out where a session is being created, you can add some debugging code to track down the location(s). One way to do this would be to add a `javax.servlet.http.HttpSessionListener` to your application, which calls `Thread.dumpStack()` in the `sessionCreated` method. - -[[403-csrf]] -=== I get a 403 Forbidden when performing a POST - -If an HTTP 403 Forbidden is returned for HTTP POST, but works for HTTP GET then the issue is most likely related to http://docs.spring.io/spring-security/site/docs/3.2.x/reference/htmlsingle/#csrf[CSRF]. Either provide the CSRF Token or disable CSRF protection (not recommended). - -[[faq-no-security-on-forward]] -=== I'm forwarding a request to another URL using the RequestDispatcher, but my security constraints aren't being applied. - -Filters are not applied by default to forwards or includes. If you really want the security filters to be applied to forwards and/or includes, then you have to configure these explicitly in your web.xml using the element, a child element of . - - -[[faq-method-security-in-web-context]] -=== I have added Spring Security's element to my application context but if I add security annotations to my Spring MVC controller beans (Struts actions etc.) then they don't seem to have an effect. - -In a Spring web application, the application context which holds the Spring MVC beans for the dispatcher servlet is often separate from the main application context. It is often defined in a file called `myapp-servlet.xml`, where "myapp" is the name assigned to the Spring `DispatcherServlet` in `web.xml`. An application can have multiple `DispatcherServlet`s, each with its own isolated application context. The beans in these "child" contexts are not visible to the rest of the application. The"parent" application context is loaded by the `ContextLoaderListener` you define in your `web.xml` and is visible to all the child contexts. This parent context is usually where you define your security configuration, including the `` element). As a result any security constraints applied to methods in these web beans will not be enforced, since the beans cannot be seen from the `DispatcherServlet` context. You need to either move the `` declaration to the web context or moved the beans you want secured into the main application context. - -Generally we would recommend applying method security at the service layer rather than on individual web controllers. - - -[[faq-no-filters-no-context]] -=== I have a user who has definitely been authenticated, but when I try to access the SecurityContextHolder during some requests, the Authentication is null. Why can't I see the user information? - -If you have excluded the request from the security filter chain using the attribute `filters='none'` in the `` element that matches the URL pattern, then the `SecurityContextHolder` will not be populated for that request. Check the debug log to see whether the request is passing through the filter chain. (You are reading the debug log, right?). - - -== Spring Security Architecture Questions - -. <> -. <> -. <> -. <> -. <> -. <> - - -[[faq-where-is-class-x]] -=== How do I know which package class X is in? - -The best way of locating classes is by installing the Spring Security source in your IDE. The distribution includes source jars for each of the modules the project is divided up into. Add these to your project source path and you can navigate directly to Spring Security classes (`Ctrl-Shift-T` in Eclipse). This also makes debugging easier and allows you to troubleshoot exceptions by looking directly at the code where they occur to see what's going on there. - - -[[faq-namespace-to-bean-mapping]] -=== How do the namespace elements map to conventional bean configurations? - -There is a general overview of what beans are created by the namespace in the namespace appendix of the reference guide. There is also a detailed blog article called "Behind the Spring Security Namespace" on http://blog.springsource.com/2010/03/06/behind-the-spring-security-namespace/[blog.springsource.com]. If want to know the full details then the code is in the `spring-security-config` module within the Spring Security 3.0 distribution. You should probably read the chapters on namespace parsing in the standard Spring Framework reference documentation first. - - -[[faq-role-prefix]] -=== What does "ROLE_" mean and why do I need it on my role names? - -Spring Security has a voter-based architecture which means that an access decision is made by a series of `AccessDecisionVoter`s. The voters act on the "configuration attributes" which are specified for a secured resource (such as a method invocation). With this approach, not all attributes may be relevant to all voters and a voter needs to know when it should ignore an attribute (abstain) and when it should vote to grant or deny access based on the attribute value. The most common voter is the `RoleVoter` which by default votes whenever it finds an attribute with the "ROLE_" prefix. It makes a simple comparison of the attribute (such as "ROLE_USER") with the names of the authorities which the current user has been assigned. If it finds a match (they have an authority called "ROLE_USER"), it votes to grant access, otherwise it votes to deny access. - -The prefix can be changed by setting the `rolePrefix` property of `RoleVoter`. If you only need to use roles in your application and have no need for other custom voters, then you can set the prefix to a blank string, in which case the `RoleVoter` will treat all attributes as roles. - - -[[faq-what-dependencies]] -=== How do I know which dependencies to add to my application to work with Spring Security? - -It will depend on what features you are using and what type of application you are developing. With Spring Security 3.0, the project jars are divided into clearly distinct areas of functionality, so it is straightforward to work out which Spring Security jars you need from your application requirements. All applications will need the `spring-security-core` jar. If you're developing a web application, you need the `spring-security-web` jar. If you're using security namespace configuration you need the `spring-security-config` jar, for LDAP support you need the `spring-security-ldap` jar and so on. - -For third-party jars the situation isn't always quite so obvious. A good starting point is to copy those from one of the pre-built sample applications WEB-INF/lib directories. For a basic application, you can start with the tutorial sample. If you want to use LDAP, with an embedded test server, then use the LDAP sample as a starting point. The reference manual also includeshttp://static.springsource.org/spring-security/site/docs/3.1.x/reference/springsecurity-single.html#appendix-dependencies[an appendix] listing the first-level dependencies for each Spring Security module with some information on whether they are optional and what they are required for. - -If you are building your project with maven, then adding the appropriate Spring Security modules as dependencies to your pom.xml will automatically pull in the core jars that the framework requires. Any which are marked as "optional" in the Spring Security POM files will have to be added to your own pom.xml file if you need them. - - -[[faq-apacheds-deps]] -=== What dependencies are needed to run an embedded ApacheDS LDAP server? - -If you are using Maven, you need to add the folowing to your pom dependencies: - -[source] ----- - - - org.apache.directory.server - apacheds-core - 1.5.5 - runtime - - - org.apache.directory.server - apacheds-server-jndi - 1.5.5 - runtime - - ----- - -The other required jars should be pulled in transitively. - -[[faq-what-is-userdetailservice]] -=== What is a UserDetailsService and do I need one? - -`UserDetailsService` is a DAO interface for loading data that is specific to a user account. It has no other function other to load that data for use by other components within the framework. It is not responsible for authenticating the user. Authenticating a user with a username/password combination is most commonly performed by the`DaoAuthenticationProvider`, which is injected with a `UserDetailsService` to allow it to load the password (and other data) for a user in order to compare it with the submitted value. Note that if you are using LDAP, <>. - -If you want to customize the authentication process then you should implement `AuthenticationProvider` yourself. See this http://blog.springsource.com/2010/08/02/spring-security-in-google-app-engine/[ blog article] for an example integrating Spring Security authentication with Google App Engine. - -== Common "Howto" Requests - -. <> -. <> -. <> -. <> -. <> -. <> -. <> -. <> - - -[[faq-extra-login-fields]] -=== I need to login in with more information than just the username. How do I add support for extra login fields (e.g. a company name)? - -This question comes up repeatedly in the Spring Security forum so you will find more information there by searching the archives (or through google). - -The submitted login information is processed by an instance of `UsernamePasswordAuthenticationFilter`. You will need to customize this class to handle the extra data field(s). One option is to use your own customized authentication token class (rather than the standard`UsernamePasswordAuthenticationToken`), another is simply to concatenate the extra fields with the username (for example, using a ":" as the separator) and pass them in the username property of `UsernamePasswordAuthenticationToken`. - -You will also need to customize the actual authentication process. If you are using a custom authentication token class, for example, you will have to write an `AuthenticationProvider` to handle it (or extend the standard`DaoAuthenticationProvider`). If you have concatenated the fields, you can implement your own`UserDetailsService` which splits them up and loads the appropriate user data for authentication. - -[[faq-matching-url-fragments]] -=== How do I apply different intercept-url constraints where only the fragment value of the requested URLs differs (e.g./foo#bar and /foo#blah? - -You can't do this, since the fragment is not transmitted from the browser to the server. The URLs above are identical from the server's perspective. This is a common question from GWT users. - -[[faq-request-details-in-user-service]] -=== How do I access the user's IP Address (or other web-request data) in a UserDetailsService? - -Obviously you can't (without resorting to something like thread-local variables) since the only information supplied to the interface is the username. Instead of implementing `UserDetailsService`, you should implement `AuthenticationProvider` directly and extract the information from the supplied`Authentication` token. - -In a standard web setup, the `getDetails()` method on the `Authentication` object will return an instance of `WebAuthenticationDetails`. If you need additional information, you can inject a custom`AuthenticationDetailsSource` into the authentication filter you are using. If you are using the namespace, for example with the `` element, then you should remove this element and replace it with a`` declaration pointing to an explicitly configured`UsernamePasswordAuthenticationFilter`. - - -[[faq-access-session-from-user-service]] -=== How do I access the HttpSession from a UserDetailsService? - -You can't, since the `UserDetailsService` has no awareness of the servlet API. If you want to store custom user data, then you should customize the`UserDetails` object which is returned. This can then be accessed at any point, via the thread-local`SecurityContextHolder`. A call to `SecurityContextHolder.getContext().getAuthentication().getPrincipal()` will return this custom object. - -If you really need to access the session, then it must be done by customizing the web tier. - - -[[faq-password-in-user-service]] -=== How do I access the user's password in a UserDetailsService? - -You can't (and shouldn't). You are probably misunderstanding its purpose. See "<>" above. - - -[[faq-dynamic-url-metadata]] -=== How do I define the secured URLs within an application dynamically? - -People often ask about how to store the mapping between secured URLs and security metadata attributes in a database, rather than in the application context. - -The first thing you should ask yourself is if you really need to do this. If an application requires securing, then it also requires that the security be tested thoroughly based on a defined policy. It may require auditing and acceptance testing before being rolled out into a production environment. A security-conscious organization should be aware that the benefits of their diligent testing process could be wiped out instantly by allowing the security settings to be modified at runtime by changing a row or two in a configuration database. If you have taken this into account (perhaps using multiple layers of security within your application) then Spring Security allows you to fully customize the source of security metadata. You can make it fully dynamic if you choose. - -Both method and web security are protected by subclasses of `AbstractSecurityInterceptor` which is configured with a `SecurityMetadataSource` from which it obtains the metadata for a particular method or filter invocation. For web security, the interceptor class is `FilterSecurityInterceptor` and it uses the marker interface`FilterInvocationSecurityMetadataSource`. The "secured object" type it operates on is a `FilterInvocation`. The default implementation which is used (both in the namespace `` and when configuring the interceptor explicitly, stores the list of URL patterns and their corresponding list of "configuration attributes" (instances of `ConfigAttribute`) in an in-memory map. - -To load the data from an alternative source, you must be using an explicitly declared security filter chain (typically Spring Security's`FilterChainProxy`) in order to customize the `FilterSecurityInterceptor` bean. You can't use the namespace. You would then implement`FilterInvocationSecurityMetadataSource` to load the data as you please for a particular`FilterInvocation` footnote:[The `FilterInvocation` object contains the `HttpServletRequest`, so you can obtain the URL or any other relevant information on which to base your decision on what the list of returned attributes will contain.]. A very basic outline would look something like this: - -[source,java] ----- - - public class MyFilterSecurityMetadataSource implements FilterInvocationSecurityMetadataSource { - - public List getAttributes(Object object) { - FilterInvocation fi = (FilterInvocation) object; - String url = fi.getRequestUrl(); - String httpMethod = fi.getRequest().getMethod(); - List attributes = new ArrayList(); - - // Lookup your database (or other source) using this information and populate the - // list of attributes - - return attributes; - } - - public Collection getAllConfigAttributes() { - return null; - } - - public boolean supports(Class clazz) { - return FilterInvocation.class.isAssignableFrom(clazz); - } - } - ----- - -For more information, look at the code for `DefaultFilterInvocationSecurityMetadataSource`. - - -[[faq-ldap-authorities]] -=== How do I authenticate against LDAP but load user roles from a database? - -The `LdapAuthenticationProvider` bean (which handles normal LDAP authentication in Spring Security) is configured with two separate strategy interfaces, one which performs the authenticatation and one which loads the user authorities, called`LdapAuthenticator` and `LdapAuthoritiesPopulator` respectively. The `DefaultLdapAuthoritiesPopulator` loads the user authorities from the LDAP directory and has various configuration parameters to allow you to specify how these should be retrieved. - -To use JDBC instead, you can implement the interface yourself, using whatever SQL is appropriate for your schema: - -[source,java] ----- - - public class MyAuthoritiesPopulator implements LdapAuthoritiesPopulator { - @Autowired - JdbcTemplate template; - - List getGrantedAuthorities(DirContextOperations userData, String username) { - List = template.query("select role from roles where username = ?", - new String[] {username}, - new RowMapper() { - /** - * We're assuming here that you're using the standard convention of using the role - * prefix "ROLE_" to mark attributes which are supported by Spring Security's RoleVoter. - */ - public GrantedAuthority mapRow(ResultSet rs, int rowNum) throws SQLException { - return new GrantedAuthorityImpl("ROLE_" + rs.getString(1); - } - } - } - } - ----- - -You would then add a bean of this type to your application context and inject it into the `LdapAuthenticationProvider`. This is covered in the section on configuring LDAP using explicit Spring beans in the LDAP chapter of the reference manual. Note that you can't use the namespace for configuration in this case. You should also consult the Javadoc for the relevant classes and interfaces. - - -[[faq-namespace-post-processor]] -=== I want to modify the property of a bean that is created by the namespace, but there is nothing in the schema to support it. What can I do short of abandoning namespace use? - -The namespace functionality is intentionally limited, so it doesn't cover everything that you can do with plain beans. If you want to do something simple, like modify a bean, or inject a different dependency, you can do this by adding a`BeanPostProcessor` to your configuration. More information can be found in the http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/htmlsingle/spring-framework-reference.html#beans-factory-extension-bpp[Spring Reference Manual]. In order to do this, you need to know a bit about which beans are created, so you should also read the blog article in the above question on <>. - -Normally, you would add the functionality you require to the `postProcessBeforeInitialization` method of`BeanPostProcessor`. Let's say that you want to customize the`AuthenticationDetailsSource` used by the `UsernamePasswordAuthenticationFilter`, (created by the `form-login` element). You want to extract a particular header called `CUSTOM_HEADER`from the request and make use of it while authenticating the user. The processor class would look like this: - -[source,java] ----- - -public class BeanPostProcessor implements BeanPostProcessor { - - public Object postProcessAfterInitialization(Object bean, String name) { - if (bean instanceof UsernamePasswordAuthenticationFilter) { - System.out.println("********* Post-processing " + name); - ((UsernamePasswordAuthenticationFilter)bean).setAuthenticationDetailsSource( - new AuthenticationDetailsSource() { - public Object buildDetails(Object context) { - return ((HttpServletRequest)context).getHeader("CUSTOM_HEADER"); - } - }); - } - return bean; - } - - public Object postProcessBeforeInitialization(Object bean, String name) { - return bean; - } -} - ----- - -You would then register this bean in your application context. Spring will automatically invoke it on the beans defined in the application context. \ No newline at end of file diff --git a/docs/manual/src/asciidoc/Guardfile b/docs/manual/src/docs/asciidoc/Guardfile similarity index 100% rename from docs/manual/src/asciidoc/Guardfile rename to docs/manual/src/docs/asciidoc/Guardfile diff --git a/docs/manual/src/docs/asciidoc/_includes/content.adoc b/docs/manual/src/docs/asciidoc/_includes/content.adoc new file mode 100644 index 0000000000..2cabae6ea5 --- /dev/null +++ b/docs/manual/src/docs/asciidoc/_includes/content.adoc @@ -0,0 +1,9 @@ += Book Title +Rob Winch + +[abstract] +This is the actual content. + +== First Section + +And off we go. \ No newline at end of file diff --git a/docs/manual/src/asciidoc/images/Authentication.gif b/docs/manual/src/docs/asciidoc/images/Authentication.gif similarity index 100% rename from docs/manual/src/asciidoc/images/Authentication.gif rename to docs/manual/src/docs/asciidoc/images/Authentication.gif diff --git a/docs/manual/src/asciidoc/images/access-decision-voting.graffle b/docs/manual/src/docs/asciidoc/images/access-decision-voting.graffle similarity index 100% rename from docs/manual/src/asciidoc/images/access-decision-voting.graffle rename to docs/manual/src/docs/asciidoc/images/access-decision-voting.graffle diff --git a/docs/manual/src/asciidoc/images/access-decision-voting.png b/docs/manual/src/docs/asciidoc/images/access-decision-voting.png similarity index 100% rename from docs/manual/src/asciidoc/images/access-decision-voting.png rename to docs/manual/src/docs/asciidoc/images/access-decision-voting.png diff --git a/docs/manual/src/asciidoc/images/after-invocation.graffle b/docs/manual/src/docs/asciidoc/images/after-invocation.graffle similarity index 100% rename from docs/manual/src/asciidoc/images/after-invocation.graffle rename to docs/manual/src/docs/asciidoc/images/after-invocation.graffle diff --git a/docs/manual/src/asciidoc/images/after-invocation.png b/docs/manual/src/docs/asciidoc/images/after-invocation.png similarity index 100% rename from docs/manual/src/asciidoc/images/after-invocation.png rename to docs/manual/src/docs/asciidoc/images/after-invocation.png diff --git a/docs/manual/src/asciidoc/images/note.png b/docs/manual/src/docs/asciidoc/images/note.png similarity index 100% rename from docs/manual/src/asciidoc/images/note.png rename to docs/manual/src/docs/asciidoc/images/note.png diff --git a/docs/manual/src/asciidoc/images/s2-banner-rhs.png b/docs/manual/src/docs/asciidoc/images/s2-banner-rhs.png similarity index 100% rename from docs/manual/src/asciidoc/images/s2-banner-rhs.png rename to docs/manual/src/docs/asciidoc/images/s2-banner-rhs.png diff --git a/docs/manual/src/asciidoc/images/s2_box_logo.png b/docs/manual/src/docs/asciidoc/images/s2_box_logo.png similarity index 100% rename from docs/manual/src/asciidoc/images/s2_box_logo.png rename to docs/manual/src/docs/asciidoc/images/s2_box_logo.png diff --git a/docs/manual/src/asciidoc/images/security-interception.graffle b/docs/manual/src/docs/asciidoc/images/security-interception.graffle similarity index 100% rename from docs/manual/src/asciidoc/images/security-interception.graffle rename to docs/manual/src/docs/asciidoc/images/security-interception.graffle diff --git a/docs/manual/src/asciidoc/images/security-interception.png b/docs/manual/src/docs/asciidoc/images/security-interception.png similarity index 100% rename from docs/manual/src/asciidoc/images/security-interception.png rename to docs/manual/src/docs/asciidoc/images/security-interception.png diff --git a/docs/manual/src/asciidoc/images/tip.png b/docs/manual/src/docs/asciidoc/images/tip.png similarity index 100% rename from docs/manual/src/asciidoc/images/tip.png rename to docs/manual/src/docs/asciidoc/images/tip.png diff --git a/docs/manual/src/asciidoc/index.adoc b/docs/manual/src/docs/asciidoc/index.adoc similarity index 99% rename from docs/manual/src/asciidoc/index.adoc rename to docs/manual/src/docs/asciidoc/index.adoc index c8fd620872..c7f0998e55 100644 --- a/docs/manual/src/asciidoc/index.adoc +++ b/docs/manual/src/docs/asciidoc/index.adoc @@ -1040,7 +1040,7 @@ matches are actually performed.]. You can also use regular-expression matching a the given pattern. With the default configuration, this is typically a comma-separated list of roles, one of which a user must have to be allowed to make the request. The prefix"ROLE_" is a marker which indicates that a simple comparison with the user's authorities should be made. In other words, a normal role-based check should be used. Access-control in Spring Security is not limited to the use of simple roles (hence the use of the prefix to differentiate between different types of security attributes). We'll see later how the interpretation can vary footnote:[The interpretation of the comma-separated values in the `access` attribute depends on the -implementation of the pass:specialcharacters,macros[<>] which is used. In Spring Security 3.0, the attribute can also be populated with an pass:specialcharacters,macros[<>].]. +implementation of the pass:specialcharacters,macros[<>] which is used. In Spring Security 3.0, the attribute can also be populated with an pass:specialcharacters,macros[<>]. [NOTE] @@ -1090,7 +1090,7 @@ You might be wondering where the login form came from when you were prompted to ---- Also note that we've added an extra `intercept-url` element to say that any requests for the login page should be available to anonymous users footnote:[See the chapter on pass:specialcharacters,macros[<>]] and also -the <> class for more details on how the value `IS_AUTHENTICATED_ANONYMOUSLY` is processed.]. Otherwise the request would be matched by the pattern `/**` and it wouldn't be +the <> class for more details on how the value `IS_AUTHENTICATED_ANONYMOUSLY` is processed.]. Otherwise the request would be matched by the pattern /** and it wouldn't be possible to access the login page itself! This is a common configuration error and will result in an infinite loop in the application. Spring Security will emit a warning in the log if your login page appears to be secured. It is also possible to have all requests matching a particular pattern bypass the security filter chain completely, by defining a separate `http` element for the pattern like this: @@ -2000,7 +2000,7 @@ Note that you don't normally need to write any code like this. The process will ==== Setting the SecurityContextHolder Contents Directly In fact, Spring Security doesn't mind how you put the `Authentication` object inside the `SecurityContextHolder`. The only critical requirement is that the `SecurityContextHolder` contains an `Authentication` which represents a principal before the `AbstractSecurityInterceptor` (which we'll see more about later) needs to authorize a user operation. -You can (and many users do) write their own filters or MVC controllers to provide interoperability with authentication systems that are not based on Spring Security. For example, you might be using Container-Managed Authentication which makes the current user available from a ThreadLocal or JNDI location. Or you might work for a company that has a legacy proprietary authentication system, which is a corporate "standard" over which you have little control. In situations like this it's quite easy to get Spring Security to work, and still provide authorization capabilities. All you need to do is write a filter (or equivalent) that reads the third-party user information from a location, build a Spring Security-specific `Authentication` object, and put it into the `SecurityContextHolder`. In this case you also need to think about things which are normally taken care of automatically by the built-in authentication infrastructure. For example, you might need to pre-emptively create an HTTP session to <>, before you write the response to the client footnote:[It isn't possible to create a session once the response has been committed.]. +You can (and many users do) write their own filters or MVC controllers to provide interoperability with authentication systems that are not based on Spring Security. For example, you might be using Container-Managed Authentication which makes the current user available from a ThreadLocal or JNDI location. Or you might work for a company that has a legacy proprietary authentication system, which is a corporate "standard" over which you have little control. In situations like this it's quite easy to get Spring Security to work, and still provide authorization capabilities. All you need to do is write a filter (or equivalent) that reads the third-party user information from a location, build a Spring Security-specific `Authentication` object, and put it into the `SecurityContextHolder`. In this case you also need to think about things which are normally taken care of automatically by the built-in authentication infrastructure. For example, you might need to pre-emptively create an HTTP session to <>, before you write the response to the client footnote:[It isn't possible to create a session once the response has been committed. If you're wondering how the `AuthenticationManager` is implemented in a real world example, we'll look at that in the <>. @@ -2379,7 +2379,7 @@ As mentioned above, the default strategy is to use Ant-style paths for matching If for some reason, you need a more powerful matching strategy, you can use regular expressions. The strategy implementation is then`RegexRequestMatcher`. See the Javadoc for this class for more information. -In practice we recommend that you use method security at your service layer, to control access to your application, and do not rely entirely on the use of security constraints defined at the web-application level. URLs change and it is difficult to take account of all the possible URLs that an application might support and how requests might be manipulated. You should try and restrict yourself to using a few simple ant paths which are simple to understand. Always try to use a"deny-by-default" approach where you have a catch-all wildcard ( `/**` or `**`) defined last and denying access. +In practice we recommend that you use method security at your service layer, to control access to your application, and do not rely entirely on the use of security constraints defined at the web-application level. URLs change and it is difficult to take account of all the possible URLs that an application might support and how requests might be manipulated. You should try and restrict yourself to using a few simple ant paths which are simple to understand. Always try to use a"deny-by-default" approach where you have a catch-all wildcard ( /** or **) defined last and denying access. Security defined at the service layer is much more robust and harder to bypass, so you should always take advantage of Spring Security's method security options. diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle index 1be9e89e7c..cf2149f6c9 100644 --- a/gradle/maven-deployment.gradle +++ b/gradle/maven-deployment.gradle @@ -87,27 +87,24 @@ def customizePom(pom, gradleProject) { } } } - build { - plugins { - plugin { - groupId = 'org.apache.maven.plugins' - artifactId = 'maven-compiler-plugin' - configuration { - source = '1.7' - target = '1.7' - } - } - if(isWar) { - plugin { - groupId = 'org.apache.maven.plugins' - artifactId = 'maven-war-plugin' - version = '2.3' - configuration { - failOnMissingWebXml = 'false' - } - } - } - } + } + + // http://forums.gradle.org/gradle/topics/after_upgrade_gradle_to_2_0_version_the_maven_pom_not_support_build_property + pom.withXml { + def plugins = asNode().appendNode('build').appendNode('plugins') + plugins + .appendNode('plugin') + .appendNode('maven-compiler-plugin').parent() + .appendNode('configuration') + .appendNode('source','1.7').parent() + .appendNode('target','1.7') + if(isWar) { + plugins + .appendNode('plugin') + .appendNode('maven-war-plugin').parent() + .appendNode('version','2.3').parent() + .appendNode('configuration') + .appendNode('failOnMissingWebXml','false') } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eb879bfb7d..eed551be62 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip