Ticket #902: Packages-whitelist.patch

src/lib/Server/Plugins/Packages.py

@@ -24 +24 @@
 def source_from_xml(xsource):
     ret = dict([('rawurl', False), ('url', False)])
     for key, tag in [('groups', 'Group'), ('components', 'Component'),
-                     ('arches', 'Arch'), ('blacklist', 'Blacklist')]:
+                     ('arches', 'Arch'), ('blacklist', 'Blacklist'),
+                     ('whitelist', 'Whitelist')]:
         ret[key] = [item.text for item in xsource.findall(tag)]
     # version and component need to both contain data for sources to work
     try:
@@ -66 +67 @@
 class Source(object):
     basegroups = []
     def __init__(self, basepath, url, version, arches, components, groups, rawurl,
-                 blacklist, recommended):
+                 blacklist, whitelist, recommended):
         self.basepath = basepath
         self.version = version
         self.components = components
@@ -77 +78 @@
         self.deps = dict()
         self.provides = dict()
         self.blacklist = set(blacklist)
+        self.whitelist = set(whitelist)
         self.cachefile = None
         self.recommended = recommended
 
@@ -170 +172 @@
         Returns => (packages, unresolved requirements)
         '''
 
-        if requirement in self.blacklist:
+        if (len(self.blacklist) > 0 and requirement in self.blacklist) or (len(self.whitelist) > 0 and requirement not in self.whitelist):
             # requirement and all deps are suppressed
             return (set(), set())
 
@@ -248 +250 @@
     ptype = 'yum'
 
     def __init__(self, basepath, url, version, arches, components, groups,
-                 rawurl, blacklist, recommended):
+                 rawurl, blacklist, whitelist, recommended):
         Source.__init__(self, basepath, url, version, arches, components,
-                        groups, rawurl, blacklist, recommended)
+                        groups, rawurl, blacklist, whitelist, recommended)
         if not self.rawurl:
             self.baseurl = self.url + '%(version)s/%(component)s/%(arch)s/'
         else:
@@ -404 +406 @@
     ptype = 'deb'
 
     def __init__(self, basepath, url, version, arches, components, groups,
-                 rawurl, blacklist, recommended):
+                 rawurl, blacklist, whitelist, recommended):
         Source.__init__(self, basepath, url, version, arches, components, groups,
-                        rawurl, blacklist, recommended)
+                        rawurl, blacklist, whitelist, recommended)
         if not self.rawurl:
             self.cachefile = self.escape_url(self.url + '@' + self.version) + '.data'
         else:

schemas/packages.xsd

@@ -20 +20 @@
       <xsd:element name="Version" type="xsd:string" minOccurs='0'
                    maxOccurs='1'/>
       <xsd:element name="Component" type="xsd:string" minOccurs='0'
-                   maxOccurs='unbounded'/>    
-      <xsd:element name="Blacklist" type="xsd:string" minOccurs='0'
-                   maxOccurs='unbounded'/>    
+                   maxOccurs='unbounded'/>
+      <xsd:choice>
+        <xsd:element name="Blacklist" type="xsd:string" minOccurs='0'
+                     maxOccurs='unbounded'/>
+        <xsd:element name="Whitelist" type="xsd:string" minOccurs='0'
+                     maxOccurs='unbounded'/>
+      </xsd:choice>
       <xsd:element name="Arch" type="xsd:string"  minOccurs='1'
                    maxOccurs='unbounded'/>
     </xsd:sequence>