Merge pull request #26 from DARIAH-DE/custom_login_link

Add possibility for custom login link
jenkinsci · Jun 29, 2016 · 24f1413 · 24f1413
2 parents a728d20 + c73508b
commit 24f1413
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/reverse_proxy_auth/ReverseProxySecurityRealm.java b/src/main/java/org/jenkinsci/plugins/reverse_proxy_auth/ReverseProxySecurityRealm.java
@@ -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) {
 
@@ -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 {

diff --git a/...resources/org/jenkinsci/plugins/reverse_proxy_auth/ReverseProxySecurityRealm/config.jelly b/...resources/org/jenkinsci/plugins/reverse_proxy_auth/ReverseProxySecurityRealm/config.jelly
@@ -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}" />
+ </f:entry>
  <f:entry title="${%Custom Log Out URL}" >
  <f:textbox name="customLogOutUrl" value="${instance.customLogOutUrl}" />
  </f:entry>

diff --git a/...ources/org/jenkinsci/plugins/reverse_proxy_auth/ReverseProxySecurityRealm/loginLink.jelly b/...ources/org/jenkinsci/plugins/reverse_proxy_auth/ReverseProxySecurityRealm/loginLink.jelly
@@ -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>