[java-idp-plugin-duo] branch main updated: Cleanup test data
Phil Smart
philip.smart at jisc.ac.uk
Thu Jun 24 10:00:12 UTC 2021
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-duo.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=55e1d278255dde08d7d27acdf7c59808028ca02e
The following commit(s) were added to refs/heads/main by this push:
new 55e1d27 Cleanup test data
55e1d27 is described below
commit 55e1d278255dde08d7d27acdf7c59808028ca02e
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Jun 24 11:00:07 2021 +0100
Cleanup test data
---
.../authn/duo/impl/AbstractDuoActionTest.java | 92 +++++++++++-----------
.../plugin/authn/mock/MockDuoOIDCClient_FAIL.java | 22 +++---
.../plugin/authn/mock/MockDuoOIDCClient_OK.java | 20 ++---
.../mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java | 20 ++---
.../authn/mock/MockDuoOIDCClient_UNKNOWN.java | 22 +++---
5 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractDuoActionTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractDuoActionTest.java
index becaf83..0f625f0 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractDuoActionTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractDuoActionTest.java
@@ -256,8 +256,8 @@ public abstract class AbstractDuoActionTest {
* @param exp expiration time.
* @param iat issued at.
* @param authTime the auth time.
- * @param apiHost TODO
- * @param factor TODO
+ * @param apiHost the api hostname.
+ * @param factor the duo factor.
* @return the duo auth token.
*/
protected JWT createSignedDummyToken(@Nonnull final String headerJson,
@@ -299,8 +299,8 @@ public abstract class AbstractDuoActionTest {
* @param exp expiration time.
* @param iat issued at.
* @param authTime the auth time.
- * @param apiHost TODO
- * @param factor TODO
+ * @param apiHost the api hostname.
+ * @param factor the duo factor.
* @return the duo auth token.
*/
protected JWT createSignedDummyTokenFromGivenSignature(@Nonnull final String headerJson,
@@ -337,8 +337,8 @@ public abstract class AbstractDuoActionTest {
* @param exp expiration time.
* @param iat issued at.
* @param authTime the auth time.
- * @param apiHost TODO
- * @param factor TODO
+ * @param apiHost the api hostname.
+ * @param factor the duo factor.
* @return the duo auth token.
*/
protected JWT createUnsignedSignedDummyToken(@Nonnull final String headerJson,
@@ -400,12 +400,12 @@ public abstract class AbstractDuoActionTest {
" \"result\": \"success\",\n" +
" \"timestamp\": 1599749128,\n" +
" \"auth_device\": {\n" +
- " \"ip\": \"82.17.89.232\",\n" +
- " \"name\": \"+44 7852 119881\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
+ " \"name\": \"+44 999999\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"txid\": \"1684599c-bb16-4250-af85-904291bfe7cc\",\n" +
@@ -413,11 +413,11 @@ public abstract class AbstractDuoActionTest {
" \"reason\": \"user_approved\",\n" +
" \"access_device\": {\n" +
" \"hostname\": null,\n" +
- " \"ip\": \"82.17.89.232\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"application\": {\n" +
@@ -427,7 +427,7 @@ public abstract class AbstractDuoActionTest {
" \"factor\": \""+factor+"\",\n" +
" \"user\": {\n" +
" \"key\": \"DUGL8U46QGJSOUJWG59W\",\n" +
- " \"name\": \"philsmart\"\n" +
+ " \"name\": \"jdoe\"\n" +
" }\n" +
" }\n" +
"}";
@@ -464,12 +464,12 @@ public abstract class AbstractDuoActionTest {
" \"result\": \"success\",\n" +
" \"timestamp\": 1599749128,\n" +
" \"auth_device\": {\n" +
- " \"ip\": \"82.17.89.232\",\n" +
- " \"name\": \"+44 7852 119881\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
+ " \"name\": \"+44 999999\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"txid\": \"1684599c-bb16-4250-af85-904291bfe7cc\",\n" +
@@ -477,11 +477,11 @@ public abstract class AbstractDuoActionTest {
" \"reason\": \"user_approved\",\n" +
" \"access_device\": {\n" +
" \"hostname\": null,\n" +
- " \"ip\": \"82.17.89.232\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"application\": {\n" +
@@ -491,7 +491,7 @@ public abstract class AbstractDuoActionTest {
" \"factor\": \""+factor+"\",\n" +
" \"user\": {\n" +
" \"key\": \"DUGL8U46QGJSOUJWG59W\",\n" +
- " \"name\": \"philsmart\"\n" +
+ " \"name\": \"jdoe\"\n" +
" }\n" +
" }\n" +
"}";
@@ -529,12 +529,12 @@ public abstract class AbstractDuoActionTest {
" \"result\": \"success\",\n" +
" \"timestamp\": 1599749128,\n" +
" \"auth_device\": {\n" +
- " \"ip\": \"82.17.89.232\",\n" +
- " \"name\": \"+44 7852 119881\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
+ " \"name\": \"+44 999999\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"txid\": \"1684599c-bb16-4250-af85-904291bfe7cc\",\n" +
@@ -542,11 +542,11 @@ public abstract class AbstractDuoActionTest {
" \"reason\": \"user_approved\",\n" +
" \"access_device\": {\n" +
" \"hostname\": null,\n" +
- " \"ip\": \"82.17.89.232\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"application\": {\n" +
@@ -556,7 +556,7 @@ public abstract class AbstractDuoActionTest {
" \"factor\": \""+factor+"\",\n" +
" \"user\": {\n" +
" \"key\": \"DUGL8U46QGJSOUJWG59W\",\n" +
- " \"name\": \"philsmart\"\n" +
+ " \"name\": \"jdoe\"\n" +
" }\n" +
" }\n" +
"}";
@@ -602,12 +602,12 @@ public abstract class AbstractDuoActionTest {
" \"result\": \"success\",\n" +
" \"timestamp\": 1599749128,\n" +
" \"auth_device\": {\n" +
- " \"ip\": \"82.17.89.232\",\n" +
- " \"name\": \"+44 7852 119881\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
+ " \"name\": \"+44 999999\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"txid\": \"1684599c-bb16-4250-af85-904291bfe7cc\",\n" +
@@ -615,11 +615,11 @@ public abstract class AbstractDuoActionTest {
" \"reason\": \"user_approved\",\n" +
" \"access_device\": {\n" +
" \"hostname\": null,\n" +
- " \"ip\": \"82.17.89.232\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"application\": {\n" +
@@ -629,7 +629,7 @@ public abstract class AbstractDuoActionTest {
" \"factor\": \""+factor+"\",\n" +
" \"user\": {\n" +
" \"key\": \"DUGL8U46QGJSOUJWG59W\",\n" +
- " \"name\": \"philsmart\"\n" +
+ " \"name\": \"jdoe\"\n" +
" }\n" +
" }\n" +
"}";
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java
index 247719f..3cb21eb 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java
@@ -79,7 +79,7 @@ public class MockDuoOIDCClient_FAIL implements DuoOIDCClient{
final String jwtJson = "{\n" +
" \"iss\": \"https://"+integration.getAPIHost()+"oauth/v1/token\",\n" +
" \"sub\": \""+SUB+"\",\n" +
- " \"preferred_username\": \"philsmart\",\n" +
+ " \"preferred_username\": \"jdoe\",\n" +
" \"aud\": \""+integration.getClientId()+"\",\n" +
" \"exp\": "+new String(Math.toIntExact(Instant.now().
plus(10,ChronoUnit.MINUTES).getEpochSecond())+",\n" +
@@ -94,12 +94,12 @@ public class MockDuoOIDCClient_FAIL implements DuoOIDCClient{
" \"result\": \"success\",\n" +
" \"timestamp\": 1599749128,\n" +
" \"auth_device\": {\n" +
- " \"ip\": \"82.17.89.232\",\n" +
- " \"name\": \"+44 7852 119881\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
+ " \"name\": \"+44 9999999\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"txid\": \"1684599c-bb16-4250-af85-904291bfe7cc\",\n" +
@@ -107,11 +107,11 @@ public class MockDuoOIDCClient_FAIL implements DuoOIDCClient{
" \"reason\": \"user_approved\",\n" +
" \"access_device\": {\n" +
" \"hostname\": null,\n" +
- " \"ip\": \"82.17.89.232\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"application\": {\n" +
@@ -121,7 +121,7 @@ public class MockDuoOIDCClient_FAIL implements DuoOIDCClient{
" \"factor\": \"duo_push\",\n" +
" \"user\": {\n" +
" \"key\": \"DUGL8U46QGJSOUJWG59W\",\n" +
- " \"name\": \"philsmart\"\n" +
+ " \"name\": \"jdoe\"\n" +
" }\n" +
" }\n" +
"}";
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java
index c3bce91..316225b 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java
@@ -91,12 +91,12 @@ public class MockDuoOIDCClient_OK implements DuoOIDCClient{
" \"result\": \"success\",\n" +
" \"timestamp\": 1599749128,\n" +
" \"auth_device\": {\n" +
- " \"ip\": \"82.17.89.232\",\n" +
- " \"name\": \"+44 7852 119881\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
+ " \"name\": \"+44 9999999\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"txid\": \"1684599c-bb16-4250-af85-904291bfe7cc\",\n" +
@@ -104,11 +104,11 @@ public class MockDuoOIDCClient_OK implements DuoOIDCClient{
" \"reason\": \"user_approved\",\n" +
" \"access_device\": {\n" +
" \"hostname\": null,\n" +
- " \"ip\": \"82.17.89.232\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"application\": {\n" +
@@ -118,7 +118,7 @@ public class MockDuoOIDCClient_OK implements DuoOIDCClient{
" \"factor\": \"duo_push\",\n" +
" \"user\": {\n" +
" \"key\": \"DUGL8U46QGJSOUJWG59W\",\n" +
- " \"name\": \"philsmart\"\n" +
+ " \"name\": \"jdoe\"\n" +
" }\n" +
" }\n" +
"}";
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java
index 29cc093..f78dca9 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java
@@ -93,12 +93,12 @@ public class MockDuoOIDCClient_OK_OLD_AUTH_TIME implements DuoOIDCClient{
" \"result\": \"success\",\n" +
" \"timestamp\": 1599749128,\n" +
" \"auth_device\": {\n" +
- " \"ip\": \"82.17.89.232\",\n" +
- " \"name\": \"+44 7852 119881\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
+ " \"name\": \"+44 9999999\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"txid\": \"1684599c-bb16-4250-af85-904291bfe7cc\",\n" +
@@ -106,11 +106,11 @@ public class MockDuoOIDCClient_OK_OLD_AUTH_TIME implements DuoOIDCClient{
" \"reason\": \"user_approved\",\n" +
" \"access_device\": {\n" +
" \"hostname\": null,\n" +
- " \"ip\": \"82.17.89.232\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"application\": {\n" +
@@ -120,7 +120,7 @@ public class MockDuoOIDCClient_OK_OLD_AUTH_TIME implements DuoOIDCClient{
" \"factor\": \"duo_push\",\n" +
" \"user\": {\n" +
" \"key\": \"DUGL8U46QGJSOUJWG59W\",\n" +
- " \"name\": \"philsmart\"\n" +
+ " \"name\": \"jdoe\"\n" +
" }\n" +
" }\n" +
"}";
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java
index fa5af4f..caea217 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java
@@ -79,7 +79,7 @@ public class MockDuoOIDCClient_UNKNOWN implements DuoOIDCClient{
final String jwtJson = "{\n" +
" \"iss\": \"https://"+integration.getAPIHost()+"oauth/v1/token\",\n" +
" \"sub\": \""+SUB+"\",\n" +
- " \"preferred_username\": \"philsmart\",\n" +
+ " \"preferred_username\": \"jdoe\",\n" +
" \"aud\": \""+integration.getClientId()+"\",\n" +
" \"exp\": "+new String(Math.toIntExact(Instant.now().
plus(10,ChronoUnit.MINUTES).getEpochSecond())+",\n" +
@@ -94,12 +94,12 @@ public class MockDuoOIDCClient_UNKNOWN implements DuoOIDCClient{
" \"result\": \"success\",\n" +
" \"timestamp\": 1599749128,\n" +
" \"auth_device\": {\n" +
- " \"ip\": \"82.17.89.232\",\n" +
- " \"name\": \"+44 7852 119881\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
+ " \"name\": \"+44 9999999\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"txid\": \"1684599c-bb16-4250-af85-904291bfe7cc\",\n" +
@@ -107,11 +107,11 @@ public class MockDuoOIDCClient_UNKNOWN implements DuoOIDCClient{
" \"reason\": \"user_approved\",\n" +
" \"access_device\": {\n" +
" \"hostname\": null,\n" +
- " \"ip\": \"82.17.89.232\",\n" +
+ " \"ip\": \"1.1.1.1\",\n" +
" \"location\": {\n" +
- " \"state\": \"Wales\",\n" +
- " \"city\": \"Cardiff\",\n" +
- " \"country\": \"United Kingdom\"\n" +
+ " \"state\": \"State\",\n" +
+ " \"city\": \"City\",\n" +
+ " \"country\": \"Country\"\n" +
" }\n" +
" },\n" +
" \"application\": {\n" +
@@ -121,7 +121,7 @@ public class MockDuoOIDCClient_UNKNOWN implements DuoOIDCClient{
" \"factor\": \"duo_push\",\n" +
" \"user\": {\n" +
" \"key\": \"DUGL8U46QGJSOUJWG59W\",\n" +
- " \"name\": \"philsmart\"\n" +
+ " \"name\": \"jdoe\"\n" +
" }\n" +
" }\n" +
"}";
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list