From 4defc0b623fe6d8dd75522d84e65f7446458350a Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Fri, 5 Feb 2021 20:21:56 +0800 Subject: [PATCH] change subject getCredentials() to getCredential(),make credential single (#59) --- .../com/usthe/sureness/processor/support/DigestProcessor.java | 4 ++-- .../com/usthe/sureness/processor/support/JwtProcessor.java | 2 +- .../usthe/sureness/processor/support/PasswordProcessor.java | 4 ++-- core/src/main/java/com/usthe/sureness/subject/Subject.java | 2 +- .../com/usthe/sureness/subject/support/DigestSubject.java | 4 ++-- .../java/com/usthe/sureness/subject/support/JwtSubject.java | 4 ++-- .../java/com/usthe/sureness/subject/support/NoneSubject.java | 2 +- .../com/usthe/sureness/subject/support/PasswordSubject.java | 4 ++-- .../sample/tom/sureness/processor/CustomTokenProcessor.java | 2 +- .../sample/tom/sureness/subject/CustomTokenSubject.java | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) 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 5455a27..4d413c4 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 b2831ed..82f07cc 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 41ba97d..ca5c759 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 8244994..139a312 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 5d004e7..d6c5cfc 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 f6c8380..1c69f45 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 96aae54..560a6cc 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 6fe8be1..cb38bc5 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 38fc02e..bad529e 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 be231d8..65a800a 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(); -- GitLab