8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-23 23:43:47 +00:00

Ajout des modèles sshfingerprint et sshfingerprintalgo

This commit is contained in:
chirac 2018-06-23 17:59:34 +02:00
parent ed59b50bcf
commit f7b29453aa
12 changed files with 360 additions and 3 deletions

View file

@ -43,7 +43,9 @@ from .models import (
Role,
OuverturePort,
Ipv6List,
OuverturePortList
OuverturePortList,
SshFingerprint,
SshFprAlgo,
)
@ -141,6 +143,15 @@ class RoleAdmin(VersionAdmin):
pass
class SshFprAlgoAdmin(VersionAdmin):
""" Admin view of a SshFprAlgo object """
pass
class SshFingerprintAdmin(VersionAdmin):
""" Admin view of a SshFprAlgo object """
pass
admin.site.register(Machine, MachineAdmin)
admin.site.register(MachineType, MachineTypeAdmin)
@ -161,3 +172,5 @@ admin.site.register(Ipv6List, Ipv6ListAdmin)
admin.site.register(Nas, NasAdmin)
admin.site.register(OuverturePort, OuverturePortAdmin)
admin.site.register(OuverturePortList, OuverturePortListAdmin)
admin.site.register(SshFprAlgo, SshFprAlgoAdmin)
admin.site.register(SshFingerprint, SshFingerprintAdmin)

View file

@ -60,6 +60,8 @@ from .models import (
IpType,
OuverturePortList,
Ipv6List,
SshFingerprint,
SshFprAlgo
)
@ -601,3 +603,33 @@ class EditOuverturePortListForm(FormRevMixin, ModelForm):
prefix=prefix,
**kwargs
)
class SshFingerprintForm(FormRevMixin, ModelForm):
"""Edition d'une sshfingerprint"""
class Meta:
model = SshFingerprint
exclude = ('machine',)
def __init__(self, *args, **kwargs):
prefix = kwargs.pop('prefix', self.Meta.model.__name__)
super(SshFingerprintForm, self).__init__(
*args,
prefix=prefix,
**kwargs
)
class SshFprAlgoForm(FormRevMixin, ModelForm):
"""Edition de la liste des algo pour sshfpr"""
class Meta:
model = SshFprAlgo
fields = '__all__'
def __init__(self, *args, **kwargs):
prefix = kwargs.pop('prefix', self.Meta.model.__name__)
super(SshFprAlgoForm, self).__init__(
*args,
prefix=prefix,
**kwargs
)

View file

@ -0,0 +1,50 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2018-06-23 14:51
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
import re2o.mixins
class Migration(migrations.Migration):
dependencies = [
('machines', '0083_role'),
]
operations = [
migrations.CreateModel(
name='SshFingerprint',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('hash_entry', models.TextField(max_length=512)),
('comment', models.CharField(blank=True, max_length=255, null=True)),
],
options={
'permissions': (('view_sshfingerprint', 'Peut voir un objet sshfingerprint'),),
},
bases=(re2o.mixins.RevMixin, re2o.mixins.AclMixin, models.Model),
),
migrations.CreateModel(
name='SshFprAlgo',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.TextField(max_length=256)),
],
options={
'permissions': (('view_sshfpralgo', 'Peut voir un algo de chiffrement'),),
},
bases=(re2o.mixins.RevMixin, re2o.mixins.AclMixin, models.Model),
),
migrations.AddField(
model_name='sshfingerprint',
name='algo',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='machines.SshFprAlgo'),
),
migrations.AddField(
model_name='sshfingerprint',
name='machine',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='machines.Machine'),
),
]

View file

@ -204,6 +204,52 @@ class Machine(RevMixin, FieldPermissionModelMixin, models.Model):
def __str__(self):
return str(self.user) + ' - ' + str(self.id) + ' - ' + str(self.name)
class SshFingerprint(RevMixin, AclMixin, models.Model):
"""Hash de la clef ssh d'une machine"""
PRETTY_NAME = "Fingerprint ssh"
machine = models.ForeignKey('Machine', on_delete=models.CASCADE)
hash_entry = models.TextField(max_length=512)
algo = models.ForeignKey('SshFprAlgo', on_delete=models.PROTECT)
comment = models.CharField(
max_length=255,
null=True,
blank=True
)
class Meta:
permissions = (
("view_sshfingerprint", "Peut voir un objet sshfingerprint"),
)
def can_view(self, user_request, *_args, **_kwargs):
return self.machine.can_view(user_request, *_args, **_kwargs)
def can_edit(self, user_request, *args, **kwargs):
return self.machine.can_edit(user_request, *args, **kwargs)
def can_delete(self, user_request, *args, **kwargs):
return self.machine.can_delete(user_request, *args, **kwargs)
def __str__(self):
return str(self.algo) + ' ' + str(self.hash_entry) + ' ' + str(self.comment)
class SshFprAlgo(RevMixin, AclMixin, models.Model):
"""Un aglorithme de création de la fingerprint ssh"""
PRETTY_NAME = "Algo de clef ssh"
name = models.TextField(max_length=256)
class Meta:
permissions = (
("view_sshfpralgo", "Peut voir un algo de chiffrement"),
)
def __str__(self):
return str(self.name)
class MachineType(RevMixin, AclMixin, models.Model):
""" Type de machine, relié à un type d'ip, affecté aux interfaces"""

