Search in sources :

Example 1 with ApiDefinitionEntity

use of com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity in project Sentinel by alibaba.

the class GatewayApiController method addApi.

@PostMapping("/new.json")
@AuthAction(AuthService.PrivilegeType.WRITE_RULE)
public Result<ApiDefinitionEntity> addApi(HttpServletRequest request, @RequestBody AddApiReqVo reqVo) {
    String app = reqVo.getApp();
    if (StringUtil.isBlank(app)) {
        return Result.ofFail(-1, "app can't be null or empty");
    }
    ApiDefinitionEntity entity = new ApiDefinitionEntity();
    entity.setApp(app.trim());
    String ip = reqVo.getIp();
    if (StringUtil.isBlank(ip)) {
        return Result.ofFail(-1, "ip can't be null or empty");
    }
    entity.setIp(ip.trim());
    Integer port = reqVo.getPort();
    if (port == null) {
        return Result.ofFail(-1, "port can't be null");
    }
    entity.setPort(port);
    // API名称
    String apiName = reqVo.getApiName();
    if (StringUtil.isBlank(apiName)) {
        return Result.ofFail(-1, "apiName can't be null or empty");
    }
    entity.setApiName(apiName.trim());
    // 匹配规则列表
    List<ApiPredicateItemVo> predicateItems = reqVo.getPredicateItems();
    if (CollectionUtils.isEmpty(predicateItems)) {
        return Result.ofFail(-1, "predicateItems can't empty");
    }
    List<ApiPredicateItemEntity> predicateItemEntities = new ArrayList<>();
    for (ApiPredicateItemVo predicateItem : predicateItems) {
        ApiPredicateItemEntity predicateItemEntity = new ApiPredicateItemEntity();
        // 匹配模式
        Integer matchStrategy = predicateItem.getMatchStrategy();
        if (!Arrays.asList(URL_MATCH_STRATEGY_EXACT, URL_MATCH_STRATEGY_PREFIX, URL_MATCH_STRATEGY_REGEX).contains(matchStrategy)) {
            return Result.ofFail(-1, "invalid matchStrategy: " + matchStrategy);
        }
        predicateItemEntity.setMatchStrategy(matchStrategy);
        // 匹配串
        String pattern = predicateItem.getPattern();
        if (StringUtil.isBlank(pattern)) {
            return Result.ofFail(-1, "pattern can't be null or empty");
        }
        predicateItemEntity.setPattern(pattern);
        predicateItemEntities.add(predicateItemEntity);
    }
    entity.setPredicateItems(new LinkedHashSet<>(predicateItemEntities));
    // 检查API名称不能重复
    List<ApiDefinitionEntity> allApis = repository.findAllByMachine(MachineInfo.of(app.trim(), ip.trim(), port));
    if (allApis.stream().map(o -> o.getApiName()).anyMatch(o -> o.equals(apiName.trim()))) {
        return Result.ofFail(-1, "apiName exists: " + apiName);
    }
    Date date = new Date();
    entity.setGmtCreate(date);
    entity.setGmtModified(date);
    try {
        entity = repository.save(entity);
    } catch (Throwable throwable) {
        logger.error("add gateway api error:", throwable);
        return Result.ofThrowable(-1, throwable);
    }
    if (!publishApis(app, ip, port)) {
        logger.warn("publish gateway apis fail after add");
    }
    return Result.ofSuccess(entity);
}
Also used : AuthAction(com.alibaba.csp.sentinel.dashboard.auth.AuthAction) Result(com.alibaba.csp.sentinel.dashboard.domain.Result) ApiPredicateItemVo(com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.ApiPredicateItemVo) java.util(java.util) Logger(org.slf4j.Logger) AuthService(com.alibaba.csp.sentinel.dashboard.auth.AuthService) InMemApiDefinitionStore(com.alibaba.csp.sentinel.dashboard.repository.gateway.InMemApiDefinitionStore) SentinelGatewayConstants(com.alibaba.csp.sentinel.adapter.gateway.common.SentinelGatewayConstants) LoggerFactory(org.slf4j.LoggerFactory) Autowired(org.springframework.beans.factory.annotation.Autowired) ApiDefinitionEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity) ApiPredicateItemEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiPredicateItemEntity) StringUtil(com.alibaba.csp.sentinel.util.StringUtil) HttpServletRequest(javax.servlet.http.HttpServletRequest) SentinelApiClient(com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient) AddApiReqVo(com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.AddApiReqVo) CollectionUtils(org.springframework.util.CollectionUtils) org.springframework.web.bind.annotation(org.springframework.web.bind.annotation) MachineInfo(com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo) UpdateApiReqVo(com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.UpdateApiReqVo) ApiDefinitionEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity) ApiPredicateItemVo(com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.ApiPredicateItemVo) ApiPredicateItemEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiPredicateItemEntity) AuthAction(com.alibaba.csp.sentinel.dashboard.auth.AuthAction)

