diff options
| author | James Moger <james.moger@gitblit.com> | 2012-10-22 16:22:37 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-10-22 16:22:37 -0400 |
| commit | e5aaa5db9b323f58d9eb8338532fd04fce885048 (patch) | |
| tree | f6202d1e79c050dac73a7922803407aee7bc9858 /src/com/gitblit/models | |
| parent | ba54242b0d080475bbfce2ab559b3fcf2a513a5b (diff) | |
| download | gitblit-e5aaa5db9b323f58d9eb8338532fd04fce885048.tar.gz gitblit-e5aaa5db9b323f58d9eb8338532fd04fce885048.zip | |
Permission regexes are now case-insensitive
Diffstat (limited to 'src/com/gitblit/models')
| -rw-r--r-- | src/com/gitblit/models/TeamModel.java | 5 | ||||
| -rw-r--r-- | src/com/gitblit/models/UserModel.java | 4 |
2 files changed, 5 insertions, 4 deletions
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<TeamModel> { 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<UserModel> 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;
|