import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.math.BigInteger;
import java.security.GeneralSecurityException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
private static final String CONCAT = "string_agg(concat('/', `name`, '=', REPLACE(REPLACE(value, '\\\\', '\\\\\\\\'), '/', '\\\\/')), '')";
- public synchronized static Certificate getBySerial(String serial) {
- if (serial == null || "".equals(serial)) {
+ public synchronized static Certificate getBySerial(BigInteger serial) {
+ if (serial == null) {
return null;
}
try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT certs.id, " + CONCAT + " as `subject`, `md`,`memid`, `profile`, `certs`.`serial`, `certs`.`description` FROM `certs` LEFT JOIN `certAvas` ON `certAvas`.`certId`=`certs`.`id` WHERE `serial`=? GROUP BY `certs`.`id`")) {
- ps.setString(1, serial);
+ ps.setString(1, serial.toString(16));
GigiResultSet rs = ps.executeQuery();
if ( !rs.next()) {
return null;
}
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;
- }
+ return getBySerial(normalizeSerial(serial));
}
+
if (certData != null && !certData.isEmpty()) {
- X509Certificate c0;
- X509Certificate cert = null;
final byte[] supplied;
+ final X509Certificate c0;
try {
supplied = PEM.decode("CERTIFICATE", certData);
c0 = (X509Certificate) CertificateFactory.getInstance("X509").generateCertificate(new ByteArrayInputStream(supplied));
throw new GigiApiException(NOT_PARSED);
}
try {
- c = getBySerialFriendly(c0.getSerialNumber().toString(16));
+ Certificate c = getBySerial(c0.getSerialNumber());
if (c == null) {
return null;
}
- cert = c.cert();
+ X509Certificate cert = c.cert();
if ( !Arrays.equals(supplied, cert.getEncoded())) {
return null;
}
+ return c;
} 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;
+ throw new GigiApiException("No information to identify the correct certificate was provided.");
}
- private static Certificate getBySerialFriendly(String serial) throws GigiApiException {
- serial = serial.trim().toLowerCase();
+ public static BigInteger normalizeSerial(String serial) throws GigiApiException {
+ serial = serial.replace(" ", "");
+ serial = serial.toLowerCase();
+ if (serial.matches("[0-9a-f]{2}(:[0-9a-f]{2})*")) {
+ serial = serial.replace(":", "");
+ }
int idx = 0;
while (idx < serial.length() && serial.charAt(idx) == '0') {
idx++;
}
serial = serial.substring(idx);
- return Certificate.getBySerial(serial);
+ if ( !serial.matches("[0-9a-f]+")) {
+ throw new GigiApiException("Malformed serial");
+ }
+ return new BigInteger(serial, 16);
}
}