Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JENKINS-24271: Re-execute and Force permissions must be separated #55

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

JENKINS-24271: Re-execute and Force permissions must be separated #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0abb6fe
JENKINS-24271: Re-execute and Force permissions must be separated
Jan 6, 2015
bb86d2b
Reverted back changes from 8e0e17b1e21624cb3db68f23b868fb15d280aae3 s…
Feb 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/hudson/plugins/promoted_builds/PromotedBuildAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,13 @@ public boolean hasPromotion() {
return !statuses.isEmpty();
}

//JENKINS-24271 Re-execute and Force permissions must be separated
public boolean canPromote() {
return this.getProject().hasPermission(Promotion.PROMOTE);
}

public boolean canReExecute() {return this.getProject().hasPermission(Promotion.REEXECUTE); }

/**
* Gets list of {@link PromotionProcess}s that are not yet attained.
* @return can be empty but never null.
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/hudson/plugins/promoted_builds/Promotion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,14 @@ private boolean preBuild(BuildListener listener, List<BuildStep> steps) {
}

public static final PermissionGroup PERMISSIONS = new PermissionGroup(Promotion.class, Messages._Promotion_Permissions_Title());

// JENKINS-24271 Re-execute and Force permissions must be separated
// This permission allows users to execute force promotion.
public static final Permission PROMOTE = new Permission(PERMISSIONS, "Promote", Messages._Promotion_PromotePermission_Description(), Jenkins.ADMINISTER, PermissionScope.RUN);

// This permission allows users to re-execute promotion.
public static final Permission REEXECUTE = new Permission(PERMISSIONS, "ReExecute", Messages._Promotion_ReExecutePermission_Description(), Jenkins.ADMINISTER, PermissionScope.RUN);

@Override
public int compareTo(Promotion that) {
return that.getId().compareTo( this.getId() );
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/hudson/plugins/promoted_builds/Status.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,8 @@ public boolean isManuallyApproved(){
* Schedules a new build.
*/
public void doBuild(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
if(!getTarget().hasPermission(Promotion.PROMOTE))
// JENKINS-24271 Re-execute and Force permissions must be separated
if(!getTarget().hasPermission(Promotion.REEXECUTE))
return;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an issue in the original code, but I would expect a "permission denied" error here



Expand Down
1 change: 1 addition & 0 deletions src/main/resources/hudson/plugins/promoted_builds/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ KeepBuildForEverAction.console.promotionNotGoodEnough=Promotion build result [{0
KeepBuildForEverAction.console.keepingBuild=Marking build to keep forever.
Promotion.Permissions.Title=Promotion
Promotion.PromotePermission.Description=This permission allows user to use force promotion and re-execution of promotion
Promotion.ReExecutePermission.Description=This permission allows user to use re-execution of promotion

Promotion.RunnerImpl.Promoting = Promoting {0}
Promotion.RunnerImpl.SchedulingBuild = scheduling build for {0}
Expand Down
19 changes: 11 additions & 8 deletions src/main/resources/hudson/plugins/promoted_builds/PromotedBuildAction/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,17 @@
<h4>Status</h4>
<div>
<!-- JENKINS-20492: show re-execute event when manually approved -->
<j:choose>
<j:when test="${it.getPromotionProcess(p.name)!=null and it.canPromote()}">
<form style="float:right" method="post" action="${p.name}/build">
<f:submit value="${%Re-execute promotion}"/>
</form>
</j:when>
</j:choose>
<j:choose>
<j:if test="${!p.isManuallyApproved()}">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to use spaces separators if you change codelines. The original tabs separator seems to be incorrect

<j:choose>
<!-- JENKINS-24271 Re-execute and Force permissions must be separated -->
<j:when test="${it.getPromotionProcess(p.name)!=null and it.canReExecute()}">
<form style="float:right" method="post" action="${p.name}/build">
<f:submit value="${%Re-execute promotion}"/>
</form>
</j:when>
</j:choose>
</j:if>
<j:choose>
<j:when test="${p.isPromotionSuccessful()}">
<img src="${imagesURL}/16x16/blue.png" alt="Unstable" width="16" height="16" />
${%Successfully promoted} (<a href="${p.name}/lastSuccessful">${%log}</a>)
Expand Down
11 changes: 7 additions & 4 deletions ...ain/resources/hudson/plugins/promoted_builds/conditions/ManualCondition/Badge/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:local="local">
<l:pane title="${%Manually Approved}" width="100"><tr><td>
<f:form method="post" action="${h.encode(p.name)}/build" name="build">
<j:if test="${!p.last.parameterDefinitionsWithValue.isEmpty()}">
Expand All @@ -8,9 +8,12 @@
</j:forEach>
</f:section>
</j:if>
<f:block>
<f:submit value="${%Re-execute promotion}" />
</f:block>
<!--JENKINS-24271 Re-execute and Force permissions must be separated-->
<j:if test="${p.getParent().canReExecute()}">
<f:block>
<f:submit value="${%Re-execute promotion}" />
</f:block>
</j:if>
</f:form>
</td></tr></l:pane>
</j:jelly>