Commit e2c0271b authored by Maël Kervella's avatar Maël Kervella

Use the record label as for other DNS records

parent 562d116c
...@@ -222,6 +222,13 @@ class SrvSerializer(NamespacedHMSerializer): ...@@ -222,6 +222,13 @@ class SrvSerializer(NamespacedHMSerializer):
fields = ('service', 'protocole', 'extension', 'ttl', 'priority', fields = ('service', 'protocole', 'extension', 'ttl', 'priority',
'weight', 'port', 'target', 'api_url') 'weight', 'port', 'target', 'api_url')
class SshFpSerializer(NamespacedHMSerializer):
"""Serialize `machines.models.SSHFP` objects.
"""
class Meta:
model = machines.SshFp
field = ('machine', 'pub_key_entry', 'algo', 'comment', 'api_url')
class InterfaceSerializer(NamespacedHMSerializer): class InterfaceSerializer(NamespacedHMSerializer):
"""Serialize `machines.models.Interface` objects. """Serialize `machines.models.Interface` objects.
...@@ -679,6 +686,26 @@ class SRVRecordSerializer(SrvSerializer): ...@@ -679,6 +686,26 @@ class SRVRecordSerializer(SrvSerializer):
fields = ('service', 'protocole', 'ttl', 'priority', 'weight', 'port', 'target') fields = ('service', 'protocole', 'ttl', 'priority', 'weight', 'port', 'target')
class SSHFPRecordSerializer(SshFpSerializer):
"""Serialize `machines.models.SshFp` objects with the data needed to
generate a SSHFP DNS record.
"""
class Meta(SshFpSerializer.Meta):
fields = ('algo_id', 'hash')
class SSHFPInterfaceSerializer(serializers.ModelSerializer):
"""Serialize `machines.models.Domain` objects with the data needed to
generate a CNAME DNS record.
"""
hostname = serializers.CharField(source='domain.name', read_only=True)
sshfp = SSHFPRecordSerializer(source='machine.sshfp_set', many=True, read_only=True)
class Meta:
model = machines.Interface
fields = ('hostname', 'sshfp')
class ARecordSerializer(serializers.ModelSerializer): class ARecordSerializer(serializers.ModelSerializer):
"""Serialize `machines.models.Interface` objects with the data needed to """Serialize `machines.models.Interface` objects with the data needed to
generate a A DNS record. generate a A DNS record.
...@@ -716,21 +743,6 @@ class CNAMERecordSerializer(serializers.ModelSerializer): ...@@ -716,21 +743,6 @@ class CNAMERecordSerializer(serializers.ModelSerializer):
fields = ('alias', 'hostname', 'extension') fields = ('alias', 'hostname', 'extension')
class SSHFPRRecordSerializer(serializers.ModelSerializer):
class Meta:
model = machines.SshFingerprint
fields = ('algo_id', 'hash')
class SSHFPRInterfaceSerializer(serializers.ModelSerializer):
hostname = serializers.CharField(source='domain.name', read_only=True)
sshfpr = SSHFPRRecordSerializer(source='machine.sshfingerprint_set', many=True, read_only=True)
class Meta:
model = machines.Interface
fields = ('hostname', 'sshfpr')
class DNSZonesSerializer(serializers.ModelSerializer): class DNSZonesSerializer(serializers.ModelSerializer):
"""Serialize the data about DNS Zones. """Serialize the data about DNS Zones.
""" """
...@@ -744,13 +756,13 @@ class DNSZonesSerializer(serializers.ModelSerializer): ...@@ -744,13 +756,13 @@ class DNSZonesSerializer(serializers.ModelSerializer):
a_records = ARecordSerializer(many=True, source='get_associated_a_records') a_records = ARecordSerializer(many=True, source='get_associated_a_records')
aaaa_records = AAAARecordSerializer(many=True, source='get_associated_aaaa_records') aaaa_records = AAAARecordSerializer(many=True, source='get_associated_aaaa_records')
cname_records = CNAMERecordSerializer(many=True, source='get_associated_cname_records') cname_records = CNAMERecordSerializer(many=True, source='get_associated_cname_records')
sshfpr_records = SSHFPRInterfaceSerializer(many=True, source='get_associated_sshfpr') sshfp_records = SSHFPInterfaceSerializer(many=True, source='get_associated_sshfp_records')
class Meta: class Meta:
model = machines.Extension model = machines.Extension
fields = ('name', 'soa', 'ns_records', 'originv4', 'originv6', fields = ('name', 'soa', 'ns_records', 'originv4', 'originv6',
'mx_records', 'txt_records', 'srv_records', 'a_records', 'mx_records', 'txt_records', 'srv_records', 'a_records',
'aaaa_records', 'cname_records', 'sshfpr_records') 'aaaa_records', 'cname_records', 'sshfp_records')
# MAILING # MAILING
......
...@@ -54,6 +54,7 @@ router.register_viewset(r'machines/ns', views.NsViewSet) ...@@ -54,6 +54,7 @@ router.register_viewset(r'machines/ns', views.NsViewSet)
router.register_viewset(r'machines/txt', views.TxtViewSet) router.register_viewset(r'machines/txt', views.TxtViewSet)
router.register_viewset(r'machines/dname', views.DNameViewSet) router.register_viewset(r'machines/dname', views.DNameViewSet)
router.register_viewset(r'machines/srv', views.SrvViewSet) router.register_viewset(r'machines/srv', views.SrvViewSet)
router.register_viewset(r'machines/sshfp', views.SshFpViewSet)
router.register_viewset(r'machines/interface', views.InterfaceViewSet) router.register_viewset(r'machines/interface', views.InterfaceViewSet)
router.register_viewset(r'machines/ipv6list', views.Ipv6ListViewSet) router.register_viewset(r'machines/ipv6list', views.Ipv6ListViewSet)
router.register_viewset(r'machines/domain', views.DomainViewSet) router.register_viewset(r'machines/domain', views.DomainViewSet)
......
...@@ -177,6 +177,13 @@ class SrvViewSet(viewsets.ReadOnlyModelViewSet): ...@@ -177,6 +177,13 @@ class SrvViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = serializers.SrvSerializer serializer_class = serializers.SrvSerializer
class SshFpViewSet(viewsets.ReadOnlyModelViewSet):
"""Exposes list and details of `machines.models.SshFp` objects.
"""
queryset = machines.SshFp.objects.all()
serializer_class = serializers.SshFpSerializer
class InterfaceViewSet(viewsets.ReadOnlyModelViewSet): class InterfaceViewSet(viewsets.ReadOnlyModelViewSet):
"""Exposes list and details of `machines.models.Interface` objects. """Exposes list and details of `machines.models.Interface` objects.
""" """
......
...@@ -39,12 +39,12 @@ from .models import ( ...@@ -39,12 +39,12 @@ from .models import (
Txt, Txt,
DName, DName,
Srv, Srv,
SshFp,
Nas, Nas,
Service, Service,
OuverturePort, OuverturePort,
Ipv6List, Ipv6List,
OuverturePortList, OuverturePortList,
SshFingerprint,
) )
...@@ -107,6 +107,11 @@ class SrvAdmin(VersionAdmin): ...@@ -107,6 +107,11 @@ class SrvAdmin(VersionAdmin):
pass pass
class SshFpAdmin(VersionAdmin):
""" Admin view of a SSHFP object """
pass
class NasAdmin(VersionAdmin): class NasAdmin(VersionAdmin):
""" Admin view of a Nas object """ """ Admin view of a Nas object """
pass pass
...@@ -142,10 +147,6 @@ class ServiceAdmin(VersionAdmin): ...@@ -142,10 +147,6 @@ class ServiceAdmin(VersionAdmin):
list_display = ('service_type', 'min_time_regen', 'regular_time_regen') list_display = ('service_type', 'min_time_regen', 'regular_time_regen')
class SshFingerprintAdmin(VersionAdmin):
""" Admin view of a SshFprAlgo object """
pass
admin.site.register(Machine, MachineAdmin) admin.site.register(Machine, MachineAdmin)
admin.site.register(MachineType, MachineTypeAdmin) admin.site.register(MachineType, MachineTypeAdmin)
admin.site.register(IpType, IpTypeAdmin) admin.site.register(IpType, IpTypeAdmin)
...@@ -156,6 +157,7 @@ admin.site.register(Ns, NsAdmin) ...@@ -156,6 +157,7 @@ admin.site.register(Ns, NsAdmin)
admin.site.register(Txt, TxtAdmin) admin.site.register(Txt, TxtAdmin)
admin.site.register(DName, DNameAdmin) admin.site.register(DName, DNameAdmin)
admin.site.register(Srv, SrvAdmin) admin.site.register(Srv, SrvAdmin)
admin.site.register(SshFp, SshFpAdmin)
admin.site.register(IpList, IpListAdmin) admin.site.register(IpList, IpListAdmin)
admin.site.register(Interface, InterfaceAdmin) admin.site.register(Interface, InterfaceAdmin)
admin.site.register(Domain, DomainAdmin) admin.site.register(Domain, DomainAdmin)
...@@ -165,4 +167,3 @@ admin.site.register(Ipv6List, Ipv6ListAdmin) ...@@ -165,4 +167,3 @@ admin.site.register(Ipv6List, Ipv6ListAdmin)
admin.site.register(Nas, NasAdmin) admin.site.register(Nas, NasAdmin)
admin.site.register(OuverturePort, OuverturePortAdmin) admin.site.register(OuverturePort, OuverturePortAdmin)
admin.site.register(OuverturePortList, OuverturePortListAdmin) admin.site.register(OuverturePortList, OuverturePortListAdmin)
admin.site.register(SshFingerprint, SshFingerprintAdmin)
...@@ -56,11 +56,11 @@ from .models import ( ...@@ -56,11 +56,11 @@ from .models import (
Service, Service,
Vlan, Vlan,
Srv, Srv,
SshFp,
Nas, Nas,
IpType, IpType,
OuverturePortList, OuverturePortList,
Ipv6List, Ipv6List,
SshFingerprint,
) )
...@@ -598,15 +598,15 @@ class EditOuverturePortListForm(FormRevMixin, ModelForm): ...@@ -598,15 +598,15 @@ class EditOuverturePortListForm(FormRevMixin, ModelForm):
) )
class SshFingerprintForm(FormRevMixin, ModelForm): class SshFpForm(FormRevMixin, ModelForm):
"""Edits a SSH fingerprint.""" """Edits a SSHFP record."""
class Meta: class Meta:
model = SshFingerprint model = SshFp
exclude = ('machine',) exclude = ('machine',)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
prefix = kwargs.pop('prefix', self.Meta.model.__name__) prefix = kwargs.pop('prefix', self.Meta.model.__name__)
super(SshFingerprintForm, self).__init__( super(SshFpForm, self).__init__(
*args, *args,
prefix=prefix, prefix=prefix,
**kwargs **kwargs
......
...@@ -10,7 +10,7 @@ import re2o.mixins ...@@ -10,7 +10,7 @@ import re2o.mixins
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('machines', '0084_sshfingerprint'), ('machines', '0083_remove_duplicate_rights'),
] ]
operations = [ operations = [
......
...@@ -10,12 +10,12 @@ import re2o.mixins ...@@ -10,12 +10,12 @@ import re2o.mixins
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('machines', '0083_remove_duplicate_rights'), ('machines', '0084_dname'),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='SshFingerprint', name='SshFp',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('pub_key_entry', models.TextField(help_text='SSH public key', max_length=2048)), ('pub_key_entry', models.TextField(help_text='SSH public key', max_length=2048)),
...@@ -24,9 +24,9 @@ class Migration(migrations.Migration): ...@@ -24,9 +24,9 @@ class Migration(migrations.Migration):
('machine', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='machines.Machine')), ('machine', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='machines.Machine')),
], ],
options={ options={
'verbose_name': 'SSH fingerprint', 'verbose_name': 'SSHFP record',
'verbose_name_plural': 'SSH fingerprints', 'verbose_name_plural': 'SSHFP records',
'permissions': (('view_sshfingerprint', 'Can see an SSH fingerprint'),), 'permissions': (('view_sshfp', 'Can see an SSHFP record'),),
}, },
bases=(re2o.mixins.RevMixin, re2o.mixins.AclMixin, models.Model), bases=(re2o.mixins.RevMixin, re2o.mixins.AclMixin, models.Model),
), ),
......
...@@ -203,72 +203,6 @@ class Machine(RevMixin, FieldPermissionModelMixin, models.Model): ...@@ -203,72 +203,6 @@ class Machine(RevMixin, FieldPermissionModelMixin, models.Model):
return str(self.user) + ' - ' + str(self.id) + ' - ' + str(self.name) return str(self.user) + ' - ' + str(self.id) + ' - ' + str(self.name)
class SshFingerprint(RevMixin, AclMixin, models.Model):
"""A fingerpirnt of an SSH public key"""
ALGO = (
("ssh-rsa", "ssh-rsa"),
("ssh-ed25519", "ssh-ed25519"),
("ecdsa-sha2-nistp256", "ecdsa-sha2-nistp256"),
("ecdsa-sha2-nistp384", "ecdsa-sha2-nistp384"),
("ecdsa-sha2-nistp521", "ecdsa-sha2-nistp521"),
)
machine = models.ForeignKey('Machine', on_delete=models.CASCADE)
pub_key_entry = models.TextField(
help_text="SSH public key",
max_length=2048
)
algo = models.CharField(
choices=ALGO,
max_length=32
)
comment = models.CharField(
help_text="Comment",
max_length=255,
null=True,
blank=True
)
@cached_property
def algo_id(self):
"""Return the id of the algorithme for this key"""
if "ecdsa" in self.algo:
return 3
elif "rsa" in self.algo:
return 1
else:
return 2
@cached_property
def hash(self):
"""Return the hashs for the pub key with correct id
cf RFC, 1 is sha1 , 2 sha256"""
return {
"1" : hashlib.sha1(base64.b64decode(self.pub_key_entry)).hexdigest(),
"2" : hashlib.sha256(base64.b64decode(self.pub_key_entry)).hexdigest(),
}
class Meta:
permissions = (
("view_sshfingerprint", "Can see an SSH fingerprint"),
)
verbose_name = "SSH fingerprint"
verbose_name_plural = "SSH fingerprints"
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.comment)
class MachineType(RevMixin, AclMixin, models.Model): class MachineType(RevMixin, AclMixin, models.Model):
""" Type de machine, relié à un type d'ip, affecté aux interfaces""" """ Type de machine, relié à un type d'ip, affecté aux interfaces"""
PRETTY_NAME = "Type de machine" PRETTY_NAME = "Type de machine"
...@@ -631,13 +565,11 @@ class Extension(RevMixin, AclMixin, models.Model): ...@@ -631,13 +565,11 @@ class Extension(RevMixin, AclMixin, models.Model):
entry += "@ IN AAAA " + str(self.origin_v6) entry += "@ IN AAAA " + str(self.origin_v6)
return entry return entry
def get_associated_sshfpr(self): def get_associated_sshfp_records(self):
from re2o.utils import all_active_assigned_interfaces from re2o.utils import all_active_assigned_interfaces
return (all_active_assigned_interfaces() return (all_active_assigned_interfaces()
.filter(type__ip_type__extension=self) .filter(type__ip_type__extension=self)
.filter( .filter(machine__id__in=SshFp.objects.values('machine')))
machine__id__in=SshFingerprint.objects.values('machine')
))
def get_associated_a_records(self): def get_associated_a_records(self):
from re2o.utils import all_active_assigned_interfaces from re2o.utils import all_active_assigned_interfaces
...@@ -831,6 +763,73 @@ class Srv(RevMixin, AclMixin, models.Model): ...@@ -831,6 +763,73 @@ class Srv(RevMixin, AclMixin, models.Model):
str(self.port) + ' ' + str(self.target) + '.' str(self.port) + ' ' + str(self.target) + '.'
class SshFp(RevMixin, AclMixin, models.Model):
"""A fingerprint of an SSH public key"""
ALGO = (
("ssh-rsa", "ssh-rsa"),
("ssh-ed25519", "ssh-ed25519"),
("ecdsa-sha2-nistp256", "ecdsa-sha2-nistp256"),
("ecdsa-sha2-nistp384", "ecdsa-sha2-nistp384"),
("ecdsa-sha2-nistp521", "ecdsa-sha2-nistp521"),
)
machine = models.ForeignKey('Machine', on_delete=models.CASCADE)
pub_key_entry = models.TextField(
help_text="SSH public key",
max_length=2048
)
algo = models.CharField(
choices=ALGO,
max_length=32
)
comment = models.CharField(
help_text="Comment",
max_length=255,
null=True,
blank=True
)
@cached_property
def algo_id(self):
"""Return the id of the algorithm for this key"""
if "ecdsa" in self.algo:
return 3
elif "rsa" in self.algo:
return 1
else:
return 2
@cached_property
def hash(self):
"""Return the hashess for the pub key with correct id
cf RFC, 1 is sha1 , 2 sha256"""
return {
"1" : hashlib.sha1(base64.b64decode(self.pub_key_entry)).hexdigest(),
"2" : hashlib.sha256(base64.b64decode(self.pub_key_entry)).hexdigest(),
}
class Meta:
permissions = (
("view_sshfp", "Can see an SSHFP record"),
)
verbose_name = "SSHFP record"
verbose_name_plural = "SSHFP records"
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.comment)
class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model): class Interface(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
""" Une interface. Objet clef de l'application machine : """ Une interface. Objet clef de l'application machine :
- une address mac unique. Possibilité de la rendre unique avec le - une address mac unique. Possibilité de la rendre unique avec le
......
...@@ -119,9 +119,9 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -119,9 +119,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a> </a>
</li> </li>
{% acl_end %} {% acl_end %}
{% can_create SshFingerprint interface.machine.id %} {% can_create SshFp interface.machine.id %}
<li> <li>
<a href="{% url 'machines:index-sshfingerprint' interface.machine.id %}"> <a href="{% url 'machines:index-sshfp' interface.machine.id %}">
<i class="fa fa-edit"></i> Manage the SSH fingerprints <i class="fa fa-edit"></i> Manage the SSH fingerprints
</a> </a>
</li> </li>
......
...@@ -33,19 +33,19 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -33,19 +33,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
{% for sshfpr in sshfingerprint_list %} {% for sshfp in sshfp_list %}
<tr> <tr>
<td class="long_text">{{ sshfpr.pub_key_entry }}</td> <td class="long_text">{{ sshfp.pub_key_entry }}</td>
<td>{{ sshfpr.algo }}</td> <td>{{ sshfp.algo }}</td>
<td>{{ sshfpr.comment }}</td> <td>{{ sshfp.comment }}</td>
<td class="text-right"> <td class="text-right">
{% can_edit sshfpr %} {% can_edit sshfp %}
{% include 'buttons/edit.html' with href='machines:edit-sshfingerprint' id=sshfpr.id %} {% include 'buttons/edit.html' with href='machines:edit-sshfp' id=sshfp.id %}
{% acl_end %} {% acl_end %}
{% can_delete sshfpr %} {% can_delete sshfp %}
{% include 'buttons/suppr.html' with href='machines:del-sshfingerprint' id=sshfpr.id %} {% include 'buttons/suppr.html' with href='machines:del-sshfp' id=sshfp.id %}
{% acl_end %} {% acl_end %}
{% history_button sshfpr %} {% history_button sshfp %}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
......
...@@ -28,11 +28,11 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -28,11 +28,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %} {% block content %}
<h2>SSH fingerprints</h2> <h2>SSH fingerprints</h2>
{% can_create SshFingerprint machine_id %} {% can_create SshFp machine_id %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-sshfingerprint' machine_id %}"> <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-sshfp' machine_id %}">
<i class="fa fa-plus"></i> Add an SSH fingerprint <i class="fa fa-plus"></i> Add an SSH fingerprint
</a> </a>
{% acl_end %} {% acl_end %}
{% include "machines/aff_sshfingerprint.html" with sshfingerprint_list=sshfingerprint_list %} {% include "machines/aff_sshfp.html" with sshfp_list=sshfp_list %}
{% endblock %} {% endblock %}
...@@ -33,12 +33,6 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -33,12 +33,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if machineform %} {% if machineform %}
{% bootstrap_form_errors machineform %} {% bootstrap_form_errors machineform %}
{% endif %} {% endif %}
{% if sshfingerprintform %}
{% bootstrap_form_errors sshfingerprintform %}
{% endif %}
{% if sshfpralgoform %}
{% bootstrap_form_errors sshfpralgoform %}
{% endif %}
{% if interfaceform %} {% if interfaceform %}
{% bootstrap_form_errors interfaceform %} {% bootstrap_form_errors interfaceform %}
{% endif %} {% endif %}
...@@ -75,6 +69,9 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -75,6 +69,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if serviceform %} {% if serviceform %}
{% bootstrap_form_errors serviceform %} {% bootstrap_form_errors serviceform %}
{% endif %} {% endif %}
{% if sshfpform %}
{% bootstrap_form_errors sshfpform %}
{% endif %}
{% if vlanform %} {% if vlanform %}
{% bootstrap_form_errors vlanform %} {% bootstrap_form_errors vlanform %}
{% endif %} {% endif %}
...@@ -91,14 +88,6 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -91,14 +88,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<h3>Machine</h3> <h3>Machine</h3>
{% massive_bootstrap_form machineform 'user' %} {% massive_bootstrap_form machineform 'user' %}
{% endif %} {% endif %}
{% if sshfingerprintform %}
<h3>SSH fingerprint</h3>
{% bootstrap_form sshfingerprintform %}
{% endif %}
{% if sshfpralgoform %}
<h3>SSH fingerprint algorithm</h3>
{% bootstrap_form sshfpralgoform %}
{% endif %}
{% if interfaceform %} {% if interfaceform %}
<h3>Interface</h3> <h3>Interface</h3>
{% if i_mbf_param %} {% if i_mbf_param %}
...@@ -147,6 +136,10 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -147,6 +136,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<h3>Enregistrement SRV</h3> <h3>Enregistrement SRV</h3>
{% massive_bootstrap_form srvform 'target' %} {% massive_bootstrap_form srvform 'target' %}
{% endif %} {% endif %}
{% if sshfpform %}
<h3>SSHFP record</h3>
{% bootstrap_form sshfpform %}
{% endif %}
{% if aliasform %} {% if aliasform %}
<h3>Alias</h3> <h3>Alias</h3>
{% bootstrap_form aliasform %} {% bootstrap_form aliasform %}
......
...@@ -82,6 +82,18 @@ urlpatterns = [ ...@@ -82,6 +82,18 @@ urlpatterns = [
url(r'^add_srv/$', views.add_srv, name='add-srv'), url(r'^add_srv/$', views.add_srv, name='add-srv'),
url(r'^edit_srv/(?P<srvid>[0-9]+)$', views.edit_srv, name='edit-srv'), url(r'^edit_srv/(?P<srvid>[0-9]+)$', views.edit_srv, name='edit-srv'),
url(r'^del_srv/$', views.del_srv, name='del-srv'), url(r'^del_srv/$', views.del_srv, name='del-srv'),
url(r'^new_sshfp/(?P<machineid>[0-9]+)$',
views.new_sshfp,
name='new-sshfp'),
url(r'^edit_sshfp/(?P<sshfpid>[0-9]+)$',
views.edit_sshfp,
name='edit-sshfp'),
url(r'^del_sshfp/(?P<sshfpid>[0-9]+)$',
views.del_sshfp,
name='del-sshfp'),
url(r'^index_sshfp/(?P<machineid>[0-9]+)$',
views.index_sshfp,
name='index-sshfp'),
url(r'^index_extension/$', views.index_extension, name='index-extension'), url(r'^index_extension/$', views.index_extension, name='index-extension'),
url(r'^add_alias/(?P<interfaceid>[0-9]+)$', url(r'^add_alias/(?P<interfaceid>[0-9]+)$',
views.add_alias, views.add_alias,
...@@ -107,18 +119,6 @@ urlpatterns = [ ...@@ -107,18 +119,6 @@ urlpatterns = [
url(r'^index_ipv6/(?P<interfaceid>[0-9]+)$', url(r'^index_ipv6/(?P<interfaceid>[0-9]+)$',
views.index_ipv6, views.index_ipv6,
name='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'^add_service/$', views.add_service, name='add-service'),
url(r'^edit_service/(?P<serviceid>[0-9]+)$', url(r'^edit_service/(?P<serviceid>[0-9]+)$',
views.edit_service, views.edit_service,
......
...@@ -103,6 +103,7 @@ from .forms import ( ...@@ -103,6 +103,7 @@ from .forms import (
DelVlanForm, DelVlanForm,
ServiceForm, ServiceForm,
DelServiceForm, DelServiceForm,
SshFpForm,
NasForm, NasForm,
DelNasForm, DelNasForm,
SrvForm, SrvForm,
...@@ -110,7 +111,6 @@ from .forms import ( ...@@ -110,7 +111,6 @@ from .forms import (
Ipv6ListForm, Ipv6ListForm,
EditOuverturePortListForm, EditOuverturePortListForm,
EditOuverturePortConfigForm, EditOuverturePortConfigForm,
SshFingerprintForm,
) )
from .models import ( from .models import (
IpType, IpType,
...@@ -129,10 +129,10 @@ from .models import ( ...@@ -129,10 +129,10 @@ from .models import (
Txt, Txt,
DName, DName,
Srv, Srv,
SshFp,
OuverturePortList, OuverturePortList,
OuverturePort, OuverturePort,
Ipv6List, Ipv6List,
SshFingerprint,
) )
...@@ -464,66 +464,66 @@ def del_ipv6list(request, ipv6list, **_kwargs): ...@@ -464,66 +464,66 @@ def del_ipv6list(request, ipv6list, **_kwargs):
@login_required @login_required
@can_create(SshFingerprint) @can_create(SshFp)
@can_edit(Machine) @can_edit(Machine)
def new_sshfingerprint(request, machine, **_kwargs): def new_sshfp(request, machine, **_kwargs):
"""Creates an SSH fingerprint""" """Creates an SSHFP record associated with a machine"""
sshfingerprint_instance = SshFingerprint(machine=machine) sshfp_instance