From e5aaa5db9b323f58d9eb8338532fd04fce885048 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 22 Oct 2012 16:22:37 -0400 Subject: Permission regexes are now case-insensitive --- src/com/gitblit/models/TeamModel.java | 5 +++-- src/com/gitblit/models/UserModel.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/com/gitblit/models') diff --git a/src/com/gitblit/models/TeamModel.java b/src/com/gitblit/models/TeamModel.java index 9ba2f669..6410eb45 100644 --- a/src/com/gitblit/models/TeamModel.java +++ b/src/com/gitblit/models/TeamModel.java @@ -29,6 +29,7 @@ import com.gitblit.Constants.AccessPermission; import com.gitblit.Constants.AccessRestrictionType; import com.gitblit.Constants.RegistrantType; import com.gitblit.Constants.Unused; +import com.gitblit.utils.StringUtils; /** * TeamModel is a serializable model class that represents a group of users and @@ -184,9 +185,9 @@ public class TeamModel implements Serializable, Comparable { permission = p; } } else { - // search for regex permission match + // search for case-insensitive regex permission match for (String key : permissions.keySet()) { - if (repository.name.matches(key)) { + if (StringUtils.matchesIgnoreCase(repository.name, key)) { AccessPermission p = permissions.get(key); if (p != null) { permission = p; diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java index 97430bfe..6cc07789 100644 --- a/src/com/gitblit/models/UserModel.java +++ b/src/com/gitblit/models/UserModel.java @@ -227,9 +227,9 @@ public class UserModel implements Principal, Serializable, Comparable return p; } } else { - // search for regex permission match + // search for case-insensitive regex permission match for (String key : permissions.keySet()) { - if (repository.name.matches(key)) { + if (StringUtils.matchesIgnoreCase(repository.name, key)) { AccessPermission p = permissions.get(key); if (p != null) { permission = p; -- cgit v1.2.3