Changeset 1791

Timestamp:

01/02/11 20:40:46 (2 years ago)

Author:

ahu

Message:

hook up activate-domain-key, deactivate-domain-key, remove-domain-key

Location:

trunk/pdns/pdns

Files:

• backends/gsql/gsqlbackend.cc (modified) (3 diffs)
• backends/gsql/gsqlbackend.hh (modified) (2 diffs)
• dbdnsseckeeper.cc (modified) (1 diff)
• pdnssec.cc (modified) (3 diffs)
• ueberbackend.cc (modified) (1 diff)
• ueberbackend.hh (modified) (1 diff)

trunk/pdns/pdns/backends/gsql/gsqlbackend.cc

@@ -102 +102 @@
       SOAData sd;
       if(!getSOA(domain,sd)) 
-        L<<Logger::Notice<<"No serial for '"<<domain<<"' found - zone is missing?"<<endl;
+        L<<Logger::Notice<<"No serial for '"<<domain<<"' found - zone is missing?"<<endl;
       else
-        di.serial=sd.serial;
+        di.serial=sd.serial;
     }
     catch(AhuException &ae){
@@ -251 +251 @@
   d_ClearDomainMetadataQuery = "delete from domainmetadata where domain_id=(select id from domains where name='%s') and domainmetadata.kind='%s'";
   d_SetDomainMetadataQuery = "insert into domainmetadata (domain_id, kind, content) select id, '%s', '%s' from domains where name='%s'";
+  
+  d_ActivateDomainKeyQuery = "update cryptokeys set active=1 where domain_id=(select id from domains where name='%s') and  cryptokeys.id=%d";
+  d_DeactivateDomainKeyQuery = "update cryptokeys set active=0 where domain_id=(select id from domains where name='%s') and  cryptokeys.id=%d";
+  d_RemoveDomainKeyQuery = "delete from cryptokeys where domain_id=(select id from domains where name='%s') and cryptokeys.id=%d";
 }
 
@@ -327 +331 @@
   return 1; // XXX FIXME, no idea how to get the id
 }
+
+bool GSQLBackend::activateDomainKey(const string& name, unsigned int id)
+{
+  char output[1024];
+  snprintf(output,sizeof(output)-1,d_ActivateDomainKeyQuery.c_str(), sqlEscape(name).c_str(), id);
+
+  try {
+    d_db->doCommand(output);
+  }
+  catch (SSqlException &e) {
+    throw AhuException("GSQLBackend unable to activate key: "+e.txtReason());
+  }
+  return true;
+}
+
+bool GSQLBackend::deactivateDomainKey(const string& name, unsigned int id)
+{
+  char output[1024];
+  snprintf(output,sizeof(output)-1,d_DeactivateDomainKeyQuery.c_str(), sqlEscape(name).c_str(), id);
+
+  try {
+    d_db->doCommand(output);
+  }
+  catch (SSqlException &e) {
+    throw AhuException("GSQLBackend unable to deactivate key: "+e.txtReason());
+  }
+  return true;
+}
+
+bool GSQLBackend::removeDomainKey(const string& name, unsigned int id)
+{
+  char output[1024];
+  snprintf(output,sizeof(output)-1,d_RemoveDomainKeyQuery.c_str(), sqlEscape(name).c_str(), id);
+
+  try {
+    d_db->doCommand(output);
+  }
+  catch (SSqlException &e) {
+    throw AhuException("GSQLBackend unable to remove key: "+e.txtReason());
+  }
+  return true;
+}
+
+
 
 bool GSQLBackend::getDomainKeys(const string& name, unsigned int kind, std::vector<KeyData>& keys)

trunk/pdns/pdns/backends/gsql/gsqlbackend.hh

@@ -48 +48 @@
   bool getDomainMetadata(const string& name, const std::string& kind, std::vector<std::string>& meta);
   bool setDomainMetadata(const string& name, const std::string& kind, const std::vector<std::string>& meta);
