Changeset 863

Timestamp:

12/15/11 17:23:45 (13 years ago)

Author:

nanardon

Message:

• support IPv6 adresses

Location:

LATMOS-Accounts

Files:

• Changes (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Sql/Netzone.pm (modified) (1 diff)
• lib/LATMOS/Accounts/BuildNet.pm (modified) (6 diffs)
• sqldata/base.sql (modified) (4 diffs)
• sqldata/up_to_3.sql (added)

LATMOS-Accounts/Changes

@@ -1 +1 @@
 Revision history for Perl extension LATMOS::Accounts.
+
+3.0.0
+    - hande IPv6 addresses
+    - support kerberos database (heidmal)
 
 2.0.0

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Netzone.pm

@@ -119 +119 @@
             select * from (
             select host(network(value::inet)+ (generate_series(1, broadcast(value::inet) - network(value::inet) -1))) from netzone_attributes where
-            attr='net' and okey = $1
+            attr='net' and okey = $1 and family(value::inet) = 4
             except
             (

LATMOS-Accounts/lib/LATMOS/Accounts/BuildNet.pm

@@ -116 +116 @@
     if (! -d $path) {
         la_log(LA_INFO, 'Creating directory %s', $path);
-        make_path($path) or return;
+        mkpath($path) or return;
     }
     my $output = join('/', $path, $ozone->get_attributes('outputD'));
@@ -340 +340 @@
             nethost.ikey = nethost_attributes_ips.okey
             where value::inet <<= any(?)
-                order by value, name
+            order by value, name
         });
         $findhost->execute(
@@ -350 +350 @@
             return;
         };
-        my @lists;
+        my %lists;
         my %names;
         # Storing all name in %names to check later if CNAME does not conflict
         while (my $res = $findhost->fetchrow_hashref) {
-            push(@lists, $res);
-            $names{$res->{name}} = 1;
+            $lists{$res->{name}} ||= {};
+            push(@{$lists{$res->{name}}{ip}}, $res->{value});
             my $host_o = $self->_base->get_object('nethost', $res->{name});
             foreach (grep { $_ } $host_o->get_attributes('otherName')) {
@@ -362 +362 @@
         }
 
-        foreach my $res (@lists) {
-            my $host_o = $self->_base->get_object('nethost', $res->{name}) or do {
+        foreach my $res (sort keys %lists) {
+            my $host_o = $self->_base->get_object('nethost', $res) or do {
                 la_log LA_ERR, "Cannot fetch host %s", $res->{name};
                 return;
@@ -371 +371 @@
                 ? '; ' . $desc . "\n"
                 : '';
-            $dbzone .= sprintf("%-30s IN    A     %s\n", $res->{name}, $res->{value});
+            foreach my $ip (@{$lists{$res}{ip}}) {
+                $dbzone .= sprintf(
+                    "%-30s IN    %-4s     %s\n",
+                    $res,
+                    ($ip =~ /:/ ? 'AAAA' : 'A'),
+                    $ip
+                );
+            }
             foreach (grep { $_ } $host_o->get_attributes('otherName')) {
-                $dbzone .= sprintf("%-30s IN    A     %s\n", $_, $res->{value});
+                foreach my $ip (@{$lists{$res}{ip}}) {
+                    $dbzone .= sprintf(
+                        "%-30s IN    %-4s     %s\n",
+                        $_,
+                        ($ip =~ /:/ ? 'AAAA' : 'A'),
+                        $ip
+                    );
+                }
             }
             foreach (grep { $_ } $host_o->get_attributes('cname')) {
@@ -387 +401 @@
                     $dbzone .= "; $msg\n";
                 } else {
-                    $dbzone .= sprintf("%-30s IN    CNAME %s\n", $_, $res->{name},);
+                    $dbzone .= sprintf("%-30s IN    CNAME    %s\n", $_, $res,);
                 }
             }

LATMOS-Accounts/sqldata/base.sql

@@ -148 +148 @@
 END IF;
 END;$$;
-
-
---
--- Name: check_zone_name_unity(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION check_zone_name_unity() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$declare
-  list record;
-begin
-
-select into list * from (
-select count(*) as c, name, zone from
-(select nethost.name, zone_obj.name as zone from
-(select nethost_attributes_ips.okey, netzone.name from nethost_attributes_ips
-join netzone_attributes on 
-netzone_attributes.attr='net' and nethost_attributes_ips.value::inet <<= netzone_attributes.value::inet
-join netzone on netzone.ikey = netzone_attributes.okey) as zone_obj
-join nethost on zone_obj.okey = nethost.ikey
-union all
-select nethost_attributes.value, zone_obj.name from
-(select nethost_attributes_ips.okey, netzone.name from nethost_attributes_ips
-join netzone_attributes on 
-netzone_attributes.attr='net' and nethost_attributes_ips.value::inet <<= netzone_attributes.value::inet
-join netzone on netzone.ikey = netzone_attributes.okey
-join netzone_attributes as nza on nza.okey = netzone.ikey and nza.attr = 'type' and nza.value = 'dns') as zone_obj
-join nethost_attributes on nethost_attributes.attr = 'cname' and nethost_attributes.okey = zone_obj.okey
-) as foo
-group by name, zone
-) as foo where c > 1;
-
-IF FOUND THEN
-  RAISE EXCEPTION 'record name found multiple time in a zone';
-END IF;
-
-RETURN new;
-END;$$;
-
 
 --
@@ -1066 +1027 @@
 --
 
-CREATE TABLE nethost_attributes_ips (CONSTRAINT nethost_is_single_ip CHECK ((netmask((value)::inet) = '255.255.255.255'::inet))
+CREATE TABLE nethost_attributes_ips (
 )
 INHERITS (nethost_attributes);
@@ -2182 +2143 @@
 --
 
-CREATE UNIQUE INDEX nethost_cname_uniq_idx ON nethost_attributes USING btree (value, okey) WHERE (attr = 'cname'::text);
+CREATE UNIQUE INDEX nethost_cname_uniq_idx ON nethost_attributes USING btree (value) WHERE (attr = 'cname'::text);
 
 
@@ -2427 +2388 @@
 
 --
--- Name: check_zone_name_unity_tg; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER check_zone_name_unity_tg
-    AFTER INSERT OR UPDATE ON nethost
-    FOR EACH STATEMENT
-    EXECUTE PROCEDURE check_zone_name_unity();
-
-
---
--- Name: check_zone_name_unity_tg; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER check_zone_name_unity_tg
-    AFTER INSERT OR UPDATE ON netzone
-    FOR EACH STATEMENT
-    EXECUTE PROCEDURE check_zone_name_unity();
-
-
---
 -- Name: department_group_upd_tg; Type: TRIGGER; Schema: public; Owner: -
 --