Merge

coin/configuration/forms.py

@@ -3,12 +3,14 @@ from __future__ import unicode_literals
 
 from django.forms import ModelForm, ValidationError
 from django.db.models import Q
+from django import forms
 
 from coin.offers.models import OfferSubscription
 from coin.configuration.models import Configuration
 
 
 class ConfigurationForm(ModelForm):
+    comment = forms.CharField(widget=forms.Textarea)
 
     class Meta:
         model = Configuration

coin/settings_base.py

@@ -244,6 +244,9 @@ LDAP_ACTIVATE = False
 LDAP_USER_BASE_DN = None
 VPN_CONF_BASE_DN = None
 
+# Allow member to edit their vpn
+MEMBER_CAN_EDIT_VPN_CONF = True
+
 # Membership configuration
 # Default cotisation in €, per year
 DEFAULT_MEMBERSHIP_FEE = 20

vpn/migrations/0002_vpnconfiguration_crypto_link.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vpn', '0001_squashed_0002_remove_vpnconfiguration_comment'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vpnconfiguration',
+            name='crypto_link',
+            field=models.URLField(help_text='Lien \xe0 usage unique (d\xe9truit apr\xe8s ouverture)', null=True, verbose_name='Mat\xe9riel cryptographique', blank=True),
+        ),
+    ]

vpn/models.py

@@ -10,7 +10,6 @@ import ldapdb.models
 from ldapdb.models.fields import CharField, ListField
 
 from coin.mixins import CoinLdapSyncMixin
-from coin.offers.models import OfferSubscription
 from coin.configuration.models import Configuration
 # from coin.offers.backends import ValidateBackendType
 from coin import utils
@@ -38,7 +37,8 @@ class VPNConfiguration(CoinLdapSyncMixin, Configuration):
                                      verbose_name="IPv6", blank=True, null=True,
                                      help_text="Adresse IPv6 utilisée par "
                                      "défaut sur le VPN")
-
+    crypto_link = models.URLField(verbose_name="Matériel cryptographique", blank=True,
+                           null=True, help_text="Lien à usage unique (détruit après ouverture)")
     objects = NetManager()
 
     def get_absolute_url(self):

vpn/templates/vpn/vpn.html

@@ -5,43 +5,62 @@
 {% block content %}
 <div class="row">
     <h2>Configuration du VPN</h2>
-    <form class="flatform" action="{{ object.get_absolute_url }}" method="post">{% csrf_token %}
-    <p class="legend">Quand vous aurez terminé vos modifications, cliquez sur <input class="button" type="submit" value="Valider" /></p>
-
+    {% if form %}
+        <form class="flatform" action="{{ object.get_absolute_url }}" method="post">{% csrf_token %}
+        <p class="legend">Quand vous aurez terminé vos modifications, cliquez sur <input class="button" type="submit" value="Valider" /></p>
+    {% endif %}
     {% for message in messages %}
-    <div class="message eat-up{% if message.tags %} {{ message.tags }}{% endif %}">
-        {{ message }}
-    </div>
+        <div class="message eat-up{% if message.tags %} {{ message.tags }}{% endif %}">
+            {{ message }}
+        </div>
     {% endfor %}
 
-    {% if form.non_field_errors or form.ipv4_endpoint.errors or form.ipv6_endpoint.errors %}
-    <div class="alert-box alert nogap">
-      {{ form.non_field_errors }}
-      {{ form.ipv4_endpoint.errors }}
-      {{ form.ipv6_endpoint.errors }}
-    </div>{% endif %}
-
+    {% if form %}
+        {% if form.non_field_errors or form.ipv4_endpoint.errors or form.ipv6_endpoint.errors %}
+            <div class="alert-box alert nogap">
+            {{ form.non_field_errors }}
+            {{ form.ipv4_endpoint.errors }}
+            {{ form.ipv6_endpoint.errors }}
+            </div>
+        {% endif %}
+    {% endif %}
     <div class="large-6 columns">
         <div class="panel">
-            <h3>Statut</h3>
+            <h3>Authentification</h3>
             <table class="full-width">
                 <tr>
                     <td class="center"><span class="label">Identifiant</span></td>
                     <td>{{object.login}}</td>
                 </tr>
+                {% if object.password %}
                 <tr>
                     <td class="center" colspan="2">
                         <a class="button tiny radius" id="passgen" href="{% url 'vpn:generate_password' object.pk %}"><i class="fa fa-refresh"></i>
  Générer un nouveau mot de passe</a>
                     </td>
                 </tr>
