Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not set by default SSH port when using Net::OpenSSH (fix: 1495) #1496

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not set by default SSH port when using Net::OpenSSH (fix: 1495) #1496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions lib/Rex/Interface/Connection/OpenSSH.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,17 @@ sub connect {

my $proxy_command = Rex::Config->get_proxy_command( server => $server );

$port ||= Rex::Config->get_port( server => $server ) || 22;
$port ||= Rex::Config->get_port( server => $server );
$timeout ||= Rex::Config->get_timeout( server => $server ) || 3;

$server =
Rex::Config->get_ssh_config_hostname( server => $server ) || $server;

( $server, $port ) = Rex::Helper::IP::get_server_and_port( $server, $port );

Rex::Logger::debug( "Connecting to $server:$port (" . $user . ")" );
my $ssh_server_port = $server; # 'server[:port]' string for debug messages
$ssh_server_port .= ":$port" if defined $port;
Rex::Logger::debug( "Connecting to $ssh_server_port ( $user )" );

my %ssh_opts = Rex::Config->get_openssh_opt();
Rex::Logger::debug("get_openssh_opt()");
Expand Down Expand Up @@ -110,20 +112,20 @@ sub connect {
if ( $auth_type && $auth_type eq "pass" ) {
Rex::Logger::debug(
Rex::Logger::masq(
"OpenSSH: pass_auth: $server:$port - $user - %s", $pass
"OpenSSH: pass_auth: $ssh_server_port - $user - %s", $pass
)
);
push @auth_types_to_try, "pass";
}
elsif ( $auth_type && $auth_type eq "krb5" ) {
Rex::Logger::debug("OpenSSH: krb5_auth: $server:$port - $user");
Rex::Logger::debug("OpenSSH: krb5_auth: $ssh_server_port - $user");
push @auth_types_to_try, "krb5";

# do nothing here
}
else { # for key auth, and others
Rex::Logger::debug(
"OpenSSH: key_auth or not defined: $server:$port - $user");
"OpenSSH: key_auth or not defined: $ssh_server_port - $user");
push @auth_types_to_try, "key", "pass";
}

Expand Down Expand Up @@ -167,22 +169,22 @@ CONNECT_TRY:
}

if ( !$self->{ssh} ) {
Rex::Logger::info( "Can't connect to $server", "warn" );
Rex::Logger::info( "Can't connect to $ssh_server_port", "warn" );
$self->{connected} = 0;
return;
}

if ( $self->{ssh} && $self->{ssh}->error ) {
Rex::Logger::info(
"Can't authenticate against $server (" . $self->{ssh}->error() . ")",
"Can't authenticate against $ssh_server_port (" . $self->{ssh}->error() . ")",
"warn" );
$self->{connected} = 1;

return;
}

Rex::Logger::debug( "Current Error-Code: " . $self->{ssh}->error() );
Rex::Logger::debug("Connected and authenticated to $server.");
Rex::Logger::debug("Connected and authenticated to $ssh_server_port.");

$self->{connected} = 1;
$self->{auth_ret} = 1;
Expand Down