From aa5b8b8266912d4b02d432049a66d29f56245115 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期五, 26 十一月 2021 18:33:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java b/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java
index 35a6ce8..0f7db32 100644
--- a/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java
+++ b/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java
@@ -1,5 +1,6 @@
package com.pollex.pam.security.provider;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.domain.Consultant;
@@ -14,12 +15,15 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContexts;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
+import org.springframework.security.authentication.AuthenticationServiceException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
@@ -28,8 +32,10 @@
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
import javax.net.ssl.SSLContext;
+import java.security.GeneralSecurityException;
import java.security.KeyManagementException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@@ -40,6 +46,7 @@
public class EServiceAuthenticationProvider {
private static final String E_SERVICE_LOGIN_SUCCESS_CODE = "0";
+ private static final Logger log = LoggerFactory.getLogger(EServiceAuthenticationProvider.class);
@Autowired
ApplicationProperties applicationProperty;
@@ -63,11 +70,15 @@
if(E_SERVICE_LOGIN_SUCCESS_CODE.equals(eServiceResponse.getCode())){
return getConsultantToken(account, credentials);
}
+
+ throw new RuntimeException("eService login failed, eService response code = " + eServiceResponse.getCode() + ", eService response msg = " + eServiceResponse.getMsg());
}
- throw new AuthenticationCredentialsNotFoundException("");
- } catch (Exception e) {
- throw new AuthenticationCredentialsNotFoundException("");
+ throw new RuntimeException("eService http error!, response http status code = " + responseEntity.getStatusCode());
+ } catch (JsonProcessingException e) {
+ throw new AuthenticationServiceException("convert to json processing error!");
+ } catch (GeneralSecurityException e) {
+ throw new AuthenticationServiceException("General Security SSL error!");
}
}
@@ -86,24 +97,26 @@
return authenticationToken;
}
- private ResponseEntity<EServiceResponse> loginByEService(String account, String paxxword) throws Exception{
- EServiceRequest dto = new EServiceRequest();
- dto.setFunc("ValidateUserLogin");
- dto.setId(account);
- dto.setPin(paxxword);
- dto.setPwd(paxxword);
- dto.setSys("epos");
-
- String dtoJson = new ObjectMapper().writeValueAsString(dto);
-
+ private ResponseEntity<EServiceResponse> loginByEService(String account, String paxxword) throws JsonProcessingException, GeneralSecurityException {
RestTemplate restTemplate = getTrustAllRestTemplate();
settingMessageConvertesToSpecifyType(restTemplate, MediaType.ALL);
+
+ String urlTemplate = UriComponentsBuilder.fromHttpUrl(applicationProperty.geteServiceLoginUrl())
+ .queryParam("func", applicationProperty.geteServiceLoginFunc())
+ .queryParam("id", account)
+ .queryParam("pin", paxxword)
+ .queryParam("pwd", paxxword)
+ .queryParam("sys", applicationProperty.geteServiceLoginSys())
+ .queryParam("transactionId", UUID.randomUUID().toString())
+ .encode().toUriString();
+
+ log.debug("http get loginByEService, url = {}", urlTemplate);
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
- HttpEntity<String> entity = new HttpEntity<>(dtoJson, headers);
- return restTemplate.exchange(applicationProperty.geteServiceLoginUrl(), HttpMethod.POST, entity, EServiceResponse.class);
+ HttpEntity<String> entity = new HttpEntity<>(headers);
+ return restTemplate.exchange(urlTemplate, HttpMethod.GET, entity, EServiceResponse.class);
}
private RestTemplate getTrustAllRestTemplate() throws KeyStoreException, NoSuchAlgorithmException, KeyManagementException {
--
Gitblit v1.8.0