Example 2 with ApiDefinitionEntity

use of com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity in project Sentinel by alibaba.

the class GatewayApiController method updateApi.

@PostMapping("/save.json")
@AuthAction(AuthService.PrivilegeType.WRITE_RULE)
public Result<ApiDefinitionEntity> updateApi(@RequestBody UpdateApiReqVo reqVo) {
    String app = reqVo.getApp();
    if (StringUtil.isBlank(app)) {
        return Result.ofFail(-1, "app can't be null or empty");
    }
    Long id = reqVo.getId();
    if (id == null) {
        return Result.ofFail(-1, "id can't be null");
    }
    ApiDefinitionEntity entity = repository.findById(id);
    if (entity == null) {
        return Result.ofFail(-1, "api does not exist, id=" + id);
    }
    // 匹配规则列表
    List<ApiPredicateItemVo> predicateItems = reqVo.getPredicateItems();
    if (CollectionUtils.isEmpty(predicateItems)) {
        return Result.ofFail(-1, "predicateItems can't empty");
    }
    List<ApiPredicateItemEntity> predicateItemEntities = new ArrayList<>();
    for (ApiPredicateItemVo predicateItem : predicateItems) {
        ApiPredicateItemEntity predicateItemEntity = new ApiPredicateItemEntity();
        // 匹配模式
        int matchStrategy = predicateItem.getMatchStrategy();
        if (!Arrays.asList(URL_MATCH_STRATEGY_EXACT, URL_MATCH_STRATEGY_PREFIX, URL_MATCH_STRATEGY_REGEX).contains(matchStrategy)) {
            return Result.ofFail(-1, "Invalid matchStrategy: " + matchStrategy);
        }
        predicateItemEntity.setMatchStrategy(matchStrategy);
        // 匹配串
        String pattern = predicateItem.getPattern();
        if (StringUtil.isBlank(pattern)) {
            return Result.ofFail(-1, "pattern can't be null or empty");
        }
        predicateItemEntity.setPattern(pattern);
        predicateItemEntities.add(predicateItemEntity);
    }
    entity.setPredicateItems(new LinkedHashSet<>(predicateItemEntities));
    Date date = new Date();
    entity.setGmtModified(date);
    try {
        entity = repository.save(entity);
    } catch (Throwable throwable) {
        logger.error("update gateway api error:", throwable);
        return Result.ofThrowable(-1, throwable);
    }
    if (!publishApis(app, entity.getIp(), entity.getPort())) {
        logger.warn("publish gateway apis fail after update");
    }
    return Result.ofSuccess(entity);
}
Also used : ApiPredicateItemVo(com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.ApiPredicateItemVo) ApiPredicateItemEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiPredicateItemEntity) ApiDefinitionEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity) AuthAction(com.alibaba.csp.sentinel.dashboard.auth.AuthAction)

Example 3 with ApiDefinitionEntity

