mirror of https://github.com/hyperledger/besu
(internal) Refactor 'onchain' to 'flexible' where applicable (#3075)
* CLI option name change Signed-off-by: Frank Li <b439988l@gmail.com> * refactor privacyparameters.java and add deprecation warning Signed-off-by: Frank Li <b439988l@gmail.com> * more refactoring Signed-off-by: Frank Li <b439988l@gmail.com> * add to everything.toml Signed-off-by: Frank Li <b439988l@gmail.com> * bugs Signed-off-by: Frank Li <b439988l@gmail.com> * more missing variable names Signed-off-by: Frank Li <b439988l@gmail.com> * more classes Signed-off-by: Frank Li <b439988l@gmail.com> * more classes Signed-off-by: Frank Li <b439988l@gmail.com> * fix compile error Signed-off-by: Frank Li <b439988l@gmail.com> * add new test to invalidate passing both commands Signed-off-by: Frank Li <b439988l@gmail.com> * more refactoring + more tests Signed-off-by: Frank Li <b439988l@gmail.com> * new batch Signed-off-by: Frank Li <b439988l@gmail.com> * final batch? Signed-off-by: Frank Li <b439988l@gmail.com> * failing unit test Signed-off-by: Frank Li <b439988l@gmail.com> * revert incorrect refactoring back to onchain Signed-off-by: Frank Li <b439988l@gmail.com> * fix unit test Signed-off-by: Frank Li <b439988l@gmail.com> * comment Signed-off-by: Frank Li <b439988l@gmail.com> * comment Signed-off-by: Frank Li <b439988l@gmail.com> * support both privx methods Signed-off-by: Frank Li <b439988l@gmail.com> * add to changelog Signed-off-by: Frank Li <b439988l@gmail.com> * address comment Signed-off-by: Frank Li <b439988l@gmail.com> * add plugin privacy Signed-off-by: Frank Li <b439988l@gmail.com>pull/3104/head
Frank Li
3 years ago
committed by
GitHub
parent
bf2fa40b4f
commit
183cdaf3e3
@ -0,0 +1,80 @@ |
||||
/* |
||||
* Copyright ConsenSys AG. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations under the License. |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx; |
||||
|
||||
import static org.apache.logging.log4j.LogManager.getLogger; |
||||
import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.FIND_FLEXIBLE_PRIVACY_GROUP_ERROR; |
||||
|
||||
import org.hyperledger.besu.enclave.types.PrivacyGroup; |
||||
import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; |
||||
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext; |
||||
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; |
||||
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider; |
||||
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; |
||||
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; |
||||
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; |
||||
import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException; |
||||
import org.hyperledger.besu.ethereum.privacy.PrivacyController; |
||||
|
||||
import java.util.Arrays; |
||||
|
||||
import graphql.com.google.common.collect.Lists; |
||||
import org.apache.logging.log4j.Logger; |
||||
|
||||
public class PrivxFindFlexiblePrivacyGroup implements JsonRpcMethod { |
||||
|
||||
private static final Logger LOG = getLogger(); |
||||
private final PrivacyController privacyController; |
||||
private final PrivacyIdProvider privacyIdProvider; |
||||
|
||||
public PrivxFindFlexiblePrivacyGroup( |
||||
final PrivacyController privacyController, final PrivacyIdProvider privacyIdProvider) { |
||||
this.privacyController = privacyController; |
||||
this.privacyIdProvider = privacyIdProvider; |
||||
} |
||||
|
||||
@Override |
||||
public String getName() { |
||||
return RpcMethod.PRIVX_FIND_PRIVACY_GROUP.getMethodName(); |
||||
} |
||||
|
||||
@Override |
||||
public JsonRpcResponse response(final JsonRpcRequestContext requestContext) { |
||||
LOG.trace("Executing {}", RpcMethod.PRIVX_FIND_PRIVACY_GROUP.getMethodName()); |
||||
|
||||
final String[] addresses = requestContext.getRequiredParameter(0, String[].class); |
||||
|
||||
LOG.trace("Finding a privacy group with members {}", Arrays.toString(addresses)); |
||||
|
||||
final PrivacyGroup[] response; |
||||
try { |
||||
response = |
||||
privacyController.findPrivacyGroupByMembers( |
||||
Arrays.asList(addresses), |
||||
privacyIdProvider.getPrivacyUserId(requestContext.getUser())); |
||||
} catch (final MultiTenancyValidationException e) { |
||||
LOG.error("Unauthorized privacy multi-tenancy rpc request. {}", e.getMessage()); |
||||
return new JsonRpcErrorResponse( |
||||
requestContext.getRequest().getId(), FIND_FLEXIBLE_PRIVACY_GROUP_ERROR); |
||||
} catch (final Exception e) { |
||||
LOG.error("Failed to fetch flexible privacy group", e); |
||||
return new JsonRpcErrorResponse( |
||||
requestContext.getRequest().getId(), FIND_FLEXIBLE_PRIVACY_GROUP_ERROR); |
||||
} |
||||
|
||||
return new JsonRpcSuccessResponse( |
||||
requestContext.getRequest().getId(), Lists.newArrayList(response)); |
||||
} |
||||
} |
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue