1223

pending completion

Build # 1223

Build Type

push

travis-ci

Committed by

xtreme-will-tran

Commit Message

Handle login failure for unverified users through password grant
 - added a custom exception translator for the
AccountNotVerifiedException

[#82327740] https://www.pivotaltracker.com/story/show/82327740

Original commit on login-server here:
https://github.com/cloudfoundry/login-server/commit/8af367ec1

Run Details

7796 of 9799 relevant lines covered (79.56%)

589.61 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

64.52

/common/src/main/java/org/cloudfoundry/identity/uaa/authentication/AuthzAuthenticationRequest.java

/*******************************************************************************
 *     Cloud Foundry 
 *     Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
 *
 *     This product is licensed to you under the Apache License, Version 2.0 (the "License").
 *     You may not use this product except in compliance with the License.
 *
 *     This product includes a number of subcomponents with
 *     separate copyright notices and license terms. Your use of these
 *     subcomponents is subject to the terms and conditions of the
 *     subcomponent's license, as noted in the LICENSE file.
 *******************************************************************************/
package org.cloudfoundry.identity.uaa.authentication;

import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;

import org.cloudfoundry.identity.uaa.user.ExtendedUaaAuthority;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;

/**
 * Authentication request object which contains the JSON data submitted to the
 * /authorize endpoint.
 * 
 * This token is not used to represent an authenticated user.
 * 
 * @author Luke Taylor
 * @author Dave Syer
 */
public class AuthzAuthenticationRequest implements Authentication {

    private final UaaAuthenticationDetails details;
    private final Map<String, String> info;

    public AuthzAuthenticationRequest(Map<String, String> info, UaaAuthenticationDetails details) {
        this.info = Collections.unmodifiableMap(info);
        Assert.notNull(details);
        this.details = details;
    }

    public AuthzAuthenticationRequest(String username, String password, UaaAuthenticationDetails details) {
        Assert.hasText(username, "username cannot be empty");
        Assert.hasText(password, "password cannot be empty");
        HashMap<String, String> info = new HashMap<String, String>();
        info.put("username", username.trim());
        info.put("password", password.trim());
        this.info = Collections.unmodifiableMap(info);
        this.details = details;
    }

    public Map<String, String> getInfo() {
        return info;
    }

    @Override
    public Collection<? extends GrantedAuthority> getAuthorities() {
        if (null != info.get("authorities")) {
            Collection<ExtendedUaaAuthority> returnAuthorities = new LinkedHashSet<ExtendedUaaAuthority>();

            String[] authorities = StringUtils.commaDelimitedListToStringArray(info.get("authorities"));

            for (String authority : authorities) {
                returnAuthorities.add(new ExtendedUaaAuthority(authority, null));
            }

            return returnAuthorities;
        } else {
            return Collections.emptySet();
        }
    }

    @Override
    public String getPrincipal() {
        return info.get("username");
    }

    @Override
    public String getCredentials() {
        return info.get("password");
    }

    @Override
    public Object getDetails() {
        return details;
    }

    @Override
    public boolean isAuthenticated() {
        return false;
    }

    @Override
    public void setAuthenticated(boolean isAuthenticated) {
        if (isAuthenticated) {
            throw new IllegalArgumentException("Authentication request can not be 'authenticated'");
        }
    }

    @Override
    public String getName() {
        return getPrincipal();
    }
}

1	/*******************************************************************************
2	* Cloud Foundry
3	* Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
4	*
5	* This product is licensed to you under the Apache License, Version 2.0 (the "License").
6	* You may not use this product except in compliance with the License.
7	*
8	* This product includes a number of subcomponents with
9	* separate copyright notices and license terms. Your use of these
10	* subcomponents is subject to the terms and conditions of the
11	* subcomponent's license, as noted in the LICENSE file.
12	*******************************************************************************/
13	package org.cloudfoundry.identity.uaa.authentication;
14
15	import java.util.Collection;
16	import java.util.Collections;
17	import java.util.HashMap;
18	import java.util.LinkedHashSet;
19	import java.util.Map;
20
21	import org.cloudfoundry.identity.uaa.user.ExtendedUaaAuthority;
22	import org.springframework.security.core.Authentication;
23	import org.springframework.security.core.GrantedAuthority;
24	import org.springframework.util.Assert;
25	import org.springframework.util.StringUtils;
26
27	/**
28	* Authentication request object which contains the JSON data submitted to the
29	* /authorize endpoint.
30	*
31	* This token is not used to represent an authenticated user.
32	*
33	* @author Luke Taylor
34	* @author Dave Syer
35	*/
36	public class AuthzAuthenticationRequest implements Authentication {	67✔
37
38	private final UaaAuthenticationDetails details;
39	private final Map<String, String> info;
40
41	public AuthzAuthenticationRequest(Map<String, String> info, UaaAuthenticationDetails details) {	48✔
42	this.info = Collections.unmodifiableMap(info);	48✔
43	Assert.notNull(details);	48✔
44	this.details = details;	48✔
45	}	48✔
46
47	public AuthzAuthenticationRequest(String username, String password, UaaAuthenticationDetails details) {	13✔
48	Assert.hasText(username, "username cannot be empty");	13✔
49	Assert.hasText(password, "password cannot be empty");	13✔
50	HashMap<String, String> info = new HashMap<String, String>();	13✔
51	info.put("username", username.trim());	13✔
52	info.put("password", password.trim());	13✔
53	this.info = Collections.unmodifiableMap(info);	13✔
54	this.details = details;	13✔
55	}	13✔
56
57	public Map<String, String> getInfo() {
58	return info;	33✔
59	}
60
61	@Override
62	public Collection<? extends GrantedAuthority> getAuthorities() {
63	if (null != info.get("authorities")) {	×
64	Collection<ExtendedUaaAuthority> returnAuthorities = new LinkedHashSet<ExtendedUaaAuthority>();	×
65
66	String[] authorities = StringUtils.commaDelimitedListToStringArray(info.get("authorities"));	×
67
68	for (String authority : authorities) {	×
69	returnAuthorities.add(new ExtendedUaaAuthority(authority, null));	×
70	}
71
72	return returnAuthorities;	×
73	} else {
74	return Collections.emptySet();	×
75	}
76	}
77
78	@Override
79	public String getPrincipal() {
80	return info.get("username");	118✔
81	}
82
83	@Override
84	public String getCredentials() {
85	return info.get("password");	67✔
86	}
87
88	@Override
89	public Object getDetails() {
90	return details;	48✔
91	}
92
93	@Override
94	public boolean isAuthenticated() {
95	return false;	×
96	}
97
98	@Override
99	public void setAuthenticated(boolean isAuthenticated) {
100	if (isAuthenticated) {	×
101	throw new IllegalArgumentException("Authentication request can not be 'authenticated'");	×
102	}
103	}	×
104
105	@Override
106	public String getName() {
107	return getPrincipal();	118✔
108	}
109	}

cloudfoundry / uaa / 1223

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous