Merge pull request #369 from ThomasWaldmann/fix-key-check

Fix key check

borg/archive.py

@@ -217,6 +217,9 @@ Number of files: {0.stats.nfiles}'''.format(self)
             yield item
 
     def add_item(self, item):
+        unknown_keys = set(item) - ITEM_KEYS
+        assert not unknown_keys, ('unknown item metadata keys detected, please update ITEM_KEYS: %s',
+                                  ','.join(k.decode('ascii') for k in unknown_keys))
         if self.show_progress and time.time() - self.last_progress > 0.2:
             self.stats.show_progress(item=item)
             self.last_progress = time.time()
@@ -483,13 +486,14 @@ Number of files: {0.stats.nfiles}'''.format(self)
         for chunk in self.chunker.chunkify(fd):
             chunks.append(cache.add_chunk(self.key.id_hash(chunk), chunk, self.stats))
         self.stats.nfiles += 1
+        t = int_to_bigint(int(time.time()) * 1000000000)
         item = {
             b'path': path,
             b'chunks': chunks,
             b'mode': 0o100660,  # regular file, ug=rw
             b'uid': uid, b'user': uid2user(uid),
             b'gid': gid, b'group': gid2group(gid),
-            b'mtime': int_to_bigint(int(time.time()) * 1000000000)
+            b'mtime': t, b'atime': t, b'ctime': t,
         }
         self.add_item(item)
         return 'i'  # stdin
@@ -588,10 +592,17 @@ Number of files: {0.stats.nfiles}'''.format(self)
         return Archive._open_rb(path, st)
 
 
+# this set must be kept complete, otherwise the RobustUnpacker might malfunction:
+ITEM_KEYS = set([b'path', b'source', b'rdev', b'chunks',
+                 b'mode', b'user', b'group', b'uid', b'gid', b'mtime', b'atime', b'ctime',
+                 b'xattrs', b'bsdflags',
+            ])
+
+
 class RobustUnpacker:
     """A restartable/robust version of the streaming msgpack unpacker
     """
-    item_keys = [msgpack.packb(name) for name in ('path', 'mode', 'source', 'chunks', 'rdev', 'xattrs', 'user', 'group', 'uid', 'gid', 'mtime')]
+    item_keys = [msgpack.packb(name) for name in ITEM_KEYS]
 
     def __init__(self, validator):
         super().__init__()