litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2279 On external auth, the HTTP header holds the externalAuthId -- there is no username any more.

Browse source
This commit is contained in:
j2blake 2011-06-01 19:16:18 +00:00
parent f3ca1a71a3
commit cab3bfe9b1
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java
View file

@ -34,8 +34,8 @@ public class ExternalAuthHelper {
/** This configuration property points to the external authorization server. */
private static final String PROPERTY_EXTERNAL_AUTH_SERVER_URL = "externalAuth.serverUrl";
/** This configuration property says which HTTP header holds the username. */
public static final String PROPERTY_EXTERNAL_AUTH_USERNAME_HEADER = "externalAuth.netIdHeaderName";
/** This configuration property says which HTTP header holds the auth ID. */
public static final String PROPERTY_EXTERNAL_AUTH_ID_HEADER = "externalAuth.netIdHeaderName";
// ----------------------------------------------------------------------
// static methods
@ -82,7 +82,7 @@ public class ExternalAuthHelper {
String externalAuthServerUrl = ConfigurationProperties.getBean(ctx)
.getProperty(PROPERTY_EXTERNAL_AUTH_SERVER_URL);
String externalAuthHeaderName = ConfigurationProperties.getBean(ctx)
.getProperty(PROPERTY_EXTERNAL_AUTH_USERNAME_HEADER);
.getProperty(PROPERTY_EXTERNAL_AUTH_ID_HEADER);
return new ExternalAuthHelper(externalAuthServerUrl,
externalAuthHeaderName);
@ -134,7 +134,7 @@ public class ExternalAuthHelper {
}
}
public String getExternalUsername(HttpServletRequest request) {
public String getExternalAuthId(HttpServletRequest request) {
if (request == null) {
log.error("request is null.");
return null;
@ -143,13 +143,13 @@ public class ExternalAuthHelper {
if (externalAuthHeaderName == null) {
log.error("User asked for external authentication, "
+ "but deploy.properties doesn't contain a value for '"
+ PROPERTY_EXTERNAL_AUTH_USERNAME_HEADER + "'");
+ PROPERTY_EXTERNAL_AUTH_ID_HEADER + "'");
return null;
}
String username = request.getHeader(externalAuthHeaderName);
log.debug("username=" + username);
return username;
String externalAuthId = request.getHeader(externalAuthHeaderName);
log.debug("externalAuthId=" + externalAuthId);
return externalAuthId;
}
@Override

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java
View file

@ -117,7 +117,7 @@ public class FakeExternalAuthController extends FreemarkerHttpServlet {
}
@Override
public String getExternalUsername(HttpServletRequest request) {
public String getExternalAuthId(HttpServletRequest request) {
log.debug("external username is '" + username + "'");
return username;
}

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
View file

@ -40,8 +40,8 @@ public class LoginExternalAuthReturn extends BaseLoginServlet {
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
String username = ExternalAuthHelper.getHelper(req)
.getExternalUsername(req);
String username = ExternalAuthHelper.getHelper(req).getExternalAuthId(
req);
List<String> associatedUris = getAuthenticator(req)
.getAssociatedIndividualUris(username);