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

James Moger

2014-11-04 4e84166db5c5538e3984d9d2d6bb1f9902e65ee0

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

@@ -37,7 +37,6 @@
import org.apache.wicket.PageParameters;

import org.apache.wicket.RestartResponseException;

import org.apache.wicket.ajax.AjaxRequestTarget;

import org.apache.wicket.behavior.IBehavior;

import org.apache.wicket.behavior.SimpleAttributeModifier;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.image.ContextImage;

@@ -57,6 +56,7 @@


import com.gitblit.Constants;

import com.gitblit.Constants.AccessPermission;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Keys;

import com.gitblit.git.PatchsetCommand;

import com.gitblit.git.PatchsetReceivePack;

@@ -86,6 +86,7 @@
import com.gitblit.utils.StringUtils;

import com.gitblit.utils.TimeUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.TicketsUI;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.BasePanel.JavascriptTextPrompt;

import com.gitblit.wicket.panels.CommentPanel;

@@ -102,7 +103,7 @@
 * @author James Moger

 *

 */

public class TicketPage extends TicketBasePage {

public class TicketPage extends RepositoryPage {



   static final String NIL = "<nil>";



@@ -154,7 +155,7 @@
      String href = urlFor(TicketsPage.class, params).toString();

      add(new ExternalLink("ticketNumber", href, "#" + ticket.number));

      Label headerStatus = new Label("headerStatus", ticket.status.toString());

      WicketUtils.setCssClass(headerStatus, getLozengeClass(ticket.status, false));

      WicketUtils.setCssClass(headerStatus, TicketsUI.getLozengeClass(ticket.status, false));

      add(headerStatus);

      add(new Label("ticketTitle", ticket.title));

      if (currentPatchset == null) {

@@ -247,17 +248,24 @@
         add(new Label("milestone"));

      } else {

         // link to milestone query

         TicketMilestone milestone = app().tickets().getMilestone(repository, ticket.milestone);

         PageParameters milestoneParameters = new PageParameters();

         milestoneParameters.put("r", repositoryName);

         TicketMilestone tm = app().tickets().getMilestone(repository, ticket.milestone);

         if (tm == null) {

            tm = new TicketMilestone(ticket.milestone);

         }

         PageParameters milestoneParameters;

         if (tm.isOpen()) {

            milestoneParameters = WicketUtils.newOpenTicketsParameter(repositoryName);

         } else {

            milestoneParameters = WicketUtils.newRepositoryParameter(repositoryName);

         }

         milestoneParameters.put(Lucene.milestone.name(), ticket.milestone);

         int progress = 0;

         int open = 0;

         int closed = 0;

         if (milestone != null) {

            progress = milestone.getProgress();

            open = milestone.getOpenTickets();

            closed = milestone.getClosedTickets();

         if (tm != null) {

            progress = tm.getProgress();

            open = tm.getOpenTickets();

            closed = tm.getClosedTickets();

         }



         Fragment milestoneProgress = new Fragment("milestone", "milestoneProgressFragment", this);

@@ -277,7 +285,10 @@
      if (StringUtils.isEmpty(ticket.body)) {

         desc = getString("gb.noDescriptionGiven");

      } else {

         desc = MarkdownUtils.transformGFM(app().settings(), ticket.body, ticket.repository);

         String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.body);

         String html = MarkdownUtils.transformGFM(app().settings(), bugtraq, ticket.repository);

         String safeHtml = app().xssFilter().relaxed(html);

         desc = safeHtml;

      }

      add(new Label("ticketDescription", desc).setEscapeModelStrings(false));



@@ -317,10 +328,10 @@
       * LARGE STATUS INDICATOR WITH ICON (DISCUSSION TAB->SIDE BAR)

       */

      Fragment ticketStatus = new Fragment("ticketStatus", "ticketStatusFragment", this);

      Label ticketIcon = getStateIcon("ticketIcon", ticket);

      Label ticketIcon = TicketsUI.getStateIcon("ticketIcon", ticket);

      ticketStatus.add(ticketIcon);

      ticketStatus.add(new Label("ticketStatus", ticket.status.toString()));

      WicketUtils.setCssClass(ticketStatus, getLozengeClass(ticket.status, false));

      WicketUtils.setCssClass(ticketStatus, TicketsUI.getLozengeClass(ticket.status, false));

      add(ticketStatus);





@@ -370,7 +381,7 @@
                        setResponsePage(TicketsPage.class, getPageParameters());

                     }

                  };

                  String css = getStatusClass(item.getModel().getObject());

                  String css = TicketsUI.getStatusClass(item.getModel().getObject());

                  WicketUtils.setCssClass(link, css);

                  item.add(link);

               }