use of com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity in project Sentinel by alibaba.

the class SentinelApiClient method fetchApis.

public CompletableFuture<List<ApiDefinitionEntity>> fetchApis(String app, String ip, int port) {
    if (StringUtil.isBlank(ip) || port <= 0) {
        return AsyncUtils.newFailedFuture(new IllegalArgumentException("Invalid parameter"));
    }
    try {
        return executeCommand(ip, port, FETCH_GATEWAY_API_PATH, false).thenApply(r -> {
            List<ApiDefinitionEntity> entities = JSON.parseArray(r, ApiDefinitionEntity.class);
            if (entities != null) {
                for (ApiDefinitionEntity entity : entities) {
                    entity.setApp(app);
                    entity.setIp(ip);
                    entity.setPort(port);
                }
            }
            return entities;
        });
    } catch (Exception ex) {
        logger.warn("Error when fetching gateway apis", ex);
        return AsyncUtils.newFailedFuture(ex);
    }
}
Also used : ApiDefinitionEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity) UnsupportedEncodingException(java.io.UnsupportedEncodingException) ExecutionException(java.util.concurrent.ExecutionException)

Example 4 with ApiDefinitionEntity

use of com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity in project Sentinel by alibaba.

the class GatewayApiControllerTest method testQueryApis.

@Test
public void testQueryApis() throws Exception {
    String path = "/gateway/api/list.json";
    List<ApiDefinitionEntity> entities = new ArrayList<>();
    // Mock two entities
    ApiDefinitionEntity entity = new ApiDefinitionEntity();
    entity.setId(1L);
    entity.setApp(TEST_APP);
    entity.setIp(TEST_IP);
    entity.setPort(TEST_PORT);
    entity.setApiName("foo");
    Date date = new Date();
    entity.setGmtCreate(date);
    entity.setGmtModified(date);
    Set<ApiPredicateItemEntity> itemEntities = new LinkedHashSet<>();
    entity.setPredicateItems(itemEntities);
    ApiPredicateItemEntity itemEntity = new ApiPredicateItemEntity();
    itemEntity.setPattern("/aaa");
    itemEntity.setMatchStrategy(URL_MATCH_STRATEGY_EXACT);
    itemEntities.add(itemEntity);
    entities.add(entity);
    ApiDefinitionEntity entity2 = new ApiDefinitionEntity();
    entity2.setId(2L);
    entity2.setApp(TEST_APP);
    entity2.setIp(TEST_IP);
    entity2.setPort(TEST_PORT);
    entity2.setApiName("biz");
    entity.setGmtCreate(date);
    entity.setGmtModified(date);
    Set<ApiPredicateItemEntity> itemEntities2 = new LinkedHashSet<>();
    entity2.setPredicateItems(itemEntities2);
    ApiPredicateItemEntity itemEntity2 = new ApiPredicateItemEntity();
    itemEntity2.setPattern("/bbb");
    itemEntity2.setMatchStrategy(URL_MATCH_STRATEGY_PREFIX);
    itemEntities2.add(itemEntity2);
    entities.add(entity2);
    CompletableFuture<List<ApiDefinitionEntity>> completableFuture = mock(CompletableFuture.class);
    given(completableFuture.get()).willReturn(entities);
    given(sentinelApiClient.fetchApis(TEST_APP, TEST_IP, TEST_PORT)).willReturn(completableFuture);
    MockHttpServletRequestBuilder requestBuilder = MockMvcRequestBuilders.get(path);
    requestBuilder.param("app", TEST_APP);
    requestBuilder.param("ip", TEST_IP);
    requestBuilder.param("port", String.valueOf(TEST_PORT));
    // Do controller logic
    MvcResult mvcResult = mockMvc.perform(requestBuilder).andExpect(MockMvcResultMatchers.status().isOk()).andDo(MockMvcResultHandlers.print()).andReturn();
    // Verify the fetchApis method has been called
    verify(sentinelApiClient).fetchApis(TEST_APP, TEST_IP, TEST_PORT);
    // Verify if two same entities are got
    Result<List<ApiDefinitionEntity>> result = JSONObject.parseObject(mvcResult.getResponse().getContentAsString(), new TypeReference<Result<List<ApiDefinitionEntity>>>() {
    });
    assertTrue(result.isSuccess());
    List<ApiDefinitionEntity> data = result.getData();
    assertEquals(2, data.size());
    assertEquals(entities, data);
    // Verify the entities are add into memory repository
    List<ApiDefinitionEntity> entitiesInMem = repository.findAllByApp(TEST_APP);
    assertEquals(2, entitiesInMem.size());
    assertEquals(entities, entitiesInMem);
}
Also used : LinkedHashSet(java.util.LinkedHashSet) MockHttpServletRequestBuilder(org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder) ArrayList(java.util.ArrayList) ApiDefinitionEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity) MvcResult(org.springframework.test.web.servlet.MvcResult) Date(java.util.Date) Result(com.alibaba.csp.sentinel.dashboard.domain.Result) MvcResult(org.springframework.test.web.servlet.MvcResult) ApiPredicateItemEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiPredicateItemEntity) ArrayList(java.util.ArrayList) List(java.util.List) NoAuthConfigurationTest(com.alibaba.csp.sentinel.dashboard.config.NoAuthConfigurationTest) Test(org.junit.Test) WebMvcTest(org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest)