View file

@ -118,6 +118,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a>
</li>
{% acl_end %}
{% can_create SshFingerprint interface.machine.id %}
<li>
<a href="{% url 'machines:index-sshfingerprint' interface.machine.id %}">
<i class="fa fa-edit"></i> Gerer les fingerprint ssh
</a>
</li>
{% acl_end %}
{% can_create OuverturePortList %}
<li>
<a href="{% url 'machines:port-config' interface.id%}">

View file

@ -0,0 +1,51 @@
{% 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 © 2018 Gabriel Détraz
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>Entrée du hash</th>
<th>Algorithme utilisé</th>
<th>Commentaire</th>
<th></th>
</tr>
</thead>
{% for sshfpr in sshfingerprint_list %}
<tr>
<td>{{ sshfpr.hash_entry }}</td>
<td>{{ sshfpr.algo }}</td>
<td>{{ sshfpr.comment }}</td>
<td class="text-right">
{% can_edit sshfpr %}
{% include 'buttons/edit.html' with href='machines:edit-sshfingerprint' id=sshfpr.id %}
{% acl_end %}
{% can_delete sshfpr %}
{% include 'buttons/suppr.html' with href='machines:del-sshfingerprint' id=sshfpr.id %}
{% acl_end %}
{% include 'buttons/history.html' with href='machines:history' name='sshfingerprint' id=sshfpr.id %}
</td>
</tr>
{% endfor %}
</table>

View file

@ -0,0 +1,39 @@
{% extends "machines/sidebar.html" %}
{% 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 © 2018 Gabriel Détraz
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 bootstrap3 %}
{% load acl %}
{% block title %}Machines{% endblock %}
{% block content %}
<h2>Liste des fingerprint ssh</h2>
{% can_create SshFingerprint machine_id %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-sshfingerprint' machine_id %}"><i class="fa fa-plus"></i> Ajouter une fingerprint ssh</a>
{% acl_end %}
{% include "machines/aff_sshfingerprint.html" with sshfingerprint_list=sshfingerprint_list %}
<br />
<br />
<br />
{% endblock %}

View file

@ -78,6 +78,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if ipv6form %}
{% bootstrap_form_errors ipv6form %}
{% endif %}
{% if sshfingerprintform %}
{% bootstrap_form_errors sshfingerprintform %}
{% endif %}
<form class="form" method="post">
{% csrf_token %}
@ -153,6 +158,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<h3>Ipv6</h3>
{% bootstrap_form ipv6form %}
{% endif %}
{% if sshfingerprintform %}
<h3>SshFingerprint</h3>
{% bootstrap_form sshfingerprintform %}
{% endif %}
{% bootstrap_button action_name button_type="submit" icon="star" %}
</form>
<br />

View file

@ -105,6 +105,18 @@ urlpatterns = [
url(r'^index_ipv6/(?P<interfaceid>[0-9]+)$',
views.index_ipv6,
name='index-ipv6'),
url(r'^new_sshfingerprint/(?P<machineid>[0-9]+)$',
views.new_sshfingerprint,
name='new-sshfingerprint'),
url(r'^edit_sshfingerprint/(?P<sshfingerprintid>[0-9]+)$',
views.edit_sshfingerprint,
name='edit-sshfingerprint'),
url(r'^del_sshfingerprint/(?P<sshfingerprintid>[0-9]+)$',
views.del_sshfingerprint,
name='del-sshfingerprint'),
url(r'^index_sshfingerprint/(?P<machineid>[0-9]+)$',
views.index_sshfingerprint,
name='index-sshfingerprint'),
url(r'^add_service/$', views.add_service, name='add-service'),
url(r'^edit_service/(?P<serviceid>[0-9]+)$',
views.edit_service,

View file

@ -107,7 +107,9 @@ from .forms import (
DelSrvForm,
Ipv6ListForm,
EditOuverturePortListForm,
EditOuverturePortConfigForm
EditOuverturePortConfigForm,
SshFingerprintForm,
SshFprAlgoForm,
)
from .models import (
IpType,
@ -129,6 +131,8 @@ from .models import (
OuverturePortList,
OuverturePort,
Ipv6List,
SshFingerprint,
SshFprAlgo,
)
@ -459,6 +463,72 @@ def del_ipv6list(request, ipv6list, **_kwargs):
)
@login_required
@can_create(SshFingerprint)
@can_edit(Machine)
def new_sshfingerprint(request, machine, **_kwargs):
"""Nouvelle sshfingerprint"""
sshfingerprint_instance = SshFingerprint(machine=machine)
sshfingerprint = SshFingerprintForm(
request.POST or None,
instance=sshfingerprint_instance
)
if sshfingerprint.is_valid():
sshfingerprint.save()
messages.success(request, "Fingerprint ssh ajoutée")
return redirect(reverse(
'machines:index-sshfingerprint',
kwargs={'machine': str(machine.id)}
))
return form(
{'sshfingerprintform': sshfingerprint, 'action_name': 'Créer'},
'machines/machine.html',
request
)
@login_required
@can_edit(SshFingerprint)
def edit_sshfingerprint(request, sshfingerprint_instance, **_kwargs):
"""Edition d'une sshfingerprint"""
sshfingerprint = SshFingerprintForm(
request.POST or None,
instance=sshfingerprint_instance
)
if sshfingerprint.is_valid():
if sshfingerprint.changed_data:
sshfingerprint.save()
messages.success(request, "Ipv6 modifiée")
return redirect(reverse(
'machines:index-sshfingerprint',
kwargs={'machineid': str(sshfingerprint_instance.machine.id)}
))
return form(
{'sshfingerprintform': sshfingerprint, 'action_name': 'Editer'},
'machines/machine.html',
request
)
@login_required
@can_delete(SshFingerprint)
def del_sshfingerprint(request, sshfingerprint, **_kwargs):
""" Supprime une sshfingerprint"""
if request.method == "POST":
machineid = sshfingerprint.machine.id
sshfingerprint.delete()
messages.success(request, "La sshfingerprint a été détruite")
return redirect(reverse(
'machines:index-sshfingerprint',
kwargs={'machineid': str(machineid)}
))
return form(
{'objet': sshfingerprint, 'objet_name': 'sshfingerprint'},
'machines/delete.html',
request
)
@login_required
@can_create(IpType)
def add_iptype(request):
@ -1387,7 +1457,31 @@ def index_alias(request, interface, interfaceid):
@login_required
@can_edit(Interface)
@can_edit(Machine)
def index_sshfingerprint(request, machine, machineid):
""" View used to display the list of existing IPv6 of an interface """
sshfingerprint_list = SshFingerprint.objects.filter(machine=machine)
return render(
request,
'machines/index_sshfingerprint.html',
{'sshfingerprint_list': sshfingerprint_list, 'machine_id': machineid}
)
@login_required
@can_view_all(SshFprAlgo)
def index_sshfpralgo(request):
""" View used to display the list of existing sshfrpalgo"""
sshfpralgo_list = SshFprAlgo.objects.all()
return render(
request,
'machines/index_sshfpralgo.html',
{'sshfpralgo_list': sshfpralgo_list}
)
@login_required
@can_view_all(Interface)
def index_ipv6(request, interface, interfaceid):
""" View used to display the list of existing IPv6 of an interface """
ipv6_list = Ipv6List.objects.filter(interface=interface)

View file

@ -112,6 +112,8 @@ MODEL_NAME = {
'Role': machines.models.Role,
'OuverturePortList': machines.models.OuverturePortList,
'OuverturePort': machines.models.OuverturePort,
'SshFingerprint': machines.models.SshFingerprint,
'SshFprAlgo': machines.models.SshFprAlgo,
# preferences
'OptionalUser': preferences.models.OptionalUser,
'OptionalMachine': preferences.models.OptionalMachine,

View file

@ -129,6 +129,8 @@ HISTORY_BIND = {
'vlan': machines.models.Vlan,
'nas': machines.models.Nas,
'ipv6list': machines.models.Ipv6List,
'sshfingerprint': machines.models.SshFingerprint,
'sshfpralgo': machines.models.SshFprAlgo,
},
}