Changeset 1466 for pyamf/trunk/pyamf/remoting/client/__init__.py

Timestamp:

06/30/08 21:51:09 (5 months ago)

Author:

thijs

Message:

Fix issue #316: Referer missing in remoting client

Review by: njoyce

Files:

• pyamf/trunk/pyamf/remoting/client/__init__.py (modified) (6 diffs)

pyamf/trunk/pyamf/remoting/client/__init__.py

@@ -176 +176 @@
         See L{ENCODING_TYPES<pyamf.ENCODING_TYPES>}.
     @type amf_version: C{int}
+    @ivar referer: The referer, or HTTP referer, identifies the address of the
+        client. Ignored by default.
+    @type referer: C{str}
     @ivar client_type: The client type. See L{ClientTypes<pyamf.ClientTypes>}.
     @ivar connection: The underlying connection to the remoting server.
@@ -183 +186 @@
     """
 
-    def __init__(self, url, amf_version=pyamf.AMF0, client_type=DEFAULT_CLIENT_TYPE):
+    def __init__(self, url, amf_version=pyamf.AMF0, client_type=DEFAULT_CLIENT_TYPE,
+                 referer=None):
         self.logger = logging.instance_logger(self)
         self.original_url = url
@@ -189 +193 @@
         self.request_number = 1
 
+        self.referer = referer
         self.amf_version = amf_version
         self.client_type = client_type
@@ -233 +238 @@
 
         self.logger.info('Creating connection to %s://%s:%s' % (self.url[0], hostname, port))
-
+        self.logger.debug('Referer: %s' % self.referer)
+        
     def addHeader(self, name, value, must_understand=False):
         """
@@ -335 +341 @@
         self.logger.debug('Executing single request: %s' % request)
         body = remoting.encode(self.getAMFRequest([request]))
+        headers = {'Content-Type': remoting.CONTENT_TYPE}
+
+        if self.referer is not None:
+            headers['Referer'] = self.referer
 
         self.logger.debug('Sending POST request to %s' % self._root_url)
         self.connection.request('POST', self._root_url, body.getvalue(),
-            {'Content-Type': remoting.CONTENT_TYPE})
+                                headers)
 
         envelope = self._getResponse()
@@ -351 +361 @@
         """
         body = remoting.encode(self.getAMFRequest(self.requests))
+        headers = {'Content-Type': remoting.CONTENT_TYPE}
+
+        if self.referer is not None:
+            headers['Referer'] = self.referer
 
         self.logger.debug('Sending POST request to %s' % self._root_url)
         self.connection.request('POST', self._root_url, body.getvalue(),
-            {'Content-Type': remoting.CONTENT_TYPE})
+                                headers)
 
         envelope = self._getResponse()