Fixes to mongodb functions

pwman/data/database.py

@@ -194,7 +194,7 @@ class Database(object):
             return [t[0] for t in tags]
         return []  # pragma: no cover
 
-    # TODO: add this to tests of postgresql and mysql!
+    # TODO: add this to test of postgresql and mysql!
     def editnode(self, nid, **kwargs):
         tags = kwargs.pop('tags', None)
         sql = ("UPDATE NODE SET {} WHERE ID = {} ".format(

pwman/data/drivers/mongodb.py

@@ -20,6 +20,7 @@
 from pwman.data.database import Database, __DB_FORMAT__
 import pymongo
 
+# TODO: EDIT node is still not working
 
 class MongoDB(Database):
 
@@ -28,7 +29,7 @@ class MongoDB(Database):
         return __DB_FORMAT__
 
     def __init__(self, mongodb_uri, dbformat=__DB_FORMAT__):
-        self.uri = mongodb_uri
+        self.uri = mongodb_uri.geturl()
 
     def _open(self):
         self._con = pymongo.Connection(self.uri)
@@ -54,7 +55,7 @@ class MongoDB(Database):
         nodes = []
         for node in node_dicts:
             n = [node['_id'],
-                 node['username'],
+                 node['user'],
                  node['password'],
                  node['url'],
                  node['notes']]
@@ -75,14 +76,8 @@ class MongoDB(Database):
 
     def add_node(self, node):
         nid = self._get_next_node_id()
-        node = {
-            '_id': nid,
-            'username': node[0],
-            'password': node[1],
-            'url': node[2],
-            'notes': node[3],
-            'tags': node[4]
-            }
+        node = node.to_encdict()
+        node['_id'] = nid
         self._db.nodes.insert(node)
         return nid
 
@@ -106,8 +101,11 @@ class MongoDB(Database):
 
     def loadkey(self):
         coll = self._db['crypto']
-        key = coll.find_one({}, {'_id': 0})
-        key = key['salt'] + '$6$' + key['key']
+        try:
+            key = coll.find_one({}, {'_id': 0})
+            key = key['salt'] + '$6$' + key['key']
+        except TypeError:
+            key = None
         return key
 
     def close(self):

tests/test_mongodb.py

@@ -18,9 +18,16 @@
 # ============================================================================
 
 import unittest
-from .test_crypto_engine import give_key, DummyCallback
+import sys
+if sys.version_info.major > 2:  # pragma: no cover
+    from urllib.parse import urlparse
+else:  # pragma: no cover
+    from urlparse import urlparse
 import pymongo
+from .test_crypto_engine import give_key, DummyCallback
+from pwman.util.crypto_engine import CryptoEngine
 from pwman.data.drivers.mongodb import MongoDB
+from pwman.data.nodes import Node
 # use pwmantest
 
 # db.createUser(
@@ -30,7 +37,6 @@ from pwman.data.drivers.mongodb import MongoDB
 #       roles: [{ role: "dbAdmin", db: "pwmantest" },
 #               { role: "readWrite", db: "pwmantest" },]
 #    })
-from pwman.util.crypto_engine import CryptoEngine
 
 
 class TestMongoDB(unittest.TestCase):
@@ -38,7 +44,7 @@ class TestMongoDB(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         u = u"mongodb://tester:12345678@localhost:27017/pwmantest"
-        cls.db = MongoDB(u)
+        cls.db = MongoDB(urlparse(u))
         cls.db._open()
 
     @classmethod
@@ -56,7 +62,11 @@ class TestMongoDB(unittest.TestCase):
     def test_2_create_collections(self):
         pass
 
-    def test_3_load_key(self):
+    def test_3a_load_key(self):
+        secretkey = self.db.loadkey()
+        self.assertIsNone(secretkey)
+
+    def test_3b_load_key(self):
         self.db.savekey('SECRET$6$KEY')
         secretkey = self.db.loadkey()
         self.assertEqual(secretkey, u'SECRET$6$KEY')
@@ -72,19 +82,34 @@ class TestMongoDB(unittest.TestCase):
     def test_5_add_node(self):
         innode = [u"TBONE", u"S3K43T", u"example.org", u"some note",
                   [u"bartag", u"footag"]]
-        self.db.add_node(innode)
+
+        kwargs = {
+            "username":innode[0], "password": innode[1],
+            "url": innode[2], "notes": innode[3], "tags": innode[4]
+        }
+
+        node = Node(clear_text=True, **kwargs)
+        self.db.add_node(node)
         outnode = self.db.getnodes([1])[0]
-        self.assertEqual(innode[:-1] + [t for t in innode[-1]], outnode[1:])
+        no = outnode[1:5]
+        no.append(outnode[5:])
+        o = Node.from_encrypted_entries(*no)
+        self.assertEqual(list(node), list(o))
 
     def test_6_list_nodes(self):
         ret = self.db.listnodes()
         self.assertEqual(ret, [1])
-        ret = self.db.listnodes("footag")
+        ce = CryptoEngine.get()
+        fltr = ce.encrypt("footag")
+        ret = self.db.listnodes(fltr)
         self.assertEqual(ret, [1])
 
     def test_6a_list_tags(self):
         ret = self.db.listtags()
-        self.assertListEqual(ret, ['bartag', 'footag'])
+        ce = CryptoEngine.get()
+        ec_tags = map(ce.encrypt,[u'bartag', u'footag'])
+        for t in ec_tags:
+            self.assertIn(t, ret)
 
     def test_6b_get_nodes(self):
         ret = self.db.getnodes([1])