Merge pull request AlessandroZ#75 from Aorimn/fix-mozilla-with-multip…

…le-profiles Fix mozilla when multiple profiles are in use
1sn0m4d · Nov 10, 2016 · ef2a6e5 · ef2a6e5
2 parents 4a04a0a + 1b5465b
commit ef2a6e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Linux/lazagne/softwares/browsers/mozilla.py b/Linux/lazagne/softwares/browsers/mozilla.py
@@ -453,11 +453,11 @@ def run(self, software_name = None):
 				print_debug('INFO', 'Profile path found: %s' % profile)
 				if not os.path.exists(profile + os.sep + 'key3.db'):
 					print_debug('WARNING', 'key3 file not found: %s' % self.key3)
-					return
+					continue
 
 				self.key3 = self.readBsddb(profile + os.sep + 'key3.db')
 				if not self.key3:
-					return
+					continue
 
 				# check if passwords are stored on the Json format
 				try:
@@ -481,12 +481,12 @@ def run(self, software_name = None):
 						print_debug('WARNING', 'Master Password is used !') 
 						masterPassword = self.found_masterpassword()
 						if not masterPassword:
-							return 
+							continue
 
 					# get user secret key
 					key = self.extractSecretKey(globalSalt, masterPassword, entrySalt)
 					if not key:
-						return 
+						continue
 
 					# everything is ready to decrypt password
 					for host, user, passw in credentials:
@@ -520,4 +520,4 @@ def run(self, software_name = None):
 						if len(values):
 							pwdFound.append(values)
 
-			return pwdFound
+			return pwdFound
diff --git a/Windows/lazagne/softwares/browsers/mozilla.py b/Windows/lazagne/softwares/browsers/mozilla.py
@@ -463,11 +463,11 @@ def run(self, software_name = None):
 				print_debug('INFO', 'Profile path found: %s' % profile)
 				if not os.path.exists(profile + os.sep + 'key3.db'):
 					print_debug('WARNING', 'key3 file not found: %s' % self.key3)
-					return
+					continue
 
 				self.key3 = self.readBsddb(profile + os.sep + 'key3.db')
 				if not self.key3:
-					return
+					continue
 
 				# check if passwords are stored on the Json format
 				try:
@@ -491,12 +491,12 @@ def run(self, software_name = None):
 						print_debug('WARNING', 'Master Password is used !') 
 						masterPassword = self.found_masterpassword()
 						if not masterPassword:
-							return 
+							continue
 
 					# get user secret key
 					key = self.extractSecretKey(globalSalt, masterPassword, entrySalt)
 					if not key:
-						return 
+						continue
 
 					# everything is ready to decrypt password
 					for host, user, passw in credentials:
@@ -530,4 +530,4 @@ def run(self, software_name = None):
 						if len(values):
 							pwdFound.append(values)
 
-			return pwdFound
+			return pwdFound