fix: Fixes for 4.5.4 #284

Signed-off-by: jgomer2001 <[email protected]>
GluuFederation · Jul 17, 2024 · 1be8f5d · 1be8f5d
1 parent d04143a
commit 1be8f5d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/plugins/email_2fa_core/pom.xml b/plugins/email_2fa_core/pom.xml
@@ -55,21 +55,30 @@
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk18on</artifactId>
-			<version>1.76</version>
+			<version>1.78.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcpkix-jdk18on</artifactId>
-			<version>1.78</version>
+			<version>1.78.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcmail-jdk18on</artifactId>
-			<version>1.76</version>
+			<version>1.78.1</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcutil-jdk18on</artifactId>
+			<version>1.78.1</version>
+			<scope>provided</scope>
+			<!-- strangely casa v4_5_4 has bcutil 1.76. Also, scope=provided should not be used here,
+			however bcmail lib cannot see the bcutil classes if they are bundled with the plugin.
+			This means casa war has to be manually updated (in the case of 4_5_4) :( -->
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/plugins/email_2fa_core/src/main/java/org/gluu/casa/plugins/emailotp/EmailOTPService.java b/plugins/email_2fa_core/src/main/java/org/gluu/casa/plugins/emailotp/EmailOTPService.java
@@ -71,10 +71,6 @@ public class EmailOTPService {
 	private long connectionTimeout = 5000;
     private KeyStore keyStore;
 
-    static {
-        SecurityProviderUtility.installBCProvider();
-    }
-
     /**
      * 
      */

diff --git a/plugins/email_2fa_core/src/main/resources/labels/zk-label.properties b/plugins/email_2fa_core/src/main/resources/labels/zk-label.properties
@@ -7,7 +7,7 @@ email.settings_button_label= Add
 #phone numbers
 usr.email_label=OTP sent via e-mail
 usr.email_title=Email addresses
-usr.email_text=Register trusted e-mail addresses where you can receive one-time passcodes (OTPs) for authenticating the user.
+usr.email_text=Register trusted e-mail addresses where you can receive one-time passcodes (OTPs) for authenticating.
 usr.email_summary=Currently, you have {0} registered email addresses
 usr.email_manage=Manage email addresses
 usr.email_add=Add e-mail address

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
         <ldapsdk.version>6.0.4</ldapsdk.version>
         <resteasy.version>4.7.8.Final</resteasy.version>
         <tika.version>2.4.1</tika.version>
-        <bc.version>1.78</bc.version>
+        <bc.version>1.78.1</bc.version>
         <sonar.projectKey>GluuFederation_casa</sonar.projectKey>
         <sonar.moduleKey>${project.groupId}:${project.artifactId}</sonar.moduleKey>
         <sonar.organization>gluufederation</sonar.organization>