diff --git a/core/src/main/java/com/usthe/sureness/processor/support/DigestProcessor.java b/core/src/main/java/com/usthe/sureness/processor/support/DigestProcessor.java index 5455a27940507581c36b62bad24cf705a6a31993..4d413c43ff6f27aca6a69f02168f7cab8b9b7108 100644 --- a/core/src/main/java/com/usthe/sureness/processor/support/DigestProcessor.java +++ b/core/src/main/java/com/usthe/sureness/processor/support/DigestProcessor.java @@ -53,7 +53,7 @@ public class DigestProcessor extends BaseProcessor { @Override public Subject authenticated(Subject var) throws SurenessAuthenticationException { - if (var.getPrincipal() == null || var.getCredentials() == null) { + if (var.getPrincipal() == null || var.getCredential() == null) { String authenticate = getAuthenticate(); throw new NeedDigestInfoException("you should try once with digest auth information", authenticate); } @@ -74,7 +74,7 @@ public class DigestProcessor extends BaseProcessor { //response = MD5("A1:nonce:nc:cNonce:qop:A2"); String oriResponse = calcDigest(a1, digestSubject.getNonce(), digestSubject.getNc(), digestSubject.getCnonce(), digestSubject.getQop(), a2); - if (!oriResponse.equals(digestSubject.getCredentials())) { + if (!oriResponse.equals(digestSubject.getCredential())) { throw new IncorrectCredentialsException("incorrect password"); } if (account.isDisabledAccount()) { diff --git a/core/src/main/java/com/usthe/sureness/processor/support/JwtProcessor.java b/core/src/main/java/com/usthe/sureness/processor/support/JwtProcessor.java index b2831edb6bbefb95beb229f05bd193e40d76522a..82f07cc5e16dc4b935985d8eab9429dad24c8a0f 100644 --- a/core/src/main/java/com/usthe/sureness/processor/support/JwtProcessor.java +++ b/core/src/main/java/com/usthe/sureness/processor/support/JwtProcessor.java @@ -41,7 +41,7 @@ public class JwtProcessor extends BaseProcessor { @Override @SuppressWarnings("unchecked") public Subject authenticated(Subject var) throws SurenessAuthenticationException { - String jwt = (String) var.getCredentials(); + String jwt = (String) var.getCredential(); if (JsonWebTokenUtil.isNotJsonWebToken(jwt)) { throw new IncorrectCredentialsException("this jwt credential is illegal"); } diff --git a/core/src/main/java/com/usthe/sureness/processor/support/PasswordProcessor.java b/core/src/main/java/com/usthe/sureness/processor/support/PasswordProcessor.java index 41ba97dfe35ddc85e00c5117ff3aa7b6eec4e80e..ca5c759b371732370eda399c9e991b001c43fa29 100644 --- a/core/src/main/java/com/usthe/sureness/processor/support/PasswordProcessor.java +++ b/core/src/main/java/com/usthe/sureness/processor/support/PasswordProcessor.java @@ -51,8 +51,8 @@ public class PasswordProcessor extends BaseProcessor { } throw new UnknownAccountException("do not exist the account: " + appId); } - if (var.getCredentials() != null && account.getPassword() != null) { - String password = String.valueOf(var.getCredentials()); + if (var.getCredential() != null && account.getPassword() != null) { + String password = String.valueOf(var.getCredential()); if (account.getSalt() != null && !"".equals(account.getSalt())) { password = Md5Util.md5( password + account.getSalt()); } diff --git a/core/src/main/java/com/usthe/sureness/subject/Subject.java b/core/src/main/java/com/usthe/sureness/subject/Subject.java index 824499429a7c96aa11cddff8b4691f1a0469b915..139a312e8f905328787f4303b84c807fd78c8c60 100644 --- a/core/src/main/java/com/usthe/sureness/subject/Subject.java +++ b/core/src/main/java/com/usthe/sureness/subject/Subject.java @@ -25,7 +25,7 @@ public interface Subject extends Serializable { * * @return credential */ - Object getCredentials(); + Object getCredential(); /** * get the roles owned by this account diff --git a/core/src/main/java/com/usthe/sureness/subject/support/DigestSubject.java b/core/src/main/java/com/usthe/sureness/subject/support/DigestSubject.java index 5d004e7201b039d8ded54463ab3560ae54669dc1..d6c5cfc50865daabd27090515b162170459ea33a 100644 --- a/core/src/main/java/com/usthe/sureness/subject/support/DigestSubject.java +++ b/core/src/main/java/com/usthe/sureness/subject/support/DigestSubject.java @@ -76,7 +76,7 @@ public class DigestSubject implements Subject { } @Override - public Object getCredentials() { + public Object getCredential() { return response; } @@ -165,7 +165,7 @@ public class DigestSubject implements Subject { @SuppressWarnings("unchecked") public Builder(Subject subject) { this.appId = String.valueOf(subject.getPrincipal()); - this.response = String.valueOf(subject.getCredentials()); + this.response = String.valueOf(subject.getCredential()); this.ownRoles = (List) subject.getOwnRoles(); this.targetUri = String.valueOf(subject.getTargetResource()); this.supportRoles = (List) subject.getSupportRoles(); diff --git a/core/src/main/java/com/usthe/sureness/subject/support/JwtSubject.java b/core/src/main/java/com/usthe/sureness/subject/support/JwtSubject.java index f6c8380abc13948ebe59146bae56ecae0a3c27f1..1c69f457c3775550f5d92f2045818b0bf1600fe7 100644 --- a/core/src/main/java/com/usthe/sureness/subject/support/JwtSubject.java +++ b/core/src/main/java/com/usthe/sureness/subject/support/JwtSubject.java @@ -50,7 +50,7 @@ public class JwtSubject implements Subject { } @Override - public Object getCredentials() { + public Object getCredential() { return this.jwt; } @@ -108,7 +108,7 @@ public class JwtSubject implements Subject { @SuppressWarnings("unchecked") public Builder(Subject subject) { this.appId = String.valueOf(subject.getPrincipal()); - this.jwt = String.valueOf(subject.getCredentials()); + this.jwt = String.valueOf(subject.getCredential()); this.ownRoles = (List) subject.getOwnRoles(); this.targetUri = String.valueOf(subject.getTargetResource()); this.supportRoles = (List) subject.getSupportRoles(); diff --git a/core/src/main/java/com/usthe/sureness/subject/support/NoneSubject.java b/core/src/main/java/com/usthe/sureness/subject/support/NoneSubject.java index 96aae5445cc88d3e78bfbfdc1b16d5886fa966fa..560a6cc07d6a2dadcb26456b4af79fcbebb3ee3f 100644 --- a/core/src/main/java/com/usthe/sureness/subject/support/NoneSubject.java +++ b/core/src/main/java/com/usthe/sureness/subject/support/NoneSubject.java @@ -38,7 +38,7 @@ public class NoneSubject implements Subject { } @Override - public Object getCredentials() { + public Object getCredential() { return null; } diff --git a/core/src/main/java/com/usthe/sureness/subject/support/PasswordSubject.java b/core/src/main/java/com/usthe/sureness/subject/support/PasswordSubject.java index 6fe8be19c3b7fc8bab04891310c07411a1616243..cb38bc5173f9bf14e64181f62a8bd960c4b3c928 100644 --- a/core/src/main/java/com/usthe/sureness/subject/support/PasswordSubject.java +++ b/core/src/main/java/com/usthe/sureness/subject/support/PasswordSubject.java @@ -47,7 +47,7 @@ public class PasswordSubject implements Subject { } @Override - public Object getCredentials() { + public Object getCredential() { return this.password; } @@ -97,7 +97,7 @@ public class PasswordSubject implements Subject { @SuppressWarnings("unchecked") public Builder(Subject subject) { this.appId = String.valueOf(subject.getPrincipal()); - this.password = String.valueOf(subject.getCredentials()); + this.password = String.valueOf(subject.getCredential()); this.ownRoles = (List) subject.getOwnRoles(); this.targetUri = String.valueOf(subject.getTargetResource()); this.supportRoles = (List) subject.getSupportRoles(); diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/processor/CustomTokenProcessor.java b/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/processor/CustomTokenProcessor.java index 38fc02e2511b45e8fe88b59aef82ecc005442845..bad529e090434ae57585e6f55d1940ac196d45cf 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/processor/CustomTokenProcessor.java +++ b/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/processor/CustomTokenProcessor.java @@ -42,7 +42,7 @@ public class CustomTokenProcessor extends BaseProcessor { @Override @SuppressWarnings("unchecked") public Subject authenticated(Subject var) throws SurenessAuthenticationException { - String token = (String) var.getCredentials(); + String token = (String) var.getCredential(); String[] tokenArr = token.split(TOKEN_SPLIT); if (TokenStorage.matchToken(tokenArr[0], token)) { // auth passed diff --git a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomTokenSubject.java b/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomTokenSubject.java index be231d8f0a9c38a8693f9387ed3f9370782ee267..65a800ae8f282de7e486749be74639064971ca3f 100644 --- a/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomTokenSubject.java +++ b/sample-tom/src/main/java/com/usthe/sureness/sample/tom/sureness/subject/CustomTokenSubject.java @@ -50,7 +50,7 @@ public class CustomTokenSubject implements Subject { } @Override - public Object getCredentials() { + public Object getCredential() { return this.token; } @@ -108,7 +108,7 @@ public class CustomTokenSubject implements Subject { @SuppressWarnings("unchecked") public Builder(Subject subject) { this.appId = String.valueOf(subject.getPrincipal()); - this.token = String.valueOf(subject.getCredentials()); + this.token = String.valueOf(subject.getCredential()); this.ownRoles = (List) subject.getOwnRoles(); this.targetUri = String.valueOf(subject.getTargetResource()); this.supportRoles = (List) subject.getSupportRoles();