Skip to content

Don't check trusted members on non-fork merge requests to reduce GitLab API calls #516

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 1 commit into
base: master
Choose a base branch
from
Open

Don't check trusted members on non-fork merge requests to reduce GitLab API calls #516

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 17 additions & 10 deletions src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,17 +676,24 @@
public SCMRevision getTrustedRevision(@NonNull SCMRevision revision, @NonNull TaskListener listener) {
if (revision instanceof MergeRequestSCMRevision) {
MergeRequestSCMHead head = (MergeRequestSCMHead) revision.getHead();
try (GitLabSCMSourceRequest request = new GitLabSCMSourceContext(null, SCMHeadObserver.none())
.withTraits(traits)
.newRequest(this, listener)) {
request.setMembers(getMembers());
boolean isTrusted = request.isTrusted(head);
LOGGER.log(Level.FINEST, String.format("Trusted Revision: %s -> %s", head.getOriginOwner(), isTrusted));
if (isTrusted) {
return revision;
if (SCMHeadOrigin.Default.class.isAssignableFrom(head.getOrigin().getClass())) {
return revision;
} else if (SCMHeadOrigin.Fork.class.isAssignableFrom(
head.getOrigin().getClass())) {
try (GitLabSCMSourceRequest request = new GitLabSCMSourceContext(null, SCMHeadObserver.none())
.withTraits(traits)
.newRequest(this, listener)) {
request.setMembers(getMembers());
boolean isTrusted = request.isTrusted(head);
LOGGER.log(
Level.FINEST,
String.format("Trusted Revision: %s -> %s", head.getOriginOwner(), isTrusted));

Check warning on line 690 in src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines 

Lines 679-690 are not covered by tests
if (isTrusted) {
return revision;
}
} catch (IOException | InterruptedException e) {
LOGGER.log(Level.SEVERE, "Exception caught: " + e, e);
}
} catch (IOException | InterruptedException e) {
LOGGER.log(Level.SEVERE, "Exception caught: " + e, e);
}
MergeRequestSCMRevision rev = (MergeRequestSCMRevision) revision;
listener.getLogger()
Expand Down
Loading