提交uaa相关

ibizlab-boot-starter-data/src/main/java/cn/ibizlab/util/service/IBZUSERServiceImpl.java

@@ -24,7 +24,7 @@ import org.springframework.util.StringUtils;
  * 实体[IBZUSER] 服务对象接口实现
  */
 @Service("IBZUSERService")
-@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:IBZUSERService}'.equals('IBZUSERService')")
+@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:IBZUAAUserService}'.equals('IBZUSERService')")
 public class IBZUSERServiceImpl extends ServiceImpl<IBZUSERMapper, IBZUSER> implements IBZUSERService, AuthenticationUserService {
 
 	@Value("${ibiz.auth.pwencrymode:0}")

ibizlab-boot-starter/src/main/java/cn/ibizlab/util/security/CloudTokenUtil.java

+package cn.ibizlab.util.security;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Clock;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.impl.DefaultClock;
+import lombok.SneakyThrows;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.Serializable;
+import java.nio.charset.Charset;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Date;
+import java.util.function.Function;
+
+@Component
+@ConditionalOnExpression("'${ibiz.auth.token.util:UAATokenUtil}'.equals('CloudTokenUtil')")
+public class CloudTokenUtil implements AuthTokenUtil, Serializable {
+
+    private static final long serialVersionUID = -3301605591108950415L;
+
+    private Clock clock = DefaultClock.INSTANCE;
+    @Value("${ibiz.jwt.secret:ibzsecret}")
+    private String secret;
+
+    @Value("${ibiz.jwt.expiration:7200000}")
+    private Long expiration;
+
+    @Value("${ibiz.jwt.header:Authorization}")
+    private String tokenHeader;
+
+
+
+    public String getUsernameFromToken(String token) {
+        return getClaimFromToken(token, Claims::getSubject);
+    }
+
+    public Date getIssuedAtDateFromToken(String token) {
+        return getClaimFromToken(token, Claims::getIssuedAt);
+    }
+
+    public Date getExpirationDateFromToken(String token) {
+        return getClaimFromToken(token, Claims::getExpiration);
+    }
+
+    public <T> T getClaimFromToken(String token, Function<Claims, T> claimsResolver) {
+        final Claims claims = getAllClaimsFromToken(token);
+        return claimsResolver.apply(claims);
+    }
+
+    public Claims getAllClaimsFromToken(String token) {
+        PublicKey publicKey = getPublicKey(getPublicKeyString());
+        return Jwts.parser()
+                .setSigningKey(publicKey)
+                .parseClaimsJws(token)
+                .getBody();
+    }
+
+
+    public String generateToken(UserDetails userDetails) {
+        return null;
+    }
+
+    public Boolean validateToken(String token, UserDetails userDetails) {
+        AuthenticationUser user = (AuthenticationUser) userDetails;
+        user.setToken(token);
+        final Date created = getIssuedAtDateFromToken(token);
+        final Date expiration = getExpirationDateFromToken(token);
+        user.setExpiration(expiration);
+        return !expiration.before(clock.now());
+
+    }
+
+    @SneakyThrows
+    protected String getPublicKeyString()   {
+        String key = "";
+        String usrHome = System.getProperty("user.home") + "/.ibzrt";
+        File pubKeyFile = new File(usrHome, "ibzrt_rsa.pub");
+        if (!pubKeyFile.exists()) {
+            key = IOUtils.toString(this.getClass().getResourceAsStream("/uaa/keypair/ibzrt_rsa.pub"));
+        } else {
+            key = IOUtils.toString(new FileInputStream(pubKeyFile));
+        }
+        return key;
+    }
+
+    /**
+     * 获取PublicKey对象
+     * @param publicKeyBase64
+     * @return
+     * @throws NoSuchAlgorithmException
+     * @throws InvalidKeySpecException
+     */
+    @SneakyThrows
+    public PublicKey getPublicKey(String publicKeyBase64) {
+        byte[] byteKey = Base64.decodeBase64(publicKeyBase64);
+        X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(byteKey);
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        return keyFactory.generatePublic(x509EncodedKeySpec);
+    }
+
+}
+

ibizlab-boot-starter/src/main/java/cn/ibizlab/util/security/UAATokenUtil.java

@@ -23,7 +23,7 @@ import java.util.Date;
 import java.util.function.Function;
 
 @Component
-@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.token.util:UAATokenUtil}'.equals('UAATokenUtil')")
+@ConditionalOnExpression("'${ibiz.auth.token.util:UAATokenUtil}'.equals('UAATokenUtil')")
 public class UAATokenUtil implements AuthTokenUtil, Serializable {
 
     private static final long serialVersionUID = -3301605591108950415L;

ibizlab-boot-starter/src/main/java/cn/ibizlab/util/service/CloudUserService.java

@@ -36,7 +36,7 @@ import java.util.*;
 
 @Slf4j
 @Service("CloudUserService")
-@ConditionalOnExpression("${ibiz.enablePermissionValid:false}&&'${ibiz.auth.service:IBZUAAUserService}'.equals('CloudUserService')")
+@ConditionalOnExpression("'${ibiz.auth.service:IBZUAAUserService}'.equals('CloudUserService')")
 public class CloudUserService extends IBZUAAUserService {
 
     @Autowired

ibizlab-boot-starter/src/main/java/cn/ibizlab/util/service/IBZUAAUserService.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
  * 实体[IBZUSER] 服务对象接口实现
  */
 @Service("IBZUAAUserService")
-@ConditionalOnExpression("${ibiz.enablePermissionValid:false}&&'${ibiz.auth.service:IBZUAAUserService}'.equals('IBZUAAUserService')")
+@ConditionalOnExpression("'${ibiz.auth.service:IBZUAAUserService}'.equals('IBZUAAUserService')")
 public class IBZUAAUserService implements AuthenticationUserService{
 
 	@Autowired

ibizlab-boot-starter/src/main/java/cn/ibizlab/util/service/SimpleUserService.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
  */
 @Primary
 @Service("SimpleUserService")
-@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:IBZUSERService}'.equals('SimpleUserService')")
+@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:IBZUAAUserService}'.equals('SimpleUserService')")
 public class SimpleUserService implements AuthenticationUserService {
 
 

ibizlab-boot-starter/src/main/resources/uaa/keypair/ibzrt_rsa.pub

+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmk8+KYDkf6dEY5XMzNHRK3+GVDc4hPxyXHygyz7u+xrNhCXQytLhnzyNxl/3kcF/S/W02Sbc/bF9n5Eakbd4Fp7DMqU9j/3Dv9hoLUQjx0RQ+wSPg399orBCWejOJA/bcii8PGPSrj9AttGTDA3gq624zGoDDK8EzjOP+HhY81QIDAQAB
\ No newline at end of file