8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-25 12:53:11 +00:00
Commit graph

2498 commits

Author SHA1 Message Date
Charlie Jacomme
cee0d1188e rename booleans dnssec_reverse_* to reverse_* 2018-08-07 09:52:00 +02:00
Charlie Jacomme
e86a0ff58b add prefix_v6_length serializer 2018-08-07 09:24:21 +02:00
chirac
49646ae34b Merge branch 'domaine_network' into 'dev'
Domaine network

See merge request federez/re2o!229
2018-08-07 00:36:05 +02:00
chirac
52685c02ed Merge branch 'python2_header' into 'dev'
Python2 header

See merge request federez/re2o!227
2018-08-07 00:29:51 +02:00
chirac
d4a90d1faf Merge branch 'non_uniq_ipv6' into 'dev'
L'ipv6 n'est pas unique au niveau bdd pour if serveurs multiples

See merge request federez/re2o!228
2018-08-07 00:23:54 +02:00
chirac
93ece1ff6a Merge branch 'bug_ipv6_list' into 'dev'
Fix object interface fonction index ipv6

See merge request federez/re2o!226
2018-08-07 00:13:43 +02:00
Gabriel Detraz
34fe6e06b7 Specification optionnelle du range contenant domain ipstart-stop 2018-08-07 00:11:20 +02:00
Gabriel Detraz
efbd0a18da L'ipv6 n'est pas unique au niveau bdd pour if serveurs multiples 2018-08-07 00:09:30 +02:00
Gabriel Detraz
57b4d8ff74 Header pour execution en python2 2018-08-07 00:05:35 +02:00
Gabriel Detraz
e9c0920a42 Fix object interface fonction index ipv6 2018-08-07 00:02:53 +02:00
chirac
6ddf9d48d1 Merge branch 'hotfix-mail-field-in-user-forms' into 'dev'
Mail->email, hotfix

See merge request federez/re2o!225
2018-08-05 23:05:14 +02:00
detraz
28b78965f6 Mail->email, hotfix 2018-08-05 23:01:42 +02:00
chirac
7b73f5a63b Merge branch 'hotfix-mail-field-in-user-forms' into 'dev'
Remet le field email dans UserForm et AdherentForm

See merge request federez/re2o!219
2018-08-05 22:57:24 +02:00
chirac
ee615ae1e1 Merge branch 'firewall_export' into 'dev'
Firewall export

See merge request federez/re2o!224
2018-08-05 21:07:12 +02:00
Arthur Grisel-Davy
27d18e034b serialization des finfos pour créer les home 2018-08-05 17:24:26 +02:00
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