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

cd: flexible treatment of repeated '..', even as prefix

Browse source 
Treat '..' as any shell does:
- while the path given starts with '..', strip away
  the first element of the current base DN
- use ',' as separator
- if anything remains in thep ath given, prepend it to
  the stripped down baseDN
- use the result as the new base DN

FossilOrigin-Name: 5a94d3451ecbc149ccd822cdaaaa818a6d3de502695c39cf3e9ae14b75ad4394
This commit is contained in:
peter@adpm.de 2011-03-05 19:19:17 +00:00
parent 2ec8004a72
commit 4d64b1b0fe
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
shelldap
View file

@ -195,14 +195,16 @@ add a list of attributes to display. Use '+' for server side attributes.
=item B< cd> =item B< cd>
Change directory. Translated to LDAP, this changes the current basedn. Change DN. Translated to LDAP, this changes the current basedn.
All commands after a 'cd' operate within the new basedn. All commands after a 'cd' operate within the new basedn.
cd cd to 'home' basedn cd change to 'home' basedn
cd ~ same thing cd ~ same thing
cd - cd to previous directory cd - change to previous node
cd ou=People cd to explicit path cd ou=People change to explicit path below current node
cd .. cd to parent node cd .. change to parent node
cd ..,..,ou=Groups change to node ou=Groups, which is a sibling
to the current node's parent node
Since LDAP doesn't actually limit what can be a container object, you Since LDAP doesn't actually limit what can be a container object, you
can actually cd into any entry. Many commands then work on '.', meaning can actually cd into any entry. Many commands then work on '.', meaning
@ -347,9 +349,6 @@ tried to follow it.
For now, it only makes sense to connect to a master if you plan on doing For now, it only makes sense to connect to a master if you plan on doing
any writes. any writes.
"cd ../ou=SomewhereElse" doesn't work, but "cd ../../" does. This is
weird, as both should probably work.
=head1 BUGS / LIMITATIONS =head1 BUGS / LIMITATIONS
There is no support for editing binary data. If you need to edit base64 There is no support for editing binary data. If you need to edit base64
@ -368,7 +367,7 @@ use Term::ReadKey;
use Term::Shell; use Term::Shell;
use Digest::MD5; use Digest::MD5;
use Net::LDAP qw(LDAP_SUCCESS LDAP_SERVER_DOWN); use Net::LDAP qw(LDAP_SUCCESS LDAP_SERVER_DOWN);
use Net::LDAP::Util qw(canonical_dn); use Net::LDAP::Util qw(canonical_dn ldap_explode_dn);
use Net::LDAP::LDIF; use Net::LDAP::LDIF;
use Data::Dumper; use Data::Dumper;
use File::Temp; use File::Temp;
@ -990,9 +989,21 @@ sub run_cd
$newbase = $self->{'previous_base'} || return; $newbase = $self->{'previous_base'} || return;
} }
# support '..' # support '..' (possibly iterated and as prefix to a DN)
if ( $newbase =~ /\.\./ ) { if ( $newbase =~ /^\.\.,?/ ) {
$self->parent_dn( \$newbase ); my @curbase = @{ldap_explode_dn($self->base(), casefold => 'none')};
# deal with leading ..,
while ($newbase =~ /^\.\./) {
shift(@curbase) if (@curbase);
$newbase =~ s/^\.\.//;
last if ($newbase !~ /,\s*/);
$newbase =~ s/,\s*//;
}
# build a new absolute DN
$newbase .= ',' . canonical_dn(\@curbase, casefold => 'none')
if (@curbase);
} }
else { else {
$self->rdn_to_dn( \$newbase ); $self->rdn_to_dn( \$newbase );