import java.io.PrintWriter;
import java.net.URLEncoder;
import java.security.GeneralSecurityException;
-import java.security.cert.X509Certificate;
import java.util.HashMap;
import java.util.Map;
import org.cacert.gigi.pages.HandlesMixedRequest;
import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.CertExporter;
import org.cacert.gigi.util.PEM;
public class Certificates extends Page implements HandlesMixedRequest {
- private Template certDisplay = new Template(Certificates.class.getResource("CertificateDisplay.templ"));
+ private static final Template certDisplay = new Template(Certificates.class.getResource("CertificateDisplay.templ"));
public static final String PATH = "/account/certs";
boolean crt = false;
boolean cer = false;
resp.setContentType("application/pkix-cert");
+ if (req.getParameter("install") != null) {
+ resp.setContentType("application/x-x509-user-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);
String serial = pi;
try {
Certificate c = Certificate.getBySerial(serial);
- if (c == null || getUser(req).getId() != c.getOwner().getId()) {
+ if (c == null || LoginPage.getAuthorizationContext(req).getTarget().getId() != c.getOwner().getId()) {
resp.sendError(404);
return true;
}
- X509Certificate cert = c.cert();
if ( !crt && !cer) {
return false;
}
ServletOutputStream out = resp.getOutputStream();
+ boolean doChain = req.getParameter("chain") != null;
+ boolean includeAnchor = req.getParameter("noAnchor") == null;
if (crt) {
- out.println(PEM.encode("CERTIFICATE", cert.getEncoded()));
- if (req.getParameter("chain") != null) {
- CACertificate ca = c.getParent();
- while ( !ca.isSelfsigned()) {
- out.println(PEM.encode("CERTIFICATE", ca.getCertificate().getEncoded()));
- ca = ca.getParent();
- }
- if (req.getParameter("noAnchor") == null) {
- out.println(PEM.encode("CERTIFICATE", ca.getCertificate().getEncoded()));
- }
- }
+ CertExporter.writeCertCrt(c, out, doChain, includeAnchor);
} else if (cer) {
- out.write(cert.getEncoded());
+ CertExporter.writeCertCer(c, out, doChain, includeAnchor);
}
} catch (IllegalArgumentException e) {
resp.sendError(404);
String serial = pi;
Certificate c = Certificate.getBySerial(serial);
- if (c == null || LoginPage.getUser(req).getId() != c.getOwner().getId()) {
+ if (c == null || LoginPage.getAuthorizationContext(req).getTarget().getId() != c.getOwner().getId()) {
resp.sendError(404);
return;
}
vars.put("serial", URLEncoder.encode(serial, "UTF-8"));
vars.put("trustchain", new TrustchainIterable(c.getParent()));
try {
- vars.put("cert", c.cert());
+ vars.put("cert", PEM.encode("CERTIFICATE", c.cert().getEncoded()));
} catch (GeneralSecurityException e) {
e.printStackTrace();
}