upd: make system-keywords configurable

Change-Id: I95ac359fac48fbe8685606d5a1bd2895bdb0a4fc

diff --git a/config/gigi.properties.template b/config/gigi.properties.template
index f4a9671981ebb8bfd40dff268a6b628ebe84f19c..b90f534632f2508f05a2694ba650b9c916f2442b 100644 (file)
--- a/config/gigi.properties.template
+++ b/config/gigi.properties.template
@@ -19,4 +19,5 @@ time.reverificationDays=90
 time.verificationFreshMonths=39
 time.verificationMaxAgeMonths=24
 
-appName=SomeCA
\ No newline at end of file
+appName=SomeCA
+appIdentifier=someca

diff --git a/doc/jenkinsJob/dyn-txt.php b/doc/jenkinsJob/dyn-txt.php
index c7b6cfeccb387ea9d363abc2696133955d2d31ec..f2fc49d92c08253e6fe7960717cb2256ff0de5ed 100644 (file)
--- a/doc/jenkinsJob/dyn-txt.php
+++ b/doc/jenkinsJob/dyn-txt.php
@@ -1,13 +1,15 @@
 <?php
 header("Content-type: text/plain");
 
-define("ZONENAME", "cacert.dyn.dogcraft.de");
-define("KEYNAME", "keys/Kcacert.dyn.dogcraft.de.+165+54687.key");
+define("ZONENAME", "your-zonename");
+define("KEYNAME", "your/dns/update.key");
+$appIdentifier = "someca";
 
 if(!isset($_GET['token']) || !isset($_GET['t1']) || !isset($_GET['t2']) || !isset($_GET['action'])){
   die("Error");
 }
