Fixing the Add/Delete Contact bug, now when a contact is added and re…

…moved, the panelPolicyManager will add/remove the contact into/from trust anchors Change-Id: Ia7a8bc5c6cbe1744018410c0ca0019db3e5d3994
named-data · May 9, 2014 · 7223269 · 7223269
1 parent cc22ba3
commit 7223269
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 0 deletions.
diff --git a/src/contact-manager.cpp b/src/contact-manager.cpp
@@ -629,13 +629,23 @@ ContactManager::addContact(const IdentityCertificate& identityCertificate, const
 
   try{
     m_contactStorage->addContact(contactItem);
+    emit contactAdded(contactItem.getNameSpace());
   }catch(exception& e){
     emit warning(e.what());
     _LOG_ERROR("Exception: " << e.what());
     return;
   }
 }
 
+void
+ContactManager::removeContact(const ndn::Name& contactNameSpace)
+{
+  Ptr<ContactItem> contact = getContact(contactNameSpace);
+  if(contact == NULL)
+    return;
+  m_contactStorage->removeContact(contactNameSpace);
+  emit contactRemoved(contact->getPublicKeyName());
+}
 
 
 #if WAF

diff --git a/src/contact-manager.h b/src/contact-manager.h
@@ -84,6 +84,10 @@ class ContactManager : public QObject
   void
   addContact(const ndn::security::IdentityCertificate& idCert, const Profile& profile);
 
+  void
+  removeContact(const ndn::Name& contactNameSpace);
+
+
 private:
   void
   setKeychain();
@@ -168,6 +172,12 @@ class ContactManager : public QObject
   void
   warning(QString msg);
 
+  void
+  contactRemoved(const ndn::Name& identity);
+
+  void
+  contactAdded(const ndn::Name& identity);                                         
+
 private slots:
 
 

diff --git a/src/contactpanel.cpp b/src/contactpanel.cpp
@@ -148,6 +148,11 @@ ContactPanel::ContactPanel(QWidget *parent)
           this, SLOT(acceptInvitation(const ChronosInvitation&, const ndn::security::IdentityCertificate&)));
   connect(m_invitationDialog, SIGNAL(invitationRejected(const ChronosInvitation&)),
           this, SLOT(rejectInvitation(const ChronosInvitation&)));
+
+  connect(&*m_contactManager, SIGNAL(contactAdded(const ndn::Name&)),
+          this, SLOT(addContactIntoPanelPolicy(const ndn::Name&)));
+  connect(&*m_contactManager, SIGNAL(contactRemoved(const ndn::Name&)),
+          this, SLOT(removeContactFromPanelPolicy(const ndn::Name&)));
 
   connect(m_settingDialog, SIGNAL(identitySet(const QString&, const QString&)),
           this, SLOT(updateDefaultIdentity(const QString&, const QString&)));
@@ -643,6 +648,18 @@ void
 ContactPanel::openInvitationDialog()
 { m_invitationDialog->show(); }
 
+void
+ContactPanel::addContactIntoPanelPolicy(const Name& contactNameSpace)
+{
+  Ptr<ContactItem> contact = m_contactManager->getContact(contactNameSpace);
+  if(contact != NULL)
+    m_panelPolicyManager->addTrustAnchor(contact->getSelfEndorseCertificate());
+}
+
+void
+ContactPanel::removeContactFromPanelPolicy(const Name& keyName)
+{ m_panelPolicyManager->removeTrustAnchor(keyName); }
+
 void
 ContactPanel::refreshContactList()
 {

diff --git a/src/contactpanel.h b/src/contactpanel.h
@@ -197,6 +197,11 @@ private slots:
   void
   removeChatDialog(const ndn::Name& chatroomName);
 
+  void 
+  addContactIntoPanelPolicy(const ndn::Name& nameSpace);
+
+  void 
+  removeContactFromPanelPolicy(const ndn::Name& keyName);
 
 
 private:

diff --git a/src/panel-policy-manager.cpp b/src/panel-policy-manager.cpp
@@ -180,6 +180,12 @@ PanelPolicyManager::addTrustAnchor(const EndorseCertificate& selfEndorseCertific
   m_trustAnchors.insert(pair <Name, Publickey > (selfEndorseCertificate.getPublicKeyName(), selfEndorseCertificate.getPublicKeyInfo())); 
 }
 
+void
+PanelPolicyManager::removeTrustAnchor(const Name& keyName)
+{  
+  m_trustAnchors.erase(keyName); 
+}
+
 Ptr<Publickey>
 PanelPolicyManager::getTrustedKey(const ndn::Name& inviterCertName)
 {

diff --git a/src/panel-policy-manager.h b/src/panel-policy-manager.h
@@ -79,6 +79,9 @@ class PanelPolicyManager : public ndn::security::PolicyManager
   void
   addTrustAnchor(const EndorseCertificate& selfEndorseCertificate);
 
+  void
+  removeTrustAnchor(const ndn::Name& keyName);
+
 // private:
 //   void 
 //   onCertificateVerified(ndn::Ptr<ndn::Data> certData,