@@ -381,9 +392,16 @@
             * RESPONSIBLE LIST

             */

            Set<String> userlist = new TreeSet<String>(ticket.getParticipants());

            for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {

               if (rp.permission.atLeast(AccessPermission.PUSH) && !rp.isTeam()) {

                  userlist.add(rp.registrant);

            if (UserModel.ANONYMOUS.canPush(getRepositoryModel())

                  || AuthorizationControl.AUTHENTICATED == getRepositoryModel().authorizationControl) {

               //    authorization is ANONYMOUS or AUTHENTICATED (i.e. all users can be set responsible)

               userlist.addAll(app().users().getAllUsernames());

            } else {

               // authorization is by NAMED users (users with PUSH permission can be set responsible)

               for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {

                  if (rp.permission.atLeast(AccessPermission.PUSH)) {

                     userlist.add(rp.registrant);

                  }

               }

            }

            List<TicketResponsible> responsibles = new ArrayList<TicketResponsible>();

@@ -501,13 +519,20 @@
       * TICKET METADATA

       */

      add(new Label("ticketType", ticket.type.toString()));



      add(new Label("priority", ticket.priority.toString()));

      add(new Label("severity", ticket.severity.toString()));



      if (StringUtils.isEmpty(ticket.topic)) {

         add(new Label("ticketTopic").setVisible(false));

      } else {

         // process the topic using the bugtraq config to link things

         String topic = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.topic);

         add(new Label("ticketTopic", topic).setEscapeModelStrings(false));

         String topic = bugtraqProcessor().processText(getRepository(), repositoryName, ticket.topic);

         String safeTopic = app().xssFilter().relaxed(topic);

         add(new Label("ticketTopic", safeTopic).setEscapeModelStrings(false));

      }









      /*

@@ -665,17 +690,8 @@
                   */

                  Fragment frag = new Fragment("entry", "statusFragment", this);

                  Label status = new Label("statusChange", entry.getStatus().toString());

                  String css = getLozengeClass(entry.getStatus(), false);

                  String css = TicketsUI.getLozengeClass(entry.getStatus(), false);

                  WicketUtils.setCssClass(status, css);

                  for (IBehavior b : status.getBehaviors()) {

                     if (b instanceof SimpleAttributeModifier) {

                        SimpleAttributeModifier sam = (SimpleAttributeModifier) b;

                        if ("class".equals(sam.getAttribute())) {

                           status.add(new SimpleAttributeModifier("class", "status-change " + sam.getValue()));

                           break;

                        }

                     }

                  }

                  frag.add(status);

                  addUserAttributions(frag, entry, avatarWidth);

                  addDateAttributions(frag, entry);

@@ -684,7 +700,9 @@
                  /*

                   * COMMENT

                   */

                  String comment = MarkdownUtils.transformGFM(app().settings(), entry.comment.text, repositoryName);

                  String bugtraq = bugtraqProcessor().processText(getRepository(), repositoryName, entry.comment.text);

                  String comment = MarkdownUtils.transformGFM(app().settings(), bugtraq, repositoryName);

                  String safeComment = app().xssFilter().relaxed(comment);

                  Fragment frag = new Fragment("entry", "commentFragment", this);

                  Label commentIcon = new Label("commentIcon");

                  if (entry.comment.src == CommentSource.Email) {

@@ -693,7 +711,7 @@
                     WicketUtils.setCssClass(commentIcon, "iconic-comment-alt2-stroke");

                  }

                  frag.add(commentIcon);

                  frag.add(new Label("comment", comment).setEscapeModelStrings(false));

                  frag.add(new Label("comment", safeComment).setEscapeModelStrings(false));

                  addUserAttributions(frag, entry, avatarWidth);

                  addDateAttributions(frag, entry);

                  item.add(frag);

@@ -936,7 +954,7 @@
                     case status:

                        // special handling for status

                        Status status = event.getStatus();

                        String css = getLozengeClass(status, true);

                        String css = TicketsUI.getLozengeClass(status, true);

                        value = String.format("<span class=\"%1$s\">%2$s</span>", css, status.toString());

                        break;

                     default:

@@ -954,7 +972,8 @@
                  sb.append("</td></tr>");

               }

               sb.append("</tbody></table>");

               item.add(new Label("fields", sb.toString()).setEscapeModelStrings(false));

               String safeHtml = app().xssFilter().relaxed(sb.toString());

               item.add(new Label("fields", safeHtml).setEscapeModelStrings(false));

            } else {

               item.add(new Label("fields").setVisible(false));

            }

@@ -1412,6 +1431,12 @@
            Fragment mergePanel = new Fragment("mergePanel", "alreadyMergedFragment", this);

            mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetAlreadyMerged"), ticket.mergeTo)));

            return mergePanel;

         } else if (MergeStatus.MISSING_INTEGRATION_BRANCH == mergeStatus) {

            // target/integration branch is missing

            Fragment mergePanel = new Fragment("mergePanel", "notMergeableFragment", this);

            mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetNotMergeable"), ticket.mergeTo)));

            mergePanel.add(new Label("mergeMore", MessageFormat.format(getString("gb.missingIntegrationBranchMore"), ticket.mergeTo)));

            return mergePanel;

         } else {

            // patchset can not be cleanly merged

            Fragment mergePanel = new Fragment("mergePanel", "notMergeableFragment", this);

@@ -1490,7 +1515,7 @@
    */

   protected RepositoryUrl getRepositoryUrl(UserModel user, RepositoryModel repository) {

      HttpServletRequest req = ((WebRequest) getRequest()).getHttpServletRequest();

      List<RepositoryUrl> urls = app().gitblit().getRepositoryUrls(req, user, repository);

      List<RepositoryUrl> urls = app().services().getRepositoryUrls(req, user, repository);

      if (ArrayUtils.isEmpty(urls)) {

         return null;

      }

@@ -1525,14 +1550,14 @@
      switch (type) {

         case Rebase:

         case Rebase_Squash:

            typeCss = getLozengeClass(Status.Declined, false);

            typeCss = TicketsUI.getLozengeClass(Status.Declined, false);

            break;

         case Squash:

         case Amend:

            typeCss = getLozengeClass(Status.On_Hold, false);

            typeCss = TicketsUI.getLozengeClass(Status.On_Hold, false);

            break;

         case Proposal:

            typeCss = getLozengeClass(Status.New, false);

            typeCss = TicketsUI.getLozengeClass(Status.New, false);

            break;

         case FastForward:

         default: