Merge lp:~franciscosouza/txaws/txaws-proxysupport into lp:txaws

[Francisco Souza]

client: add support for http and https proxying

https://codereview.appspot.com/6852064/

[Chico (franciscossouza)]

Reviewers: mp+134896_code.launchpad.net,

Message:
Please take a look.

Description:
client: add support for http and https proxying

https://code.launchpad.net/~franciscosouza/txaws/txaws-proxysupport/+merge/134896

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/6852064/

Affected files:
   A [revision details]
   M txaws/client/base.py

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: txaws/client/base.py
=== modified file 'txaws/client/base.py'
--- txaws/client/base.py 2012-05-16 02:35:26 +0000
+++ txaws/client/base.py 2012-11-19 12:56:26 +0000
@@ -1,3 +1,6 @@
+import os
+import urlparse
+
  try:
      from xml.etree.ElementTree import ParseError
  except ImportError:
@@ -6,14 +9,14 @@
  import warnings
  from StringIO import StringIO

+from twisted.internet.endpoints import TCP4ClientEndpoint
  from twisted.internet.ssl import ClientContextFactory
  from twisted.internet.protocol import Protocol
  from twisted.internet.defer import Deferred, succeed, fail
  from twisted.python import failure
  from twisted.web import http
  from twisted.web.iweb import UNKNOWN_LENGTH
-from twisted.web.client import HTTPClientFactory
-from twisted.web.client import Agent
+from twisted.web.client import Agent, ProxyAgent
  from twisted.web.client import ResponseDone
  from twisted.web.http import NO_CONTENT
  from twisted.web.http_headers import Headers
@@ -220,16 +223,28 @@
          if (self.body_producer is None) and (data is not None):
              self.body_producer = FileBodyProducer(StringIO(data))
          if scheme == "https":
- if self.endpoint.ssl_hostname_verification:
- contextFactory = WebVerifyingContextFactory(host)
+ proxy_endpoint = os.environ.get("https_proxy")
+ if proxy_endpoint:
+ proxy_url = urlparse.urlparse(proxy_endpoint)
+ endpoint = TCP4ClientEndpoint(self.reactor,
proxy_url.hostname, proxy_url.port)
+ agent = ProxyAgent(endpoint, self.reactor)
              else:
- contextFactory = WebClientContextFactory()
- agent = Agent(self.reactor, contextFactory)
+ if self.endpoint.ssl_hostname_verification:
+ contextFactory = WebVerifyingContextFactory(host)
+ else:
+ contextFactory = WebClientContextFactory()
+ agent = Agent(self.reactor, contextFactory)
              self.client.url = url
              d = agent.request(method, url, self.request_headers,
                  self.body_producer)
          else:
- agent = Agent(self.reactor)
+ proxy_endpoint = os.environ.get("http_proxy")
+ if proxy_endpoint:
+ proxy_url = urlparse.urlparse(proxy_endpoint)
+ endpoint = TCP4ClientEndpoint(self.reactor,
proxy_url.hostname, proxy_url.port)
+ agent =...

[lp:~franciscosouza/txaws/txaws-proxysupport]

153. By Francisco Souza on 2012-11-19

client: don't pass reator to ProxyAgent

Endpoint already holds the instance of the reactor.

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6852064/

[lp:~franciscosouza/txaws/txaws-proxysupport]

154. By Francisco Souza on 2012-11-21

client: trap PotentialDataLoss

Amazon never sends Content-Length header, even on http 1.0.

[Chico (franciscossouza)]

Please take a look.

https://codereview.appspot.com/6852064/

Unmerged revisions

154. By Francisco Souza on 2012-11-21

client: trap PotentialDataLoss

Amazon never sends Content-Length header, even on http 1.0.

153. By Francisco Souza on 2012-11-19

client: don't pass reator to ProxyAgent

Endpoint already holds the instance of the reactor.

152. By Francisco Souza on 2012-11-19

client: add support for http and https proxying

=== modified file 'txaws/client/base.py'
--- txaws/client/base.py	2012-05-16 02:35:26 +0000
+++ txaws/client/base.py	2012-11-21 12:05:22 +0000
@@ -1,3 +1,6 @@
+import os
+import urlparse
+
 try:
     from xml.etree.ElementTree import ParseError
 except ImportError:
@@ -6,16 +9,16 @@
 import warnings
 from StringIO import StringIO
 
+from twisted.internet.endpoints import TCP4ClientEndpoint
 from twisted.internet.ssl import ClientContextFactory
 from twisted.internet.protocol import Protocol
 from twisted.internet.defer import Deferred, succeed, fail
 from twisted.python import failure
 from twisted.web import http
 from twisted.web.iweb import UNKNOWN_LENGTH
-from twisted.web.client import HTTPClientFactory
-from twisted.web.client import Agent
+from twisted.web.client import Agent, ProxyAgent
 from twisted.web.client import ResponseDone
-from twisted.web.http import NO_CONTENT
+from twisted.web.http import NO_CONTENT, PotentialDataLoss
 from twisted.web.http_headers import Headers
 from twisted.web.error import Error as TwistedWebError
 try:
@@ -130,7 +133,7 @@
         self._received += len(bytes)
 
     def connectionLost(self, reason):
-        reason.trap(ResponseDone)
+        reason.trap(ResponseDone, PotentialDataLoss)
         d = self.finished
         self.finished = None
         streaming = self.content_length is UNKNOWN_LENGTH
@@ -220,16 +223,28 @@
         if (self.body_producer is None) and (data is not None):
             self.body_producer = FileBodyProducer(StringIO(data))
         if scheme == "https":
-            if self.endpoint.ssl_hostname_verification:
-                contextFactory = WebVerifyingContextFactory(host)
+            proxy_endpoint = os.environ.get("https_proxy")
+            if proxy_endpoint:
+                proxy_url = urlparse.urlparse(proxy_endpoint)
+                endpoint = TCP4ClientEndpoint(self.reactor, proxy_url.hostname, proxy_url.port)
+                agent = ProxyAgent(endpoint)
             else:
-                contextFactory = WebClientContextFactory()
-            agent = Agent(self.reactor, contextFactory)
+                if self.endpoint.ssl_hostname_verification:
+                    contextFactory = WebVerifyingContextFactory(host)
+                else:
+                    contextFactory = WebClientContextFactory()
+                agent = Agent(self.reactor, contextFactory)
             self.client.url = url
             d = agent.request(method, url, self.request_headers,
                 self.body_producer)
         else:
-            agent = Agent(self.reactor)
+            proxy_endpoint = os.environ.get("http_proxy")
+            if proxy_endpoint:
+                proxy_url = urlparse.urlparse(proxy_endpoint)
+                endpoint = TCP4ClientEndpoint(self.reactor, proxy_url.hostname, proxy_url.port)
+                agent = ProxyAgent(endpoint)
+            else:
+                agent = Agent(self.reactor)
             d = agent.request(method, url, self.request_headers,
                 self.body_producer)
         d.addCallback(self._handle_response)