From afc0703c0cf98a264646f7ff91fc0f6834f5ac2f Mon Sep 17 00:00:00 2001
From: Cameron Fieber <cfieber@netflix.com>
Date: Wed, 29 Mar 2017 13:09:30 -0700
Subject: [PATCH] fix(service): disable content negotiation via URI path
 extension

fix a problem treating URIs that end with '.com' as a request for content-type
application/ms-download

turns out some people have email addresses that end with '.com'
---
 .../com/netflix/spinnaker/fiat/config/FiatConfig.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fiat-web/src/main/java/com/netflix/spinnaker/fiat/config/FiatConfig.java b/fiat-web/src/main/java/com/netflix/spinnaker/fiat/config/FiatConfig.java
index 4c5636eb1..ec040b578 100644
--- a/fiat-web/src/main/java/com/netflix/spinnaker/fiat/config/FiatConfig.java
+++ b/fiat-web/src/main/java/com/netflix/spinnaker/fiat/config/FiatConfig.java
@@ -11,6 +11,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.http.MediaType;
+import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
@@ -39,6 +41,12 @@ public void addInterceptors(InterceptorRegistry registry) {
     registry.addInterceptor(interceptor);
   }
 
+  @Override
+  public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+    super.configureContentNegotiation(configurer);
+    configurer.favorPathExtension(false).defaultContentType(MediaType.APPLICATION_JSON);
+  }
+
   @Bean
   @ConditionalOnMissingBean(UserRolesProvider.class)
   UserRolesProvider defaultUserRolesProvider() {