[tor-commits] [torflow/master] 4080 sha1sum not defined

[mikeperry at torproject.org]

commit de846d719a69756c8993be7f1c279dde6a81776a
Author: aagbsn <aagbsn at extc.org>
Date:   Thu Sep 22 02:23:13 2011 -0700

    4080 sha1sum not defined
    
    This fix corrects 2 references to an undefined variable sha1sum:
    
    fix for missing sha1sum #1 just uses the sha() of the content from
    the new request because compare() already declares the content equal:
    
    if req.content == new_req.content:
      assert(sha(req.content) == sha(new_req.content))
    
    fix for missing sha1sum #2 is to load the original content (from disk)
    and compute sha(). I added a helper function load_original_sha1sum()
    for clarity.
---
 NetworkScanners/ExitAuthority/soat.py |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py
index 7688be1..be0dde0 100755
--- a/NetworkScanners/ExitAuthority/soat.py
+++ b/NetworkScanners/ExitAuthority/soat.py
@@ -1303,6 +1303,7 @@ class BaseHTTPTest(Test):
     if result == COMPARE_NOEQUAL:
       # Reload direct content and try again
       new_req = http_request(address, my_cookie_jar, self.headers)
+      sha1sum_new = sha(new_req.content)
       
       # If a new direct load somehow fails, then we're out of luck
       if not (200 <= new_req.code < 300):
@@ -1320,7 +1321,7 @@ class BaseHTTPTest(Test):
         # The content has not actually changed, so our exit node is screwing with us.
         result = HttpTestResult(self.node_map[exit_node[1:]],
                                 address, TEST_FAILURE, FAILURE_EXITONLY,
-                                sha1sum.hexdigest(), psha1sum.hexdigest(),
+                                sha1sum_new.hexdigest(), psha1sum.hexdigest(),
                                 address_to_context(address)+".content")
         retval = self.register_exit_failure(result)
 
@@ -1342,6 +1343,7 @@ class BaseHTTPTest(Test):
       retval = self.register_success(result)
 
     elif result == COMPARE_TRUNCATION:
+      sha1sum = self.load_original_sha1sum(address)
       result = HttpTestResult(self.node_map[exit_node[1:]],
                               address, TEST_FAILURE, FAILURE_EXITTRUNCATION,
                               sha1sum.hexdigest(), psha1sum.hexdigest(),
@@ -1453,6 +1455,13 @@ class BaseHTTPTest(Test):
     else:
       return COMPARE_NOEQUAL
 
+  def load_original_sha1sum(self, address):
+    context = self.address_to_context(address)
+    f = open(context + '.content')
+    old_content = f.read()
+    f.close() 
+    return sha(old_content)
+
 # TODO move these somewhere sensible
 def mime_to_filetype(mime_type):
   return mimetypes.guess_extension(mime_type)[1:]