X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FDomain.java;h=eecf37669a3e91438e40ba0c8bf103c7de87caca;hb=73ac9fa5e36efef14464f40294e43ef85fadf320;hp=78ebc9bbf78ff3f96edee4b8ef27a3888925f183;hpb=9c05ed99bc13cd875e16f1f8c72376ed29f57498;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java
index 78ebc9bb..eecf3766 100644
--- a/src/org/cacert/gigi/dbObjects/Domain.java
+++ b/src/org/cacert/gigi/dbObjects/Domain.java
@@ -1,20 +1,13 @@
 package org.cacert.gigi.dbObjects;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.IDN;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Properties;
-import java.util.Set;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
-import org.cacert.gigi.util.PublicSuffixes;
+import org.cacert.gigi.util.DomainAssessment;
 
 public class Domain implements IdCachable, Verifyable {
 
@@ -24,18 +17,6 @@ public class Domain implements IdCachable, Verifyable {
 
     private int id;
 
-    private static final Set<String> IDNEnabledTLDs;
-
-    static {
-        Properties CPS = new Properties();
-        try (InputStream resourceAsStream = Domain.class.getResourceAsStream("CPS.properties")) {
-            CPS.load(resourceAsStream);
-            IDNEnabledTLDs = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(CPS.getProperty("IDN-enabled").split(","))));
-        } catch (IOException e) {
-            throw new Error(e);
-        }
-    }
-
     private Domain(int id) {
         try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `memid`, `domain` FROM `domains` WHERE `id`=? AND `deleted` IS NULL")) {
             ps.setInt(1, id);
@@ -51,68 +32,15 @@ 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));
+            DomainAssessment.checkCertifiableDomain(suffix, actor.isInGroup(Group.CODESIGNING), true);
             this.owner = owner;
             this.suffix = suffix;
             insert();
         }
     }
 
-    public static void checkCertifyableDomain(String s, boolean hasPunycodeRight) throws GigiApiException {
-        String[] parts = s.split("\\.", -1);
-        if (parts.length < 2) {
-            throw new GigiApiException("Domain does not contain '.'.");
-        }
-        for (int i = parts.length - 1; i >= 0; i--) {
-            if ( !isVaildDomainPart(parts[i], hasPunycodeRight)) {
-                throw new GigiApiException("Syntax error in Domain");
-            }
-        }
-        String publicSuffix = PublicSuffixes.getInstance().getRegistrablePart(s);
-        if ( !s.equals(publicSuffix)) {
-            throw new GigiApiException("You may only register a domain with exactly one lable before the public suffix.");
-        }
-        checkPunycode(parts[0], s.substring(parts[0].length() + 1));
-    }
-
-    private static void checkPunycode(String label, String domainContext) throws GigiApiException {
-        if (label.charAt(2) != '-' || label.charAt(3) != '-') {
-            return; // is no punycode
-        }
-        if ( !IDNEnabledTLDs.contains(domainContext)) {
-            throw new GigiApiException("Punycode label could not be positively verified.");
-        }
-        if ( !label.startsWith("xn--")) {
-            throw new GigiApiException("Unknown ACE prefix.");
-        }
-        try {
-            String unicode = IDN.toUnicode(label);
-            if (unicode.startsWith("xn--")) {
-                throw new GigiApiException("Punycode label could not be positively verified.");
-            }
-        } catch (IllegalArgumentException e) {
-            throw new GigiApiException("Punycode label could not be positively verified.");
-        }
-    }
-
-    public static boolean isVaildDomainPart(String s, boolean allowPunycode) {
-        if ( !s.matches("[a-z0-9-]+")) {
-            return false;
-        }
-        if (s.charAt(0) == '-' || s.charAt(s.length() - 1) == '-') {
-            return false;
-        }
-        if (s.length() > 63) {
-            return false;
-        }
-        boolean canBePunycode = s.length() >= 4 && s.charAt(2) == '-' && s.charAt(3) == '-';
-        if (canBePunycode && !allowPunycode) {
-            return false;
-        }
-        return true;
-    }
-
     private static void checkInsert(String suffix) throws GigiApiException {
         try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `domains` WHERE (`domain`=? OR (CONCAT('.', `domain`)=RIGHT(?,LENGTH(`domain`)+1)  OR RIGHT(`domain`,LENGTH(?)+1)=CONCAT('.',?))) AND `deleted` IS NULL")) {
             ps.setString(1, suffix);
@@ -123,7 +51,7 @@ public class Domain implements IdCachable, Verifyable {
             boolean existed = rs.next();
             rs.close();
             if (existed) {
-                throw new GigiApiException("Domain could not be inserted. Domain is already valid.");
+                throw new GigiApiException("Domain could not be inserted. Domain is already known to the system.");
             }
         }
     }
@@ -171,7 +99,7 @@ public class Domain implements IdCachable, Verifyable {
         LinkedList<DomainPingConfiguration> configs = this.configs;
         if (configs == null) {
             configs = new LinkedList<>();
-            try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT id FROM pingconfig WHERE domainid=?")) {
+            try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT id FROM pingconfig WHERE domainid=? AND `deleted` IS NULL")) {
                 ps.setInt(1, id);
                 GigiResultSet rs = ps.executeQuery();
                 while (rs.next()) {
@@ -194,6 +122,14 @@ public class Domain implements IdCachable, Verifyable {
         configs = null;
     }
 
+    public void clearPings() throws GigiApiException {
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `pingconfig` SET `deleted`=CURRENT_TIMESTAMP WHERE `deleted` is NULL AND `domainid`=?")) {
+            ps.setInt(1, id);
+            ps.execute();
+        }
+        configs = null;
+    }
+
     public synchronized void verify(String hash) throws GigiApiException {
         try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `domainPinglog` SET `state`='success' WHERE `challenge`=? AND `state`='open' AND `configId` IN (SELECT `id` FROM `pingconfig` WHERE `domainid`=? AND `type`='email')")) {
             ps.setString(1, hash);