Commit 22bc2eb9 authored by Alinga Yeung's avatar Alinga Yeung
Browse files

Story 1869. Fixed ACScopeValidator.

parent 4d3b90bb

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

+3 −6
Original line number Original line Diff line number Diff line
@@ -93,15 +93,12 @@ public class ACScopeValidator extends DelegationToken.ScopeValidator 
        try

        try

        {

        {

            // validate service endpoint

            // validate service endpoint

            if (RESET_PASSWORD_SCOPE == requestURI)

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

            {

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

                // validate allowed action for this service endpoint

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

            {

            {

                return; // OK

                return; // OK

            }

            }

        }

        }

        }

        catch(Exception ignore) { }

        catch(Exception ignore) { }

        

        

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

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