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

Jump to bottom

Store redirect URL in a session variable #58

Merged
merged 1 commit into from
Mar 25, 2022
Merged

Store redirect URL in a session variable #58

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
16 changes: 7 additions & 9 deletions src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,20 +274,20 @@ public HttpResponse doCommenceLogin(StaplerRequest request, @QueryParameter Stri
} else {
redirectOnFinish = Jenkins.get().getRootUrl();
}
request.getSession().setAttribute(REFERER_ATTRIBUTE, redirectOnFinish);

List<NameValuePair> parameters = new ArrayList<>();
parameters.add(new BasicNameValuePair("redirect_uri", buildRedirectUrl(request, redirectOnFinish)));
parameters.add(new BasicNameValuePair("redirect_uri", buildRedirectUrl(request)));
parameters.add(new BasicNameValuePair("response_type", "code"));
parameters.add(new BasicNameValuePair("client_id", clientID));
parameters.add(new BasicNameValuePair("scope", "api"));

return new HttpRedirect(gitlabWebUri + "/oauth/authorize?" + URLEncodedUtils.format(parameters, StandardCharsets.UTF_8));
}

private String buildRedirectUrl(StaplerRequest request, String referer) throws MalformedURLException {
private String buildRedirectUrl(StaplerRequest request) throws MalformedURLException {
URL currentUrl = new URL(Jenkins.get().getRootUrl());
List<NameValuePair> parameters = new ArrayList<>();
parameters.add(new BasicNameValuePair("state", referer));

URL redirect_uri = new URL(currentUrl.getProtocol(), currentUrl.getHost(), currentUrl.getPort(),
request.getContextPath() + "/securityRealm/finishLogin?" + URLEncodedUtils.format(parameters, StandardCharsets.UTF_8));
Expand All @@ -305,16 +305,14 @@ public HttpResponse doFinishLogin(StaplerRequest request) throws IOException {
Log.info("doFinishLogin: missing code or private_token.");
return HttpResponses.redirectToContextRoot();
}

String state = request.getParameter("state");

String referer = (String)request.getSession().getAttribute(REFERER_ATTRIBUTE);
HttpPost httpPost = new HttpPost(gitlabWebUri + "/oauth/token");
List<NameValuePair> parameters = new ArrayList<>();
parameters.add(new BasicNameValuePair("client_id", clientID));
parameters.add(new BasicNameValuePair("client_secret", clientSecret));
parameters.add(new BasicNameValuePair("code", code));
parameters.add(new BasicNameValuePair("grant_type", "authorization_code"));
parameters.add(new BasicNameValuePair("redirect_uri", buildRedirectUrl(request, state)));
parameters.add(new BasicNameValuePair("redirect_uri", buildRedirectUrl(request)));
httpPost.setEntity(new UrlEncodedFormEntity(parameters, StandardCharsets.UTF_8));

CloseableHttpClient httpclient = HttpClients.createDefault();
Expand Down Expand Up @@ -366,8 +364,8 @@ public HttpResponse doFinishLogin(StaplerRequest request) throws IOException {
Log.info("GitLab did not return an access token.");
}

if (StringUtils.isNotBlank(state)) {
return HttpResponses.redirectTo(state);
if (StringUtils.isNotBlank(referer)) {
return HttpResponses.redirectTo(referer);
}
return HttpResponses.redirectToContextRoot();
}
Expand Down