shelldap: comparison shelldap

equal deleted inserted replaced

-:95dbffcc757b
+:057fefab56b0
 cat uid=mahlon,ou=People,dc=example,o=company
 cat uid=mahlon + userPassword
 =item B<  cd>
-Change DN.  Translated to LDAP, this changes the current basedn.
+Change directory.  Translated to LDAP, this changes the current basedn.
 All commands after a 'cd' operate within the new basedn.
-cd                change to 'home' basedn
+cd                  change to 'home' basedn
-cd ~              same thing
+cd ~                change to the binddn, or basedn if anonymously bound
-cd -              change to previous node
+cd -                change to previous node
-cd ou=People      change to explicit path below current node
+cd ou=People        change to explicit path below current node
-cd ..             change to parent node
+cd ..               change to parent node
-cd ..,..,ou=Groups  change to node ou=Groups, which is a sibling
+cd ../../ou=Groups  change to node ou=Groups, which is a sibling
-to the current node's parent node
+to the current node's grandparent
 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
 "wherever I currently am."
 use strict;
 use warnings;
 use Term::ReadKey;
 use Term::Shell;
 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 ldap_explode_dn);
+use Net::LDAP::Util qw/ canonical_dn ldap_explode_dn /;
 use Net::LDAP::LDIF;
 use Data::Dumper;
 use File::Temp;
 use Algorithm::Diff;
 use Carp 'confess';
 	$self->{'cwd_entries'} = $cache->{'entries'};
 	return;
 }
-# convert a given path to a DN: deal with '..', '.', '~'
+# convert a given path to a DN: deal with '..', '.'
-# Synopsis: $dn = $self->path_to_dn($path, [relative => N]);
+# Synopsis: $dn = $self->path_to_dn( $path );
 sub path_to_dn
 {
-	my $self  = shift;
+	my $self    = shift;
-	my $path = shift;
+	my $path    = shift;
-	my %flags = @_;
+	my %flags   = @_;
-	my $base = $self->base();
+	my $curbase = $self->base();
-	# fail on wrong / missing parameter
-	return undef  if (!defined($path));
-	# return configured base DN
-	return($conf->{basedn})  if ($path eq '~');
 	# return current base DN
-	return($base)  if ($path eq '.');
+	return $curbase if $path eq '.';
-	if ($path =~ /^\.\./o) {	# relative path
+	# support 'cd -'
+	return $self->{'previous_base'} if $path eq '-';
+	# support empty 'cd' or 'cd ~' going to root
+	return $conf->{'basedn'} if $path eq '~' || ! $path;
+	# relative path, upwards
+	#
+	if ( $path =~ /^\.\./o ) {
 		# support '..' (possibly iterated and as prefix to a DN)
-		my @base = @{ldap_explode_dn($base, casefold => 'none')};
+		my @base = @{ ldap_explode_dn($curbase, casefold => 'none') };
 		# deal with leading ..,
-		while ($path =~ /^\.\./) {
+		while ( $path =~ /^\.\./ ) {
-			shift(@base)  if (@base);
+			shift( @base ) if @base;
 			$path =~ s/^\.\.//;
-			last  if ($path !~ /,\s*/);
+			last if $path !~ /[,\/]\s*/;
-			$path =~ s/,\s*//;
+			$path =~ s/[,\/]\s*//;
 		}
-		# build a new absolute DN
+		# append the new dn to the node if one was specified:
-		$path .= ',' . canonical_dn(\@base, casefold => 'none')
+		#    cd ../../cn=somewhere  vs
-			if (@base);
+		#    cd ../../
-	}
+		#
-	elsif ($path =~ /,\s*~$/o) {	# absolute path
+		my $newbase_root = canonical_dn( \@base, casefold => 'none' );
-		$path =~ s/,\s*~$//;
+		$path = $path ? $path . ',' . $newbase_root : $newbase_root;
-		$path.= ','.$conf->{basedn}
+	}
-			if ($conf->{basedn});
-	}
+	# attach the base if it isn't already there (this takes care of
-	else {				# relative or absolute path
+	# deeper relative nodes and absolutes)
-		$path.= ','.$conf->{basedn}
+	#
-			if ($conf->{basedn} && $flags{relative});
+	else {
-	}
+		$path = "$path," . $curbase unless $path =~ /$curbase/;
+	}
-	return($path);
+	return $path;
 }
 # given an array ref of shell-like globs,
 # make and return an LDAP filter object.
 #
 			attrs  => \@attrs
 		});
 	}
 	else {
 		# convert given path to DN
-		$dn = $self->path_to_dn($dn, relative => 1);
+		$dn = $self->path_to_dn( $dn );
 		$s = $self->search({
 			base   => $dn,
 			vals   => 1,
 			attrs  => \@attrs
 		});
 sub run_cd
 {
 	my $self	= shift;
 	my $newbase = join ' ', @_;
-	# support 'cd' going to root
-	$newbase ||= $conf->{'basedn'};
-	# support 'cd -'
-	if ( $newbase eq '-' ) {
-		$newbase = $self->{'previous_base'} || return;
-	}
 	# convert given path to a DN
-	$newbase = $self->path_to_dn($newbase, relative => 1);
+	$newbase = $self->path_to_dn( $newbase );
 	unless ( $self->is_valid_dn( $newbase ) ) {
 		print "No such object\n";
 		return;
 	}
 		print "No destination dn provided.\n";
 		return;
 	}
 	# convert given source path to DN
-	$s_dn = $self->path_to_dn($s_dn, relative => 1);
+	$s_dn = $self->path_to_dn( $s_dn );
 	my $s = $self->search({ base => $s_dn, vals => 1 });
 	unless ( $s->{'code'} == LDAP_SUCCESS ) {
 		print "No such object\n";
 		return;
 		print "No dn provided.\n";
 		return;
 	}
 	# convert given path to DN
-	$dn = $self->path_to_dn($dn, relative => 1);
+	$dn = $self->path_to_dn( $dn );
 	my $s = $self->search({ base => $dn, vals => 1 });
 	if ( $s->{'code'} ) {
 		print $s->{'message'} . "\n";
 	unless ( $base ) {
 		print "No search base specified.\n";
 		return;
 	}
 	# convert base path to DN
-	$base = $self->path_to_dn($base, relative => 1);
+	$base = $self->path_to_dn( $base );
 	$self->debug("Filter parsed as: " . $filter->as_string() . "\n");
 	my $s = $self->search(
 		{
 		print "No 'directory' provided.\n";
 		return;
 	}
 	# convert given path to DN
-	$dir = $self->path_to_dn($dir, relative => 1);
+	$dir = $self->path_to_dn( $dir );
 	# normalize name, if it is not yet a legal DN
 	$dir = 'ou='.$dir  if (!canonical_dn($dir));
 	# get RDN: naming attributes (lower-case) and their values
 		print "No destination dn provided.\n";
 		return;
 	}
 	# convert given source path to DN
-	$s_dn = $self->path_to_dn($s_dn, relative => 1);
+	$s_dn = $self->path_to_dn( $s_dn );
 	unless ( $self->is_valid_dn( $s_dn ) ) {
 		print "No such object\n";
 		return;
 	}
 		print "Sorry, password changes not supported by LDAP server.\n";
 		return;
 	}
 	# convert given path to DN
-	$self->path_to_dn($dn, relative => 1);
+	$self->path_to_dn( $dn );
 	my $s = $self->search( { base => $dn, scope => 'base' } );
 	if ( $s->{'code'} ) {
 		print $s->{'message'}, "\n";
 		return;

changeset 33	057fefab56b0
parent 32	95dbffcc757b
child 34	40c3719c87d4