[Jifty-commit] jifty branch, master, updated. jifty-1.10228-25-g08c3ca6

Jifty commits jifty-commit at lists.jifty.org
Tue May 17 16:40:41 EDT 2011


The branch, master has been updated
       via  08c3ca6a7bec943086d7c6b4da3e6c81c33ac21e (commit)
       via  85e8fa7abd99a626b6224679a42709abe2e932e9 (commit)
      from  238d2cc0693515a393971165e998ae1c30627d18 (commit)

Summary of changes:
 lib/Jifty/API.pm |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 85e8fa7abd99a626b6224679a42709abe2e932e9
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue May 17 16:36:55 2011 -0400

    Revert "use bizarre strings to test match-all-regex instead"
    
    This reverts commit 6fc7598b76d98ced9d2499b7dd8d7ab4ba2fe070.

diff --git a/lib/Jifty/API.pm b/lib/Jifty/API.pm
index 1ae817d..c7fd1a6 100644
--- a/lib/Jifty/API.pm
+++ b/lib/Jifty/API.pm
@@ -270,8 +270,7 @@ sub restrict {
         die "For security reasons, Jifty won't let you allow all actions"
             if $polarity eq "allow"
             and ref $restriction
-            and 'weird_string_that_does_not_match_normally' =~ $restriction
-            and '' =~ $restriction;
+            and $restriction =~ /^\(\?[-xism]*:\^?\.\*\$?\)$/;
 
         # Fully qualify it if it's a string
         $restriction = $self->qualify($restriction)

commit 08c3ca6a7bec943086d7c6b4da3e6c81c33ac21e
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue May 17 16:40:21 2011 -0400

    Handle 5.14's qr// stringification better

diff --git a/lib/Jifty/API.pm b/lib/Jifty/API.pm
index c7fd1a6..4d30a17 100644
--- a/lib/Jifty/API.pm
+++ b/lib/Jifty/API.pm
@@ -270,7 +270,7 @@ sub restrict {
         die "For security reasons, Jifty won't let you allow all actions"
             if $polarity eq "allow"
             and ref $restriction
-            and $restriction =~ /^\(\?[-xism]*:\^?\.\*\$?\)$/;
+            and $restriction =~ /^\(\?^?[-xismadlu]*:\^?\.\*\$?\)$/;
 
         # Fully qualify it if it's a string
         $restriction = $self->qualify($restriction)

-----------------------------------------------------------------------


More information about the Jifty-commit mailing list