Sunyard/sydapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gitrep/dev-shangqing' into dev-shangqing-origin

Browse Source 
# Conflicts:
#	.gitignore
#	src/main/java/com/sunyard/SydApiException.java
This commit is contained in:
cheney
2022-09-05 15:49:46 +08:00
parent 8ccb1b983e f59e25757f
commit 77dd48f8a0
33 changed files with 1194 additions and 1417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sunyard/MutiThreadHander.java
+109
View File
@@ -0,0 +1,109 @@
package com.sunyard;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
/**
* 管理多线程间对象
* 类似 ThreadLocal
* @param <T>
*/
public class MutiThreadHander<T> {
private static class Handler<T> {
private T obj = null;
private long creatAt = System.currentTimeMillis();
private long lastGetAt = System.currentTimeMillis();
public Handler(T obj) {
this.obj = obj;
}
public T getObj() {
return obj;
}
public long getCreatAt() {
return creatAt;
}
public long getLastGetAt() {
return lastGetAt;
}
}
private final Map<Thread, Handler> handers = new HashMap<Thread, Handler>();
private ScheduledExecutorService gcThread = Executors.newScheduledThreadPool(1);
private long maxLiveMillis = 8 * 3600 * 1000;
private long maxIdleMillis = 3600 * 1000;
private long checkEveryMillis = 5 * 60 * 1000;
public MutiThreadHander() {
gcThread.scheduleWithFixedDelay(new Runnable() {
@Override
public void run() {
try {
if ( handers.size() <= 0 ) {
return;
}
long now = System.currentTimeMillis();
Iterator<Map.Entry<Thread, Handler>>it = handers.entrySet().iterator();
while ( it.hasNext() ){
Map.Entry<Thread, Handler> entry = it.next();
// check maxLiveMillis
if ( entry.getValue().getCreatAt() - now > maxLiveMillis ){
synchronized ( handers ){
it.remove();
}
}
// check maxIdleMillis
if ( entry.getValue().getLastGetAt() - now > maxIdleMillis ){
synchronized ( handers ){
it.remove();
}
}
}
} catch ( Exception e) {
e.printStackTrace();
}
}
}, checkEveryMillis, checkEveryMillis, TimeUnit.MILLISECONDS );
}
protected T initialValue() {
return null;
}
public void clear(){
synchronized ( handers ) {
handers.remove( Thread.currentThread() );
}
}
public void set(T obj){
synchronized ( handers ) {
handers.put( Thread.currentThread() , new Handler(obj));
}
}
public T get(){
synchronized ( handers ) {
Handler hander = handers.get( Thread.currentThread() );
if ( null == hander ) {
T o = initialValue();
hander = new Handler( o );
handers.put( Thread.currentThread(), hander );
}
return (T) hander.getObj();
}
}
}
src/main/java/com/sunyard/SydApiException.java
+36 -26
View File
@@ -13,82 +13,92 @@ public class SydApiException extends RuntimeException{
return retCode;
}
public void transMsg(){
switch (this.retCode){
private static String transMsg(int code){
String msg = "未定义的错误";
switch (code){
case -1:
case -2:
case -3:
this.msg = "网络错误";
msg = "网络错误";
break;
case -4:
this.msg = "返回包的序列号有误";
msg = "返回包的序列号有误";
break;
case -5:
this.msg = "返回包的命令码有误";
msg = "返回包的命令码有误";
break;
case -6:
this.msg = "输出缓冲区预留太小";
msg = "输出缓冲区预留太小";
break;
case -25:
this.msg = "输入的 HASH 值长度应该为 32 个字节";
msg = "输入的 HASH 值长度应该为 32 个字节";
break;
case -26:
this.msg = "用户标识超长(应该<=16) ";
msg = "用户标识超长(应该<=16) ";
break;
case -27:
this.msg = "数据类型不合法 ";
msg = "数据类型不合法 ";
break;
case 33:
this.msg = "检索的数据或密钥不存在";
msg = "检索的数据或密钥不存在";
break;
case 4:
this.msg = "DER 编码格式错误(公钥) ";
msg = "DER 编码格式错误(公钥) ";
break;
case 21:
this.msg = "输入的数据格式错误 ";
msg = "输入的数据格式错误 ";
break;
case 19:
this.msg = "数据解密错(C3) ";
msg = "数据解密错(C3) ";
break;
case 2:
this.msg = "签名验证错误 ";
msg = "签名验证错误 ";
break;
case 129:
this.msg = "没有该指令";
msg = "没有该指令";
break;
case 0x8006 : {
this.msg = "输入的数据格式错误";
msg = "输入的数据格式错误";
break;
}
case 32770:
this.msg = "签名验证错误(P7) ";
msg = "签名验证错误(P7) ";
break;
case 32773:
this.msg = "证书不可信";
msg = "证书不可信";
break;
case 32884:
this.msg = "证书或签名数据的格式错";
msg = "证书或签名数据的格式错";
break;
case 36868:
this.msg = "DN 所指向的实体不存在";
msg = "DN 所指向的实体不存在";
break;
case 40000:
this.msg = "输入的大数据处理异常";
break;
case 56300:
this.msg = "证书导入错误";
break;
case 56307:
this.msg = "证书删除错误";
break;
default:
this.msg = "未定义的错误";
msg = "未定义的错误";
}
return msg;
}
public void transMsg(){
this.msg = transMsg( this.retCode );
}
public SydApiException(int retCode) {
@@ -98,9 +108,9 @@ public class SydApiException extends RuntimeException{
}
public SydApiException(String msg, int ret){
super("SydApiException(" +"code ="+ String.format(" %d", ret) + " : "+"msg ="+ (null == msg ? "未定义的错误" : msg) +")" );
this.retCode = ret;
public SydApiException(String msg, int retCode){
super("SydApiException(" + String.format("%04X", retCode) + ":" + ( null == msg ? transMsg(retCode) : msg ) + ")" );
this.retCode = retCode;
if (null == msg || "".equals(msg)){
transMsg();
}else {
@@ -124,7 +134,7 @@ public class SydApiException extends RuntimeException{
sb.append(Integer.toHexString(this.retCode));
sb.append(" ) ");
sb.append(" msg = ");
sb.append(this.msg);
sb.append(msg);
return sb.toString();
}
}
src/main/java/com/sunyard/inf/SydCryptionApi.java
+4
View File
@@ -3,6 +3,7 @@ package com.sunyard.inf;
import com.sunyard.RetWrap;
import java.io.UnsupportedEncodingException;
import java.util.List;
/**
* 对称加解密相关接口
@@ -273,6 +274,9 @@ interface SydSYMApi {
*/
byte[] SYMEncryptData(int nAlg, String seesionKey, int fullmode, byte[] pINdata);
List<byte[]> SYMEncryptDecryptBatchData(int nAlg, String[] seesionKey, int fullmode, List<byte[]> pINdata);
/**
* 用输入的会话密钥，对指定报文数据进行加密处理。
*
src/main/java/com/sunyard/inf/SydSVApi.java
+3 -3
View File
@@ -60,8 +60,8 @@ interface SydAttachedSVApi {
* @param orgData 要签名的信息
* @return 签名结果
*/
String SM2SignC(int flag, String privateKey, byte[] publicKey, byte[] orgData);
String SM2SignC(int flag, String pUserID, String privateKey, byte[] publicKey, byte[] orgData);
byte[] SM2SignC(int flag, String privateKey, byte[] publicKey, byte[] orgData);
byte[] SM2SignC(int flag, String pUserID, String privateKey, byte[] publicKey, byte[] orgData);
/**
* SM2 私钥签名
* @param pUserID 使用者的 ID，最大长度为 16 位数字，右对齐。
@@ -142,7 +142,7 @@ interface SydAttachedSVApi {
int nOrgDataType,
byte[] publicKey,
byte[] orgData,
String sign
byte[] sign
);
src/main/java/com/sunyard/inf/customize/SydHAApi.java
+8 -1
View File
@@ -117,9 +117,16 @@ public interface SydHAApi {
* @param nOrgDataType 签名数据类型，SydApi.DATA_ORIGIN(1) 原始数据 SydApi.DATA_HASH(0) ： hash 后的类型
* @param publicKey 公钥串，DER编码，HEX格式
* @param orgData 待签名的原始数据,“签名数据类型”为 0 时：HASH 值。“签名数据类型”为 1 时：要签名的信息
* @param base64Sign 签名数据 （DER 编码 + Base64 编码）
* @param sign S+R
* @return 验签是否通过
*/
public boolean SM2Verify(
int nOrgDataType,
byte[] publicKey,
byte[] orgData,
byte[] sign
);
public boolean SM2Verify(
int nOrgDataType,
byte[] publicKey,
src/main/java/com/sunyard/inf/customize/SydSDNXApiImpl.java
-185
View File
@@ -1,185 +0,0 @@
package com.sunyard.inf.customize;
import com.sunyard.SydApiException;
import com.sunyard.cert.X509;
import com.sunyard.proto.Packet;
import com.sunyard.proto.PacketSection;
import com.sunyard.proto.Util;
import com.sunyard.trans.PacketSN;
import racal.sunyard.main.SydApi4j;
import racal.sunyard.main.proto.Proto8003;
import racal.sunyard.main.proto.Proto8004;
import racal.sunyard.main.proto.Proto8012;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
public class SydSDNXApiImpl extends SydApi4j implements SydSDNXApi {
public String nakedSign(byte[] orgData, String sCertDN) {
Proto8003 proto = new Proto8003(); //pset.getProtocolReqRender("75");
byte[] dn = new byte[256];
byte[] s = null;
try {
s = sCertDN.getBytes("GBK");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
System.arraycopy(s, 0, dn, 0, s.length);
// 填充数据
HashMap<String, Object> packet = new HashMap<String, Object>();
HashMap<String, Object> data = new HashMap<String, Object>();
packet.put("data", data);
PacketSN sn = PacketSN.gen();
packet.put("header", sn.getSn().array());
data.put("signatureDataType$option", 1);
data.put("DN", dn);
data.put("data", orgData);
// 渲染发送
ByteBuffer bb = proto.rend(packet);
synchronized (this) {
// 响应解析
bb = syncRead(syncSend(bb));
}
Packet p = proto.parse(bb);
Map<String, Object> ret = p.toMap();
if (
!Arrays.equals(sn.getSn().array(), ((PacketSection) ret.get("header")).getBytes())
) {
throw new SydApiException("包序号不匹配", -4);
}
ret = (Map<String, Object>) ret.get("data");
PacketSection error = (PacketSection) ret.get("error");
byte[] be = error.getBytes();
if (
(0 != (be[0] ^ be[1]))) {
throw new SydApiException(error.getInfo(), error.autoInt());
}
return Util.encodeBase64(((PacketSection) ret.get("signature")).getBytes());
//return ((PacketSection) ret.get("signature")).getBytes();
}
@Override
public boolean SYD_NakedVerify(byte[] orgData, String sign, String organizationNum) {
Proto8004 proto = new Proto8004(); //pset.getProtocolReqRender("75");
byte[] dn = new byte[256];
byte[] s = null;
// 填充数据
HashMap<String, Object> packet = new HashMap<String, Object>();
HashMap<String, Object> data = new HashMap<String, Object>();
packet.put("data", data);
PacketSN sn = PacketSN.gen();
packet.put("header", sn.getSn().array());
data.put("signatureDataType$option", 2);
data.put("organizationNum", organizationNum);
data.put("data", orgData);
data.put("signature", Util.decodeBase64(sign));
data.put("returnSign$option", 0);
// 渲染发送
ByteBuffer bb = proto.rend(packet);
synchronized (this) {
// 响应解析
bb = syncRead(syncSend(bb));
}
Packet p = proto.parse(bb, packet);
Map<String, Object> ret = p.toMap();
if (
!Arrays.equals(sn.getSn().array(), ((PacketSection) ret.get("header")).getBytes())
) {
throw new SydApiException("包序号不匹配", -4);
}
ret = (Map<String, Object>) ret.get("data");
PacketSection error = (PacketSection) ret.get("error");
byte[] be = error.getBytes();
if ((0 != (be[0] ^ be[1]))) {
throw new SydApiException(error.getInfo(), error.autoInt());
}
return true;
}
@Override
public X509 SYD_Get_X509_CertInfo_HA(String bNumber, byte[] orgData, String sign) {
Proto8012 proto = new Proto8012(); //pset.getProtocolReqRender("75");
// 填充数据
HashMap<String, Object> packet = new HashMap<String, Object>();
HashMap<String, Object> data = new HashMap<String, Object>();
packet.put("data", data);
PacketSN sn = PacketSN.gen();
packet.put("header", sn.getSn().array());
data.put("originData", orgData);
data.put("signData", sign.getBytes());
data.put("flag$option", 2);
data.put("organizationNum", bNumber);
// 渲染发送
ByteBuffer bb = proto.rend(packet);
synchronized (this) {
// 响应解析
bb = syncRead(syncSend(bb));
}
Packet p = proto.parse(bb, packet);
Map<String, Object> ret = p.toMap();
if (
!Arrays.equals(sn.getSn().array(), ((PacketSection) ret.get("header")).getBytes())
) {
throw new SydApiException("包序号不匹配", -4);
}
ret = (Map<String, Object>) ret.get("data");
PacketSection error = (PacketSection) ret.get("error");
byte[] be = error.getBytes();
if ((0 != (be[0] ^ be[1]))) {
throw new SydApiException(error.getInfo(), error.autoInt());
}
PacketSection info = (PacketSection) ret.get("info");
byte[] pCertInfo = info.getBytes();
// X509 cinfo = new X509();
// cinfo.setIssuer(Util.toCleanString(pCertInfo, 0, 257));
// cinfo.setSerialNumber(Util.toCleanString(pCertInfo, 257, 65));
// cinfo.setSubject(Util.toCleanString(pCertInfo, 257 + 65, 257));
// cinfo.setNotBefore(Util.toCleanString(pCertInfo, 257 + 65 + 257, 15));
// cinfo.setNotAfter(Util.toCleanString(pCertInfo, 257 + 65 + 257 + 15, 15));
// byte[] blen = new byte[]{pCertInfo[257 + 65 + 257 + 15 + 15], pCertInfo[257 + 65 + 257 + 15 + 16]};
// int len = Util.b2i(blen);
// byte[] pem = new byte[len];
// System.arraycopy(pCertInfo, 257 + 65 + 257 + 15 + 17, pem, 0, len);
// String pp = new String(pem);
// 解析证书
return GetX509CertInfo(new String(pCertInfo));
}
}
src/main/java/racal/sunyard/main/SydApi4j.java
+140 -7
View File
@@ -641,6 +641,7 @@ public class SydApi4j implements SydApi {
byte[] dn = new byte[256];
byte[] s = null;
try {
sCertDN = DnUtil.verifyDn( sCertDN );
s = sCertDN.getBytes("GBK");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
@@ -2073,7 +2074,119 @@ public class SydApi4j implements SydApi {
data.put("msg", pInData);
packet.put("data", data);
return repackEncrypt(packet);
return repackEncrypt( packet );
}
public List<byte[]> SYMEncryptDecryptBatchData(int nAlg, String[] seesionKey, int fullmode, List<byte[]> pINdata) {
int batchSize = pINdata.size();
if ( batchSize < 1 || batchSize > 10 ) {
throw new IllegalArgumentException("批量数量错误");
}
if ( seesionKey.length != pINdata.size() ) {
throw new IllegalArgumentException("密钥和数据数量不匹配");
}
if ( 0x0 != (byte) (nAlg & 0x1) ){
// 解密
for ( byte[]d : pINdata ) {
if ( d.length > 1040 ) {
throw new IllegalArgumentException("批量单数数据超长 1040");
}
}
} else {
// 加密
for ( byte[]d : pINdata ) {
if ( d.length > 1024 ) {
throw new IllegalArgumentException("批量单数数据超长 1024");
}
}
}
ByteBuffer bb = ByteBuffer.allocate(10 * 1024);
PacketSN sn = PacketSN.gen();
bb.put( new byte[2] );
bb.put( sn.getSn().array() );
bb.put( "E0".getBytes() );
bb.put( (byte) 0x34 ); // 批量加解密
bb.put( (byte) batchSize ); // 批量数
bb.put( (byte) ( 0x30 + nAlg) ); // 密钥模式
bb.put( (byte) ( 0x31) ); // ECB
bb.put( (byte) ( 0x30) ); // ZEK
// 填充多个密钥
for ( String key : seesionKey ) {
bb.put( key.getBytes() );
}
bb.put( (byte) ( 0x30) ); // 输入消息类型二进制
bb.put( (byte) ( 0x30) ); // 输出消息类型二进制
bb.put( (byte) ( 0x30 + fullmode) ); // 填充模式
bb.put( "0000".getBytes() ); // 填充字符
bb.put( (byte) ( 0x32) ); // 填充类型
// iv 暂未支持
// P 长度暂未支持
// 填充多个消息数据长度
for ( byte[] data : pINdata ) {
bb.put( String.format("%03X", data.length).getBytes() );
}
// 填充多个消息数据
for ( byte[] data : pINdata ) {
bb.put( data );
}
// 重新计算长度
int len = bb.position();
len -= 2;
byte[] lenArray = new byte[ 2 ];
lenArray[0] = (byte)((len >> 8) & 0xFF);
lenArray[1] = (byte)( len & 0xFF);
bb.put( 0, (byte)((len >> 8) & 0xFF) );
bb.put( 1, (byte)( len & 0xFF) );
// 通信
synchronized (this) {
// 响应解析
bb = syncRead(syncSend(bb));
}
bb.flip();
bb.position( 12 );
byte[] code = new byte[2];
bb.get( code );
int retCode = Integer.valueOf( new String( code ) );
if ( 0 != retCode ) {
throw new SydApiException( retCode );
}
// 跳过输出模式
bb.get();
// 获取 N 个长度
int[] lens = new int[ batchSize ];
for ( int i = 0; i < batchSize; i++ ){
byte[] iLenArray = new byte[3];
bb.get( iLenArray );
lens[ i ] = Integer.valueOf( new String( iLenArray ), 16 );
}
List<byte[]>ret = new ArrayList<byte[]>();
// 获取 N 个长度的数据
for ( int l : lens ) {
byte[] d = new byte[ l ];
bb.get(d);
ret.add( d );
}
return ret;
}
@@ -3762,6 +3875,13 @@ public class SydApi4j implements SydApi {
// 测试通过
public String SM2GetPrivateKeyC(String privateKeyTag) {
if ( privateKeyTag.length() < 16 ) {
privateKeyTag = "0000000000000000" + privateKeyTag;
privateKeyTag = privateKeyTag.substring( privateKeyTag.length() -16 );
privateKeyTag += "00000000001";
}
ProtoQP proto = new ProtoQP();
HashMap<String, Object> packet = new HashMap<String, Object>();
HashMap<String, Object> data = new HashMap<String, Object>();
@@ -4008,13 +4128,13 @@ public class SydApi4j implements SydApi {
* @param orgData 要签名的信息
* @return 签名结果
*/
public String SM2SignC(int flag, String privateKey, byte[] publicKey, byte[] orgData) {
public byte[] SM2SignC(int flag, String privateKey, byte[] publicKey, byte[] orgData) {
return SM2SignC(flag, "1234567812345678", privateKey, publicKey, orgData);
}
// 测试通过
@Override
public String SM2SignC(int flag, String uid, String privateKey, byte[] publicKey, byte[] orgData) {
public byte[] SM2SignC(int flag, String uid, String privateKey, byte[] publicKey, byte[] orgData) {
Proto74 proto = new Proto74();
@@ -4055,7 +4175,7 @@ public class SydApi4j implements SydApi {
byte[] s = new byte[a];
bb.get(s, 0, a);
return SYMUtil.derSign2Base64Sign(s);
return Util.decodeBase64( SYMUtil.derSign2Base64Sign(s) );
}
@@ -4226,6 +4346,17 @@ public class SydApi4j implements SydApi {
return ((PacketSection) ret.get("signature")).getString();
}
@Override
public boolean SM2Verify(
int nOrgDataType,
byte[] publicKey,
byte[] orgData,
byte[] sign
) {
String certNo = "1234567812345678";
return SM2Verify(certNo, nOrgDataType, publicKey, orgData, sign);
}
@Override
public boolean SM2Verify(
int nOrgDataType,
@@ -4234,9 +4365,10 @@ public class SydApi4j implements SydApi {
String base64Sign
) {
String certNo = "1234567812345678";
return SM2Verify(certNo, nOrgDataType, publicKey, orgData, base64Sign);
return SM2Verify(certNo, nOrgDataType, publicKey, orgData, Util.decodeBase64(base64Sign) );
}
@Override
public String SM2Sign(
int nOrgDataType,
@@ -4333,7 +4465,7 @@ public class SydApi4j implements SydApi {
// 测试通过
@Override
public boolean SM2Verify(String certNo, int nOrgDataType, byte[] publicKey, byte[] orgData, String base64Sign) {
public boolean SM2Verify(String certNo, int nOrgDataType, byte[] publicKey, byte[] orgData, byte[] sign) {
if (certNo.length() > 32) {
certNo = certNo.substring(0, 32);
@@ -4341,7 +4473,7 @@ public class SydApi4j implements SydApi {
Proto75 proto = new Proto75(); //pset.getProtocolReqRender("75");
byte[] sign = SYMUtil.base64Sign2DerSign(base64Sign);
sign = SYMUtil.base64Sign2DerSign( Util.encodeBase64(sign) );
// 填充数据
HashMap<String, Object> packet = new HashMap<String, Object>();
@@ -10567,6 +10699,7 @@ public class SydApi4j implements SydApi {
}
public String attachedSignSoft(byte[] orgData, String sCertDN) throws UnsupportedEncodingException {
sCertDN = DnUtil.verifyDn( sCertDN );
String pk = this.GetDNPublicKey( SydApi.FOR_SIGN, sCertDN.getBytes("GBK") );
try {
byte[] hash = this.SM3Hash( pk, orgData );