Merge pull request 'Delete Profile API' (#367) from delete_profile into master

Reviewed-on: #367
Reviewed-by: Dan Ballard <dan@openprivacy.ca>

app/app.go

@@ -44,7 +44,7 @@ type Application interface {
 	LoadProfiles(password string)
 	CreatePeer(name string, password string)
 	CreateTaggedPeer(name string, password string, tag string)
-	DeletePeer(onion string)
+	DeletePeer(onion string, currentPassword string)
 	AddPeerPlugin(onion string, pluginID plugins.PluginID)
 	ChangePeerPassword(onion, oldpass, newpass string)
 	LaunchPeers()
@@ -142,28 +142,33 @@ func (app *application) CreatePeer(name string, password string) {
 	app.CreateTaggedPeer(name, password, "")
 }
 
-func (app *application) DeletePeer(onion string) {
+func (app *application) DeletePeer(onion string, password string) {
 	log.Infof("DeletePeer called on %v\n", onion)
 	app.appmutex.Lock()
 	defer app.appmutex.Unlock()
 
-	app.appletPlugins.ShutdownPeer(onion)
-	app.plugins.Delete(onion)
+	if app.storage[onion].CheckPassword(password) {
+		app.appletPlugins.ShutdownPeer(onion)
+		app.plugins.Delete(onion)
 
-	app.peers[onion].Shutdown()
-	delete(app.peers, onion)
+		app.peers[onion].Shutdown()
+		delete(app.peers, onion)
 
-	app.engines[onion].Shutdown()
-	delete(app.engines, onion)
+		app.engines[onion].Shutdown()
+		delete(app.engines, onion)
 
-	app.storage[onion].Shutdown()
-	app.storage[onion].Delete()
-	delete(app.storage, onion)
+		app.storage[onion].Shutdown()
+		app.storage[onion].Delete()
+		delete(app.storage, onion)
 
-	app.eventBuses[onion].Publish(event.NewEventList(event.ShutdownPeer, event.Identity, onion))
+		app.eventBuses[onion].Publish(event.NewEventList(event.ShutdownPeer, event.Identity, onion))
 
-	app.applicationCore.DeletePeer(onion)
-	log.Debugf("Delete peer for %v Done\n", onion)
+		app.applicationCore.DeletePeer(onion)
+		log.Debugf("Delete peer for %v Done\n", onion)
+		app.appBus.Publish(event.NewEventList(event.PeerDeleted, event.Identity, onion))
+		return
+	}
+	app.appBus.Publish(event.NewEventList(event.AppError, event.Error, event.PasswordMatchError, event.Identity, onion))
 }
 
 func (app *application) ChangePeerPassword(onion, oldpass, newpass string) {

app/appClient.go

@@ -47,7 +47,7 @@ func (ac *applicationClient) handleEvent(ev *event.Event) {
 		reload := ev.Data[event.Status] == event.StorageRunning
 		created := ev.Data[event.Created]
 		ac.newPeer(localID, key, salt, reload, created)
-	case event.DeletePeer:
+	case event.PeerDeleted:
 		onion := ev.Data[event.Identity]
 		ac.handleDeletedPeer(onion)
 	case event.PeerError:
@@ -112,9 +112,9 @@ func (ac *applicationClient) CreateTaggedPeer(name, password, tag string) {
 	ac.bridge.Write(&message)
 }
 
-// DeletePeer messages tehe service to delete a peer
-func (ac *applicationClient) DeletePeer(onion string) {
-	message := event.IPCMessage{Dest: DestApp, Message: event.NewEvent(event.DeletePeer, map[event.Field]string{event.Identity: onion})}
+// DeletePeer messages the service to delete a peer
+func (ac *applicationClient) DeletePeer(onion string, password string) {
+	message := event.IPCMessage{Dest: DestApp, Message: event.NewEvent(event.DeletePeer, map[event.Field]string{event.Identity: onion, event.Password: password})}
 	ac.bridge.Write(&message)
 }
 
@@ -131,6 +131,7 @@ func (ac *applicationClient) handleDeletedPeer(onion string) {
 	ac.eventBuses[onion].Publish(event.NewEventList(event.ShutdownPeer, event.Identity, onion))
 
 	ac.applicationCore.DeletePeer(onion)
+	ac.appBus.Publish(event.NewEventList(event.PeerDeleted, event.Identity, onion))
 }
 
 func (ac *applicationClient) AddPeerPlugin(onion string, pluginID plugins.PluginID) {

app/appService.go

@@ -52,7 +52,8 @@ func (as *applicationService) handleEvent(ev *event.Event) {
 		as.createPeer(profileName, password, tag)
 	case event.DeletePeer:
 		onion := ev.Data[event.Identity]
-		as.deletePeer(onion)
+		password := ev.Data[event.Password]
+		as.deletePeer(onion, password)
 
 		message := event.IPCMessage{Dest: DestApp, Message: *ev}
 		as.bridge.Write(&message)
@@ -164,21 +165,32 @@ func (as *applicationService) getACNStatusHandler() func(int, string) {
 	}
 }
 
-func (as *applicationService) deletePeer(onion string) {
+func (as *applicationService) deletePeer(onion, password string) {
 	as.asmutex.Lock()
 	defer as.asmutex.Unlock()
 
-	as.appletPlugins.ShutdownPeer(onion)
-	as.plugins.Delete(onion)
+	if as.storage[onion].CheckPassword(password) {
+		as.appletPlugins.ShutdownPeer(onion)
+		as.plugins.Delete(onion)
 
-	as.engines[onion].Shutdown()
-	delete(as.engines, onion)
+		as.engines[onion].Shutdown()
+		delete(as.engines, onion)
 
-	as.storage[onion].Shutdown()
-	as.storage[onion].Delete()
-	delete(as.storage, onion)
+		as.storage[onion].Shutdown()
+		as.storage[onion].Delete()
+		delete(as.storage, onion)
 
-	as.applicationCore.DeletePeer(onion)
+		as.eventBuses[onion].Publish(event.NewEventList(event.ShutdownPeer, event.Identity, onion))
+
+		as.applicationCore.DeletePeer(onion)
+		log.Debugf("Delete peer for %v Done\n", onion)
+
+		message := event.IPCMessage{Dest: DestApp, Message: event.NewEventList(event.PeerDeleted, event.Identity, onion)}
+		as.bridge.Write(&message)
+		return
+	}
+	message := event.IPCMessage{Dest: DestApp, Message: event.NewEventList(event.AppError, event.Error, event.PasswordMatchError, event.Identity, onion)}
+	as.bridge.Write(&message)
 }
 
 func (as *applicationService) ShutdownPeer(onion string) {

event/common.go

@@ -194,6 +194,8 @@ const (
 
 	// Identity(onion)
 	DeletePeer = Type("DeletePeer")
+	// Identity(onion)
+	PeerDeleted = Type("PeerDeleted")
 
 	// Identity(onion), Data(pluginID)
 	AddPeerPlugin = Type("AddPeerPlugin")
@@ -312,6 +314,7 @@ const (
 // Defining Common errors
 const (
 	AppErrLoaded0 = "Loaded 0 profiles"
+	PasswordMatchError = "Password did not match"
 )
 
 // Values to be suplied in event.NewPeer for Status

storage/profile_store.go

@@ -22,6 +22,7 @@ type ProfileStore interface {
 	GetProfileCopy(timeline bool) *model.Profile
 	GetNewPeerMessage() *event.Event
 	GetStatusMessages() []*event.Event
+	CheckPassword(string) bool
 }
 
 // CreateProfileWriterStore creates a profile store backed by a filestore listening for events and saving them

storage/v1/profile_store.go

@@ -33,6 +33,12 @@ type ProfileStoreV1 struct {
 	writer       bool
 }
 
+// CheckPassword returns true if the given password produces the same key as the current stored key, otherwise false.
+func (ps *ProfileStoreV1) CheckPassword(checkpass string) bool {
+	oldkey := CreateKey(checkpass, ps.salt[:])
+	return oldkey == ps.key
+}
+
 func initV1Directory(directory, password string) ([32]byte, [128]byte, error) {
 	key, salt, err := CreateKeySalt(password)
 	if err != nil {