Skip to content

SaaS多租户平台私钥托管动态切换 #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master-2.0
Choose a base branch
from
Open

SaaS多租户平台私钥托管动态切换 #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions ...on/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
*/
package org.fisco.bcos.sdk.transaction.manager;

import java.io.IOException;
import java.math.BigInteger;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import org.apache.commons.lang3.tuple.Pair;
import org.fisco.bcos.sdk.abi.ABICodec;
import org.fisco.bcos.sdk.abi.ABICodecException;
Expand Down Expand Up @@ -48,6 +44,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.math.BigInteger;
import java.util.List;
import java.util.concurrent.CompletableFuture;

/**
* ContractlessTransactionManager @Description: ContractlessTransactionManager
*
Expand Down Expand Up @@ -96,7 +97,7 @@ public void deployOnly(String abi, String bin, List<Object> params) throws ABICo

@Override
public TransactionReceipt deployAndGetReceipt(String data) {
String signedData = createSignedTransaction(null, data, this.cryptoKeyPair);
String signedData = createSignedTransaction(null, data, getCryptoKeyPair());
return transactionPusher.push(signedData);
}

Expand Down Expand Up @@ -126,7 +127,7 @@ public TransactionResponse deployAndGetResponseWithStringParams(
createSignedTransaction(
null,
abiCodec.encodeConstructorFromString(abi, bin, params),
this.cryptoKeyPair));
getCryptoKeyPair()));
}

@Override
Expand Down Expand Up @@ -181,7 +182,7 @@ public void sendTransactionOnly(String signedData) {
public TransactionResponse sendTransactionAndGetResponse(
String to, String abi, String functionName, String data)
throws TransactionBaseException, ABICodecException {
String signedData = createSignedTransaction(to, data, this.cryptoKeyPair);
String signedData = createSignedTransaction(to, data, getCryptoKeyPair());
TransactionReceipt receipt = this.transactionPusher.push(signedData);
try {
return transactionDecoder.decodeReceiptWithValues(abi, functionName, receipt);
Expand Down Expand Up @@ -246,7 +247,7 @@ public void sendTransactionAsync(
TransactionCallback callback)
throws TransactionBaseException, ABICodecException {
String data = encodeFunction(abi, functionName, params);
sendTransactionAsync(to, data, this.cryptoKeyPair, callback);
sendTransactionAsync(to, data, getCryptoKeyPair(), callback);
}

@Override
Expand All @@ -265,15 +266,15 @@ public void sendTransactionAndGetReceiptByContractLoaderAsync(
String data =
abiCodec.encodeMethod(
contractLoader.getABIByContractName(contractName), functionName, args);
sendTransactionAsync(contractAddress, data, this.cryptoKeyPair, callback);
sendTransactionAsync(contractAddress, data, getCryptoKeyPair(), callback);
}

@Override
public CallResponse sendCallByContractLoader(
String contractName, String contractAddress, String functionName, List<Object> args)
throws TransactionBaseException, ABICodecException {
return sendCall(
this.cryptoKeyPair.getAddress(),
getCryptoKeyPair().getAddress(),
contractAddress,
contractLoader.getABIByContractName(contractName),
functionName,
Expand Down Expand Up @@ -328,7 +329,7 @@ public CallResponse callAndGetResponse(
public String createSignedConstructor(String abi, String bin, List<Object> params)
throws ABICodecException {
return createSignedTransaction(
null, abiCodec.encodeConstructor(abi, bin, params), this.cryptoKeyPair);
null, abiCodec.encodeConstructor(abi, bin, params), getCryptoKeyPair());
}

@Override
Expand Down Expand Up @@ -397,4 +398,4 @@ private CallResponse parseCallResponseStatus(Call.CallOutput callOutput)
public ContractLoader getContractLoader() {
return contractLoader;
}
}
}
36 changes: 30 additions & 6 deletions ...ransaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
*/
package org.fisco.bcos.sdk.transaction.manager;

import java.math.BigInteger;
import org.fisco.bcos.sdk.client.Client;
import org.fisco.bcos.sdk.client.protocol.request.Transaction;
import org.fisco.bcos.sdk.client.protocol.response.Call;
import org.fisco.bcos.sdk.crypto.CryptoSuite;
import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair;
import org.fisco.bcos.sdk.model.CryptoType;
import org.fisco.bcos.sdk.model.TransactionReceipt;
import org.fisco.bcos.sdk.model.callback.TransactionCallback;
import org.fisco.bcos.sdk.transaction.builder.TransactionBuilderInterface;
Expand All @@ -34,6 +34,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.math.BigInteger;

public class TransactionProcessor implements TransactionProcessorInterface {
protected static Logger log = LoggerFactory.getLogger(TransactionProcessor.class);
protected final CryptoSuite cryptoSuite;
Expand All @@ -58,21 +60,21 @@ public TransactionProcessor(
@Override
public TransactionReceipt sendTransactionAndGetReceipt(
String to, String data, CryptoKeyPair cryptoKeyPair) {
String signedData = createSignedTransaction(to, data, cryptoKeyPair);
String signedData = createSignedTransaction(to, data, getCryptoKeyPair());
return this.client.sendRawTransactionAndGetReceipt(signedData);
}

@Override
public void sendTransactionAsync(
String to, String data, CryptoKeyPair cryptoKeyPair, TransactionCallback callback) {
String signedData = createSignedTransaction(to, data, cryptoKeyPair);
String signedData = createSignedTransaction(to, data, getCryptoKeyPair());
client.sendRawTransactionAndGetReceiptAsync(signedData, callback);
}

@Override
public byte[] sendTransactionAsyncAndGetHash(
String to, String data, CryptoKeyPair cryptoKeyPair, TransactionCallback callback) {
String signedData = createSignedTransaction(to, data, cryptoKeyPair);
String signedData = createSignedTransaction(to, data, getCryptoKeyPair());
client.sendRawTransactionAndGetReceiptAsync(signedData, callback);
byte[] transactionHash = cryptoSuite.hash(Hex.decode(Numeric.cleanHexPrefix(signedData)));
return transactionHash;
Expand Down Expand Up @@ -101,6 +103,28 @@ public String createSignedTransaction(String to, String data, CryptoKeyPair cryp
new BigInteger(this.chainId),
BigInteger.valueOf(this.groupId),
"");
return transactionEncoder.encodeAndSign(rawTransaction, cryptoKeyPair);
return transactionEncoder.encodeAndSign(rawTransaction, getCryptoKeyPair());
}

/**
* SaaS多租户平台私钥托管动态切换
* 1.识别租户(Controller从request Header中获取X-tenant租户ID存入ThreadLocal)
* 2.切换私钥(根据租户ID从DB查询托管私钥创建CryptoKeyPair)
* @return
*/
protected CryptoKeyPair getCryptoKeyPair(){
//请根据实际业务实现租户识别和根据租户ID从DB查询托管私钥逻辑替换privateKey
//AccountService accountService = SpringUtils.getBean("accountService");
String privateKey = null;//accountService.getPrivateKey(TenantContextHolder.getTenant());
if(null == privateKey){
log.info("getCryptoKeyPair[accountService.getPrivateKey(tenantId)] is null, use default cryptoKeyPair");
return this.cryptoKeyPair;
}

//创建国密类型的CryptoSuite
CryptoKeyPair cryptoKeyPair = new CryptoSuite(CryptoType.SM_TYPE).createKeyPair(privateKey);
log.info("Dynamic CryptoKeyPair address => " + cryptoKeyPair.getAddress());
//cryptoSuite.setCryptoKeyPair(cryptoKeyPair);
return cryptoKeyPair;
}
}
}