Example 5 with ApiDefinitionEntity

use of com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity in project pig by pig-mesh.

the class GatewayApiController method addApi.

@PostMapping("/new.json")
@AuthAction(AuthService.PrivilegeType.WRITE_RULE)
public Result<ApiDefinitionEntity> addApi(HttpServletRequest request, @RequestBody AddApiReqVo reqVo) {
    String app = reqVo.getApp();
    if (StringUtil.isBlank(app)) {
        return Result.ofFail(-1, "app can't be null or empty");
    }
    ApiDefinitionEntity entity = new ApiDefinitionEntity();
    entity.setApp(app.trim());
    String ip = reqVo.getIp();
    if (StringUtil.isBlank(ip)) {
        return Result.ofFail(-1, "ip can't be null or empty");
    }
    entity.setIp(ip.trim());
    Integer port = reqVo.getPort();
    if (port == null) {
        return Result.ofFail(-1, "port can't be null");
    }
    entity.setPort(port);
    // API名称
    String apiName = reqVo.getApiName();
    if (StringUtil.isBlank(apiName)) {
        return Result.ofFail(-1, "apiName can't be null or empty");
    }
    entity.setApiName(apiName.trim());
    // 匹配规则列表
    List<ApiPredicateItemVo> predicateItems = reqVo.getPredicateItems();
    if (CollectionUtils.isEmpty(predicateItems)) {
        return Result.ofFail(-1, "predicateItems can't empty");
    }
    List<ApiPredicateItemEntity> predicateItemEntities = new ArrayList<>();
    for (ApiPredicateItemVo predicateItem : predicateItems) {
        ApiPredicateItemEntity predicateItemEntity = new ApiPredicateItemEntity();
        // 匹配模式
        Integer matchStrategy = predicateItem.getMatchStrategy();
        if (!Arrays.asList(URL_MATCH_STRATEGY_EXACT, URL_MATCH_STRATEGY_PREFIX, URL_MATCH_STRATEGY_REGEX).contains(matchStrategy)) {
            return Result.ofFail(-1, "invalid matchStrategy: " + matchStrategy);
        }
        predicateItemEntity.setMatchStrategy(matchStrategy);
        // 匹配串
        String pattern = predicateItem.getPattern();
        if (StringUtil.isBlank(pattern)) {
            return Result.ofFail(-1, "pattern can't be null or empty");
        }
        predicateItemEntity.setPattern(pattern);
        predicateItemEntities.add(predicateItemEntity);
    }
    entity.setPredicateItems(new LinkedHashSet<>(predicateItemEntities));
    // 检查API名称不能重复
    List<ApiDefinitionEntity> allApis = repository.findAllByMachine(MachineInfo.of(app.trim(), ip.trim(), port));
    if (allApis.stream().map(o -> o.getApiName()).anyMatch(o -> o.equals(apiName.trim()))) {
        return Result.ofFail(-1, "apiName exists: " + apiName);
    }
    Date date = new Date();
    entity.setGmtCreate(date);
    entity.setGmtModified(date);
    try {
        entity = repository.save(entity);
    } catch (Throwable throwable) {
        logger.error("add gateway api error:", throwable);
        return Result.ofThrowable(-1, throwable);
    }
    if (!publishApis(app, ip, port)) {
        logger.warn("publish gateway apis fail after add");
    }
    return Result.ofSuccess(entity);
}
Also used : AuthAction(com.alibaba.csp.sentinel.dashboard.auth.AuthAction) Result(com.alibaba.csp.sentinel.dashboard.domain.Result) ApiPredicateItemVo(com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.ApiPredicateItemVo) java.util(java.util) Logger(org.slf4j.Logger) AuthService(com.alibaba.csp.sentinel.dashboard.auth.AuthService) InMemApiDefinitionStore(com.alibaba.csp.sentinel.dashboard.repository.gateway.InMemApiDefinitionStore) SentinelGatewayConstants(com.alibaba.csp.sentinel.adapter.gateway.common.SentinelGatewayConstants) LoggerFactory(org.slf4j.LoggerFactory) Autowired(org.springframework.beans.factory.annotation.Autowired) ApiDefinitionEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity) ApiPredicateItemEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiPredicateItemEntity) StringUtil(com.alibaba.csp.sentinel.util.StringUtil) HttpServletRequest(javax.servlet.http.HttpServletRequest) SentinelApiClient(com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient) AddApiReqVo(com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.AddApiReqVo) CollectionUtils(org.springframework.util.CollectionUtils) org.springframework.web.bind.annotation(org.springframework.web.bind.annotation) MachineInfo(com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo) UpdateApiReqVo(com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.UpdateApiReqVo) ApiDefinitionEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity) ApiPredicateItemVo(com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.ApiPredicateItemVo) ApiPredicateItemEntity(com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiPredicateItemEntity) AuthAction(com.alibaba.csp.sentinel.dashboard.auth.AuthAction)

