From b2c14647b6081d10915db6f637ec18c0485dc84e Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 15:28:15 -0400 Subject: [PATCH 01/20] only push to latest --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 00dece5..4cb31d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ deploy: - provider: script script: make push-image on: - all_branches: true + branch: latest condition: ${DOCKER_USERNAME} && ${DOCKER_PASSWORD} From 9adcb564dd67329dbb6c6c38bd518a49808aa0ea Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 15:54:22 -0400 Subject: [PATCH 02/20] fix --- .travis.yml | 3 ++- src/main/java/kabasec/Login.java | 29 +++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4cb31d7..3829c98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,8 @@ deploy: - provider: script script: make push-image on: - branch: latest +# branch: latest + all_branches: true condition: ${DOCKER_USERNAME} && ${DOCKER_PASSWORD} diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 4514d45..27bb39c 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -95,7 +95,7 @@ public Properties login(Properties args) { jwt = auth.getJwt(creds); // check id, password/PAT, and team membership here. } catch (KabaneroSecurityException e) { // Encountered an error requesting, parsing, or processing GitHub data for user - if (e.getMessage().contains("Encountered an error requesting, parsing, or processing GitHub data for user") || e.getMessage().contains("An error occurred during authentication for user Unexpected char")) { + if (checkApiUrlException(e.getMessage())) { msg = "login failed, you may want to check your authorization configuration. Double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct"; System.out.println("An error occurred during authentication for user, double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct, exception message: "+ e.getMessage()); Properties p = new Properties(); @@ -106,7 +106,7 @@ public Properties login(Properties args) { } return returnError(e.getStatusCode(), "An error occurred during authentication for user ", e); } catch (Exception e) { - if (e.getMessage().contains("could not parse exception response") || e.getMessage().contains("An error occurred during authentication for user Unexpected char") || e.getMessage().contains("Unexpected char 60 at (line no=1, column no=1, offset=0")) { + if (checkApiUrlException(e.getMessage())) { msg = "login failed, you may want to check your authorization configuration. Double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct"; System.out.println("An error occurred during authentication for user, double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct, exception message: "+e.getMessage()); Properties p = new Properties(); @@ -131,6 +131,31 @@ public Properties login(Properties args) { return returnSuccess(jwt); } + private boolean checkApiUrlException(String msg) { + boolean urlException=false; + final String error1="Encountered an error requesting, parsing, or processing GitHub data for user"; + final String error2="An error occurred during authentication for user Unexpected char"; + final String error3="Unexpected char 60 at (line no=1, column no=1, offset=0"; + final String error4="could not parse exception response"; + switch (msg) { + case error1: + urlException=true; + break; + case error2: + urlException=true; + break; + case error3: + urlException=true; + break; + case error4: + urlException=true; + break; + default: + break; + } + return urlException; + } + private void throttle() { // if it's less than 10 seconds, then sleep for 10 seconds if (System.currentTimeMillis()-lastTimeJWTissued<=10000) { From 749f5fb8927a36950fc2102295b2012b7d7ae81e Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 16:15:29 -0400 Subject: [PATCH 03/20] debug --- src/main/java/kabasec/Login.java | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 27bb39c..3b8daf2 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -133,26 +133,15 @@ public Properties login(Properties args) { private boolean checkApiUrlException(String msg) { boolean urlException=false; + System.out.println("msg="+msg+"|||"); final String error1="Encountered an error requesting, parsing, or processing GitHub data for user"; final String error2="An error occurred during authentication for user Unexpected char"; - final String error3="Unexpected char 60 at (line no=1, column no=1, offset=0"; + final String error3="Unexpected char 60 at (line no=1, column no=1, offset=0)"; final String error4="could not parse exception response"; - switch (msg) { - case error1: - urlException=true; - break; - case error2: - urlException=true; - break; - case error3: - urlException=true; - break; - case error4: - urlException=true; - break; - default: - break; - } + if (msg.contentEquals(error1)) urlException=true; + if (msg.contentEquals(error2)) urlException=true; + if (msg.contentEquals(error3)) urlException=true; + if (msg.contentEquals(error4)) urlException=true; return urlException; } From 52301c79bd74e0bcbda1053a6843b2d0f4fc0dfe Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 16:25:12 -0400 Subject: [PATCH 04/20] try again --- src/main/java/kabasec/Login.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 3b8daf2..44d2bef 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -136,11 +136,11 @@ private boolean checkApiUrlException(String msg) { System.out.println("msg="+msg+"|||"); final String error1="Encountered an error requesting, parsing, or processing GitHub data for user"; final String error2="An error occurred during authentication for user Unexpected char"; - final String error3="Unexpected char 60 at (line no=1, column no=1, offset=0)"; + final String error3="Unexpected char 60"; final String error4="could not parse exception response"; if (msg.contentEquals(error1)) urlException=true; if (msg.contentEquals(error2)) urlException=true; - if (msg.contentEquals(error3)) urlException=true; + if (msg.contains(error3)) urlException=true; if (msg.contentEquals(error4)) urlException=true; return urlException; } From 951430fc50eaae72686afa7e5b8635bb8b7d7aef Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 16:41:08 -0400 Subject: [PATCH 05/20] debug --- src/main/java/kabasec/Login.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 44d2bef..c059b8c 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -95,7 +95,7 @@ public Properties login(Properties args) { jwt = auth.getJwt(creds); // check id, password/PAT, and team membership here. } catch (KabaneroSecurityException e) { // Encountered an error requesting, parsing, or processing GitHub data for user - if (checkApiUrlException(e.getMessage())) { + if (checkApiUrlException(e)) { msg = "login failed, you may want to check your authorization configuration. Double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct"; System.out.println("An error occurred during authentication for user, double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct, exception message: "+ e.getMessage()); Properties p = new Properties(); @@ -106,7 +106,7 @@ public Properties login(Properties args) { } return returnError(e.getStatusCode(), "An error occurred during authentication for user ", e); } catch (Exception e) { - if (checkApiUrlException(e.getMessage())) { + if (checkApiUrlException(e)) { msg = "login failed, you may want to check your authorization configuration. Double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct"; System.out.println("An error occurred during authentication for user, double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct, exception message: "+e.getMessage()); Properties p = new Properties(); @@ -131,17 +131,22 @@ public Properties login(Properties args) { return returnSuccess(jwt); } - private boolean checkApiUrlException(String msg) { + private boolean checkApiUrlException(Exception e) { boolean urlException=false; + String msg = e.getMessage(); + e.printStackTrace(); System.out.println("msg="+msg+"|||"); final String error1="Encountered an error requesting, parsing, or processing GitHub data for user"; final String error2="An error occurred during authentication for user Unexpected char"; final String error3="Unexpected char 60"; final String error4="could not parse exception response"; + final String error5="An error occurred during authentication for user, double check the apiUrl:"; if (msg.contentEquals(error1)) urlException=true; if (msg.contentEquals(error2)) urlException=true; if (msg.contains(error3)) urlException=true; if (msg.contentEquals(error4)) urlException=true; + if (msg.contains(error5)) urlException=true; + System.out.println("urlException="+urlException); return urlException; } From 8addea6f32b83ac4985576a87eecb3e92c73e8ae Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 17:04:57 -0400 Subject: [PATCH 06/20] contains --- src/main/java/kabasec/Login.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index c059b8c..9db2e1e 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -102,7 +102,7 @@ public Properties login(Properties args) { p.put("message", msg); return p; } else { - System.out.println(returnError(500, "An error occurred during authentication for user", e)); + System.out.println("An error occurred during authentication for user, exception message: "+ e.getMessage()); } return returnError(e.getStatusCode(), "An error occurred during authentication for user ", e); } catch (Exception e) { @@ -136,15 +136,15 @@ private boolean checkApiUrlException(Exception e) { String msg = e.getMessage(); e.printStackTrace(); System.out.println("msg="+msg+"|||"); - final String error1="Encountered an error requesting, parsing, or processing GitHub data for user"; + final String error1="Encountered an error requesting, parsing"; final String error2="An error occurred during authentication for user Unexpected char"; final String error3="Unexpected char 60"; final String error4="could not parse exception response"; final String error5="An error occurred during authentication for user, double check the apiUrl:"; - if (msg.contentEquals(error1)) urlException=true; - if (msg.contentEquals(error2)) urlException=true; + if (msg.contains(error1)) urlException=true; + if (msg.contains(error2)) urlException=true; if (msg.contains(error3)) urlException=true; - if (msg.contentEquals(error4)) urlException=true; + if (msg.contains(error4)) urlException=true; if (msg.contains(error5)) urlException=true; System.out.println("urlException="+urlException); return urlException; From fd713ccffe6a3d2a2f6ea5a57a5d0cb6fad6c835 Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 17:07:00 -0400 Subject: [PATCH 07/20] simplify --- src/main/java/kabasec/Login.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 9db2e1e..849ff49 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -93,18 +93,6 @@ public Properties login(Properties args) { Authentication auth = new Authentication(); checkTeamsAndGithubURL(auth); jwt = auth.getJwt(creds); // check id, password/PAT, and team membership here. - } catch (KabaneroSecurityException e) { - // Encountered an error requesting, parsing, or processing GitHub data for user - if (checkApiUrlException(e)) { - msg = "login failed, you may want to check your authorization configuration. Double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct"; - System.out.println("An error occurred during authentication for user, double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct, exception message: "+ e.getMessage()); - Properties p = new Properties(); - p.put("message", msg); - return p; - } else { - System.out.println("An error occurred during authentication for user, exception message: "+ e.getMessage()); - } - return returnError(e.getStatusCode(), "An error occurred during authentication for user ", e); } catch (Exception e) { if (checkApiUrlException(e)) { msg = "login failed, you may want to check your authorization configuration. Double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct"; From eb5f7777c3348fde42053df01846bca425ceda96 Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 17:22:29 -0400 Subject: [PATCH 08/20] response status --- src/main/java/kabasec/Login.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 849ff49..6cff878 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -97,15 +97,12 @@ public Properties login(Properties args) { if (checkApiUrlException(e)) { msg = "login failed, you may want to check your authorization configuration. Double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct"; System.out.println("An error occurred during authentication for user, double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct, exception message: "+e.getMessage()); - Properties p = new Properties(); - p.put("message", msg); - return p; + return returnError(417, msg, e); + //return p; } else { System.out.println("An error occurred during authentication for user, exception message: "+e.getMessage()); } - Properties p = new Properties(); - p.put("message", msg); - return p; + return returnError(417, msg, e); } throttle(); lastTimeJWTissued=System.currentTimeMillis(); @@ -123,7 +120,7 @@ private boolean checkApiUrlException(Exception e) { boolean urlException=false; String msg = e.getMessage(); e.printStackTrace(); - System.out.println("msg="+msg+"|||"); + System.out.println("msg="+msg+"||"); final String error1="Encountered an error requesting, parsing"; final String error2="An error occurred during authentication for user Unexpected char"; final String error3="Unexpected char 60"; From 637ee6f9da4281943d426880f533677e0294b83a Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 17:51:10 -0400 Subject: [PATCH 09/20] comma --- src/main/java/kabasec/Login.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 6cff878..ac204bd 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -98,7 +98,6 @@ public Properties login(Properties args) { msg = "login failed, you may want to check your authorization configuration. Double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct"; System.out.println("An error occurred during authentication for user, double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct, exception message: "+e.getMessage()); return returnError(417, msg, e); - //return p; } else { System.out.println("An error occurred during authentication for user, exception message: "+e.getMessage()); } @@ -120,7 +119,6 @@ private boolean checkApiUrlException(Exception e) { boolean urlException=false; String msg = e.getMessage(); e.printStackTrace(); - System.out.println("msg="+msg+"||"); final String error1="Encountered an error requesting, parsing"; final String error2="An error occurred during authentication for user Unexpected char"; final String error3="Unexpected char 60"; @@ -131,7 +129,6 @@ private boolean checkApiUrlException(Exception e) { if (msg.contains(error3)) urlException=true; if (msg.contains(error4)) urlException=true; if (msg.contains(error5)) urlException=true; - System.out.println("urlException="+urlException); return urlException; } @@ -185,7 +182,7 @@ private String buildErrorMessageString(String errorMsg, Exception e) { fullErrorMsg += " " + errorMsg; } if (e != null) { - fullErrorMsg += " " + e.getMessage(); + fullErrorMsg += ", " + e.getMessage(); } return fullErrorMsg; } From dc860427dad10325f62675c5129d4469631ce564 Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 17:55:31 -0400 Subject: [PATCH 10/20] 424 --- src/main/java/kabasec/Login.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index ac204bd..9c70a5e 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -97,11 +97,11 @@ public Properties login(Properties args) { if (checkApiUrlException(e)) { msg = "login failed, you may want to check your authorization configuration. Double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct"; System.out.println("An error occurred during authentication for user, double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct, exception message: "+e.getMessage()); - return returnError(417, msg, e); + return returnError(424, msg, e); } else { System.out.println("An error occurred during authentication for user, exception message: "+e.getMessage()); } - return returnError(417, msg, e); + return returnError(424, msg, e); } throttle(); lastTimeJWTissued=System.currentTimeMillis(); From 96f9a58f46716432b7c2af15bb8d5df200cddb5e Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 18:07:07 -0400 Subject: [PATCH 11/20] reset --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3829c98..00dece5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ deploy: - provider: script script: make push-image on: -# branch: latest all_branches: true condition: ${DOCKER_USERNAME} && ${DOCKER_PASSWORD} From 98c276142d260af7ae058f7a3649f3d615ba04de Mon Sep 17 00:00:00 2001 From: davco01a Date: Tue, 12 May 2020 18:27:51 -0400 Subject: [PATCH 12/20] shorten error msg to client --- src/main/java/kabasec/Login.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 9c70a5e..a5c7223 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -97,7 +97,7 @@ public Properties login(Properties args) { if (checkApiUrlException(e)) { msg = "login failed, you may want to check your authorization configuration. Double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct"; System.out.println("An error occurred during authentication for user, double check the apiUrl: in your github: configuraton in the Kabanero CR Instance to make sure it's correct, exception message: "+e.getMessage()); - return returnError(424, msg, e); + return returnError(424, msg, null); } else { System.out.println("An error occurred during authentication for user, exception message: "+e.getMessage()); } From a57d9bcaa39b4e875211a78c1c1de4f1aa257784 Mon Sep 17 00:00:00 2001 From: davco01a Date: Wed, 13 May 2020 09:55:14 -0400 Subject: [PATCH 13/20] 401 for other --- src/main/java/kabasec/Login.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index a5c7223..5fec9a1 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -101,7 +101,7 @@ public Properties login(Properties args) { } else { System.out.println("An error occurred during authentication for user, exception message: "+e.getMessage()); } - return returnError(424, msg, e); + return returnError(401, msg, e); } throttle(); lastTimeJWTissued=System.currentTimeMillis(); From d67e9e459989116fdcc76400b4aac502508b80e2 Mon Sep 17 00:00:00 2001 From: davco01a Date: Wed, 13 May 2020 10:09:04 -0400 Subject: [PATCH 14/20] improve exception handling --- src/main/java/kabasec/Login.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 5fec9a1..4223e12 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -101,7 +101,12 @@ public Properties login(Properties args) { } else { System.out.println("An error occurred during authentication for user, exception message: "+e.getMessage()); } - return returnError(401, msg, e); + if (e instanceof KabaneroSecurityException) { + KabaneroSecurityException k = (KabaneroSecurityException)e; + returnError(k.getStatusCode(), "An error occurred during authentication for user", e); + } else { + return returnError(401, "An error occurred during authentication for user", e); + } } throttle(); lastTimeJWTissued=System.currentTimeMillis(); From 26dfebcd9e56c80873264848af520ee2bf7487be Mon Sep 17 00:00:00 2001 From: davco01a Date: Wed, 13 May 2020 10:30:40 -0400 Subject: [PATCH 15/20] more granular ex --- src/main/java/kabasec/Login.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 4223e12..481adba 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -124,16 +124,24 @@ private boolean checkApiUrlException(Exception e) { boolean urlException=false; String msg = e.getMessage(); e.printStackTrace(); + final String error0="Bad Credentials"; final String error1="Encountered an error requesting, parsing"; final String error2="An error occurred during authentication for user Unexpected char"; final String error3="Unexpected char 60"; final String error4="could not parse exception response"; final String error5="An error occurred during authentication for user, double check the apiUrl:"; - if (msg.contains(error1)) urlException=true; - if (msg.contains(error2)) urlException=true; - if (msg.contains(error3)) urlException=true; - if (msg.contains(error4)) urlException=true; - if (msg.contains(error5)) urlException=true; + if (msg.contains(error1)) { + String cause=""; + if (e.getCause()!=null) cause = e.getCause().toString(); + if (cause.contains(error0) || e.getMessage().contains(error0)) { + urlException=false; + } + else urlException=true; + } + else if (msg.contains(error2)) urlException=true; + else if (msg.contains(error3)) urlException=true; + else if (msg.contains(error4)) urlException=true; + else if (msg.contains(error5)) urlException=true; return urlException; } From 8633837a6f6a84e4546122570e977080e7878371 Mon Sep 17 00:00:00 2001 From: davco01a Date: Wed, 13 May 2020 10:44:51 -0400 Subject: [PATCH 16/20] more chex --- src/main/java/kabasec/Login.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 481adba..37f1896 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -124,7 +124,8 @@ private boolean checkApiUrlException(Exception e) { boolean urlException=false; String msg = e.getMessage(); e.printStackTrace(); - final String error0="Bad Credentials"; + final String error00="Received unexpected 401 response from GET request"; + final String error0="Bad credentials"; final String error1="Encountered an error requesting, parsing"; final String error2="An error occurred during authentication for user Unexpected char"; final String error3="Unexpected char 60"; @@ -133,7 +134,7 @@ private boolean checkApiUrlException(Exception e) { if (msg.contains(error1)) { String cause=""; if (e.getCause()!=null) cause = e.getCause().toString(); - if (cause.contains(error0) || e.getMessage().contains(error0)) { + if (cause.contains(error00) ||cause.contains(error0) || e.getMessage().contains(error0)) { urlException=false; } else urlException=true; From 48f43d8ce786116929326977d38a4523a1e3b6e5 Mon Sep 17 00:00:00 2001 From: davco01a Date: Wed, 13 May 2020 11:07:48 -0400 Subject: [PATCH 17/20] debug --- src/main/java/kabasec/Login.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 37f1896..5a04edb 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -122,7 +122,14 @@ public Properties login(Properties args) { private boolean checkApiUrlException(Exception e) { boolean urlException=false; + String msg = e.getMessage(); + String cause=""; + if (e.getCause()!=null) cause = e.getCause().toString(); + System.out.println("in checkApiUrlException"); + System.out.println("exception msg="+msg); + System.out.println("exception cause="+cause); + e.printStackTrace(); final String error00="Received unexpected 401 response from GET request"; final String error0="Bad credentials"; @@ -132,9 +139,7 @@ private boolean checkApiUrlException(Exception e) { final String error4="could not parse exception response"; final String error5="An error occurred during authentication for user, double check the apiUrl:"; if (msg.contains(error1)) { - String cause=""; - if (e.getCause()!=null) cause = e.getCause().toString(); - if (cause.contains(error00) ||cause.contains(error0) || e.getMessage().contains(error0)) { + if (cause.contains(error00) || cause.contains(error0) || msg.contains(error00)|| msg.contains(error0)) { urlException=false; } else urlException=true; From 6ccef17ff0be64ade7dd2523344ac56e290ed3dd Mon Sep 17 00:00:00 2001 From: davco01a Date: Wed, 13 May 2020 11:33:46 -0400 Subject: [PATCH 18/20] just if then elses --- src/main/java/kabasec/Login.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 5a04edb..7a461ed 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -138,12 +138,13 @@ private boolean checkApiUrlException(Exception e) { final String error3="Unexpected char 60"; final String error4="could not parse exception response"; final String error5="An error occurred during authentication for user, double check the apiUrl:"; - if (msg.contains(error1)) { - if (cause.contains(error00) || cause.contains(error0) || msg.contains(error00)|| msg.contains(error0)) { - urlException=false; - } - else urlException=true; - } + + if (msg.contains(error00)) urlException=false; + else if (msg.contains(error0)) urlException=false; + else if (cause.contains(error00)) urlException=false; + else if (cause.contains(error00)) urlException=false; + else if (cause.contains(error0)) urlException=false; + else if (msg.contains(error1)) urlException=true; else if (msg.contains(error2)) urlException=true; else if (msg.contains(error3)) urlException=true; else if (msg.contains(error4)) urlException=true; From 456edd1ff904bdc2625fae78f8842af62af1085f Mon Sep 17 00:00:00 2001 From: davco01a Date: Wed, 13 May 2020 11:49:14 -0400 Subject: [PATCH 19/20] fix --- src/main/java/kabasec/Login.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 7a461ed..8b8baa9 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -103,7 +103,7 @@ public Properties login(Properties args) { } if (e instanceof KabaneroSecurityException) { KabaneroSecurityException k = (KabaneroSecurityException)e; - returnError(k.getStatusCode(), "An error occurred during authentication for user", e); + return returnError(k.getStatusCode(), "An error occurred during authentication for user", e); } else { return returnError(401, "An error occurred during authentication for user", e); } @@ -149,6 +149,7 @@ private boolean checkApiUrlException(Exception e) { else if (msg.contains(error3)) urlException=true; else if (msg.contains(error4)) urlException=true; else if (msg.contains(error5)) urlException=true; + System.out.println("urlException="+urlException); return urlException; } From 03b57e750e41a01f258f5efc311874cc5ca67581 Mon Sep 17 00:00:00 2001 From: davco01a Date: Wed, 13 May 2020 11:52:31 -0400 Subject: [PATCH 20/20] rename vars --- src/main/java/kabasec/Login.java | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/kabasec/Login.java b/src/main/java/kabasec/Login.java index 8b8baa9..ebaef97 100644 --- a/src/main/java/kabasec/Login.java +++ b/src/main/java/kabasec/Login.java @@ -131,24 +131,23 @@ private boolean checkApiUrlException(Exception e) { System.out.println("exception cause="+cause); e.printStackTrace(); - final String error00="Received unexpected 401 response from GET request"; - final String error0="Bad credentials"; - final String error1="Encountered an error requesting, parsing"; - final String error2="An error occurred during authentication for user Unexpected char"; - final String error3="Unexpected char 60"; - final String error4="could not parse exception response"; - final String error5="An error occurred during authentication for user, double check the apiUrl:"; + final String error0="Received unexpected 401 response from GET request"; + final String error1="Bad credentials"; + final String error2="Encountered an error requesting, parsing"; + final String error3="An error occurred during authentication for user Unexpected char"; + final String error4="Unexpected char 60"; + final String error5="could not parse exception response"; + final String error6="An error occurred during authentication for user, double check the apiUrl:"; - if (msg.contains(error00)) urlException=false; - else if (msg.contains(error0)) urlException=false; - else if (cause.contains(error00)) urlException=false; - else if (cause.contains(error00)) urlException=false; - else if (cause.contains(error0)) urlException=false; - else if (msg.contains(error1)) urlException=true; + if (msg.contains(error0)) urlException=false; + else if (msg.contains(error1)) urlException=false; + else if (cause.contains(error0)) urlException=false; + else if (cause.contains(error1)) urlException=false; else if (msg.contains(error2)) urlException=true; else if (msg.contains(error3)) urlException=true; else if (msg.contains(error4)) urlException=true; else if (msg.contains(error5)) urlException=true; + else if (msg.contains(error6)) urlException=true; System.out.println("urlException="+urlException); return urlException; }