[karaf] branch master updated: [KARAF-5581]bin/client -u karaf -p karaf can login if we enable jasypt for jaas

[ff...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 9ad3b9a  [KARAF-5581]bin/client -u karaf -p karaf can login if we enable jasypt for jaas
9ad3b9a is described below

commit 9ad3b9a81497b8b0ee64c87c777581a556ee8865
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Jan 25 16:56:22 2018 +0800

    [KARAF-5581]bin/client -u karaf -p karaf can login if we enable jasypt for jaas
---
 .../org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
index a6601d0..478251c 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java
@@ -83,7 +83,13 @@ public abstract class AbstractKarafLoginModule implements LoginModule {
 
     public boolean checkPassword(String plain, String encrypted) {
         String newEncrypted = encryptionSupport.encrypt(plain);
-        return encrypted.equals(newEncrypted);
+        String prefix = encryptionSupport.getEncryptionPrefix();
+        String suffix = encryptionSupport.getEncryptionSuffix();
+        boolean isMatch = encryptionSupport.getEncryption() != null 
+            ? encryptionSupport.getEncryption().checkPassword(plain, 
+                encrypted.substring(prefix.length(), encrypted.length() - suffix.length())) : false;
+        return encrypted.equals(newEncrypted) 
+            || isMatch;
     }
 
 }

-- 
To stop receiving notification emails like this one, please contact
ffang@apache.org.