Merge pull request #179 from erkin/current

loadkey: T3506: Remove loadkey

2 files changed, 0 insertions, 187 deletions

diff --git a/Makefile.am b/Makefile.am
index fa905779..d609ebee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,6 @@ sbin_SCRIPTS += scripts/vyatta-interfaces.pl
 sbin_SCRIPTS += scripts/vyatta-address
 sbin_SCRIPTS += scripts/vyatta-tunnel-cleanup
 sbin_SCRIPTS += scripts/vyatta-raid-event
-sbin_SCRIPTS += scripts/vyatta-load-user-key.pl
 sbin_SCRIPTS += scripts/install/install-get-partition
 sbin_SCRIPTS += scripts/install/install-functions
 sbin_SCRIPTS += scripts/install/install-image-new
diff --git a/scripts/vyatta-load-user-key.pl b/scripts/vyatta-load-user-key.pl
deleted file mode 100755
index e78ebc35..00000000
--- a/scripts/vyatta-load-user-key.pl
+++ /dev/null
@@ -1,186 +0,0 @@
-#! /usr/bin/perl
-
-# **** License ****
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2010 Vyatta, Inc.
-# All Rights Reserved.
-#
-# Author: Stephen Hemminger
-# Date: February 2010
-#
-# **** End License ****
-
-use lib "/opt/vyatta/share/perl5/";
-use strict;
-use warnings;
-
-use Vyatta::Config;
-use IO::Prompt;
-
-my $sbindir = $ENV{vyatta_sbindir};
-
-sub check_http {
-    my ($url) = @_;
-
-    #
-    # error codes are send back in html, so 1st try a header
-    # and look for "HTTP/1.1 200 OK"
-    #
-    my $rc = `curl -s -q -I $url 2>&1`;
-    if ( $rc =~ /HTTP\/\d+\.?\d\s+(\d+)\s+(.*)$/mi ) {
-	my $rc_code   = $1;
-	my $rc_string = $2;
-
-	die "http error: [$rc_code] $rc_string\n"
-	    unless ( $rc_code == 200 );
-    } else {
-	die "Error: $rc\n";
-    }
-}
-
-sub geturl {
-    my $url = shift;
-
-    # Is it a local file?
-    unless ($url =~ m#(^[^/]\w+)://# ) {
-	open(my $in, '<', $url)
-	    or die "Cannot open file $url: $!\n";
-	return $in;
-    }
-
-    my $proto = $1;
-    check_http($url)
-	if ($proto eq 'http');
-
-    my $cmd = "curl --insecure -#";
-
-    # Handle user@host syntax which curl doesn't do
-    if ($proto eq 'scp') {
-	if ($url =~ m#scp://(\w+)@(.*)# ) {
-	    $cmd .= " -u $1";
-	    $url = "scp://$2";
-	}
-    }
-    $cmd .= " $url";
-
-    my $curl_out = `$cmd`;
-    my $rc = ($? >> 8);
-    if ($proto eq 'scp' && $rc == 51){
-        $url =~ m/scp:\/\/(.*?)\//;
-        my $host = $1;
-        if ($host =~ m/.*@(.*)/) {
-          $host = $1;
-        }
-        my $rsa_key = `ssh-keyscan -t rsa $host 2>/dev/null`;
-        print "The authenticity of host '$host' can't be established.\n";
-        my $fingerprint = `ssh-keygen -lf /dev/stdin <<< \"$rsa_key\" | awk {' print \$2 '}`;
-        chomp $fingerprint;
-        print "RSA key fingerprint is $fingerprint.\n";
-        if (prompt("Are you sure you want to continue connecting (yes/no) [Yes]? ", -tynd=>"y")) {
-            mkdir "~/.ssh/";
-            open(my $known_hosts, ">>", "$ENV{HOME}/.ssh/known_hosts")
-              or die "Cannot open known_hosts: $!";
-            print $known_hosts "$rsa_key\n";
-            close($known_hosts);
-            $curl_out = `curl -# $url`;
-            print "\n";
-        }
-    }
-    open (my $curl, "<", \$curl_out)
-	or die "$cmd command failed: $!";
-
-    return $curl;
-}
-
-sub validate_keytype {
-    my ($keytype) = @_;
-    if ($keytype eq 'ssh-rsa' || $keytype eq 'ssh-dss' || $keytype eq 'ecdsa-sha2-nistp256' || $keytype eq 'ecdsa-sha2-nistp384' || $keytype eq 'ecdsa-sha2-nistp521' || $keytype eq 'ssh-ed25519') {
-        return 1;
-    }
-    return 0;
-}
-
-sub getkeys {
-    my ($user, $in) = @_;
-
-    print "\n";
-    while (<$in>) {
-	chomp;
-
-	next if /^#/;	    # ignore comments
-
-	# public key (format 2) consist of:
-	# [options] keytype base64-encoded key comment
-	my @fields = split / /;
-
-	my $options;
-	$options = shift @fields
-	    if (validate_keytype $fields[1]);
-
-	my $keytype;
-	$keytype = shift @fields;
-
-	my $keycode;
-	$keycode = shift @fields;
-
-	my $comment;
-	$comment = join(' ', @fields);
-
-	die "Unknown key type $keytype : must be one of ssh-rsa, ssh-dss, ecdsa-sha2-nistp* or ssh-ed25519\n"
-	    unless validate_keytype $keytype;
-
-	my $cmd
-	    = "set system login user $user authentication public-keys $comment";
-
-	if ($options) {
-	    system ("$sbindir/my_$cmd" . " options $options");
-	    die "\"$cmd\" at "
-		if ($? >> 8);
-	}
-
-	system ("$sbindir/my_$cmd" . " type $keytype");
-	die "\"$cmd\" at "
-	    if ($? >> 8);
-
-	system ("$sbindir/my_$cmd" . " key $keycode");
-	die "\"$cmd\" at "
-	    if ($? >> 8);
-    }
-}
-
-print "Warning: `loadkey' command has been deprecated and will be removed in a future version.\n";
-print "Instead, use the op-mode command `generate public-key-command' to generate commands for manual addition:\n";
-print "\$ generate public-key-command name <username> path <path-or-url>\n\n";
-
-die "Incorrect number of arguments, expect\n",
-    " loadkey user filename|url\n"
-    unless ($#ARGV == 1);
-
-my $user = $ARGV[0];
-my $source = $ARGV[1];
-
-my $config = new Vyatta::Config;
-$config->setLevel("system login user");
-
-die "User $user does not exist in current configuration\n"
-    unless $config->exists($user);
-
-getkeys($user, geturl($source));
-
-system("$sbindir/my_commit");
-if ( $? >> 8 ) {
-    print "Load failed (commit failed)\n";
-    exit 1;
-}
-
-print "Done\n";
-exit 0;