mahlon/shelldap
1
0
Fork 0
Code Issues Pull requests Activity

Improve accepted command line options

Browse source 
This commit enables getopt case sensitivity and adds all command line
options/abbreviations typically supported by LDAP clients:

-w/-y, -p, -x, -Z/-ZZ, -v

FossilOrigin-Name: 5f3778ecf065e9bcf061b8b6a7e606dbb3a043169a03a7630c960f331d68d6b2
This commit is contained in:
docelic@crystallabs.io 2019-05-05 08:51:34 +00:00
parent d3adc445d6
commit 248cedd05e
1 changed files with 35 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
shelldap
View file

@ -109,6 +109,7 @@ address, or a URI.
--server ldaps://ldap.example.net --server ldaps://ldap.example.net
-H ldaps://ldap.example.net -H ldaps://ldap.example.net
-h hostname_or_IP
=back =back
@ -165,7 +166,7 @@ credentials.
A space separated list of SASL mechanisms. Requires the Authen::SASL A space separated list of SASL mechanisms. Requires the Authen::SASL
module. module.
--sasl "PLAIN CRAM-MD5 GSSAPI" --sasl 'PLAIN CRAM-MD5 GSSAPI'
=back =back
@ -547,6 +548,7 @@ use Algorithm::Diff qw//;
use Carp 'confess'; use Carp 'confess';
use POSIX qw//; use POSIX qw//;
use Tie::IxHash qw//; use Tie::IxHash qw//;
use Perl6::Slurp qw/slurp/;
use base 'Term::Shell'; use base 'Term::Shell';
my $conf = $main::conf; my $conf = $main::conf;
@ -652,7 +654,7 @@ sub init
my @versions = $self->{'root_dse'}->get_value('supportedLDAPVersion'); my @versions = $self->{'root_dse'}->get_value('supportedLDAPVersion');
print "Connected to $conf->{'server'}\n"; print "Connected to $conf->{'server'}\n";
print "Supported LDAP version: ", ( join ', ', @versions ), "\n"; print "Supported LDAP version: ", ( join ', ', @versions ), "\n";
print "Cipher in use: ", $self->ldap()->cipher(), "\n"; print "Cipher in use: ", $self->ldap()->cipher() || '', "\n";
} }
# check for the pagination extension on the server early, and bail # check for the pagination extension on the server early, and bail
@ -702,19 +704,25 @@ sub ldap
You may try connecting insecurely, or install the module and try again.\n} if $@; You may try connecting insecurely, or install the module and try again.\n} if $@;
} }
if ($conf->{'binddn'}) {
if($conf->{'promptpass'}) {
# Prompt for a password after disabling local echo. # Prompt for a password after disabling local echo.
# #
if ( ($conf->{'binddn'} && ! $conf->{'bindpass'}) || $conf->{'promptpass'} ) {
print "Bind password: "; print "Bind password: ";
Term::ReadKey::ReadMode 2; Term::ReadKey::ReadMode 2;
chomp( $conf->{'bindpass'} = <STDIN> ); chomp( $conf->{'bindpass'} = <STDIN> );
Term::ReadKey::ReadMode 0; Term::ReadKey::ReadMode 0;
print "\n"; print "\n";
} elsif($conf->{'pass'}) {
$conf->{'bindpass'} = $conf->{'pass'}
} elsif($conf->{'passfile'}) {
chomp( $conf->{'bindpass'} = slurp $conf->{'passfile'} );
}
} }
# make the connection # make the connection
my $ldap = Net::LDAP->new( $conf->{'server'} ) my $ldap = Net::LDAP->new( $conf->{'server'}, $conf->{port} ? ('port' => $conf->{port}) : ())
or die "Unable to connect to LDAP server '$conf->{'server'}': $!\n"; or die "Unable to connect to LDAP server '$conf->{'server'}' port ${\( $conf->{port} || 'default' )}: $!\n";
# secure connection options # secure connection options
# #
@ -2639,9 +2647,9 @@ use warnings;
$0 = 'shelldap'; $0 = 'shelldap';
my $VERSION = '1.4.0'; my $VERSION = '1.4.0';
use Getopt::Long; use Getopt::Long qw(:config no_ignore_case);
use YAML::Syck; use YAML::Syck qw//;
use Pod::Usage; use Pod::Usage qw//;
eval { require Term::ReadLine::Gnu; }; eval { require Term::ReadLine::Gnu; };
warn qq{Term::ReadLine::Gnu not installed. warn qq{Term::ReadLine::Gnu not installed.
Continuing, but shelldap is of limited usefulness without it.\n\n} if $@; Continuing, but shelldap is of limited usefulness without it.\n\n} if $@;
@ -2651,20 +2659,29 @@ use vars '$conf';
$conf = load_config() || {}; $conf = load_config() || {};
Getopt::Long::GetOptions( Getopt::Long::GetOptions(
$conf, $conf,
'server|H=s', 'server|h|H=s',
'port|p=s',
'configfile|f=s', 'configfile|f=s',
'binddn|D=s', 'binddn|D=s',
'basedn|b=s', 'basedn|b=s',
'cacheage=i', 'cacheage=i',
'cmdline_attributes|attributes=s@', 'cmdline_attributes|attributes=s@',
'paginate=i', 'paginate=i',
'promptpass|W', 'promptpass|W!',
'pass|w=s',
'passfile|y=s',
'timeout=i', 'timeout=i',
'sasl|Y=s', 'sasl|Y=s',
'simple|x!' => sub {
my($opt,$arg) = @_;
$conf->{sasl} = $arg ? undef : 'PLAIN CRAM-MD5 GSSAPI'
},
'tls_cacert=s', 'tls_cacert=s',
'tls_cert=s', 'tls_cert=s',
'tls_key=s', 'tls_key=s',
'tls', 'debug', 'version', 'tls|Z|ZZ!',
'debug|v',
'version',
help => sub { help => sub {
Pod::Usage::pod2usage( Pod::Usage::pod2usage(
-verbose => 1, -verbose => 1,