From 24f37acef3e7e33576bcd071569a94de980b6544 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Tue, 5 Nov 2013 09:36:26 +0100 Subject: ssh: Make inet option configurable and remove ipv6_disabled option --- lib/ssh/doc/src/ssh.xml | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lib/ssh/doc/src') diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 896b98edc2..b338241685 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -181,10 +181,6 @@

Allow an existing file descriptor to be used (simply passed on to the transport protocol).

 - - -

Determines if SSH shall use IPv6 or not.

-

Provide, in bytes, when rekeying should be initiated, @@ -313,10 +309,6 @@

Allow an existing file-descriptor to be used (simply passed on to the transport protocol).

 - - -

Determines if SSH shall use IPv6 or not (only used when - HostAddress is set to any).

Provide a fun() to implement your own logging when a user fails to authenticate.

-- cgit v1.2.3 From 422ed9ecd9c95c25964381b7ca2888a0320a8ee4 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Wed, 6 Nov 2013 10:54:02 +0100 Subject: ssh: Simplify handling of connection attributes (e.i. user and sockname) OTP-11296 --- lib/ssh/doc/src/ssh.xml | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) (limited to 'lib/ssh/doc/src') diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index b338241685..3409681af4 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -198,8 +198,11 @@ Value}] Retrieves information about a connection. - Option = client_version | server_version | peer - Value = term() + Option = client_version | server_version | user | peer | sockname + Value = [option_value()] + option_value() = {{Major::integer(), Minor::integer()}, VersionString::string()} | User::string() | + Peer::{inet:hostname(), {inet::ip_adress(), inet::port_number()}} | + Sockname::{inet::ip_adress(), inet::port_number()} ()

Retrieves information about a connection. @@ -325,19 +328,6 @@ - - peername(ConnectionRef) -> {ok, {Address,Port}} | {error,Error} - - - ConnectionRef = ssh_connection_ref() - Address = ip_address() - Port = integer() - - -

Returns the address and port for the other end of a connection. -

- - shell(Host) -> @@ -358,20 +348,6 @@ - - sockname(ConnectionRef) -> {ok, {Address,Port}} | {error,Error} - - - ConnectionRef = ssh_connection_ref() - Address = ip_address() - Port = integer() - - -

Returns the local address and port number for a connection. -

- - - start() -> start(Type) -> ok | {error, Reason} -- cgit v1.2.3 From e6631f5a8bbf3218eaed1e973bfb42aa40902667 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Mon, 11 Nov 2013 09:54:29 +0100 Subject: ssh: Add option to disallow CLI OTP-10976 --- lib/ssh/doc/src/ssh.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/ssh/doc/src') diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 3409681af4..acf31fc0e9 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -248,13 +248,14 @@ + channel_init_args()} | no_cli}]]> - Provides your own cli implementation, i.e. a channel callback + Provides your own CLI implementation, i.e. a channel callback module that implements a shell and command execution. Note that you may customize the shell read-eval-print loop using the option shell which is much less work than implementing - your own cli channel. + your own CLI channel. If set to no_cli you will disable + CLI channels and only subsystem channels will be allowed. -- cgit v1.2.3 From 7efe1b6dd3215261777b5f335b4f92dfca7cea42 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Wed, 13 Nov 2013 10:56:13 +0100 Subject: ssh: Logging fun and document enhancement --- lib/ssh/doc/src/ssh.xml | 17 ++++++++--------- lib/ssh/doc/src/ssh_client_key_api.xml | 6 ++++-- lib/ssh/doc/src/ssh_server_key_api.xml | 4 +++- 3 files changed, 15 insertions(+), 12 deletions(-) (limited to 'lib/ssh/doc/src') diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index acf31fc0e9..c1a51d57fc 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -53,8 +53,7 @@ returned by ssh:daemon/[1,2,3]

ssh_connection_ref() - opaque to the user returned by ssh:connect/3

-

ip_address() - {N1,N2,N3,N4} % IPv4 | - {K1,K2,K3,K4,K5,K6,K7,K8} % IPv6

+

ip_address() - inet::ip_address()

subsystem_spec() = {subsystem_name(), {channel_callback(), channel_init_args()}}

subsystem_name() = string()

@@ -296,7 +295,7 @@ user. From a security perspective this option makes the server very vulnerable.

 - boolean()}]]> + boolean()}]]>

Provide a function for password validation. This is called with user and password as strings, and should return @@ -313,17 +312,17 @@

Allow an existing file-descriptor to be used (simply passed on to the transport protocol).

 - + _}]]> -

Provide a fun() to implement your own logging when a user fails to authenticate.

+

Provide a fun to implement your own logging when a user fails to authenticate.

 - + _}]]> -

Provide a fun() to implement your own logging when a user authenticates to the server.

+

Provide a fun to implement your own logging when a user authenticates to the server.

 - + _}]]> -

Provide a fun() to implement your own logging when a user disconnects from the server.

+

Provide a fun to implement your own logging when a user disconnects from the server.

 diff --git a/lib/ssh/doc/src/ssh_client_key_api.xml b/lib/ssh/doc/src/ssh_client_key_api.xml index b9b1ec4efa..2fa06f8bf1 100644 --- a/lib/ssh/doc/src/ssh_client_key_api.xml +++ b/lib/ssh/doc/src/ssh_client_key_api.xml @@ -41,12 +41,14 @@

Type definitions that are used more than once in this module and/or abstractions to indicate the intended use of the data - type:

+ type. For more details on public key data types + see the public_key user's guide. +

boolean() = true | false

string() = [byte()]

public_key() = #'RSAPublicKey'{}| {integer(), #'Dss-Parms'{}}| term()

-

private_key() = #'RSAPublicKey'{}| {integer(), #'Dss-Parms'{}}| term()

+

private_key() = #'RSAPrivateKey'{} | #'DSAPrivateKey'{} | term()

public_key_algorithm() = 'ssh-rsa'| 'ssh-dss' | atom()

diff --git a/lib/ssh/doc/src/ssh_server_key_api.xml b/lib/ssh/doc/src/ssh_server_key_api.xml index 51e1fc1f2e..ee537f2f60 100644 --- a/lib/ssh/doc/src/ssh_server_key_api.xml +++ b/lib/ssh/doc/src/ssh_server_key_api.xml @@ -40,7 +40,9 @@

Type definitions that are used more than once in this module and/or abstractions to indicate the intended use of the data - type:

+ type. For more details on public key data types + see the public_key user's guide. +

boolean() = true | false

string() = [byte()]

-- cgit v1.2.3