From c729c59cedff4e800c659e524081fbd1be8db3c1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 22 Sep 2011 16:09:37 -0400
Subject: [PATCH] Rearranged federation status enum.
---
src/com/gitblit/wicket/pages/LoginPage.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/LoginPage.java b/src/com/gitblit/wicket/pages/LoginPage.java
index 6ee72db..45e1e2d 100644
--- a/src/com/gitblit/wicket/pages/LoginPage.java
+++ b/src/com/gitblit/wicket/pages/LoginPage.java
@@ -55,7 +55,7 @@
}
add(new Label("title", GitBlit.getString(Keys.web.siteName, Constants.NAME)));
- add(new Label("name", Constants.NAME));
+ add(new Label("name", GitBlit.getString(Keys.web.siteName, Constants.NAME)));
StatelessForm<Void> loginForm = new StatelessForm<Void>("loginForm") {
@@ -69,6 +69,11 @@
UserModel user = GitBlit.self().authenticate(username, password);
if (user == null) {
error("Invalid username or password!");
+ } else if (user.username.equals(Constants.FEDERATION_USER)) {
+ // disallow the federation user from logging in via the
+ // web ui
+ error("Invalid username or password!");
+ user = null;
} else {
loginUser(user);
}
--
Gitblit v1.9.1