From c648dae172f041d5e9d8bac9ed9ba54db595ff9a Mon Sep 17 00:00:00 2001
From: chenjun <jclazz@outlook.com>
Date: Thu, 31 Oct 2019 23:23:00 +0800
Subject: [PATCH] fix #663

---
 .../PigxUserAuthenticationConverter.java      | 28 ++++++++++++++++++-
 .../exception/ForbiddenException.java         |  6 ++--
 .../exception/PigxAuth2Exception.java         |  4 +++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java
index cac995c21..3a9f1a862 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java
@@ -17,7 +17,10 @@
 
 package com.pig4cloud.pigx.common.security.component;
 
+import cn.hutool.core.util.StrUtil;
+import com.pig4cloud.pigx.common.core.constant.CommonConstants;
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
+import com.pig4cloud.pigx.common.security.exception.ForbiddenException;
 import com.pig4cloud.pigx.common.security.service.PigxUser;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -25,10 +28,14 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.oauth2.provider.token.UserAuthenticationConverter;
 import org.springframework.util.StringUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * @author lengleng
@@ -64,8 +71,8 @@ public class PigxUserAuthenticationConverter implements UserAuthenticationConver
 	@Override
 	public Authentication extractAuthentication(Map<String, ?> map) {
 		if (map.containsKey(USERNAME)) {
+			validateTenantId(map);
 			Collection<? extends GrantedAuthority> authorities = getAuthorities(map);
-
 			String username = (String) map.get(USERNAME);
 			Integer id = (Integer) map.get(SecurityConstants.DETAILS_USER_ID);
 			Integer deptId = (Integer) map.get(SecurityConstants.DETAILS_DEPT_ID);
@@ -88,4 +95,23 @@ public class PigxUserAuthenticationConverter implements UserAuthenticationConver
 		}
 		throw new IllegalArgumentException("Authorities must be either a String or a Collection");
 	}
+
+	private void validateTenantId(Map<String, ?> map){
+		String headerValue =  getCurrentTenantId();
+		Integer userValue = (Integer) map.get(SecurityConstants.DETAILS_TENANT_ID);
+		if(StrUtil.isNotBlank(headerValue) && !userValue.toString().equals(headerValue)){
+			// TODO: 不要提示租户ID不对，避免被穷举
+			throw new ForbiddenException("bad tenant id");
+		}
+	}
+
+	public static Optional<HttpServletRequest> getCurrentHttpRequest() {
+		return Optional.ofNullable(RequestContextHolder.getRequestAttributes())
+				.filter(requestAttributes -> ServletRequestAttributes.class.isAssignableFrom(requestAttributes.getClass()))
+				.map(requestAttributes -> ((ServletRequestAttributes) requestAttributes))
+				.map(ServletRequestAttributes::getRequest);
+	}
+	public static String getCurrentTenantId() {
+		return getCurrentHttpRequest().map(httpServletRequest -> httpServletRequest.getHeader(CommonConstants.TENANT_ID)).orElse(null);
+	}
 }
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ForbiddenException.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ForbiddenException.java
index f9541bb65..9cbe6a55f 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ForbiddenException.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/ForbiddenException.java
@@ -27,10 +27,12 @@ import org.springframework.http.HttpStatus;
  */
 @JsonSerialize(using = PigxAuth2ExceptionSerializer.class)
 public class ForbiddenException extends PigxAuth2Exception {
-
-	public ForbiddenException(String msg, Throwable t) {
+	public ForbiddenException(String msg) {
 		super(msg);
 	}
+	public ForbiddenException(String msg, Throwable t) {
+		super(msg,t);
+	}
 
 	@Override
 	public String getOAuth2ErrorCode() {
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java
index 780f9eb68..bd6b6cd05 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java
@@ -36,6 +36,10 @@ public class PigxAuth2Exception extends OAuth2Exception {
 		super(msg);
 	}
 
+	public PigxAuth2Exception(String msg, Throwable t) {
+		super(msg,t);
+	}
+
 	public PigxAuth2Exception(String msg, String errorCode) {
 		super(msg);
 		this.errorCode = errorCode;