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 2013/10/24 20:59:49 UTC
svn commit: r1535498 - in /openmeetings/trunk/singlewebapp/src:
util/java/org/apache/openmeetings/util/crypt/MD5.java
web/java/org/apache/openmeetings/web/app/WebSession.java
Author: solomax
Date: Thu Oct 24 18:59:49 2013
New Revision: 1535498
URL: http://svn.apache.org/r1535498
Log:
[OPENMEETINGS-818] room enter via secureHash is fixed
code clean up;
Modified:
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5.java?rev=1535498&r1=1535497&r2=1535498&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/crypt/MD5.java Thu Oct 24 18:59:49 2013
@@ -21,28 +21,14 @@ package org.apache.openmeetings.util.cry
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-public class MD5 {
+import org.apache.commons.codec.binary.Hex;
- private static String toHexString(byte b) {
- int value = (b & 0x7F) + (b < 0 ? 128 : 0);
-
- String ret = (value < 16 ? "0" : "");
- ret += Integer.toHexString(value).toLowerCase();
-
- return ret;
- }
-
- public static String do_checksum(String data) throws NoSuchAlgorithmException {
- MessageDigest md5 = MessageDigest.getInstance("MD5");
- StringBuffer strbuf = new StringBuffer();
+public class MD5 {
+ public static String do_checksum(String data) throws NoSuchAlgorithmException {
+ MessageDigest md5 = MessageDigest.getInstance("MD5");
md5.update(data.getBytes(), 0, data.length());
- byte[] digest = md5.digest();
-
- for (int i = 0; i < digest.length; i++) {
- strbuf.append(toHexString(digest[i]));
- }
- return strbuf.toString();
+ return Hex.encodeHexString(md5.digest());
}
}
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java?rev=1535498&r1=1535497&r2=1535498&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java Thu Oct 24 18:59:49 2013
@@ -116,7 +116,11 @@ public class WebSession extends Abstract
if (!secureHash.isEmpty()) {
PageParameters pp = new PageParameters();
for (String p : params.getParameterNames()) {
- pp.add(p, params.getParameterValues(p));
+ for (StringValue sv : params.getParameterValues(p)) {
+ if (!sv.isEmpty()) {
+ pp.add(p, sv.toString());
+ }
+ }
}
throw new RestartResponseAtInterceptPageException(SwfPage.class, pp);
}