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

Add support for prompting user account at each login #538

Merged
merged 1 commit into from
Feb 9, 2024
Merged

Add support for prompting user account at each login #538

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
20 changes: 20 additions & 0 deletions src/main/java/com/microsoft/jenkins/azuread/AzureSecurityRealm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ public class AzureSecurityRealm extends SecurityRealm {
private static final int BAD_REQUEST = 400;
public static final String CONVERTER_DISABLE_GRAPH_INTEGRATION = "disableGraphIntegration";
public static final String CONVERTER_SINGLE_LOGOUT = "singleLogout";
public static final String CONVERTER_PROMPT_ACCOUNT = "promptAccount";
public static final String CONVERTER_ENVIRONMENT_NAME = "environmentName";

private Cache<String, AzureAdUser> caches;
Expand All @@ -132,6 +133,7 @@ public class AzureSecurityRealm extends SecurityRealm {
private Secret tenant;
private int cacheDuration;
private boolean fromRequest = false;
private boolean promptAccount;
private boolean singleLogout;
private boolean disableGraphIntegration;
private String azureEnvironmentName = "Azure";
Expand Down Expand Up @@ -162,6 +164,14 @@ ClientSecretCredential getClientSecretCredential() {
.build();
}

public boolean isPromptAccount() {
return promptAccount;
}

@DataBoundSetter
public void setPromptAccount(boolean promptAccount) {
this.promptAccount = promptAccount;
}

public boolean isSingleLogout() {
return singleLogout;
Expand Down Expand Up @@ -317,6 +327,9 @@ public HttpResponse doCommenceLogin(StaplerRequest request, @Header("Referer") f
Map<String, String> additionalParams = new HashMap<>();
additionalParams.put("nonce", nonce);
additionalParams.put("response_mode", "form_post");
if (promptAccount) {
additionalParams.put("prompt", "select_account");
}

return new HttpRedirect(service.getAuthorizationUrl(additionalParams));
}
Expand Down Expand Up @@ -631,6 +644,10 @@ public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingC
writer.setValue(String.valueOf(realm.isDisableGraphIntegration()));
writer.endNode();

writer.startNode(CONVERTER_PROMPT_ACCOUNT);
writer.setValue(String.valueOf(realm.isPromptAccount()));
writer.endNode();

writer.startNode(CONVERTER_SINGLE_LOGOUT);
writer.setValue(String.valueOf(realm.isSingleLogout()));
writer.endNode();
Expand Down Expand Up @@ -665,6 +682,9 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
case CONVERTER_DISABLE_GRAPH_INTEGRATION:
realm.setDisableGraphIntegration(Boolean.parseBoolean(value));
break;
case CONVERTER_PROMPT_ACCOUNT:
realm.setPromptAccount(Boolean.parseBoolean(value));
break;
case CONVERTER_SINGLE_LOGOUT:
realm.setSingleLogout(Boolean.parseBoolean(value));
break;
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/com/microsoft/jenkins/azuread/AzureSecurityRealm/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
<f:checkbox />
</f:entry>

<f:entry title="${%Prompt for user account on each login}" field="promptAccount">
<f:checkbox />
</f:entry>

<f:entry title="${%Enable Single Logout}" field="singleLogout">
<f:checkbox />
</f:entry>
Expand Down