Added null checks and tests to constructors

RequestKey, JaasGrantedAuthority, and SwitchUserGrantedAuthority
assume certain final members are non-null.

Issue: gh-6892
This commit is contained in:
Clement Ng
2019-05-28 19:35:06 -07:00
committed by Josh Cummings
parent 9fe8949883
commit e66369f6c6
6 changed files with 123 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,9 +15,10 @@
*/
package org.springframework.security.web.access.intercept;
import static org.assertj.core.api.Assertions.*;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.springframework.security.web.access.intercept.RequestKey;
/**
@@ -63,4 +64,14 @@ public class RequestKeyTests {
assertThat(key1.equals(key2)).isFalse();
assertThat(key2.equals(key1)).isFalse();
}
/**
* @throws Exception
*/
@Test
public void keysWithNullUrlFailsAssertion() throws Exception {
assertThatThrownBy(() -> new RequestKey(null, null))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("url cannot be null");
}
}

View File

@@ -0,0 +1,49 @@
/*
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.security.web.authentication.switchuser;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority;
/**
*
* @author Clement Ng
*
*/
public class SwitchUserGrantedAuthorityTests {
/**
* @throws Exception
*/
@Test
public void authorityWithNullRoleFailsAssertion() throws Exception {
assertThatThrownBy(() -> new SwitchUserGrantedAuthority(null, null))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("role cannot be null");
}
/**
* @throws Exception
*/
@Test
public void authorityWithNullSourceFailsAssertion() throws Exception {
assertThatThrownBy(() -> new SwitchUserGrantedAuthority("role", null))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("source cannot be null");
}
}