+                {% endif %}
+                {% if object.crypto_link %}
+                <tr>
+                    <td class="center"><span class="label">Matériel cryptographique</span></td>
+                    <td><a href="{{object.crypto_link}}">Télecharger (lien supprimé après ouverture)</a></td>
+                </tr>
+                {% endif %}
                 <tr class="flatfield">
-                    <td class="center">{{ form.comment.label_tag }}</td>
-                    <td>{{ form.comment }}</td>
+                    {% if form %}
+                        <td class="center">{{ form.comment.label_tag }}</td>
+                        <td>{{ form.comment }}</td>
+                    {% else %}
+                    <td class="center"><span class="label">Commentaire</span></td>
+                        <td>{{ object.comment }}</td>
+                        
+                    {% endif %}
                 </tr>
                 <tr>
                     <td class="center boolviewer" colspan="2">
+                    {% if form %}
                         <input type="checkbox" disabled="disabled"{% if object.activated %} checked="checked"{% endif %} />
+                    {% endif %}
                         <span>Ce VPN est {{ object.activated|yesno:"activé,désactivé" }}</span>
                     </td>
                 </tr>
@@ -53,14 +72,25 @@
         <div class="panel">
             <h3>Adresses IP</h3>
             <table class="full-width">
-                <tr class="flatfield">
-                    <td class="center">{{ form.ipv4_endpoint.label_tag }}</td>
-                    <td{% if form.non_field_errors or form.ipv4_endpoint.errors %} class="errored"{% endif %}>{{ form.ipv4_endpoint }}</td>
-                </tr>
-                <tr class="flatfield">
-                    <td class="center">{{ form.ipv6_endpoint.label_tag }}</td>
-                    <td{% if form.non_field_errors or form.ipv6_endpoint.errors %} class="errored"{% endif %}>{{ form.ipv6_endpoint }}</td>
-                </tr>
+                {% if form %}
+                    <tr class="flatfield">
+                        <td class="center">{{ form.ipv4_endpoint.label_tag }}</td>
+                        <td{% if form.non_field_errors or form.ipv4_endpoint.errors %} class="errored"{% endif %}>{{ form.ipv4_endpoint }}</td>
+                    </tr>
+                    <tr class="flatfield">
+                        <td class="center">{{ form.ipv6_endpoint.label_tag }}</td>
+                        <td{% if form.non_field_errors or form.ipv6_endpoint.errors %} class="errored"{% endif %}>{{ form.ipv6_endpoint }}</td>
+                    </tr>
+                {% else %}
+                    <tr class="flatfield">
+                        <td class="center"><span class="label">IPv4</span></td>
+                        <td>{{ object.ipv4_endpoint }}</td>
+                    </tr>
+                    <tr class="flatfield">
+                        <td class="center"><span class="label">IPv6</span></td>
+                        <td>{{ object.ipv6_endpoint }}</td>
+                    </tr>
+                {% endif %}
                 <tr>
                     <td class="center"><span class="label">Sous-réseaux</span></td>
                     <td>
@@ -70,8 +100,10 @@
             </table>
         </div>
     </div>
+    {% if form %}
     <p class="formcontrol"><input class="button" type="submit" value="Valider" /></p>
     </form>
+    {% endif %}
 </div>
 
 <div class="row" id="graph">

vpn/views.py

@@ -7,6 +7,7 @@ import urllib2
 from django.http import StreamingHttpResponse, HttpResponseServerError
 from django.shortcuts import get_object_or_404
 from django.views.generic.detail import DetailView
+from django.shortcuts import get_object_or_404
 from django.views.generic.edit import UpdateView
 from django.conf import settings
 from django.contrib.messages.views import SuccessMessageMixin
@@ -27,6 +28,11 @@ class VPNView(SuccessMessageMixin, UpdateView):
     def dispatch(self, *args, **kwargs):
         return super(VPNView, self).dispatch(*args, **kwargs)
 
+    def get_form(self, form_class=None):
+        if settings.MEMBER_CAN_EDIT_VPN_CONF:
+            return super(VPNView, self).get_form(form_class)
+        return None
+
     def get_object(self):
         if self.request.user.is_superuser:
             return get_object_or_404(VPNConfiguration, pk=self.kwargs.get("pk"))