Skip to content
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

feat: merge 0.6.5.1 to main #439

Merged
merged 3 commits into from
Aug 8, 2024
Merged

feat: merge 0.6.5.1 to main #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bacc1dd
fix: governance responseCode is 4
Aug 1, 2024
37f7145
fix: overwrite updates
Aug 2, 2024
362fff1
fix: verify ServiceCollectConfiguration
Aug 5, 2024
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
42 changes: 25 additions & 17 deletions arex-web-api/src/main/java/com/arextest/web/api/service/aspect/AppAuthAspectExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
import com.arextest.common.context.ArexContext;
import com.arextest.common.exceptions.ArexException;
import com.arextest.common.jwt.JWTService;
import com.arextest.common.model.response.ResponseCode;
import com.arextest.common.utils.ResponseUtils;
import com.arextest.common.utils.ResponseUtils_New;
import com.arextest.config.model.dao.config.SystemConfigurationCollection;
import com.arextest.config.model.dto.application.ApplicationConfiguration;
import com.arextest.config.model.dto.system.SystemConfiguration;
Expand Down Expand Up @@ -56,18 +55,10 @@ public Object doAround(ProceedingJoinPoint point, AppAuth auth) throws Throwable

if (context.getAppId() == null) {
LOGGER.error("header has no appId");
return reject(point, auth, Constants.NO_APPID);
return reject(point, auth, Constants.NO_APPID, ArexApiResponseCode.APP_AUTH_NO_APP_ID);
}

OwnerExistResult ownerExistResult = getOwnerExistResult();
if (ownerExistResult.getExist()) {
context.setPassAuth(true);
return point.proceed();
} else {
context.setPassAuth(false);
return reject(point, auth, ownerExistResult.getRemark());
}

return processOwnerExistVerify(ownerExistResult, context, point, auth);
} finally {
ArexContext.removeContext();
}
Expand Down Expand Up @@ -103,21 +94,37 @@ protected OwnerExistResult getOwnerExistResult() {
context.getAppId());
if (CollectionUtils.isEmpty(applications)) {
LOGGER.error("error appId, appId: {}", context.getAppId());
return new OwnerExistResult(false, Constants.ERROR_APPID);
return new OwnerExistResult(false, Constants.ERROR_APPID,
ArexApiResponseCode.APP_AUTH_ERROR_APP_ID);
}
Set<String> owners = applications.get(0).getOwners();
if (CollectionUtils.isEmpty(owners) || owners.contains(userName)) {
return new OwnerExistResult(true, null);
return new OwnerExistResult(true, null, null);
} else {
return new OwnerExistResult(false, Constants.NO_PERMISSION,
ArexApiResponseCode.APP_AUTH_NO_PERMISSION);
}
}


private Object processOwnerExistVerify(OwnerExistResult ownerExistResult, ArexContext context,
ProceedingJoinPoint point, AppAuth auth)
throws Throwable {
if (ownerExistResult.getExist()) {
context.setPassAuth(true);
return point.proceed();
} else {
return new OwnerExistResult(false, Constants.NO_PERMISSION);
context.setPassAuth(false);
return reject(point, auth, ownerExistResult.getRemark(), ownerExistResult.getResponseCode());
}
}


private Object reject(ProceedingJoinPoint point, AppAuth auth, String remark) throws Throwable {
private Object reject(ProceedingJoinPoint point, AppAuth auth, String remark, int responseCode)
throws Throwable {
switch (auth.rejectStrategy()) {
case FAIL_RESPONSE:
return ResponseUtils.errorResponse(remark, ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(remark, responseCode);
case DOWNGRADE:
ArexContext.getContext().setPassAuth(false);
return point.proceed();
Expand Down Expand Up @@ -146,6 +153,7 @@ public static class OwnerExistResult {

private Boolean exist;
private String remark;
private Integer responseCode;
}


Expand Down
60 changes: 31 additions & 29 deletions arex-web-api/src/main/java/com/arextest/web/api/service/controller/FileSystemController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.arextest.web.api.service.controller;

import com.arextest.common.jwt.JWTService;
import com.arextest.common.model.response.Response;
import com.arextest.common.model.response.ResponseCode;
import com.arextest.common.jwt.JWTService;
import com.arextest.common.utils.ResponseUtils;
import com.arextest.common.utils.ResponseUtils_New;
import com.arextest.web.common.exception.ArexApiResponseCode;
import com.arextest.web.core.business.filesystem.FileSystemService;
import com.arextest.web.core.business.filesystem.RolePermission;
import com.arextest.web.model.contract.contracts.SuccessResponseType;
Expand Down Expand Up @@ -102,8 +104,8 @@ public Response addItem(@RequestHeader(name = Constants.ACCESS_TOKEN) String tok
if (StringUtils.isNotEmpty(request.getId())
&& !rolePermission.checkPermissionByToken(RolePermission.EDIT_ITEM, token,
request.getId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
String userName = jwtService.getUserName(token);
request.setUserName(userName);
Expand All @@ -116,8 +118,8 @@ public Response addItem(@RequestHeader(name = Constants.ACCESS_TOKEN) String tok
public Response removeItem(@RequestHeader(name = Constants.ACCESS_TOKEN) String token,
@Valid @RequestBody FSRemoveItemRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.EDIT_ITEM, token, request.getId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
String userName = jwtService.getUserName(token);
FSRemoveItemResponseType response = new FSRemoveItemResponseType();
Expand All @@ -130,8 +132,8 @@ public Response removeItem(@RequestHeader(name = Constants.ACCESS_TOKEN) String
public Response rename(@RequestHeader(name = Constants.ACCESS_TOKEN) String token,
@Valid @RequestBody FSRenameRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.EDIT_ITEM, token, request.getId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
FSRenameResponseType response = new FSRenameResponseType();
response.setSuccess(fileSystemService.rename(request));
Expand All @@ -143,8 +145,8 @@ public Response rename(@RequestHeader(name = Constants.ACCESS_TOKEN) String toke
public Response duplicate(@RequestHeader(name = Constants.ACCESS_TOKEN) String token,
@Valid @RequestBody FSDuplicateRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.EDIT_ITEM, token, request.getId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
FSDuplicateResponseType response = fileSystemService.duplicate(request);
return ResponseUtils.successResponse(response);
Expand All @@ -171,8 +173,8 @@ public Response deleteWorkspace(@RequestHeader(name = Constants.ACCESS_TOKEN) St
@Valid @RequestBody FSDeleteWorkspaceRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.EDIT_WORKSPACE, token,
request.getWorkspaceId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
SuccessResponseType response = new SuccessResponseType();
response.setSuccess(fileSystemService.deleteWorkspace(request.getWorkspaceId()));
Expand All @@ -185,8 +187,8 @@ public Response renameWorkspace(@RequestHeader(name = Constants.ACCESS_TOKEN) St
@Valid @RequestBody FSRenameWorkspaceRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.EDIT_WORKSPACE, token,
request.getId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
SuccessResponseType response = new SuccessResponseType();
response.setSuccess(fileSystemService.renameWorkspace(request));
Expand All @@ -199,8 +201,8 @@ public Response queryWorkspaceById(@RequestHeader(name = Constants.ACCESS_TOKEN)
@RequestBody FSQueryWorkspaceRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.VIEW_WORKSPACE, token,
request.getId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
FSQueryWorkspaceResponseType response = fileSystemService.queryWorkspaceById(request);
return ResponseUtils.successResponse(response);
Expand Down Expand Up @@ -283,8 +285,8 @@ public Response inviteToWorkspace(@RequestHeader(name = Constants.ACCESS_TOKEN)
@Valid @RequestBody InviteToWorkspaceRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.INVITE_TO_WORKSPACE, token,
request.getWorkspaceId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
InviteToWorkspaceResponseType response = fileSystemService.inviteToWorkspace(request);
return ResponseUtils.successResponse(response);
Expand All @@ -305,8 +307,8 @@ public Response removeUserFromWorkspace(
@Valid @RequestBody RemoveUserFromWorkspaceType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.EDIT_WORKSPACE, token,
request.getWorkspaceId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
SuccessResponseType response = new SuccessResponseType();
response.setSuccess(
Expand All @@ -320,8 +322,8 @@ public Response changeRole(@RequestHeader(name = Constants.ACCESS_TOKEN) String
@Valid @RequestBody ChangeRoleRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.EDIT_WORKSPACE, token,
request.getWorkspaceId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
SuccessResponseType response = new SuccessResponseType();
response.setSuccess(fileSystemService.changeRole(request));
Expand Down Expand Up @@ -403,8 +405,8 @@ public Response getWorkspaceItem(@RequestHeader(name = Constants.ACCESS_TOKEN) S
@RequestBody FSGetWorkspaceItemsRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.VIEW_WORKSPACE, token,
request.getWorkspaceId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
FSGetWorkspaceItemsResponseType response = fileSystemService.getWorkspaceItems(request);
return ResponseUtils.successResponse(response);
Expand All @@ -416,8 +418,8 @@ public Response searchWorkspaceItems(@RequestHeader(name = Constants.ACCESS_TOKE
@RequestBody FSSearchWorkspaceItemsRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.VIEW_WORKSPACE, token,
request.getWorkspaceId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
FSSearchWorkspaceItemsResponseType response = fileSystemService.searchWorkspaceItems(request);
return ResponseUtils.successResponse(response);
Expand All @@ -430,8 +432,8 @@ public Response getWorkspaceItemTree(@RequestHeader(name = Constants.ACCESS_TOKE
@RequestBody FSGetWorkspaceItemTreeRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.VIEW_WORKSPACE, token,
request.getWorkspaceId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
FSGetWorkspaceItemTreeResponseType response = fileSystemService.getWorkspaceItemTree(request);
return ResponseUtils.successResponse(response);
Expand All @@ -443,8 +445,8 @@ public Response batchGetInterfaceCase(@RequestHeader(name = Constants.ACCESS_TOK
@RequestBody BatchGetInterfaceCaseRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.VIEW_WORKSPACE, token,
request.getWorkspaceId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
BatchGetInterfaceCaseResponseType response = fileSystemService.batchGetInterfaceCase(request);
return ResponseUtils.successResponse(response);
Expand Down
14 changes: 8 additions & 6 deletions arex-web-api/src/main/java/com/arextest/web/api/service/controller/LabelController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import com.arextest.common.model.response.Response;
import com.arextest.common.model.response.ResponseCode;
import com.arextest.common.utils.ResponseUtils;
import com.arextest.common.utils.ResponseUtils_New;
import com.arextest.web.common.exception.ArexApiResponseCode;
import com.arextest.web.core.business.LabelService;
import com.arextest.web.core.business.filesystem.RolePermission;
import com.arextest.web.model.contract.contracts.SuccessResponseType;
Expand Down Expand Up @@ -41,8 +43,8 @@ public Response saveLabel(@RequestHeader(name = Constants.ACCESS_TOKEN) String t
@Valid @RequestBody SaveLabelRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.EDIT_LABEL, token,
request.getWorkspaceId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
SuccessResponseType response = new SuccessResponseType();
response.setSuccess(labelService.saveLabel(request));
Expand All @@ -54,8 +56,8 @@ public Response removeLabel(@RequestHeader(name = Constants.ACCESS_TOKEN) String
@Valid @RequestBody RemoveLabelRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.EDIT_LABEL, token,
request.getWorkspaceId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
SuccessResponseType response = new SuccessResponseType();
response.setSuccess(labelService.removeLabel(request));
Expand All @@ -68,8 +70,8 @@ public Response queryLabelsByWorkspaceId(
@Valid @RequestBody QueryLabelsByWorkspaceIdRequestType request) {
if (!rolePermission.checkPermissionByToken(RolePermission.EDIT_LABEL, token,
request.getWorkspaceId())) {
return ResponseUtils.errorResponse(Constants.NO_PERMISSION,
ResponseCode.AUTHENTICATION_FAILED);
return ResponseUtils_New.errorResponse(Constants.NO_PERMISSION,
ArexApiResponseCode.FS_NO_PERMISSION);
}
QueryLabelsByWorkspaceIdResponseType response = new QueryLabelsByWorkspaceIdResponseType();
response.setLabels(labelService.queryLabelsByWorkspaceId(request.getWorkspaceId()));
Expand Down
13 changes: 12 additions & 1 deletion ...java/com/arextest/web/api/service/controller/config/AbstractMultiEnvConfigController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@ public Response modify(@PathVariable ModifyType modifyType, @RequestBody T confi
configuration.validateEnvConfigs();
return ResponseUtils.successResponse(getMultiEnvConfigurableHandler().editMultiEnvList(configuration));
}
return super.modify(modifyType, configuration);
if (modifyType == ModifyType.INSERT) {
configuration.validParameters();
return ResponseUtils.successResponse(getConfigurableHandler().insert(configuration));
}
if (modifyType == ModifyType.UPDATE) {
configuration.validParameters();
return ResponseUtils.successResponse(getConfigurableHandler().update(configuration));
}
if (modifyType == ModifyType.REMOVE) {
return ResponseUtils.successResponse(getConfigurableHandler().remove(configuration));
}
return ResponseUtils.resourceNotFoundResponse();
}
}
13 changes: 13 additions & 0 deletions arex-web-common/src/main/java/com/arextest/web/common/exception/ArexApiResponseCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@

/**
* Response codes from arex-api start with 1
*
* @author b_yu
* @since 2023/11/8
*/
public class ArexApiResponseCode extends ResponseCode_New {

// common error codes start with 101xxx
public static final int UNSUPPORTED_CATEGORY = 101001;
public static final int RECORD_CASE_NOT_FOUND = 101002;
Expand All @@ -20,5 +22,16 @@ public class ArexApiResponseCode extends ResponseCode_New {
public static final int FS_FORMAT_ERROR = 103002;
public static final int FS_UNKNOWN_NODE_TYPE = 103003;

// collections auth error codes start with 1039xx
public static final int FS_NO_PERMISSION = 103900;

// record & replay error codes start with 104xxx

// app auth error codes start with 105xxx, shared with arex-storage-web-api
// com.arextest.storage.model.ArexStorageResponseCode
public static final int APP_AUTH_NO_APP_ID = 105001;
public static final int APP_AUTH_ERROR_APP_ID = 105002;
public static final int APP_AUTH_NO_PERMISSION = 105003;


}
8 changes: 6 additions & 2 deletions .../java/com/arextest/web/core/business/config/record/ServiceCollectConfigurableHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

import com.arextest.config.model.dto.record.ServiceCollectConfiguration;
import com.arextest.config.repository.MultiEnvConfigRepositoryProvider;
import com.arextest.config.repository.impl.ServiceCollectConfigurationRepositoryImpl;
import com.arextest.web.core.business.config.AbstractMultiEnvConfigHandler;
import java.util.Collections;
import java.util.List;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
Expand All @@ -18,6 +20,9 @@
public final class ServiceCollectConfigurableHandler
extends AbstractMultiEnvConfigHandler<ServiceCollectConfiguration> {

@Resource
ServiceCollectConfigurationRepositoryImpl serviceCollectConfigurationRepository;

protected ServiceCollectConfigurableHandler(
@Autowired MultiEnvConfigRepositoryProvider<ServiceCollectConfiguration> repositoryProvider) {
super(repositoryProvider);
Expand All @@ -39,7 +44,6 @@ protected void mergeGlobalDefaultSettings(ServiceCollectConfiguration source) {
}

public void updateServiceCollectTime(String appId) {
ServiceCollectConfiguration serviceCollectConfiguration = this.useResult(appId);
this.update(serviceCollectConfiguration);
serviceCollectConfigurationRepository.updateServiceCollectTime(appId);
}
}
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@
<revision>0.6.5.1</revision>
<arex-common.version>0.1.28</arex-common.version>
<arex-extension-interface.version>0.0.1</arex-extension-interface.version>
<arex-storage-config.version>1.2.15</arex-storage-config.version>
<arex-storage-config.version>1.2.24</arex-storage-config.version>
<arex-storage.version>1.1.27</arex-storage.version>
<arex-compare-extension.version>0.0.1</arex-compare-extension.version>
<caffeine.version>2.9.3</caffeine.version>
Expand Down