diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java index e09dfdce09a84ddb0e20b12fd4fd7f95f3b32024..08d8c67039533a0898dadb928753d93977ae4dfc 100755 --- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java +++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java @@ -480,14 +480,13 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO throw new GroupNotFoundException(groupID); } - if (searchEntry.getAttributeValueAsDN("owner") == null) + DN groupOwner = searchEntry.getAttributeValueAsDN("owner"); + if (groupOwner == null) { //TODO assume user not allowed to read group throw new AccessControlException(groupID); } - DN groupOwner = searchEntry.getAttributeValueAsDN("owner"); - User<X500Principal> owner; try { diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupsAction.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupsAction.java index 95c16dd61f701e570a0c95b67424926b3ab6e068..40b01cc12243c3d0909dfe7e933a1b1946b25d97 100755 --- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupsAction.java +++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupsAction.java @@ -77,7 +77,6 @@ import java.security.PrivilegedExceptionAction; import java.util.List; import javax.security.auth.Subject; -import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; @@ -143,56 +142,56 @@ public abstract class GroupsAction } catch (AccessControlException e) { - log.debug(e); + log.debug("Permission denied", e); String message = "Permission Denied"; this.logInfo.setMessage(message); sendError(403, message); } catch (IllegalArgumentException e) { - log.debug(e); + log.debug("Illegal argument", e); String message = e.getMessage(); this.logInfo.setMessage(message); sendError(400, message); } catch (MemberNotFoundException e) { - log.debug(e); + log.debug("Member Not Found", e); String message = "Member not found: " + e.getMessage(); this.logInfo.setMessage(message); sendError(404, message); } catch (GroupNotFoundException e) { - log.debug(e); + log.debug("Group not found", e); String message = "Group not found: " + e.getMessage(); this.logInfo.setMessage(message); sendError(404, message); } catch (UserNotFoundException e) { - log.debug(e); + log.debug("User Not Found", e); String message = "User not found: " + e.getMessage(); this.logInfo.setMessage(message); sendError(404, message); } catch (MemberAlreadyExistsException e) { - log.debug(e); + log.debug("Member Already Exists", e); String message = "Member already exists: " + e.getMessage(); this.logInfo.setMessage(message); sendError(409, message); } catch (GroupAlreadyExistsException e) { - log.debug(e); + log.debug("Group Already Exists", e); String message = "Group already exists: " + e.getMessage(); this.logInfo.setMessage(message); sendError(409, message); } catch (UnsupportedOperationException e) { - log.debug(e); + log.debug("Unsupported Operation", e); this.logInfo.setMessage("Not yet implemented."); sendError(501); } diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java index 1515d37e34a7dbcf32e945872a2c4135aec483d8..425b25f4bd0227f7de0775315b07636ec847a75d 100755 --- a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java +++ b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java @@ -68,7 +68,10 @@ */ package ca.nrc.cadc.ac.client; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; @@ -101,7 +104,11 @@ import ca.nrc.cadc.ac.Role; import ca.nrc.cadc.ac.UserNotFoundException; import ca.nrc.cadc.auth.AuthenticationUtil; import ca.nrc.cadc.auth.SSLUtil; -import ca.nrc.cadc.net.*; +import ca.nrc.cadc.net.HttpDownload; +import ca.nrc.cadc.net.HttpPost; +import ca.nrc.cadc.net.HttpUpload; +import ca.nrc.cadc.net.InputStreamWrapper; +import ca.nrc.cadc.net.NetUtil; import com.csvreader.CsvReader; @@ -258,7 +265,7 @@ public class GMSClient Throwable error = transfer.getThrowable(); if (error != null) { - log.debug("getGroup throwable", error); + log.debug("getGroup throwable (" + transfer.getResponseCode() + ")", error); // transfer returns a -1 code for anonymous access. if ((transfer.getResponseCode() == -1) || (transfer.getResponseCode() == 401) ||