Projet

Général

Profil

0001-cartads_cs-add-optional-parameter-for-client-name-36.patch

Frédéric Péters, 19 septembre 2019 12:13

Télécharger (2,6 ko)

Voir les différences: 

Subject: [PATCH] cartads_cs: add optional parameter for client name (#36258)


 .../migrations/0006_cartadscs_client_name.py  | 20 +++++++++++++++++++
 passerelle/apps/cartads_cs/models.py          |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 passerelle/apps/cartads_cs/migrations/0006_cartadscs_client_name.py
passerelle/apps/cartads_cs/migrations/0006_cartadscs_client_name.py
1 
# -*- coding: utf-8 -*-
2 
# Generated by Django 1.11.12 on 2019-09-19 10:10
3 
from __future__ import unicode_literals
4 

  		




  
  5
  
    
from django.db import migrations, models

  		




  
  6
  
    

  		




  
  7
  
    

  		




  
  8
  
    
class Migration(migrations.Migration):

  		




  
  9
  
    

  		




  
  10
  
    
    dependencies = [

  		




  
  11
  
    
        ('cartads_cs', '0005_cartadsfile_sent_to_cartads'),

  		




  
  12
  
    
    ]

  		




  
  13
  
    

  		




  
  14
  
    
    operations = [

  		




  
  15
  
    
        migrations.AddField(

  		




  
  16
  
    
            model_name='cartadscs',

  		




  
  17
  
    
            name='client_name',

  		




  
  18
  
    
            field=models.CharField(blank=True, help_text='Only useful in shared environments.', max_length=64, null=True, verbose_name='Client Name'),

  		




  
  19
  
    
        ),

  		




  
  20
  
    
    ]

  		












  

    
      passerelle/apps/cartads_cs/models.py
    
  





  99
  99
  
    
            help_text=_('ex: https://example.net/adscs/webservices/'))

  		




  100
  100
  
    
    username = models.CharField(_('Username'), max_length=64)

  		




  101
  101
  
    
    password = models.CharField(_('Password'), max_length=64)

  		




  
  102
  
    
    client_name = models.CharField(_('Client Name'), max_length=64, blank=True, null=True,

  		




  
  103
  
    
            help_text=_('Only useful in shared environments.'))

  		




  102
  104
  
    
    iv = models.CharField(_('Initialisation Vector'), max_length=16)

  		




  103
  105
  
    
    secret_key = models.CharField(_('Secret Key'), max_length=16)

  		




  104
  106
  
    
    ftp_server = models.CharField(_('FTP Server'), max_length=128)

  		




  ......




  139
  141
  
    
            'login': self.username,

  		




  140
  142
  
    
            'password': self.password,

  		




  141
  143
  
    
        }

  		




  
  144
  
    
        if self.client_name:

  		




  
  145
  
    
            token_data['client'] = self.client_name

  		




  142
  146
  
    
        token_data_str = json.dumps(token_data)

  		




  143
  147
  
    
        data_pad = AES.block_size - len(token_data_str) % AES.block_size

  		




  144
  148
  
    
        aes = AES.new(self.secret_key, AES.MODE_CBC, self.iv)

  		




  145
  
  
    
-