+  
+  bool removeDomainKey(const string& name, unsigned int id);
+  bool activateDomainKey(const string& name, unsigned int id);
+  bool deactivateDomainKey(const string& name, unsigned int id);
+  
 private:
   string d_qname;
@@ -87 +92 @@
   string d_ClearDomainMetadataQuery;
   string d_SetDomainMetadataQuery;
+
+  string d_RemoveDomainKeyQuery;
+  string d_ActivateDomainKeyQuery;
+  string d_DeactivateDomainKeyQuery;
 protected:  
   bool d_dnssecQueries;

trunk/pdns/pdns/dbdnsseckeeper.cc

@@ -89 +89 @@
 void DNSSECKeeper::removeKey(const std::string& zname, unsigned int id)
 {
-  // XXX
+  UeberBackend db;
+  db.removeDomainKey(zname, id);
 }
 
 void DNSSECKeeper::deactivateKey(const std::string& zname, unsigned int id)
 {
-  // XX
+  UeberBackend db;
+  db.deactivateDomainKey(zname, id);
 }
 
 void DNSSECKeeper::activateKey(const std::string& zname, unsigned int id)
 {
-  // XXX
+  UeberBackend db;
+  db.activateDomainKey(zname, id);
 }
 

trunk/pdns/pdns/pdnssec.cc

@@ -24 +24 @@
   return arg;
 }
-
 
 string humanTime(time_t t)
@@ -257 +256 @@
     const string& zone=cmds[1];
     // need to get algorithm & ksk or zsk from commandline
+    cerr<<"Adding a ZSK"<<endl;
     dk.addKey(zone, 1, 5, 0); 
-    cerr<<"Not implemented"<<endl;
   }
   else if(cmds[0] == "remove-zone-key") {
@@ -323 +322 @@
     DNSSECPrivateKey dpk=dk.getKeyById(zone, id);
     cout << dpk.d_key.convertToISC(dpk.d_algorithm) <<endl;
-  }
+  }  
   else if(cmds[0]=="import-zone-key") {
-    cerr<<"This isn't quite right yet!"<<endl; /// XXX FIXME
+    if(cmds.size()!=3) {
+      cerr<<"Syntax: pdnssec import-zone-key zone-name filename"<<endl;
+      exit(1);
+    }
     string zone=cmds[1];
     string fname=cmds[2];

trunk/pdns/pdns/ueberbackend.cc

@@ -130 +130 @@
   BOOST_FOREACH(DNSBackend* db, backends) {
     if(db->setDomainMetadata(name, kind, meta))
+      return true;
+  }
+  return false;
+}
+
+bool UeberBackend::activateDomainKey(const string& name, unsigned int id)
+{
+  BOOST_FOREACH(DNSBackend* db, backends) {
+    if(db->activateDomainKey(name, id))
+      return true;
+  }
+  return false;
+}
+
+bool UeberBackend::deactivateDomainKey(const string& name, unsigned int id)
+{
+  BOOST_FOREACH(DNSBackend* db, backends) {
+    if(db->deactivateDomainKey(name, id))
+      return true;
+  }
+  return false;
+}
+
+bool UeberBackend::removeDomainKey(const string& name, unsigned int id)
+{
+  BOOST_FOREACH(DNSBackend* db, backends) {
+    if(db->removeDomainKey(name, id))
       return true;
   }

trunk/pdns/pdns/ueberbackend.hh

@@ -128 +128 @@
   bool getDomainMetadata(const string& name, const std::string& kind, std::vector<std::string>& meta);
   bool setDomainMetadata(const string& name, const std::string& kind, const std::vector<std::string>& meta);
+
+  bool removeDomainKey(const string& name, unsigned int id);
+  bool activateDomainKey(const string& name, unsigned int id);
+  bool deactivateDomainKey(const string& name, unsigned int id);
   
   void alsoNotifies(const string &domain, set<string> *ips);