From: Felix Dörre <felix@dogcraft.de>
Date: Tue, 22 Jul 2014 23:48:09 +0000 (+0200)
Subject: SPKAC: add intstall link for signed certificates.
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=b15cde2e2f51cb494b5fd3860523ced9a8bd19c1

SPKAC: add intstall link for signed certificates.
---

diff --git a/src/org/cacert/gigi/pages/account/MailCertificates.java b/src/org/cacert/gigi/pages/account/MailCertificates.java
index 56a0b5bd..de8c1ca0 100644
--- a/src/org/cacert/gigi/pages/account/MailCertificates.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificates.java
@@ -31,6 +31,7 @@ public class MailCertificates extends Page {
 
 	@Override
 	public boolean beforeTemplate(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+
 		String pi = req.getPathInfo().substring(PATH.length());
 		if (pi.length() == 0) {
 			return false;
@@ -38,9 +39,16 @@ public class MailCertificates extends Page {
 		pi = pi.substring(1);
 		boolean crt = false;
 		boolean cer = false;
+		resp.setContentType("application/pkix-cert");
 		if (pi.endsWith(".crt")) {
 			crt = true;
 			pi = pi.substring(0, pi.length() - 4);
+		} else if (pi.endsWith(".cer")) {
+			if (req.getParameter("install") != null) {
+				resp.setContentType("application/x-x509-user-cert");
+			}
+			cer = true;
+			pi = pi.substring(0, pi.length() - 4);
 		} else if (pi.endsWith(".cer")) {
 			cer = true;
 			pi = pi.substring(0, pi.length() - 4);
@@ -103,6 +111,11 @@ public class MailCertificates extends Page {
 			out.print(".cer'>");
 			out.print(translate(req, "DER encoded Certificate"));
 			out.println("</a><br/>");
+			out.print("<a href='");
+			out.print(serial);
+			out.print(".cer?install'>");
+			out.print(translate(req, "Install into browser."));
+			out.println("</a><br/>");
 
 			out.println("<pre>");
 			try {