Add ISA_dep_plugin for dependency checking and visualization

README.md

@@ -31,16 +31,20 @@ Usage
 In order to enable the isafw during the image build, please add 
 the following line to your build/conf/local.conf file:
 
+```python
 INHERIT += "isafw"
+```
 
 Next you need to update your build/conf/bblayers.conf file with the
 location of meta-security-isafw layer on your filesystem along with
 any other layers needed. e.g.:
 
+```python
 BBLAYERS ?= " \
   /OE/oe-core/meta \
   /OE/meta-security-isafw \
   "
+```
 
 Also, some isafw plugins require network connection, so in case of a
 proxy setup please make sure to export http_proxy variable into your 
@@ -49,12 +53,16 @@ environment.
 In order to produce image reports, you can execute image build 
 normally. For example:
 
+```shell
 bitbake core-image-minimal
+```
 
 If you are only interested to produce a report based on packages 
 and without building an image, please use:
 
+```shell
 bitbake -c analyse_sources_all core-image-minimal
+```
 
 
 Logs

classes/isafw.bbclass

@@ -46,7 +46,7 @@ python do_analysesource() {
         fetch.unpack(workdir, (url,))
 
     recipe = isafw.ISA_package()
-    recipe.name = d.getVar('PN', True)
+    recipe.name = d.getVar('BPN', True)
     recipe.version = d.getVar('PV', True)
     recipe.version = recipe.version.split('+git', 1)[0]
 
@@ -125,13 +125,15 @@ addtask do_process_reports after do_${PR_ORIG_TASK}
 # These tasks are intended to be called directly by the user (e.g. bitbake -c)
 
 addtask do_analyse_sources after do_analysesource
+do_analyse_sources[doc] = "Produce ISAFW reports based on given package without building it"
 do_analyse_sources[nostamp] = "1"
 do_analyse_sources[postfuncs] = "do_process_reports"
 do_analyse_sources() {
 	:
 }
 
 addtask do_analyse_sources_all after do_analysesource
+do_analyse_sources_all[doc] = "Produce ISAFW reports for all packages in given target without building them"
 do_analyse_sources_all[recrdeptask] = "do_analyse_sources_all do_analysesource"
 do_analyse_sources_all[recideptask] = "do_${PR_ORIG_TASK}"
 do_analyse_sources_all[nostamp] = "1"
@@ -190,18 +192,19 @@ python analyse_image() {
 }
 
 do_rootfs[depends] += "checksec-native:do_populate_sysroot"
+do_rootfs[depends] += "prelink-native:do_populate_sysroot"
 analyse_image[fakeroot] = "1"
 
 def isafw_init(isafw, d):
     import re, errno
 
     isafw_config = isafw.ISA_config()
-
     isafw_config.proxy = d.getVar('HTTP_PROXY', True)
     if not isafw_config.proxy :
         isafw_config.proxy = d.getVar('http_proxy', True)
     bb.debug(1, 'isafw: proxy is %s' % isafw_config.proxy)
 
+    isafw_config.machine = d.getVar('MACHINE', True)
     isafw_config.timestamp = d.getVar('DATETIME', True)
     isafw_config.reportdir = d.getVar('ISAFW_REPORTDIR', True) + "_" + isafw_config.timestamp
     if not os.path.exists(os.path.dirname(isafw_config.reportdir + "/test")):
@@ -234,7 +237,8 @@ def manifest2pkglist(d):
         with open(manifest_file, 'r') as finput:
             for line in finput:
                 items = line.split()
-                foutput.write(items[0] + " " + items[2] + "\n")
+                if items and (len(items) >= 3):
+                    foutput.write(items[0] + " " + items[2] + "\n")
 
     return pkglist
 

lib/isafw/isafw.py

@@ -81,6 +81,8 @@ class ISA_config:
     reportdir = ""                # location of produced reports
     logdir = ""                   # location of produced logs
     timestamp = ""                # timestamp of the build provided by build system
+    full_reports = False          # produce full reports for plugins, False by default
+    machine = ""                  # name of machine build is produced for
 
 
 class ISA:
@@ -201,5 +203,24 @@ def process_report(self):
                 except:
                     print("Exception in plugin: ", sys.exc_info())
 
+    def cleanup(self):
+        for name in isaplugins.__all__:
+            plugin = getattr(isaplugins, name)
+            try:
+                # see if the plugin has a 'cleanup' attribute
+                cleanup = plugin.cleanup
+            except AttributeError:
+                # if it doesn't, it is ok, won't call this plugin
+                pass
+            else:
+                if self.ISA_config.plugin_whitelist and plugin.getPluginName() not in self.ISA_config.plugin_whitelist:
+                    continue
+                if self.ISA_config.plugin_blacklist and plugin.getPluginName() in self.ISA_config.plugin_blacklist:
+                    continue
+                try:
+                    cleanup()
+                except:
+                    print("Exception in plugin cleanup: ", sys.exc_info())
+