Commit 7d1c64fd authored by Ivan Tyagov's avatar Ivan Tyagov

Use cookie for authentication. Remove old unused code.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23641 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 46b36a63
No related merge requests found
...@@ -42,6 +42,9 @@ from AccessControl.SecurityManagement import newSecurityManager, noSecurityManag ...@@ -42,6 +42,9 @@ from AccessControl.SecurityManagement import newSecurityManager, noSecurityManag
import zLOG import zLOG
import cookielib import cookielib
from urlparse import urlparse, urlunparse from urlparse import urlparse, urlunparse
from base64 import encodestring, decodestring
from urllib import quote, unquote
from DateTime import DateTime
# global (RAM) cookie storage # global (RAM) cookie storage
cookiejar = cookielib.CookieJar() cookiejar = cookielib.CookieJar()
...@@ -413,11 +416,19 @@ class WizardTool(BaseTool): ...@@ -413,11 +416,19 @@ class WizardTool(BaseTool):
"""Updates parameter_dict to include local saved server info settings. """ """Updates parameter_dict to include local saved server info settings. """
global _server_to_preference_ids_map global _server_to_preference_ids_map
for key, value in _server_to_preference_ids_map.items(): for key, value in _server_to_preference_ids_map.items():
if key != 'password':
parameter_dict[key] = self.getExpressConfigurationPreference(value, None) parameter_dict[key] = self.getExpressConfigurationPreference(value, None)
else:
parameter_dict['password'] = ''
## add local ERP5 instance url ## add local ERP5 instance url
parameter_dict['erp5_url'] = self.getPortalObject().absolute_url() parameter_dict['erp5_url'] = self.getPortalObject().absolute_url()
# add user preffered language # add user preffered language
parameter_dict['user_preferred_language'] = getattr(self, 'user_preferred_language', 'en') parameter_dict['user_preferred_language'] = getattr(self, 'user_preferred_language', 'en')
# add password from cookie
__ac_express = self.REQUEST.get('__ac_express', None)
if __ac_express is not None:
__ac_express = decodestring(unquote(__ac_express))
parameter_dict['password'] = __ac_express
def _updateParameterDictWithFileUpload(self, parameter_dict): def _updateParameterDictWithFileUpload(self, parameter_dict):
"""Updates parameter_dict to replace file upload with their file content, """Updates parameter_dict to replace file upload with their file content,
...@@ -518,12 +529,6 @@ class WizardTool(BaseTool): ...@@ -518,12 +529,6 @@ class WizardTool(BaseTool):
###################################################### ######################################################
## Navigation ## ## Navigation ##
###################################################### ######################################################
security.declareProtected(Permissions.ModifyPortalContent, 'init')
def init(self, REQUEST=None, **kw):
""" Unconditionaly reset client_id and start new configuration process. """
#user_id = REQUEST.get('field_my_ac_name', '')
#password = REQUEST.get('field_my_ac_password', '')
return self.next(REQUEST, **kw)
#security.declareProtected(Permissions.ModifyPortalContent, 'login') #security.declareProtected(Permissions.ModifyPortalContent, 'login')
def login(self, REQUEST): def login(self, REQUEST):
...@@ -547,9 +552,16 @@ class WizardTool(BaseTool): ...@@ -547,9 +552,16 @@ class WizardTool(BaseTool):
return self.WizardTool_dialogForm(form_html=response["data"]) return self.WizardTool_dialogForm(form_html=response["data"])
elif command == "next": elif command == "next":
self._setServerInfo(user_id=user_id, \ self._setServerInfo(user_id=user_id, \
password=password, \ #password=password, \
client_id=response['server_buffer'].get('client_id', None), \ client_id=response['server_buffer'].get('client_id', None), \
current_bc_index=response['server_buffer'].get('current_bc_index', None)) current_bc_index=response['server_buffer'].get('current_bc_index', None))
# set encoded __ac_express cookie at client's browser
__ac_express = quote(encodestring(password))
expires = (DateTime() + 1).toZone('GMT').rfc822()
REQUEST.RESPONSE.setCookie('__ac_express',
__ac_express,
expires = expires)
REQUEST.set('__ac_express', __ac_express)
return self.next(REQUEST=REQUEST) return self.next(REQUEST=REQUEST)
elif command == "login": elif command == "login":
## invalid user/password ## invalid user/password
...@@ -624,15 +636,18 @@ class WizardTool(BaseTool): ...@@ -624,15 +636,18 @@ class WizardTool(BaseTool):
what's happening. """ what's happening. """
active_process = self.portal_activities.newActiveProcess() active_process = self.portal_activities.newActiveProcess()
REQUEST.set('active_process_id', active_process.getId()) REQUEST.set('active_process_id', active_process.getId())
self.activate(active_process=active_process, tag = 'initialERP5Setup').initialERP5Setup() request_restore_dict = {'__ac_express': self.REQUEST.get('__ac_express', None),}
self.activate(active_process=active_process, tag = 'initialERP5Setup').initialERP5Setup(request_restore_dict)
return self.Wizard_viewInstallationStatus(REQUEST) return self.Wizard_viewInstallationStatus(REQUEST)
security.declareProtected(Permissions.ModifyPortalContent, 'initialERP5Setup') security.declareProtected(Permissions.ModifyPortalContent, 'initialERP5Setup')
def initialERP5Setup(self): def initialERP5Setup(self, request_restore_dict={}):
""" Get from remote generation server customized bt5 template files """ Get from remote generation server customized bt5 template files
and then install them. """ and then install them. """
# TODO: the installation have to be splitted into 1 activity per business # restore some REQUEST variables as this method is executed in an activity
# template install. # and there's no access to real original REQUEST
for key, value in request_restore_dict.items():
self.REQUEST.set(key, value)
self.REQUEST.form['wizard_request_type'] = 'initial_setup' self.REQUEST.form['wizard_request_type'] = 'initial_setup'
# calculate server_url, because after bt5 installation reindexing is started # calculate server_url, because after bt5 installation reindexing is started
# which will make it impossible to get preferences items # which will make it impossible to get preferences items
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment