Stockage des creds d'identification des switchs

preferences/admin.py

@@ -38,7 +38,8 @@ from .models import (
     AssoOption,
     MailMessageOption,
     HomeOption,
-    RadiusKey
+    RadiusKey,
+    SwitchManagementCred
 )
 
 
@@ -91,6 +92,10 @@ class RadiusKeyAdmin(VersionAdmin):
     """Class radiuskey"""
     pass
 
+class SwitchManagementCredAdmin(VersionAdmin):
+    """Class managementcred for switch"""
+    pass
+
 
 admin.site.register(OptionalUser, OptionalUserAdmin)
 admin.site.register(OptionalMachine, OptionalMachineAdmin)
@@ -101,5 +106,6 @@ admin.site.register(Service, ServiceAdmin)
 admin.site.register(MailContact, MailContactAdmin)
 admin.site.register(Reminder, ReminderAdmin)
 admin.site.register(RadiusKey, RadiusKeyAdmin)
+admin.site.register(SwitchManagementCred, SwitchManagementCredAdmin)
 admin.site.register(AssoOption, AssoOptionAdmin)
 admin.site.register(MailMessageOption, MailMessageOptionAdmin)

preferences/forms.py

@@ -40,7 +40,8 @@ from .models import (
     Service,
     MailContact
     Reminder,
-    RadiusKey
+    RadiusKey,
+    SwitchManagementCred
 )
 
 
@@ -269,6 +270,31 @@ class RadiusKeyForm(FormRevMixin, ModelForm):
         return instance
 
 
+class SwitchManagementCredForm(FormRevMixin, ModelForm):
+    """Edition, ajout de creds de management pour gestion
+    et interface rest des switchs"""
+    members = forms.ModelMultipleChoiceField(
+        Switch.objects.all(),
+        required=False
+    )
+
+    class Meta:
+        model = SwitchManagementCred
+        fields = '__all__'
+
+    def __init__(self, *args, **kwargs):
+        prefix = kwargs.pop('prefix', self.Meta.model.__name__)
+        super(SwitchManagementCredForm, self).__init__(*args, prefix=prefix, **kwargs)
+        instance = kwargs.get('instance', None)
+        if instance:
+            self.initial['members'] = Switch.objects.filter(management_creds=instance)
+
+    def save(self, commit=True):
+        instance = super().save(commit)
+        instance.switch_set = self.cleaned_data['members']
+        return instance
+
+
 class MailContactForm(ModelForm):
     """Edition, ajout d'adresse de contact"""
     class Meta:

preferences/migrations/0048_switchmanagementcred.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-07-10 23:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import re2o.aes_field
+import re2o.mixins
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0047_auto_20180711_0015'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SwitchManagementCred',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('management_id', models.CharField(help_text='Login du switch', max_length=63)),
+                ('management_pass', re2o.aes_field.AESEncryptedField(help_text='Mot de passe', max_length=63)),
+                ('default_switch', models.BooleanField(default=True, help_text='Creds par défaut des switchs', unique=True)),
+            ],
+            options={
+                'permissions': (('view_switchmanagementcred', 'Peut voir un objet switchmanagementcred'),),
+            },
+            bases=(re2o.mixins.AclMixin, models.Model),
+        ),
+    ]

preferences/models.py

@@ -235,7 +235,7 @@ class OptionalTopologie(AclMixin, PreferencesModel):
     def provision_switchs_enabled(self):
         """Return true if all settings are ok : switchs on automatic provision,
         ip_type"""
-        return bool(self.provisioned_switchs and self.switchs_ip_type)
+        return bool(self.provisioned_switchs and self.switchs_ip_type and SwitchManagementCred.objects.filter(default_switch=True).exists())
 
     class Meta:
         permissions = (
@@ -278,6 +278,31 @@ class RadiusKey(AclMixin, models.Model):
         return "Clef radius " + str(self.id) + " " + str(self.comment)
 
 
+class SwitchManagementCred(AclMixin, models.Model):
+    """Class of a management creds of a switch, for rest management"""
+    management_id = models.CharField(
+        max_length=63,
+        help_text="Login du switch"
+    )
+    management_pass = AESEncryptedField(
+        max_length=63,
+        help_text="Mot de passe"
+    )
+    default_switch = models.BooleanField(
+        default=True,
+        unique=True,
+        help_text= "Creds par défaut des switchs"
+    )
+
+    class Meta:
+        permissions = (
+            ("view_switchmanagementcred", "Peut voir un objet switchmanagementcred"),
+        )
+
+    def __str__(self):
+        return "Identifiant " + str(self.management_id)
+
+
 class Reminder(AclMixin, models.Model):
     """Options pour les mails de notification de fin d'adhésion.
     Days: liste des nombres de jours pour lesquells un mail est envoyé

preferences/templates/preferences/aff_switchmanagementcred.html

@@ -0,0 +1,47 @@
+{% comment %}
+Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+se veut agnostique au réseau considéré, de manière à être installable en
+quelques clics.
+
+Copyright © 2017  Gabriel Détraz
+Copyright © 2017  Goulven Kermarec
+Copyright © 2017  Augustin Lemesle
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+{% endcomment %}
+{% load acl %}
+    <table class="table table-striped">
+        <thead>
+            <tr>
+                <th>Identifiant</th>
+                <th>Creds par default des switchs</th>
+		<th></th>
+                <th></th>
+            </tr>
+        </thead>
+        {% for switchmanagementcred in switchmanagementcred_list %}
+        <tr>
+            <td>{{ switchmanagementcred.management_id }}</td>
+            <td>{{ switchmanagementcred.default_switch }}</td>
+            <td class="text-right">
+            {% can_edit switchmanagementcred %}
+            {% include 'buttons/edit.html' with href='preferences:edit-switchmanagementcred' id=switchmanagementcred.id %}
+            {% acl_end %}
+            {% include 'buttons/history.html' with href='preferences:history' name='switchmanagementcred' id=switchmanagementcred.id %}
+            </td>
+        </tr>
+        {% endfor %}
+    </table>
+

preferences/templates/preferences/display_preferences.html

@@ -124,7 +124,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	</tr>
     </table>
 
-    <h5>Configuration des switches</h5>
+	<h6>Clef radius</h6>
+	  {% can_create RadiusKey%}
+	  <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-radiuskey'  %}"><i class="fa fa-plus"></i> Ajouter une clef radius</a>
+	  {% acl_end %}
+	  {%  include "preferences/aff_radiuskey.html" with  radiuskey_list=radiuskey_list %}
+
+    <h4>Configuration des switches</h4>
     <table class="table table-striped">
 	<tr>
             <th>Web management, activé si provision automatique</th>
@@ -148,11 +154,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	</tr>
     </table>
 
-	<h5>Clef radius</h5>
-	  {% can_create RadiusKey%}
-	  <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-radiuskey'  %}"><i class="fa fa-plus"></i> Ajouter une clef radius</a>
+       <h6>Creds de management des switchs</h6>
+	  {% can_create SwitchManagementCred%}
+	  <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-switchmanagementcred'  %}"><i class="fa fa-plus"></i> Ajouter un id/mdp de management switch</a>
 	  {% acl_end %}
-	  {%  include "preferences/aff_radiuskey.html" with  radiuskey_list=radiuskey_list %}
+          <p>
+          </p>
+          {% if switchmanagementcred_list %}<span class="label label-success"> OK{% else %}<span class="label label-danger">Manquant{% endif %}</span>
+          {%  include "preferences/aff_switchmanagementcred.html" with  switchmanagementcred_list=switchmanagementcred_list %}
+
+
 
     <h5>{% if topologieoptions.provisioned_switchs %}<span class="label label-success">Provision de la config des switchs{% else %}<span class="label label-danger">Provision de la config des switchs{% endif%}</span></h5>
     <table class="table table-striped">

preferences/urls.py

@@ -94,5 +94,12 @@ urlpatterns = [
         name='edit-radiuskey'
         ),
     url(r'^del_radiuskey/$', views.del_radiuskey, name='del-radiuskey'),
+    url(r'^add_switchmanagementcred/$', views.add_switchmanagementcred, name='add-switchmanagementcred'),
+    url(
+        r'^edit_switchmanagementcred/(?P<switchmanagementcredid>[0-9]+)$',
+        views.edit_switchmanagementcred,
+        name='edit-switchmanagementcred'
+        ),
+    url(r'^del_switchmanagementcred/$', views.del_switchmanagementcred, name='del-switchmanagementcred'),
     url(r'^$', views.display_options, name='display-options'),
 ]

preferences/views.py

@@ -43,16 +43,12 @@ from reversion import revisions as reversion
 from re2o.views import form
 from re2o.acl import can_create, can_edit, can_delete_set, can_view_all
 
-<<<<<<< HEAD
-from .forms import (
-    ServiceForm, DelServiceForm, MailContactForm, DelMailContactForm
-=======
 from .forms import MailContactForm, DelMailContactForm
 from .forms import (
     ServiceForm,
     ReminderForm,
-    RadiusKeyForm
->>>>>>> 3d881c4f... Gestion de la clef radius, et serialisation
+    RadiusKeyForm,
+    SwitchManagementCredForm
 )
 from .models import (
     Service,
@@ -63,13 +59,10 @@ from .models import (
     MailMessageOption,
     GeneralOption,
     OptionalTopologie,
-<<<<<<< HEAD
-    HomeOption
-=======
     HomeOption,
     Reminder,
-    RadiusKey
->>>>>>> 3d881c4f... Gestion de la clef radius, et serialisation
+    RadiusKey,
+    SwitchManagementCred
 )
 from . import models
 from . import forms
@@ -90,11 +83,9 @@ def display_options(request):
     mailmessageoptions, _created = MailMessageOption.objects.get_or_create()
     service_list = Service.objects.all()
     mailcontact_list = MailContact.objects.all()
-<<<<<<< HEAD
-=======
     reminder_list = Reminder.objects.all()
     radiuskey_list = RadiusKey.objects.all()
->>>>>>> 3d881c4f... Gestion de la clef radius, et serialisation
+    switchmanagementcred_list = SwitchManagementCred.objects.all()
     return form({
         'useroptions': useroptions,
         'machineoptions': machineoptions,
@@ -104,13 +95,11 @@ def display_options(request):
         'homeoptions': homeoptions,
         'mailmessageoptions': mailmessageoptions,
         'service_list': service_list,
-<<<<<<< HEAD
         'mailcontact_list': mailcontact_list
-=======
         'reminder_list': reminder_list,
         'mailcontact_list': mailcontact_list,
         'radiuskey_list' : radiuskey_list,
->>>>>>> 3d881c4f... Gestion de la clef radius, et serialisation
+        'switchmanagementcred_list': switchmanagementcred_list,  
         }, 'preferences/display_preferences.html', request)
 
 
@@ -223,8 +212,6 @@ def del_service(request, instances):
 
 
 @login_required
-<<<<<<< HEAD
-=======
 @can_delete(Reminder)
 def del_reminder(request, reminder_instance, **_kwargs):
     """Destruction d'un reminder"""
@@ -285,7 +272,51 @@ def del_radiuskey(request, radiuskey_instance, **_kwargs):
 
 
 @login_required
->>>>>>> 3d881c4f... Gestion de la clef radius, et serialisation
+@can_create(SwitchManagementCred)
+def add_switchmanagementcred(request):
+    """Ajout de creds de management"""
+    switchmanagementcred = SwitchManagementCredForm(request.POST or None)
+    if switchmanagementcred.is_valid():
+        switchmanagementcred.save()
+        messages.success(request, "Ces creds ont été ajoutés")
+        return redirect(reverse('preferences:display-options'))
+    return form(
+        {'preferenceform': switchmanagementcred, 'action_name': 'Ajouter'},
+        'preferences/preferences.html',
+        request
+        )
+
+@can_edit(SwitchManagementCred)
+def edit_switchmanagementcred(request, switchmanagementcred_instance, **_kwargs):
+    """Edition des creds de management"""
+    switchmanagementcred = SwitchManagementCredForm(request.POST or None, instance=switchmanagementcred_instance)
+    if switchmanagementcred.is_valid():
+        switchmanagementcred.save()
+        messages.success(request, "Creds de managament modifié")
+        return redirect(reverse('preferences:display-options'))
+    return form(
+        {'preferenceform': switchmanagementcred, 'action_name': 'Editer'},
+        'preferences/preferences.html',
+        request
+    )
+
+
+@login_required
+@can_delete(SwitchManagementCred)
+def del_switchmanagementcred(request, switchmanagementcred_instance, **_kwargs):
+    """Destruction d'un switchmanagementcred"""
+    if request.method == "POST":
+        switchmanagementcred_instance.delete()
+        messages.success(request, "Ce switchmanagementcred a été détruit")
+        return redirect(reverse('preferences:display-options'))
+    return form(
+        {'objet': switchmanagementcred_instance, 'objet_name': 'switchmanagementcred'},
+        'preferences/delete.html',
+        request
+        )
+
+
+@login_required
 @can_create(MailContact)
 def add_mailcontact(request):
     """Add a contact email adress."""

topologie/migrations/0071_switch_management_creds.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-07-10 23:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0048_switchmanagementcred'),
+        ('topologie', '0070_switch_radius_key'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='switch',
+            name='management_creds',
+            field=models.ForeignKey(blank=True, help_text='Identifiant de management de ce switch', null=True, on_delete=django.db.models.deletion.PROTECT, to='preferences.SwitchManagementCred'),
+        ),
+    ]

topologie/models.py

@@ -49,7 +49,11 @@ from django.db import transaction
 from django.utils.translation import ugettext_lazy as _
 from reversion import revisions as reversion
 
-from preferences.models import OptionalTopologie, RadiusKey
+from preferences.models import (
+    OptionalTopologie,
+    RadiusKey,
+    SwitchManagementCred
+)
 from machines.models import Machine, regen
 from re2o.mixins import AclMixin, RevMixin
 
@@ -236,6 +240,13 @@ class Switch(AclMixin, Machine):
         on_delete=models.PROTECT,
         help_text="Clef radius du switch"
     )
+    management_creds = models.ForeignKey(
+        'preferences.SwitchManagementCred',
+        blank=True,
+        null=True,
+        on_delete=models.PROTECT,
+        help_text="Identifiant de management de ce switch"
+    )
 
     class Meta:
         unique_together = ('stack', 'stack_member_id')
@@ -306,15 +317,30 @@ class Switch(AclMixin, Machine):
 
     @cached_property
     def get_radius_key(self):
+        """Retourne l'objet de la clef radius de ce switch"""
         return self.radius_key or RadiusKey.objects.filter(default_switch=True).first()
 
     @cached_property
     def get_radius_key_value(self):
+        """Retourne la valeur en str de la clef radius, none si il n'y en a pas"""
         if self.get_radius_key:
             return self.get_radius_key.radius_key
         else:
             return None
 
+    @cached_property
+    def get_management_cred(self):
+        """Retourne l'objet des creds de managament de ce switch"""
+        return self.management_creds or SwitchManagementCred.objects.filter(default_switch=True).first()
+
+    @cached_property
+    def get_management_cred_value(self):
+        """Retourne un dict des creds de management du switch"""
+        if self.get_management_cred:
+            return {'id': self.get_management_cred.management_id, 'pass': self.get_management_cred.management_pass}
+        else:
+            return None
+
     @cached_property
     def rest_enabled(self):
         return OptionalTopologie.get_cached_value('switchs_rest_management') or self.automatic_provision