merge two heads
authorOliver Maurhart <oliver.maurhart@ait.ac.at>
Mon, 19 May 2014 15:45:15 +0200
changeset 157f540d6673499
parent 155 bcb24068c63e
parent 156 caf3dd2bf081
child 158 316f9a5be7e5
merge two heads
OpenSecurity/bin/opensecurity_client_restful_server.py
     1.1 --- a/OpenSecurity/bin/opensecurity_client_restful_server.py	Mon May 19 15:44:43 2014 +0200
     1.2 +++ b/OpenSecurity/bin/opensecurity_client_restful_server.py	Mon May 19 15:45:15 2014 +0200
     1.3 @@ -47,6 +47,11 @@
     1.4  import urllib
     1.5  import urllib2
     1.6  import web
     1.7 +import threading
     1.8 +import time
     1.9 +import string
    1.10 +import win32api
    1.11 +import win32con
    1.12  
    1.13  from opensecurity_util import logger, setupLogger, OpenSecurityException
    1.14  if sys.platform == 'win32' or sys.platform == 'cygwin':
    1.15 @@ -443,11 +448,8 @@
    1.16              print 'error in password parsing'
    1.17              return
    1.18          
    1.19 -        # TODO: it would be WAY easier and secure if we just 
    1.20 -        #       add the result json to a HTTP-POST here.
    1.21 +        # by provided a 'data' we turn this into a POST statement
    1.22          url_addr = 'http://' + self._remote_ip + ':58080' + self._resource
    1.23 -
    1.24 -        # by provided a 'data' we turn this into a POST statement
    1.25          req = urllib2.Request(url_addr, urllib.urlencode(j))
    1.26          try:
    1.27              res = urllib2.urlopen(req)