Add the shadow map to the consul source

nss_cache/sources/consulsource.py

@@ -9,6 +9,7 @@
 
 from nss_cache.maps import group
 from nss_cache.maps import passwd
+from nss_cache.maps import shadow
 from nss_cache.sources import httpsource
 
 
@@ -36,7 +37,7 @@ def _SetDefaults(self, configuration):
     if 'datacenter' not in configuration:
       configuration['datacenter'] = self.DATACENTER
 
-    for url in ['passwd_url', 'group_url']:
+    for url in ['passwd_url', 'group_url', 'shadow_url']:
       configuration[url] = '{}?recurse&token={}&dc={}'.format(
           configuration[url], configuration['token'], configuration['datacenter'])
 
@@ -64,6 +65,18 @@ def GetGroupMap(self, since=None):
     """
     return GroupUpdateGetter().GetUpdates(self, self.conf['group_url'], since)
 
+  def GetShadowMap(self, since=None):
+    """Return the shadow map from this source.
+
+    Args:
+      since: Get data only changed since this timestamp (inclusive) or None
+      for all data.
+
+    Returns:
+      instance of shadow.ShadowMap
+    """
+    return ShadowUpdateGetter().GetUpdates(self, self.conf['shadow_url'], since)
+
 
 class PasswdUpdateGetter(httpsource.UpdateGetter):
   """Get passwd updates."""
@@ -89,6 +102,17 @@ def CreateMap(self):
     return group.GroupMap()
 
 
+class ShadowUpdateGetter(httpsource.UpdateGetter):
+  """Get shadow updates."""
+
+  def GetParser(self):
+    """Returns a MapParser to parse FilesShadow cache."""
+    return ConsulShadowMapParser()
+
+  def CreateMap(self):
+    """Returns a new ShadowMap instance to have ShadowMapEntries added to it."""
+    return shadow.ShadowMap()
+
 class ConsulMapParser(object):
   """A base class for parsing nss_files module cache."""
 
@@ -174,3 +198,22 @@ def _ReadEntry(self, name, entry):
       members = ['']
     map_entry.members = members
     return map_entry
+
+class ConsulShadowMapParser(ConsulMapParser):
+  """Class for parsing nss_files module shadow cache."""
+
+  def _ReadEntry(self, name, entry):
+    """Return a ShadowMapEntry from a record in the target cache."""
+
+    map_entry = shadow.ShadowMapEntry()
+    # maps expect strict typing, so convert to int as appropriate.
+    map_entry.name = name
+    map_entry.passwd = entry.get('passwd', '*')
+
+    for attr in ['lstchg', 'min', 'max', 'warn', 'inact', 'expire']:
+      try:
+        setattr(map_entry, attr, int(entry[attr]))
+      except (ValueError, KeyError):
+        continue
+
+    return map_entry

nss_cache/sources/consulsource_test.py

@@ -7,6 +7,7 @@
 
 from nss_cache.maps import group
 from nss_cache.maps import passwd
+from nss_cache.maps import shadow
 from nss_cache.sources import consulsource
 
 
@@ -123,5 +124,40 @@ def testInvalidEntry(self):
     self.assertEquals(entry, None)
 
 
+class TestConsulShadowMapParser(unittest.TestCase):
+
+  def setUp(self):
+    self.good_entry = shadow.ShadowMapEntry()
+    self.good_entry.name = 'foo'
+    self.good_entry.passwd = '*'
+    self.good_entry.lstchg = 17246
+    self.good_entry.min = 0
+    self.good_entry.max = 99999
+    self.good_entry.warn = 7
+    self.parser = consulsource.ConsulShadowMapParser()
+
+  def testGetMap(self):
+    shadow_map = shadow.ShadowMap()
+    cache_info = StringIO.StringIO('''[
+                                   {"Key": "org/groups/foo/passwd", "Value": "Kg=="},
+                                   {"Key": "org/groups/foo/lstchg", "Value": "MTcyNDY="},
+                                   {"Key": "org/groups/foo/min", "Value": "MA=="},
+                                   {"Key": "org/groups/foo/max", "Value": "OTk5OTk="},
+                                   {"Key": "org/groups/foo/warn", "Value": "Nw=="}
+                                   ]''')
+    self.parser.GetMap(cache_info, shadow_map)
+    self.assertEquals(self.good_entry, shadow_map.PopItem())
+
+  def testReadEntry(self):
+    data = {'passwd': '*', 'lstchg': 17246, 'min': 0, 'max': 99999, 'warn': 7}
+    entry = self.parser._ReadEntry('foo', data)
+    self.assertEquals(self.good_entry, entry)
+
+  def testDefaultPasswd(self):
+    data = {'lstchg': 17246, 'min': 0, 'max': 99999, 'warn': 7}
+    entry = self.parser._ReadEntry('foo', data)
+    self.assertEquals(self.good_entry, entry)
+
+
 if __name__ == '__main__':
   unittest.main()

runtests.py

@@ -22,6 +22,7 @@
 
 import logging
 import os
+import sys
 import unittest
 
 
@@ -48,6 +49,7 @@
 
 from nss_cache.sources.source_test import *
 from nss_cache.sources.source_factory_test import *
+from nss_cache.sources.consulsource_test import *
 from nss_cache.sources.httpsource_test import *
 from nss_cache.sources.ldapsource_test import *
 # Unsupported and deprecated.