Merge branch 'main' into jans-cedarling-10479

JanssenProject · Jan 18, 2025 · 56e36f4 · 56e36f4
2 parents 25d4ab7 + ef8a07a
commit 56e36f4
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 30 deletions.
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -334,8 +334,10 @@ jobs:
           TAG="0.0.0"
         fi
         wget https://github.com/${{ github.repository }}/releases/download/"${VER}"/cedarling_wasm_"${TAG}"_pkg.tar.gz -O cedarling_wasm.tar.gz
-        mkdir wasm
-        tar -xvf cedarling_wasm.tar.gz -C wasm
+        mkdir -p src/wasm
+        tar -xvf cedarling_wasm.tar.gz -C src/wasm
+        rm cedarling_wasm.tar.gz
+        ls src/wasm
         # END Get the latest cedarling wasm package
         npm install
         npm run build
@@ -435,4 +437,4 @@ jobs:
         sha256sum cedarling_wasm_"${TAG}"_pkg.tar.gz > cedarling_wasm_"${TAG}"_pkg.tar.gz.sha256sum
         gpg --armor --detach-sign cedarling_wasm_"${TAG}"_pkg.tar.gz || echo "Failed to sign"
         echo "${{ secrets.MOAUTO_WORKFLOW_TOKEN }}" | gh auth login --with-token
-        gh release upload "${VERSION}" *.tar.gz *.sha256sum *.asc
+        gh release upload "${VERSION}" *.tar.gz *.sha256sum *.asc
diff --git a/demos/jans-tarp/src/options/homePage.tsx b/demos/jans-tarp/src/options/homePage.tsx
@@ -5,11 +5,9 @@ import Tab from '@mui/material/Tab';
 import Box from '@mui/material/Box';
 import Password from '@mui/icons-material/Password';
 import LockPerson from '@mui/icons-material/LockPerson';
-import OIDCClients from './OIDCClients';
+import OIDCClients from './oidcClients';
 import Cedarling from './cedarling';
 import Grid from '@mui/material/Grid';
