Implement lengths in thandy objects, mostly:

Accept them, and when they're present, don't fetch more bytes than
specified, since that would be dangerous.  Include lengths in every
generated object type except for the timestamp, since that would break
exising code.

git-svn-id: file:///home/or/svnrepo/updater/trunk@17629 55e972cd-5a19-0410-ae62-a4d7a52db4cd

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/thandy/SignerCLI.py b/lib/thandy/SignerCLI.py
index 7427474..b3e4a8b 100644
--- a/lib/thandy/SignerCLI.py
+++ b/lib/thandy/SignerCLI.py
@@ -92,17 +92,20 @@ def makebundle(args):
 
     configFile = args[0]
     packages = {}
+    packageLen = {}
     for pkgFile in args[1:]:
         print "Loading", pkgFile
         f = open(pkgFile, 'r')
         p = json.load(f)
         f.close()
+        packageLen = os.stat(pkgFile).st_size
         _, r, _ = thandy.formats.checkSignedObj(p)
         if r != 'package':
             print pkgFile, "was not a package"
         packages[p['signed']['name']] = p['signed']
 
-    bundleObj = thandy.formats.makeBundleObj(configFile, packages.__getitem__)
+    bundleObj = thandy.formats.makeBundleObj(configFile, packages.__getitem__,
+                                             packageLen.__getitem__)
     signable = thandy.formats.makeSignable(bundleObj)
 
     ks = getKeyStore()