Forgot to commit UserModel with cookie field

James Moger

2012-07-11 a31cf95ac0787eb559cb78f48c52bc6b79e970d8

 src/com/gitblit/FederationPullExecutor.java

@@ -19,6 +19,7 @@


import java.io.File;

import java.io.FileOutputStream;

import java.io.IOException;

import java.net.InetAddress;

import java.text.MessageFormat;

import java.util.ArrayList;

@@ -32,7 +33,6 @@
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;

@@ -43,10 +43,15 @@


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;

import com.gitblit.utils.JGitUtils.CloneResult;

import com.gitblit.utils.StringUtils;

@@ -81,8 +86,8 @@
    * 

    * @param registrations

    * @param isDaemon

    *            if true, registrations are rescheduled in perpetuity. if false,

    *            the federation pull operation is executed once.

    *            if true, registrations are rescheduled in perpetuity. if

    *            false, the federation pull operation is executed once.

    */

   public FederationPullExecutor(List<FederationModel> registrations, boolean isDaemon) {

      this.registrations = registrations;

@@ -110,7 +115,7 @@
                  String message = "Federation pull of " + registration.name + " @ "

                        + registration.url + " is now at " + is.name();

                  GitBlit.self()

                        .notifyAdministrators(

                        .sendMailToAdministrators(

                              "Pull Status of " + registration.name + " is " + is.name(),

                              message);

               }

@@ -169,7 +174,7 @@
         } else {

            repositoryName = registrationFolder + "/" + repository.name;

         }

			


         if (registration.bare) {

            // bare repository, ensure .git suffix

            if (!repositoryName.toLowerCase().endsWith(DOT_GIT_EXT)) {

@@ -178,7 +183,8 @@
         } else {

            // normal repository, strip .git suffix

            if (repositoryName.toLowerCase().endsWith(DOT_GIT_EXT)) {

               repositoryName = repositoryName.substring(0, repositoryName.indexOf(DOT_GIT_EXT));

               repositoryName = repositoryName.substring(0,

                     repositoryName.indexOf(DOT_GIT_EXT));

            }

         }



@@ -190,7 +196,8 @@
            StoredConfig config = existingRepository.getConfig();

            config.load();

            String origin = config.getString("remote", "origin", "url");

            RevCommit commit = JGitUtils.getCommit(existingRepository, "refs/remotes/origin/master");

            RevCommit commit = JGitUtils.getCommit(existingRepository,

                  org.eclipse.jgit.lib.Constants.FETCH_HEAD);

            if (commit != null) {

               fetchHead = commit.getName();

            }

@@ -209,7 +216,7 @@
               Constants.FEDERATION_USER, registration.token);

         logger.info(MessageFormat.format("Pulling federated repository {0} from {1} @ {2}",

               repository.name, registration.name, registration.url));

						


         CloneResult result = JGitUtils.cloneRepository(registrationFolderFile, repository.name,

               cloneUrl, registration.bare, credentials);

         Repository r = GitBlit.self().getRepository(repositoryName);

@@ -225,17 +232,35 @@
         } 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

