Checksum the project.py file to validate that the pickle we get from the project...

[deliverable/lttng-ivc.git] / lttng_ivc / utils / ProjectFactory.py

diff --git a/lttng_ivc/utils/ProjectFactory.py b/lttng_ivc/utils/ProjectFactory.py
index e50e290a2ef56dcdd62cf06643144d1610eadc13..f45b786c921dbd0be985d44e3618ee4157b7bc4b 100644 (file)
--- a/lttng_ivc/utils/ProjectFactory.py
+++ b/lttng_ivc/utils/ProjectFactory.py
@@ -6,6 +6,7 @@ import pickle
 import lttng_ivc.utils.project as Project
 import lttng_ivc.settings as Settings
 
+from lttng_ivc.utils.utils import sha256_checksum
 
 _logger = logging.getLogger('project.factory')
 _project_constructor = {
@@ -17,6 +18,8 @@ _project_constructor = {
 
 __projects_cache = {}
 
+_project_py_checksum = sha256_checksum(Settings.project_py_file_location)
+
 _markers = None
 with open(Settings.run_configuration_file, 'r') as stream:
     # This is voluntary static across calls, no need to perform this
@@ -37,11 +40,16 @@ def get_fresh(label, tmpdir):
 
 
 def _validate_pickle(pickle, label):
-    _logger.warn("Checking validate for {} {}".format(pickle,
-        label))
+    _logger.debug("Checking validate for {} {}".format(pickle,
+                                                       label))
+    if pickle._py_file_checksum != _project_py_checksum:
+        _logger.warn("Project py file changed".format(pickle.label,
+                                                      label))
+        return False
+
     if pickle.label != label:
         _logger.warn("Label  {} and {} are not the same".format(pickle.label,
-            label))
+                                                                label))
         return False
     if pickle.sha1 != _markers[label]['sha1']:
         _logger.warn("Sha1  {} and {} are not the same".format(pickle.sha1,