moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

testenv: fix http_server.py with Response and Authentication.

Browse Source 
* testenv/exc/server_error.py: Try writing file content for GET
request even if there is a Response rule present.
* testenv/server/http/http_server.py: Likewise.
This commit is contained in:
Yousong Zhou 2015-01-30 21:07:11 +08:00 committed by Giuseppe Scrivano
parent 3a00b37bc2
commit b7b6d7fd89
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testenv/exc/server_error.py
View File

@ -5,3 +5,6 @@ class ServerError (Exception):
def __init__ (self, err_message): def __init__ (self, err_message):
self.err_message = err_message self.err_message = err_message
class AuthError (ServerError):
pass

33
testenv/server/http/http_server.py
View File

@ -1,5 +1,5 @@
from http.server import HTTPServer, BaseHTTPRequestHandler from http.server import HTTPServer, BaseHTTPRequestHandler
from exc.server_error import ServerError from exc.server_error import ServerError, AuthError
from socketserver import BaseServer from socketserver import BaseServer
from posixpath import basename, splitext from posixpath import basename, splitext
from base64 import b64encode from base64 import b64encode
@ -274,18 +274,16 @@ class _Handler (BaseHTTPRequestHandler):
self.user = auth_rule.auth_user self.user = auth_rule.auth_user
self.passw = auth_rule.auth_pass self.passw = auth_rule.auth_pass
params = self.parse_auth_header (auth_header) params = self.parse_auth_header (auth_header)
pass_auth = True
if self.user != params['username'] or \ if self.user != params['username'] or \
self.nonce != params['nonce'] or \ self.nonce != params['nonce'] or \
self.opaque != params['opaque']: self.opaque != params['opaque']:
pass_auth = False return False
req_attribs = ['username', 'realm', 'nonce', 'uri', 'response'] req_attribs = ['username', 'realm', 'nonce', 'uri', 'response']
for attrib in req_attribs: for attrib in req_attribs:
if attrib not in params: if attrib not in params:
pass_auth = False return False
if not self.check_response (params): if not self.check_response (params):
pass_auth = False return False
return pass_auth
def authorize_both (self, auth_header, auth_rule): def authorize_both (self, auth_header, auth_rule):
return False return False
@ -296,11 +294,11 @@ class _Handler (BaseHTTPRequestHandler):
def Authentication (self, auth_rule): def Authentication (self, auth_rule):
try: try:
self.handle_auth (auth_rule) self.handle_auth (auth_rule)
except ServerError as se: except AuthError as se:
self.send_response (401, "Authorization Required") self.send_response (401, "Authorization Required")
self.send_challenge (auth_rule.auth_type) self.send_challenge (auth_rule.auth_type)
self.finish_headers () self.finish_headers ()
raise ServerError (se.__str__()) raise se
def handle_auth (self, auth_rule): def handle_auth (self, auth_rule):
is_auth = True is_auth = True
@ -314,11 +312,11 @@ class _Handler (BaseHTTPRequestHandler):
assert hasattr (self, "authorize_" + auth_type) assert hasattr (self, "authorize_" + auth_type)
is_auth = getattr (self, "authorize_" + auth_type) (auth_header, auth_rule) is_auth = getattr (self, "authorize_" + auth_type) (auth_header, auth_rule)
except AssertionError: except AssertionError:
raise ServerError ("Authentication Mechanism " + auth_type + " not supported") raise AuthError ("Authentication Mechanism " + auth_type + " not supported")
except AttributeError as ae: except AttributeError as ae:
raise ServerError (ae.__str__()) raise AuthError (ae.__str__())
if is_auth is False: if is_auth is False:
raise ServerError ("Unable to Authenticate") raise AuthError ("Unable to Authenticate")
def ExpectHeader (self, header_obj): def ExpectHeader (self, header_obj):
@ -363,6 +361,8 @@ class _Handler (BaseHTTPRequestHandler):
if path in self.server.fileSys: if path in self.server.fileSys:
self.rules = self.server.server_configs.get (path) self.rules = self.server.server_configs.get (path)
content = self.server.fileSys.get (path)
content_length = len (content)
for rule_name in self.rules: for rule_name in self.rules:
try: try:
assert hasattr (self, rule_name) assert hasattr (self, rule_name)
@ -371,12 +371,13 @@ class _Handler (BaseHTTPRequestHandler):
msg = "Rule " + rule_name + " not defined" msg = "Rule " + rule_name + " not defined"
self.send_error (500, msg) self.send_error (500, msg)
return (None, None) return (None, None)
except AuthError as ae:
print (ae.__str__())
return (None, None)
except ServerError as se: except ServerError as se:
print (se.__str__()) print (se.__str__())
return (None, None) return (content, None)
content = self.server.fileSys.get (path)
content_length = len (content)
try: try:
self.range_begin = self.parse_range_header ( self.range_begin = self.parse_range_header (
self.headers.get ("Range"), content_length) self.headers.get ("Range"), content_length)