Ticket #317: server-name-317.patch
| File server-name-317.patch, 9.1 KB (added by thijs, 5 months ago) |
|---|
-
pyamf/remoting/gateway/wsgi.py
60 60 start_response('400 Bad Request', [ 61 61 ('Content-Type', 'text/plain'), 62 62 ('Content-Length', str(len(response))), 63 ('Server', gateway.SERVER_NAME), 63 64 ]) 64 65 65 66 return [response] … … 81 82 try: 82 83 request = remoting.decode(body, context) 83 84 except pyamf.DecodeError: 84 self.logger.e rror(gateway.format_exception())85 self.logger.exception(gateway.format_exception()) 85 86 86 87 response = "400 Bad Request\n\nThe request body was unable to " \ 87 88 "be successfully decoded." … … 92 93 start_response('400 Bad Request', [ 93 94 ('Content-Type', 'text/plain'), 94 95 ('Content-Length', str(len(response))), 96 ('Server', gateway.SERVER_NAME), 95 97 ]) 96 98 97 99 return [response] … … 104 106 except (KeyboardInterrupt, SystemExit): 105 107 raise 106 108 except: 107 self.logger.e rror(gateway.format_exception())109 self.logger.exception(gateway.format_exception()) 108 110 109 111 response = "500 Internal Server Error\n\nThe request was " \ 110 112 "unable to be successfully processed." … … 115 117 start_response('500 Internal Server Error', [ 116 118 ('Content-Type', 'text/plain'), 117 119 ('Content-Length', str(len(response))), 120 ('Server', gateway.SERVER_NAME), 118 121 ]) 119 122 120 123 return [response] … … 125 128 try: 126 129 stream = remoting.encode(response, context) 127 130 except pyamf.EncodeError: 128 self.logger.e rror(gateway.format_exception())131 self.logger.exception(gateway.format_exception()) 129 132 130 133 response = "500 Internal Server Error\n\nThe request was " \ 131 134 "unable to be encoded." … … 136 139 start_response('500 Internal Server Error', [ 137 140 ('Content-Type', 'text/plain'), 138 141 ('Content-Length', str(len(response))), 142 ('Server', gateway.SERVER_NAME), 139 143 ]) 140 144 141 145 return [response] … … 145 149 start_response('200 OK', [ 146 150 ('Content-Type', remoting.CONTENT_TYPE), 147 151 ('Content-Length', str(len(response))), 152 ('Server', gateway.SERVER_NAME), 148 153 ]) 149 154 150 155 return [response] -
pyamf/remoting/gateway/google.py
59 59 60 60 def get(self): 61 61 self.response.headers['Content-Type'] = 'text/plain' 62 self.response.headers['Server'] = gateway.SERVER_NAME 62 63 self.error(405) 63 64 self.response.out.write("405 Method Not Allowed\n\n" + \ 64 65 "To access this PyAMF gateway you must use POST requests " + \ … … 74 75 try: 75 76 request = remoting.decode(body, context) 76 77 except pyamf.DecodeError: 77 self.logger.e rror(gateway.format_exception())78 self.logger.exception(gateway.format_exception()) 78 79 79 80 response = "400 Bad Request\n\nThe request body was unable to " \ 80 81 "be successfully decoded." … … 84 85 85 86 self.error(400) 86 87 self.response.headers['Content-Type'] = 'text/plain' 88 self.response.headers['Server'] = gateway.SERVER_NAME 87 89 self.response.out.write(response) 88 90 89 91 return … … 96 98 except (KeyboardInterrupt, SystemExit): 97 99 raise 98 100 except: 99 self.logger.e rror(gateway.format_exception())101 self.logger.exception(gateway.format_exception()) 100 102 101 103 response = "500 Internal Server Error\n\nThe request was " \ 102 104 "unable to be successfully processed." … … 106 108 107 109 self.error(500) 108 110 self.response.headers['Content-Type'] = 'text/plain' 111 self.response.headers['Server'] = gateway.SERVER_NAME 109 112 self.response.out.write(response) 110 113 111 114 return … … 116 119 try: 117 120 stream = remoting.encode(response, context) 118 121 except pyamf.EncodeError: 119 self.logger.e rror(gateway.format_exception())122 self.logger.exception(gateway.format_exception()) 120 123 121 124 response = "500 Internal Server Error\n\nThe request was " \ 122 125 "unable to be encoded." … … 126 129 127 130 self.error(500) 128 131 self.response.headers['Content-Type'] = 'text/plain' 132 self.response.headers['Server'] = gateway.SERVER_NAME 129 133 self.response.out.write(response) 130 134 131 135 return … … 134 138 135 139 self.response.headers['Content-Type'] = remoting.CONTENT_TYPE 136 140 self.response.headers['Content-Length'] = str(len(response)) 141 self.response.headers['Server'] = gateway.SERVER_NAME 142 137 143 self.response.out.write(response) 138 144 139 145 def __call__(self, *args, **kwargs): -
pyamf/remoting/gateway/__init__.py
7 7 @since: 0.1.0 8 8 """ 9 9 10 import platform 10 11 import types 11 12 12 13 import pyamf 13 14 from pyamf import remoting, logging, util 14 15 16 SERVER_NAME = 'PyAMF/%s Python/%s' % ( 17 '.'.join(map(lambda x: str(x), pyamf.__version__)), 18 platform.python_version() 19 ) 20 15 21 fault_alias = pyamf.get_class_alias(remoting.ErrorFault) 16 22 17 23 class BaseServiceError(pyamf.BaseError): -
pyamf/remoting/gateway/django.py
86 86 try: 87 87 request = remoting.decode(http_request.raw_post_data, context) 88 88 except pyamf.DecodeError: 89 self.logger.e rror(gateway.format_exception())89 self.logger.exception(gateway.format_exception()) 90 90 http_response.status_code = 400 91 91 92 92 return http_response … … 99 99 except (KeyboardInterrupt, SystemExit): 100 100 raise 101 101 except: 102 self.logger.e rror(gateway.format_exception())102 self.logger.exception(gateway.format_exception()) 103 103 104 104 return http.HttpResponseServerError() 105 105 … … 109 109 try: 110 110 stream = remoting.encode(response, context) 111 111 except pyamf.EncodeError: 112 self.logger.e rror(gateway.format_exception())112 self.logger.exception(gateway.format_exception()) 113 113 114 114 return http.HttpResponseServerError('Unable to encode the response') 115 115 116 116 buf = stream.getvalue() 117 117 http_response['Content-Type'] = remoting.CONTENT_TYPE 118 118 http_response['Content-Length'] = str(len(buf)) 119 http_response['Server'] = gateway.SERVER_NAME 119 120 http_response.write(buf) 120 121 121 122 return http_response -
pyamf/remoting/gateway/twisted.py
68 68 request, (failure.type, failure.value, failure.tb))) 69 69 70 70 def response_cb(result): 71 self.gateway.logger.debug("AMF Response: %r" % result)72 71 response.body = result 72 73 self.gateway.logger.debug("AMF Response: %r" % response) 73 74 deferred_response.callback(response) 74 75 75 76 def preprocess_cb(result): … … 123 124 deferred_response.callback(remoting.Response(ro_response, status=remoting.STATUS_ERROR)) 124 125 125 126 def response_cb(result): 126 self.gateway.logger.debug("AMF Response: %r" % result)127 127 128 ro_response.body = result 128 deferred_response.callback(remoting.Response(ro_response)) 129 res = remoting.Response(ro_response) 130 self.gateway.logger.debug("AMF Response: %r" % res) 131 132 deferred_response.callback(res) 129 133 130 134 def process_cb(result): 131 135 d = defer.maybeDeferred(self.gateway.callServiceRequest, service_request, *ro_request.body, **kwargs) … … 194 198 195 199 request.setHeader("Content-Type", mimetype) 196 200 request.setHeader("Content-Length", str(len(content))) 201 request.setHeader("Server", gateway.SERVER_NAME) 197 202 198 203 request.write(content) 199 204 request.finish() … … 209 214 """ 210 215 Return HTTP 400 Bad Request. 211 216 """ 212 self.logger.e rror(failure.printDetailedTraceback())217 self.logger.exception(failure.printDetailedTraceback()) 213 218 214 219 body = "400 Bad Request\n\nThe request body was unable to " \ 215 220 "be successfully decoded."