chirac
c0cc3e6240
Merge branch 'tld_string' into 'dev'
...
Fonctions machines pour récup les tld en string , mise en cache
See merge request federez/re2o!222
2018-08-05 15:51:24 +02:00
chirac
a911a08207
Fonctions machines pour récup les tld en string , mise en cache
2018-08-05 15:44:04 +02:00
Gabriel Detraz
dc8cf8dbcc
Serialisation des ouvertures de ports individuelles
2018-08-05 14:36:32 +02:00
Hugo LEVY-FALK
1c75edb24f
Remet le field email dans UserForm et AdherentForm
2018-08-05 12:44:21 +02:00
chirac
679ae86243
Merge branch 'fix_import_crans' into 'dev'
...
Fix gen_range + macaddress non unique
See merge request federez/re2o!218
2018-08-05 12:27:23 +02:00
chirac
65b3c8768b
Fix gen_range + macaddress non unique
2018-08-05 12:22:51 +02:00
chirac
cf7be2b21f
Merge branch 'support_old_hash' into 'dev'
...
Support old hashes, md5/crypt
See merge request federez/re2o!215
2018-08-05 12:14:59 +02:00
Charlie
89bd17a477
fix export ldap for old hash
2018-08-05 12:11:16 +02:00
Gabriel Detraz
cd7cf1cac4
Affichage intelligent des ports ouverts dans la serialisation
2018-08-05 11:18:53 +02:00
Gabriel Detraz
63748168f2
Export complet du prefix v6
2018-08-05 11:14:19 +02:00
David Sinquin
ca08234a81
login handler: Use constant-time comparaison for hashes.
...
An attacker knowing the salt but not the hash could try timming-attacks
to guess a password hash and then try to find it from the hash.
Although not a high risk, there is no good reason not to use a
constant-time comparison, hence this commit.
2018-08-04 22:57:03 +02:00
David Sinquin
3244a46d94
login handler: Various code cleanings with no impact.
2018-08-04 22:57:03 +02:00
Charlie Jacomme
fbb2c59722
Support old hashes, md5/crypt
2018-08-04 16:58:42 +02:00
chirac
cf3edceff5
Merge branch 'dnssec_options' into 'dev'
...
Dnssec options
See merge request federez/re2o!194
2018-08-04 14:26:35 +02:00
chirac
f4099611d6
Merge branch 'fix_migrations_dev' into 'dev'
...
Fix migrations dev
See merge request federez/re2o!214
2018-08-04 11:05:58 +02:00
Hugo LEVY-FALK
470b02be94
Répare l'API pour les Ports en ajoutant la sérialisation des PortProfile.
2018-08-04 10:53:34 +02:00
Hugo LEVY-FALK
b140e26f0a
Suppression des migrations précédemment fusionnées.
2018-08-04 09:54:17 +02:00
Charlie Jacomme
4329641899
Ading prefix_v6_length field to IpType
2018-08-04 08:54:49 +02:00
Charlie Jacomme
6aed938334
serializer prefix_v6 for dns reverse
2018-08-04 08:51:18 +02:00
Charlie Jacomme
1cb0fb275b
serializers for dns reverse, cidr is list
2018-08-04 08:51:04 +02:00
Charlie Jacomme
1a46f3110f
Serializers for reverse DNS
2018-08-04 08:50:33 +02:00
Gabriel Detraz
cd5d0f562c
Simplification et fusion des migrations
2018-08-04 08:37:01 +02:00
Gabriel Detraz
bf06d133f0
Fix bug sur l'edition du txt + élargi le champ pour dnssec
2018-08-04 08:35:25 +02:00
Charlie Jacomme
7f6bc6c2ec
migrations for dnssec reverse
2018-08-04 08:33:02 +02:00
Charlie Jacomme
029a83bd33
Ajout dnssec reverse bool for iptypes
2018-08-04 08:33:02 +02:00
chirac
8e8c10ce68
Merge branch 'firewall_port_export' into 'dev'
...
Serialisation des ouvertures de ports en sortie par subnet
See merge request federez/re2o!213
2018-08-04 08:24:41 +02:00
chirac
42f3c32cef
Merge branch 'roles' into 'dev'
...
Ajout les Roles
See merge request federez/re2o!182
2018-08-04 08:24:30 +02:00
Hugo LEVY-FALK
a7ea8a1518
Répare de petits soucis de templates + problemes de rebase
2018-08-04 01:52:40 +02:00
Gabriel Detraz
5757a0c03d
Serialisation des ouvertures de ports en sortie par subnet
2018-08-04 01:24:20 +02:00
chirac
f168a4f72d
Merge branch 'machine_on_type_vlan' into 'dev'
...
L'autocreation renvoie l'interface crée
See merge request federez/re2o!212
2018-08-04 01:19:50 +02:00
Gabriel Detraz
a4007b985f
L'autocreation renvoie l'interface crée
2018-08-04 01:15:34 +02:00
chirac
a1c35832aa
Merge branch 'machine_on_type_vlan' into 'dev'
...
Placement des machines sur un vlan en fonction de leur classe type
See merge request federez/re2o!211
2018-08-03 20:36:48 +02:00
Gabriel Detraz
d46ce4a151
Placement des machines sur un vlan en fonction de leur classe type
2018-08-03 18:08:33 +02:00
chirac
c49a3b6eee
Merge branch 'hotfix-BugEditAssoOption' into 'dev'
...
Hotfix bug edit asso option
See merge request federez/re2o!210
2018-08-03 11:56:17 +02:00
Maxime Bombar
22662a2b22
[preferences/EditAssoOptionForm] commits c1f55e797 and 78b950c39 removed references to payment. This form was forgotten.
2018-08-03 10:24:42 +02:00
chirac
6202ddd0fa
Déplacé dans une MR ultérieure
2018-08-02 23:29:58 +02:00
Hugo LEVY-FALK
4679bbe604
Retire des modifications qui viendrons avec les switchs.
2018-08-02 23:29:58 +02:00
Gabriel Detraz
7166318e19
Repare le get_instance de role
2018-08-02 23:29:58 +02:00
Hugo LEVY-FALK
5e5bd89885
Anglais épisode 2 : L'attaque des templates
2018-08-02 23:29:58 +02:00
Hugo LEVY-FALK
d7af7d64a2
Une migration de Role pour les gouverner toutes.
2018-08-02 23:29:58 +02:00
Hugo LEVY-FALK
0b86dc1ec4
TODO : offrir des cours d'anglais au cr@ns.
2018-08-02 23:29:58 +02:00
Hugo LEVY-FALK
ed91cdcfe5
Recolle les fixations ensemble
2018-08-02 23:29:58 +02:00
Gabriel Detraz
5dc59035f5
Crée spécific role, l'utilise pour get l'ip du serveur des config switchs
2018-08-02 23:28:43 +02:00
Gabriel Detraz
35eb945404
Notion de role spécifique pour retrouver le bon role
2018-08-02 23:28:43 +02:00
chirac
793cf302ad
Fix bug admin
2018-08-02 23:28:43 +02:00
Charlie Jacomme
b70f6fd97a
migration for Role
2018-08-02 23:28:43 +02:00
Charlie Jacomme
5dab70ccee
Add machines.models.Role
2018-08-02 23:28:43 +02:00
klafyvel
d2a128326a
Merge branch 'fix_dev' into 'dev'
...
Fix dev
See merge request federez/re2o!209
2018-08-02 20:55:57 +02:00
klafyvel
db6c9a0702
Merge branch 'dev' into 'fix_dev'
...
# Conflicts:
# topologie/migrations/0061_portprofile.py
# topologie/templates/topologie/aff_port.html
# topologie/templates/topologie/aff_port_profile.html
2018-08-02 20:52:48 +02:00
Hugo LEVY-FALK
b356954f6c
Fix de l'historique pour l'affichage des port_profile
2018-08-02 20:47:05 +02:00
