Skip to content

JENKINS-50122 Fix rights management for workflow jobs #114

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

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

JENKINS-50122 Fix rights management for workflow jobs #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07a1bf0
Fix rights management for workflow jobs
jpigree May 14, 2019
a0cce1b
BranchJobProperty is set only on workflowjobs created by multibranch
jpigree May 15, 2019
2fbc2f3
Do not use wildcard imports
jpigree Aug 21, 2019
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
8 changes: 2 additions & 6 deletions src/main/java/org/jenkinsci/plugins/GithubAuthorizationStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,8 @@ public ACL getACL(@Nonnull AbstractItem item) {

@Nonnull
public ACL getACL(@Nonnull Job<?,?> job) {
if(job instanceof WorkflowJob && job.getProperty(BranchJobProperty.class) != null || job instanceof AbstractProject) {
GithubRequireOrganizationMembershipACL githubACL = (GithubRequireOrganizationMembershipACL) getRootACL();
return githubACL.cloneForProject(job);
} else {
return getRootACL();
}
GithubRequireOrganizationMembershipACL githubACL = (GithubRequireOrganizationMembershipACL) getRootACL();
return githubACL.cloneForProject(job);
}

/**
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/org/jenkinsci/plugins/GithubRequireOrganizationMembershipACL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,15 @@ private String getRepositoryName() {
String repositoryName = null;
String repoUrl = null;
Describable scm = null;

if (this.item instanceof WorkflowJob) {
WorkflowJob project = (WorkflowJob) item;
scm = project.getProperty(BranchJobProperty.class).getBranch().getScm();
WorkflowJob job = (WorkflowJob) item;

if(job.getProperty(BranchJobProperty.class) != null) {
scm = job.getProperty(BranchJobProperty.class).getBranch().getScm();
} else if (! job.getSCMs().isEmpty()) {
scm = job.getSCMs().iterator().next();
}
} else if (this.item instanceof MultiBranchProject) {
MultiBranchProject project = (MultiBranchProject) item;
scm = (SCMSource) project.getSCMSources().get(0);
Expand Down
Loading