Fixed access banner encoding (part 2).

The code that reads the access banner from file has been modified
to explicitly use UTF-8 encoding.

The Info class and the PKI UI have been modified not to encode the
access banner in Base64 since it is not necessary.

https://pagure.io/dogtagpki/issue/2671

Change-Id: I5f41a8ebac0bc91623b27f14608bca294bc9bc38

2 files changed, 2 insertions, 5 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 327347726..7a4727be4 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
@@ -98,7 +98,7 @@ public class PKIService {
     }
 
     public static String getBanner() throws IOException {
-        return new String(Files.readAllBytes(bannerFile)).trim();
+        return new String(Files.readAllBytes(bannerFile), "UTF-8").trim();
     }
 
     public static MediaType resolveFormat(MediaType format) {
diff --git a/base/server/share/webapps/pki/js/pki-banner.js b/base/server/share/webapps/pki/js/pki-banner.js
index 05b5f0180..2bb27927e 100644
--- a/base/server/share/webapps/pki/js/pki-banner.js
+++ b/base/server/share/webapps/pki/js/pki-banner.js
@@ -36,11 +36,8 @@ if (location.protocol == "https:" && !sessionStorage.bannerLock) {
                 return;
             }
 
-            // decode Base64-encoded UTF-8 banner
-            var banner = decodeURIComponent(escape(atob(data.Banner)));
-
             // display the banner and ask for confirmation
-            var message = banner + "\n\nDo you want to proceed?";
+            var message = data.Banner + "\n\nDo you want to proceed?";
 
             // if banner accepted
             if (confirm(message)) {