Add workaround for iOS 11 broken Base64 encoding.

seize-the-dave · Dec 14, 2017 · fee2a56 · fee2a56
1 parent 40295aa
commit fee2a56
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/org/jscep/server/ScepServlet.java b/src/main/java/org/jscep/server/ScepServlet.java
@@ -633,10 +633,20 @@ private byte[] getMessageBytes(final HttpServletRequest req)
                 if (LOGGER.isDebugEnabled()) {
                     LOGGER.debug("Decoding {}", msg);
                 }
-                return Base64.decode(msg);
+                return Base64.decode(fixBrokenBase64(msg));
             } else {
                 return new byte[0];
             }
         }
     }
+
+    /**
+     * iOS 11's MDM sends badly encoded Base64 data, with '+' encoded as ' '.
+     *
+     * @return the base64 string with ' ' replaced by '+'.
+     */
+    private String fixBrokenBase64(String base64) {
+        return base64.replace(' ', '+');
+    }
+
 }