-if($_GET['token'] != "rD1m3A9ew6Hs4DIv7lnTxNbR6dr"){
+$link = mysqli_connect("localhost", "db-user", "db-pw", "db");
+if($_GET['token'] != "your-token-here"){
   die ();
 }
 $t1 = $_GET['t1'];
@@ -15,41 +17,49 @@ $t2 = $_GET['t2'];
 if(!preg_match("/^[a-zA-Z0-9]+$/", $t1) || !preg_match("/^[a-zA-Z0-9]+$/", $t2)){
   die("Error");
 }
-$todelete = array();
 
-if(file_exists("data.php")){
-  include ("data.php");
-}
+$dnscalls = "";
+if($t1!="purge"){
+  $stmt = $link->prepare("INSERT INTO tokens SET type=?, name=?");
+  $stmt->bind_param("ss", $type, $name);
+  $type=$_GET['action'];
+  $name = $t1;
+  if($_GET['action'] == "http"){
+    $stmt->execute();
 
-$time = time()/60;
-if(!isset($todelete[$time])){
-  $todelete[$time] = array();
+    file_put_contents(".well-known/$appIdentifier-challenge/$t1.txt", $t2);
+  } else if($_GET['action'] == "dns") {
+    $stmt->execute();
+
+    $dnscalls .= "update delete {$t1}._$appIdentifier._auth." . ZONENAME . " TXT\n"
+      ."update add {$t1}._$appIdentifier._auth." . ZONENAME . " 60 TXT {$t2}\n";
+  }
 }
+$stmt = $link->prepare("SELECT type, name FROM tokens WHERE created + 60000 < CURRENT_TIMESTAMP;");
+$stmt->execute();
 
-$dnscalls = "";
+/* bind result variables */
+$stmt->bind_result($type, $name);
+$todelete = array();
 
-if($_GET['action'] == "http"){
-  $todelete[$time][] = array("http", $t1);
-  file_put_contents("cacert-$t1.txt", $t2);
-} else if($_GET['action'] == "dns") {
-  $todelete[$time][] = array("dns", $t1);
-  $dnscalls .= "update delete {$t1}._cacert._auth." . ZONENAME . " TXT\n"
-    ."update add {$t1}._cacert._auth." . ZONENAME . " 60 TXT {$t2}\n";
-}
-$copy = $todelete;
-foreach($copy as $nt => $ar){
-  if($nt < $time - 2){
-    unset($todelete[$nt]);
-    foreach($ar as $act){
-      if($act[0] == "http"){
-        unlink("cacert-{$act[1]}.txt");
-      } else if($act[0] == "dns") {
-        $dnscalls .= "update delete {$act[1]}._cacert._auth." . ZONENAME . " TXT\n";
-      }
-    }
+/* fetch value */
+while($stmt->fetch()){
+  if($type == "http"){
+    unlink(".well-known/$appIdentifier-challenge/{$name}.txt");
+  } else if($type == "dns") {
+    $dnscalls .= "update delete {$name}._$appIdentifier._auth." . ZONENAME . " TXT\n";
   }
+  $todelete[] = array("type"=>$type, "name"=>$name);
+}
+
+$stmtd = $link->prepare("DELETE FROM tokens WHERE type=? AND name=?");
+$stmtd->bind_param("ss", $type, $name);
+
+foreach($todelete as $val){
+  $type = $val["type"];
+  $name = $val["name"];
+  $stmtd->execute();
 }
-file_put_contents("data.php", "<?php \$todelete = ".var_export($todelete,true).";\n?>");
 
 if($dnscalls != ""){
   dnsAction($dnscalls);
@@ -62,4 +72,3 @@ function dnsAction($command) {
   fwrite($nsupdate, $call);
   $retval = pclose($nsupdate); // nsupdate doesn't return anything useful when called this way
 }
-

diff --git a/src/club/wpia/gigi/util/ServerConstants.java b/src/club/wpia/gigi/util/ServerConstants.java
index d95db1b538f2b54a2a72f91df7d0507f98ef3959..8ff3883cf99f4f923a2b634743d0f1a064edff70 100644 (file)
--- a/src/club/wpia/gigi/util/ServerConstants.java
+++ b/src/club/wpia/gigi/util/ServerConstants.java
@@ -60,6 +60,8 @@ public class ServerConstants {
 
     private static String appName = null;
 
+    private static String appIdentifier = null;
+
     public static void init(Properties conf) {
         securePort = port = "";
         if ( !conf.getProperty("https.port").equals("443")) {
@@ -81,6 +83,10 @@ public class ServerConstants {
         if (appName == null) {
             throw new Error("App name missing");
         }
+        appIdentifier = conf.getProperty("appIdentifier");
+        if (appIdentifier == null) {
+            throw new Error("App identifier missing");
+        }
     }
 
     public static String getHostName(Host h) {
@@ -150,4 +156,11 @@ public class ServerConstants {
         return appName;
     }
 
+    public static String getAppIdentifier() {
+        if (appIdentifier == null) {
+            throw new Error("AppIdentifier not initialized.");
+        }
+        return appIdentifier;
+    }
+
 }

diff --git a/src/club/wpia/gigi/util/SystemKeywords.java b/src/club/wpia/gigi/util/SystemKeywords.java
index 847df894a57848471b1bf185187e50f283843bde..32bf711aabc1994d9e3cac633feb8305e718c7de 100644 (file)
--- a/src/club/wpia/gigi/util/SystemKeywords.java
+++ b/src/club/wpia/gigi/util/SystemKeywords.java
@@ -1,14 +1,16 @@
 package club.wpia.gigi.util;
 
+import club.wpia.gigi.util.ServerConstants.Host;
+
 public class SystemKeywords {
 
-    public static final String CAA_NAME = "someca.org";
+    public static final String CAA_NAME = ServerConstants.getSuffix();
 
-    public static final String SMTP_NAME = "www.someca.org";
+    public static final String SMTP_NAME = ServerConstants.getHostName(Host.WWW);
 
-    public static final String SMTP_PSEUDO_FROM = "returns@someca.org";
+    public static final String SMTP_PSEUDO_FROM = "returns@" + ServerConstants.getSuffix();
 
-    public static final String HTTP_CHALLENGE_PREFIX = "cacert-";
+    public static final String HTTP_CHALLENGE_PREFIX = ".well-known/" + ServerConstants.getAppIdentifier() + "-challenge/";
 
-    public static final String DNS_PREFIX = "_cacert";
+    public static final String DNS_PREFIX = "_" + ServerConstants.getAppIdentifier();
 }

diff --git a/tests/club/wpia/gigi/testUtils/ConfiguredTest.java b/tests/club/wpia/gigi/testUtils/ConfiguredTest.java
index 025f1d6cc393390f1268469980e5a74395644347..cdacf6922f0f4af08d51e5484f210211fa96b654 100644 (file)
--- a/tests/club/wpia/gigi/testUtils/ConfiguredTest.java
+++ b/tests/club/wpia/gigi/testUtils/ConfiguredTest.java
@@ -27,14 +27,14 @@ import org.junit.BeforeClass;
 
 import club.wpia.gigi.GigiApiException;
 import club.wpia.gigi.database.DatabaseConnection;
-import club.wpia.gigi.database.GigiPreparedStatement;
 import club.wpia.gigi.database.DatabaseConnection.Link;
+import club.wpia.gigi.database.GigiPreparedStatement;
 import club.wpia.gigi.database.SQLFileManager.ImportType;
+import club.wpia.gigi.dbObjects.CATS.CATSType;
 import club.wpia.gigi.dbObjects.CertificateProfile;
 import club.wpia.gigi.dbObjects.Domain;
 import club.wpia.gigi.dbObjects.DomainPingType;
 import club.wpia.gigi.dbObjects.User;
-import club.wpia.gigi.dbObjects.CATS.CATSType;
 import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail;
 import club.wpia.gigi.util.DatabaseManager;
 import club.wpia.gigi.util.DomainAssessment;
@@ -118,6 +118,7 @@ public abstract class ConfiguredTest {
         mainProps.setProperty("name.api", testProps.getProperty("name.api"));
 
         mainProps.setProperty("appName", "SomeCA");
+        mainProps.setProperty("appIdentifier", "someca");
 
         mainProps.setProperty("https.port", testProps.getProperty("serverPort.https"));
         mainProps.setProperty("http.port", testProps.getProperty("serverPort.http"));