Merging in latest boto.

boto/mturk/notification.py

 # Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
@@ skipping 56 matching lines @@
                     param = str(ed['param'])
                     if n not in events_dict:
                         events_dict[n] = {}
                     events_dict[n][param] = v
         for n in events_dict:
             self.events.append(Event(events_dict[n]))
 
     def verify(self, secret_key):
         """
         Verifies the authenticity of a notification message.
+
+        TODO: This is doing a form of authentication and
+              this functionality should really be merged
+              with the pluggable authentication mechanism
+              at some point.
         """
-        verification_input = NotificationMessage.SERVICE_NAME + NotificationMessage.OPERATION_NAME + self.timestamp
-        signature_calc = self._auth_handler.sign_string(verification_input)
+        verification_input = NotificationMessage.SERVICE_NAME
+        verification_input += NotificationMessage.OPERATION_NAME
+        verification_input += self.timestamp
+        h = hmac.new(key=secret_key, digestmod=sha)
+        h.update(verification_input)
+        signature_calc = base64.b64encode(h.digest())
         return self.signature == signature_calc
 
 class Event:
     def __init__(self, d):
         self.event_type = d['EventType']
         self.event_time_str = d['EventTime']
         self.hit_type = d['HITTypeId']
         self.hit_id = d['HITId']
         if 'AssignmentId' in d:   # Not present in all event types
             self.assignment_id = d['AssignmentId']
 
         #TODO: build self.event_time datetime from string self.event_time_str
 
     def __repr__(self):
         return "<boto.mturk.notification.Event: %s for HIT # %s>" % (self.event_type, self.hit_id)