From e7e8bd8af341719b7cb902c7861ea198f5db43a6 Mon Sep 17 00:00:00 2001
From: Robbert Noordzij <robbert@xseeding.nl>
Date: Tue, 07 Oct 2014 06:14:27 -0400
Subject: [PATCH] Bug in the rawservlet in extracting the repository out of the path. The offset for finding the next slash should be the current slash + 1, not the last offset + the offset of the current slash.
---
src/main/java/com/gitblit/authority/UserCertificateConfig.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/authority/UserCertificateConfig.java b/src/main/java/com/gitblit/authority/UserCertificateConfig.java
index 5ec76f7..411b88a 100644
--- a/src/main/java/com/gitblit/authority/UserCertificateConfig.java
+++ b/src/main/java/com/gitblit/authority/UserCertificateConfig.java
@@ -30,35 +30,36 @@
/**
* User certificate config section parser.
- *
+ *
* @author James Moger
*/
public class UserCertificateConfig {
public static final SectionParser<UserCertificateConfig> KEY = new SectionParser<UserCertificateConfig>() {
- public UserCertificateConfig parse(final Config cfg) {
+ @Override
+ public UserCertificateConfig parse(final Config cfg) {
return new UserCertificateConfig(cfg);
}
};
-
+
public final List<UserCertificateModel> list;
private UserCertificateConfig(final Config c) {
SimpleDateFormat df = new SimpleDateFormat(Constants.ISO8601);
- list = new ArrayList<UserCertificateModel>();
+ list = new ArrayList<UserCertificateModel>();
for (String username : c.getSubsections("user")) {
UserCertificateModel uc = new UserCertificateModel(new UserModel(username));
try {
uc.expires = df.parse(c.getString("user", username, "expires"));
} catch (ParseException e) {
LoggerFactory.getLogger(UserCertificateConfig.class).error("Failed to parse date!", e);
- } catch (NullPointerException e) {
+ } catch (NullPointerException e) {
}
uc.notes = c.getString("user", username, "notes");
- uc.revoked = new ArrayList<String>(Arrays.asList(c.getStringList("user", username, "revoked")));
+ uc.revoked = new ArrayList<String>(Arrays.asList(c.getStringList("user", username, "revoked")));
list.add(uc);
}
}
-
+
public UserCertificateModel getUserCertificateModel(String username) {
for (UserCertificateModel ucm : list) {
if (ucm.user.username.equalsIgnoreCase(username)) {
--
Gitblit v1.9.1