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 2015/03/16 09:08:08 UTC
svn commit: r1666906 - in /openmeetings:
branches/3.0.x/src/util/java/org/apache/openmeetings/util/crypt/
trunk/singlewebapp/openmeetings-server/src/site/xdoc/
trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/
trunk...
Author: solomax
Date: Mon Mar 16 08:08:08 2015
New Revision: 1666906
URL: http://svn.apache.org/r1666906
Log:
Documentation related to Custom Crypt-Style is updated
Modified:
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
openmeetings/trunk/site/CustomCryptMechanism.html
Modified: openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java?rev=1666906&r1=1666905&r2=1666906&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java (original)
+++ openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java Mon Mar 16 08:08:08 2015
@@ -26,6 +26,7 @@ public class MD5CryptImplementation impl
* (non-Javadoc)
* @see org.apache.openmeetings.utils.crypt.ICryptString#createPassPhrase(java.lang.String)
*/
+ @Override
public String createPassPhrase(String userGivenPass) {
String passPhrase = null;
try {
@@ -40,6 +41,7 @@ public class MD5CryptImplementation impl
* (non-Javadoc)
* @see org.apache.openmeetings.utils.crypt.ICryptString#verifyPassword(java.lang.String, java.lang.String)
*/
+ @Override
public Boolean verifyPassword(String passGiven, String passwdFromDb) {
boolean validPassword = false;
String salt = passwdFromDb.split("\\$")[2];
Modified: openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/crypt/MD5Implementation.java?rev=1666906&r1=1666905&r2=1666906&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/crypt/MD5Implementation.java (original)
+++ openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/crypt/MD5Implementation.java Mon Mar 16 08:08:08 2015
@@ -26,6 +26,7 @@ public class MD5Implementation implement
* (non-Javadoc)
* @see org.apache.openmeetings.utils.crypt.ICryptString#createPassPhrase(java.lang.String)
*/
+ @Override
public String createPassPhrase(String userGivenPass) {
String passPhrase = null;
try {
@@ -40,6 +41,7 @@ public class MD5Implementation implement
* (non-Javadoc)
* @see org.apache.openmeetings.utils.crypt.ICryptString#verifyPassword(java.lang.String, java.lang.String)
*/
+ @Override
public Boolean verifyPassword(String passGiven, String passwdFromDb) {
return (passwdFromDb.equals(createPassPhrase(passGiven)));
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml?rev=1666906&r1=1666905&r2=1666906&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml Mon Mar 16 08:08:08 2015
@@ -17,7 +17,7 @@
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Howto create a Custom Crypt styles</title>
- <author email="sebawagner@apache.org">
+ <author email="dev@openmeetings.apache.org">
OpenMeetings Team
</author>
</properties>
@@ -30,10 +30,10 @@
</p>
<ul>
- <li>org.xmlcrm.utils.crypt.MD5Implementation - this uses common MD5
+ <li>org.apache.openmeetings.util.crypt.MD5Implementation - this uses common MD5
Crypt like PHP does, this is the default one (results in something
like: fe01ce2a7fbac8fafaed7c982a04e229)</li>
- <li>org.xmlcrm.utils.crypt.MD5CryptImplementation - does use
+ <li>org.apache.openmeetings.util.crypt.MD5CryptImplementation - does use
BSD-Style of encryption using a salt (results in something like:
$1$GMsj7F2I$5S3r9CeukXGXNwf6b4sph1)</li>
</ul>
@@ -47,19 +47,17 @@
<section name="Configuration of Custom Crypt-Style">
<p>
To add your own crypt style you need to write a class which
- implements the interface: org.xmlcrm.utils.cryptCryptString
- <br />
- and extends the Adapter: org.xmlcrm.utils.CryptStringAdapter
+ implements the interface: org.apache.openmeetings.util.crypt.ICryptString
<br />
Example of an Implementation:
</p>
<source>
<![CDATA[
-package org.xmlcrm.utils.crypt;
+package org.apache.openmeetings.util.crypt;
import java.security.NoSuchAlgorithmException;
-public class MD5Implementation extends CryptStringAdapter implements CryptString {
+public class MD5Implementation implements ICryptString {
@Override
public String createPassPhrase(String userGivenPass) {
String passPhrase = null;
@@ -81,7 +79,7 @@ public class MD5Implementation extends C
<p>To add your own Encryption-Class you need to add your class to the
OpenMeetings-Webapp (make it available to the webapp-classpath) and
use your custom-class-name instead of
- org.xmlcrm.utils.crypt.MD5Implementation during the Installation or
+ org.apache.openmeetings.util.crypt.MD5Implementation during the Installation or
at runtime by editing the config-key crypt_ClassName</p>
</section>
<section name="Configuration of Custom Crypt-Style">
Modified: openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java?rev=1666906&r1=1666905&r2=1666906&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java Mon Mar 16 08:08:08 2015
@@ -32,6 +32,7 @@ public class MD5CryptImplementation impl
* (non-Javadoc)
* @see org.apache.openmeetings.utils.crypt.ICryptString#createPassPhrase(java.lang.String)
*/
+ @Override
public String createPassPhrase(String userGivenPass) {
String passPhrase = null;
try {
@@ -46,6 +47,7 @@ public class MD5CryptImplementation impl
* (non-Javadoc)
* @see org.apache.openmeetings.utils.crypt.ICryptString#verifyPassword(java.lang.String, java.lang.String)
*/
+ @Override
public Boolean verifyPassword(String passGiven, String passwdFromDb) {
boolean validPassword = false;
String salt = passwdFromDb.split("\\$")[2];
Modified: openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java?rev=1666906&r1=1666905&r2=1666906&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java Mon Mar 16 08:08:08 2015
@@ -32,6 +32,7 @@ public class MD5Implementation implement
* (non-Javadoc)
* @see org.apache.openmeetings.utils.crypt.ICryptString#createPassPhrase(java.lang.String)
*/
+ @Override
public String createPassPhrase(String userGivenPass) {
String passPhrase = null;
try {
@@ -46,6 +47,7 @@ public class MD5Implementation implement
* (non-Javadoc)
* @see org.apache.openmeetings.utils.crypt.ICryptString#verifyPassword(java.lang.String, java.lang.String)
*/
+ @Override
public Boolean verifyPassword(String passGiven, String passwdFromDb) {
return (passwdFromDb.equals(createPassPhrase(passGiven)));
}
Modified: openmeetings/trunk/site/CustomCryptMechanism.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/site/CustomCryptMechanism.html?rev=1666906&r1=1666905&r2=1666906&view=diff
==============================================================================
--- openmeetings/trunk/site/CustomCryptMechanism.html (original)
+++ openmeetings/trunk/site/CustomCryptMechanism.html Mon Mar 16 08:08:08 2015
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2015-02-15
+ | Generated by Apache Maven Doxia at 2015-03-16
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -8,7 +8,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="OpenMeetings Team" />
- <meta name="Date-Revision-yyyymmdd" content="20150215" />
+ <meta name="Date-Revision-yyyymmdd" content="20150316" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project – Howto create a Custom Crypt styles</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -43,7 +43,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2015-02-15
+ <li id="publishDate">Last Published: 2015-03-16
</li>
@@ -772,11 +772,11 @@
<ul>
-<li>org.xmlcrm.utils.crypt.MD5Implementation - this uses common MD5
+<li>org.apache.openmeetings.util.crypt.MD5Implementation - this uses common MD5
Crypt like PHP does, this is the default one (results in something
like: fe01ce2a7fbac8fafaed7c982a04e229)</li>
-<li>org.xmlcrm.utils.crypt.MD5CryptImplementation - does use
+<li>org.apache.openmeetings.util.crypt.MD5CryptImplementation - does use
BSD-Style of encryption using a salt (results in something like:
$1$GMsj7F2I$5S3r9CeukXGXNwf6b4sph1)</li>
</ul>
@@ -794,9 +794,7 @@
<p>
To add your own crypt style you need to write a class which
- implements the interface: org.xmlcrm.utils.cryptCryptString
- <br />
- and extends the Adapter: org.xmlcrm.utils.CryptStringAdapter
+ implements the interface: org.apache.openmeetings.util.crypt.ICryptString
<br />
Example of an Implementation:
</p>
@@ -804,11 +802,11 @@
<div class="source">
<pre>
-package org.xmlcrm.utils.crypt;
+package org.apache.openmeetings.util.crypt;
import java.security.NoSuchAlgorithmException;
-public class MD5Implementation extends CryptStringAdapter implements CryptString {
+public class MD5Implementation implements ICryptString {
@Override
public String createPassPhrase(String userGivenPass) {
String passPhrase = null;
@@ -831,7 +829,7 @@ public class MD5Implementation extends C
<p>To add your own Encryption-Class you need to add your class to the
OpenMeetings-Webapp (make it available to the webapp-classpath) and
use your custom-class-name instead of
- org.xmlcrm.utils.crypt.MD5Implementation during the Installation or
+ org.apache.openmeetings.util.crypt.MD5Implementation during the Installation or
at runtime by editing the config-key crypt_ClassName</p>
</div>