From 8691dcf8bb5abb677cf0ed85f741e9173e269515 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Wed, 12 Aug 2015 09:07:54 -0400
Subject: [PATCH] Removed GoogleCode reference from README
---
src/main/java/com/gitblit/auth/AuthenticationProvider.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/gitblit/auth/AuthenticationProvider.java b/src/main/java/com/gitblit/auth/AuthenticationProvider.java
index f7b75fa..f6511ba 100644
--- a/src/main/java/com/gitblit/auth/AuthenticationProvider.java
+++ b/src/main/java/com/gitblit/auth/AuthenticationProvider.java
@@ -16,6 +16,7 @@
package com.gitblit.auth;
import java.io.File;
+import java.math.BigInteger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,6 +28,7 @@
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.ArrayUtils;
+import com.gitblit.utils.DeepCopier;
import com.gitblit.utils.StringUtils;
public abstract class AuthenticationProvider {
@@ -78,27 +80,40 @@
}
protected void updateUser(UserModel userModel) {
- // TODO implement user model change detection
- // account for new user and revised user
+ final UserModel userLocalDB = userManager.getUserModel(userModel.getName());
- // username
- // displayname
- // email address
- // cookie
+ // Establish the checksum of the current version of the user
+ final BigInteger userCurrentCheck = DeepCopier.checksum(userModel);
- userManager.updateUserModel(userModel);
+ // Establish the checksum of the stored version of the user
+ final BigInteger userLocalDBcheck = DeepCopier.checksum(userLocalDB);
+
+ // Compare the checksums
+ if (!userCurrentCheck.equals(userLocalDBcheck)) {
+ // If mismatch, save the new instance.
+ userManager.updateUserModel(userModel);
+ }
}
protected void updateTeam(TeamModel teamModel) {
- // TODO implement team model change detection
- // account for new team and revised team
+ final TeamModel teamLocalDB = userManager.getTeamModel(teamModel.name);
- // memberships
+ // Establish the checksum of the current version of the team
+ final BigInteger teamCurrentCheck = DeepCopier.checksum(teamModel);
- userManager.updateTeamModel(teamModel);
+ // Establish the checksum of the stored version of the team
+ final BigInteger teamLocalDBcheck = DeepCopier.checksum(teamLocalDB);
+
+ // Compare the checksums
+ if (!teamCurrentCheck.equals(teamLocalDBcheck)) {
+ // If mismatch, save the new instance.
+ userManager.updateTeamModel(teamModel);
+ }
}
public abstract void setup();
+
+ public abstract void stop();
public abstract UserModel authenticate(String username, char[] password);
@@ -145,6 +160,11 @@
protected UsernamePasswordAuthenticationProvider(String serviceName) {
super(serviceName);
}
+
+ @Override
+ public void stop() {
+
+ }
}
public static class NullProvider extends AuthenticationProvider {
@@ -159,6 +179,11 @@
}
@Override
+ public void stop() {
+
+ }
+
+ @Override
public UserModel authenticate(String username, char[] password) {
return null;
}
--
Gitblit v1.9.1