import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.security.GeneralSecurityException;
+import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.sql.Date;
private String description = "";
+ public static final TranslateCommand NOT_LOADED = new TranslateCommand("Certificate could not be loaded");
+
+ public static final TranslateCommand NOT_PARSED = new TranslateCommand("Certificate could not be parsed");
+
/**
* Creates a new Certificate. WARNING: this is an internal API. Creating
* certificates for users must be done using the {@link CertificateRequest}
public String getDescription() {
return description;
}
+
+ public static Certificate locateCertificate(String serial, String certData) throws GigiApiException {
+ Certificate c = null;
+
+ if (serial != null && !serial.isEmpty()) {
+ c = getBySerialFriendly(serial);
+ if (c == null) {
+ return null;
+ }
+ }
+ if (certData != null && !certData.isEmpty()) {
+ X509Certificate c0;
+ X509Certificate cert = null;
+ final byte[] supplied;
+ try {
+ supplied = PEM.decode("CERTIFICATE", certData);
+ c0 = (X509Certificate) CertificateFactory.getInstance("X509").generateCertificate(new ByteArrayInputStream(supplied));
+ } catch (IllegalArgumentException e1) {
+ throw new GigiApiException(NOT_PARSED);
+ } catch (CertificateException e1) {
+ throw new GigiApiException(NOT_PARSED);
+ }
+ try {
+ c = getBySerialFriendly(c0.getSerialNumber().toString(16));
+ if (c == null) {
+ return null;
+ }
+ cert = c.cert();
+ if ( !Arrays.equals(supplied, cert.getEncoded())) {
+ return null;
+ }
+ } catch (IOException e) {
+ throw new GigiApiException(NOT_LOADED);
+ } catch (GeneralSecurityException e) {
+ throw new GigiApiException(NOT_LOADED);
+ }
+ }
+ if (c == null) {
+ throw new GigiApiException("No information to identify the correct certificate was provided.");
+ }
+ return c;
+ }
+
+ private static Certificate getBySerialFriendly(String serial) throws GigiApiException {
+ serial = serial.trim().toLowerCase();
+ int idx = 0;
+ while (idx < serial.length() && serial.charAt(idx) == '0') {
+ idx++;
+ }
+ serial = serial.substring(idx);
+ return Certificate.getBySerial(serial);
+ }
}
package club.wpia.gigi.pages.main;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.security.KeyFactory;
import java.security.PrivateKey;
import java.security.Signature;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.security.interfaces.RSAPrivateKey;
import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
import java.util.Base64;
import java.util.HashMap;
import java.util.Locale;
public static final String CHALLENGE_PREFIX = "This private key has been compromised. Challenge: ";
- public static final TranslateCommand NOT_LOADED = new TranslateCommand("Certificate could not be loaded");
-
public static final TranslateCommand NOT_FOUND = new TranslateCommand("Certificate to revoke not found");
private static final MailTemplate revocationNotice = new MailTemplate(KeyCompromiseForm.class.getResource("RevocationNotice.templ"));
if (RATE_LIMIT.isLimitExceeded(req.getRemoteAddr())) {
throw new RateLimitException();
}
- Certificate c = null;
- X509Certificate cert = null;
- String serial = req.getParameter("serial");
- String certData = req.getParameter("cert");
- if (serial != null && !serial.isEmpty()) {
- c = fetchCertificate(serial);
- try {
- cert = c.cert();
- } catch (IOException e) {
- throw new PermamentFormException(new GigiApiException(NOT_LOADED));
- } catch (GeneralSecurityException e) {
- throw new PermamentFormException(new GigiApiException(NOT_LOADED));
- }
- }
- if (certData != null && !certData.isEmpty()) {
- X509Certificate c0;
- byte[] supplied;
- try {
- supplied = PEM.decode("CERTIFICATE", certData);
- c0 = (X509Certificate) CertificateFactory.getInstance("X509").generateCertificate(new ByteArrayInputStream(supplied));
- } catch (IllegalArgumentException e1) {
- throw new PermamentFormException(new GigiApiException("Your certificate could not be parsed"));
- } catch (CertificateException e1) {
- throw new PermamentFormException(new GigiApiException("Your certificate could not be parsed"));
- }
- try {
- String ser = c0.getSerialNumber().toString(16);
- c = fetchCertificate(ser);
- cert = c.cert();
- if ( !Arrays.equals(supplied, cert.getEncoded())) {
- throw new PermamentFormException(new GigiApiException(NOT_FOUND));
- }
- } catch (IOException e) {
- throw new PermamentFormException(new GigiApiException(NOT_LOADED));
- } catch (GeneralSecurityException e) {
- throw new PermamentFormException(new GigiApiException(NOT_LOADED));
+ Certificate c;
+ try {
+ c = Certificate.locateCertificate(req.getParameter("serial"), req.getParameter("cert"));
+ if (c == null) {
+ throw new GigiApiException(NOT_FOUND);
}
+ } catch (GigiApiException e) {
+ throw new PermamentFormException(e);
}
- if (c == null) {
- throw new PermamentFormException(new GigiApiException("No certificate identification information provided"));
+
+ X509Certificate cert;
+ try {
+ cert = c.cert();
+ } catch (IOException | GeneralSecurityException e) {
+ throw new PermamentFormException(new GigiApiException(Certificate.NOT_LOADED));
}
+
if (c.getStatus() == CertificateStatus.REVOKED) {
return new SuccessMessageResult(new TranslateCommand("Certificate had already been revoked"));
}
return signature;
}
- private Certificate fetchCertificate(String serial) {
- Certificate c;
- serial = serial.trim().toLowerCase();
- int idx = 0;
- while (idx < serial.length() && serial.charAt(idx) == '0') {
- idx++;
- }
- serial = serial.substring(idx);
- c = Certificate.getBySerial(serial);
- if (c == null) {
- throw new PermamentFormException(new GigiApiException(NOT_FOUND));
- }
- return c;
- }
-
@Override
protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
vars.put("challenge", challenge);
params("serial=1&priv=%priv", NOT_FOUND),
params("serial=1%serial&priv=%priv", NOT_FOUND),
// missing certificate identification
- params("serial=&cert=&priv=%priv", "identification"),
- params("cert=&priv=%priv", "identification"),
- params("serial=&priv=%priv", "identification"),
- params("priv=%priv", "identification"),
+ params("serial=&cert=&priv=%priv", "No information to identify"),
+ params("cert=&priv=%priv", "No information to identify"),
+ params("serial=&priv=%priv", "No information to identify"),
+ params("priv=%priv", "No information to identify"),
// sign missing
params("serial=%serial&priv=&signature=", "No verification"),
params("serial=%serial&signature=", "No verification"),
params("serial=%serial", "No verification"),
params("cert=%cert&signature=%tamperedSignature", "Verification does not match"),
- params("cert=-_&signature=%signature", "certificate could not be parsed"),
+ params("cert=-_&signature=%signature", "Certificate could not be parsed"),
params("cert=%cert&signature=-_", "Signature is malformed"),
params("cert=%cert&priv=-_", "Private Key is malformed"),
};