Rewrite our build as modular maven components
This refactoring splits the code up into different components, with their own per-component CLASSPATH. By moving all of our classes into isolated components we can better isolate the classpaths and try to avoid unexpected dependency problems. It also allows us to more clearly define which components are used by the GWT UI and thus must be compiled under GWT, and which components are run on the server and can therefore use more of the J2SE API. Change-Id: I833cc22bacc5655d1c9099ed7c2b0e0a5b08855a Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
@@ -0,0 +1,238 @@
|
||||
// Copyright (C) 2009 The Android Open Source Project
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package com.google.gerrit.server;
|
||||
|
||||
import com.google.gerrit.reviewdb.Account;
|
||||
import com.google.gerrit.reviewdb.AccountGroup;
|
||||
import com.google.gerrit.reviewdb.Change;
|
||||
import com.google.gerrit.reviewdb.ReviewDb;
|
||||
import com.google.gerrit.reviewdb.StarredChange;
|
||||
import com.google.gerrit.server.account.AccountCache;
|
||||
import com.google.gerrit.server.account.AccountState;
|
||||
import com.google.gerrit.server.account.Realm;
|
||||
import com.google.gerrit.server.config.AuthConfig;
|
||||
import com.google.gerrit.server.config.Nullable;
|
||||
import com.google.gwtorm.client.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.OutOfScopeException;
|
||||
import com.google.inject.Provider;
|
||||
import com.google.inject.ProvisionException;
|
||||
import com.google.inject.Singleton;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.eclipse.jgit.lib.PersonIdent;
|
||||
|
||||
import java.net.InetAddress;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.SocketAddress;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.TimeZone;
|
||||
|
||||
/** An authenticated user. */
|
||||
public class IdentifiedUser extends CurrentUser {
|
||||
/** Create an IdentifiedUser, ignoring any per-request state. */
|
||||
@Singleton
|
||||
public static class GenericFactory {
|
||||
private final AuthConfig authConfig;
|
||||
private final AccountCache accountCache;
|
||||
private final Realm realm;
|
||||
|
||||
@Inject
|
||||
GenericFactory(final AuthConfig authConfig,
|
||||
final AccountCache accountCache, final Realm realm) {
|
||||
this.authConfig = authConfig;
|
||||
this.accountCache = accountCache;
|
||||
this.realm = realm;
|
||||
}
|
||||
|
||||
public IdentifiedUser create(final Account.Id id) {
|
||||
return new IdentifiedUser(AccessPath.UNKNOWN, authConfig, accountCache,
|
||||
realm, null, null, id);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an IdentifiedUser, relying on current request state.
|
||||
* <p>
|
||||
* Can only be used from within a module that has defined request scoped
|
||||
* {@code @RemotePeer SocketAddress} and {@code ReviewDb} providers.
|
||||
*/
|
||||
@Singleton
|
||||
public static class RequestFactory {
|
||||
private final AuthConfig authConfig;
|
||||
private final AccountCache accountCache;
|
||||
private final Realm realm;
|
||||
private final Provider<SocketAddress> remotePeerProvider;
|
||||
private final Provider<ReviewDb> dbProvider;
|
||||
|
||||
@Inject
|
||||
RequestFactory(final AuthConfig authConfig,
|
||||
final AccountCache accountCache, final Realm realm,
|
||||
final @RemotePeer Provider<SocketAddress> remotePeerProvider,
|
||||
final Provider<ReviewDb> dbProvider) {
|
||||
this.authConfig = authConfig;
|
||||
this.accountCache = accountCache;
|
||||
this.realm = realm;
|
||||
this.remotePeerProvider = remotePeerProvider;
|
||||
this.dbProvider = dbProvider;
|
||||
}
|
||||
|
||||
public IdentifiedUser create(final AccessPath accessPath,
|
||||
final Account.Id id) {
|
||||
return new IdentifiedUser(accessPath, authConfig, accountCache, realm,
|
||||
remotePeerProvider, dbProvider, id);
|
||||
}
|
||||
}
|
||||
|
||||
private static final Logger log =
|
||||
LoggerFactory.getLogger(IdentifiedUser.class);
|
||||
|
||||
private final Realm realm;
|
||||
private final AccountCache accountCache;
|
||||
|
||||
@Nullable
|
||||
private final Provider<SocketAddress> remotePeerProvider;
|
||||
|
||||
@Nullable
|
||||
private final Provider<ReviewDb> dbProvider;
|
||||
|
||||
private final Account.Id accountId;
|
||||
|
||||
private AccountState state;
|
||||
private Set<String> emailAddresses;
|
||||
private Set<AccountGroup.Id> effectiveGroups;
|
||||
private Set<Change.Id> starredChanges;
|
||||
|
||||
private IdentifiedUser(final AccessPath accessPath,
|
||||
final AuthConfig authConfig, final AccountCache accountCache,
|
||||
final Realm realm,
|
||||
@Nullable final Provider<SocketAddress> remotePeerProvider,
|
||||
@Nullable final Provider<ReviewDb> dbProvider, final Account.Id id) {
|
||||
super(accessPath, authConfig);
|
||||
this.realm = realm;
|
||||
this.accountCache = accountCache;
|
||||
this.remotePeerProvider = remotePeerProvider;
|
||||
this.dbProvider = dbProvider;
|
||||
this.accountId = id;
|
||||
}
|
||||
|
||||
private AccountState state() {
|
||||
if (state == null) {
|
||||
state = accountCache.get(getAccountId());
|
||||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
/** The account identity for the user. */
|
||||
public Account.Id getAccountId() {
|
||||
return accountId;
|
||||
}
|
||||
|
||||
public Account getAccount() {
|
||||
return state().getAccount();
|
||||
}
|
||||
|
||||
public Set<String> getEmailAddresses() {
|
||||
if (emailAddresses == null) {
|
||||
emailAddresses = state().getEmailAddresses();
|
||||
}
|
||||
return emailAddresses;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<AccountGroup.Id> getEffectiveGroups() {
|
||||
if (effectiveGroups == null) {
|
||||
if (authConfig.isIdentityTrustable(state().getExternalIds())) {
|
||||
effectiveGroups = realm.groups(state());
|
||||
|
||||
} else {
|
||||
effectiveGroups = authConfig.getRegisteredGroups();
|
||||
}
|
||||
}
|
||||
return effectiveGroups;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<Change.Id> getStarredChanges() {
|
||||
if (starredChanges == null) {
|
||||
if (dbProvider == null) {
|
||||
throw new OutOfScopeException("Not in request scoped user");
|
||||
}
|
||||
final Set<Change.Id> h = new HashSet<Change.Id>();
|
||||
try {
|
||||
for (final StarredChange sc : dbProvider.get().starredChanges()
|
||||
.byAccount(getAccountId())) {
|
||||
h.add(sc.getChangeId());
|
||||
}
|
||||
} catch (ProvisionException e) {
|
||||
log.warn("Cannot query starred by user changes", e);
|
||||
} catch (OrmException e) {
|
||||
log.warn("Cannot query starred by user changes", e);
|
||||
}
|
||||
starredChanges = Collections.unmodifiableSet(h);
|
||||
}
|
||||
return starredChanges;
|
||||
}
|
||||
|
||||
public PersonIdent newPersonIdent() {
|
||||
return newPersonIdent(new Date(), TimeZone.getDefault());
|
||||
}
|
||||
|
||||
public PersonIdent newPersonIdent(final Date when, final TimeZone tz) {
|
||||
final Account ua = getAccount();
|
||||
String name = ua.getFullName();
|
||||
if (name == null) {
|
||||
name = ua.getPreferredEmail();
|
||||
}
|
||||
if (name == null) {
|
||||
name = "Anonymous Coward";
|
||||
}
|
||||
|
||||
final String userId = "account-" + ua.getId().toString();
|
||||
final String user;
|
||||
if (ua.getSshUserName() != null) {
|
||||
user = ua.getSshUserName() + "|" + userId;
|
||||
} else {
|
||||
user = userId;
|
||||
}
|
||||
|
||||
String host = null;
|
||||
final SocketAddress remotePeer =
|
||||
remotePeerProvider != null ? remotePeerProvider.get() : null;
|
||||
if (remotePeer instanceof InetSocketAddress) {
|
||||
final InetSocketAddress sa = (InetSocketAddress) remotePeer;
|
||||
final InetAddress in = sa.getAddress();
|
||||
if (in != null) {
|
||||
host = in.getCanonicalHostName();
|
||||
} else {
|
||||
host = sa.getHostName();
|
||||
}
|
||||
}
|
||||
if (host == null) {
|
||||
host = "unknown";
|
||||
}
|
||||
|
||||
return new PersonIdent(name, user + "@" + host, when, tz);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "IdentifiedUser[account " + getAccountId() + "]";
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user