Aggregations

ApiDefinitionEntity (com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity)23 ApiPredicateItemEntity (com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiPredicateItemEntity)18 ApiPredicateItemVo (com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.ApiPredicateItemVo)14 Result (com.alibaba.csp.sentinel.dashboard.domain.Result)13 AuthAction (com.alibaba.csp.sentinel.dashboard.auth.AuthAction)10 Test (org.junit.Test)8 WebMvcTest (org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest)8 MvcResult (org.springframework.test.web.servlet.MvcResult)8 MockHttpServletRequestBuilder (org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder)8 AddApiReqVo (com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.AddApiReqVo)7 UpdateApiReqVo (com.alibaba.csp.sentinel.dashboard.domain.vo.gateway.api.UpdateApiReqVo)7 SentinelGatewayConstants (com.alibaba.csp.sentinel.adapter.gateway.common.SentinelGatewayConstants)5 AuthService (com.alibaba.csp.sentinel.dashboard.auth.AuthService)5 SentinelApiClient (com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient)5 MachineInfo (com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo)5 InMemApiDefinitionStore (com.alibaba.csp.sentinel.dashboard.repository.gateway.InMemApiDefinitionStore)5 StringUtil (com.alibaba.csp.sentinel.util.StringUtil)5 UnsupportedEncodingException (java.io.UnsupportedEncodingException)5 java.util (java.util)5 ExecutionException (java.util.concurrent.ExecutionException)5