Commit 09fc6d35 authored by Dustin Jenkins's avatar Dustin Jenkins
Browse files

Story 1869: Code clean up.

parent 22bc2eb9

cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ACScopeValidator.java

+5 −13
Original line number Diff line number Diff line
@@ -90,19 +90,11 @@ public class ACScopeValidator extends DelegationToken.ScopeValidator 
    public void verifyScope(URI scope, String requestURI)

        throws InvalidDelegationTokenException 

    {

        try

        if (!requestURI.endsWith(RESET_PASSWORD_SCOPE)

            && !scope.toASCIIString().equals(RESET_PASSWORD_SCOPE))

        {

            // validate service endpoint

            if ((requestURI.endsWith(RESET_PASSWORD_SCOPE)) && 

                    (scope.toASCIIString().equals(RESET_PASSWORD_SCOPE)))

            {

                return; // OK

            }

            throw new InvalidDelegationTokenException("invalid scope: "

                                                      + scope);

        }

        catch(Exception ignore) { }

        

        throw new InvalidDelegationTokenException("invalid scope: " + scope);

    }

    

    

}