Merged #217 "Exclude SSLv3 from Gitblit GO https protocols"

James Moger

2014-11-04 4e84166db5c5538e3984d9d2d6bb1f9902e65ee0

 src/main/java/com/gitblit/wicket/pages/ComparePage.java

@@ -41,6 +41,7 @@
import com.gitblit.models.RefModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.SubmoduleModel;
import com.gitblit.servlet.RawServlet;
import com.gitblit.utils.DiffUtils;
import com.gitblit.utils.DiffUtils.DiffOutput;
import com.gitblit.utils.DiffUtils.DiffOutputType;
@@ -55,7 +56,7 @@

/**
 * The compare page allows you to compare two branches, tags, or hash ids.
 * 
 *
 * @author James Moger
 *
 */
@@ -71,7 +72,7 @@
      super(params);
      Repository r = getRepository();
      RepositoryModel repository = getRepositoryModel();
		

      if (StringUtils.isEmpty(objectId)) {
         // seleciton form
         add(new Label("comparison").setVisible(false));
@@ -79,30 +80,30 @@
         // active comparison
         Fragment comparison = new Fragment("comparison", "comparisonFragment", this);
         add(comparison);
			

         RevCommit fromCommit;
         RevCommit toCommit;
			

         String[] parts = objectId.split("\\.\\.");
         if (parts[0].startsWith("refs/") && parts[1].startsWith("refs/")) {
            // set the ref models
            fromRefId.setObject(parts[0]);
            toRefId.setObject(parts[1]);
				

            fromCommit = getCommit(r, fromRefId.getObject());
            toCommit = getCommit(r, toRefId.getObject());
         } else {
            // set the id models
            fromCommitId.setObject(parts[0]);
            toCommitId.setObject(parts[1]);
				

            fromCommit = getCommit(r, fromCommitId.getObject());
            toCommit = getCommit(r, toCommitId.getObject());
         }

         // prepare submodules
         getSubmodules(toCommit);
			

         final String startId = fromCommit.getId().getName();
         final String endId = toCommit.getId().getName();

@@ -135,6 +136,7 @@
            private static final long serialVersionUID = 1L;
            int counter;

            @Override
            public void populateItem(final Item<PathChangeModel> item) {
               final PathChangeModel entry = item.getModelObject();
               Label changeType = new Label("changeType", "");
@@ -170,6 +172,7 @@
                  item.add(new ExternalLink("patch", "").setEnabled(false));
                  item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils
                        .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule));
                  item.add(new ExternalLink("raw", "").setEnabled(false));
                  item.add(new ExternalLink("blame", "").setEnabled(false));
                  item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
                        .newPathParameter(repositoryName, endId, entry.path))
@@ -181,6 +184,9 @@
                        .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
                  item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
                        .newPathParameter(repositoryName, endId, entry.path))
                        .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
                  String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, endId, entry.path);
                  item.add(new ExternalLink("raw", rawUrl)
                        .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
                  item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
                        .newPathParameter(repositoryName, endId, entry.path))
@@ -209,14 +215,14 @@
         public void onSubmit() {
            String from = ComparePage.this.fromRefId.getObject();
            String to = ComparePage.this.toRefId.getObject();
				

            PageParameters params = WicketUtils.newRangeParameter(repositoryName, from, to);
            String relativeUrl = urlFor(ComparePage.class, params).toString();
            String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl);
            getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl));
         }
      };
		

      List<String> refs = new ArrayList<String>();
      for (RefModel ref : JGitUtils.getLocalBranches(r, true, -1)) {
         refs.add(ref.getName());
@@ -232,7 +238,7 @@
      refsForm.add(new DropDownChoice<String>("fromRef", fromRefId, refs).setEnabled(refs.size() > 0));
      refsForm.add(new DropDownChoice<String>("toRef", toRefId, refs).setEnabled(refs.size() > 0));
      add(refsForm);
		

      //
      // manual ids form
      //
@@ -244,23 +250,23 @@
         public void onSubmit() {
            String from = ComparePage.this.fromCommitId.getObject();
            String to = ComparePage.this.toCommitId.getObject();
				

            PageParameters params = WicketUtils.newRangeParameter(repositoryName, from, to);
            String relativeUrl = urlFor(ComparePage.class, params).toString();
            String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl);
            getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl));
         }
      };
		

      TextField<String> fromIdField = new TextField<String>("fromId", fromCommitId);
      WicketUtils.setInputPlaceholder(fromIdField, getString("gb.from") + "...");
      idsForm.add(fromIdField);
		

      TextField<String> toIdField = new TextField<String>("toId", toCommitId);
      WicketUtils.setInputPlaceholder(toIdField, getString("gb.to") + "...");
      idsForm.add(toIdField);
      add(idsForm);
		

      r.close();
   }

@@ -268,7 +274,7 @@
   protected String getPageName() {
      return getString("gb.compare");
   }
	

   @Override
   protected Class<? extends BasePage> getRepoNavPageClass() {
      return ComparePage.class;