Skip to content

Invalidate connection and retry on 401 #1532

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

Draft
gbhat618 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Invalidate connection and retry on 401 #1532

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/Connector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,15 @@
}
}

static void invalidate(@NonNull GitHub hub) {
ConnectionId connectionId = reverseLookup.get(hub);
if (connectionId == null) {
return;
}
connections.remove(connectionId);
reverseLookup.remove(hub);
}

Check warning on line 525 in src/main/java/org/jenkinsci/plugins/github_branch_source/Connector.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines 

Lines 519-525 are not covered by tests

static List<DomainRequirement> githubDomainRequirements(String apiUri) {
return URIRequirementBuilder.fromUri(StringUtils.defaultIfEmpty(apiUri, GitHubServerConfig.GITHUB_URL))
.build();
Expand Down
16 changes: 15 additions & 1 deletion src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1421,7 +1421,21 @@
}

String fullName = repoOwner + "/" + repository;
ghRepository = github.getRepository(fullName);
try {
ghRepository = github.getRepository(fullName);
} catch (HttpException e) {
if (e.getResponseCode() != HttpServletResponse.SC_UNAUTHORIZED) {
throw e;
}
LOGGER.fine(() -> "token seems to be rotated, retrying with fresh credentials");
Connector.invalidate(github);
GitHub retryGitHub = Connector.connect(apiUri, getCredentials(retrieveContext, true));
try {
ghRepository = retryGitHub.getRepository(fullName);
} finally {
Connector.release(retryGitHub);
}
}

Check warning on line 1438 in src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines 

Lines 1426-1438 are not covered by tests
final GHRepository ghRepository = this.ghRepository;
listener.getLogger()
.format(
Expand Down
Loading