msmith - in flumotion/trunk: . flumotion/component/base

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Wed Jul 11 15:13:44 2007
New Revision: 5314

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/base/http.py
Log:
        * flumotion/component/base/http.py:
          Don't accept a keycard with an id that's already in use.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Jul 11 15:13:44 2007
@@ -1,3 +1,8 @@
+2007-07-11  Michael Smith <msmith at fluendo.com>
+
+	* flumotion/component/base/http.py:
+	  Don't accept a keycard with an id that's already in use.
+
 2007-07-10  Arek Korbik  <arkadini at gmail.com>
 
 	* flumotion/launch/inspect.py:

Modified: flumotion/trunk/flumotion/component/base/http.py
==============================================================================
--- flumotion/trunk/flumotion/component/base/http.py	(original)
+++ flumotion/trunk/flumotion/component/base/http.py	Wed Jul 11 15:13:44 2007
@@ -258,6 +258,10 @@
             fd = request.transport.fileno()
 
             if self.bouncerName:
+                if keycard.id in self._idToKeycard:
+                    self.warning("Duplicate keycard id: refusing")
+                    raise errors.NotAuthenticatedError()
+
                 self._fdToKeycard[fd] = keycard
                 self._idToKeycard[keycard.id] = keycard