Merge lp:~nosferato/encuentro/keyring-fix into lp:encuentro

[Nicolas Guerrero]

I made some changes on config.py module in order to provide a keyring mask for user and password data.

[lp:~nosferato/encuentro/keyring-fix]

255. By Nicolas Guerrero on 2015-05-11

keyring fix, last changes

[Facundo Batista (facundo)]

Discussed several details to fix on IRC

review: Needs Fixing

Unmerged revisions

255. By Nicolas Guerrero on 2015-05-11

keyring fix, last changes

254. By Nicolas Guerrero on 2015-05-08

Bug #1185528 -
The password should be saved in a safe keyring, if available, not in the config file

=== modified file 'encuentro/config.py'
--- encuentro/config.py	2014-09-11 23:37:49 +0000
+++ encuentro/config.py	2015-05-11 14:24:46 +0000
@@ -18,6 +18,18 @@
 
 """The system configuration."""
 
+NOT_KEYRING_MSG = u"""
+ATENCIÓN: no se encontró el módulo 'keyring'.
+Si lo instala, Encuentro lo usará para guardar información 
+sensible (en lugar de guardarla en el archivo de configuración).
+"""
+    
+try:
+    import keyring
+except ImportError:
+    keyring = None
+    print NOT_KEYRING_MSG
+
 import logging
 import os
 import pickle
@@ -61,6 +73,10 @@
 
         with open(fname, 'rb') as fh:
             saved_dict = pickle.load(fh)
+            if keyring is not None:
+                for key in SECURITY_CONFIG:
+                    if keyring.get_keyring() is not None:
+                        saved_dict[key] = keyring.get_password('encuentro', key)
             logger.debug("Loaded: %s", self.sanitized_config())
         self.update(saved_dict)
 
@@ -72,6 +88,9 @@
         """Save the config to disk."""
         # we don't want to pickle this class, but the dict itself
         raw_dict = self.copy()
+        if keyring is not None:
+            for key in SECURITY_CONFIG:
+                    keyring.set_password('encuentro', key,raw_dict.pop(key))
         logger.debug("Saving: %s", self.sanitized_config())
         with utils.SafeSaver(self._fname) as fh:
             pickle.dump(raw_dict, fh)
@@ -98,4 +117,4 @@
 
 
 config = _Config()
-signal = _Signal()
+signal = _Signal()
\ No newline at end of file