Changeset 1225

Timestamp:

04/17/13 18:24:00 (11 years ago)

Author:

nanardon

Message:

Add ssh fp support

This patch add support for SSH finger print DNS support. Nethost have now an
sshfp attribute to hold fingerprint. The fingerprint are added into DNS zones

This patch also make 'checkzone' test optional and not enable by default.

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (1 diff)
• LATMOS-Accounts/Makefile.PL (modified) (1 diff)
• LATMOS-Accounts/bin/la-sql-updsshfp (added)
• LATMOS-Accounts/bin/la-sql-upgrade.in (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Nethost.pm (modified) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm (modified) (2 diffs)
• LATMOS-Accounts/man/man5/latmos-accounts.ini.pod (modified) (1 diff)
• LATMOS-Accounts/sqldata/attributes.csv (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -128 +128 @@
             date
             unexported
+            sshfp
         ) ],
     },

trunk/LATMOS-Accounts/Makefile.PL

@@ -58 +58 @@
         bin/la-sql-upgrade
         bin/la-sql-edit-form
+        bin/la-sql-updsshfp
         bin/la-test-mail
         ) ],

trunk/LATMOS-Accounts/bin/la-sql-upgrade.in

@@ -26 +26 @@
     'no-commit'      => \my $nocommit,
     'v|verbose'      => \my $verbose,
+    'h|help'         => sub { pod2usage(1); },
 ) or pod2usage();
 

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Nethost.pm

@@ -84 +84 @@
                 multiple => 1,
                 input => sub { lc($_[0]) },
+            },
+            sshfp => { multiple => 1, },
+            sshfpUpdate  => {
+                managed => 1,
             },
         }
@@ -158 +162 @@
         delete($data{ipFrom});
     }
+    if ($data{sshfpUpdate}) {
+        open my $h, '<', \$data{sshfpUpdate};
+        my @sshfps;
+        while (my $line = <$h>) {
+            my ($type, $mode, $key) = $line =~ /^\S+\s+IN\s+SSHFP\s+(\d)\s+(\d)\s+(\S+)/i
+                or do {
+                    la_log(LA_ERR, "Seems to not be a ssh-keygen line: %s", $line);
+                    return;
+                };
+            la_log(LA_DEBUG, "found sshfp %s %s %s", $type, $mode, $key);
+            push(@sshfps, "$type $mode $key");
+        }
+        close($h);
+        delete($data{sshfpUpdate});
+        $data{sshfp} = \@sshfps;
+    }
 
     $self->SUPER::set_fields(%data)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm

@@ -318 +318 @@
 sub _checkzone_output {
     my ($self, $ozone, $output) = @_;
+
+    if (!$self->_la->val('network', 'checkzone')) {
+        return 1;
+    }
 
     my ($fh, $filename) = tempfile();
@@ -479 +483 @@
                 }
             }
+            foreach (grep { $_ } $host_o->get_attributes('sshfp')) {
+                $dbzone .= sprintf(
+                    "%-30s IN    SSHFP    %s\n",
+                    $res,
+                    $_,
+                );
+            }
         }
     }

trunk/LATMOS-Accounts/man/man5/latmos-accounts.ini.pod

@@ -91 +91 @@
 If set, must contains an email address where error will be sent in batch mode.
 
+=head2 checkzone
+
+If set generated DNS zones will be first written in a temporary files and
+checked by C<checkzone> utility.
+
+If the test fail the zone is not generated and temporary file not removed for
+analysis.
+
 =head2 BASES SECTIONS
 

trunk/LATMOS-Accounts/sqldata/attributes.csv

@@ -43 +43 @@
 "nethost","noInheritPuppet",""
 "nethost","encryptKey","EnCrypt Key"
+"nethost","sshfp",""
 "netzone","group",""
 "netzone","net",""