summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Proxy.py
Commit message (Collapse)AuthorAgeFilesLines
* Proxy.py: Pass through SSL protocol optionSol Jerome2014-10-151-4/+7
| | | | | | | | | | | | | | Previously we were not passing through the SSL protocol specified in the client's bcfg2.conf which caused it to unconditionally be set to xmlrpc/ssl. While this appears to automagically work with newer versions of openssl, the version in e.g. centos5 will fail if the server is set to use TLSv1. This commit passes through the setting from the client's bcfg2.conf so that older clients can talk to servers which are set to TLSv1 (in order to mitigate the effects of POODLE). Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* Don't re-raise unknown exceptions per stpierreMichael Fenn2013-11-021-4/+0
|
* Proxy: Catch SSL errors and retryMichael Fenn2013-11-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SSL library can throw an exception during the XMLRPC method call. There is no explicit except statement for this type of exception so they get raised up and abort the client's processing. This patch catches the exception so that normal retry processing occurs. Typical traceback: Traceback (most recent call last): File "/usr/sbin/bcfg2", line 29, in ? sys.exit(main()) File "/usr/sbin/bcfg2", line 26, in main return Client(setup).run() File "/usr/lib/python2.4/site-packages/Bcfg2/Client/Client.py", line 256, in run rawconfig = self.get_config(times=times).decode('utf-8') File "/usr/lib/python2.4/site-packages/Bcfg2/Client/Client.py", line 225, in get_config self.run_probes(times=times) File "/usr/lib/python2.4/site-packages/Bcfg2/Client/Client.py", line 151, in run_probes probes = Bcfg2.Client.XML.XML(str(self.proxy.GetProbes())) File "/usr/lib/python2.4/site-packages/Bcfg2/Proxy.py", line 81, in __call__ return _orig_Method.__call__(self, *args) File "/usr/lib64/python2.4/xmlrpclib.py", line 1096, in __call__ return self.__send(self.__name, args) File "/usr/lib64/python2.4/xmlrpclib.py", line 1383, in __request verbose=self.__verbose File "/usr/lib/python2.4/site-packages/Bcfg2/Proxy.py", line 331, in request return self.parse_response(response) File "/usr/lib64/python2.4/xmlrpclib.py", line 1255, in parse_response return self._parse_response(file, None) File "/usr/lib64/python2.4/xmlrpclib.py", line 1276, in _parse_response response = file.read(1024) File "/usr/lib64/python2.4/httplib.py", line 480, in read s = self.fp.read(amt) File "/usr/lib64/python2.4/socket.py", line 303, in read data = self._sock.recv(recv_size) File "/usr/lib64/python2.4/site-packages/M2Crypto/SSL/Connection.py", line 217, in read return self._read_bio(size) File "/usr/lib64/python2.4/site-packages/M2Crypto/SSL/Connection.py", line 202, in _read_bio return m2.ssl_read(self.ssl, size, self._timeout) M2Crypto.SSL.SSLError: (104, 'Connection reset by peer')
* Proxy: handle BadStatusLine errors gracefullyChris St. Pierre2013-05-231-1/+1
|
* Proxy: Use ASCII quotes to make python 2 happySol Jerome2013-05-051-1/+1
| | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* Proxy: Fix HTTPConnection for >= python 3.2Sol Jerome2013-05-041-1/+6
| | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* testsuite: more text fixesChris St. Pierre2013-03-261-0/+2
|
* Merge branch '1.3.2' into maintChris St. Pierre2013-03-211-0/+3
|\ | | | | | | | | | | | | | | | | Conflicts: src/lib/Bcfg2/Client/Tools/__init__.py src/sbin/bcfg2-test testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py testsuite/Testsrc/test_code_checks.py
| * added PEP-8 style checks to test suiteChris St. Pierre2013-03-111-0/+3
| |
* | allow communication passwords with URL special chars (@, /, etc.) in themChris St. Pierre2013-03-181-3/+4
|/
* improve some error messagesChris St. Pierre2012-10-041-3/+5
|
* various pylint fixesChris St. Pierre2012-09-251-1/+0
|
* removed debugging statementChris St. Pierre2012-09-071-1/+0
|
* improving plugin development docsChris St. Pierre2012-09-061-21/+1
|
* renamed Bcfg2Py3k to CompatChris St. Pierre2012-08-271-1/+1
|
* fixed broken XML-RPC retries, made delay configurableChris St. Pierre2012-08-201-29/+38
|
* Proxy: made SSLHTTPConnection object py3k-compatibleChris St. Pierre2012-08-201-13/+17
|
* added CherryPy-based server coreChris St. Pierre2012-07-191-13/+1
|
* Add IPv6 supportSol Jerome2012-07-081-1/+9
| | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* fixed total think-o in ProxyErrorChris St. Pierre2012-05-021-1/+1
|
* Allow to run directly from a git checkout (#1037)Sol Jerome2012-03-241-0/+368
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>