From 159676e365e1eb7a1039ba427c8acb1bb2bcfc81 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Thu, 16 Jun 2016 12:14:54 +0200 Subject: [PATCH] fix: email + domain ignore case fixes #15 Change-Id: I8928aa862393ef7977e91393ae8d91667e790fe8 --- src/org/cacert/gigi/database/DatabaseConnection.java | 2 +- src/org/cacert/gigi/database/upgrade/from_10.sql | 2 ++ src/org/cacert/gigi/dbObjects/Domain.java | 1 + src/org/cacert/gigi/dbObjects/EmailAddress.java | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 src/org/cacert/gigi/database/upgrade/from_10.sql diff --git a/src/org/cacert/gigi/database/DatabaseConnection.java b/src/org/cacert/gigi/database/DatabaseConnection.java index f1c1c011..09093669 100644 --- a/src/org/cacert/gigi/database/DatabaseConnection.java +++ b/src/org/cacert/gigi/database/DatabaseConnection.java @@ -99,7 +99,7 @@ public class DatabaseConnection { } - public static final int CURRENT_SCHEMA_VERSION = 10; + public static final int CURRENT_SCHEMA_VERSION = 11; public static final int CONNECTION_TIMEOUT = 24 * 60 * 60; diff --git a/src/org/cacert/gigi/database/upgrade/from_10.sql b/src/org/cacert/gigi/database/upgrade/from_10.sql new file mode 100644 index 00000000..8bbb6bb2 --- /dev/null +++ b/src/org/cacert/gigi/database/upgrade/from_10.sql @@ -0,0 +1,2 @@ +UPDATE "emails" SET "email" = lower("email"); +UPDATE "domains" SET "domain" = lower("domain"); diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java index 58765303..fa6a6d0e 100644 --- a/src/org/cacert/gigi/dbObjects/Domain.java +++ b/src/org/cacert/gigi/dbObjects/Domain.java @@ -51,6 +51,7 @@ public class Domain implements IdCachable, Verifyable { } public Domain(User actor, CertificateOwner owner, String suffix) throws GigiApiException { + suffix = suffix.toLowerCase(); synchronized (Domain.class) { checkCertifyableDomain(suffix, actor.isInGroup(Group.CODESIGNING)); this.owner = owner; diff --git a/src/org/cacert/gigi/dbObjects/EmailAddress.java b/src/org/cacert/gigi/dbObjects/EmailAddress.java index d92338ca..04108ea2 100644 --- a/src/org/cacert/gigi/dbObjects/EmailAddress.java +++ b/src/org/cacert/gigi/dbObjects/EmailAddress.java @@ -42,6 +42,7 @@ public class EmailAddress implements IdCachable, Verifyable { } public EmailAddress(User owner, String address, Locale mailLocale) throws GigiApiException { + address = address.toLowerCase(); if ( !EmailProvider.MAIL.matcher(address).matches()) { throw new IllegalArgumentException("Invalid email."); } -- 2.39.2