DATAREST-980 - HAL browser not working behind zuul with csrf protection

pom.xml

@@ -39,6 +39,7 @@
 <hibernate.version>4.3.10.Final</hibernate.version>
 <jsonpath>1.1.0</jsonpath>
 <bundlor.enabled>false</bundlor.enabled>
+<manifest.file/>
 </properties>
 
 <developers>

spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/ProjectionDefinitionConfiguration.java

@@ -15,6 +15,11 @@
  */
 package org.springframework.data.rest.core.config;
 
+import lombok.AccessLevel;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.Value;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -118,7 +123,7 @@ public ProjectionDefinitionConfiguration addProjection(Class<?> projectionType,
 Assert.notEmpty(sourceTypes, "Source types must not be null!");
 
 for (Class<?> sourceType : sourceTypes) {
-this.projectionDefinitions.add(new ProjectionDefinition(sourceType, projectionType, name));
+this.projectionDefinitions.add(ProjectionDefinition.of(sourceType, projectionType, name));
 }
 
 return this;
@@ -189,10 +194,12 @@ private static boolean isSubTypeOf(Class<?> left, Class<?> right) {
  * 
  * @author Oliver Gierke
  */
+@Value
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 static final class ProjectionDefinition {
 
-private final Class<?> sourceType, targetType;
-private final String name;
+private final @NonNull Class<?> sourceType, targetType;
+private final @NonNull String name;
 
 /**
  * Creates a new {@link ProjectionDefinitionKey} for the given source type and name;
@@ -201,47 +208,11 @@ static final class ProjectionDefinition {
  * @param targetType must not be {@literal null}.
  * @param name must not be {@literal null} or empty.
  */
-public ProjectionDefinition(Class<?> sourceType, Class<?> targetType, String name) {
+static ProjectionDefinition of(Class<?> sourceType, Class<?> targetType, String name) {
 
-Assert.notNull(sourceType, "Source type must not be null!");
-Assert.notNull(targetType, "Target type must not be null!");
 Assert.hasText(name, "Name must not be null or empty!");
 
-this.sourceType = sourceType;
-this.targetType = targetType;
-this.name = name;
-}
-
-/* 
- * (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
-@Override
-public boolean equals(Object obj) {
-
-if (!(obj instanceof ProjectionDefinition)) {
-return false;
-}
-
-ProjectionDefinition that = (ProjectionDefinition) obj;
-return this.name.equals(that.name) && this.sourceType.equals(that.sourceType)
-&& this.sourceType.equals(that.sourceType);
-}
-
-/* 
- * (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
-@Override
-public int hashCode() {
-
-int result = 31;
-
-result += name.hashCode();
-result += sourceType.hashCode();
-result += targetType.hashCode();
-
-return result;
+return new ProjectionDefinition(sourceType, targetType, name);
 }
 }
 }

spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/RepositoryRestConfiguration.java

@@ -112,13 +112,15 @@ public URI getBasePath() {
  * 
  * @param basePath the basePath to set
  */
-public void setBasePath(String basePath) {
+public RepositoryRestConfiguration setBasePath(String basePath) {
 
 Assert.isTrue(!basePath.startsWith("http"), "Use a path not a URI");
 basePath = StringUtils.trimTrailingCharacter(basePath, '/');
 this.basePath = URI.create(basePath.startsWith("/") ? basePath : "/".concat(basePath));
 
 Assert.isTrue(!this.basePath.isAbsolute(), "Absolute URIs are not supported as base path!");
+
+return this;
 }
 
 /**
@@ -504,8 +506,11 @@ public MetadataConfiguration getMetadataConfiguration() {
  * @param enableEnumTranslation
  * @see #getEnumTranslationConfiguration()
  */
-public void setEnableEnumTranslation(boolean enableEnumTranslation) {
+public RepositoryRestConfiguration setEnableEnumTranslation(boolean enableEnumTranslation) {
+
 this.enableEnumTranslation = enableEnumTranslation;
+
+return this;
 }
 
 /**
@@ -547,9 +552,13 @@ public RepositoryDetectionStrategy getRepositoryDetectionStrategy() {
  * @param repositoryDetectionStrategy can be {@literal null}.
  * @since 2.5
  */
-public void setRepositoryDetectionStrategy(RepositoryDetectionStrategy repositoryDetectionStrategy) {
+public RepositoryRestConfiguration setRepositoryDetectionStrategy(
+RepositoryDetectionStrategy repositoryDetectionStrategy) {
+
 this.repositoryDetectionStrategy = repositoryDetectionStrategy == null ? RepositoryDetectionStrategies.DEFAULT
 : repositoryDetectionStrategy;
+
+return this;
 }
 
 /**

spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/Supplier.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.rest.core.util;
+
+/**
+ * Mimics Java 8's Supplier interface to allow deferring a computation.
+ * 
+ * @author Oliver Gierke
+ * @since 2.6
+ * @soundtrack KRS-One - Sound Of Da Police (Return Of The Boom Bap)
+ */
+public interface Supplier<T> {
+
+T get();
+}

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/config/ProjectionDefinitionConfigurationUnitTests.java

@@ -121,10 +121,10 @@ public void defaultsNameToSimpleClassNameIfNotAnnotated() {
 @Test
 public void definitionEquals() {
 
-ProjectionDefinition objectName = new ProjectionDefinition(Object.class, Object.class, "name");
-ProjectionDefinition sameObjectName = new ProjectionDefinition(Object.class, Object.class, "name");
-ProjectionDefinition stringName = new ProjectionDefinition(String.class, Object.class, "name");
-ProjectionDefinition objectOtherNameKey = new ProjectionDefinition(Object.class, Object.class, "otherName");
+ProjectionDefinition objectName = ProjectionDefinition.of(Object.class, Object.class, "name");
+ProjectionDefinition sameObjectName = ProjectionDefinition.of(Object.class, Object.class, "name");
+ProjectionDefinition stringName = ProjectionDefinition.of(String.class, Object.class, "name");
+ProjectionDefinition objectOtherNameKey = ProjectionDefinition.of(Object.class, Object.class, "otherName");
 
 assertThat(objectName, is(objectName));
 assertThat(objectName, is(sameObjectName));

spring-data-rest-hal-browser/pom.xml

@@ -108,6 +108,53 @@
 <copy todir="${project.build.outputDirectory}/META-INF/spring-data-rest/hal-browser/vendor/js">
 <fileset dir="${project.build.directory}/json-editor/META-INF/resources/webjars/json-editor/${json-editor.version}" />
 </copy>
+<copy file="${project.build.outputDirectory}/META-INF/spring-data-rest/hal-browser/browser.html"
+ tofile="${project.build.outputDirectory}/META-INF/spring-data-rest/hal-browser/index.html" />
+<replace file="${project.build.outputDirectory}/META-INF/spring-data-rest/hal-browser/index.html">
+<replacefilter>
+<replacetoken><![CDATA[</body>]]></replacetoken>
+<replacevalue><![CDATA[
+<script id="dynamic-request-template" type="text/template">
+<div class="modal-header">
+<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+<h3>Create/Update</h3>
+</div>
+
+<form class="non-safe" action="<%= href %>">
+<div class="modal-body" style="padding-top: 0px">
+<div id="jsoneditor"></div>
+
+<div class="well well-small" style="padding-bottom: 0px;">
+<div class="container-fluid">
+<div class="row-fluid">
+<div class="control-group">
+<label class="control-label" style="display: inline-block; font-weight: bold;">Action:</label>
+<input name="method" type="text" class="method controls" style="width: 98%" value="POST" />
+<input name="url" type="text" class="url controls" style="width: 98%" value="<%= href %>" />
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="modal-footer">
+<button type="submit" class="btn btn-primary">Make Request</button>
+</div>
+</form>
+</script>
+
+<script src="vendor/js/jsoneditor.js"></script>
+<script src="js/CustomPostForm.js"></script>
+
+</body>]]>
+</replacevalue>
+</replacefilter>
+</replace>
+<replace file="${project.build.outputDirectory}/META-INF/spring-data-rest/hal-browser/index.html">
+<replacefilter>
+<replacetoken>The HAL Browser</replacetoken>
+<replacevalue>The HAL Browser (for Spring Data REST)</replacevalue>
+</replacefilter>
+</replace>
 <delete file="${project.build.outputDirectory}/META-INF/spring-data-rest/hal-browser/browser.html" />
 </target>
 </configuration>