linspector/linspector-old
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some additions in http service; does not work and i dont know why... :( maybe i am too tired

Browse source
This commit is contained in:
Johannes Findeisen 2013-10-27 03:59:24 +01:00
commit 0915526a59
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
linspector/services/http.py
View file

@ -2,10 +2,11 @@
The http service. The http service.
This is for checking the availability and output of HTTP services. Basic HTTP This is for checking the availability and output of HTTP services. Basic HTTP
content could be fetched and compared.HTTPS is not validating the server certificate! content could be fetched and compared.HTTPS is not validating the server
certificate!
This should just return 0 on success and NOT 0 on error. Just to make internals generic This should just return 0 on success and NOT 0 on error. Just to make internals
to just report this code and not use a parser. generic to just report this code and not use a parser.
Copyright (c) 2011-2013 "Johannes Findeisen and Rafael Timmerberg" Copyright (c) 2011-2013 "Johannes Findeisen and Rafael Timmerberg"
@ -37,8 +38,12 @@ logger = getLogger(__name__)
class HttpService(Service): class HttpService(Service):
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(HttpService, self).__init__(**kwargs) super(HttpService, self).__init__(**kwargs)
args = self.get_arguments() args = self.get_arguments()
if "content" in args:
self.content = args["content"]
else:
raise Exception("There is no content set")
self.method = "get" self.method = "get"
if "method" in args: if "method" in args:
@ -63,14 +68,23 @@ class HttpService(Service):
def needs_arguments(self): def needs_arguments(self):
return True return True
def execute(self): def execute(self, jobInfo):
params = urllib.urlencode(self.params) params = urllib.urlencode(self.params)
if self.method is "get": if self.method is "get":
f = urllib.urlopen(self.protocol + "://" + self._host + ":" + self.port + self.path + "?%s" % params) f = urllib.urlopen(self.protocol + "://" + self._host + ":" + self.port + self.path + "?%s" % params)
elif self.method is "post": elif self.method is "post":
f = urllib.urlopen(self.protocol + "://" + self._host + ":" + self.port + self.path, params) f = urllib.urlopen(self.protocol + "://" + self._host + ":" + self.port + self.path, params)
#print f.read() if self.content not in f.read():
jobInfo.set_errorcode(1)
jobInfo.set_message("[http: " + jobInfo.jobHex + "] Content not found on host: " +
jobInfo.get_host() + " on port: " + str(self.port))
elif jobInfo.get_errorcode() == -1:
jobInfo.set_execution_successful(True)
jobInfo.set_errorcode(0)
jobInfo.set_message("[http: " + jobInfo.jobHex + "] Content found on host: " +
jobInfo.get_host() + " on port: " + str(self.port))
def create(kwargs): def create(kwargs):