Changeset 1760

Timestamp:

12/27/10 20:25:04 (2 years ago)

Author:

ahu

Message:

align our key storage naming with the excellent ldns/nsd/unbound tools, which also found a few bugs in our storage

Location:

trunk/pdns/pdns

Files:

• fsdnsseckeeper.cc (modified) (10 diffs)
• misc.hh (modified) (1 diff)
• pdnssec.cc (modified) (1 diff)

trunk/pdns/pdns/fsdnsseckeeper.cc

@@ -38 +38 @@
   outputs_t outputs;
   push_back(outputs)("Modulus", &d_context.N)("PublicExponent",&d_context.E)
-    ("Modulus", &d_context.N)
-    ("PublicExponent",&d_context.E)
     ("PrivateExponent",&d_context.D)
     ("Prime1",&d_context.P)
@@ -84 +82 @@
   {
     //    cerr<<"Entry: '"<< dir_itr->leaf() <<"'"<<endl;
-    if(ends_with(dir_itr->leaf(),".isc")) {
+    if(ends_with(dir_itr->leaf(),".private")) {
       //      cerr<<"Hit!"<<endl;
 
@@ -119 +117 @@
         ++dir_itr )
   {
-          if(ends_with(dir_itr->leaf(),".isc")) {
+          if(ends_with(dir_itr->leaf(),".private")) {
                   maxID = max(maxID, (unsigned int)atoi(dir_itr->leaf().c_str()));
           }
@@ -171 +169 @@
   
   {  
-    ofstream iscFile((iscName+".isc").c_str());
+    ofstream iscFile((iscName+".private").c_str());
     iscFile << isc;
   }
 
   {  
-    ofstream dnskeyFile((iscName+".dnskey").c_str());
+    ofstream dnskeyFile((iscName+".key").c_str());
     dnskeyFile << toCanonic("", name) << " IN DNSKEY " << drc.getZoneRepresentation()<<endl;
   }
@@ -183 +181 @@
 
 
-static bool zskCompareByID(const DNSSECKeeper::keyset_t::value_type& a, const DNSSECKeeper::keyset_t::value_type& b)
-{
-  return a.second.id < b.second.id;
+static bool keyCompareByKindAndID(const DNSSECKeeper::keyset_t::value_type& a, const DNSSECKeeper::keyset_t::value_type& b)
+{
+  return make_pair(!a.second.keyOrZone, a.second.id) <
+         make_pair(!b.second.keyOrZone, b.second.id);
 }
 
 void DNSSECKeeper::removeKey(const std::string& zname, unsigned int id)
 {
-  // unlink((d_dirname +"/"+ zname +"/zsks/"+fname).c_str());
-  abort();
+  string fname = getKeyFilenameById(d_dirname+"/keys/", id);
+  if(unlink(fname.c_str()) < 0)
+    unixDie("removing key file '"+fname+"'");
 }
 
 void DNSSECKeeper::deactivateKey(const std::string& zname, unsigned int id)
 {
-  // unlink((d_dirname +"/"+ zname +"/zsks/"+fname).c_str());
   string fname = getKeyFilenameById(d_dirname+"/keys/", id);
   string newname = boost::replace_last_copy(fname, ".active", ".passive");
@@ -205 +204 @@
 void DNSSECKeeper::activateKey(const std::string& zname, unsigned int id)
 {
-  // unlink((d_dirname +"/"+ zname +"/zsks/"+fname).c_str());
-  abort();
+  string fname = getKeyFilenameById(d_dirname+"/keys/", id);
+  string newname = boost::replace_last_copy(fname, ".passive", ".active");
+  if(rename(fname.c_str(), newname.c_str()) < 0)
+    unixDie("renaming file to deactivate key, from: '"+fname+"' to '"+newname+"'");
 }
 
@@ -264 +265 @@
   {
     //cerr<<"Entry: '"<< dir_itr->leaf() <<"'"<<endl;
-    if(ends_with(dir_itr->leaf(),".isc")) {
+    if(ends_with(dir_itr->leaf(),".private")) {
       DNSSECPrivateKey dpk;
       getRSAKeyFromISC(&dpk.d_key.getContext(), dir_itr->path().file_string().c_str());
@@ -286 +287 @@
         &ts1.tm_mon, &ts1.tm_mday, &ts1.tm_hour, &ts1.tm_min);
              
-
       ts1.tm_year -= 1900;
-      
       ts1.tm_mon--;
       
@@ -300 +299 @@
         keyset.push_back(make_pair(dpk, kmd));
     }
-    sort(keyset.begin(), keyset.end(), zskCompareByID);
+    sort(keyset.begin(), keyset.end(), keyCompareByKindAndID);
   }
 
@@ -343 +342 @@
 
   {  
-    ofstream iscFile((iscName+".isc").c_str());
+    ofstream iscFile((iscName+".private").c_str());
     iscFile << isc;
   }
 
   {  
-    ofstream dnskeyFile((iscName+".dnskey").c_str());
+    ofstream dnskeyFile((iscName+".key").c_str());
     dnskeyFile << toCanonic("", name) << " IN DNSKEY " << drc.getZoneRepresentation()<<endl;
   }

trunk/pdns/pdns/misc.hh

@@ -7 +7 @@
     as published by the Free Software Foundation
     
-
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

trunk/pdns/pdns/pdnssec.cc

@@ -273 +273 @@
     const string& zone=cmds[1];
     
-    DNSSECKeeper::keyset_t keyset=dk.getKeys(zone, boost::indeterminate);
+    DNSSECKeeper::keyset_t keyset=dk.getKeys(zone);
 
     if(keyset.empty())  {