summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2012-10-03 17:50:48 -0400
committerJames Moger <james.moger@gitblit.com>2012-10-03 17:50:48 -0400
commitec0ce1621a3e145d5786c0c26caffd0c5c3acd61 (patch)
tree90964958d81d755c5518a240c3b167ea04bf67c2 /src
parentc25b9801899e86753dd6ba80ebc68102ee37a21c (diff)
downloadgitblit-ec0ce1621a3e145d5786c0c26caffd0c5c3acd61.tar.gz
gitblit-ec0ce1621a3e145d5786c0c26caffd0c5c3acd61.zip
Fix anonymous browsing of user profile page
Diffstat (limited to 'src')
-rw-r--r--src/com/gitblit/models/RepositoryModel.java4
-rw-r--r--src/com/gitblit/models/UserModel.java2
-rw-r--r--src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java5
3 files changed, 9 insertions, 2 deletions
diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java
index 65629faf..caf7e7e4 100644
--- a/src/com/gitblit/models/RepositoryModel.java
+++ b/src/com/gitblit/models/RepositoryModel.java
@@ -152,6 +152,10 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
return !StringUtils.isEmpty(originRepository);
}
+ public boolean isOwner(String username) {
+ return owner != null && username != null && owner.equalsIgnoreCase(username);
+ }
+
public boolean isPersonalRepository() {
return !StringUtils.isEmpty(projectPath) && projectPath.charAt(0) == '~';
}
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 6d5de3bb..dd41df08 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -59,7 +59,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel>
}
private UserModel() {
- this.username = "anonymous";
+ this.username = "$anonymous";
this.isAuthenticated = false;
}
diff --git a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java b/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
index 0a6bc623..50f0d52d 100644
--- a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
+++ b/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
@@ -134,8 +134,11 @@ public class ProjectRepositoryPanel extends BasePanel {
}
UserModel user = GitBlitWebSession.get().getUser();
+ if (user == null) {
+ user = UserModel.ANONYMOUS;
+ }
Fragment repositoryLinks;
- boolean showOwner = user != null && user.username.equalsIgnoreCase(entry.owner);
+ boolean showOwner = entry.isOwner(user.username);
// owner of personal repository gets admin powers
boolean showAdmin = isAdmin || entry.isUsersPersonalRepository(user.username);