import java.io.IOException;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.Calendar;
return;
}
HttpSession hs = req.getSession();
- String clientSerial = (String) hs.getAttribute(CERT_SERIAL);
+ BigInteger clientSerial = (BigInteger) hs.getAttribute(CERT_SERIAL);
if (clientSerial != null) {
X509Certificate[] cert = (X509Certificate[]) req.getAttribute("javax.servlet.request.X509Certificate");
if (cert == null || cert[0] == null//
- || !cert[0].getSerialNumber().toString(16).toLowerCase().equals(clientSerial) //
+ || !cert[0].getSerialNumber().equals(clientSerial) //
|| !cert[0].getIssuerDN().equals(hs.getAttribute(CERT_ISSUER))) {
hs.invalidate();
resp.sendError(403, "Certificate mismatch.");
package club.wpia.gigi.api;
import java.io.IOException;
+import java.math.BigInteger;
import java.security.cert.X509Certificate;
import javax.servlet.http.HttpServletRequest;
resp.sendError(403, "Error, cert authing required. No cert found.");
return;
}
- String serial = LoginPage.extractSerialFormCert(cert);
+ BigInteger serial = LoginPage.extractSerialFormCert(cert);
Certificate clientCert = Certificate.getBySerial(serial);
CertificateOwner u = CertificateOwner.getByEnabledSerial(serial);
if (u == null || clientCert == null) {
package club.wpia.gigi.api;
import java.io.IOException;
+import java.math.BigInteger;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import club.wpia.gigi.GigiApiException;
import club.wpia.gigi.dbObjects.Certificate;
import club.wpia.gigi.dbObjects.CertificateOwner;
import club.wpia.gigi.dbObjects.Organisation;
resp.sendError(500, "Error, requires a serial parameter");
return;
}
- target = target.toLowerCase();
- Certificate clientCert = Certificate.getBySerial(target);
+ BigInteger targetSerial;
+ try {
+ targetSerial = Certificate.normalizeSerial(target);
+ } catch (GigiApiException e) {
+ resp.sendError(500, "Error, requires valid serial");
+ return;
+ }
+ Certificate clientCert = Certificate.getBySerial(targetSerial);
if (clientCert == null) {
resp.sendError(500, "Error, requires valid serial");
return;
}
- CertificateOwner o = CertificateOwner.getByEnabledSerial(target);
+ CertificateOwner o = CertificateOwner.getByEnabledSerial(targetSerial);
if (o instanceof Organisation) {
Organisation org = (Organisation) o;
if (org.isSelfOrganisation()) {
import java.io.IOException;
import java.io.PrintWriter;
+import java.math.BigInteger;
import java.util.HashMap;
import javax.servlet.http.HttpServletRequest;
String pi = req.getPathInfo();
if (pi.equals(PATH_RESOLVE)) {
String serial = req.getParameter("serial");
- if (serial == null) {
+ if (serial == null || serial.isEmpty()) {
resp.sendError(500, "Error, requires serial");
return;
}
- Certificate c = Certificate.getBySerial(serial);
+ Certificate c = Certificate.getBySerial(new BigInteger(serial, 16));
if (c == null) {
resp.sendError(500, "Error, requires serial");
return;
package club.wpia.gigi.api;
import java.io.IOException;
+import java.math.BigInteger;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
}
String tserial = req.getParameter("serial");
- if (tserial == null) {
+ if (tserial == null || tserial.isEmpty()) {
resp.sendError(500, "Error, no Serial found");
return;
}
- Certificate c = Certificate.getBySerial(tserial);
+ Certificate c = Certificate.getBySerial(new BigInteger(tserial, 16));
if (c == null || c.getOwner() != u) {
resp.sendError(403, "Access Denied");
return;
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;
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}
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 String getDescription() {
return description;
}
+
+ public static Certificate locateCertificate(String serial, String certData) throws GigiApiException {
+ if (serial != null && !serial.isEmpty()) {
+ return getBySerial(normalizeSerial(serial));
+ }
+
+ if (certData != null && !certData.isEmpty()) {
+ final byte[] supplied;
+ final X509Certificate c0;
+ 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 {
+ Certificate c = getBySerial(c0.getSerialNumber());
+ if (c == null) {
+ return null;
+ }
+ 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);
+ }
+ }
+ throw new GigiApiException("No information to identify the correct certificate was provided.");
+ }
+
+ 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);
+ if ( !serial.matches("[0-9a-f]+")) {
+ throw new GigiApiException("Malformed serial");
+ }
+ return new BigInteger(serial, 16);
+ }
}
import java.io.ObjectOutputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
+import java.math.BigInteger;
import java.util.LinkedList;
import java.util.List;
}
}
- public static CertificateOwner getByEnabledSerial(String serial) {
+ public static CertificateOwner getByEnabledSerial(BigInteger serial) {
try (GigiPreparedStatement prep = new GigiPreparedStatement("SELECT `memid` FROM `certs` INNER JOIN `logincerts` ON `logincerts`.`id`=`certs`.`id` WHERE serial=? AND `revoked` is NULL")) {
- prep.setString(1, serial);
+ prep.setString(1, serial.toString(16));
GigiResultSet res = prep.executeQuery();
if (res.next()) {
return getById(res.getInt(1));
* if encoding fails
*/
public byte[] respondBytes(OCSPRequest req, CertId id) throws GeneralSecurityException, IOException {
- Certificate tcert = Certificate.getBySerial(id.getSerialNumber().toString(16).toLowerCase());
+ Certificate tcert = Certificate.getBySerial(id.getSerialNumber());
if (tcert == null) {
return OCSPResponse.invalid();
}
import java.io.IOException;
import java.io.PrintWriter;
+import java.math.BigInteger;
import java.security.cert.X509Certificate;
import java.util.Map;
}
private void tryAuthWithCertificate(HttpServletRequest req, X509Certificate x509Certificate) {
- String serial = extractSerialFormCert(x509Certificate);
+ BigInteger serial = extractSerialFormCert(x509Certificate);
User user = fetchUserBySerial(serial);
if (user == null) {
return;
req.getSession().setAttribute(LOGIN_METHOD, new TranslateCommand("Certificate"));
}
- public static String extractSerialFormCert(X509Certificate x509Certificate) {
- return x509Certificate.getSerialNumber().toString(16).toLowerCase();
+ public static BigInteger extractSerialFormCert(X509Certificate x509Certificate) {
+ return x509Certificate.getSerialNumber();
}
- public static User fetchUserBySerial(String serial) {
- if ( !serial.matches("[a-f0-9]+")) {
- throw new Error("serial malformed.");
- }
-
+ public static User fetchUserBySerial(BigInteger serial) {
CertificateOwner o = CertificateOwner.getByEnabledSerial(serial);
if (o == null || !(o instanceof User)) {
return null;
package club.wpia.gigi.pages.account.certs;
import java.io.PrintWriter;
+import java.math.BigInteger;
import java.util.LinkedList;
import java.util.Map;
}
LinkedList<Job> revokes = new LinkedList<Job>();
for (String serial : certs) {
- Certificate c = Certificate.getBySerial(serial);
+ Certificate c = Certificate.getBySerial(new BigInteger(serial, 16));
if (c == null || c.getOwner() != target) {
continue;
}
import java.io.IOException;
import java.io.PrintWriter;
+import java.math.BigInteger;
import java.net.URLEncoder;
import java.security.GeneralSecurityException;
import java.security.cert.X509Certificate;
cer = true;
pi = pi.substring(0, pi.length() - 4);
}
- String serial = pi;
+ BigInteger serial = new BigInteger(pi, 16);
try {
Certificate c = Certificate.getBySerial(serial);
if (c == null || ( !support && LoginPage.getAuthorizationContext(req).getTarget().getId() != c.getOwner().getId())) {
pi = pi.substring(1);
String serial = pi;
- Certificate c = Certificate.getBySerial(serial);
+ Certificate c = Certificate.getBySerial(new BigInteger(serial, 16));
Language l = LoginPage.getLanguage(req);
if (c == null || ( !support && LoginPage.getAuthorizationContext(req).getTarget().getId() != c.getOwner().getId())) {
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);
}
BigInteger serial = first.getSerialNumber();
- Certificate c = Certificate.getBySerial(serial.toString(16));
+ Certificate c = Certificate.getBySerial(serial);
if (c == null) {
return "Certificate not found: Serial " + serial.toString(16) + " missing.";
}
import static org.junit.Assert.*;
import java.io.IOException;
+import java.math.BigInteger;
import java.security.GeneralSecurityException;
import java.security.KeyPair;
import java.security.PrivateKey;
testFails(CertificateStatus.ISSUED, c);
- Certificate c2 = Certificate.getBySerial(c.getSerial());
+ Certificate c2 = Certificate.getBySerial(new BigInteger(c.getSerial(), 16));
assertNotNull(c2);
assertEquals(2, c2.getSANs().size());
assertEquals(c.getSANs().get(0).getName(), c2.getSANs().get(0).getName());
--- /dev/null
+package club.wpia.gigi.dbObjects;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import club.wpia.gigi.GigiApiException;
+
+@RunWith(Parameterized.class)
+public class TestSerialNormalization {
+
+ private final String input;
+
+ private final String normalized;
+
+ @Parameters
+ public static List<String[]> params() {
+ return Arrays.asList(new String[] {
+ "dead00beef", "dead00beef"
+ }, new String[] {
+ "Dead00beef", "dead00beef"
+ }, new String[] {
+ "DEAD00BEEF", "dead00beef"
+ }, new String[] {
+ "00DEAD00BEEF", "dead00beef"
+ }, new String[] {
+ " 00dead00beef", "dead00beef"
+ }, new String[] {
+ "00dead00beef ", "dead00beef"
+ }, new String[] {
+ " 00dead00beef ", "dead00beef"
+ }, new String[] {
+ " 00dead 00beef ", "dead00beef"
+ }, new String[] {
+ " 00d ead 00beef ", "dead00beef"
+ }, new String[] {
+ "de:ad:00:be:ef", "dead00beef"
+ }, new String[] {
+ "00:de:ad:03:be:ef", "dead03beef"
+ }, new String[] {
+ "08:15:47:11", "8154711"
+ }, new String[] {
+ " 00:de:Ad:43:be:ef ", "dead43beef"
+ }, new String[] {
+ "00:de:ad:43:beef", null
+ }, new String[] {
+ "g", null
+ }, new String[] {
+ ".", null
+ });
+ }
+
+ public TestSerialNormalization(String input, String normalized) {
+ this.input = input;
+ this.normalized = normalized;
+ }
+
+ @Test
+ public void testNormalize() throws GigiApiException {
+ if (normalized == null) {
+ try {
+ Certificate.normalizeSerial(input);
+ fail("malformed serial accepted");
+ } catch (GigiApiException e) {
+ return;
+ }
+ }
+ assertEquals(normalized, Certificate.normalizeSerial(input).toString(16));
+ }
+}
@Test
public void testSetLoginEnabled() throws IOException, GeneralSecurityException {
X509Certificate parsedLoginNotEnabled = createCertWithValidity("&validFrom=now&validity=1m", false);
- assertNull(CertificateOwner.getByEnabledSerial(parsedLoginNotEnabled.getSerialNumber().toString(16).toLowerCase()));
+ assertNull(CertificateOwner.getByEnabledSerial(parsedLoginNotEnabled.getSerialNumber()));
X509Certificate parsedLoginEnabled = createCertWithValidity("&validFrom=now&validity=1m", true);
- assertEquals(u, CertificateOwner.getByEnabledSerial(parsedLoginEnabled.getSerialNumber().toString(16).toLowerCase()));
+ assertEquals(u, CertificateOwner.getByEnabledSerial(parsedLoginEnabled.getSerialNumber()));
}
@Test
params("cert=%cert&priv=%priv", null),// cert+key
params("serial=%serial&signature=%signature", null),
// Zero serial
- params("serial=0000&priv=%priv", NOT_FOUND),
- params("serial=0lkd&priv=%priv", NOT_FOUND),
+ params("serial=0000&priv=%priv", "Malformed serial"),
+ params("serial=0lkd&priv=%priv", "Malformed serial"),
// tampered cert
params("cert=%tamperedCert&priv=%priv", "not be parsed"),
params("cert=%cert&priv=%tamperedPriv", "Private Key is malformed"),
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"),
};
projects / gigi.git / commitdiff