rework op/groups.t

p4raw-id: //depot/perl@2240

1 files changed, 50 insertions, 22 deletions

diff --git a/t/op/groups.t b/t/op/groups.t
index 6f7f8c478c..78a748fddd 100755
--- a/t/op/groups.t
+++ b/t/op/groups.t
@@ -1,6 +1,6 @@
 #!./perl
 
-$ENV{PATH} = '/usr/xpg4/bin:/bin:/usr/bin:/usr/ucb';
+$ENV{PATH} = '/bin:/usr/bin:/usr/xpg4/bin:/usr/ucb';
 
 # We have to find a command that prints all (effective
 # and real) group names (not ids).  The known commands are:
@@ -10,23 +10,44 @@ $ENV{PATH} = '/usr/xpg4/bin:/bin:/usr/bin:/usr/ucb';
 # Beware 1: some systems do just 'id -G' even when 'id -Gn' is used.
 # Beware 2: id -Gn or id -a format might be id(name) or name(id).
 # Beware 3: the groups= might be anywhere in the id output.
+# Beware 4: groups can have spaces ('id -a' being the only defense against this)
 #
 # That is, we might meet the following:
 #
-# foo bar zot			# accept
-# 1 2 3				# reject
-# groups=foo(1),bar(2),zot(3)	# parse
-# groups=1(foo),2(bar),3(zot)	# parse
+# foo bar zot				# accept
+# foo 22 42 bar zot			# accept
+# 1 22 42 2 3				# reject
+# groups=(42),foo(1),bar(2),zot me(3)	# parse
+# groups=22,42,1(foo),2(bar),3(zot me)	# parse
 #
 # and the groups= might be after, before, or between uid=... and gid=...
 
 GROUPS: {
-    last GROUPS if ($groups = `groups 2>/dev/null`) ne '';
-    if ($groups = `id -Gn 2>/dev/null` ne '') {
-	last GROUPS unless $groups =~ /^(\d+)(\s+\d)*$/;
+    # prefer 'id' over 'groups' (is this ever wrong anywhere?)
+    # and 'id -a' over 'id -Gn' (the former is good about spaces in group names)
+    if (($groups = `id -a 2>/dev/null`) ne '') {
+	# $groups is of the form:
+	# uid=39957(gsar) gid=22(users) groups=33536,39181,22(users),0(root),1067(dev)
+	last GROUPS;
+    }
+    if (($groups = `id -Gn 2>/dev/null`) ne '') {
+	# $groups could be of the form:
+	# users 33536 39181 root dev
+	last GROUPS if $groups !~ /^(\d|\s)+$/;
     }
-    if ($groups = `id -a 2>/dev/null` ne '') {
-	# Grok format soon.
+    if (($groups = `groups 2>/dev/null`) ne '') {
+	# may not reflect all groups in some places, so do a sanity check
+	if (-d '/afs') {
+	    print <<EOM;
+# These test results *may* be bogus, as you appear to have AFS,
+# and I can't find a working 'id' in your PATH (which I have set
+# to '$ENV{PATH}').
+#
+# If these tests fail, report the particular incantation you use
+# on this platform to find *all* the groups that an arbitrary
+# luser may belong to, using the 'perlbug' program.
+EOM
+	}
 	last GROUPS;
     }
     # Okay, not today.
@@ -36,21 +57,28 @@ GROUPS: {
 
 # Remember that group names can contain whitespace, '-', et cetera.
 # That is: do not \w, do not \S.
-if ($groups =~ /groups=((.+?\(.+?\))(,.+?\(.+?\))*)( [ug]id=|$)/) {
+if ($groups =~ /groups=(.+)( [ug]id=|$)/) {
     my $gr = $1;
-    my @g0 = $gr =~ /(.+?)\((.+?)\),?/g;
-    my @g1 = @g0[ map { $_ * 2     } 0..$#g0/2 ];
-    my @g2 = @g0[ map { $_ * 2 + 1 } 0..$#g0/2 ];
+    my @g0 = split /,/, $gr;
+    my @g1;
+    # prefer names over numbers
+    for (@g0) {
+        # 42(zot me)
+	if (/^(\d+)(?:\(([^)]+)\))?$/) {
+	    push @g1, ($2 || $1);
+	}
+        # zot me(42)
+	elsif (/^([^(]*)\((\d+)\)$/) {
+	    push @g1, ($1 || $2);
+	}
+	else {
+	    print "# ignoring group entry [$_]\n";
+	}
+    }
+    print "# groups=$gr\n";
     print "# g0 = @g0\n";
     print "# g1 = @g1\n";
-    print "# g2 = @g2\n";
-    if (grep /\D/, @g1) {
-	$groups = join(" ", @g1);
-    } elsif (grep /\D/, @g2) {
-	$groups = join(" ", @g2);
-    } else {
-	# Let's fail.  We want to parse the output.  Really.
-    }
+    $groups = "@g1";
 }
 
 print "1..2\n";