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

Add possibility for custom login link #26

Merged
merged 1 commit into from
Jun 29, 2016
Merged

Add possibility for custom login link #26

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: 8 additions & 1 deletion src/main/java/org/jenkinsci/plugins/reverse_proxy_auth/ReverseProxySecurityRealm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,11 @@ public class ReverseProxySecurityRealm extends SecurityRealm {
/**
* Custom post logout url
*/
public final String customLogInUrl;
public final String customLogOutUrl;

@DataBoundConstructor
public ReverseProxySecurityRealm(String forwardedUser, String headerGroups, String headerGroupsDelimiter, String customLogOutUrl, String server, String rootDN, boolean inhibitInferRootDN,
public ReverseProxySecurityRealm(String forwardedUser, String headerGroups, String headerGroupsDelimiter, String customLogInUrl, String customLogOutUrl, String server, String rootDN, boolean inhibitInferRootDN,
String userSearchBase, String userSearch, String groupSearchBase, String groupSearchFilter, String groupMembershipFilter, String groupNameAttribute, String managerDN, String managerPassword,
Integer updateInterval, boolean disableLdapEmailResolver, String displayNameLdapAttribute, String emailAddressLdapAttribute) {

Expand All @@ -285,6 +286,12 @@ public ReverseProxySecurityRealm(String forwardedUser, String headerGroups, Stri
this.headerGroupsDelimiter = "|";
}

if(!StringUtils.isBlank(customLogInUrl)) {
this.customLogInUrl = customLogInUrl;
} else {
this.customLogInUrl = null;
}

if(!StringUtils.isBlank(customLogOutUrl)) {
this.customLogOutUrl = customLogOutUrl;
} else {
Expand Down
3 changes: 3 additions & 0 deletions ...resources/org/jenkinsci/plugins/reverse_proxy_auth/ReverseProxySecurityRealm/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ THE SOFTWARE.
<f:textbox field="headerGroupsDelimiter" default="|" />
</f:entry>
<f:advanced>
<f:entry title="${%Custom Log In URL}" >
<f:textbox name="customLogInUrl" value="${instance.customLogInUrl}" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have an associated help file as this doesn't seem like a feature with obvious behavior.

</f:entry>
<f:entry title="${%Custom Log Out URL}" >
<f:textbox name="customLogOutUrl" value="${instance.customLogOutUrl}" />
</f:entry>
Expand Down
7 changes: 5 additions & 2 deletions ...ources/org/jenkinsci/plugins/reverse_proxy_auth/ReverseProxySecurityRealm/loginLink.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
<!-- no login link -->
<j:jelly xmlns:j="jelly:core" />
<j:jelly xmlns:j="jelly:core">
<j:if test="${it.customLogInUrl != null}">
<a href="${it.customLogInUrl}"><b>${%login}</b></a>
</j:if>
</j:jelly>