-import Paper from '@mui/material/Paper';
-import { styled } from '@mui/material/styles';
 
 interface TabPanelProps {
   children?: React.ReactNode;

diff --git a/docs/janssen-server/install/vm-install/rhel.md b/docs/janssen-server/install/vm-install/rhel.md
@@ -41,15 +41,15 @@ sudo rpm -import automation-jans-public-gpg.asc
   [Releases](https://github.com/JanssenProject/jans/releases)
 
 ```
-wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version-stable.el8.x86_64.rpm -P ~/
+wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version.el8.x86_64.rpm -P ~/
 ```
 
 - Verify integrity of the downloaded package using published `sha256sum`.
 
     Download `sha256sum` file for the package
 
     ```shell
-    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version-stable.el8.x86_64.rpm.sha256sum -P ~/
+    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version.el8.x86_64.rpm.sha256sum -P ~/
     ```
 
     Check the hash if it is matching.

diff --git a/docs/janssen-server/install/vm-install/suse.md b/docs/janssen-server/install/vm-install/suse.md
@@ -53,15 +53,15 @@ sudo rpm -import automation-jans-public-gpg.asc
   [Releases](https://github.com/JanssenProject/jans/releases)
 
 ```shell
-wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version-stable.suse15.x86_64.rpm
+wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version.suse15.x86_64.rpm
 ```
 
 - Verify integrity of the downloaded package using published `sha256sum`.
 
 Download `sha256sum` file for the package
 
 ```shell
-wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version-stable.suse15.x86_64.rpm.sha256sum
+wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans-replace-janssen-version.suse15.x86_64.rpm.sha256sum
 ```
 
 Check the hash if it is matching. You may need to change your working directory

diff --git a/docs/janssen-server/install/vm-install/ubuntu.md b/docs/janssen-server/install/vm-install/ubuntu.md
@@ -38,15 +38,15 @@ sudo gpg --import automation-jans-public-gpg.asc;
 [Releases](https://github.com/JanssenProject/jans/releases)
 
 ```
-wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version-stable.ubuntu22.04_amd64.deb -P /tmp
+wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version.ubuntu22.04_amd64.deb -P /tmp
 ```
 
 - Verify integrity of the downloaded package by verifying published `sha256sum`.   
 
     Download `sha256sum` file for the package
 
     ```shell
-    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version-stable.ubuntu22.04_amd64.deb.sha256sum -P /tmp
+    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version.ubuntu22.04_amd64.deb.sha256sum -P /tmp
     ```
 
     Check the hash if it is matching.
@@ -74,15 +74,15 @@ sudo apt install  ./jans_replace-janssen-version.ubuntu22.04_amd64.deb
 [Releases](https://github.com/JanssenProject/jans/releases)
 
 ```
-wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version-stable.ubuntu20.04_amd64.deb -P /tmp
+wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version.ubuntu20.04_amd64.deb -P /tmp
 ```
 
 - Verify integrity of the downloaded package by verifying published `sha256sum`.   
 
     Download `sha256sum` file for the package
 
     ```shell
-    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version-stable.ubuntu20.04_amd64.deb.sha256sum -P /tmp
+    wget https://github.com/JanssenProject/jans/releases/download/vreplace-janssen-version/jans_replace-janssen-version.ubuntu20.04_amd64.deb.sha256sum -P /tmp
     ```
 
     Check the hash if it is matching.

diff --git a/...th-server/server/src/test/java/io/jans/as/server/comp/db/UserJansExtUidAttributeTest.java b/...th-server/server/src/test/java/io/jans/as/server/comp/db/UserJansExtUidAttributeTest.java
@@ -11,6 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.File;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -87,10 +88,9 @@ public static void init() {
     @Produces
     @ApplicationScoped
     public StringEncrypter getStringEncrypter() throws EncryptionException {
-    	log.info("Current folder: {}", (new File(".").getAbsolutePath()));
-    	System.out.println("Current folder: {}" +(new File(".").getAbsolutePath()));
+        String saltFilePath = Paths.get(Paths.get("").toAbsolutePath().toString(), "target/conf/salt").toAbsolutePath().toString();
+        FileConfiguration cryptoConfiguration = new FileConfiguration(saltFilePath);
 
-    	FileConfiguration cryptoConfiguration = new FileConfiguration(".\\target\\conf\\salt");
         String encodeSalt = cryptoConfiguration.getString("encodeSalt");
 
         return StringEncrypter.instance(encodeSalt);

diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/comp/db/UserServiceTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/comp/db/UserServiceTest.java
@@ -10,6 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Properties;
 
@@ -87,7 +88,8 @@ public static void init() {
     @Produces
     @ApplicationScoped
     public StringEncrypter getStringEncrypter() throws EncryptionException {
-        FileConfiguration cryptoConfiguration = new FileConfiguration(".\\target\\conf\\salt");
+        String saltFilePath = Paths.get(Paths.get("").toAbsolutePath().toString(), "target/conf/salt").toAbsolutePath().toString();
+        FileConfiguration cryptoConfiguration = new FileConfiguration(saltFilePath);
         String encodeSalt = cryptoConfiguration.getString("encodeSalt");
 
         return StringEncrypter.instance(encodeSalt);
@@ -295,7 +297,7 @@ public void findUserAfterAddAuthenticator() {
         assertNotNull(user.getAuthenticator());
         assertNotNull(user.getAuthenticator().getAuthenticators());
         assertEquals(user.getAuthenticator().getAuthenticators().size(), 1);
-        assertEquals(userAuthenticatorService.getUserAuthenticatorsByType(user, "type1"), Arrays.asList(new UserAuthenticator("id2", "type2")));
+        assertEquals(userAuthenticatorService.getUserAuthenticatorsByType(user, "type2"), Arrays.asList(new UserAuthenticator("id2", "type2")));
 
     }
 

diff --git a/jans-cedarling/flask-sidecar/Dockerfile b/jans-cedarling/flask-sidecar/Dockerfile
@@ -31,7 +31,7 @@ RUN pip3 install "poetry==$POETRY_VERSION" gunicorn \
 # ===============
 # Project setup
 # ===============
-ENV JANS_SOURCE_VERSION=2779a7e70e23be1c0afc810abd27910c60fcd9b1
+ENV JANS_SOURCE_VERSION=6c06ade0dcfc8530d85f9949a604acf77fe1e6be
 
 COPY docker-entrypoint.sh /
 RUN chmod +x /docker-entrypoint.sh

diff --git a/jans-linux-setup/jans_setup/templates/jans-keycloak-link/jans-keycloak-link-config.json b/jans-linux-setup/jans_setup/templates/jans-keycloak-link/jans-keycloak-link-config.json
@@ -73,13 +73,13 @@
   "snapshotFolder": "%(snapshots_dir)s",
   "snapshotMaxCount": 10,
   "keycloakConfiguration": {
-    "serverUrl": "http://localhost:8180",
-    "realm": "master",
-    "clientId": "clientserviceaccount",
-    "clientSecret": "cbyFHt3MMU2vNluAmzXopl9SHx9CUmfC",
-    "grantType": "client_credentials",
-    "username": "admin",
-    "password": "keycloak"
+    "serverUrl": "",
+    "realm": "",
+    "clientId": "",
+    "clientSecret": "",
+    "grantType": "",
+    "username": "",
+    "password": ""
   },
   "baseDN": null,
   "personObjectClassTypes": null,

diff --git a/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java b/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java
@@ -8,6 +8,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -55,7 +56,11 @@ public Object getValue() {
 
     public void setValue(Object value) {
         this.values = new ArrayList<>();
-        this.values.add(value);
+    	if (value instanceof List) {
+            this.values.addAll((Collection<? extends Object>) value);
+    	} else {
+    		this.values.add(value);
+    	}
         this.multiValued = false;
     }
 

diff --git a/jans-orm/util/src/main/java/io/jans/orm/util/properties/FileConfiguration.java b/jans-orm/util/src/main/java/io/jans/orm/util/properties/FileConfiguration.java
@@ -6,6 +6,7 @@
 
 package io.jans.orm.util.properties;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -77,9 +78,9 @@ protected void loadProperties() {
 
 			this.loaded = true;
 		} catch (ConfigurationException ex) {
-			LOG.error(String.format("Failed to load '%s' configuration file from config folder", this.fileName));
+			LOG.error(String.format("Failed to load '%s' configuration file from config folder. Current folder: '%s'", this.fileName, (new File(".").getAbsolutePath())));
 		} catch (Exception e) {
-			LOG.error(String.format("Failed to load '%s' configuration file from config folder", this.fileName));
+			LOG.error(String.format("Failed to load '%s' configuration file from config folder. Current folder: '%s'", this.fileName, (new File(".").getAbsolutePath())));
 			LOG.error(e.getMessage(), e);
 		}
 	}