Changeset 1225 for trunk/LATMOS-Accounts/lib/LATMOS

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/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Sql/Nethost.pm (modified) (2 diffs)
• Task/Buildnet.pm (modified) (2 diffs)

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,
+                    $_,
+                );
+            }
         }
     }