Changeset 297:12ce8e22d275

Timestamp:

09/05/11 12:13:36 (5 months ago)

Author:

xeraph

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2731

Message:

added null salt (kraken-dom api changed)

Location:

kraken-webconsole

Files:

• pom.xml (modified) (2 diffs)
• src/main/java/org/krakenapps/webconsole/plugins/AccountPlugin.java (modified) (2 diffs)

kraken-webconsole/pom.xml

@@ -11 +11 @@
         <groupId>org.krakenapps</groupId>
         <artifactId>kraken-webconsole</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
         <packaging>bundle</packaging>
         <name>Kraken Web Console</name>
@@ -76 +76 @@
                         <groupId>org.krakenapps</groupId>
                         <artifactId>kraken-dom</artifactId>
-                        <version>1.2.0</version>
+                        <version>1.2.8</version>
                 </dependency>
                 <dependency>

kraken-webconsole/src/main/java/org/krakenapps/webconsole/plugins/AccountPlugin.java

@@ -28 +28 @@
         private AdminApi adminApi;
 
+        // from js web console only
         @AllowGuestAccess
         @MsgbusMethod
@@ -33 +34 @@
                 String user = req.getString("user");
                 String password = req.getString("password");
+                String salt = req.getString("salt");
 
                 logger.trace("kraken webconsole: login attempt user [{}], password [{}]", new Object[] { user, password });
 
-                String hash = adminApi.hash(adminApi.hashPassword(password));
+                String hash = adminApi.hash(adminApi.hashPassword(salt, password));
                 String nonce = "";
                 Admin admin = adminApi.login(user, hash, nonce);