From patchwork Tue May 23 13:51:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9742697 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DA592601C2 for ; Tue, 23 May 2017 13:54:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB176287CE for ; Tue, 23 May 2017 13:54:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFBCC287D8; Tue, 23 May 2017 13:54:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C8FFE287D6 for ; Tue, 23 May 2017 13:54:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dDAEP-0001Ip-1i; Tue, 23 May 2017 13:52:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dDAEN-0001I6-0u for xen-devel@lists.xenproject.org; Tue, 23 May 2017 13:52:11 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 06/09-01999-A8E34295; Tue, 23 May 2017 13:52:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRWlGSWpSXmKPExsXitHRDpG6bnUq kwYqp5hbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8ajmWEFl+Ur5l3azNTA+Fa8i5GTQ0LAX+L/ gecsIDabgI7Exbk72UBsEQFHic8rzjB1MXJwMAtoSSxZKQUSFhbwkHiyZhsTiM0ioCqxe8F/M JtXwFJi/uHrbBAj9STeTnzBCGJzClhJTN6yGywuBFSzYdVhqHpBiZMzn4CtZRbQlGjd/psdwp aXaN46mxmiXlGif94DtgmMfLOQtMxC0jILScsCRuZVjOrFqUVlqUW6lnpJRZnpGSW5iZk5uoY Gpnq5qcXFiempOYlJxXrJ+bmbGIFhxgAEOxjXtjofYpTkYFIS5d2ToBwpxJeUn1KZkVicEV9U mpNafIhRhoNDSYL3rq1KpJBgUWp6akVaZg4w4GHSEhw8SiK8nSBp3uKCxNzizHSI1ClGRSlx3 oUgCQGQREZpHlwbLMouMcpKCfMyAh0ixFOQWpSbWYIq/4pRnINRSZg3CWQKT2ZeCdz0V0CLmY AWu95VBllckoiQkmpgrPvxSPy+47SZrtvnZmex1fOseCvntHPJxontSlmVfU7f9vaKb92zl4m 9Y1PElqKtt17N/x7WyhXYbXRe87jSa6Evdskh6nvKl0znqYlk6Qw4YVMlJ7Lgz2eXfwyZM90d s15P6Jp3w8Q654TlvKUPSmyqjh7k3xO7Xnndxd7k+mmvb4ltvqsSqcRSnJFoqMVcVJwIAMna8 DytAgAA X-Env-Sender: prvs=309d5d743=roger.pau@citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1495547519!84359158!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53160 invoked from network); 23 May 2017 13:52:06 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 23 May 2017 13:52:06 -0000 X-IronPort-AV: E=Sophos;i="5.38,382,1491264000"; d="scan'208";a="425045134" From: Roger Pau Monne To: , Date: Tue, 23 May 2017 14:51:43 +0100 Message-ID: <20170523135148.77673-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <20170523135148.77673-1-roger.pau@citrix.com> References: <20170523135148.77673-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Roger Pau Monne Subject: [Xen-devel] [PATCH 2/7] osstest: move known_hosts generation to TestSupport X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This is equivalent to the already existing authorized_keys function, and generates the contents of the known_hosts file that should be installed on targets. Signed-off-by: Roger Pau Monné Acked-by: Ian Jackson --- Osstest/Debian.pm | 36 +----------------------------------- Osstest/TestSupport.pm | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 8ba48bfa..87539822 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -709,41 +709,7 @@ sub preseed_ssh ($$) { my ($ho,$sfx) = @_; my $authkeys_url= create_webfile($ho, "authkeys$sfx", authorized_keys()); - - my $hostkeyfile= "$c{OverlayLocal}/etc/ssh/ssh_host_rsa_key.pub"; - my $hostkey= get_filecontents($hostkeyfile); - chomp($hostkey); $hostkey.="\n"; - my $knownhosts= ''; - - my $hostsq= $dbh_tests->prepare(<execute($flight); - while (my ($node) = $hostsq->fetchrow_array()) { - my $defaultfqdn = $node; - $defaultfqdn .= ".$c{TestHostDomain}" unless $defaultfqdn =~ m/\./; - - my %props; - $mhostdb->get_properties($node, \%props); - - my $longname= $props{Fqdn} // $defaultfqdn; - my (@hostent)= gethostbyname($longname); - if (!@hostent) { - logm("skipping host key for nonexistent host $longname"); - next; - } - my $specs= join ',', $longname, $node, map { - join '.', unpack 'W4', $_; - } @hostent[4..$#hostent]; - logm("adding host key for $specs"); - $knownhosts.= "$specs ".$hostkey; - } - $hostsq->finish(); - - $knownhosts.= "localhost,127.0.0.1 ".$hostkey; - my $knownhosts_url= create_webfile($ho, "known_hosts$sfx", $knownhosts); + my $knownhosts_url= create_webfile($ho, "known_hosts$sfx", known_hosts()); preseed_hook_command($ho, 'late_command', $sfx, <prepare(<execute($flight); + while (my ($node) = $hostsq->fetchrow_array()) { + my $defaultfqdn = $node; + $defaultfqdn .= ".$c{TestHostDomain}" unless $defaultfqdn =~ m/\./; + + my %props; + $mhostdb->get_properties($node, \%props); + + my $longname= $props{Fqdn} // $defaultfqdn; + my (@hostent)= gethostbyname($longname); + if (!@hostent) { + logm("skipping host key for nonexistent host $longname"); + next; + } + my $specs= join ',', $longname, $node, map { + join '.', unpack 'W4', $_; + } @hostent[4..$#hostent]; + logm("adding host key for $specs"); + $knownhosts.= "$specs ".$hostkey; + } + $hostsq->finish(); + + $knownhosts.= "localhost,127.0.0.1 ".$hostkey; + + return $knownhosts; +} + sub cfg_tftp_di_version ($) { my ($suite) = @_; $suite //= 'x def suite'; # will not find $c{...}