You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/06/11 16:05:35 UTC
[1/3] incubator-brooklyn git commit: Tweak PasswordHasher.sha256() to
avoid potentially misleading use of ByteBuffer.array().
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 284b763d2 -> 5ceb8aadb
Tweak PasswordHasher.sha256() to avoid potentially misleading use of ByteBuffer.array().
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7fc2a076
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7fc2a076
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7fc2a076
Branch: refs/heads/master
Commit: 7fc2a076346bf3ef06c97e04647de2663daaf6b6
Parents: 284b763
Author: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Authored: Thu Jun 11 13:03:53 2015 +0100
Committer: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Committed: Thu Jun 11 13:43:05 2015 +0100
----------------------------------------------------------------------
.../src/main/java/brooklyn/rest/security/PasswordHasher.java | 5 +++--
.../test/java/brooklyn/rest/security/PasswordHasherTest.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7fc2a076/usage/rest-server/src/main/java/brooklyn/rest/security/PasswordHasher.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/security/PasswordHasher.java b/usage/rest-server/src/main/java/brooklyn/rest/security/PasswordHasher.java
index 2085379..262920c 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/security/PasswordHasher.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/security/PasswordHasher.java
@@ -24,8 +24,9 @@ import com.google.common.hash.Hashing;
public class PasswordHasher {
public static String sha256(String salt, String password) {
- byte[] salted = Charsets.UTF_8.encode((salt == null ? "" : salt) + password).array();
- HashCode hash = Hashing.sha256().hashBytes(salted);
+ if (salt == null) salt = "";
+ byte[] bytes = (salt + password).getBytes(Charsets.UTF_8);
+ HashCode hash = Hashing.sha256().hashBytes(bytes);
return hash.toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7fc2a076/usage/rest-server/src/test/java/brooklyn/rest/security/PasswordHasherTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/security/PasswordHasherTest.java b/usage/rest-server/src/test/java/brooklyn/rest/security/PasswordHasherTest.java
index bbe19b1..745f71d 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/security/PasswordHasherTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/security/PasswordHasherTest.java
@@ -26,6 +26,6 @@ public class PasswordHasherTest {
@Test
public void testHashSha256() throws Exception {
- assertEquals(PasswordHasher.sha256("mysalt", "mypassword"), "e1c2390613b1beff83420c15d6ceca3b2e77e66e3f4be4e45186032120a30f22");
+ assertEquals(PasswordHasher.sha256("mysalt", "mypassword"), "d02878b06efa88579cd84d9e50b211c0a7caa92cf243bad1622c66081f7e2692");
}
}
[2/3] incubator-brooklyn git commit: Small improvements to unit test.
Posted by sj...@apache.org.
Small improvements to unit test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b0c7c610
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b0c7c610
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b0c7c610
Branch: refs/heads/master
Commit: b0c7c6100478b7655c4bfb6da469ed42fa087095
Parents: 7fc2a07
Author: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Authored: Thu Jun 11 14:31:30 2015 +0100
Committer: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Committed: Thu Jun 11 14:31:30 2015 +0100
----------------------------------------------------------------------
.../test/java/brooklyn/rest/security/PasswordHasherTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b0c7c610/usage/rest-server/src/test/java/brooklyn/rest/security/PasswordHasherTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/security/PasswordHasherTest.java b/usage/rest-server/src/test/java/brooklyn/rest/security/PasswordHasherTest.java
index 745f71d..7537a78 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/security/PasswordHasherTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/security/PasswordHasherTest.java
@@ -26,6 +26,12 @@ public class PasswordHasherTest {
@Test
public void testHashSha256() throws Exception {
+ // Note: expected hash values generated externally:
+ // echo -n mysaltmypassword | openssl dgst -sha256
+
assertEquals(PasswordHasher.sha256("mysalt", "mypassword"), "d02878b06efa88579cd84d9e50b211c0a7caa92cf243bad1622c66081f7e2692");
+ assertEquals(PasswordHasher.sha256("", "mypassword"), "89e01536ac207279409d4de1e5253e01f4a1769e696db0d6062ca9b8f56767c8");
+ assertEquals(PasswordHasher.sha256(null, "mypassword"), "89e01536ac207279409d4de1e5253e01f4a1769e696db0d6062ca9b8f56767c8");
}
+
}
[3/3] incubator-brooklyn git commit: This closes #687
Posted by sj...@apache.org.
This closes #687
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5ceb8aad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5ceb8aad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5ceb8aad
Branch: refs/heads/master
Commit: 5ceb8aadb5704e84ff3509e8d8d035938db7d8f6
Parents: 284b763 b0c7c61
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Jun 11 15:03:30 2015 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Jun 11 15:03:30 2015 +0100
----------------------------------------------------------------------
.../src/main/java/brooklyn/rest/security/PasswordHasher.java | 5 +++--
.../test/java/brooklyn/rest/security/PasswordHasherTest.java | 8 +++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------