diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-06-14 03:40:43 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-06-14 05:54:46 +0200 |
| commit | 4a8e1703603ab348b24d4f010e3587c340e1a032 (patch) | |
| tree | b41697d3f316e3c12a5124b9e280f7b50e643de7 | |
| parent | e5f6ed7be301a3531b871ef3b0ce64bea0fe1973 (diff) | |
| download | pki-4a8e1703603ab348b24d4f010e3587c340e1a032.tar.gz pki-4a8e1703603ab348b24d4f010e3587c340e1a032.tar.xz pki-4a8e1703603ab348b24d4f010e3587c340e1a032.zip | |
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
| -rw-r--r-- | base/common/src/org/dogtagpki/common/Info.java | 2 | ||||
| -rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/base/PKIService.java | 2 | ||||
| -rw-r--r-- | base/server/share/webapps/pki/js/pki-banner.js | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/base/common/src/org/dogtagpki/common/Info.java b/base/common/src/org/dogtagpki/common/Info.java index 7ea3fd73a..0a216f434 100644 --- a/base/common/src/org/dogtagpki/common/Info.java +++ b/base/common/src/org/dogtagpki/common/Info.java @@ -26,7 +26,6 @@ import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,7 +66,6 @@ public class Info extends ResourceMessage { } @XmlElement(name="Banner") - @XmlJavaTypeAdapter(Base64Adapter.class) public String getBanner() { return banner; } 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)) { |