| | |
|---|
| | | import java.util.Arrays;
|
|---|
| | | import java.util.Collection;
|
|---|
| | | import java.util.Date;
|
|---|
| | | import java.util.HashMap;
|
|---|
| | | import java.util.HashSet;
|
|---|
| | | import java.util.List;
|
|---|
| | | import java.util.Map;
|
|---|
| | |
|---|
| | | import java.util.Set;
|
|---|
| | | import java.util.concurrent.TimeUnit;
|
|---|
| | |
|
|---|
| | | import org.eclipse.jgit.lib.Ref;
|
|---|
| | | import org.eclipse.jgit.lib.Repository;
|
|---|
| | | import org.eclipse.jgit.lib.StoredConfig;
|
|---|
| | | import org.eclipse.jgit.revwalk.RevCommit;
|
|---|
| | |
|---|
| | | import org.slf4j.Logger;
|
|---|
| | | import org.slf4j.LoggerFactory;
|
|---|
| | |
|
|---|
| | | import com.gitblit.Constants.AccessPermission;
|
|---|
| | | import com.gitblit.Constants.FederationPullStatus;
|
|---|
| | | import com.gitblit.Constants.FederationStrategy;
|
|---|
| | | import com.gitblit.GitBlitException.ForbiddenException;
|
|---|
| | | import com.gitblit.models.FederationModel;
|
|---|
| | | import com.gitblit.models.RefModel;
|
|---|
| | | import com.gitblit.models.RepositoryModel;
|
|---|
| | | import com.gitblit.models.TeamModel;
|
|---|
| | | import com.gitblit.models.UserModel;
|
|---|
| | | import com.gitblit.utils.ArrayUtils;
|
|---|
| | | import com.gitblit.utils.FederationUtils;
|
|---|
| | | import com.gitblit.utils.FileUtils;
|
|---|
| | | import com.gitblit.utils.JGitUtils;
|
|---|
| | |
|---|
| | | config.load();
|
|---|
| | | String origin = config.getString("remote", "origin", "url");
|
|---|
| | | RevCommit commit = JGitUtils.getCommit(existingRepository,
|
|---|
| | | "refs/remotes/origin/master");
|
|---|
| | | org.eclipse.jgit.lib.Constants.FETCH_HEAD);
|
|---|
| | | if (commit != null) {
|
|---|
| | | fetchHead = commit.getName();
|
|---|
| | | }
|
|---|
| | |
|---|
| | | } else {
|
|---|
| | | // fetch and update
|
|---|
| | | boolean fetched = false;
|
|---|
| | | RevCommit commit = JGitUtils.getCommit(r, "refs/remotes/origin/master");
|
|---|
| | | String origin = commit.getName();
|
|---|
| | | fetched = fetchHead == null || !fetchHead.equals(origin);
|
|---|
| | | RevCommit commit = JGitUtils.getCommit(r, org.eclipse.jgit.lib.Constants.FETCH_HEAD);
|
|---|
| | | String newFetchHead = commit.getName();
|
|---|
| | | fetched = fetchHead == null || !fetchHead.equals(newFetchHead);
|
|---|
| | |
|
|---|
| | | if (registration.mirror) {
|
|---|
| | | // mirror
|
|---|
| | | if (fetched) {
|
|---|
| | | // reset the local HEAD to origin/master
|
|---|
| | | Ref ref = JGitUtils.resetHEAD(r, "origin/master");
|
|---|
| | | // update local branches to match the remote tracking branches
|
|---|
| | | for (RefModel ref : JGitUtils.getRemoteBranches(r, false, -1)) {
|
|---|
| | | if (ref.displayName.startsWith("origin/")) {
|
|---|
| | | String branch = org.eclipse.jgit.lib.Constants.R_HEADS
|
|---|
| | | + ref.displayName.substring(ref.displayName.indexOf('/') + 1);
|
|---|
| | | String hash = ref.getReferencedObjectId().getName();
|
|---|
| | | |
|---|
| | | JGitUtils.setBranchRef(r, branch, hash);
|
|---|
| | | logger.info(MessageFormat.format(" resetting {0} of {1} to {2}", branch,
|
|---|
| | | repository.name, hash));
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | |
|---|
| | | String newHead;
|
|---|
| | | if (StringUtils.isEmpty(repository.HEAD)) {
|
|---|
| | | newHead = newFetchHead;
|
|---|
| | | } else {
|
|---|
| | | newHead = repository.HEAD;
|
|---|
| | | }
|
|---|
| | | JGitUtils.setHEADtoRef(r, newHead);
|
|---|
| | | logger.info(MessageFormat.format(" resetting HEAD of {0} to {1}",
|
|---|
| | | repository.name, ref.getObjectId().getName()));
|
|---|
| | | repository.name, newHead));
|
|---|
| | | registration.updateStatus(repository, FederationPullStatus.MIRRORED);
|
|---|
| | | } else {
|
|---|
| | | // indicate no commits pulled
|
|---|
| | |
|---|
| | | federationSets.addAll(repository.federationSets);
|
|---|
| | | }
|
|---|
| | | repository.federationSets = new ArrayList<String>(federationSets);
|
|---|
| | | |
|---|
| | | // merge indexed branches
|
|---|
| | | Set<String> indexedBranches = new HashSet<String>();
|
|---|
| | | if (rm.indexedBranches != null) {
|
|---|
| | | indexedBranches.addAll(rm.indexedBranches);
|
|---|
| | | }
|
|---|
| | | if (repository.indexedBranches != null) {
|
|---|
| | | indexedBranches.addAll(repository.indexedBranches);
|
|---|
| | | }
|
|---|
| | | repository.indexedBranches = new ArrayList<String>(indexedBranches);
|
|---|
| | |
|
|---|
| | | }
|
|---|
| | | // only repositories that are actually _cloned_ from the origin
|
|---|
| | | // Gitblit repository are marked as federated. If the origin
|
|---|
| | |
|---|
| | | // reparent all repository permissions if the local
|
|---|
| | | // repositories are stored within subfolders
|
|---|
| | | if (!StringUtils.isEmpty(registrationFolder)) {
|
|---|
| | | List<String> permissions = new ArrayList<String>(user.repositories);
|
|---|
| | | user.repositories.clear();
|
|---|
| | | for (String permission : permissions) {
|
|---|
| | | user.addRepository(registrationFolder + "/" + permission);
|
|---|
| | | if (user.permissions != null && user.permissions.size() > 0) {
|
|---|
| | | // pulling from >= 1.2 version
|
|---|
| | | Map<String, AccessPermission> copy = new HashMap<String, AccessPermission>(user.permissions);
|
|---|
| | | user.permissions.clear();
|
|---|
| | | for (Map.Entry<String, AccessPermission> entry : copy.entrySet()) {
|
|---|
| | | user.setRepositoryPermission(registrationFolder + "/" + entry.getKey(), entry.getValue());
|
|---|
| | | }
|
|---|
| | | } else {
|
|---|
| | | // pulling from <= 1.1 version
|
|---|
| | | List<String> permissions = new ArrayList<String>(user.repositories);
|
|---|
| | | user.repositories.clear();
|
|---|
| | | for (String permission : permissions) {
|
|---|
| | | user.addRepositoryPermission(registrationFolder + "/" + permission);
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | |
|---|
| | | GitBlit.self().updateUserModel(user.username, user, true);
|
|---|
| | | } else {
|
|---|
| | | // update repository permissions of local user
|
|---|
| | | for (String repository : user.repositories) {
|
|---|
| | | localUser.addRepository(repository);
|
|---|
| | | if (user.permissions != null && user.permissions.size() > 0) {
|
|---|
| | | // pulling from >= 1.2 version
|
|---|
| | | Map<String, AccessPermission> copy = new HashMap<String, AccessPermission>(user.permissions);
|
|---|
| | | for (Map.Entry<String, AccessPermission> entry : copy.entrySet()) {
|
|---|
| | | localUser.setRepositoryPermission(entry.getKey(), entry.getValue());
|
|---|
| | | }
|
|---|
| | | } else {
|
|---|
| | | // pulling from <= 1.1 version
|
|---|
| | | for (String repository : user.repositories) {
|
|---|
| | | localUser.addRepositoryPermission(repository);
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | localUser.password = user.password;
|
|---|
| | | localUser.canAdmin = user.canAdmin;
|
|---|
| | |
|---|
| | |
|
|---|
| | | // update team repositories
|
|---|
| | | TeamModel remoteTeam = user.getTeam(teamname);
|
|---|
| | | if (remoteTeam != null && remoteTeam.repositories != null) {
|
|---|
| | | int before = team.repositories.size();
|
|---|
| | | team.addRepositories(remoteTeam.repositories);
|
|---|
| | | int after = team.repositories.size();
|
|---|
| | | if (after > before) {
|
|---|
| | | // repository count changed, update
|
|---|
| | | if (remoteTeam != null) {
|
|---|
| | | if (remoteTeam.permissions != null) {
|
|---|
| | | // pulling from >= 1.2
|
|---|
| | | for (Map.Entry<String, AccessPermission> entry : remoteTeam.permissions.entrySet()){
|
|---|
| | | team.setRepositoryPermission(entry.getKey(), entry.getValue());
|
|---|
| | | }
|
|---|
| | | GitBlit.self().updateTeamModel(teamname, team, false);
|
|---|
| | | } else if(!ArrayUtils.isEmpty(remoteTeam.repositories)) {
|
|---|
| | | // pulling from <= 1.1
|
|---|
| | | team.addRepositoryPermissions(remoteTeam.repositories);
|
|---|
| | | GitBlit.self().updateTeamModel(teamname, team, false);
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | |
|---|
| | | "Failed to retrieve SETTINGS from federated gitblit ({0} @ {1})",
|
|---|
| | | registration.name, registration.url), e);
|
|---|
| | | }
|
|---|
| | | |
|---|
| | |
|
|---|
| | | try {
|
|---|
| | | // Pull SCRIPTS
|
|---|
| | | Map<String, String> scripts = FederationUtils.getScripts(registration);
|
|---|
| | |
|---|
| | | for (Map.Entry<String, String> script : scripts.entrySet()) {
|
|---|
| | | String scriptName = script.getKey();
|
|---|
| | | if (scriptName.endsWith(".groovy")) {
|
|---|
| | | scriptName = scriptName.substring(0, scriptName.indexOf(".groovy"));
|
|---|
| | | scriptName = scriptName.substring(0, scriptName.indexOf(".groovy"));
|
|---|
| | | }
|
|---|
| | | File file = new File(registrationFolderFile, registration.name + "_" + scriptName + ".groovy");
|
|---|
| | | File file = new File(registrationFolderFile, registration.name + "_"
|
|---|
| | | + scriptName + ".groovy");
|
|---|
| | | FileUtils.writeContent(file, script.getValue());
|
|---|
| | | }
|
|---|
| | | }
|
|---|
