Uses wrongly `re.match` for `[bookmark] paths` settings

[Jun Omae]

It seems [bookmark] paths supports shell wildcards, not regular expression.

    bookmarkable_paths = ListOption('bookmark', 'paths', '/*',
        doc='List of URL paths to allow bookmarking on. Globs are supported.')

But the plugin uses re.match for each value with no changes.

    def post_process_request(self, req, template, data, content_type):
        # Show bookmarks context menu except when on the bookmark page
        if 'BOOKMARK_VIEW' in req.perm and not self.match_request(req):
            for path in self.bookmarkable_paths:
                if re.match(path, req.path_info):
                    self.render_bookmarker(req)
                    break
        return template, data, content_type

I think it should fix to be able to use shell wildcards.

[Ryan J Ollos]

Yeah, that makes sense. +1 from me.

[Ryan J Ollos]

Same issue was noted with the VotePlugin in comment:5:ticket:10942.

[Ryan J Ollos]

It looks like ​fnmatch will accomplish what we want. How does the following patch look?

tracbookmark/__init__.py

@@ -9 +9 @@
 # you should have received as part of this distribution.
 
 import re
+from fnmatch import fnmatch
 
 from genshi.builder import tag
 from trac.config import ListOption
@@ -168 +169 @@
         # Show bookmarks context menu except when on the bookmark page
         if self._authorize(req) and not self.match_request(req):
             for path in self.bookmarkable_paths:
-                if re.match(path, req.path_info):
+                if fnmatch(req.path_info, path):
                     self.render_bookmarker(req)
                     break
         return template, data, content_type

[Ryan J Ollos]

On second look, we might want to use ​fnmatchcase.

[Jun Omae]

Replying to rjollos:

On second look, we might want to use ​fnmatchcase.

Looks good! Yes, we should use fnmatchcase because the URLs in Trac is case-sensitive. Please commit it!

[Ryan J Ollos]

(In [13011]) Fixes #10226:

BookmarkPlugin: Perform Unix shell-style wildcard matching (globs), as is documented, for the paths option. Previously, a regular expression was used to match paths.

[Ryan J Ollos]

(In [13012]) Fixes #11037, Refs #10226:

VotePlugin: Perform Unix shell-style wildcard matching (globs), as is documented, for the paths option. Previously, a regular expression was used to match paths.