git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow self signed certificates
[unfold.git]
/
manifoldapi
/
manifoldapi.py
diff --git
a/manifoldapi/manifoldapi.py
b/manifoldapi/manifoldapi.py
index
b105bf3
..
c6eea10
100644
(file)
--- a/
manifoldapi/manifoldapi.py
+++ b/
manifoldapi/manifoldapi.py
@@
-1,9
+1,10
@@
# Manifold API Python interface
# Manifold API Python interface
-import copy, xmlrpclib
+import copy, xmlrpclib
, ssl
from myslice.configengine import ConfigEngine
from django.contrib import messages
from myslice.configengine import ConfigEngine
from django.contrib import messages
+from django.shortcuts import redirect
from manifoldresult import ManifoldResult, ManifoldCode, ManifoldException
from manifold.core.result_value import ResultValue
from manifoldresult import ManifoldResult, ManifoldCode, ManifoldException
from manifold.core.result_value import ResultValue
@@
-40,7
+41,11
@@
class ManifoldAPI:
self.calls = {}
self.multicall = False
self.url = ConfigEngine().manifold_url()
self.calls = {}
self.multicall = False
self.url = ConfigEngine().manifold_url()
- self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True)
+
+ # Manifold uses a self signed certificate
+ # https://www.python.org/dev/peps/pep-0476/
+ context = ssl._create_unverified_context()
+ self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True, context=context)
def __repr__ (self): return "ManifoldAPI[%s]"%self.url
def __repr__ (self): return "ManifoldAPI[%s]"%self.url
@@
-154,7
+159,7
@@
def execute_query(request, query):
request.session.flush()
#raise Exception, "User not authenticated"
host = request.get_host()
request.session.flush()
#raise Exception, "User not authenticated"
host = request.get_host()
- return redirect(
host
)
+ return redirect(
'/'
)
manifold_api_session_auth = request.session['manifold']['auth']
return _execute_query(request, query, manifold_api_session_auth)
manifold_api_session_auth = request.session['manifold']['auth']
return _execute_query(request, query, manifold_api_session_auth)