From 5ae0b71e1e6e73e4bacf321a7d5be49fcdf4ad97 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 20 Oct 2011 08:01:54 -0400
Subject: [PATCH] Properly handle anonymous registrations.
---
src/com/gitblit/client/GitblitManager.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/client/GitblitManager.java b/src/com/gitblit/client/GitblitManager.java
index e5b6b43..43cdab3 100644
--- a/src/com/gitblit/client/GitblitManager.java
+++ b/src/com/gitblit/client/GitblitManager.java
@@ -316,9 +316,14 @@
Date lastLogin = dateFormat.parse(config.getString("servers", server, "lastLogin"));
String url = config.getString("servers", server, "url");
String account = config.getString("servers", server, "account");
- // FIXME this is pretty lame
- char[] password = new String(Base64.decode(config.getString("servers", server,
- "password"))).toCharArray();
+ char[] password;
+ String pw = config.getString("servers", server, "password");
+ if (StringUtils.isEmpty(pw)) {
+ password = new char[0];
+ } else {
+ // FIXME this is pretty lame
+ password = new String(Base64.decode(pw)).toCharArray();
+ }
GitblitRegistration reg = new GitblitRegistration(server, url, account, password);
reg.lastLogin = lastLogin;
registrations.put(reg.name, reg);
@@ -333,7 +338,7 @@
StoredConfig config = getConfig();
config.setString("servers", reg.name, "url", reg.url);
config.setString("servers", reg.name, "account", reg.account);
- // FIXME this is pretty lame
+ // FIXME this is pretty lame
config.setString("servers", reg.name, "password",
Base64.encodeBytes(new String(reg.password).getBytes("UTF-8")));
config.setString("servers", reg.name, "lastLogin", dateFormat.format(reg.lastLogin));
--
Gitblit v1.9.1