In an attempt to see if #2531 (which is marked closed) solves this problem, I did:

git clone git://reductivelabs.com/puppet

Applied this patch as talked about in http://projects.reductivelabs.com/issues/2531#note-11 and committed by James Turnbull:

http://projects.reductivelabs.com/projects/puppet/repository/revisions/a35e9bf918db0f6fca45d8b0b002a372cff4f982/diff/lib/puppet/network/authstore.rb

and ran install.rb after wiping out my old installation.

I got the same results: info: access[^{/catalog/([/]+)$]:} allowing $1 access

Pete

Yeah, that’s what I would expect (though the wording of the message, “allowing $1 access”, isn’t a good diagnostic as that message wasn’t adjusted by the patch).

That patch was intentionally minimalistic, and only dealt with a specific use case. I’m working up a similarly targeted patch for you to try, but the real solution will be to refactor that code.

Should have a sketch of a solution up as a for-testing-only branch in a few minutes.

I’ve temporarily removed the testing branch. It broke other things and was inadequate as a solution to the present ticket. I’ll post another stab when I have one.

There’s an added complexity due to the initial prefix (01.) being taken as the start of a numeric IP address, so the approach I was considering won’t suffice. I do have a good reproduction case now though, and will post a full patch in the next day or so.

Markus Roberts wrote:

This appears to be very closely related to 2531.

Specifically, I believe the problem is caused by the periods in the domain name. This I suspect results in a comparison between an array of domain name segments (in reverse order, so top-level first) with an array consisting of a single string (the expansion of $1) with internal periods.

I suspect you are right, but I’m wondering why I didn’t catch this issue when I coded this. The solution IMHO would be to munge_name the pattern after interpolation.

On the previous ticket we decided on making the minimal fix that would handle the specific case in question rather than a larger refactoring to handle the general problem. For the point release (0.25.1) policy dictates another minimalistic solution, but I’ll reiterate my support for a full refactoring.

It’s up to you or Luke, since you’re taking care of this ticket.

Brice —

Yeah, that was pretty much my initial thought, but munge-after-interpolate and variants didn’t pan out.

The specific case we didn’t catch was where the interpolation contained dots, began and ended with digits, yet was a host name and not an ip address. It’s getting tangled with the numeric ip handling logic somewhere along the way.

I’m testing various ideas, should have a fix out this morning.

— Markus

I grabbed the branch by doing this:

git clone git://github.com/MarkusQ/puppet.git puppet

and I got the same results, so I think I didn’t grab the right branch?

Pete

You then need to do a “git checkout ticket/master/2620” in that directory to get 0.25 + the patch; what you got was just the root of my tree, which is (IIRC) 0.25 RC1.

Gah, forgive my SVN ways, I’m clearly doing something wrong:

[~]# git clone git://github.com/MarkusQ/puppet.git puppet Initialized empty Git repository in /root/puppet/.git/ remote: Counting objects: 51418, done. remote: Compressing objects: 100% (14191/14191), done. remote: Total 51418 (delta 36850), reused 50769 (delta 36287) Receiving objects: 100% (51418/51418), 9.41 MiB | 2676 KiB/s, done. Resolving deltas: 100% (36850/36850), done. [~]# cd puppet [puppet]# git checkout ticket/master/2620 error: pathspec ‘ticket/master/2620’ did not match any file(s) known to git.

Pete,

You have to make the local branch first.

try: git checkout -b ticket/master/2620 origin/master/ticket/2620

FYI, that will make the new branch and checkout in one command

The format is git checkout -b

In this case you are going to be branching from a remote branch and the default name for a remote that you cloned is ‘origin’

Nut. I still need hand holding.

[root ~]# git clone git://github.com/MarkusQ/puppet.git puppet
Initialized empty Git repository in /root/puppet/.git/
remote: Counting objects: 51418, done.
remote: Compressing objects: 100% (14191/14191), done.
remote: Total 51418 (delta 36850), reused 50769 (delta 36287)
Receiving objects: 100% (51418/51418), 9.41 MiB | 2658 KiB/s, done.
Resolving deltas: 100% (36850/36850), done.
[root ~]# cd puppet
[root puppet]# ls
autotest  CHANGELOG  COPYING   ext         lib      man       README           README.rst  spec
bin       conf       examples  install.rb  LICENSE  Rakefile  README.queueing  sbin        test
[root puppet]# git checkout -b ticket/master/2620 origin/master/ticket/2620
fatal: git checkout: updating paths is incompatible with switching branches/forcing
Did you intend to checkout 'origin/master/ticket/2620' which can not be resolved as commit?