forked from DSpace/DSpace
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Comment out SAML auth and reinstate LDAP auth
- Loading branch information
Showing
11 changed files
with
430 additions
and
346 deletions.
There are no files selected for viewing
328 changes: 0 additions & 328 deletions
328
dspace-jspui/src/main/webapp/WEB-INF/spring/securityContext.xml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <%-- | ||
| The contents of this file are subject to the license and copyright | ||
| detailed in the LICENSE and NOTICE files at the root of the source | ||
| tree and available online at | ||
| http://www.dspace.org/license/ | ||
| --%> | ||
| <%-- | ||
| - Display message indicating password is incorrect, and allow a retry | ||
| --%> | ||
|
|
||
| <%@ page contentType="text/html;charset=UTF-8" %> | ||
|
|
||
| <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> | ||
| <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> | ||
|
|
||
| <%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %> | ||
|
|
||
| <dspace:layout navbar="off" | ||
| locbar="nolink" | ||
| titlekey="jsp.login.ldap-incorrect.title"> | ||
| <table border="0" width="90%"> | ||
| <tr> | ||
| <td align="left"> | ||
| <h1><fmt:message key="jsp.login.ldap-incorrect.heading"/></h1> | ||
| </td> | ||
| <td align="right" class="standard"> | ||
| <dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.index\") + \"#login\" %>"><fmt:message key="jsp.help"/></dspace:popup> | ||
| </td> | ||
| </tr> | ||
| </table> | ||
| <p align="center"><strong><fmt:message key="jsp.login.ldap-incorrect.errormsg"/></strong></p> | ||
| <dspace:include page="/components/ldap-form.jsp" /> | ||
| </dspace:layout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <%-- | ||
| The contents of this file are subject to the license and copyright | ||
| detailed in the LICENSE and NOTICE files at the root of the source | ||
| tree and available online at | ||
| http://www.dspace.org/license/ | ||
| --%> | ||
| <%-- | ||
| - Page that displays the netid/password login form | ||
| --%> | ||
|
|
||
| <%@ page contentType="text/html;charset=UTF-8" %> | ||
|
|
||
| <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> | ||
| <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> | ||
|
|
||
| <%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %> | ||
|
|
||
| <dspace:layout navbar="off" | ||
| locbar="off" | ||
| titlekey="jsp.login.ldap.title"> | ||
|
|
||
| <table border="0" width="90%"> | ||
| <tr> | ||
| <td align="left"> | ||
| <h1><fmt:message key="jsp.login.ldap.heading"/></h1> | ||
| </td> | ||
| <td align="right" class="standard"> | ||
| <dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.index\") + \"#login\"%>"><fmt:message key="jsp.help"/></dspace:popup> | ||
| </td> | ||
| </tr> | ||
| </table> | ||
| <dspace:include page="/components/ldap-form.jsp" /> | ||
| </dspace:layout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <%-- | ||
| The contents of this file are subject to the license and copyright | ||
| detailed in the LICENSE and NOTICE files at the root of the source | ||
| tree and available online at | ||
| http://www.dspace.org/license/ | ||
| --%> | ||
| <%-- | ||
| - Displays a message indicating the user has logged out | ||
| --%> | ||
|
|
||
| <%@ page contentType="text/html;charset=UTF-8" %> | ||
|
|
||
| <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" | ||
| prefix="fmt" %> | ||
|
|
||
| <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> | ||
|
|
||
| <dspace:layout locbar="nolink" titlekey="jsp.login.logged-out.title"> | ||
| <%-- <h1>Logged Out</h1> --%> | ||
| <h1><fmt:message key="jsp.login.logged-out.title"/></h1> | ||
|
|
||
| <%-- <p>Thank you for remembering to log out!</p> --%> | ||
| <p><fmt:message key="jsp.login.logged-out.thank"/></p> | ||
| <%-- <p><a href="<%= request.getContextPath() %>/">Go to DSpace Home</a></p> --%> | ||
| <p><a href="<%= request.getContextPath() %>/"><fmt:message key="jsp.general.gohome"/></a></p> | ||
|
|
||
| </dspace:layout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <%-- | ||
| The contents of this file are subject to the license and copyright | ||
| detailed in the LICENSE and NOTICE files at the root of the source | ||
| tree and available online at | ||
| http://www.dspace.org/license/ | ||
| --%> | ||
| <%-- | ||
| - Page that displays the email/password login form | ||
| --%> | ||
|
|
||
| <%@ page contentType="text/html;charset=UTF-8" %> | ||
|
|
||
| <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> | ||
|
|
||
| <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> | ||
|
|
||
| <%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %> | ||
|
|
||
| <dspace:layout navbar="default" locbar="off" titlekey="jsp.login.password.title" nocache="true"> | ||
| <div class="panel panel-primary"> | ||
| <div class="panel-heading"><fmt:message key="jsp.login.password.heading"/> | ||
| <span class="pull-right"><dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.index\") + \"#login\"%>"><fmt:message key="jsp.help"/></dspace:popup></span> | ||
| </div> | ||
| <dspace:include page="/components/login-form.jsp" /> | ||
| </div> | ||
| </dspace:layout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| <%-- | ||
| The contents of this file are subject to the license and copyright | ||
| detailed in the LICENSE and NOTICE files at the root of the source | ||
| tree and available online at | ||
| http://www.dspace.org/license/ | ||
| --%> | ||
| <%-- | ||
| - Profile editing page | ||
| - | ||
| - Attributes to pass in: | ||
| - | ||
| - eperson - the EPerson who's editing their profile | ||
| - missing.fields - if a Boolean true, the user hasn't entered enough | ||
| - information on the form during a previous attempt | ||
| - password.problem - if a Boolean true, there's a problem with password | ||
| --%> | ||
|
|
||
| <%@ page contentType="text/html;charset=UTF-8" %> | ||
|
|
||
| <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" | ||
| prefix="fmt" %> | ||
|
|
||
|
|
||
| <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> | ||
|
|
||
| <%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %> | ||
|
|
||
| <%@ page import="org.dspace.eperson.EPerson, org.dspace.core.ConfigurationManager" %> | ||
| <%@ page import="org.dspace.core.Utils" %> | ||
|
|
||
| <% | ||
| EPerson eperson = (EPerson) request.getAttribute("eperson"); | ||
| Boolean attr = (Boolean) request.getAttribute("missing.fields"); | ||
| boolean missingFields = (attr != null && attr.booleanValue()); | ||
| attr = (Boolean) request.getAttribute("password.problem"); | ||
| boolean passwordProblem = (attr != null && attr.booleanValue()); | ||
| boolean ldap_enabled = ConfigurationManager.getBooleanProperty("authentication-ldap", "enable"); | ||
| boolean ldap_eperson = (ldap_enabled && (eperson.getNetid() != null) && (eperson.getNetid().equals("") == false)); | ||
| %> | ||
|
|
||
| <dspace:layout style="submission" titlekey="jsp.register.edit-profile.title" nocache="true"> | ||
|
|
||
| <%-- <h1>Edit Your Profile</h1> --%> | ||
| <h1><fmt:message key="jsp.register.edit-profile.title"/> | ||
| <dspace:popup page='<%= LocaleSupport.getLocalizedMessage(pageContext, "help.index") + "#editprofile"%>'><fmt:message key="jsp.morehelp"/></dspace:popup> | ||
| </h1> | ||
|
|
||
| <% | ||
| if (missingFields) | ||
| { | ||
| %> | ||
| <%-- <p><strong>Please fill out all of the required fields.</strong></p> --%> | ||
| <p class="alert alert-info"><fmt:message key="jsp.register.edit-profile.info1"/></p> | ||
| <% | ||
| } | ||
| if (passwordProblem) | ||
| { | ||
| %> | ||
| <%-- <p><strong>The passwords you enter below must match, and need to be at | ||
| least 6 characters long.</strong></p> --%> | ||
| <p class="alert alert-warning"><fmt:message key="jsp.register.edit-profile.info2"/></p> | ||
| <% | ||
| } | ||
| %> | ||
|
|
||
| <div class="alert alert-info"><fmt:message key="jsp.register.edit-profile.info3"/></div> | ||
|
|
||
| <form class="form-horizontal" action="<%= request.getContextPath() %>/profile" method="post"> | ||
|
|
||
| <dspace:include page="/register/profile-form.jsp" /> | ||
| <input type="hidden" name="csrf_token" value="<%=session.getAttribute("csrfToken")%>"> | ||
|
|
||
| <% | ||
| // Only show password update section if the user doesn't use | ||
| // certificates | ||
| if ((eperson.getRequireCertificate() == false) && (ldap_eperson == false)) | ||
| { | ||
| %> | ||
| <p class="alert" style="padding-bottom: 0px; text-align: center;"><fmt:message key="jsp.register.edit-profile.info5"/></p> | ||
| <% | ||
| } | ||
| %> | ||
| <div class="col-md-offset-5"> | ||
| <%-- <p align="center"><input type="submit" name="submit" value="Update Profile"></p> --%> | ||
| <input class="btn btn-success col-md-4" type="submit" name="submit" value="<fmt:message key="jsp.register.edit-profile.update.button"/>" /> | ||
| </div> | ||
| </form> | ||
| </dspace:layout> |
Oops, something went wrong.