Projet

Général

Profil

0001-log_filters-get-user-and-ip-from-record-if-present-3.patch

Benjamin Dauvergne, 19 août 2019 16:49

Télécharger (1,86 ko)

Voir les différences: 

Subject: [PATCH 1/4] log_filters: get user and ip from record if present
 (#35302)


 src/authentic2/log_filters.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)
src/authentic2/log_filters.py
29 29 
           Inspired by django-log-request-id
30 30 
        '''
31 31 
        from . import middleware
32 
        request = middleware.StoreRequestMiddleware.get_request()
33 
        user = self.DEFAULT_USERNAME
34 
        ip = self.DEFAULT_IP
35 
        request_id = self.DEFAULT_REQUEST_ID
36 
        if request is not None:
32 
        request = record.request = getattr(record, 'request', middleware.StoreRequestMiddleware.get_request())
33 

  		




  
  34
  
    
        if not hasattr(record, 'request_id'):

  		




  
  35
  
    
            record.request_id = getattr(request, 'request_id', self.DEFAULT_REQUEST_ID)

  		




  
  36
  
    

  		




  
  37
  
    
        if not hasattr(record, 'ip'):

  		




  
  38
  
    
            record.ip = self.DEFAULT_IP

  		




  
  39
  
    
            if record.request:

  		




  
  40
  
    
                record.ip = request.META.get('REMOTE_ADDR', self.DEFAULT_IP)

  		




  
  41
  
    

  		




  
  42
  
    
        if not hasattr(record, 'user'):

  		




  37
  43
  
    
            if hasattr(request, 'user') and request.user.is_authenticated():

  		




  38
  
  
    
                user = six.text_type(request.user)

  		




  39
  
  
    
            ip = request.META.get('REMOTE_ADDR', self.DEFAULT_IP)

  		




  40
  
  
    
            request_id = request.request_id

  		




  41
  
  
    
        record.user = user

  		




  42
  
  
    
        record.ip = ip

  		




  43
  
  
    
        record.request_id = request_id

  		




  
  44
  
    
                record.user = six.text_type(request.user)

  		




  
  45
  
    
            else:

  		




  
  46
  
    
                record.user = self.DEFAULT_USERNAME

  		




  
  47
  
    

  		




  44
  48
  
    
        return True

  		




  45
  49
  
    

  		




  46
  50
  
    

  		




  47
  
  
    
-