0001-general-remove-support-for-logged-in-anonymous-users.patch

Frédéric Péters, 17 octobre 2020 21:37

Voir les différences: en ligne côte à côte

Subject: [PATCH] general: remove support for logged-in anonymous users
 (#47822)

 wcs/forms/root.py       |  7 ++-----
 wcs/qommon/ident/idp.py |  2 +-
 wcs/qommon/logger.py    |  1 +
 wcs/qommon/myspace.py   |  7 +++----
 wcs/qommon/saml2.py     |  8 +-------
 wcs/qommon/sessions.py  | 25 +++++--------------------
 6 files changed, 13 insertions(+), 37 deletions(-)

             formdata.data = form_data
             formdata.receipt_time = time.localtime()
             if not get_request().is_in_backoffice():
                 session = get_session()
                 if session and session.user and not str(session.user).startswith('anonymous-'):
                     formdata.user_id = session.user
                 formdata.user = get_request().user
             formdata.store()
         def autosave(self):
-...
             else:
                 # if submitting via frontoffice, attach current user, eventually
                 # anonymous, to the formdata
                 if session and session.user and not str(session.user).startswith('anonymous-'):
                     filled.user_id = session.user
                 filled.user = get_request().user
                 filled.store()
                 if not filled.user_id:

                 login_url += '?' + urllib.urlencode({'next': get_request().get_frontoffice_url()})
                 return redirect(login_url)
             if not get_request().user.anonymous:
             if get_request().user:
                 raise errors.AccessForbiddenError()
             form = Form(enctype = 'multipart/form-data', use_tokens = False)

wcs/qommon/logger.py
77	77	else:
78	78	user_id = user.id
79	79	if type(user_id) is str and user_id.startswith('anonymous-'):
	80	# legacy; kept for ancient log entries
80	81	user_id = 'anonymous'
81	82	else:
82	83	user_id = 'unlogged'

     # This module depends upon the following protocol from the user class:
+    #
     # protocol User:
     #   anonymous = boolean
     #   def can_go_in_admin(self): User -> boolean
     #   def can_go_in_backoffice(self): User -> boolean
     #   def get_formdef(self): User -> an object responding to the FormDef protocol
-...
         def profile(self):
             user = get_request().user
             if not user or user.anonymous:
             if not user:
                 raise errors.AccessUnauthorizedError()
             form = Form(enctype = 'multipart/form-data')
-...
                 raise errors.TraversalError()
             user = get_request().user
             if not user or user.anonymous:
             if not user:
                 raise errors.AccessUnauthorizedError()
             form = Form(enctype = 'multipart/form-data')
-...
         def remove(self):
             user = get_request().user
             if not user or user.anonymous:
             if not user:
                 raise errors.AccessUnauthorizedError()
             form = Form(enctype = 'multipart/form-data')

             if user:
                 session.set_user(user.id)
             else:
                 session.set_user('anonymous-%s' % login.nameIdentifier.content)
                 if login.identity:
                     session.lasso_anonymous_identity_dump = login.identity.dump()
                 else:
                     # XXX: this situation happened with SSO initiated by IdP, this
                     # is not normal
                     pass
                 return error_page('Error associating user on SSO')
             session.lasso_identity_provider_id = login.remoteProviderId
             session.message = None
             return self.continue_to_after_url()

         name_identifier = None
         lasso_session_dump = None
         lasso_session_index = None
         lasso_anonymous_identity_dump = None
         lasso_identity_provider_id = None
         message = None
         saml_authn_context = None
-...
         def has_info(self):
             return self.name_identifier or \
                 self.lasso_session_dump or self.message or \
                 self.lasso_anonymous_identity_dump or \
                 self.lasso_identity_provider_id or \
                 self.saml_authn_context or \
                 self.ident_idp_token or \
-...
         def has_user(self):
             user_id = QuixoteSession.get_user(self)
             if user_id and not str(user_id).startswith('anonymous-'):
                 return True
             return False
             return bool(user_id)
         def get_user(self):
             user_id = QuixoteSession.get_user(self)
             if user_id:
                 if str(user_id).startswith('anonymous-'):
                     user = get_publisher().user_class()
                     user.id = user_id
                     user.anonymous = True
                     user.name_identifiers = [ self.name_identifier ]
                     user.lasso_dump = self.lasso_anonymous_identity_dump
                 else:
                     try:
                         user = get_publisher().user_class.get(user_id)
                     except KeyError:
                         return None
                 try:
                     user = get_publisher().user_class.get(user_id)
                 except KeyError:
                     return None
                 if user.is_active:
                     return user
                 else:
                     self.set_user(None)
             return None
         def set_user(self, user_id):
-...
             QuixoteSession.set_user(self, user_id)
             if user_id is None:
                 return
             if str(user_id).startswith('anonymous-'):
                 # do not store connection time for anonymous users
                 return
             try:
                 user = get_publisher().user_class.get(user_id)
                 user.last_seen = time.time()
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-general-remove-support-for-logged-in-anonymous-users.patch