X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificate.java;h=12aa2993f3b12cbdbec7122e5248cc1daa7f0bd0;hp=b0c85e96b9f691b13b6bdd68e5b678b5b95264da;hb=0b86fb147b4a61f315770fa5bba4466ca18ddfa8;hpb=d7c0f42f9a60ae6dfff83d1f01e547bbf5681c0d diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java index b0c85e96..12aa2993 100644 --- a/src/org/cacert/gigi/dbObjects/Certificate.java +++ b/src/org/cacert/gigi/dbObjects/Certificate.java @@ -17,6 +17,7 @@ import java.util.List; import java.util.Map.Entry; import org.cacert.gigi.GigiApiException; +import org.cacert.gigi.database.DBEnum; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; import org.cacert.gigi.output.template.Outputable; @@ -25,7 +26,7 @@ import org.cacert.gigi.util.KeyStorage; public class Certificate implements IdCachable { - public enum SANType { + public enum SANType implements DBEnum { EMAIL("email"), DNS("DNS"); private final String opensslName; @@ -37,6 +38,11 @@ public class Certificate implements IdCachable { public String getOpensslName() { return opensslName; } + + @Override + public String getDBName() { + return opensslName; + } } public static class SubjectAlternateName implements Comparable { @@ -478,7 +484,7 @@ public class Certificate implements IdCachable { public static Certificate[] findBySANPattern(String request, SANType type) { try (GigiPreparedStatement prep = new GigiPreparedStatement("SELECT `certId` FROM `subjectAlternativeNames` WHERE `contents` LIKE ? and `type`=?::`SANType` GROUP BY `certId` LIMIT 100", true)) { prep.setString(1, request); - prep.setString(2, type.getOpensslName()); + prep.setEnum(2, type); return fetchCertsToArray(prep); } }