opendev/gerrit
Code Issues Proposed changes

Change Receive to test only the most recent contributor agreement

Browse Source 
We only examine the most recent contributor agreement that the user
has entered into the system.  This lets us check the isValid flag
and issue a reasonable error message if the completed agreement is
no longer valid on this site and a new one must be completed.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-01-03 12:39:54 -08:00
parent 42aa39e995
commit 68eff50909
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
appjar/src/main/java/com/google/gerrit/server/ssh/Receive.java
View File

@@ -126,23 +126,35 @@ class Receive extends AbstractGitCommand {
userAccount.getId()).toList()) {
final ContributorAgreement cla =
db.contributorAgreements().get(a.getAgreementId());
if (cla == null || !cla.isActive()) {
if (cla == null) {
continue;
}
if (bestAgreement == null
|| bestAgreement.getStatus() != AccountAgreement.Status.VERIFIED) {
bestAgreement = a;
bestCla = cla;
}
if (bestAgreement.getStatus() == AccountAgreement.Status.VERIFIED) {
break;
}
bestAgreement = a;
bestCla = cla;
break;
}
} catch (OrmException e) {
throw new Failure(1, "database error");
}
if (bestCla != null && !bestCla.isActive()) {
final StringBuilder msg = new StringBuilder();
msg.append("\nfatal: ");
msg.append(bestCla.getShortName());
msg.append(" contributor agreement is expired.\n");
if (server.getCanonicalURL() != null) {
msg.append("\nPlease complete a new agreement");
msg.append(":\n\n ");
msg.append(server.getCanonicalURL());
msg.append("Gerrit#");
msg.append(Link.SETTINGS_AGREEMENTS);
msg.append("\n");
}
msg.append("\n");
throw new Failure(1, msg.toString());
}
if (bestCla != null && bestCla.isRequireContactInformation()) {
final ContactInformation info = userAccount.getContactInformation();
boolean fail = false;