Fixed missing Accept header handling.

Some clients might not send the Accept header when invoking the
REST services. To handle this the REST services have been modified
to use the Content-type if the Accept header is missing, or use a
default message format if Content-type is not specified.

1 files changed, 20 insertions, 1 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java b/base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java
index 2b8a4ada3..9338b9645 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java
@@ -66,6 +66,8 @@ public class PKIService {
 
     public static MediaType resolveFormat(MediaType format) {
 
+        if (format == null) return null;
+
         for (MediaType supportedFormat : MESSAGE_FORMATS) {
             if (format.isCompatible(supportedFormat)) return supportedFormat;
         }
@@ -75,6 +77,8 @@ public class PKIService {
 
     public static MediaType resolveFormat(List<MediaType> formats) {
 
+        if (formats == null) return null;
+
         for (MediaType acceptableFormat : formats) {
             MediaType supportedFormat = resolveFormat(acceptableFormat);
             if (supportedFormat != null) return supportedFormat;
@@ -84,7 +88,22 @@ public class PKIService {
     }
 
     public MediaType getResponseFormat() {
-        MediaType responseFormat = resolveFormat(headers.getAcceptableMediaTypes());
+        MediaType contentType = headers.getMediaType();
+        List<MediaType> acceptableFormats = headers.getAcceptableMediaTypes();
+
+        MediaType responseFormat;
+        if (acceptableFormats == null || acceptableFormats.isEmpty()) {
+            // if the Accept header is missing
+            if (contentType == null) {
+                // and if the Content-type header is missing, use the default format
+                responseFormat = PKIService.MESSAGE_FORMATS.get(0);
+            } else {
+                // otherwise, use the Content-type header
+                responseFormat = resolveFormat(contentType);
+            }
+        } else {
+            responseFormat = resolveFormat(acceptableFormats);
+        }
         if (responseFormat == null) throw new PKIException(Response.Status.NOT_ACCEPTABLE);
         return responseFormat;
     }