[Oval-commits] r163 - trunk/oval-server/OvalServer

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-08-20 10:15:54 +0000 (Mon, 20 Aug 2007)
New Revision: 163

Modified:
   trunk/oval-server/OvalServer/OvalHttpServer.py
Log:
Remove unused ls code. Fix path to definitions

Modified: trunk/oval-server/OvalServer/OvalHttpServer.py
===================================================================
--- trunk/oval-server/OvalServer/OvalHttpServer.py	2007-08-20 07:25:17 UTC (rev 162)
+++ trunk/oval-server/OvalServer/OvalHttpServer.py	2007-08-20 10:15:54 UTC (rev 163)
@@ -2,31 +2,11 @@
 from OpenSSL import SSL
 from dba import dba
 import os, sys, socket
-import xml.dom.ext
 import logging
 
-def ls (path):
-	import xml.dom.minidom
-	
-	doc = xml.dom.minidom.Document ()	
-	root = doc.createElement (os.path.split(path)[1])
-	
-	for file in os.listdir (path):
-		if os.path.isdir ('%s/%s' % (path, file)):
-			node = doc.createElement('dir')
-			node.appendChild (doc.createTextNode(file))
-			root.appendChild (node)
-			
-		if os.path.isfile ("%s/%s" % (path, file)):
-			node = doc.createElement('file')
-			node.appendChild (doc.createTextNode(file))
-			root.appendChild (node)
-		
-	return root
-
 class HttpRequestHandler (SimpleHTTPServer.SimpleHTTPRequestHandler):
 	
-	workdir = '/home/blaze/tmp/oval/server'
+	workdir = '/home/blaze/tmp/oval/server/definitions'
 	
 	def do_QUIT (self):
 		"""send 200 OK response, and set server.stop to True"""
@@ -40,7 +20,7 @@
 		client_ip = self.client_address[0]
 		if db.getAgentInfo(client_ip):
 			try:
-				f = open (self.workdir+os.sep+client_ip)
+				f = open (self.workdir+os.sep+client_ip+'.xml')
 				self.send_response(200)
 				self.send_header('Content-type', 'text/xml')
 				self.end_headers()
@@ -50,24 +30,7 @@
 			except IOError:
 				self.send_error(404, 'File Not Found: %s' % client_ip)
 		else:
-			db.addAgent(client_ip)
-#		try:
-#			#Add check for ../../ names
-#			if self.path.endswith('.xml'):
-#				f = open (self.workdir + os.sep + 'definitions' + os.sep + self.path)
-#				self.send_response(200)
-#				self.send_header('Content-type', 'text/xml')
-#				self.end_headers()
-#				self.wfile.write(f.read())
-#				f.close()
-#				return
-#			else:
-#				self.send_response(200)
-#				self.send_header('Content-type', 'text/xml')
-#				self.end_headers()
-#				xml.dom.ext.PrettyPrint (ls(self.workdir + os.sep + 'definitions'), self.wfile)
-#				return
-		
+			db.addAgent(client_ip)		
 			
 class HttpsRequestHandler (HttpRequestHandler):
 	"""http request handler with QUIT stopping the server"""