Tolerate optional file keys

api/rules.py

@@ -51,6 +51,9 @@ HARDCODED_RULES = [
     }
 ]
 
+def _log_file_key_error(file_, container, error):
+    log.warning('file ' + file_['name'] + ' in container ' + str(container['_id']) + ' ' + error)
+
 def eval_match(match_type, match_param, file_, container):
     """
     Given a match entry, return if the match succeeded.
@@ -61,7 +64,11 @@ def eval_match(match_type, match_param, file_, container):
 
     # Match the file's type
     if match_type == 'file.type':
-        return file_['type'] == match_param
+        try:
+            return file_['type'] == match_param
+        except KeyError:
+            _log_file_key_error(file_, container, 'has no type key')
+            return False
 
     # Match a shell glob for the file name
     elif match_type == 'file.name':
@@ -69,7 +76,11 @@ def eval_match(match_type, match_param, file_, container):
 
     # Match any of the file's measurements
     elif match_type == 'file.measurements':
-        return match_param in file_[measurements]
+        try:
+            return match_param in file_[measurements]
+        except KeyError:
+            _log_file_key_error(file_, container, 'has no measurements key')
+            return False
 
     # Match the container's primary measurment
     elif match_type == 'container.measurement':