From 12231762d3f2681bf6a5062931659a9aea8e815a Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Sun, 12 Mar 2023 21:49:53 +0100 Subject: [PATCH] [DEV] set SSO optionnal. (no security mode) --- pom.xml | 2 +- src/org/kar/archidata/SqlWrapper.java | 2 +- src/org/kar/archidata/UpdateJwtPublicKey.java | 8 +++++++- src/org/kar/archidata/util/ConfigBaseVariable.java | 4 ---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 0250175..4c43eec 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 kangaroo-and-rabbit archidata - 0.3.3 + 0.3.4 3.1.1 2.3.1 diff --git a/src/org/kar/archidata/SqlWrapper.java b/src/org/kar/archidata/SqlWrapper.java index 00a1c94..39a4324 100644 --- a/src/org/kar/archidata/SqlWrapper.java +++ b/src/org/kar/archidata/SqlWrapper.java @@ -756,7 +756,7 @@ public class SqlWrapper { query.append(".deleted = false "); */ firstField = true; - System.out.println("generate the query: '" + query.toString() + "'"); + //System.out.println("generate the query: '" + query.toString() + "'"); // prepare the request: PreparedStatement ps = entry.connection.prepareStatement(query.toString(), Statement.RETURN_GENERATED_KEYS); whereInjectValue(ps, condition); diff --git a/src/org/kar/archidata/UpdateJwtPublicKey.java b/src/org/kar/archidata/UpdateJwtPublicKey.java index 74c6897..d4efdb0 100644 --- a/src/org/kar/archidata/UpdateJwtPublicKey.java +++ b/src/org/kar/archidata/UpdateJwtPublicKey.java @@ -6,8 +6,13 @@ import org.kar.archidata.util.JWTWrapper; public class UpdateJwtPublicKey extends Thread { boolean kill = false; public void run() { + if (ConfigBaseVariable.getSSOAddress() == null) { + System.out.println("SSO INTERFACE is not provided ==> work alone."); + // No SO provided, kill the thread. + return; + } while (this.kill == false) { - // need to uppgrade when server call us... + // need to upgrade when server call us... try { JWTWrapper.initLocalTokenRemote(ConfigBaseVariable.getSSOAddress(), "archidata"); } catch (Exception e1) { @@ -16,6 +21,7 @@ public class UpdateJwtPublicKey extends Thread { return; } try { + // update every 5 minutes the master token Thread.sleep(1000*60*5, 0); } catch (InterruptedException e) { e.printStackTrace(); diff --git a/src/org/kar/archidata/util/ConfigBaseVariable.java b/src/org/kar/archidata/util/ConfigBaseVariable.java index bd174bf..b2f7aaa 100644 --- a/src/org/kar/archidata/util/ConfigBaseVariable.java +++ b/src/org/kar/archidata/util/ConfigBaseVariable.java @@ -77,10 +77,6 @@ public class ConfigBaseVariable { } public static String getSSOAddress() { - if (ssoAdress == null) { - //return "http://sso_host/api/"; - return "http://192.168.1.156/karso/api/"; - } return ssoAdress; } public static String ssoToken() {