/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 7398

include the subjects we are testing for authentication.
https://redmine.dataone.org/issues/2778

     	//defer to the shared util for recursively compiling the subjects
     	Set<Subject> subjects = AuthUtils.authorizedClientSubjects(session);
     	// track the identities we have checked against
     	StringBuffer includedSubjects = new StringBuffer();
         // get the system metadata
         String pidStr = pid.getValue();
         SystemMetadata systemMetadata = null;
-...
           logMetacat.debug("Comparing \t" +
                            systemMetadata.getRightsHolder().getValue() +
                            " \tagainst \t" + s.getValue());
           	includedSubjects.append(s.getValue() + "; ");
         	allowed = systemMetadata.getRightsHolder().equals(s);
         	if (allowed) {
         		return allowed;
-...
         // throw or return?
         if (!allowed) {
           throw new NotAuthorized("1820", permission + " not allowed on " + pidStr);
           throw new NotAuthorized("1820", permission + " not allowed on " + pidStr + " for subject[s]: " + includedSubjects.toString() );
+        }
         return allowed;

Also available in: Unified diff