hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-436] SWORD Authenticator doesn't support the special groups infrastructure

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@4637 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Andrea Bollini
2009-12-17 11:47:00 +00:00
parent ad598e34ed
commit 1fec2f71c0
5 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/authenticate/IPAuthentication.java
View File

@@ -195,6 +195,10 @@ public class IPAuthentication implements AuthenticationMethod
public int[] getSpecialGroups(Context context, HttpServletRequest request)
throws SQLException
{
if (request == null)
{
return new int[0];
}
List<Integer> groupIDs = new ArrayList<Integer>();
String addr = request.getRemoteAddr();

6
dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java
View File

@@ -71,6 +71,10 @@ public class ShibAuthentication implements AuthenticationMethod
public int authenticate(Context context, String username, String password,
String realm, HttpServletRequest request) throws SQLException
{
if (request == null)
{
return BAD_ARGS;
}
log.info("Shibboleth login started...");
java.util.Enumeration names = request.getHeaderNames();
@@ -218,7 +222,7 @@ public class ShibAuthentication implements AuthenticationMethod
public int[] getSpecialGroups(Context context, HttpServletRequest request)
{
// no user logged in or user not logged from shibboleth
if (context.getCurrentUser() == null
if (request == null || context.getCurrentUser() == null
|| request.getSession().getAttribute("shib.authenticated") == null)
{
return new int[0];

4
dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
View File

@@ -496,6 +496,10 @@ public class X509Authentication implements AuthenticationMethod
public int[] getSpecialGroups(Context context, HttpServletRequest request)
throws SQLException
{
if (request == null)
{
return new int[0];
}
Boolean authenticated = false;
HttpSession session = request.getSession(false);

17
dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/SWORDAuthenticator.java
View File

@@ -262,6 +262,15 @@ public class SWORDAuthenticator
{
authenticated = true;
sc.setAuthenticated(ep);
// Set any special groups - invoke the authentication mgr.
int[] groupIDs = AuthenticationManager.getSpecialGroups(context, null);
for (int i = 0; i < groupIDs.length; i++)
{
context.setSpecialGroup(groupIDs[i]);
log.debug("Adding Special Group id="+String.valueOf(groupIDs[i]));
}
sc.setAuthenticatorContext(context);
sc.setContext(context);
}
@@ -283,6 +292,14 @@ public class SWORDAuthenticator
sc.setOnBehalfOf(epObo);
Context oboContext = this.constructContext(ip);
oboContext.setCurrentUser(epObo);
// Set any special groups - invoke the authentication mgr.
int[] groupIDs = AuthenticationManager.getSpecialGroups(oboContext, null);
for (int i = 0; i < groupIDs.length; i++)
{
oboContext.setSpecialGroup(groupIDs[i]);
log.debug("Adding Special Group id="+String.valueOf(groupIDs[i]));
}
sc.setContext(oboContext);
}
else

1
dspace/CHANGES
View File

@@ -113,6 +113,7 @@
- [DS-260] Template item some times has owningCollection filled and some times not
- [DS-309] Shiboleth default roles are applied also to anonymous user and user logged-in with other methods
- [DS-270] Make delegate admin permissions configurable
- [DS-436] SWORD Authenticator doesn't support the special groups infrastructure
(Tim Donohue)
- [DS-218] Cannot add/remove email subscriptions from Profile page in XMLUI