Adjusted Metric chart widths. Diff hunk header css tweak.

James Moger

2011-09-29 fd6ac68c0b1136182b5d713ec88ea94e26c4a76d

 src/com/gitblit/FederationServlet.java

@@ -68,7 +68,7 @@
    * @param req

    *            the pull type request

    */

   public static String asPullLink(String sourceURL, String token, FederationRequest req) {

   public static String asFederationLink(String sourceURL, String token, FederationRequest req) {

      return asFederationLink(sourceURL, null, token, req, null);

   }



@@ -95,7 +95,7 @@
         req = FederationRequest.PULL_REPOSITORIES;

      }

      return remoteURL + Constants.FEDERATION_PATH + "?req=" + req.name().toLowerCase()

            + "&token=" + token

            + (token == null ? "" : ("&token=" + token))

            + (tokenType == null ? "" : ("&tokenType=" + tokenType.name().toLowerCase()))

            + (myURL == null ? "" : ("&url=" + StringUtils.encodeURL(myURL)));

   }

@@ -111,6 +111,16 @@
   private void processRequest(javax.servlet.http.HttpServletRequest request,

         javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException,

         java.io.IOException {

      FederationRequest reqType = FederationRequest.fromName(request.getParameter("req"));

      logger.info(MessageFormat.format("Federation {0} request from {1}", reqType,

            request.getRemoteAddr()));



      if (FederationRequest.POKE.equals(reqType)) {

         // Gitblit always responds to POKE requests to verify a connection

         logger.info("Received federation POKE from " + request.getRemoteAddr());

         return;

      }



      if (!GitBlit.getBoolean(Keys.git.enableGitServlet, true)) {

         logger.warn(Keys.git.enableGitServlet + " must be set TRUE for federation requests.");

         response.sendError(HttpServletResponse.SC_FORBIDDEN);

@@ -125,23 +135,8 @@
         return;

      }



      String token = request.getParameter("token");

      FederationRequest reqType = FederationRequest.fromName(request.getParameter("req"));

      logger.info(MessageFormat.format("Federation {0} request from {1}", reqType,

            request.getRemoteAddr()));



      if (FederationRequest.PROPOSAL.equals(reqType)) {

         // Receive a gitblit federation proposal

         String url = StringUtils.decodeFromHtml(request.getParameter("url"));

         FederationToken tokenType = FederationToken.fromName(request.getParameter("tokenType"));



         if (!GitBlit.getBoolean(Keys.federation.allowProposals, false)) {

            logger.error(MessageFormat.format("Rejected {0} federation proposal from {1}",

                  tokenType.name(), url));

            response.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED);

            return;

         }



         BufferedReader reader = request.getReader();

         StringBuilder json = new StringBuilder();

         String line = null;

@@ -150,28 +145,45 @@
         }

         reader.close();



         // check to see if we have repository data

         // check to see if we have proposal data

         if (json.length() == 0) {

            logger.error(MessageFormat.format(

                  "Failed to receive proposed repositories list from {0}", url));

            logger.error(MessageFormat.format("Failed to receive proposal data from {0}",

                  request.getRemoteAddr()));

            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);

            return;

         }



         // deserialize the repository data

         // deserialize the proposal

         Gson gson = new Gson();

         Map<String, RepositoryModel> repositories = gson.fromJson(json.toString(),

               FederationUtils.REPOSITORIES_TYPE);

         FederationProposal proposal = gson.fromJson(json.toString(), FederationProposal.class);



         // submit a proposal

         FederationProposal proposal = new FederationProposal(url, tokenType, token,

               repositories);

         String hosturl = HttpUtils.getHostURL(request);

         String gitblitUrl = hosturl + request.getContextPath();

         GitBlit.self().submitFederationProposal(proposal, gitblitUrl);

         // reject proposal, if not receipt prohibited

         if (!GitBlit.getBoolean(Keys.federation.allowProposals, false)) {

            logger.error(MessageFormat.format("Rejected {0} federation proposal from {1}",

                  proposal.tokenType.name(), proposal.url));

            response.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED);

            return;

         }



         // poke the origin Gitblit instance that is proposing federation

         boolean poked = false;

         try {

            poked = FederationUtils.poke(proposal.url);

         } catch (Exception e) {

            logger.error("Failed to poke origin", e);

         }

         if (!poked) {

            logger.error(MessageFormat.format("Failed to send federation poke to {0}",

                  proposal.url));

            response.setStatus(HttpServletResponse.SC_NOT_ACCEPTABLE);

            return;

         }



         String url = HttpUtils.getGitblitURL(request);

         GitBlit.self().submitFederationProposal(proposal, url);

         logger.info(MessageFormat.format(

               "Submitted {0} federation proposal to pull {1} repositories from {2}",

               tokenType.name(), repositories.size(), url));

               proposal.tokenType.name(), proposal.repositories.size(), proposal.url));

         response.setStatus(HttpServletResponse.SC_OK);

         return;

      }

@@ -215,6 +227,7 @@
      }



      // Determine the federation tokens for this gitblit instance

      String token = request.getParameter("token");

      List<String> tokens = GitBlit.self().getFederationTokens();

      if (!tokens.contains(token)) {

         logger.warn(MessageFormat.format(

@@ -225,37 +238,8 @@


      Object result = null;

      if (FederationRequest.PULL_REPOSITORIES.equals(reqType)) {

         // Determine the Gitblit clone url

         StringBuilder sb = new StringBuilder();

         sb.append(HttpUtils.getHostURL(request));

         sb.append(Constants.GIT_PATH);

         sb.append("{0}");

         String cloneUrl = sb.toString();



         // Retrieve all available repositories

         UserModel user = new UserModel(Constants.FEDERATION_USER);

         user.canAdmin = true;

         List<RepositoryModel> list = GitBlit.self().getRepositoryModels(user);



         // create the [cloneurl, repositoryModel] map

         Map<String, RepositoryModel> repositories = new HashMap<String, RepositoryModel>();

         for (RepositoryModel model : list) {

            // by default, setup the url for THIS repository

            String url = MessageFormat.format(cloneUrl, model.name);

            switch (model.federationStrategy) {

            case EXCLUDE:

               // skip this repository

               continue;

            case FEDERATE_ORIGIN:

               // federate the origin, if it is defined

               if (!StringUtils.isEmpty(model.origin)) {

                  url = model.origin;

               }

               break;

            }

            repositories.put(url, model);

         }

         result = repositories;

         String gitblitUrl = HttpUtils.getGitblitURL(request);

         result = GitBlit.self().getRepositories(gitblitUrl, token);

      } else {

         if (FederationRequest.PULL_SETTINGS.equals(reqType)) {

            // pull settings