Skip to content
Snippets Groups Projects
Commit ee899a80 authored by Jeff Burke's avatar Jeff Burke
Browse files

s1651: updates from ac_ws int tests

parent 5f7a7eae
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 135 additions and 45 deletions
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
+ 1
− 0
View file @ ee899a80
...@@ -267,6 +267,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO ...@@ -267,6 +267,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
} }
catch (LDAPException e) catch (LDAPException e)
{ {
e.printStackTrace();
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
......
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupsActionFactory.java
+ 1
− 1
View file @ ee899a80
...@@ -130,7 +130,7 @@ public class GroupsActionFactory ...@@ -130,7 +130,7 @@ public class GroupsActionFactory
} }
else if (method.equals("POST")) else if (method.equals("POST"))
{ {
action = new ModifyGroupAction(logInfo, groupName, request.getInputStream()); action = new ModifyGroupAction(logInfo, groupName, request.getRequestURI(), request.getInputStream());
} }
} }
else if (segments.length == 3) else if (segments.length == 3)
......
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ModifyGroupAction.java
+ 6
− 3
View file @ ee899a80
...@@ -82,12 +82,14 @@ import javax.servlet.http.HttpServletResponse; ...@@ -82,12 +82,14 @@ import javax.servlet.http.HttpServletResponse;
public class ModifyGroupAction extends GroupsAction public class ModifyGroupAction extends GroupsAction
{ {
private final String groupName; private final String groupName;
private final String request;
private final InputStream inputStream; private final InputStream inputStream;
ModifyGroupAction(GroupLogInfo logInfo, String groupName, InputStream inputStream) ModifyGroupAction(GroupLogInfo logInfo, String groupName, String request, InputStream inputStream)
{ {
super(logInfo); super(logInfo);
this.groupName = groupName; this.groupName = groupName;
this.request = request;
this.inputStream = inputStream; this.inputStream = inputStream;
} }
...@@ -98,7 +100,6 @@ public class ModifyGroupAction extends GroupsAction ...@@ -98,7 +100,6 @@ public class ModifyGroupAction extends GroupsAction
Group group = GroupReader.read(this.inputStream); Group group = GroupReader.read(this.inputStream);
Group oldGroup = groupPersistence.getGroup(this.groupName); Group oldGroup = groupPersistence.getGroup(this.groupName);
Group modifiedGroup = groupPersistence.modifyGroup(group); Group modifiedGroup = groupPersistence.modifyGroup(group);
this.response.sendRedirect(modifiedGroup.getID());
List<String> addedMembers = new ArrayList<String>(); List<String> addedMembers = new ArrayList<String>();
for (User member : group.getUserMembers()) for (User member : group.getUserMembers())
...@@ -133,6 +134,8 @@ public class ModifyGroupAction extends GroupsAction ...@@ -133,6 +134,8 @@ public class ModifyGroupAction extends GroupsAction
deletedMembers = null; deletedMembers = null;
} }
logGroupInfo(group.getID(), deletedMembers, addedMembers); logGroupInfo(group.getID(), deletedMembers, addedMembers);
this.response.sendRedirect(request);
return null; return null;
} }
......
projects/cadcAccessControl/src/ca/nrc/cadc/ac/AC.java
+ 1
− 1
View file @ ee899a80
...@@ -85,7 +85,7 @@ public class AC ...@@ -85,7 +85,7 @@ public class AC
// Denotes a group readable by public // Denotes a group readable by public
public static final String PROPERTY_PUBLIC = "ivo://ivoa.net/gms#public"; public static final String PROPERTY_PUBLIC = "ivo://ivoa.net/gms#public";
public static final String GMS_SERVICE_URI = "ivo://cadc.nrc.ca/gms"; public static final String GMS_SERVICE_URI = "ivo://cadc.nrc.ca/ac";
// Group URI attribute once the group name is appended // Group URI attribute once the group name is appended
public static final String GROUP_URI = "ivo://cadc.nrc.ca/gms#"; public static final String GROUP_URI = "ivo://cadc.nrc.ca/gms#";
......
projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
+ 126
− 40
View file @ ee899a80
...@@ -129,12 +129,14 @@ public class GMSClient ...@@ -129,12 +129,14 @@ public class GMSClient
URL testURL = new URL(baseURL); URL testURL = new URL(baseURL);
if (!testURL.getProtocol().equals("https")) if (!testURL.getProtocol().equals("https"))
{ {
throw new IllegalArgumentException("URL must have HTTPS protocol"); throw new IllegalArgumentException(
"URL must have HTTPS protocol");
} }
} }
catch (MalformedURLException e) catch (MalformedURLException e)
{ {
throw new IllegalArgumentException("URL is malformed: " + e.getMessage()); throw new IllegalArgumentException("URL is malformed: " +
e.getMessage());
} }
if (baseURL.endsWith("/")) if (baseURL.endsWith("/"))
...@@ -162,7 +164,8 @@ public class GMSClient ...@@ -162,7 +164,8 @@ public class GMSClient
* *
* @param group The group to create * @param group The group to create
* @return The newly created group will all the information. * @return The newly created group will all the information.
* @throws GroupAlreadyExistsException If a group with the same name already exists. * @throws GroupAlreadyExistsException If a group with the same name already
* exists.
* @throws AccessControlException If unauthorized to perform this operation. * @throws AccessControlException If unauthorized to perform this operation.
* @throws UserNotFoundException * @throws UserNotFoundException
* @throws IOException * @throws IOException
...@@ -190,7 +193,10 @@ public class GMSClient ...@@ -190,7 +193,10 @@ public class GMSClient
if (error != null) if (error != null)
{ {
log.debug("createGroup throwable", error); log.debug("createGroup throwable", error);
if ((transfer.getResponseCode() == 401) || (transfer.getResponseCode() == 403)) // transfer returns a -1 code for anonymous uploads.
if ((transfer.getResponseCode() == -1) ||
(transfer.getResponseCode() == 401) ||
(transfer.getResponseCode() == 403))
{ {
throw new AccessControlException(error.getMessage()); throw new AccessControlException(error.getMessage());
} }
...@@ -246,7 +252,10 @@ public class GMSClient ...@@ -246,7 +252,10 @@ public class GMSClient
if (error != null) if (error != null)
{ {
log.debug("getGroup throwable", error); log.debug("getGroup throwable", error);
if ((transfer.getResponseCode() == 401) || (transfer.getResponseCode() == 403)) // transfer returns a -1 code for anonymous access.
if ((transfer.getResponseCode() == -1) ||
(transfer.getResponseCode() == 401) ||
(transfer.getResponseCode() == 403))
{ {
throw new AccessControlException(error.getMessage()); throw new AccessControlException(error.getMessage());
} }
...@@ -295,7 +304,8 @@ public class GMSClient ...@@ -295,7 +304,8 @@ public class GMSClient
GroupWriter.write(group, groupXML); GroupWriter.write(group, groupXML);
log.debug("updateGroup: " + groupXML); log.debug("updateGroup: " + groupXML);
HttpPost transfer = new HttpPost(updateGroupURL, groupXML.toString(), "application/xml", true); HttpPost transfer = new HttpPost(updateGroupURL, groupXML.toString(),
"application/xml", true);
transfer.setSSLSocketFactory(getSSLSocketFactory()); transfer.setSSLSocketFactory(getSSLSocketFactory());
transfer.run(); transfer.run();
...@@ -304,7 +314,14 @@ public class GMSClient ...@@ -304,7 +314,14 @@ public class GMSClient
if (error != null) if (error != null)
{ {
log.debug("updateGroup throwable", error); log.debug("updateGroup throwable", error);
if ((transfer.getResponseCode() == 401) || (transfer.getResponseCode() == 403)) if (transfer.getResponseCode() == 302)
{
return getGroup(group.getID());
}
// transfer returns a -1 code for anonymous access.
if ((transfer.getResponseCode() == -1) ||
(transfer.getResponseCode() == 401) ||
(transfer.getResponseCode() == 403))
{ {
throw new AccessControlException(error.getMessage()); throw new AccessControlException(error.getMessage());
} }
...@@ -345,19 +362,22 @@ public class GMSClient ...@@ -345,19 +362,22 @@ public class GMSClient
{ {
URL deleteGroupURL = new URL(this.baseURL + "/groups/" + groupName); URL deleteGroupURL = new URL(this.baseURL + "/groups/" + groupName);
log.debug("deleteGroup request to " + deleteGroupURL.toString()); log.debug("deleteGroup request to " + deleteGroupURL.toString());
HttpURLConnection conn = (HttpURLConnection) deleteGroupURL.openConnection(); HttpURLConnection conn =
(HttpURLConnection) deleteGroupURL.openConnection();
conn.setRequestMethod("DELETE"); conn.setRequestMethod("DELETE");
SSLSocketFactory sf = getSSLSocketFactory(); SSLSocketFactory sf = getSSLSocketFactory();
if ((sf != null) && ((conn instanceof HttpsURLConnection))) if ((sf != null) && ((conn instanceof HttpsURLConnection)))
{ {
((HttpsURLConnection) conn).setSSLSocketFactory(getSSLSocketFactory()); ((HttpsURLConnection) conn)
.setSSLSocketFactory(getSSLSocketFactory());
} }
int responseCode = conn.getResponseCode(); int responseCode = conn.getResponseCode();
if (responseCode != 200) if (responseCode != 200)
{ {
String errMessage = NetUtil.getErrorBody(conn); String errMessage = NetUtil.getErrorBody(conn);
log.debug("deleteGroup response " + responseCode + ": " + errMessage); log.debug("deleteGroup response " + responseCode + ": " +
errMessage);
if ((responseCode == 401) || (responseCode == 403)) if ((responseCode == 401) || (responseCode == 403))
{ {
...@@ -389,24 +409,39 @@ public class GMSClient ...@@ -389,24 +409,39 @@ public class GMSClient
throws IllegalArgumentException, GroupNotFoundException, throws IllegalArgumentException, GroupNotFoundException,
AccessControlException, IOException AccessControlException, IOException
{ {
URL addGroupMemberURL = new URL(this.baseURL + "/groups/" + targetGroupName + "/groupMembers/" + groupMemberName); URL addGroupMemberURL = new URL(this.baseURL + "/groups/" +
targetGroupName + "/groupMembers/" +
groupMemberName);
log.debug("addGroupMember request to " + addGroupMemberURL.toString()); log.debug("addGroupMember request to " + addGroupMemberURL.toString());
HttpURLConnection conn = (HttpURLConnection) addGroupMemberURL.openConnection(); HttpURLConnection conn =
(HttpURLConnection) addGroupMemberURL.openConnection();
conn.setRequestMethod("PUT"); conn.setRequestMethod("PUT");
SSLSocketFactory sf = getSSLSocketFactory(); SSLSocketFactory sf = getSSLSocketFactory();
if ((sf != null) && ((conn instanceof HttpsURLConnection))) if ((sf != null) && ((conn instanceof HttpsURLConnection)))
{ {
((HttpsURLConnection) conn).setSSLSocketFactory(getSSLSocketFactory()); ((HttpsURLConnection) conn)
.setSSLSocketFactory(getSSLSocketFactory());
} }
int responseCode = conn.getResponseCode();
// Try to handle anonymous access and throw AccessControlException
int responseCode = -1;
try
{
responseCode = conn.getResponseCode();
}
catch (Exception ignore) {}
if ((responseCode != 200) && (responseCode != 201)) if ((responseCode != 200) && (responseCode != 201))
{ {
String errMessage = NetUtil.getErrorBody(conn); String errMessage = NetUtil.getErrorBody(conn);
log.debug("addGroupMember response " + responseCode + ": " + errMessage); log.debug("addGroupMember response " + responseCode + ": " +
errMessage);
if ((responseCode == 401) || (responseCode == 403)) if ((responseCode == -1) ||
(responseCode == 401) ||
(responseCode == 403))
{ {
throw new AccessControlException(errMessage); throw new AccessControlException(errMessage);
} }
...@@ -436,25 +471,40 @@ public class GMSClient ...@@ -436,25 +471,40 @@ public class GMSClient
{ {
String userIDType = AuthenticationUtil.getPrincipalType(userID); String userIDType = AuthenticationUtil.getPrincipalType(userID);
String encodedUserID = URLEncoder.encode(userID.toString(), "UTF-8"); String encodedUserID = URLEncoder.encode(userID.toString(), "UTF-8");
URL addUserMemberURL = new URL(this.baseURL + "/groups/" + targetGroupName + "/userMembers/" + encodedUserID + "?idType=" + userIDType); URL addUserMemberURL = new URL(this.baseURL + "/groups/" +
targetGroupName + "/userMembers/" +
encodedUserID + "?idType=" + userIDType);
log.debug("addUserMember request to " + addUserMemberURL.toString()); log.debug("addUserMember request to " + addUserMemberURL.toString());
HttpURLConnection conn = (HttpURLConnection) addUserMemberURL.openConnection(); HttpURLConnection conn =
(HttpURLConnection) addUserMemberURL.openConnection();
conn.setRequestMethod("PUT"); conn.setRequestMethod("PUT");
SSLSocketFactory sf = getSSLSocketFactory(); SSLSocketFactory sf = getSSLSocketFactory();
if ((sf != null) && ((conn instanceof HttpsURLConnection))) if ((sf != null) && ((conn instanceof HttpsURLConnection)))
{ {
((HttpsURLConnection) conn).setSSLSocketFactory(getSSLSocketFactory()); ((HttpsURLConnection) conn)
.setSSLSocketFactory(getSSLSocketFactory());
} }
int responseCode = conn.getResponseCode();
// Try to handle anonymous access and throw AccessControlException
int responseCode = -1;
try
{
responseCode = conn.getResponseCode();
}
catch (Exception ignore) {}
if ((responseCode != 200) && (responseCode != 201)) if ((responseCode != 200) && (responseCode != 201))
{ {
String errMessage = NetUtil.getErrorBody(conn); String errMessage = NetUtil.getErrorBody(conn);
log.debug("addUserMember response " + responseCode + ": " + errMessage); log.debug("addUserMember response " + responseCode + ": " +
errMessage);
if ((responseCode == 401) || (responseCode == 403)) if ((responseCode == -1) ||
(responseCode == 401) ||
(responseCode == 403))
{ {
throw new AccessControlException(errMessage); throw new AccessControlException(errMessage);
} }
...@@ -479,27 +529,44 @@ public class GMSClient ...@@ -479,27 +529,44 @@ public class GMSClient
* @throws java.io.IOException * @throws java.io.IOException
* @throws AccessControlException If unauthorized to perform this operation. * @throws AccessControlException If unauthorized to perform this operation.
*/ */
public void removeGroupMember(String targetGroupName, String groupMemberName) public void removeGroupMember(String targetGroupName,
String groupMemberName)
throws GroupNotFoundException, AccessControlException, IOException throws GroupNotFoundException, AccessControlException, IOException
{ {
URL removeGroupMemberURL = new URL(this.baseURL + "/groups/" + targetGroupName + "/groupMembers/" + groupMemberName); URL removeGroupMemberURL = new URL(this.baseURL + "/groups/" +
log.debug("removeGroupMember request to " + removeGroupMemberURL.toString()); targetGroupName + "/groupMembers/" +
groupMemberName);
log.debug("removeGroupMember request to " +
removeGroupMemberURL.toString());
HttpURLConnection conn = (HttpURLConnection) removeGroupMemberURL.openConnection(); HttpURLConnection conn =
(HttpURLConnection) removeGroupMemberURL.openConnection();
conn.setRequestMethod("DELETE"); conn.setRequestMethod("DELETE");
SSLSocketFactory sf = getSSLSocketFactory(); SSLSocketFactory sf = getSSLSocketFactory();
if ((sf != null) && ((conn instanceof HttpsURLConnection))) if ((sf != null) && ((conn instanceof HttpsURLConnection)))
{ {
((HttpsURLConnection) conn).setSSLSocketFactory(getSSLSocketFactory()); ((HttpsURLConnection) conn)
.setSSLSocketFactory(getSSLSocketFactory());
} }
int responseCode = conn.getResponseCode();
// Try to handle anonymous access and throw AccessControlException
int responseCode = -1;
try
{
responseCode = conn.getResponseCode();
}
catch (Exception ignore) {}
if (responseCode != 200) if (responseCode != 200)
{ {
String errMessage = NetUtil.getErrorBody(conn); String errMessage = NetUtil.getErrorBody(conn);
log.debug("removeGroupMember response " + responseCode + ": " + errMessage); log.debug("removeGroupMember response " + responseCode + ": " +
errMessage);
if ((responseCode == 401) || (responseCode == 403)) if ((responseCode == -1) ||
(responseCode == 401) ||
(responseCode == 403))
{ {
throw new AccessControlException(errMessage); throw new AccessControlException(errMessage);
} }
...@@ -529,25 +596,42 @@ public class GMSClient ...@@ -529,25 +596,42 @@ public class GMSClient
{ {
String userIDType = AuthenticationUtil.getPrincipalType(userID); String userIDType = AuthenticationUtil.getPrincipalType(userID);
String encodedUserID = URLEncoder.encode(userID.toString(), "UTF-8"); String encodedUserID = URLEncoder.encode(userID.toString(), "UTF-8");
URL removeUserMemberURL = new URL(this.baseURL + "/groups/" + targetGroupName + "/userMembers/" + encodedUserID + "?idType=" + userIDType); URL removeUserMemberURL = new URL(this.baseURL + "/groups/" +
targetGroupName + "/userMembers/" +
encodedUserID + "?idType=" +
userIDType);
log.debug("removeUserMember request to " + removeUserMemberURL.toString()); log.debug("removeUserMember request to " +
removeUserMemberURL.toString());
HttpURLConnection conn = (HttpURLConnection) removeUserMemberURL.openConnection(); HttpURLConnection conn =
(HttpURLConnection) removeUserMemberURL.openConnection();
conn.setRequestMethod("DELETE"); conn.setRequestMethod("DELETE");
SSLSocketFactory sf = getSSLSocketFactory(); SSLSocketFactory sf = getSSLSocketFactory();
if ((sf != null) && ((conn instanceof HttpsURLConnection))) if ((sf != null) && ((conn instanceof HttpsURLConnection)))
{ {
((HttpsURLConnection) conn).setSSLSocketFactory(getSSLSocketFactory()); ((HttpsURLConnection) conn)
.setSSLSocketFactory(getSSLSocketFactory());
} }
int responseCode = conn.getResponseCode();
// Try to handle anonymous access and throw AccessControlException
int responseCode = -1;
try
{
responseCode = conn.getResponseCode();
}
catch (Exception ignore) {}
if (responseCode != 200) if (responseCode != 200)
{ {
String errMessage = NetUtil.getErrorBody(conn); String errMessage = NetUtil.getErrorBody(conn);
log.debug("removeUserMember response " + responseCode + ": " + errMessage); log.debug("removeUserMember response " + responseCode + ": " +
errMessage);
if ((responseCode == 401) || (responseCode == 403)) if ((responseCode == -1) ||
(responseCode == 401) ||
(responseCode == 403))
{ {
throw new AccessControlException(errMessage); throw new AccessControlException(errMessage);
} }
...@@ -597,8 +681,10 @@ public class GMSClient ...@@ -597,8 +681,10 @@ public class GMSClient
Subject subject = Subject.getSubject(acContext); Subject subject = Subject.getSubject(acContext);
if (subject != null) if (subject != null)
{ {
Set groupCredentialSet = subject.getPrivateCredentials(GroupCredentials.class); Set groupCredentialSet =
if ((groupCredentialSet != null) && (groupCredentialSet.size() == 1)) subject.getPrivateCredentials(GroupCredentials.class);
if ((groupCredentialSet != null) &&
(groupCredentialSet.size() == 1))
{ {
Iterator i = groupCredentialSet.iterator(); Iterator i = groupCredentialSet.iterator();
return ((GroupCredentials) i.next()).groupMemberships; return ((GroupCredentials) i.next()).groupMemberships;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment