You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/06/18 09:14:21 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2042] some
other issues are fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new e68e5f5 [OPENMEETINGS-2042] some other issues are fixed
e68e5f5 is described below
commit e68e5f5177ba6dd69f1c95d5c27ea9471ef5d25b
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Jun 18 16:14:11 2019 +0700
[OPENMEETINGS-2042] some other issues are fixed
---
.../openmeetings/util/crypt/CryptProvider.java | 23 +++++++++++-----------
.../apache/openmeetings/web/common/Captcha.java | 4 ++--
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java
index 9d8cf1e..d0046ab 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java
@@ -23,25 +23,24 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.getCryptClassNa
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import net.jcip.annotations.ThreadSafe;
+
+@ThreadSafe
public class CryptProvider {
private static final Logger log = LoggerFactory.getLogger(CryptProvider.class);
private static ICrypt crypt;
private CryptProvider() {}
- public static ICrypt get() {
+ public static synchronized ICrypt get() {
if (crypt == null) {
- synchronized (CryptProvider.class) {
- if (crypt == null) {
- String clazz = getCryptClassName();
- try {
- log.debug("getInstanceOfCrypt:: configKeyCryptClassName: {}", clazz);
-
- crypt = clazz == null ? null : (ICrypt) Class.forName(clazz).getDeclaredConstructor().newInstance();
- } catch (Exception err) {
- log.error("[getInstanceOfCrypt]", err);
- }
- }
+ String clazz = getCryptClassName();
+ try {
+ log.debug("get:: configKeyCryptClassName: {}", clazz);
+
+ crypt = clazz == null ? null : (ICrypt) Class.forName(clazz).getDeclaredConstructor().newInstance();
+ } catch (Exception err) {
+ log.error("[get]", err);
}
}
return crypt;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java
index e58ad5c..6f8f6df 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.common;
import static java.nio.charset.StandardCharsets.UTF_8;
-import java.util.Random;
+import java.security.SecureRandom;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -44,7 +44,7 @@ public class Captcha extends Panel {
private String randomText;
private final CaptchaImageResource captchaImageResource = new CaptchaImageResource() {
private static final long serialVersionUID = 1L;
- private Random rnd = new Random();
+ private SecureRandom rnd = new SecureRandom();
@Override
protected byte[] render() {