@@ -255,7 +280,7 @@
            // preserve local settings

            repository.isFrozen = rm.isFrozen;

            repository.federationStrategy = rm.federationStrategy;

				


            // merge federation sets

            Set<String> federationSets = new HashSet<String>();

            if (rm.federationSets != null) {

@@ -265,6 +290,17 @@
               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

@@ -276,14 +312,18 @@
         r.close();

      }



      IUserService userService = null;



      try {

         // Pull USERS

         // TeamModels are automatically pulled because they are contained

         // within the UserModel. The UserService creates unknown teams

         // and updates existing teams.

         Collection<UserModel> users = FederationUtils.getUsers(registration);

         if (users != null && users.size() > 0) {

            File realmFile = new File(registrationFolderFile, registration.name

                  + "_users.properties");

            File realmFile = new File(registrationFolderFile, registration.name + "_users.conf");

            realmFile.delete();

            FileUserService userService = new FileUserService(realmFile);

            userService = new ConfigUserService(realmFile);

            for (UserModel user : users) {

               userService.updateUserModel(user.username, user);



@@ -314,16 +354,61 @@
                     localUser.canAdmin = user.canAdmin;

                     GitBlit.self().updateUserModel(localUser.username, localUser, false);

                  }



                  for (String teamname : GitBlit.self().getAllTeamnames()) {

                     TeamModel team = GitBlit.self().getTeamModel(teamname);

                     if (user.isTeamMember(teamname) && !team.hasUser(user.username)) {

                        // new team member

                        team.addUser(user.username);

                        GitBlit.self().updateTeamModel(teamname, team, false);

                     } else if (!user.isTeamMember(teamname) && team.hasUser(user.username)) {

                        // remove team member

                        team.removeUser(user.username);

                        GitBlit.self().updateTeamModel(teamname, team, false);

                     }



                     // update team repositories

                     TeamModel remoteTeam = user.getTeam(teamname);

                     if (remoteTeam != null && !ArrayUtils.isEmpty(remoteTeam.repositories)) {

                        int before = team.repositories.size();

                        team.addRepositories(remoteTeam.repositories);

                        int after = team.repositories.size();

                        if (after > before) {

                           // repository count changed, update

                           GitBlit.self().updateTeamModel(teamname, team, false);

                        }

                     }

                  }

               }

            }

         }

      } catch (Exception e) {

         // a 403 error code is normal for a PULL_REPOSITORIES token

         if (!e.getMessage().contains("403")) {

            logger.warn(MessageFormat.format(

                  "Failed to retrieve USERS from federated gitblit ({0} @ {1})",

                  registration.name, registration.url), e);

      } catch (ForbiddenException e) {

         // ignore forbidden exceptions

      } catch (IOException e) {

         logger.warn(MessageFormat.format(

               "Failed to retrieve USERS from federated gitblit ({0} @ {1})",

               registration.name, registration.url), e);

      }



      try {

         // Pull TEAMS

         // We explicitly pull these even though they are embedded in

         // UserModels because it is possible to use teams to specify

         // mailing lists or push scripts without specifying users.

         if (userService != null) {

            Collection<TeamModel> teams = FederationUtils.getTeams(registration);

            if (teams != null && teams.size() > 0) {

               for (TeamModel team : teams) {

                  userService.updateTeamModel(team);

               }

            }

         }

      } catch (ForbiddenException e) {

         // ignore forbidden exceptions

      } catch (IOException e) {

         logger.warn(MessageFormat.format(

               "Failed to retrieve TEAMS from federated gitblit ({0} @ {1})",

               registration.name, registration.url), e);

      }



      try {

@@ -337,13 +422,34 @@
            properties.store(os, null);

            os.close();

         }

      } catch (Exception e) {

         // a 403 error code is normal for a PULL_REPOSITORIES token

         if (!e.getMessage().contains("403")) {

            logger.warn(MessageFormat.format(

                  "Failed to retrieve SETTINGS from federated gitblit ({0} @ {1})",

                  registration.name, registration.url), e);

      } catch (ForbiddenException e) {

         // ignore forbidden exceptions

      } catch (IOException e) {

         logger.warn(MessageFormat.format(

               "Failed to retrieve SETTINGS from federated gitblit ({0} @ {1})",

               registration.name, registration.url), e);

      }



      try {

         // Pull SCRIPTS

         Map<String, String> scripts = FederationUtils.getScripts(registration);

         if (scripts != null && scripts.size() > 0) {

            for (Map.Entry<String, String> script : scripts.entrySet()) {

               String scriptName = script.getKey();

               if (scriptName.endsWith(".groovy")) {

                  scriptName = scriptName.substring(0, scriptName.indexOf(".groovy"));

               }

               File file = new File(registrationFolderFile, registration.name + "_"

                     + scriptName + ".groovy");

               FileUtils.writeContent(file, script.getValue());

            }

         }

      } catch (ForbiddenException e) {

         // ignore forbidden exceptions

      } catch (IOException e) {

         logger.warn(MessageFormat.format(

               "Failed to retrieve SCRIPTS from federated gitblit ({0} @ {1})",

               registration.name, registration.url), e);

      }

   }