Datasets:

JetBrains-Research

/

lca-bug-localization

like 1

wso2/product-microgateway/1546/1545

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/1545

https://github.com/wso2/product-microgateway/pull/1546

https://github.com/wso2/product-microgateway/pull/1546

fix

Error reading event hub config

### Description: Even the event hub config is enabled the config is not getting effected ### Steps to reproduce: enable event hub config in the config.toml ### Affected Product Version: <!-- Members can use Affected/*** labels --> ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

737f4139548a7fa4a6062c68bd0868df7e8b8445

e7c6696f71485de5f284358465fd005f413bad77

https://github.com/wso2/product-microgateway/compare/737f4139548a7fa4a6062c68bd0868df7e8b8445...e7c6696f71485de5f284358465fd005f413bad77

diff --git a/enforcer/src/main/java/org/wso2/micro/gateway/enforcer/config/dto/EventHubConfigurationDto.java b/enforcer/src/main/java/org/wso2/micro/gateway/enforcer/config/dto/EventHubConfigurationDto.java index 4d07919ff..7c0b188cd 100644 --- a/enforcer/src/main/java/org/wso2/micro/gateway/enforcer/config/dto/EventHubConfigurationDto.java +++ b/enforcer/src/main/java/org/wso2/micro/gateway/enforcer/config/dto/EventHubConfigurationDto.java @@ -24,17 +24,17 @@ import java.util.Properties; * Holds the configurations related to connecting with APIM event hub node. */ public class EventHubConfigurationDto { - private boolean enabled; + private boolean enable; private String serviceUrl; private int initDelay = 0; private Properties jmsConnectionParameters = new Properties(); public boolean isEnabled() { - return enabled; + return enable; } - public void setEnabled(boolean enabled) { - this.enabled = enabled; + public void setEnable(boolean enable) { + this.enable = enable; } public String getServiceUrl() {

['enforcer/src/main/java/org/wso2/micro/gateway/enforcer/config/dto/EventHubConfigurationDto.java']

{'.java': 1}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/1969/1963

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/1963

https://github.com/wso2/product-microgateway/pull/1969

https://github.com/wso2/product-microgateway/pull/1969

fix

Issue in non secured blocked API's resource

### Description: <!-- Describe the issue --> When turned off the security for the resource once, blocked state not applied to the resource. ### Steps to reproduce: create API, deploy, publish, invoke block API, invoke,-> fails as expected. remove security for the resource. invoke -> successful invoke, this is erroneous. try enable security, publish API again and block again. -> nothing blocks the API now. ### Affected Product Version: <!-- Members can use Affected/*** labels --> ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

92d236d2342d051b52615a9b5cd2c54c65e4b10f

f06084abddf40c5d5199c783f684e33cd4b6ee71

https://github.com/wso2/product-microgateway/compare/92d236d2342d051b52615a9b5cd2c54c65e4b10f...f06084abddf40c5d5199c783f684e33cd4b6ee71

diff --git a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/UnsecuredAPIAuthenticator.java b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/UnsecuredAPIAuthenticator.java index 40c801c78..abc10eb9e 100644 --- a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/UnsecuredAPIAuthenticator.java +++ b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/UnsecuredAPIAuthenticator.java @@ -20,9 +20,14 @@ package org.wso2.choreo.connect.enforcer.security.jwt; import org.wso2.choreo.connect.enforcer.api.RequestContext; import org.wso2.choreo.connect.enforcer.api.config.ResourceConfig; +import org.wso2.choreo.connect.enforcer.constants.APIConstants; +import org.wso2.choreo.connect.enforcer.constants.GeneralErrorCodeConstants; import org.wso2.choreo.connect.enforcer.exception.APISecurityException; +import org.wso2.choreo.connect.enforcer.models.API; import org.wso2.choreo.connect.enforcer.security.AuthenticationContext; import org.wso2.choreo.connect.enforcer.security.Authenticator; +import org.wso2.choreo.connect.enforcer.subscription.SubscriptionDataHolder; +import org.wso2.choreo.connect.enforcer.subscription.SubscriptionDataStore; import org.wso2.choreo.connect.enforcer.util.FilterUtils; /** @@ -31,7 +36,8 @@ import org.wso2.choreo.connect.enforcer.util.FilterUtils; public class UnsecuredAPIAuthenticator implements Authenticator { - @Override public boolean canAuthenticate(RequestContext requestContext) { + @Override + public boolean canAuthenticate(RequestContext requestContext) { // Retrieve the disable security value. If security is disabled, then you can proceed directly with the // authentication. if (isDisableSecurity(requestContext.getMatchedResourcePath())) { @@ -40,7 +46,22 @@ public class UnsecuredAPIAuthenticator implements Authenticator { return false; } - @Override public AuthenticationContext authenticate(RequestContext requestContext) throws APISecurityException { + @Override + public AuthenticationContext authenticate(RequestContext requestContext) throws APISecurityException { + String uuid = requestContext.getMatchedAPI().getAPIConfig().getUuid(); + String context = requestContext.getMatchedAPI().getAPIConfig().getBasePath(); + String apiTenantDomain = FilterUtils.getTenantDomainFromRequestURL(context); + SubscriptionDataStore datastore = SubscriptionDataHolder.getInstance() + .getTenantSubscriptionStore(apiTenantDomain); + API api = datastore.getApiByContextAndVersion(uuid); + if (api != null && APIConstants.LifecycleStatus.BLOCKED.equals(api.getLcState())) { + requestContext.getProperties() + .put(APIConstants.MessageFormat.ERROR_MESSAGE, GeneralErrorCodeConstants.API_BLOCKED_MESSAGE); + requestContext.getProperties().put(APIConstants.MessageFormat.ERROR_DESCRIPTION, + GeneralErrorCodeConstants.API_BLOCKED_DESCRIPTION); + throw new APISecurityException(APIConstants.StatusCodes.SERVICE_UNAVAILABLE.getCode(), + GeneralErrorCodeConstants.API_BLOCKED_CODE, GeneralErrorCodeConstants.API_BLOCKED_MESSAGE); + } return FilterUtils.generateAuthenticationContext(requestContext); }

['enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/UnsecuredAPIAuthenticator.java']

{'.java': 1}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2346/2345

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2345

https://github.com/wso2/product-microgateway/pull/2346

https://github.com/wso2/product-microgateway/pull/2346

fixes

Cannot invoke non secured resource

### Description: <!-- Describe the issue --> gets 500 error with following log ``` java.lang.NullPointerException choreo-connect-with-apim-enforcer-1 | at com.google.protobuf.Value$Builder.setStringValue(Value.java:1063) choreo-connect-with-apim-enforcer-1 | at org.wso2.choreo.connect.enforcer.grpc.ExtAuthService.lambda$buildResponse$3(ExtAuthService.java:155) choreo-connect-with-apim-enforcer-1 | at java.base/java.util.HashMap.forEach(Unknown Source) choreo-connect-with-apim-enforcer-1 | at org.wso2.choreo.connect.enforcer.grpc.ExtAuthService.buildResponse(ExtAuthService.java:154) choreo-connect-with-apim-enforcer-1 | at org.wso2.choreo.connect.enforcer.grpc.ExtAuthService.check(ExtAuthService.java:74) choreo-connect-with-apim-enforcer-1 | at io.envoyproxy.envoy.service.auth.v3.AuthorizationGrpc$MethodHandlers.invoke(AuthorizationGrpc.java:245) choreo-connect-with-apim-enforcer-1 | at io.grpc.stub.ServerCalls$UnaryServerCallHandler$UnaryServerCallListener.onHalfClose(ServerCalls.java:180) choreo-connect-with-apim-enforcer-1 | at io.grpc.internal.ServerCallImpl$ServerStreamListenerImpl.halfClosed(ServerCallImpl.java:331) choreo-connect-with-apim-enforcer-1 | at io.grpc.internal.ServerImpl$JumpToApplicationThreadServerStreamListener$1HalfClosed.runInContext(ServerImpl.java:814) choreo-connect-with-apim-enforcer-1 | at io.grpc.internal.ContextRunnable.run(ContextRunnable.java:37) choreo-connect-with-apim-enforcer-1 | at io.grpc.internal.SerializingExecutor.run(SerializingExecutor.java:123) choreo-connect-with-apim-enforcer-1 | at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) choreo-connect-with-apim-enforcer-1 | at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) choreo-connect-with-apim-enforcer-1 | at java.base/java.lang.Thread.run(Unknown Source) ``` ### Steps to reproduce: create an api disable security on a resource invoke the resource ### analyse this is due to new metadata added by https://github.com/wso2/product-microgateway/pull/2330/ and they are being null for non secured resource raw token is null when resource is unsecured https://github.com/wso2/product-microgateway/blob/d66797c2a2b056b594cb1b4708820c80d504f635/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java#L273 ### Affected Product Version: <!-- Members can use Affected/*** labels --> ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

d66797c2a2b056b594cb1b4708820c80d504f635

b78a4f7c6ad762d01dc5d9edc9198c352f60cb01

https://github.com/wso2/product-microgateway/compare/d66797c2a2b056b594cb1b4708820c80d504f635...b78a4f7c6ad762d01dc5d9edc9198c352f60cb01

diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java index a2ce09436..c6b8813bb 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java @@ -43,6 +43,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.Objects; /** * This is the filter handling the authentication for the requests flowing through the gateway. @@ -129,7 +130,7 @@ public class AuthFilter implements Filter { canAuthenticated = true; AuthenticationResponse authenticateResponse = authenticate(authenticator, requestContext); if (authenticateResponse.isAuthenticated() && !authenticateResponse.isContinueToNextAuthenticator()) { - setInterceptorAuthContext(authenticator, requestContext); + setInterceptorAuthContextMetadata(authenticator, requestContext); return true; } } @@ -266,11 +267,14 @@ public class AuthFilter implements Filter { StringUtils.join(retryConfig.getStatusCodes(), ",")); } - private void setInterceptorAuthContext(Authenticator authenticator, RequestContext requestContext) { + private void setInterceptorAuthContextMetadata(Authenticator authenticator, RequestContext requestContext) { // add auth context to metadata, lua script will add it to the auth context of the interceptor AuthenticationContext authContext = requestContext.getAuthenticationContext(); - requestContext.addMetadataToMap(InterceptorConstants.AuthContextFields.TOKEN_TYPE, authenticator.getName()); - requestContext.addMetadataToMap(InterceptorConstants.AuthContextFields.TOKEN, authContext.getRawToken()); - requestContext.addMetadataToMap(InterceptorConstants.AuthContextFields.KEY_TYPE, authContext.getKeyType()); + requestContext.addMetadataToMap(InterceptorConstants.AuthContextFields.TOKEN_TYPE, + Objects.toString(authenticator.getName(), "")); + requestContext.addMetadataToMap(InterceptorConstants.AuthContextFields.TOKEN, + Objects.toString(authContext.getRawToken(), "")); + requestContext.addMetadataToMap(InterceptorConstants.AuthContextFields.KEY_TYPE, + Objects.toString(authContext.getKeyType(), "")); } }

['enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java']

{'.java': 1}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2142/2081

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2081

https://github.com/wso2/product-microgateway/pull/2142

https://github.com/wso2/product-microgateway/pull/2142

fix

Internal key caching issue

### Description: <!-- Describe the issue --> ### Steps to reproduce: use a valid internal key and invoke a created api then tamper with the key (delete some characters) and use it to invoke the same api. -> it works (but this should not work) ### Affected Product Version: <!-- Members can use Affected/*** labels --> beta ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

bc0220ca5f89f04a9d7ae6e9f7707eb3fa2d3975

695b16ebc6700ff5a11ac67270ca0533021e62bb

https://github.com/wso2/product-microgateway/compare/bc0220ca5f89f04a9d7ae6e9f7707eb3fa2d3975...695b16ebc6700ff5a11ac67270ca0533021e62bb

diff --git a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/dto/JWTTokenPayloadInfo.java b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/dto/JWTTokenPayloadInfo.java index f07b0096e..d60cbaea3 100644 --- a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/dto/JWTTokenPayloadInfo.java +++ b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/dto/JWTTokenPayloadInfo.java @@ -28,7 +28,7 @@ public class JWTTokenPayloadInfo implements Serializable { JWTClaimsSet payload; - String rawPayload; + String accessToken; public JWTClaimsSet getPayload() { return payload; @@ -38,11 +38,11 @@ public class JWTTokenPayloadInfo implements Serializable { this.payload = payload; } - public String getRawPayload() { - return rawPayload; + public String getAccessToken() { + return accessToken; } - public void setRawPayload(String rawPayload) { - this.rawPayload = rawPayload; + public void setAccessToken(String accessToken) { + this.accessToken = accessToken; } } diff --git a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java index 69c91686b..f3201d068 100644 --- a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java +++ b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java @@ -122,9 +122,11 @@ public class InternalAPIKeyAuthenticator implements Authenticator { JWTTokenPayloadInfo jwtTokenPayloadInfo = (JWTTokenPayloadInfo) CacheProvider.getGatewayInternalKeyDataCache().getIfPresent(tokenIdentifier); if (jwtTokenPayloadInfo != null) { - String rawPayload = jwtTokenPayloadInfo.getRawPayload(); - isVerified = rawPayload.equals(splitToken[1]) && !isJwtTokenExpired(payload); - } else if (CacheProvider.getInvalidGatewayInternalKeyCache().getIfPresent(tokenIdentifier) != null) { + String cachedToken = jwtTokenPayloadInfo.getAccessToken(); + isVerified = cachedToken.equals(internalKey) && !isJwtTokenExpired(payload); + } else if (CacheProvider.getInvalidGatewayInternalKeyCache().getIfPresent(tokenIdentifier) != null + && internalKey + .equals(CacheProvider.getInvalidGatewayInternalKeyCache().getIfPresent(tokenIdentifier))) { if (log.isDebugEnabled()) { log.debug("Internal Key retrieved from the invalid internal Key cache. Internal Key: " + FilterUtils.getMaskedToken(splitToken[0])); @@ -168,7 +170,7 @@ public class InternalAPIKeyAuthenticator implements Authenticator { } jwtTokenPayloadInfo = new JWTTokenPayloadInfo(); jwtTokenPayloadInfo.setPayload(payload); - jwtTokenPayloadInfo.setRawPayload(splitToken[1]); + jwtTokenPayloadInfo.setAccessToken(internalKey); CacheProvider.getGatewayInternalKeyDataCache().put(tokenIdentifier, jwtTokenPayloadInfo); } @@ -182,7 +184,7 @@ public class InternalAPIKeyAuthenticator implements Authenticator { requestContext.getMatchedAPI().getAPIConfig().getUuid()); } else { CacheProvider.getGatewayInternalKeyDataCache().invalidate(payload.getJWTID()); - CacheProvider.getInvalidGatewayInternalKeyCache().put(payload.getJWTID(), "carbon.super"); + CacheProvider.getInvalidGatewayInternalKeyCache().put(payload.getJWTID(), internalKey); throw new APISecurityException(APIConstants.StatusCodes.UNAUTHENTICATED.getCode(), APISecurityConstants.API_AUTH_INVALID_CREDENTIALS, APISecurityConstants.API_AUTH_INVALID_CREDENTIALS_MESSAGE); diff --git a/integration/test-integration/src/test/java/org/wso2/choreo/connect/tests/testcases/standalone/jwtValidator/InternalKeyTestCase.java b/integration/test-integration/src/test/java/org/wso2/choreo/connect/tests/testcases/standalone/jwtValidator/InternalKeyTestCase.java index b1700234c..bba6faf68 100644 --- a/integration/test-integration/src/test/java/org/wso2/choreo/connect/tests/testcases/standalone/jwtValidator/InternalKeyTestCase.java +++ b/integration/test-integration/src/test/java/org/wso2/choreo/connect/tests/testcases/standalone/jwtValidator/InternalKeyTestCase.java @@ -32,13 +32,30 @@ import java.util.Map; public class InternalKeyTestCase { protected String internalKey; + protected String tamperedInternalKey; @BeforeClass(description = "initialise the setup") void start() throws Exception { internalKey = TokenUtil.getJwtForPetstore(TestConstant.KEY_TYPE_PRODUCTION, null, true); + tamperedInternalKey = internalKey.substring(0, internalKey.length()-4); } + // First invoke with tampered internal key. This should fail. @Test(description = "Test to check the InternalKey is working") + public void invokeWithTamperedInternalKey() throws Exception { + // Set header + Map<String, String> headers = new HashMap<>(); + headers.put("Internal-Key", tamperedInternalKey); + HttpResponse response = HttpsClientRequest.doGet(Utils.getServiceURLHttps("/v2/pet/2") , headers); + + Assert.assertNotNull(response); + Assert.assertEquals(response.getResponseCode(), HttpStatus.SC_UNAUTHORIZED,"Response code mismatched"); + Assert.assertTrue(response.getData().contains("Invalid Credentials"), "Error response message mismatch"); + } + + // When invoke with original token even though the tampered key is in the invalid key cache, + // original token should pass. + @Test(description = "Test to check the InternalKey is working", dependsOnMethods = "invokeWithTamperedInternalKey") public void invokeInternalKeyHeaderSuccessTest() throws Exception { // Set header Map<String, String> headers = new HashMap<>(); @@ -61,6 +78,19 @@ public class InternalKeyTestCase { Assert.assertTrue(response.getData().contains("Invalid Credentials"), "Error response message mismatch"); } + // After invoking with original key, it is cacahed as a success token. But again using the tampered key should fail. + @Test(description = "Test to check the InternalKey is working", dependsOnMethods = "invokeInternalKeyHeaderSuccessTest") + public void invokeAgainWithTamperedInternalKey() throws Exception { + // Set header + Map<String, String> headers = new HashMap<>(); + headers.put("Internal-Key", tamperedInternalKey); + HttpResponse response = HttpsClientRequest.doGet(Utils.getServiceURLHttps("/v2/pet/2") , headers); + + Assert.assertNotNull(response); + Assert.assertEquals(response.getResponseCode(), HttpStatus.SC_UNAUTHORIZED,"Response code mismatched"); + Assert.assertTrue(response.getData().contains("Invalid Credentials"), "Error response message mismatch"); + } + @Test(description = "Test to check the internal key auth validate expired token") public void invokeExpiredInternalKeyTest() throws Exception {

['enforcer/src/main/java/org/wso2/choreo/connect/enforcer/dto/JWTTokenPayloadInfo.java', 'enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java', 'integration/test-integration/src/test/java/org/wso2/choreo/connect/tests/testcases/standalone/jwtValidator/InternalKeyTestCase.java']

{'.java': 3}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2112/2114

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2114

https://github.com/wso2/product-microgateway/pull/2112

https://github.com/wso2/product-microgateway/pull/2112

fixes

Incorrect API-UUID is published to analytics for Internal-Key invocation

### Description: The API UUID published to the analytics for internal Key invocation, is incorrect at the moment. Instead of the UUID assigned from APIM Publisher, it publishes a hash value. This is due to authentication Context's API UUID is not being populated properly when InternalKey Authentication is used. ### Steps to reproduce: ### Affected Product Version: <!-- Members can use Affected/*** labels --> ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

85e8639833f2f94877a2cc34f6df70dc257a751f

dff54eb2fc8defd4c7019c8da81a5eba9af4fc15

https://github.com/wso2/product-microgateway/compare/85e8639833f2f94877a2cc34f6df70dc257a751f...dff54eb2fc8defd4c7019c8da81a5eba9af4fc15

diff --git a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java index cdeaa3615..69c91686b 100644 --- a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java +++ b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java @@ -178,7 +178,8 @@ public class InternalAPIKeyAuthenticator implements Authenticator { log.debug("Internal Key authentication successful."); } return FilterUtils.generateAuthenticationContext(tokenIdentifier, payload, api, - requestContext.getMatchedAPI().getAPIConfig().getTier()); + requestContext.getMatchedAPI().getAPIConfig().getTier(), + requestContext.getMatchedAPI().getAPIConfig().getUuid()); } else { CacheProvider.getGatewayInternalKeyDataCache().invalidate(payload.getJWTID()); CacheProvider.getInvalidGatewayInternalKeyCache().put(payload.getJWTID(), "carbon.super"); diff --git a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java index e0b67ec6d..4ba7378a2 100644 --- a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java +++ b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java @@ -202,7 +202,10 @@ public class FilterUtils { authContext.setStopOnQuotaReach(true); authContext.setConsumerKey(null); authContext.setCallerToken(null); - + String apiUUID = requestContext.getMatchedAPI().getAPIConfig().getUuid(); + if (!StringUtils.isEmpty(apiUUID)) { + authContext.setApiUUID(apiUUID); + } return authContext; } @@ -293,7 +296,8 @@ public class FilterUtils { * @throws java.text.ParseException */ public static AuthenticationContext generateAuthenticationContext(String tokenIdentifier, JWTClaimsSet payload, - JSONObject api, String apiLevelPolicy) + JSONObject api, String apiLevelPolicy, + String apiUUID) throws java.text.ParseException { AuthenticationContext authContext = new AuthenticationContext(); @@ -305,7 +309,6 @@ public class FilterUtils { } else { authContext.setKeyType(APIConstants.API_KEY_TYPE_PRODUCTION); } - authContext.setApiTier(apiLevelPolicy); if (api != null) { authContext.setTier(APIConstants.UNLIMITED_TIER); @@ -313,6 +316,9 @@ public class FilterUtils { authContext.setApiPublisher(api.getAsString(APIConstants.JwtTokenConstants.API_PUBLISHER)); } + if (!StringUtils.isEmpty(apiUUID)) { + authContext.setApiUUID(apiUUID); + } authContext.setApplicationName(APIConstants.JwtTokenConstants.INTERNAL_KEY_APP_NAME); authContext.setApplicationId(UUID.nameUUIDFromBytes(APIConstants.JwtTokenConstants.INTERNAL_KEY_APP_NAME. getBytes(StandardCharsets.UTF_8)).toString());

['enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java', 'enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java']

{'.java': 2}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2062/2061

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2061

https://github.com/wso2/product-microgateway/pull/2062

https://github.com/wso2/product-microgateway/pull/2062

fix

Envoy access log entry should be tracked in enforcer as well

### Description: In envoy we can print the random UUID for each request in access logs using the parameter `%REQ(X-REQUEST-ID)%` . This is useful to track the request. We should use the same tracking ID in the enforcer side access logs as well. ### Steps to reproduce: Currently enforcer prints id attribute of the http request(https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/auth/v3/attribute_context.proto#service-auth-v3-attributecontext-httprequest), which is different from the UUID printed by X-REQUEST-ID in envoy access log. ### Affected Product Version: 0.9.0 ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

aaf9992948b69f4295ea857d8efb676e5c72a68c

69a8252f445cb8ac1da0c0c799f0ead5089bcb18

https://github.com/wso2/product-microgateway/compare/aaf9992948b69f4295ea857d8efb676e5c72a68c...69a8252f445cb8ac1da0c0c799f0ead5089bcb18

diff --git a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/HttpConstants.java b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/HttpConstants.java index 300f10bcd..898312a2b 100644 --- a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/HttpConstants.java +++ b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/HttpConstants.java @@ -25,4 +25,5 @@ public class HttpConstants { public static final int NO_CONTENT_STATUS_CODE = 204; public static final String OPTIONS = "OPTIONS"; public static final String ALLOW_HEADER = "allow"; + public static final String X_REQUEST_ID_HEADER = "x-request-id"; } diff --git a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/ExtAuthService.java b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/ExtAuthService.java index c70fa9afa..6c2e17ae4 100644 --- a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/ExtAuthService.java +++ b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/ExtAuthService.java @@ -48,7 +48,9 @@ public class ExtAuthService extends AuthorizationGrpc.AuthorizationImplBase { @Override public void check(CheckRequest request, StreamObserver<CheckResponse> responseObserver) { - ThreadContext.put(APIConstants.LOG_TRACE_ID, request.getAttributes().getRequest().getHttp().getId()); + ThreadContext.put(APIConstants.LOG_TRACE_ID, request.getAttributes().getRequest().getHttp() + .getHeadersOrDefault(HttpConstants.X_REQUEST_ID_HEADER, + request.getAttributes().getRequest().getHttp().getId())); ResponseObject responseObject = requestHandler.process(request); CheckResponse response = buildResponse(request, responseObject); responseObserver.onNext(response); diff --git a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/interceptors/AccessLogInterceptor.java b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/interceptors/AccessLogInterceptor.java index cdbbf9267..dcdb43141 100644 --- a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/interceptors/AccessLogInterceptor.java +++ b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/interceptors/AccessLogInterceptor.java @@ -30,6 +30,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.wso2.choreo.connect.discovery.service.websocket.WebSocketFrameRequest; import org.wso2.choreo.connect.discovery.service.websocket.WebSocketFrameResponse; +import org.wso2.choreo.connect.enforcer.constants.HttpConstants; import org.wso2.choreo.connect.enforcer.websocket.MetadataConstants; /** @@ -50,7 +51,12 @@ public class AccessLogInterceptor implements ServerInterceptor { if (message instanceof CheckRequest) { CheckRequest checkRequest = (CheckRequest) message; enforcerServerCall.setStartTime(System.currentTimeMillis()); - enforcerServerCall.setTraceId(checkRequest.getAttributes().getRequest().getHttp().getId()); + String requestId = checkRequest.getAttributes().getRequest().getHttp().getId(); + // x-request-id equals to envoy access log entries "%REQ(X-REQUEST-ID)%". This allows + // to correlate the same request in Router and the Enforcer. If this header is not coming then + // we set the http request Id property as the default value. + enforcerServerCall.setTraceId(checkRequest.getAttributes().getRequest().getHttp() + .getHeadersOrDefault(HttpConstants.X_REQUEST_ID_HEADER, requestId)); super.onMessage(message); } else if (message instanceof WebSocketFrameRequest) { WebSocketFrameRequest webSocketFrameRequest = (WebSocketFrameRequest) message;

['enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/ExtAuthService.java', 'enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/interceptors/AccessLogInterceptor.java', 'enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/HttpConstants.java']

{'.java': 3}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/1978/1977

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/1977

https://github.com/wso2/product-microgateway/pull/1978

https://github.com/wso2/product-microgateway/pull/1978

fixes

When Denied Policies and Analytics Both are enabled, enforcer results in Null Pointer Error

### Description: $subject. ### Steps to reproduce: Enable analytics and start the microgateway. Enable denied policy. ### Affected Product Version: choreo-connect-0.9.0-beta ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

02834babd0fe3dc012e6a9946a3519a72f5929d3

0538f9dfee7ca15740272d3300f448a611c229c1

https://github.com/wso2/product-microgateway/compare/02834babd0fe3dc012e6a9946a3519a72f5929d3...0538f9dfee7ca15740272d3300f448a611c229c1

diff --git a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java index 87b3dd2b5..f7c1c5f49 100644 --- a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java +++ b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java @@ -76,6 +76,14 @@ public class ChoreoFaultAnalyticsProvider implements AnalyticsDataProvider { switch (statusCode) { case 401: case 403: + // For Denied policies, the status code remains 403, but it is categorized + // under throttling + if (requestContext.getProperties().containsKey(APIConstants.MessageFormat.ERROR_CODE)) { + if (AnalyticsConstants.BLOCKED_ERROR_CODE == Integer.parseInt(requestContext.getProperties() + .get(APIConstants.MessageFormat.ERROR_CODE).toString())) { + return FaultCategory.THROTTLED; + } + } return FaultCategory.AUTH; case 429: return FaultCategory.THROTTLED;

['enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java']

{'.java': 1}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/1976/1958

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/1958

https://github.com/wso2/product-microgateway/pull/1976

https://github.com/wso2/product-microgateway/pull/1976

fixes

Analytics list down API list in the analytics tenant drop down

### Description: Create multiple APIS for a tenant and invoke them. Each API will list as separate tenant in the analytics drop down. ### Steps to reproduce: 1. create a tenant domain abc.com 2. Create 2 apis with context /foo and /bar 3. Then invoke the APIs and go and view analytics 4. Under the tenant drop down it will list below 2 tenants, which are actually a 2 APIs of a single tenant ``` 1. /t/abc.com/foo 2. /t/abc.com/bar ``` ### Affected Product Version: Post 0.9.0-beta ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

ab255b91621fa7e66ffcdb71475e58e04149c7f2

e64af966434d18f9a29a04609306a07c2c9b74c4

https://github.com/wso2/product-microgateway/compare/ab255b91621fa7e66ffcdb71475e58e04149c7f2...e64af966434d18f9a29a04609306a07c2c9b74c4

diff --git a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java index fe9ca3f28..87b3dd2b5 100644 --- a/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java +++ b/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java @@ -96,10 +96,10 @@ public class ChoreoFaultAnalyticsProvider implements AnalyticsDataProvider { api.setApiType(requestContext.getMatchedAPI().getAPIConfig().getApiType()); api.setApiName(requestContext.getMatchedAPI().getAPIConfig().getName()); api.setApiVersion(requestContext.getMatchedAPI().getAPIConfig().getVersion()); - api.setApiCreatorTenantDomain(FilterUtils.getTenantDomainFromRequestURL( - requestContext.getMatchedAPI().getAPIConfig().getBasePath()) == null - ? APIConstants.SUPER_TENANT_DOMAIN_NAME - : requestContext.getMatchedAPI().getAPIConfig().getBasePath()); + String tenantDomain = FilterUtils.getTenantDomainFromRequestURL( + requestContext.getMatchedAPI().getAPIConfig().getBasePath()); + api.setApiCreatorTenantDomain( + tenantDomain == null ? APIConstants.SUPER_TENANT_DOMAIN_NAME : tenantDomain); api.setOrganizationId(requestContext.getMatchedAPI().getAPIConfig().getOrganizationId()); return api; }

['enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java']

{'.java': 1}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2323/2322

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2322

https://github.com/wso2/product-microgateway/pull/2323

https://github.com/wso2/product-microgateway/pull/2323

fixes

Class cast exception in backend JWT for organizations claim

### Description: The following error can be observed when the token has the **organizations** claim and backend JWT generation is enabled. ``` [2021-10-25 11:35:26,350][363acd6ee699def3feb2cd9e722812c1] ERROR - {org.wso2.choreo.connect.enforcer.commons.model.ParameterResolver} - PathTemplate and RawPath is mismatched. Oct 25, 2021 11:35:26 AM io.grpc.internal.SerializingExecutor run SEVERE: Exception while executing runnable io.grpc.internal.ServerImpl$JumpToApplicationThreadServerStreamListener$1HalfClosed@1fbab702 java.lang.ClassCastException: class net.minidev.json.JSONArray cannot be cast to class [Ljava.lang.String; (net.minidev.json.JSONArray is in unnamed module of loader 'app'; [Ljava.lang.String; is in module java.base of loader 'bootstrap') at org.wso2.choreo.connect.enforcer.util.FilterUtils.constructJWTContent(FilterUtils.java:356) at org.wso2.choreo.connect.enforcer.util.FilterUtils.generateJWTInfoDto(FilterUtils.java:342) at org.wso2.choreo.connect.enforcer.security.jwt.JWTAuthenticator.authenticate(JWTAuthenticator.java:270) at org.wso2.choreo.connect.enforcer.security.AuthFilter.authenticate(AuthFilter.java:145) at org.wso2.choreo.connect.enforcer.security.AuthFilter.handleRequest(AuthFilter.java:125) at org.wso2.choreo.connect.enforcer.api.API.executeFilterChain(API.java:42) at org.wso2.choreo.connect.enforcer.api.RestAPI.process(RestAPI.java:151) at org.wso2.choreo.connect.enforcer.server.HttpRequestHandler.process(HttpRequestHandler.java:57) at org.wso2.choreo.connect.enforcer.grpc.ExtAuthService.check(ExtAuthService.java:73) at io.envoyproxy.envoy.service.auth.v3.AuthorizationGrpc$MethodHandlers.invoke(AuthorizationGrpc.java:245) at io.grpc.stub.ServerCalls$UnaryServerCallHandler$UnaryServerCallListener.onHalfClose(ServerCalls.java:180) at io.grpc.PartialForwardingServerCallListener.onHalfClose(PartialForwardingServerCallListener.java:35) at io.grpc.ForwardingServerCallListener.onHalfClose(ForwardingServerCallListener.java:23) at io.grpc.ForwardingServerCallListener$SimpleForwardingServerCallListener.onHalfClose(ForwardingServerCallListener.java:40) at io.grpc.internal.ServerCallImpl$ServerStreamListenerImpl.halfClosed(ServerCallImpl.java:331) at io.grpc.internal.ServerImpl$JumpToApplicationThreadServerStreamListener$1HalfClosed.runInContext(ServerImpl.java:814) at io.grpc.internal.ContextRunnable.run(ContextRunnable.java:37) at io.grpc.internal.SerializingExecutor.run(SerializingExecutor.java:123) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) at java.base/java.lang.Thread.run(Unknown Source) ``` ### Steps to reproduce:

110c51d5c18c6ca6d718413e0c68befd8e3761e8

cfa3e38e9be1cb504eac667222111f733cec2167

https://github.com/wso2/product-microgateway/compare/110c51d5c18c6ca6d718413e0c68befd8e3761e8...cfa3e38e9be1cb504eac667222111f733cec2167

diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java index 8ccd02250..57990879b 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java @@ -19,6 +19,7 @@ package org.wso2.choreo.connect.enforcer.util; import com.nimbusds.jwt.JWTClaimsSet; +import net.minidev.json.JSONArray; import net.minidev.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.HttpClient; @@ -353,7 +354,11 @@ public class FilterUtils { jwtInfoDto.setSub(sub); } if (claims.get(JWTConstants.ORGANIZATIONS) != null) { - String[] organizations = (String[]) claims.get(JWTConstants.ORGANIZATIONS); + JSONArray orgArray = (JSONArray) claims.get(JWTConstants.ORGANIZATIONS); + String[] organizations = new String[orgArray.size()]; + for (int i = 0; i < orgArray.size(); i++) { + organizations[i] = orgArray.get(i).toString(); + } jwtInfoDto.setOrganizations(organizations); } }

['enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java']

{'.java': 1}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2556/2561

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2561

https://github.com/wso2/product-microgateway/pull/2556

https://github.com/wso2/product-microgateway/pull/2556

fixes

Unlimited API Tier does not apply after resource level tier is set once

### Description: $subject ### Steps to reproduce: 1. Create an API and assign resource level Tier and save. 2. Deploy the API and see if the resource level tier is applied. 3. Then change it to API Level and assign unlimited tier. 4. Deploy the API and see if the resource level tier is applied. (in this case, it would apply.) ### Affected Product Version: <!-- Members can use Affected/*** labels --> ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

12a2e8aef063c31d077e51126dd86b8fff171678

4f7da1064b42b3726baf0a0b30544284a1159edd

https://github.com/wso2/product-microgateway/compare/12a2e8aef063c31d077e51126dd86b8fff171678...4f7da1064b42b3726baf0a0b30544284a1159edd

diff --git a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/APIConfig.java b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/APIConfig.java index 32fe1df81..331d53b84 100644 --- a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/APIConfig.java +++ b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/APIConfig.java @@ -40,7 +40,7 @@ public class APIConfig { private String uuid; private Map<String, List<String>> apiSecurity = new HashMap<>(); - private String tier = "Unlimited"; + private String tier; private boolean disableSecurity = false; private List<ResourceConfig> resources = new ArrayList<>(); @@ -203,7 +203,7 @@ public class APIConfig { private String uuid; private Map<String, SecuritySchemaConfig> securitySchemeDefinitions; private Map<String, List<String>> apiSecurity = new HashMap<>(); - private String tier = "Unlimited"; + private String tier; private boolean disableSecurity = false; private List<ResourceConfig> resources = new ArrayList<>(); diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java index dde3ff0bf..2df3c35ef 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java @@ -228,7 +228,6 @@ public class InternalAPIKeyAuthenticator extends APIKeyHandler { } return FilterUtils.generateAuthenticationContext(tokenIdentifier, payload, api, - requestContext.getMatchedAPI().getTier(), requestContext.getMatchedAPI().getUuid(), internalKey); } else { log.error("Internal Key authentication failed. " + FilterUtils.getMaskedToken(splitToken[0])); diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java index 19f1a7abf..a006c434e 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java @@ -135,7 +135,7 @@ public class ThrottleFilter implements Filter { String authorizedUser = FilterUtils.buildUsernameWithTenant(authContext.getUsername(), appTenant); boolean isApiLevelTriggered = false; - if (!StringUtils.isEmpty(apiTier) && !ThrottleConstants.UNLIMITED_TIER.equalsIgnoreCase(apiTier)) { + if (!StringUtils.isEmpty(api.getTier())) { resourceThrottleKey = apiThrottleKey; resourceTier = apiTier; isApiLevelTriggered = true; @@ -298,7 +298,9 @@ public class ThrottleFilter implements Filter { tenantDomain = APIConstants.SUPER_TENANT_DOMAIN_NAME; } - if (!StringUtils.isEmpty(apiTier) && !ThrottleConstants.UNLIMITED_TIER.equals(apiTier)) { + // apiConfig instance will have the tier assigned only if openapi definition contains the + // extension + if (!StringUtils.isEmpty(api.getTier())) { resourceTier = apiTier; resourceKey = apiContext; } else { @@ -362,7 +364,7 @@ public class ThrottleFilter implements Filter { } private String getApiTier(APIConfig apiConfig) { - if (!apiConfig.getTier().isBlank()) { + if (!StringUtils.isEmpty(apiConfig.getTier())) { return apiConfig.getTier(); } return ThrottleConstants.UNLIMITED_TIER; diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java index b5a97aae3..b03c3567e 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java @@ -300,13 +300,12 @@ public class FilterUtils { * @param tokenIdentifier * @param payload * @param api - * @param apiLevelPolicy * @param rawToken Raw token used to authenticate the request * @return * @throws java.text.ParseException */ public static AuthenticationContext generateAuthenticationContext(String tokenIdentifier, JWTClaimsSet payload, - JSONObject api, String apiLevelPolicy, + JSONObject api, String apiUUID, String rawToken) throws java.text.ParseException { diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketMetaDataFilter.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketMetaDataFilter.java index a4a292f1c..b0344c52c 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketMetaDataFilter.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketMetaDataFilter.java @@ -27,6 +27,7 @@ import org.wso2.choreo.connect.enforcer.commons.model.APIConfig; import org.wso2.choreo.connect.enforcer.commons.model.AuthenticationContext; import org.wso2.choreo.connect.enforcer.commons.model.RequestContext; import org.wso2.choreo.connect.enforcer.constants.APIConstants; +import org.wso2.choreo.connect.enforcer.throttle.ThrottleConstants; import org.wso2.choreo.connect.enforcer.tracing.TracingConstants; import org.wso2.choreo.connect.enforcer.tracing.TracingSpan; import org.wso2.choreo.connect.enforcer.tracing.TracingTracer; @@ -63,6 +64,8 @@ public class WebSocketMetaDataFilter implements Filter { ThreadContext.get(APIConstants.LOG_TRACE_ID)); } + String apiTier = !requestContext.getMatchedAPI().getTier().isBlank() + ? requestContext.getMatchedAPI().getTier() : ThrottleConstants.UNLIMITED_TIER; AuthenticationContext authenticationContext = requestContext.getAuthenticationContext(); requestContext.addMetadataToMap(MetadataConstants.GRPC_STREAM_ID, UUID.randomUUID().toString()); requestContext.addMetadataToMap(MetadataConstants.REQUEST_ID, @@ -74,7 +77,7 @@ public class WebSocketMetaDataFilter implements Filter { requestContext.addMetadataToMap(MetadataConstants.TIER, getNullableStringValue(authenticationContext.getTier())); requestContext.addMetadataToMap(MetadataConstants.API_TIER, - getNullableStringValue(requestContext.getMatchedAPI().getTier())); + getNullableStringValue(apiTier)); requestContext.addMetadataToMap(MetadataConstants.CONTENT_AWARE_TIER_PRESENT, getNullableStringValue(String.valueOf(authenticationContext.isContentAwareTierPresent()))); requestContext.addMetadataToMap(MetadataConstants.API_KEY,

['enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java', 'enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/APIConfig.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketMetaDataFilter.java']

{'.java': 5}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2508/2509

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2509

https://github.com/wso2/product-microgateway/pull/2508

https://github.com/wso2/product-microgateway/pull/2508

fixes

Path Parameters are not populated for some cases with wildcard templates

### Description: Path Parameters are not populated for a template like /pet/{petID/somestring/* when the rawURL is /pet/1/somestring. In addition, following log is printed. ``` PathTemplate and RawPath is mismatched. ``` ### Steps to reproduce: ### Affected Product Version: choreo-connect-1.0.0-beta ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

892384d54d64ecfc305184146cc206b5228a36eb

639af63973a7e42165a9c075c80698087ffe7d80

https://github.com/wso2/product-microgateway/compare/892384d54d64ecfc305184146cc206b5228a36eb...639af63973a7e42165a9c075c80698087ffe7d80

diff --git a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/ParameterResolver.java b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/ParameterResolver.java index 1ba41f305..b102c2fad 100644 --- a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/ParameterResolver.java +++ b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/ParameterResolver.java @@ -33,9 +33,11 @@ class ParameterResolver { private static final Logger logger = LogManager.getLogger(ParameterResolver.class); private final List<String> parameterNames = new ArrayList<>(); private final Pattern pattern; + private String pathTemplate; public ParameterResolver(final String parameterTemplate) { // This formatting is required since /foo and /foo/ are considered to be equal + this.pathTemplate = parameterTemplate; String formattedPathParamTemplate = parameterTemplate.endsWith("/") ? parameterTemplate.substring(0, parameterTemplate.length() - 1) : parameterTemplate; final Matcher matcher = PARAMETER_PATTERN.matcher(formattedPathParamTemplate); @@ -52,7 +54,7 @@ class ParameterResolver { } String regex = Pattern.quote(matcher.replaceAll("_____PARAM_____")) .replace("_____PARAM_____", "\\\\E([^/]*)\\\\Q"); - regex = regex.endsWith("*\\\\E") ? regex.substring(0, regex.length() - 3) + "\\\\E(.*)" : regex; + regex = regex.endsWith("*\\\\E") ? regex.substring(0, regex.length() - 4) + "\\\\E($|([/]{1}(.*)))" : regex; pattern = Pattern.compile(regex); } @@ -63,7 +65,7 @@ class ParameterResolver { final Matcher matcher = pattern.matcher(formattedURI); if (!matcher.matches()) { // Unlikely to occur as this pair is already matched within router. - logger.error("PathTemplate and RawPath is mismatched."); + logger.debug("PathTemplate: {} and RawPath: {} is mismatched.", pathTemplate, uriString); return new HashMap<>(); } final Map<String, String> map = new HashMap<>(); diff --git a/enforcer-parent/commons/src/test/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContextTest.java b/enforcer-parent/commons/src/test/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContextTest.java index 6c9e4fe31..c338bdecf 100644 --- a/enforcer-parent/commons/src/test/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContextTest.java +++ b/enforcer-parent/commons/src/test/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContextTest.java @@ -72,8 +72,15 @@ public class RequestContextTest { public void testPathParameterGenerationWithWildcard() { testPathParamValues("/v2/pet/12/2/random/random2", "/v2", "/pet/{petId}/{imageId}/*", "petId", "12"); + testPathParamValues("/v2/pet/12/2/random/random2/random3", "/v2", "/pet/{petId}/{imageId}/*", + "petId", "12"); testPathParamValues("/v2/pet/12/image/2/random/random2", "/v2", "/pet/{petId}/image/{imageId}/*", "imageId", "2"); + testPathParamValues("/v2/pet/12/2/image", "/v2", "/pet/{petId}/{imageId}/image/*", + "petId", "12"); + testPathParamValues("/v2/pet/pet-1/image/*", "/v2", "/pet/{imageId}/image/*", + "imageId", "pet-1"); + testMismatchedPaths("/v2/pet/12/2/image123", "/v2", "/pet/{petId}/{imageId}/image/*"); } @Test @@ -107,4 +114,13 @@ public class RequestContextTest { requestContext.getPathParameters().get(pathParamName), expectedValue); } + private void testMismatchedPaths(String rawPath, String basePath, String pathTemplate) { + RequestContext.Builder builder = new RequestContext.Builder(rawPath); + builder.matchedAPI(new APIConfig.Builder("Petstore").basePath(basePath).build()); + builder.pathTemplate(pathTemplate); + RequestContext requestContext = builder.build(); + Assert.assertNotNull(requestContext.getPathParameters()); + Assert.assertEquals(0, requestContext.getPathParameters().size()); + } + }

['enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/ParameterResolver.java', 'enforcer-parent/commons/src/test/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContextTest.java']

{'.java': 2}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2519/2520

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2520

https://github.com/wso2/product-microgateway/pull/2519

https://github.com/wso2/product-microgateway/pull/2519

fixes

Websocket APIs cannot be invoked due to NPE.

### Description: Websocket APIs cannot be invoked due to NPE in enforcer. ### Steps to reproduce: start choreo-connect-with-apim Deploy websocketAPI Invoke the API with a valid token obtained from devportal ### Affected Product Version: choreo-connect-1.0.0-beta2-snapshot ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

892384d54d64ecfc305184146cc206b5228a36eb

849d9fedfe64c8fa61f9fd03173130a33de9c248

https://github.com/wso2/product-microgateway/compare/892384d54d64ecfc305184146cc206b5228a36eb...849d9fedfe64c8fa61f9fd03173130a33de9c248

diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java index a93a71489..fbe71d153 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java @@ -234,7 +234,10 @@ public class AuthFilter implements Filter { } ResourceConfig resourceConfig = requestContext.getMatchedResourcePath(); - if (resourceConfig.getEndpoints().containsKey(keyType)) { + // In websockets case, the endpoints object becomes null. Hence it would result + // in a NPE, if it is not checked. + if (resourceConfig.getEndpoints() != null && + resourceConfig.getEndpoints().containsKey(keyType)) { EndpointCluster endpointCluster = resourceConfig.getEndpoints().get(keyType); // Apply resource level retry headers

['enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java']

{'.java': 1}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2524/2529

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2529

https://github.com/wso2/product-microgateway/pull/2524

https://github.com/wso2/product-microgateway/pull/2524

fixes

Set Application ID instead of UUID for throttle event.

### Description: There are two IDs associated with application; an incremental ID and a UUID. It is required to use incremental ID rather than UUID, as it is the approach taken by the synapse gateway. This is required to have the deployment pattern where synapse gateway and choreo connect both runs connecting to a single TM instance. ### Steps to reproduce: add log publisher for throttle request stream in apim (navigate to /carbon) Enable global throttling in CC Invoke. ### Affected Product Version: choreo-connect-beta ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

25946350568fb934eb1776bc9667da454760510f

4a4ed36c6673cb9c3f95f77579ebf22dfc0216e7

https://github.com/wso2/product-microgateway/compare/25946350568fb934eb1776bc9667da454760510f...4a4ed36c6673cb9c3f95f77579ebf22dfc0216e7

diff --git a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/AuthenticationContext.java b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/AuthenticationContext.java index 514eed52e..c5a78403e 100644 --- a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/AuthenticationContext.java +++ b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/AuthenticationContext.java @@ -31,7 +31,8 @@ public class AuthenticationContext { private String apiKey; private String keyType; private String callerToken; - private String applicationId; + private int applicationId; + private String applicationUUID; private String applicationName; private String consumerKey; private String subscriber; @@ -51,9 +52,9 @@ public class AuthenticationContext { public static final String UNKNOWN_VALUE = "__unknown__"; public AuthenticationContext() { - this.applicationId = UNKNOWN_VALUE; this.apiPublisher = UNKNOWN_VALUE; - this.applicationId = UNKNOWN_VALUE; + this.applicationUUID = UNKNOWN_VALUE; + this.applicationId = -1; this.applicationName = UNKNOWN_VALUE; this.applicationTier = "Unlimited"; this.consumerKey = UNKNOWN_VALUE; @@ -190,15 +191,15 @@ public class AuthenticationContext { } /** - * Get the application UUID for the matched application. + * Get the application ID for the matched application. * * @return */ - public String getApplicationId() { + public int getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { + public void setApplicationId(int applicationId) { this.applicationId = applicationId; } @@ -370,4 +371,12 @@ public class AuthenticationContext { public void setRawToken(String rawToken) { this.rawToken = rawToken; } + + public String getApplicationUUID() { + return applicationUUID; + } + + public void setApplicationUUID(String applicationUUID) { + this.applicationUUID = applicationUUID; + } } diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/AnalyticsFilter.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/AnalyticsFilter.java index a700334c2..376cfec06 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/AnalyticsFilter.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/AnalyticsFilter.java @@ -127,8 +127,8 @@ public class AnalyticsFilter { // Default Value would be PRODUCTION requestContext.addMetadataToMap(MetadataConstants.APP_KEY_TYPE_KEY, authContext.getKeyType() == null ? APIConstants.API_KEY_TYPE_PRODUCTION : authContext.getKeyType()); - requestContext.addMetadataToMap(MetadataConstants.APP_ID_KEY, - AnalyticsUtils.setDefaultIfNull(authContext.getApplicationId())); + requestContext.addMetadataToMap(MetadataConstants.APP_UUID_KEY, + AnalyticsUtils.setDefaultIfNull(authContext.getApplicationUUID())); requestContext.addMetadataToMap(MetadataConstants.APP_NAME_KEY, AnalyticsUtils.setDefaultIfNull(authContext.getApplicationName())); requestContext.addMetadataToMap(MetadataConstants.APP_OWNER_KEY, diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoAnalyticsProvider.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoAnalyticsProvider.java index 634187304..9c8a794a0 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoAnalyticsProvider.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoAnalyticsProvider.java @@ -124,7 +124,7 @@ public class ChoreoAnalyticsProvider implements AnalyticsDataProvider { application.setApplicationOwner(getValueAsString(fieldsMap, MetadataConstants.APP_OWNER_KEY)); application.setApplicationName(getValueAsString(fieldsMap, MetadataConstants.APP_NAME_KEY)); application.setKeyType(getValueAsString(fieldsMap, MetadataConstants.APP_KEY_TYPE_KEY)); - application.setApplicationId(getValueAsString(fieldsMap, MetadataConstants.APP_ID_KEY)); + application.setApplicationId(getValueAsString(fieldsMap, MetadataConstants.APP_UUID_KEY)); return application; } diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java index 21d80ad34..c0277e119 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java @@ -59,7 +59,7 @@ public class ChoreoFaultAnalyticsProvider implements AnalyticsDataProvider { @Override public boolean isAnonymous() { return requestContext.getAuthenticationContext() == null || - StringUtils.isEmpty(requestContext.getAuthenticationContext().getApplicationId()); + StringUtils.isEmpty(requestContext.getAuthenticationContext().getApplicationUUID()); } @Override @@ -118,7 +118,7 @@ public class ChoreoFaultAnalyticsProvider implements AnalyticsDataProvider { // Default Value would be PRODUCTION application.setKeyType( authContext.getKeyType() == null ? APIConstants.API_KEY_TYPE_PRODUCTION : authContext.getKeyType()); - application.setApplicationId(AnalyticsUtils.setDefaultIfNull(authContext.getApplicationId())); + application.setApplicationId(AnalyticsUtils.setDefaultIfNull(authContext.getApplicationUUID())); application.setApplicationOwner(AnalyticsUtils.setDefaultIfNull(authContext.getSubscriber())); application.setApplicationName(AnalyticsUtils.setDefaultIfNull(authContext.getApplicationName())); return application; diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/MetadataConstants.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/MetadataConstants.java index d6a5c69dc..d63b58f3a 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/MetadataConstants.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/MetadataConstants.java @@ -34,6 +34,7 @@ public class MetadataConstants { public static final String API_ORGANIZATION_ID = WSO2_METADATA_PREFIX + "api-organization-id"; public static final String APP_ID_KEY = WSO2_METADATA_PREFIX + "application-id"; + public static final String APP_UUID_KEY = WSO2_METADATA_PREFIX + "application-uuid"; public static final String APP_KEY_TYPE_KEY = WSO2_METADATA_PREFIX + "application-key-type"; public static final String APP_NAME_KEY = WSO2_METADATA_PREFIX + "application-name"; public static final String APP_OWNER_KEY = WSO2_METADATA_PREFIX + "application-owner"; diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/dto/APIKeyValidationInfoDTO.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/dto/APIKeyValidationInfoDTO.java index 4930db085..455b29b3e 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/dto/APIKeyValidationInfoDTO.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/dto/APIKeyValidationInfoDTO.java @@ -42,7 +42,7 @@ public class APIKeyValidationInfoDTO implements Serializable { private String userType; private String endUserToken; private String endUserName; - private String applicationId; + private int applicationId; private String applicationName; private String applicationTier; //use this to pass key validation status @@ -140,11 +140,11 @@ public class APIKeyValidationInfoDTO implements Serializable { this.endUserName = endUserName; } - public String getApplicationId() { + public int getApplicationId() { return applicationId; } - public void setApplicationId(String applicationId) { + public void setApplicationId(int applicationId) { this.applicationId = applicationId; } diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/KeyValidator.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/KeyValidator.java index e44e95359..776e9c310 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/KeyValidator.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/KeyValidator.java @@ -281,7 +281,8 @@ public class KeyValidator { } infoDTO.setTier(sub.getPolicyId()); infoDTO.setSubscriber(app.getSubName()); - infoDTO.setApplicationId(app.getUUID()); + infoDTO.setApplicationId(app.getId()); + infoDTO.setApplicationUUID(app.getUUID()); infoDTO.setApiName(api.getApiName()); infoDTO.setApiVersion(api.getApiVersion()); infoDTO.setApiPublisher(api.getApiProvider()); diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyAuthenticator.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyAuthenticator.java index f71c6390c..746a2e049 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyAuthenticator.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyAuthenticator.java @@ -273,7 +273,9 @@ public class APIKeyAuthenticator extends APIKeyHandler { validationInfoDTO.setType(APIConstants.API_KEY_TYPE_PRODUCTION); } if (app != null) { - validationInfoDTO.setApplicationId(app.getAsString(APIConstants.JwtTokenConstants.APPLICATION_ID)); + validationInfoDTO.setApplicationId(app.getAsNumber(APIConstants.JwtTokenConstants.APPLICATION_ID) + .intValue()); + validationInfoDTO.setApplicationUUID(app.getAsString(APIConstants.JwtTokenConstants.APPLICATION_UUID)); validationInfoDTO.setApplicationName(app.getAsString(APIConstants.JwtTokenConstants.APPLICATION_NAME)); validationInfoDTO.setApplicationTier(app.getAsString(APIConstants.JwtTokenConstants.APPLICATION_TIER)); validationInfoDTO.setSubscriber(app.getAsString(APIConstants.JwtTokenConstants.APPLICATION_OWNER)); diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java index 8d92efd37..a5263c0eb 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java @@ -324,7 +324,8 @@ public class JWTAuthenticator implements Authenticator { String kmReference) { String applicationRef = APIConstants.ANONYMOUS_PREFIX + kmReference; apiKeyValidationInfoDTO.setApplicationName(applicationRef); - apiKeyValidationInfoDTO.setApplicationId( + apiKeyValidationInfoDTO.setApplicationId(-1); + apiKeyValidationInfoDTO.setApplicationUUID( UUID.nameUUIDFromBytes( applicationRef.getBytes(StandardCharsets.UTF_8)).toString()); apiKeyValidationInfoDTO.setApplicationTier(APIConstants.UNLIMITED_TIER); @@ -453,7 +454,8 @@ public class JWTAuthenticator implements Authenticator { JSONObject app = payload.getJSONObjectClaim(APIConstants.JwtTokenConstants.APPLICATION); if (app != null) { validationInfo.setApplicationUUID(app.getAsString(APIConstants.JwtTokenConstants.APPLICATION_UUID)); - validationInfo.setApplicationId(app.getAsString(APIConstants.JwtTokenConstants.APPLICATION_ID)); + validationInfo.setApplicationId(app.getAsNumber(APIConstants.JwtTokenConstants.APPLICATION_ID) + .intValue()); validationInfo.setApplicationName(app.getAsString(APIConstants.JwtTokenConstants.APPLICATION_NAME)); validationInfo.setApplicationTier(app.getAsString(APIConstants.JwtTokenConstants.APPLICATION_TIER)); validationInfo.setSubscriber(app.getAsString(APIConstants.JwtTokenConstants.APPLICATION_OWNER)); diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/server/WebSocketHandler.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/server/WebSocketHandler.java index 5f46712cc..fc50ad820 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/server/WebSocketHandler.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/server/WebSocketHandler.java @@ -18,6 +18,7 @@ package org.wso2.choreo.connect.enforcer.server; import io.opentelemetry.context.Scope; +import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.ThreadContext; @@ -105,7 +106,11 @@ public class WebSocketHandler implements RequestHandler<WebSocketFrameRequest, W String apiKey = extAuthMetadata.get(MetadataConstants.API_KEY); String keyType = extAuthMetadata.get(MetadataConstants.KEY_TYPE); String callerToken = extAuthMetadata.get(MetadataConstants.CALLER_TOKEN); - String applicationId = extAuthMetadata.get(MetadataConstants.APP_ID); + int applicationId = -1; + if (!StringUtils.isEmpty(extAuthMetadata.get(MetadataConstants.APP_ID))) { + applicationId = Integer.parseInt(extAuthMetadata.get(MetadataConstants.APP_ID)); + } + String applicationName = extAuthMetadata.get(MetadataConstants.APP_NAME); String consumerKey = extAuthMetadata.get(MetadataConstants.CONSUMER_KEY); String subscriber = extAuthMetadata.get(MetadataConstants.SUBSCRIBER); diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleDataHolder.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleDataHolder.java index 81a3750f3..8652e7098 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleDataHolder.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleDataHolder.java @@ -387,7 +387,7 @@ public class ThrottleDataHolder { * @return throttle {@link Decision} */ public Decision isThrottledByCustomPolicy(String userID, String resourceKey, String apiContext, String apiVersion, - String appTenant, String apiTenant, String appId, String clientIp) { + String appTenant, String apiTenant, int appId, String clientIp) { Decision decision = new Decision(); if (keyTemplates.size() > 0) { for (String key : keyTemplates.keySet()) { @@ -397,7 +397,7 @@ public class ThrottleDataHolder { key = key.replaceAll("\\\\$apiVersion", apiVersion); key = key.replaceAll("\\\\$appTenant", appTenant); key = key.replaceAll("\\\\$apiTenant", apiTenant); - key = key.replaceAll("\\\\$appId", appId); + key = key.replaceAll("\\\\$appId", String.valueOf(appId)); if (clientIp != null) { key = key.replaceAll("\\\\$clientIp", FilterUtils.ipToBigInteger(clientIp).toString()); diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java index f7ca83c3e..19f1a7abf 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java @@ -122,7 +122,7 @@ public class ThrottleFilter implements Filter { APIConfig api = reqContext.getMatchedAPI(); String apiContext = api.getBasePath(); String apiVersion = api.getVersion(); - String appId = authContext.getApplicationId(); + int appId = authContext.getApplicationId(); String apiTier = getApiTier(api); String apiThrottleKey = getApiThrottleKey(apiContext, apiVersion); String resourceTier = getResourceTier(reqContext.getMatchedResourcePath()); @@ -202,7 +202,7 @@ public class ThrottleFilter implements Filter { } // Checking Application level throttling - String appThrottleKey = appId + ':' + authorizedUser; + String appThrottleKey = appId + ":" + authorizedUser; Decision appDecision = checkAppLevelThrottled(appThrottleKey, appTier); if (appDecision.isThrottled()) { log.debug("Setting application throttle out response"); @@ -307,11 +307,11 @@ public class ThrottleFilter implements Filter { } throttleEvent.put(ThrottleEventConstants.MESSAGE_ID, requestContext.getRequestID()); - throttleEvent.put(ThrottleEventConstants.APP_KEY, authContext.getApplicationId() + ':' + authorizedUser); + throttleEvent.put(ThrottleEventConstants.APP_KEY, authContext.getApplicationId() + ":" + authorizedUser); throttleEvent.put(ThrottleEventConstants.APP_TIER, authContext.getApplicationTier()); throttleEvent.put(ThrottleEventConstants.API_KEY, apiContext); throttleEvent.put(ThrottleEventConstants.API_TIER, apiTier); - throttleEvent.put(ThrottleEventConstants.SUBSCRIPTION_KEY, authContext.getApplicationId() + ':' + + throttleEvent.put(ThrottleEventConstants.SUBSCRIPTION_KEY, authContext.getApplicationId() + ":" + apiContext); throttleEvent.put(ThrottleEventConstants.SUBSCRIPTION_TIER, authContext.getTier()); throttleEvent.put(ThrottleEventConstants.RESOURCE_KEY, resourceKey); @@ -322,7 +322,7 @@ public class ThrottleFilter implements Filter { throttleEvent.put(ThrottleEventConstants.API_VERSION, apiVersion); throttleEvent.put(ThrottleEventConstants.APP_TENANT, authContext.getSubscriberTenantDomain()); throttleEvent.put(ThrottleEventConstants.API_TENANT, tenantDomain); - throttleEvent.put(ThrottleEventConstants.APP_ID, authContext.getApplicationId()); + throttleEvent.put(ThrottleEventConstants.APP_ID, String.valueOf(authContext.getApplicationId())); throttleEvent.put(ThrottleEventConstants.API_NAME, apiName); throttleEvent.put(ThrottleEventConstants.PROPERTIES, getProperties(requestContext).toString()); return throttleEvent; @@ -346,8 +346,8 @@ public class ThrottleFilter implements Filter { return apiThrottleKey; } - private String getSubscriptionThrottleKey(String appId, String apiContext, String apiVersion) { - String subThrottleKey = appId + ':' + apiContext; + private String getSubscriptionThrottleKey(int appId, String apiContext, String apiVersion) { + String subThrottleKey = appId + ":" + apiContext; if (!apiVersion.isBlank()) { subThrottleKey += ':' + apiVersion; } diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java index b463d006d..b5a97aae3 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java @@ -200,7 +200,8 @@ public class FilterUtils { } // Setting end user as anonymous authContext.setUsername(APIConstants.END_USER_ANONYMOUS); - authContext.setApplicationId(clientIP); + // TODO: (VirajSalaka) clientIP for applicationUUID? + authContext.setApplicationUUID(clientIP); authContext.setApplicationName(null); authContext.setApplicationTier(APIConstants.UNLIMITED_TIER); authContext.setSubscriber(APIConstants.END_USER_ANONYMOUS); @@ -229,6 +230,7 @@ public class FilterUtils { if (apiKeyValidationInfoDTO != null) { authContext.setKeyType(apiKeyValidationInfoDTO.getType()); authContext.setApplicationId(apiKeyValidationInfoDTO.getApplicationId()); + authContext.setApplicationUUID(apiKeyValidationInfoDTO.getApplicationUUID()); authContext.setApplicationName(apiKeyValidationInfoDTO.getApplicationName()); authContext.setApplicationTier(apiKeyValidationInfoDTO.getApplicationTier()); authContext.setSubscriber(apiKeyValidationInfoDTO.getSubscriber()); @@ -328,7 +330,7 @@ public class FilterUtils { authContext.setApiUUID(apiUUID); } authContext.setApplicationName(APIConstants.JwtTokenConstants.INTERNAL_KEY_APP_NAME); - authContext.setApplicationId(UUID.nameUUIDFromBytes(APIConstants.JwtTokenConstants.INTERNAL_KEY_APP_NAME. + authContext.setApplicationUUID(UUID.nameUUIDFromBytes(APIConstants.JwtTokenConstants.INTERNAL_KEY_APP_NAME. getBytes(StandardCharsets.UTF_8)).toString()); authContext.setApplicationTier(APIConstants.UNLIMITED_TIER); authContext.setSubscriber(APIConstants.JwtTokenConstants.INTERNAL_KEY_APP_NAME); @@ -368,7 +370,7 @@ public class FilterUtils { } } if (apiKeyValidationInfoDTO != null) { - jwtInfoDto.setApplicationId(apiKeyValidationInfoDTO.getApplicationId()); + jwtInfoDto.setApplicationId(apiKeyValidationInfoDTO.getApplicationUUID()); jwtInfoDto.setApplicationName(apiKeyValidationInfoDTO.getApplicationName()); jwtInfoDto.setApplicationTier(apiKeyValidationInfoDTO.getApplicationTier()); jwtInfoDto.setKeyType(apiKeyValidationInfoDTO.getType()); diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/MetadataConstants.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/MetadataConstants.java index 1766047a5..139724b49 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/MetadataConstants.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/MetadataConstants.java @@ -30,6 +30,7 @@ public class MetadataConstants { public static final String KEY_TYPE = "keyType"; public static final String CALLER_TOKEN = "callerToken"; public static final String APP_ID = "applicationId"; + public static final String APP_UUID = "applicationUUID"; public static final String APP_NAME = "applicationName"; public static final String CONSUMER_KEY = "consumerKey"; public static final String SUBSCRIBER = "subscriber"; diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketMetaDataFilter.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketMetaDataFilter.java index eb3641d56..a4a292f1c 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketMetaDataFilter.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketMetaDataFilter.java @@ -84,7 +84,10 @@ public class WebSocketMetaDataFilter implements Filter { requestContext.addMetadataToMap(MetadataConstants.CALLER_TOKEN, getNullableStringValue(authenticationContext.getCallerToken())); requestContext.addMetadataToMap(MetadataConstants.APP_ID, - getNullableStringValue(authenticationContext.getApplicationId())); + String.valueOf(authenticationContext.getApplicationId())); + // Unused but added to maintain the consistancy + requestContext.addMetadataToMap(MetadataConstants.APP_UUID, + String.valueOf(authenticationContext.getApplicationUUID())); requestContext.addMetadataToMap(MetadataConstants.APP_NAME, getNullableStringValue(authenticationContext.getApplicationName())); requestContext.addMetadataToMap(MetadataConstants.CONSUMER_KEY, diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketThrottleFilter.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketThrottleFilter.java index c867bcd8c..763996124 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketThrottleFilter.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketThrottleFilter.java @@ -97,7 +97,7 @@ public class WebSocketThrottleFilter implements Filter { APIConfig api = requestContext.getMatchedAPI(); String apiContext = api.getBasePath(); String apiVersion = api.getVersion(); - String appId = authContext.getApplicationId(); + int appId = authContext.getApplicationId(); String apiTier = getApiTier(api); String apiThrottleKey = getApiThrottleKey(apiContext, apiVersion); String subTier = authContext.getTier(); @@ -164,7 +164,7 @@ public class WebSocketThrottleFilter implements Filter { } // Checking Application level throttling - String appThrottleKey = appId + ':' + authorizedUser; + String appThrottleKey = appId + ":" + authorizedUser; Decision appDecision = checkAppLevelThrottled(appThrottleKey, appTier); if (appDecision.isThrottled()) { log.debug("Setting application throttle out response"); @@ -196,7 +196,7 @@ public class WebSocketThrottleFilter implements Filter { return apiThrottleKey; } - private String getSubscriptionThrottleKey(String appId, String apiContext, String apiVersion) { + private String getSubscriptionThrottleKey(int appId, String apiContext, String apiVersion) { String subThrottleKey = appId + ':' + apiContext; if (!apiVersion.isBlank()) { subThrottleKey += ':' + apiVersion; @@ -237,11 +237,11 @@ public class WebSocketThrottleFilter implements Filter { } throttleEvent.put(ThrottleEventConstants.MESSAGE_ID, requestContext.getRequestID()); - throttleEvent.put(ThrottleEventConstants.APP_KEY, authContext.getApplicationId() + ':' + authorizedUser); + throttleEvent.put(ThrottleEventConstants.APP_KEY, authContext.getApplicationId() + ":" + authorizedUser); throttleEvent.put(ThrottleEventConstants.APP_TIER, authContext.getApplicationTier()); throttleEvent.put(ThrottleEventConstants.API_KEY, apiContext); throttleEvent.put(ThrottleEventConstants.API_TIER, apiTier); - throttleEvent.put(ThrottleEventConstants.SUBSCRIPTION_KEY, authContext.getApplicationId() + ':' + + throttleEvent.put(ThrottleEventConstants.SUBSCRIPTION_KEY, authContext.getApplicationId() + ":" + apiContext); throttleEvent.put(ThrottleEventConstants.SUBSCRIPTION_TIER, authContext.getTier()); // TODO: (Praminda) should publish with tenant domain? @@ -250,7 +250,7 @@ public class WebSocketThrottleFilter implements Filter { throttleEvent.put(ThrottleEventConstants.API_VERSION, apiVersion); throttleEvent.put(ThrottleEventConstants.APP_TENANT, authContext.getSubscriberTenantDomain()); throttleEvent.put(ThrottleEventConstants.API_TENANT, tenantDomain); - throttleEvent.put(ThrottleEventConstants.APP_ID, authContext.getApplicationId()); + throttleEvent.put(ThrottleEventConstants.APP_ID, String.valueOf(authContext.getApplicationId())); throttleEvent.put(ThrottleEventConstants.API_NAME, apiName); throttleEvent.put(ThrottleEventConstants.PROPERTIES, getProperties(requestContext).toString()); return throttleEvent;

['enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyAuthenticator.java', 'enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/AuthenticationContext.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/MetadataConstants.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleDataHolder.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketThrottleFilter.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/AnalyticsFilter.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoAnalyticsProvider.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/FilterUtils.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/KeyValidator.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/MetadataConstants.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/dto/APIKeyValidationInfoDTO.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/server/WebSocketHandler.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/websocket/WebSocketMetaDataFilter.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java']

{'.java': 16}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2538/2537

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2537

https://github.com/wso2/product-microgateway/pull/2538

https://github.com/wso2/product-microgateway/pull/2538

fixes

NPE when invoking Websocket APIs

### Description: <!-- Describe the issue --> $subject. Below log can be seen in the enforcer logs. ``` enforcer_1 | java.lang.NullPointerException enforcer_1 | at org.wso2.choreo.connect.enforcer.commons.model.RequestContext$Builder.populatePathParameters(RequestContext.java:454) enforcer_1 | at org.wso2.choreo.connect.enforcer.commons.model.RequestContext$Builder.build(RequestContext.java:421) enforcer_1 | at org.wso2.choreo.connect.enforcer.server.WebSocketHandler.buildRequestContext(WebSocketHandler.java:157) enforcer_1 | at org.wso2.choreo.connect.enforcer.server.WebSocketHandler.process(WebSocketHandler.java:80) enforcer_1 | at org.wso2.choreo.connect.enforcer.websocket.WebSocketResponseObserver.lambda$onNext$0(WebSocketResponseObserver.java:77) enforcer_1 | at java.base/java.lang.Iterable.forEach(Unknown Source) enforcer_1 | at org.wso2.choreo.connect.enforcer.websocket.WebSocketResponseObserver.onNext(WebSocketResponseObserver.java:70) enforcer_1 | at org.wso2.choreo.connect.enforcer.websocket.WebSocketResponseObserver.onNext(WebSocketResponseObserver.java:41) enforcer_1 | at io.grpc.stub.ServerCalls$StreamingServerCallHandler$StreamingServerCallListener.onMessage(ServerCalls.java:249) enforcer_1 | at io.grpc.internal.ServerCallImpl$ServerStreamListenerImpl.messagesAvailableInternal(ServerCallImpl.java:309) enforcer_1 | at io.grpc.internal.ServerCallImpl$ServerStreamListenerImpl.messagesAvailable(ServerCallImpl.java:292) enforcer_1 | at io.grpc.internal.ServerImpl$JumpToApplicationThreadServerStreamListener$1MessagesAvailable.runInContext(ServerImpl.java:782) enforcer_1 | at io.grpc.internal.ContextRunnable.run(ContextRunnable.java:37) enforcer_1 | at io.grpc.internal.SerializingExecutor.run(SerializingExecutor.java:123) enforcer_1 | at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) enforcer_1 | at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) enforcer_1 | at java.base/java.lang.Thread.run(Unknown Source) ``` ### Steps to reproduce: ### Affected Product Version: <!-- Members can use Affected/*** labels --> 1.0.0-rc1-snapshot ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s):

ee416e1dc8f1988c50ead87696982204de5e4202

e58f010246b8a646164e468f0f9da09a3ec76d12

https://github.com/wso2/product-microgateway/compare/ee416e1dc8f1988c50ead87696982204de5e4202...e58f010246b8a646164e468f0f9da09a3ec76d12

diff --git a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContext.java b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContext.java index 2a3eed21f..38f5b63e0 100644 --- a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContext.java +++ b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContext.java @@ -20,6 +20,8 @@ package org.wso2.choreo.connect.enforcer.commons.model; import org.apache.commons.lang3.StringUtils; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -33,6 +35,7 @@ import java.util.TreeMap; * through out the complete request flow through the gateway enforcer. */ public class RequestContext { + private static final Logger logger = LogManager.getLogger(RequestContext.class); //constants public static final String CLUSTER_HEADER = "x-wso2-cluster-header"; @@ -447,6 +450,11 @@ public class RequestContext { */ private Map<String, String> populatePathParameters(String basePath, String resourceTemplate, String rawPath) { + if (resourceTemplate == null || rawPath == null) { + logger.debug("Skip populating the path parameters. template: {}, rawPath: {}", resourceTemplate, + rawPath); + return null; + } // Format the basePath and resourcePath to maintain consistency String formattedBasePath = basePath.startsWith("/") ? basePath : "/" + basePath; formattedBasePath = formattedBasePath.endsWith("/") ? @@ -457,8 +465,7 @@ public class RequestContext { String formattedRawPath = rawPath.split("\\\\?")[0]; final ParameterResolver parameterResolver = new ParameterResolver (formattedBasePath + formattedResourcePathTemplate); - final Map<String, String> resultMap = parameterResolver.parametersByName(formattedRawPath); - return resultMap; + return parameterResolver.parametersByName(formattedRawPath); } } }

['enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContext.java']

{'.java': 1}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2563/2572

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2572

https://github.com/wso2/product-microgateway/pull/2563

https://github.com/wso2/product-microgateway/pull/2563

fixes

Avoid Unwanted headers/query parameters being forwarded to the backend.

### Description: There can be headers which are not supposed to forwarded to backend as well as in the throttle publish event. ### Steps to reproduce: Invoke API with APIKey. And check the recieved set of headers in the backend. ### Affected Product Version: choreo-connect-1.0.0-rc1 ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

90791d02ec7f352e55b10eb6528b4262c9fa5540

a8b4f9d20717faa7b1dabb4023ac529cb7f3c484

https://github.com/wso2/product-microgateway/compare/90791d02ec7f352e55b10eb6528b4262c9fa5540...a8b4f9d20717faa7b1dabb4023ac529cb7f3c484

diff --git a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContext.java b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContext.java index 38f5b63e0..fa64ad2e5 100644 --- a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContext.java +++ b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContext.java @@ -62,6 +62,10 @@ public class RequestContext { private WebSocketFrameContext webSocketFrameContext; private Map<String, String> queryParameters; private Map<String, String> pathParameters; + private ArrayList<String> queryParamsToRemove; + // This is used to keep protected headers like authorization header. The protected headers will not be + // sent to the Traffic Manager when header based rate limiting is enabled. + private ArrayList<String> protectedHeaders; // Request Timestamp is required for analytics private long requestTimeStamp; @@ -312,6 +316,28 @@ public class RequestContext { return webSocketFrameContext; } + /** + * If there is a set of query parameters needs to be removed from the outbound request, those parameters should + * be added to the arrayList here. + * + * @return query parameters which are supposed to be removed. + */ + public ArrayList<String> getQueryParamsToRemove() { + return queryParamsToRemove; + } + + /** + * If there is a set of headers needs to be removed from the throttle publishing event, those headers should + * be added to the arrayList here. + * + * Ex. Authorization Header + * + * @return header names which are not supposed to be published to the traffic manager. + */ + public ArrayList<String> getProtectedHeaders() { + return protectedHeaders; + } + /** * Implements builder pattern to build an {@link RequestContext} object. */ @@ -412,6 +438,8 @@ public class RequestContext { requestContext.clientIp = this.clientIp; requestContext.addHeaders = new HashMap<>(); requestContext.removeHeaders = new ArrayList<>(); + requestContext.queryParamsToRemove = new ArrayList<>(); + requestContext.protectedHeaders = new ArrayList<>(); String[] queryParts = this.requestPath.split("\\\\?"); String queryPrams = queryParts.length > 1 ? queryParts[1] : ""; diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/api/ResponseObject.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/api/ResponseObject.java index b4d34e3c6..36e0e588d 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/api/ResponseObject.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/api/ResponseObject.java @@ -34,6 +34,9 @@ public class ResponseObject { private ArrayList<String> removeHeaderMap = new ArrayList<>(); private Map<String, String> metaDataMap; private boolean isDirectResponse = false; + private ArrayList<String> queryParamsToRemove = new ArrayList<>(); + private Map<String, String> queryParams; + private String requestPath; public ArrayList<String> getRemoveHeaderMap() { return removeHeaderMap; @@ -110,4 +113,28 @@ public class ResponseObject { public void setMetaDataMap(Map<String, String> metaDataMap) { this.metaDataMap = metaDataMap; } + + public ArrayList<String> getQueryParamsToRemove() { + return queryParamsToRemove; + } + + public void setQueryParamsToRemove(ArrayList<String> queryParamsToRemove) { + this.queryParamsToRemove = queryParamsToRemove; + } + + public Map<String, String> getQueryParamMap() { + return queryParams; + } + + public void setQueryParamMap(Map<String, String> queryParams) { + this.queryParams = queryParams; + } + + public String getRequestPath() { + return requestPath; + } + + public void setRequestPath(String requestPath) { + this.requestPath = requestPath; + } } diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/api/RestAPI.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/api/RestAPI.java index b89f6cbca..d5f998815 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/api/RestAPI.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/api/RestAPI.java @@ -157,17 +157,15 @@ public class RestAPI implements API { @Override public ResponseObject process(RequestContext requestContext) { ResponseObject responseObject = new ResponseObject(requestContext.getRequestID()); + responseObject.setRequestPath(requestContext.getRequestPath()); boolean analyticsEnabled = ConfigHolder.getInstance().getConfig().getAnalyticsConfig().isEnabled(); - // Process to-be-removed headers - AuthHeaderDto authHeader = ConfigHolder.getInstance().getConfig().getAuthHeader(); - if (!authHeader.isEnableOutboundAuthHeader()) { - String authHeaderName = FilterUtils.getAuthHeaderName(requestContext); - requestContext.getRemoveHeaders().add(authHeaderName); - } + populateRemoveAndProtectedHeaders(requestContext); if (executeFilterChain(requestContext)) { responseObject.setRemoveHeaderMap(requestContext.getRemoveHeaders()); + responseObject.setQueryParamsToRemove(requestContext.getQueryParamsToRemove()); + responseObject.setQueryParamMap(requestContext.getQueryParameters()); responseObject.setStatusCode(APIConstants.StatusCodes.OK.getCode()); if (requestContext.getAddHeaders() != null && requestContext.getAddHeaders().size() > 0) { responseObject.setHeaderMap(requestContext.getAddHeaders()); @@ -288,4 +286,43 @@ public class RestAPI implements API { } } } + + private void populateRemoveAndProtectedHeaders(RequestContext requestContext) { + Map<String, SecuritySchemaConfig> securitySchemeDefinitions = + requestContext.getMatchedAPI().getSecuritySchemeDefinitions(); + // API key headers are considered to be protected headers, such that the header would not be sent + // to backend and traffic manager. + // This would prevent leaking credentials, even if user is invoking unsecured resource with some + // credentials. + for (Map.Entry<String, SecuritySchemaConfig> entry : securitySchemeDefinitions.entrySet()) { + SecuritySchemaConfig schema = entry.getValue(); + if (APIConstants.SWAGGER_API_KEY_AUTH_TYPE_NAME.equalsIgnoreCase(schema.getType())) { + if (APIConstants.SWAGGER_API_KEY_IN_HEADER.equals(schema.getIn())) { + requestContext.getProtectedHeaders().add(schema.getName()); + requestContext.getRemoveHeaders().add(schema.getName()); + continue; + } + if (APIConstants.SWAGGER_API_KEY_IN_QUERY.equals(schema.getIn())) { + requestContext.getQueryParamsToRemove().add(schema.getName()); + } + } + } + + // Internal-Key credential is considered to be protected headers, such that the header would not be sent + // to backend and traffic manager. + String internalKeyHeader = ConfigHolder.getInstance().getConfig().getAuthHeader() + .getTestConsoleHeaderName().toLowerCase(); + requestContext.getRemoveHeaders().add(internalKeyHeader); + // Avoid internal key being published to the Traffic Manager + requestContext.getProtectedHeaders().add(internalKeyHeader); + + // Remove Authorization Header + AuthHeaderDto authHeader = ConfigHolder.getInstance().getConfig().getAuthHeader(); + String authHeaderName = FilterUtils.getAuthHeaderName(requestContext); + if (!authHeader.isEnableOutboundAuthHeader()) { + requestContext.getRemoveHeaders().add(authHeaderName); + } + // Authorization Header should not be included in the throttle publishing event. + requestContext.getProtectedHeaders().add(authHeaderName); + } } diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/APIConstants.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/APIConstants.java index 80bd4b0ea..ea792da28 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/APIConstants.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/APIConstants.java @@ -86,6 +86,7 @@ public class APIConstants { public static final String APPLICATION_JSON = "application/json"; public static final String API_TRACE_KEY = "X-TRACE-KEY"; public static final String X_FORWARDED_FOR = "x-forwarded-for"; + public static final String PATH_HEADER = ":path"; public static final String LOG_TRACE_ID = "traceId"; diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/ExtAuthService.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/ExtAuthService.java index 594749436..6225ef6e8 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/ExtAuthService.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/ExtAuthService.java @@ -47,6 +47,9 @@ import org.wso2.choreo.connect.enforcer.tracing.TracingSpan; import org.wso2.choreo.connect.enforcer.tracing.TracingTracer; import org.wso2.choreo.connect.enforcer.tracing.Utils; +import java.util.List; +import java.util.Map; + /** * This is the gRPC server written to match with the envoy ext-authz filter proto file. Envoy proxy call this service. * This is the entry point to the filter chain process for a request. @@ -140,6 +143,21 @@ public class ExtAuthService extends AuthorizationGrpc.AuthorizationImplBase { .build(); } else { OkHttpResponse.Builder okResponseBuilder = OkHttpResponse.newBuilder(); + + // If the user is sending the APIKey credentials within query parameters, those query parameters should + // not be sent to the backend. Hence, the :path header needs to be constructed again removing the apiKey + // query parameter. In this scenario, apiKey query parameter is sent within the property called + // 'queryParamsToRemove' so that the custom filters also can utilize the method. + if (responseObject.getQueryParamsToRemove().size() > 0) { + String constructedPath = constructQueryParamString(responseObject.getRequestPath(), + responseObject.getQueryParamMap(), responseObject.getQueryParamsToRemove()); + HeaderValueOption headerValueOption = HeaderValueOption.newBuilder() + .setHeader(HeaderValue.newBuilder().setKey(APIConstants.PATH_HEADER).setValue(constructedPath) + .build()) + .build(); + okResponseBuilder.addHeaders(headerValueOption); + } + if (responseObject.getHeaderMap() != null) { responseObject.getHeaderMap().forEach((key, value) -> { HeaderValueOption headerValueOption = HeaderValueOption.newBuilder() @@ -180,4 +198,34 @@ public class ExtAuthService extends AuthorizationGrpc.AuthorizationImplBase { } return Code.INTERNAL_VALUE; } + + private String constructQueryParamString(String requestPath, Map<String, String> queryParamMap, + List<String> queryParamsToRemove) { + // If no query parameters needs to be removed, then the request path can be applied as it is. + if (queryParamsToRemove.size() == 0) { + return requestPath; + } + + String pathWithoutQueryParams = requestPath.split("\\\\?")[0]; + StringBuilder requestPathBuilder = new StringBuilder(pathWithoutQueryParams); + int count = 0; + if (queryParamMap.size() > 0) { + for (String queryParam : queryParamMap.keySet()) { + if (queryParamsToRemove.contains(queryParam)) { + continue; + } + if (count == 0) { + requestPathBuilder.append("?"); + } else { + requestPathBuilder.append("&"); + } + requestPathBuilder.append(queryParam); + if (queryParamMap.get(queryParam) != null) { + requestPathBuilder.append("=").append(queryParamMap.get(queryParam)); + } + count++; + } + } + return requestPathBuilder.toString(); + } } diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java index dde3ff0bf..681d0602e 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java @@ -96,8 +96,6 @@ public class InternalAPIKeyAuthenticator extends APIKeyHandler { } // Extract internal from the request while removing it from the msg context. String internalKey = extractInternalKey(requestContext); - // Remove internal key from outbound request - requestContext.getRemoveHeaders().add(securityParam); String[] splitToken = internalKey.split("\\\\."); SignedJWT signedJWT = SignedJWT.parse(internalKey); diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java index 19f1a7abf..62f359b33 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java @@ -394,6 +394,15 @@ public class ThrottleFilter implements Filter { if (config.isHeaderConditionsEnabled()) { Map<String, String> headers = requestContext.getHeaders(); for (String name : headers.keySet()) { + // To avoid publishing user token to the traffic manager. + if (requestContext.getProtectedHeaders().contains(name)) { + continue; + } + // Sending path header is stopped as it could contain query parameters which are used + // to secure APIs. + if (name.equals(APIConstants.PATH_HEADER)) { + continue; + } jsonObMap.put(name, headers.get(name)); } } @@ -401,6 +410,10 @@ public class ThrottleFilter implements Filter { if (config.isQueryConditionsEnabled()) { Map<String, String> params = requestContext.getQueryParameters(); for (String name : params.keySet()) { + // To avoid publishing apiKey to the traffic manager. + if (requestContext.getQueryParamsToRemove().contains(name)) { + continue; + } jsonObMap.put(name, params.get(name)); } }

['enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/grpc/ExtAuthService.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/throttle/ThrottleFilter.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/APIConstants.java', 'enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContext.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/api/ResponseObject.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/api/RestAPI.java']

{'.java': 7}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2455/2454

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2454

https://github.com/wso2/product-microgateway/pull/2455

https://github.com/wso2/product-microgateway/pull/2455

fixes

backend basic auth security not working when API is not not secured

### Description: <!-- Describe the issue --> ### Steps to reproduce: create api. disable security for an resource. add production endpoint basic auth security deploy and invoke the resource. backend call does not have basic auth header ### Affected Product Version: <!-- Members can use Affected/*** labels --> ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

e840cade2e225ecbca163c832f8c9e0c6dc0a2cb

2c408d34211682eb6e6a0556ee47dd387e1d3ada

https://github.com/wso2/product-microgateway/compare/e840cade2e225ecbca163c832f8c9e0c6dc0a2cb...2c408d34211682eb6e6a0556ee47dd387e1d3ada

diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java index a1687eeb8..d83d0e2c3 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java @@ -37,6 +37,7 @@ import org.wso2.choreo.connect.enforcer.security.jwt.APIKeyAuthenticator; import org.wso2.choreo.connect.enforcer.security.jwt.InternalAPIKeyAuthenticator; import org.wso2.choreo.connect.enforcer.security.jwt.JWTAuthenticator; import org.wso2.choreo.connect.enforcer.security.jwt.UnsecuredAPIAuthenticator; +import org.wso2.choreo.connect.enforcer.util.EndpointSecurityUtils; import org.wso2.choreo.connect.enforcer.util.FilterUtils; import java.util.ArrayList; @@ -153,6 +154,8 @@ public class AuthFilter implements Filter { requestContext.setAuthenticationContext(authenticate); if (authenticate.isAuthenticated()) { updateClusterHeaderAndCheckEnv(requestContext, authenticate); + // set backend security + EndpointSecurityUtils.addEndpointSecurity(requestContext); return new AuthenticationResponse(true, false, false); } diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyAuthenticator.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyAuthenticator.java index 222fb4294..c53c76234 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyAuthenticator.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyAuthenticator.java @@ -43,7 +43,6 @@ import org.wso2.choreo.connect.enforcer.dto.APIKeyValidationInfoDTO; import org.wso2.choreo.connect.enforcer.dto.JWTTokenPayloadInfo; import org.wso2.choreo.connect.enforcer.exception.APISecurityException; import org.wso2.choreo.connect.enforcer.util.BackendJwtUtils; -import org.wso2.choreo.connect.enforcer.util.EndpointSecurityUtils; import org.wso2.choreo.connect.enforcer.util.FilterUtils; import org.wso2.choreo.connect.enforcer.util.JWTUtils; @@ -251,9 +250,6 @@ public class APIKeyAuthenticator extends APIKeyHandler { // Get APIKeyValidationInfoDTO APIKeyValidationInfoDTO apiKeyValidationInfoDTO = getAPIKeyValidationDTO(requestContext, payload); - // Sets endpoint security - EndpointSecurityUtils.addEndpointSecurity(requestContext, apiKeyValidationInfoDTO); - // TODO: Add analytics data processing // Get SignedJWTInfo diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java index 8e6a94053..92469e697 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java @@ -44,7 +44,6 @@ import org.wso2.choreo.connect.enforcer.tracing.TracingSpan; import org.wso2.choreo.connect.enforcer.tracing.TracingTracer; import org.wso2.choreo.connect.enforcer.tracing.Utils; import org.wso2.choreo.connect.enforcer.util.BackendJwtUtils; -import org.wso2.choreo.connect.enforcer.util.EndpointSecurityUtils; import org.wso2.choreo.connect.enforcer.util.FilterUtils; import java.text.ParseException; @@ -210,9 +209,6 @@ public class InternalAPIKeyAuthenticator extends APIKeyHandler { //Get APIKeyValidationInfoDTO for internal key with limited info APIKeyValidationInfoDTO apiKeyValidationInfoDTO = getAPIKeyValidationDTO(requestContext, payload); - // Sets endpoint security - EndpointSecurityUtils.addEndpointSecurity(requestContext, apiKeyValidationInfoDTO); - // Generate or get backend JWT JWTConfigurationDto jwtConfigurationDto = ConfigHolder.getInstance(). getConfig().getJwtConfigurationDto(); diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java index 00439e100..3c31fad10 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java @@ -54,7 +54,6 @@ import org.wso2.choreo.connect.enforcer.tracing.TracingSpan; import org.wso2.choreo.connect.enforcer.tracing.TracingTracer; import org.wso2.choreo.connect.enforcer.tracing.Utils; import org.wso2.choreo.connect.enforcer.util.BackendJwtUtils; -import org.wso2.choreo.connect.enforcer.util.EndpointSecurityUtils; import org.wso2.choreo.connect.enforcer.util.FilterUtils; import org.wso2.choreo.connect.enforcer.util.JWTUtils; @@ -237,9 +236,6 @@ public class JWTAuthenticator implements Authenticator { } log.debug("JWT authentication successful."); - // Set endpoint security - EndpointSecurityUtils.addEndpointSecurity(requestContext, apiKeyValidationInfoDTO); - // Generate or get backend JWT String endUserToken = null; JWTConfigurationDto backendJwtConfig = ConfigHolder.getInstance().getConfig(). diff --git a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/EndpointSecurityUtils.java b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/EndpointSecurityUtils.java index 39b56f5b0..d2d5e05eb 100644 --- a/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/EndpointSecurityUtils.java +++ b/enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/EndpointSecurityUtils.java @@ -21,7 +21,6 @@ package org.wso2.choreo.connect.enforcer.util; import org.wso2.choreo.connect.enforcer.commons.model.RequestContext; import org.wso2.choreo.connect.enforcer.commons.model.SecurityInfo; import org.wso2.choreo.connect.enforcer.constants.APIConstants; -import org.wso2.choreo.connect.enforcer.dto.APIKeyValidationInfoDTO; import java.util.Base64; @@ -34,30 +33,31 @@ public class EndpointSecurityUtils { * Adds the backend endpoint security header to the given requestContext. * * @param requestContext requestContext instance to add the backend endpoint security header - * @param apiKeyValidationInfoDTO apiKeyValidationInfoDTO containing necessary info */ - public static void addEndpointSecurity(RequestContext requestContext, - APIKeyValidationInfoDTO apiKeyValidationInfoDTO) { - SecurityInfo securityInfo; - if (apiKeyValidationInfoDTO.getType() != null && - requestContext.getMatchedAPI().getEndpointSecurity() != null) { - if (apiKeyValidationInfoDTO.getType().equals(APIConstants.API_KEY_TYPE_PRODUCTION)) { + public static void addEndpointSecurity(RequestContext requestContext) { + SecurityInfo securityInfo = null; + String keyType = ""; + if (requestContext.getAuthenticationContext() != null) { + keyType = requestContext.getAuthenticationContext().getKeyType(); + } + if (requestContext.getMatchedAPI().getEndpointSecurity() != null) { + if (APIConstants.API_KEY_TYPE_PRODUCTION.equals(keyType)) { securityInfo = requestContext.getMatchedAPI().getEndpointSecurity(). getProductionSecurityInfo(); } else { securityInfo = requestContext.getMatchedAPI().getEndpointSecurity(). getSandBoxSecurityInfo(); } - if (securityInfo != null && securityInfo.isEnabled() && - APIConstants.AUTHORIZATION_HEADER_BASIC. - equalsIgnoreCase(securityInfo.getSecurityType())) { - requestContext.getRemoveHeaders().remove(APIConstants.AUTHORIZATION_HEADER_DEFAULT - .toLowerCase()); - requestContext.addOrModifyHeaders(APIConstants.AUTHORIZATION_HEADER_DEFAULT, - APIConstants.AUTHORIZATION_HEADER_BASIC + ' ' + - Base64.getEncoder().encodeToString((securityInfo.getUsername() + - ':' + String.valueOf(securityInfo.getPassword())).getBytes())); - } + } + if (securityInfo != null && securityInfo.isEnabled() && + APIConstants.AUTHORIZATION_HEADER_BASIC. + equalsIgnoreCase(securityInfo.getSecurityType())) { + requestContext.getRemoveHeaders().remove(APIConstants.AUTHORIZATION_HEADER_DEFAULT + .toLowerCase()); + requestContext.addOrModifyHeaders(APIConstants.AUTHORIZATION_HEADER_DEFAULT, + APIConstants.AUTHORIZATION_HEADER_BASIC + ' ' + + Base64.getEncoder().encodeToString((securityInfo.getUsername() + + ':' + String.valueOf(securityInfo.getPassword())).getBytes())); } } } diff --git a/integration/mock-backend-server/src/main/java/org/wso2/choreo/connect/mockbackend/MockBackendProd.java b/integration/mock-backend-server/src/main/java/org/wso2/choreo/connect/mockbackend/MockBackendProd.java index 3851bdaf4..4ddf8c491 100644 --- a/integration/mock-backend-server/src/main/java/org/wso2/choreo/connect/mockbackend/MockBackendProd.java +++ b/integration/mock-backend-server/src/main/java/org/wso2/choreo/connect/mockbackend/MockBackendProd.java @@ -291,6 +291,7 @@ public class MockBackendProd extends Thread { // response flow headers to interceptor service // sent request body in response body httpServer.createContext(context + "/echo", Utils::echo); + httpServer.createContext(context + "/echo2", Utils::echo); httpServer.start(); } catch (Exception ex) { diff --git a/integration/test-integration/src/test/java/org/wso2/choreo/connect/tests/testcases/withapim/BackendSecurityTestCase.java b/integration/test-integration/src/test/java/org/wso2/choreo/connect/tests/testcases/withapim/BackendSecurityTestCase.java index ef1d33e75..f25d38fc7 100644 --- a/integration/test-integration/src/test/java/org/wso2/choreo/connect/tests/testcases/withapim/BackendSecurityTestCase.java +++ b/integration/test-integration/src/test/java/org/wso2/choreo/connect/tests/testcases/withapim/BackendSecurityTestCase.java @@ -81,8 +81,15 @@ public class BackendSecurityTestCase extends ApimBaseTest { apiOperation.setTarget("/echo"); apiOperation.setThrottlingPolicy(TestConstant.API_TIER.UNLIMITED); + APIOperationsDTO apiOperation2 = new APIOperationsDTO(); + apiOperation2.setVerb("GET"); + apiOperation2.setTarget("/echo2"); + apiOperation2.setThrottlingPolicy(TestConstant.API_TIER.UNLIMITED); + apiOperation2.setAuthType("None"); + List<APIOperationsDTO> operationsDTOS = new ArrayList<>(); operationsDTOS.add(apiOperation); + operationsDTOS.add(apiOperation2); APIRequest apiRequest = PublisherUtils.createSampleAPIRequest(API_NAME, API_CONTEXT, API_VERSION, user.getUserName()); @@ -102,17 +109,29 @@ public class BackendSecurityTestCase extends ApimBaseTest { Utils.delay(TestConstant.DEPLOYMENT_WAIT_TIME * 2, "Interrupted when waiting for the " + "subscription to be deployed"); + //test 1 - jwt secured resource //Invoke API Map<String, String> headers = new HashMap<>(); headers.put(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken); String endpoint = Utils.getServiceURLHttps(API_CONTEXT + "/1.0.0/echo"); HttpResponse response = HttpsClientRequest.doGet(endpoint, headers); - Assert.assertNotNull(response, "Error occurred while invoking the endpoint " + endpoint + " HttpResponse "); + Assert.assertNotNull(response, "Error occurred while invoking the endpoint " + endpoint); // test headers Map<String, String> respHeaders = response.getHeaders(); Assert.assertTrue(respHeaders.containsKey("authorization"), "Backend did not receive auth header"); Assert.assertEquals(respHeaders.get("authorization"), "Basic YWRtaW46YWRtaW4=", "backend basic auth header is incorrect"); + + //test 2 - invoke non secured resource + endpoint = Utils.getServiceURLHttps(API_CONTEXT + "/1.0.0/echo2"); + response = HttpsClientRequest.doGet(endpoint); + Assert.assertNotNull(response, "Error occurred while invoking the endpoint " + endpoint); + + // test headers + respHeaders = response.getHeaders(); + Assert.assertTrue(respHeaders.containsKey("authorization"), "Backend did not receive auth header"); + Assert.assertEquals(respHeaders.get("authorization"), "Basic YWRtaW46YWRtaW4=", + "backend basic auth header is incorrect"); } }

['enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/APIKeyAuthenticator.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/InternalAPIKeyAuthenticator.java', 'integration/mock-backend-server/src/main/java/org/wso2/choreo/connect/mockbackend/MockBackendProd.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/util/EndpointSecurityUtils.java', 'integration/test-integration/src/test/java/org/wso2/choreo/connect/tests/testcases/withapim/BackendSecurityTestCase.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java', 'enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/jwt/JWTAuthenticator.java']

{'.java': 7}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

wso2/product-microgateway/2438/2439

wso2

product-microgateway

https://github.com/wso2/product-microgateway/issues/2439

https://github.com/wso2/product-microgateway/pull/2438

https://github.com/wso2/product-microgateway/pull/2438

fixes

PathParameters does not resolve if the rawPath contains a trailing slash

### Description: If there is a path called `/pet/{petId}` and the inbound request has `/pet/2/`. Due to trailing slash, the path parameters are not resolved for the usage of custom filters. And following error log also getting printed. ``` PathTemplate and RawPath is mismatched. ``` ### Steps to reproduce: Refer to the description. ### Affected Product Version: Choreo-Connect-1.0.0-alpha ### Environment details (with versions): - OS: - Client: - Env (Docker/K8s): --- ### Optional Fields #### Related Issues: <!-- Any related issues from this/other repositories--> #### Suggested Labels: <!--Only to be used by non-members--> #### Suggested Assignees: <!--Only to be used by non-members-->

aa0cde140e39ce785d7355d67b1ec979ddf269b6

9037df6cec519f8abd3c1ac4653de836948752ae

https://github.com/wso2/product-microgateway/compare/aa0cde140e39ce785d7355d67b1ec979ddf269b6...9037df6cec519f8abd3c1ac4653de836948752ae

diff --git a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/ParameterResolver.java b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/ParameterResolver.java index 4ae2c4c83..1ba41f305 100644 --- a/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/ParameterResolver.java +++ b/enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/ParameterResolver.java @@ -29,14 +29,16 @@ import java.util.regex.Pattern; class ParameterResolver { - private static final Pattern PARAMETER_PATTERN = Pattern.compile("(\\\\{[a-zA-Z]+\\\\})"); + private static final Pattern PARAMETER_PATTERN = Pattern.compile("(\\\\{[a-zA-Z0-9]+[a-z-_A-Z0-9]*\\\\})"); private static final Logger logger = LogManager.getLogger(ParameterResolver.class); private final List<String> parameterNames = new ArrayList<>(); private final Pattern pattern; public ParameterResolver(final String parameterTemplate) { - - final Matcher matcher = PARAMETER_PATTERN.matcher(parameterTemplate); + // This formatting is required since /foo and /foo/ are considered to be equal + String formattedPathParamTemplate = parameterTemplate.endsWith("/") ? + parameterTemplate.substring(0, parameterTemplate.length() - 1) : parameterTemplate; + final Matcher matcher = PARAMETER_PATTERN.matcher(formattedPathParamTemplate); while (matcher.find()) { if (matcher.groupCount() == 1) { @@ -55,7 +57,10 @@ class ParameterResolver { } public Map<String, String> parametersByName(final String uriString) throws IllegalArgumentException { - final Matcher matcher = pattern.matcher(uriString); + // This formatting is required since /foo and /foo/ are considered to be equal + String formattedURI = uriString.endsWith("/") ? + uriString.substring(0, uriString.length() - 1) : uriString; + final Matcher matcher = pattern.matcher(formattedURI); if (!matcher.matches()) { // Unlikely to occur as this pair is already matched within router. logger.error("PathTemplate and RawPath is mismatched."); diff --git a/enforcer-parent/commons/src/test/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContextTest.java b/enforcer-parent/commons/src/test/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContextTest.java index 4b6263f0a..6c9e4fe31 100644 --- a/enforcer-parent/commons/src/test/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContextTest.java +++ b/enforcer-parent/commons/src/test/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContextTest.java @@ -38,6 +38,36 @@ public class RequestContextTest { "statusType", "available"); } + @Test + public void testPathParametersWithTrailingSlashInTemplate() { + testPathParamValues("/v2/pet/12/status/available", "/v2", "/pet/{petId}/status/{statusType}/", + "petId", "12"); + } + + @Test + public void testPathParametersWithTrailingSlashInRawPath() { + testPathParamValues("/v2/pet/12/status/available/", "/v2", "/pet/{petId}/status/{statusType}", + "petId", "12"); + } + + @Test + public void testPathParametersWithHyphen() { + testPathParamValues("/v2/pet/12/status/available", "/v2", "/pet/{pet-Id}/status/{statusType}", + "pet-Id", "12"); + } + + @Test + public void testPathParametersWithUnderscore() { + testPathParamValues("/v2/pet/12/status/available", "/v2", "/pet/{pet_Id}/status/{statusType}", + "pet_Id", "12"); + } + + @Test + public void testPathParametersWithNumbers() { + testPathParamValues("/v2/pet/12/status/available", "/v2", "/pet/{petId2}/status/{statusType}", + "petId2", "12"); + } + @Test public void testPathParameterGenerationWithWildcard() { testPathParamValues("/v2/pet/12/2/random/random2", "/v2", "/pet/{petId}/{imageId}/*",

['enforcer-parent/commons/src/main/java/org/wso2/choreo/connect/enforcer/commons/model/ParameterResolver.java', 'enforcer-parent/commons/src/test/java/org/wso2/choreo/connect/enforcer/commons/model/RequestContextTest.java']

{'.java': 2}

Java

{'Java': 2861210, 'Go': 979303, 'Lua': 49518, 'Shell': 37030, 'C++': 27281, 'Dockerfile': 16279, 'HTML': 5630, 'Starlark': 2894, 'Jinja': 1646, 'Open Policy Agent': 539}

Apache License 2.0

dbs-leipzig/gradoop/803/802

dbs-leipzig

gradoop

https://github.com/dbs-leipzig/gradoop/issues/802

https://github.com/dbs-leipzig/gradoop/pull/803

https://github.com/dbs-leipzig/gradoop/pull/803

fixes

PropertyValue returns wrong types

The function PropertyValue.getType() returns the wrong objects for the following types: - `TYPE_LIST` - `TYPE_DATE` - `TYPE_TIME` - `TYPE_DATETIME` Fix bug and add unit tests for this function.

6fe007fe705845b1f9ce0857c1149932c06e20d6

632f79428658c49206d1295c7cf4760266a7ab1b

https://github.com/dbs-leipzig/gradoop/compare/6fe007fe705845b1f9ce0857c1149932c06e20d6...632f79428658c49206d1295c7cf4760266a7ab1b

diff --git a/gradoop-common/src/main/java/org/gradoop/common/model/impl/properties/PropertyValue.java b/gradoop-common/src/main/java/org/gradoop/common/model/impl/properties/PropertyValue.java index 8e0d06c20d4..6ed36757fd1 100644 --- a/gradoop-common/src/main/java/org/gradoop/common/model/impl/properties/PropertyValue.java +++ b/gradoop-common/src/main/java/org/gradoop/common/model/impl/properties/PropertyValue.java @@ -41,6 +41,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Collections; /** * Represents a single property value in the EPGM. @@ -137,6 +138,11 @@ public class PropertyValue implements Value, Serializable, Comparable<PropertyVa */ private static final long serialVersionUID = 1L; + /** + * Mapping from byte value to associated Class + */ + private static final Map<Byte, Class> TYPE_MAPPING = getTypeMap(); + /** * Stores the type and the value */ @@ -723,21 +729,36 @@ public class PropertyValue implements Value, Serializable, Comparable<PropertyVa // Util //---------------------------------------------------------------------------- + /** + * Get the data type as class object according to the first position of the rawBytes[] array + * + * @return Class object + */ public Class<?> getType() { - return rawBytes[0] == TYPE_BOOLEAN ? - Boolean.class : rawBytes[0] == TYPE_INTEGER ? - Integer.class : rawBytes[0] == TYPE_LONG ? - Long.class : rawBytes[0] == TYPE_FLOAT ? - Float.class : rawBytes[0] == TYPE_DOUBLE ? - Double.class : rawBytes[0] == TYPE_STRING ? - String.class : rawBytes[0] == TYPE_BIG_DECIMAL ? - BigDecimal.class : rawBytes[0] == TYPE_GRADOOP_ID ? - GradoopId.class : rawBytes[0] == TYPE_MAP ? - Map.class : rawBytes[0] == TYPE_LIST ? - LocalDate.class : rawBytes[0] == TYPE_DATE ? - LocalTime.class : rawBytes[0] == TYPE_TIME ? - LocalDateTime.class : rawBytes[0] == TYPE_DATETIME ? - List.class : null; + return TYPE_MAPPING.get(rawBytes[0]); + } + + /** + * Creates a type mapping HashMap to assign a byte value to its represented Class + * + * @return a Map with byte to class assignments + */ + private static Map<Byte, Class> getTypeMap() { + Map<Byte, Class> map = new HashMap<>(); + map.put(TYPE_BOOLEAN, Boolean.class); + map.put(TYPE_INTEGER, Integer.class); + map.put(TYPE_LONG, Long.class); + map.put(TYPE_FLOAT, Float.class); + map.put(TYPE_DOUBLE, Double.class); + map.put(TYPE_STRING, String.class); + map.put(TYPE_BIG_DECIMAL, BigDecimal.class); + map.put(TYPE_GRADOOP_ID, GradoopId.class); + map.put(TYPE_MAP, Map.class); + map.put(TYPE_LIST, List.class); + map.put(TYPE_DATE, LocalDate.class); + map.put(TYPE_TIME, LocalTime.class); + map.put(TYPE_DATETIME, LocalDateTime.class); + return Collections.unmodifiableMap(map); } public int getByteSize() { diff --git a/gradoop-common/src/test/java/org/gradoop/common/model/impl/properties/PropertyValueTest.java b/gradoop-common/src/test/java/org/gradoop/common/model/impl/properties/PropertyValueTest.java index 988b8da4303..f3b81a48623 100644 --- a/gradoop-common/src/test/java/org/gradoop/common/model/impl/properties/PropertyValueTest.java +++ b/gradoop-common/src/test/java/org/gradoop/common/model/impl/properties/PropertyValueTest.java @@ -898,6 +898,52 @@ public class PropertyValueTest { p = create(DATETIME_VAL_d); assertEquals(p, writeAndReadFields(PropertyValue.class, p)); } + + @Test + public void testGetType() { + PropertyValue p = create(NULL_VAL_0); + assertNull(p.getType()); + + p = create(BOOL_VAL_1); + assertEquals(Boolean.class, p.getType()); + + p = create(INT_VAL_2); + assertEquals(Integer.class, p.getType()); + + p = create(LONG_VAL_3); + assertEquals(Long.class, p.getType()); + + p = create(FLOAT_VAL_4); + assertEquals(Float.class, p.getType()); + + p = create(DOUBLE_VAL_5); + assertEquals(Double.class, p.getType()); + + p = create(STRING_VAL_6); + assertEquals(String.class, p.getType()); + + p = create(BIG_DECIMAL_VAL_7); + assertEquals(BigDecimal.class, p.getType()); + + p = create(GRADOOP_ID_VAL_8); + assertEquals(GradoopId.class, p.getType()); + + p = create(MAP_VAL_9); + assertEquals(Map.class, p.getType()); + + p = create(LIST_VAL_a); + assertEquals(List.class, p.getType()); + + p = create(DATE_VAL_b); + assertEquals(LocalDate.class, p.getType()); + + p = create(TIME_VAL_c); + assertEquals(LocalTime.class, p.getType()); + + p = create(DATETIME_VAL_d); + assertEquals(LocalDateTime.class, p.getType()); + } + /** * Assumes that p1 == p2 < p3 */

['gradoop-common/src/test/java/org/gradoop/common/model/impl/properties/PropertyValueTest.java', 'gradoop-common/src/main/java/org/gradoop/common/model/impl/properties/PropertyValue.java']

{'.java': 2}

Java

{'Java': 6591650, 'Shell': 2289}

Apache License 2.0

dbs-leipzig/gradoop/787/786

dbs-leipzig

gradoop

https://github.com/dbs-leipzig/gradoop/issues/786

https://github.com/dbs-leipzig/gradoop/pull/787

https://github.com/dbs-leipzig/gradoop/pull/787

fixes

Overlap operator does not consider the edges of the second graph

Graph 1 : `(A)-[message]->(B)-[message]->(C)` Graph 2: `(A)-[like]->(B)-[message]->(C)` Gaph1.overlap(Gaph2) returns the graph: `(A)-[message]->(B)-[message]->(C)` which is not the graph I expected. In my opinion the proper result should be a overlap of vertices AND edges: `(A) (B)-[message]->(C)` The edge `(A)-[message]->(B)` does not occur in both graphs, but only in the first one. The following code of the function Overlap.execute() is one solution approach. I join the edge-set of the second graph on the edge-set of the first graph: ``` public class Overlap [...] { public LogicalGraph execute(LogicalGraph firstGraph, LogicalGraph secondGraph) { [...] DataSet<Edge> newEdges = firstGraph.getEdges() .join(secondGraph.getEdges()) .where(new Id<>()) .equalTo(new Id<>()) .with(new LeftSide<>()); [...] } } ``` Related: #687 Also a UnitTest for this case should be added.

0b27a64617966f478a6b0557e1b131aeb98238ce

a527afac168b0ed1fd0f1c87ba1154a7eb0322b0

https://github.com/dbs-leipzig/gradoop/compare/0b27a64617966f478a6b0557e1b131aeb98238ce...a527afac168b0ed1fd0f1c87ba1154a7eb0322b0

diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/overlap/Overlap.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/overlap/Overlap.java index 83d1126b6a1..db1ba1594e3 100644 --- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/overlap/Overlap.java +++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/overlap/Overlap.java @@ -21,8 +21,6 @@ import org.gradoop.common.model.impl.pojo.Vertex; import org.gradoop.flink.model.api.epgm.LogicalGraph; import org.gradoop.flink.model.api.operators.BinaryGraphToGraphOperator; import org.gradoop.flink.model.impl.functions.epgm.Id; -import org.gradoop.flink.model.impl.functions.epgm.SourceId; -import org.gradoop.flink.model.impl.functions.epgm.TargetId; import org.gradoop.flink.model.impl.functions.utils.LeftSide; /** @@ -50,12 +48,8 @@ public class Overlap implements BinaryGraphToGraphOperator { .with(new LeftSide<>()); DataSet<Edge> newEdges = firstGraph.getEdges() - .join(newVertices) - .where(new SourceId<>()) - .equalTo(new Id<>()) - .with(new LeftSide<>()) - .join(newVertices) - .where(new TargetId<>()) + .join(secondGraph.getEdges()) + .where(new Id<>()) .equalTo(new Id<>()) .with(new LeftSide<>()); diff --git a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/operators/overlap/OverlapTest.java b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/operators/overlap/OverlapTest.java index 61d9385248c..da1fd1575b5 100644 --- a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/operators/overlap/OverlapTest.java +++ b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/operators/overlap/OverlapTest.java @@ -105,6 +105,19 @@ public class OverlapTest extends ReducibleBinaryOperatorsTestBase { collectAndAssertTrue(derivedGraph1.overlap(derivedGraph2).equalsByElementIds(expected)); } + @Test + public void testVertexOnlyOverlappingGraphs() throws Exception { + FlinkAsciiGraphLoader loader = getLoaderFromString( + "g1[(a)-[e1]->(b)]" + + "g2[(a)-[e2]->(b)]" + + "expected[(a)(b)]"); + LogicalGraph g1 = loader.getLogicalGraphByVariable("g1"); + LogicalGraph g2 = loader.getLogicalGraphByVariable("g2"); + LogicalGraph expected = loader.getLogicalGraphByVariable("expected"); + + collectAndAssertTrue(g1.overlap(g2).equalsByElementIds(expected)); + } + @Test public void testGraphContainment() throws Exception { FlinkAsciiGraphLoader loader = getSocialNetworkLoader(); @@ -156,8 +169,10 @@ public class OverlapTest extends ReducibleBinaryOperatorsTestBase { @Test public void testReduceCollection() throws Exception { FlinkAsciiGraphLoader loader = getLoaderFromString("" + - "g1[(a)-[e1]->(b)];g2[(b)-[e2]->(c)]" + - "g3[(c)-[e3]->(d)];g4[(a)-[e1]->(b)]" + + "g1[(a)-[e1]->(b)]" + + "g2[(b)-[e2]->(c)]" + + "g3[(c)-[e3]->(d)]" + + "g4[(a)-[e1]->(b)]" + "exp12[(b)]" + "exp13[]" + "exp14[(a)-[e1]->(b)]"

['gradoop-flink/src/test/java/org/gradoop/flink/model/impl/operators/overlap/OverlapTest.java', 'gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/overlap/Overlap.java']

{'.java': 2}

Java

{'Java': 6591650, 'Shell': 2289}

Apache License 2.0

cloudslang/cloud-slang/370/199

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/199

https://github.com/CloudSlang/cloud-slang/pull/370

https://github.com/CloudSlang/cloud-slang/pull/370#issuecomment-121254894

fixes

Uninformative error message in CLI when missing spaces before 'required' keyword

When there are missing spaces before input's 'required' keyword, for example: flow: inputs: - input: required: true and trying to run the flow in the CLI, you get an uninformative error message: Command failed java.lang.RuntimeException: java.lang.RuntimeException: Error transforming source: flow_with_required_input.sl to a Slang model. null

847c906f25e97c48a9058c653eca079659fe3e42

d232e7828e7a803967f05215517891c75e2f0797

https://github.com/cloudslang/cloud-slang/compare/847c906f25e97c48a9058c653eca079659fe3e42...d232e7828e7a803967f05215517891c75e2f0797

diff --git a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/modeller/transformers/AbstractInputsTransformer.java b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/modeller/transformers/AbstractInputsTransformer.java index 5f92c01c4..1da4637a7 100644 --- a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/modeller/transformers/AbstractInputsTransformer.java +++ b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/modeller/transformers/AbstractInputsTransformer.java @@ -34,7 +34,7 @@ public abstract class AbstractInputsTransformer { Map.Entry<String, ?> entry = ((Map<String, ?>) rawInput).entrySet().iterator().next(); Object entryValue = entry.getValue(); if(entryValue == null){ - throw new RuntimeException("Could not transform Input : " + rawInput + " Since it has a null value"); + throw new RuntimeException("Could not transform Input : " + rawInput + " Since it has a null value.\\n\\nMake sure a value is specified or that indentation is properly done."); } if (entryValue instanceof Map) { // - some_inputs:

['cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/modeller/transformers/AbstractInputsTransformer.java']

{'.java': 1}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/869/868

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/868

https://github.com/CloudSlang/cloud-slang/pull/869

https://github.com/CloudSlang/cloud-slang/pull/869

fixes

False validation error

if an input has the tag private: true, it should not be accessible to the user at runtime: > 11:36:02 [ERROR] Failed to extract metadata for file: 'c:\\Users\\moldovas\\cloudslang\\cloud-slang-content\\content\\io\\cloudslang\\base\\datetime\\get_time.sl'. > Error for executable io.cloudslang.base.datetime.get_time: Input 'localeLang' is missing description. > > ``` > - localeLang: > default: ${get("locale_lang", "en")} > private: true > ```

70d43050c2f180b18170be7135e85e939f8405ce

5b1aadbf21f9837d2cd7edaf0fa445af6149d41e

https://github.com/cloudslang/cloud-slang/compare/70d43050c2f180b18170be7135e85e939f8405ce...5b1aadbf21f9837d2cd7edaf0fa445af6149d41e

diff --git a/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/validation/StaticValidatorImpl.java b/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/validation/StaticValidatorImpl.java index ed6f7ca2f..55bb76bc6 100644 --- a/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/validation/StaticValidatorImpl.java +++ b/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/validation/StaticValidatorImpl.java @@ -13,6 +13,7 @@ import io.cloudslang.lang.compiler.Extension; import io.cloudslang.lang.compiler.modeller.model.Executable; import io.cloudslang.lang.compiler.modeller.model.Metadata; import io.cloudslang.lang.entities.bindings.InOutParam; +import io.cloudslang.lang.entities.bindings.Input; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang.Validate; import org.springframework.stereotype.Component; @@ -55,7 +56,8 @@ public class StaticValidatorImpl implements StaticValidator { for (InOutParam inOutParam : ListUtils.emptyIfNull(inOutParams)) { if (metadataInOutParams == null) { throw new MetadataMissingException(errorMessagePrefix + "s are missing description entirely."); - } else if (metadataInOutParams.get(inOutParam.getName()) == null) { + } else if (metadataInOutParams.get(inOutParam.getName()) == null && + (!(inOutParam instanceof Input) || !((Input) inOutParam).isPrivateInput())) { throw new MetadataMissingException(errorMessagePrefix + " '" + inOutParam.getName() + "' is missing description."); } } diff --git a/cloudslang-content-verifier/src/test/java/io/cloudslang/lang/tools/build/validation/StaticValidatorTest.java b/cloudslang-content-verifier/src/test/java/io/cloudslang/lang/tools/build/validation/StaticValidatorTest.java index 55c8f0caf..75608c5d1 100644 --- a/cloudslang-content-verifier/src/test/java/io/cloudslang/lang/tools/build/validation/StaticValidatorTest.java +++ b/cloudslang-content-verifier/src/test/java/io/cloudslang/lang/tools/build/validation/StaticValidatorTest.java @@ -54,7 +54,8 @@ public class StaticValidatorTest { List<Input> inputList = Lists.newArrayList(new Input.InputBuilder("input1", "value1").build(), new Input.InputBuilder("input2", "value2").build(), new Input.InputBuilder("input3", "value3").build()); - Flow newExecutable = new Flow(null, null, null, "no_dependencies", "empty_flow", inputList, null, null, new HashSet<String>(), SYSTEM_PROPERTY_DEPENDENCIES); + Flow newExecutable = new Flow(null, null, null, "no_dependencies", "empty_flow", inputList, null, null, + new HashSet<String>(), SYSTEM_PROPERTY_DEPENDENCIES); Metadata metadata = new Metadata(); Map<String, String> inputMap = new HashMap<>(); inputMap.put("input1", "description1"); @@ -63,7 +64,25 @@ public class StaticValidatorTest { exception.expect(RuntimeException.class); exception.expectMessage("Error for executable no_dependencies.empty_flow: Input 'input3' is missing description."); - staticValidator.validateSlangFile(new File(getClass().getResource("/no_dependencies/empty_flow.sl").toURI()), newExecutable, metadata, true); + staticValidator.validateSlangFile(new File(getClass().getResource("/no_dependencies/empty_flow.sl").toURI()), + newExecutable, metadata, true); + } + + @Test + public void missingDescriptionForPrivateInputInput() throws URISyntaxException { + List<Input> inputList = Lists.newArrayList(new Input.InputBuilder("input1", "value1").build(), + new Input.InputBuilder("input2", "value2").build(), + new Input.InputBuilder("input3", "value3").withPrivateInput(true).build()); + Flow newExecutable = new Flow(null, null, null, "no_dependencies", "empty_flow", inputList, null, null, + new HashSet<String>(), SYSTEM_PROPERTY_DEPENDENCIES); + Metadata metadata = new Metadata(); + Map<String, String> inputMap = new HashMap<>(); + inputMap.put("input1", "description1"); + inputMap.put("input2", "description2"); + metadata.setInputs(inputMap); + + staticValidator.validateSlangFile(new File(getClass().getResource("/no_dependencies/empty_flow.sl").toURI()), + newExecutable, metadata, true); } @Test

['cloudslang-content-verifier/src/test/java/io/cloudslang/lang/tools/build/validation/StaticValidatorTest.java', 'cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/validation/StaticValidatorImpl.java']

{'.java': 2}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/957/956

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/956

https://github.com/CloudSlang/cloud-slang/pull/957

https://github.com/CloudSlang/cloud-slang/pull/957

fixes

CLI compile folders

`compile dir_with_no_sl_files` --> NPE compile description says `--f ...` <-- should be updated to `--d`

542fca98f64398385726a81f29ce55419d206129

d611268b66a76eb27258717238591ed7529f497a

https://github.com/cloudslang/cloud-slang/compare/542fca98f64398385726a81f29ce55419d206129...d611268b66a76eb27258717238591ed7529f497a

diff --git a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCli.java b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCli.java index f1eba947f..fcd1360f7 100644 --- a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCli.java +++ b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCli.java @@ -23,17 +23,6 @@ import io.cloudslang.lang.runtime.events.LanguageEventData; import io.cloudslang.score.events.EventConstants; import io.cloudslang.score.events.ScoreEvent; import io.cloudslang.score.events.ScoreEventListener; - -import java.io.File; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang.time.StopWatch; @@ -46,6 +35,15 @@ import org.springframework.shell.core.annotation.CliOption; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; +import java.io.File; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author lesant @@ -150,9 +148,11 @@ public class SlangCli implements CommandMarker { @CliCommand(value = "compile", help = "Display compile errors for an executable") public String compileSource( - @CliOption(key = {"", "d", "directory"}, mandatory = false, help = FILE_HELP) + @CliOption(key = {"", "d", "directory"}, mandatory = false, + help = "Path to directory. e.g. compile --d c:/.../your_directory") final List<String> directories, - @CliOption(key = {"", "f", "file"}, mandatory = false, help = FILE_HELP) final File file, + @CliOption(key = {"", "f", "file"}, mandatory = false, + help = "Path to filename. e.g. compile --f c:/.../your_flow.sl") final File file, @CliOption(key = {"cp", "classpath"}, mandatory = false, help = CLASSPATH_HELP) final List<String> classPath ) { @@ -169,17 +169,21 @@ public class SlangCli implements CommandMarker { } private String printAllCompileErrors(List<CompilationModellingResult> results) { - StringBuilder stringBuilder = new StringBuilder(); - for (CompilationModellingResult result : results) { - printCompileErrors(result.getErrors(), result.getFile(), stringBuilder); - stringBuilder.append(System.lineSeparator()); + if (results.size() > 0) { + StringBuilder stringBuilder = new StringBuilder(); + for (CompilationModellingResult result : results) { + printCompileErrors(result.getErrors(), result.getFile(), stringBuilder); + stringBuilder.append(System.lineSeparator()); + } + return stringBuilder.toString(); + } else { + return "No files were found to compile."; } - return stringBuilder.toString(); } private String printCompileErrors(List<RuntimeException> exceptions, File file, StringBuilder stringBuilder) { if (exceptions.size() > 0) { - stringBuilder.append("Following exceptions were found:" + System.lineSeparator()); + stringBuilder.append("Following exceptions were found:").append(System.lineSeparator()); for (RuntimeException exception : exceptions) { stringBuilder.append("\\t"); stringBuilder.append(exception.getClass()); @@ -189,7 +193,7 @@ public class SlangCli implements CommandMarker { } throw new RuntimeException(stringBuilder.toString()); } else { - stringBuilder.append("Compilation was successful for " + file.getName()); + stringBuilder.append("Compilation was successful for ").append(file.getName()); } return StringUtils.trim(stringBuilder.toString()); } @@ -215,7 +219,7 @@ public class SlangCli implements CommandMarker { if (CollectionUtils.isEmpty(systemProperties)) { stringBuilder.append("No system properties found."); } else { - stringBuilder.append("Following system properties were loaded:" + System.lineSeparator()); + stringBuilder.append("Following system properties were loaded:").append(System.lineSeparator()); for (SystemProperty systemProperty : systemProperties) { stringBuilder.append("\\t"); stringBuilder.append(systemProperty.getFullyQualifiedName()); diff --git a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/ConsolePrinterImpl.java b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/ConsolePrinterImpl.java index b7bd94af8..e2a02703b 100644 --- a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/ConsolePrinterImpl.java +++ b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/ConsolePrinterImpl.java @@ -48,7 +48,9 @@ public class ConsolePrinterImpl implements ConsolePrinter, DisposableBean { @Override public synchronized void waitForAllPrintTasksToFinish() { try { - lastTask.get(1, TimeUnit.MINUTES); + if (lastTask != null) { + lastTask.get(1, TimeUnit.MINUTES); + } } catch (InterruptedException | ExecutionException | TimeoutException ignore) { } } diff --git a/cloudslang-cli/src/test/java/io/cloudslang/lang/cli/services/ConsolePrinterImplTest.java b/cloudslang-cli/src/test/java/io/cloudslang/lang/cli/services/ConsolePrinterImplTest.java index f13ee6c0f..a40846279 100644 --- a/cloudslang-cli/src/test/java/io/cloudslang/lang/cli/services/ConsolePrinterImplTest.java +++ b/cloudslang-cli/src/test/java/io/cloudslang/lang/cli/services/ConsolePrinterImplTest.java @@ -42,6 +42,7 @@ import static org.mockito.Mockito.when; public class ConsolePrinterImplTest { private static final String SINGLE_THREAD_EXECUTOR = "singleThreadExecutor"; + public static final String LAST_TASK = "lastTask"; @InjectMocks @Spy @@ -96,6 +97,21 @@ public class ConsolePrinterImplTest { verify(lastTask, times(1)).get(1, TimeUnit.MINUTES); } + @Test + public void testNullPointerExceptionNotThrown() throws NoSuchFieldException, IllegalAccessException { + ConsolePrinterImpl consolePrinter = new ConsolePrinterImpl(); + consolePrinter.initialize(); + + Class<? extends ConsolePrinterImpl> consolePrinterClass = consolePrinter.getClass(); + Field consolePrinterClassDeclaredField = consolePrinterClass.getDeclaredField(LAST_TASK); + + consolePrinterClassDeclaredField.setAccessible(true); + Object lastTask = consolePrinterClassDeclaredField.get(consolePrinter); + assertNull(lastTask); + + consolePrinter.waitForAllPrintTasksToFinish(); + } + @Test public void testConsolePrint() throws Exception { final List<Runnable> runnableList = new ArrayList<>();

['cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/ConsolePrinterImpl.java', 'cloudslang-cli/src/test/java/io/cloudslang/lang/cli/services/ConsolePrinterImplTest.java', 'cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCli.java']

{'.java': 3}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/479/331

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/331

https://github.com/CloudSlang/cloud-slang/pull/479

https://github.com/CloudSlang/cloud-slang/pull/479

fixes

CLI log: Missing CALL_ARGUMENTS for Python action [1]

Observed the following in CLI log: Java action - call arguments logged: ``` STEP_TYPE=ACTION, STEP_NAME=null, TYPE=EVENT_ACTION_START, CALL_ARGUMENTS={characterSet=UTF-8, agentForwarding=null, command=docker ps -a, timeout=600000, password=null, pty=false, privateKeyFile=c:/.../id_rsa, port=22, host=111.111.111.111, arguments=null, closeSession=false, username=core} ``` Python action - call arguments not logged: ``` STEP_TYPE=ACTION, STEP_NAME=null, TYPE=EVENT_ACTION_START, CALL_ARGUMENTS={} ``` however there are inputs declared in the operation. Shouldn't call arguments appear in the log also for Python actions (EVENT_ACTION_START events)?

b57a401b31e480701af163aec446c0dfb0c6ede2

c1ec95f59f4c904eed6bd03915a553d1bfbac616

https://github.com/cloudslang/cloud-slang/compare/b57a401b31e480701af163aec446c0dfb0c6ede2...c1ec95f59f4c904eed6bd03915a553d1bfbac616

diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java index 41527a5ae..a35b5371a 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java @@ -152,4 +152,9 @@ public class LanguageEventData extends HashMap<String, Serializable> { public void setAsyncLoopBoundExpression(List<Serializable> asyncLoopBoundExpression) { put(BOUND_ASYNC_LOOP_EXPRESSION, (Serializable) asyncLoopBoundExpression); } + + public Map<String, Serializable> getCallArguments() {return (Map<String, Serializable>) get(CALL_ARGUMENTS);} + + public void setCallArguments(Map<String, Serializable> callArguments) {put(CALL_ARGUMENTS, (Serializable) callArguments); + } } diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java index 26d305fa5..18b57da47 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java @@ -17,11 +17,12 @@ import io.cloudslang.lang.entities.ScoreLangConstants; import io.cloudslang.lang.runtime.env.ReturnValues; import io.cloudslang.lang.runtime.env.RunEnvironment; import io.cloudslang.lang.runtime.events.LanguageEventData; +import io.cloudslang.score.api.execution.ExecutionParametersConsts; +import io.cloudslang.score.lang.ExecutionRuntimeServices; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.SerializationUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.log4j.Logger; -import io.cloudslang.score.api.execution.ExecutionParametersConsts; -import io.cloudslang.score.lang.ExecutionRuntimeServices; import org.python.core.*; import org.python.util.PythonInterpreter; import org.springframework.beans.factory.annotation.Autowired; @@ -30,11 +31,7 @@ import org.springframework.stereotype.Component; import java.io.Serializable; import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import static io.cloudslang.score.api.execution.ExecutionParametersConsts.EXECUTION_RUNTIME_SERVICES; @@ -63,10 +60,16 @@ public class ActionSteps extends AbstractSteps { Map<String, Serializable> returnValue = new HashMap<>(); Map<String, Serializable> callArguments = runEnv.removeCallArguments(); + Map<String, Serializable> callArgumentsDeepCopy = new HashMap<>(); + + for (Map.Entry<String, Serializable> entry : callArguments.entrySet()) { + callArgumentsDeepCopy.put(entry.getKey(), SerializationUtils.clone(entry.getValue())); + } + Map<String, SerializableSessionObject> serializableSessionData = runEnv.getSerializableDataMap(); fireEvent(executionRuntimeServices, ScoreLangConstants.EVENT_ACTION_START, "Preparing to run action " + actionType, runEnv.getExecutionPath().getParentPath(), LanguageEventData.StepType.ACTION, null, - Pair.of(LanguageEventData.CALL_ARGUMENTS, (Serializable) callArguments)); + Pair.of(LanguageEventData.CALL_ARGUMENTS, (Serializable) callArgumentsDeepCopy)); try { switch (actionType) { case JAVA: diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java index 721c7fa60..ec74928df 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java @@ -15,6 +15,7 @@ import com.hp.oo.sdk.content.plugin.SerializableSessionObject; import io.cloudslang.lang.entities.ScoreLangConstants; import io.cloudslang.lang.runtime.env.RunEnvironment; import io.cloudslang.lang.runtime.env.ReturnValues; +import io.cloudslang.lang.runtime.events.LanguageEventData; import org.junit.Assert; import io.cloudslang.score.api.execution.ExecutionParametersConsts; import io.cloudslang.score.events.ScoreEvent; @@ -135,6 +136,68 @@ public class ActionStepsTest { Assert.assertNotNull(actionEndEvent); } + @Test + public void doActionPythonActionCheckCallArgumentsOnEvent() { + //prepare doAction arguments + RunEnvironment runEnv = new RunEnvironment(); + ExecutionRuntimeServices runtimeServices = new ExecutionRuntimeServices(); + + Map<String, Serializable> callArguments = new HashMap<>(); + callArguments.put("index", 1); + runEnv.putCallArguments(callArguments); + + String userPythonScript = "var= \\"hello\\""; + + //invoke doAction + actionSteps.doAction(runEnv,new HashMap<String, Object>(), PYTHON, "", "", runtimeServices, userPythonScript, 2L, "operationName"); + + Collection<ScoreEvent> events = runtimeServices.getEvents(); + + Assert.assertFalse(events.isEmpty()); + ScoreEvent eventActionStart = null; + for(ScoreEvent event:events){ + if(event.getEventType().equals(ScoreLangConstants.EVENT_ACTION_START)){ + eventActionStart = event; + break; + } + } + + Assert.assertNotNull(eventActionStart); + LanguageEventData data = (LanguageEventData)eventActionStart.getData(); + Map<String, Serializable> actualCallArguments = data.getCallArguments(); + Assert.assertEquals("Python action call arguments are not as expected", callArguments, actualCallArguments); + } + + @Test + public void doActionJavaActionCheckCallArgumentsOnEvent() { + //prepare doAction arguments + RunEnvironment runEnv = new RunEnvironment(); + ExecutionRuntimeServices runtimeServices = new ExecutionRuntimeServices(); + + Map<String, Serializable> callArguments = new HashMap<>(); + callArguments.put("index", 1); + runEnv.putCallArguments(callArguments); + + //invoke doAction + actionSteps.doAction(runEnv, new HashMap<String, Object>(), JAVA, ContentTestActions.class.getName(), "doJavaSampleAction", runtimeServices, null, 2L, "operationName"); + + Collection<ScoreEvent> events = runtimeServices.getEvents(); + + Assert.assertFalse(events.isEmpty()); + ScoreEvent eventActionStart = null; + for(ScoreEvent event:events){ + if(event.getEventType().equals(ScoreLangConstants.EVENT_ACTION_START)){ + eventActionStart = event; + break; + } + } + + Assert.assertNotNull(eventActionStart); + LanguageEventData data = (LanguageEventData)eventActionStart.getData(); + Map<String, Serializable> actualCallArguments = data.getCallArguments(); + Assert.assertEquals("Java action call arguments are not as expected", callArguments, actualCallArguments); + } + @Test(expected = RuntimeException.class, timeout = DEFAULT_TIMEOUT) public void doJavaActionWrongMethodTest() { //prepare doAction arguments

['cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java', 'cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java']

{'.java': 3}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/1005/1004

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/1004

https://github.com/CloudSlang/cloud-slang/pull/1005

https://github.com/CloudSlang/cloud-slang/pull/1005

fixes

Builder - file name not printed

https://travis-ci.org/CloudSlang/cloud-slang-content/builds/238929220?utm_source=github_status&utm_medium=notification ```console 02/06/17 22:05:30 [INFO] Test case passed: testRemoteSecureCopySucessLocalToRemote [/home/travis/build/CloudSlang/cloud-slang-content/test/io/cloudslang/base/remote_file_transfer/remote_secure_copy.inputs.yaml]. Finished running: io.cloudslang.base.remote_file_transfer.test_remote_secure_copy_local_to_remote with result: SUCCESS 02/06/17 22:05:30 [ERROR] 02/06/17 22:05:30 [ERROR] ------------------------------------------------------------ 02/06/17 22:05:30 [ERROR] Exception: Error at line [13] - There should be an empty line between two sections of different tags (@description and @input) 02/06/17 22:05:30 [ERROR] Exception: Error at line [13] - There should be an empty line between two sections of different tags (@description and @input) 02/06/17 22:05:30 [ERROR] Exception: Error at line [11] - There should be an empty line between two sections of different tags (@description and @input) 02/06/17 22:05:30 [ERROR] Exception: Error at line [12] - There should be an empty line between two sections of different tags (@description and @input) 02/06/17 22:05:30 [ERROR] FAILURE: Validation of slang files for project: "/home/travis/build/CloudSlang/cloud-slang-content" failed. 02/06/17 22:05:30 [ERROR] --------------- ``` which file?

bbb20fab5c5de83d724d3ec3f2c0adf770427078

bb66ee6910987996d31da7be7bf44747ed6200ba

https://github.com/cloudslang/cloud-slang/compare/bbb20fab5c5de83d724d3ec3f2c0adf770427078...bb66ee6910987996d31da7be7bf44747ed6200ba

diff --git a/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/verifier/SlangContentVerifier.java b/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/verifier/SlangContentVerifier.java index f1abd557e..977a97bdb 100644 --- a/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/verifier/SlangContentVerifier.java +++ b/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/verifier/SlangContentVerifier.java @@ -24,9 +24,11 @@ import io.cloudslang.lang.tools.build.validation.MetadataMissingException; import io.cloudslang.lang.tools.build.validation.StaticValidator; import java.io.File; import java.util.ArrayDeque; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Queue; import java.util.Set; @@ -70,21 +72,27 @@ public class SlangContentVerifier { loggingService.logEvent(Level.INFO, slangFiles.size() + " .sl files were found"); loggingService.logEvent(Level.INFO, ""); Queue<RuntimeException> exceptions = new ArrayDeque<>(); + String errorMessagePrefixMetadata = ""; for (File slangFile: slangFiles) { Executable sourceModel = null; try { + errorMessagePrefixMetadata = "Failed to extract metadata for file: \\'" + + slangFile.getAbsoluteFile() + "\\'.\\n"; + String errorMessagePrefixCompilation = "Failed to compile file: \\'" + + slangFile.getAbsoluteFile() + "\\'.\\n"; + Validate.isTrue(slangFile.isFile(), "file path \\'" + slangFile.getAbsolutePath() + "\\' must lead to a file"); SlangSource slangSource = SlangSource.fromFile(slangFile); ExecutableModellingResult preCompileResult = slangCompiler.preCompileSource(slangSource); sourceModel = preCompileResult.getExecutable(); - exceptions.addAll(preCompileResult.getErrors()); + exceptions.addAll(prependPrefix(preCompileResult.getErrors(), errorMessagePrefixCompilation)); MetadataModellingResult metadataResult = metadataExtractor .extractMetadataModellingResult(slangSource, shouldValidateCheckstyle); Metadata sourceMetadata = metadataResult.getMetadata(); - exceptions.addAll(metadataResult.getErrors()); + exceptions.addAll(prependPrefix(metadataResult.getErrors(), errorMessagePrefixMetadata)); if (sourceModel != null) { int size = exceptions.size(); @@ -95,8 +103,7 @@ public class SlangContentVerifier { } } } catch (Exception e) { - String errorMessage = "Failed to extract metadata for file: \\'" + - slangFile.getAbsoluteFile() + "\\'.\\n" + e.getMessage(); + String errorMessage = errorMessagePrefixMetadata + e.getMessage(); loggingService.logEvent(Level.ERROR, errorMessage); exceptions.add(new RuntimeException(errorMessage, e)); if (e instanceof MetadataMissingException && sourceModel != null) { @@ -115,6 +122,18 @@ public class SlangContentVerifier { return preCompileResult; } + private Collection<RuntimeException> prependPrefix(Collection<RuntimeException> errors, String prefix) { + List<RuntimeException> result = new ArrayList<>(); + for (RuntimeException ex : errors) { + result.add(wrapWithPrefix(ex, prefix)); + } + return result; + } + + private RuntimeException wrapWithPrefix(RuntimeException rex, String prefix) { + return new RuntimeException(prefix + rex.getMessage(), rex); + } + public CompileResult compileSlangModels(Map<String, Executable> slangModels) { CompileResult compileResult = new CompileResult(); Map<String, CompilationArtifact> compiledArtifacts = new HashMap<>();

['cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/verifier/SlangContentVerifier.java']

{'.java': 1}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/419/413

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/413

https://github.com/CloudSlang/cloud-slang/pull/419

https://github.com/CloudSlang/cloud-slang/pull/419

fixes

read_from_file operation context serialization error

If score tries to create execution message during this operation execution (for example if isRunningTooLong), it fails because PyFile object, which is serializable itself ,has field file:TextIOWrapper which is not serializable. ``` bash (SimpleExecutionRunnable.java:126) ERROR - Error during execution!!! java.lang.RuntimeException: Failed to serialize execution plan. Error: at io.cloudslang.engine.queue.entities.ExecutionMessageConverter.objToBytes(ExecutionMessageConverter.java:100) at io.cloudslang.engine.queue.entities.ExecutionMessageConverter.createPayload(ExecutionMessageConverter.java:45) at io.cloudslang.engine.queue.entities.ExecutionMessageConverter.createPayload(ExecutionMessageConverter.java:41) at io.cloudslang.worker.management.services.SimpleExecutionRunnable.createInProgressExecutionMessage(SimpleExecutionRunnable.java:387) at io.cloudslang.worker.management.services.SimpleExecutionRunnable.isRunningTooLong(SimpleExecutionRunnable.java:330) at io.cloudslang.worker.management.services.SimpleExecutionRunnable.shouldStop(SimpleExecutionRunnable.java:175) at io.cloudslang.worker.management.services.SimpleExecutionRunnable.executeRegularStep(SimpleExecutionRunnable.java:161) at io.cloudslang.worker.management.services.SimpleExecutionRunnable.run(SimpleExecutionRunnable.java:119) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) at io.cloudslang.worker.management.services.WorkerThreadFactory$1.run(WorkerThreadFactory.java:33) at java.lang.Thread.run(Thread.java:745) Caused by: java.io.NotSerializableException: org.python.core.io.TextIOWrapper ```

b5d7bcc04c986238d85bf691b32970236d991263

af352cae13eb5354b2059840809ad95564688770

https://github.com/cloudslang/cloud-slang/compare/b5d7bcc04c986238d85bf691b32970236d991263...af352cae13eb5354b2059840809ad95564688770

diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java index cdad7ad78..bc2912ec8 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java @@ -25,9 +25,13 @@ import io.cloudslang.score.lang.ExecutionRuntimeServices; import org.python.core.Py; import org.python.core.PyBoolean; import org.python.core.PyException; +import org.python.core.PyFile; +import org.python.core.PyFunction; import org.python.core.PyModule; import org.python.core.PyObject; import org.python.core.PyStringMap; +import org.python.core.PySystemState; +import org.python.core.PyType; import org.python.util.PythonInterpreter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -36,6 +40,7 @@ import java.io.Serializable; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -258,7 +263,7 @@ public class ActionSteps extends AbstractSteps { while (localsIterator.hasNext()) { String key = localsIterator.next().asString(); PyObject value = interpreter.get(key); - if ((key.startsWith("__") && key.endsWith("__")) || value instanceof PyModule) { + if (keyIsExcluded(key, value)) { continue; } Serializable javaValue = resolveJythonObjectToJava(value); @@ -268,6 +273,14 @@ public class ActionSteps extends AbstractSteps { return returnValue; } + private boolean keyIsExcluded(String key, PyObject value) { + return (key.startsWith("__") && key.endsWith("__")) || + value instanceof PyFile || + value instanceof PyModule || + value instanceof PyFunction || + value instanceof PySystemState; + } + private Serializable resolveJythonObjectToJava(PyObject value) { if (value instanceof PyBoolean) { PyBoolean pyBoolean = (PyBoolean) value; diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java index e18581a81..1caa89773 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java @@ -19,7 +19,9 @@ import org.junit.Assert; import io.cloudslang.score.api.execution.ExecutionParametersConsts; import io.cloudslang.score.events.ScoreEvent; import io.cloudslang.score.lang.ExecutionRuntimeServices; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.python.util.PythonInterpreter; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +30,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import java.io.File; +import java.io.IOException; import java.io.Serializable; import java.util.Collection; import java.util.HashMap; @@ -48,6 +52,9 @@ public class ActionStepsTest { private static final long DEFAULT_TIMEOUT = 10000; + @Rule + public TemporaryFolder folder = new TemporaryFolder(); + @Autowired private ActionSteps actionSteps; ExecutionRuntimeServices executionRuntimeServicesMock = mock(ExecutionRuntimeServices.class); @@ -465,6 +472,32 @@ public class ActionStepsTest { Assert.assertEquals("Python action outputs are not as expected", expectedOutputs, actualOutputs); } + @Test + public void doActionInvalidReturnTypes() throws IOException { + //prepare doAction arguments + RunEnvironment runEnv = new RunEnvironment(); + File file = folder.newFile(); + String userPythonScript = + "valid = 1\\n" + + "with open('" + file.getAbsolutePath() + "', 'r') as f:\\n" + + " f.close()\\n\\n" + + "import sys\\n" + + "import io\\n" + + "def a():\\n" + + " print 'a'\\n\\n"; + + //invoke doAction + actionSteps.doAction(runEnv, new HashMap<String, Object>(), PYTHON, "", "", executionRuntimeServicesMock, userPythonScript, 2L); + + //extract actual outputs + ReturnValues actualReturnValues = runEnv.removeReturnValues(); + Map<String, Serializable> actualOutputs = actualReturnValues.getOutputs(); + + //verify matching + Assert.assertEquals("Invalid types passed exclusion", + 1, actualOutputs.size()); + } + @Test (expected = RuntimeException.class, timeout = DEFAULT_TIMEOUT) public void doActionPythonMissingInputsTest() { //prepare doAction arguments

['cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java', 'cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java']

{'.java': 2}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/416/406

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/406

https://github.com/CloudSlang/cloud-slang/pull/416

https://github.com/CloudSlang/cloud-slang/pull/416

fixes

Python action - Cannot import svn.local

When trying to import in an action python script, we get: ``` Command failed java.lang.RuntimeException: Slang Error : Error executing python script: Traceback (most recent call last): File "<string>", line 2, in <module> File "C:\\Users\\stoneo\\Desktop\\Cslang-0.8-rc-1\\cslang\\python-lib\\svn\\local.py", line 4, in <module> import svn.common File "C:\\Users\\stoneo\\Desktop\\Cslang-0.8-rc-1\\cslang\\python-lib\\svn\\common.py", line 4, in <module> import dateutil.parser File "C:\\Users\\stoneo\\Desktop\\Cslang-0.8-rc-1\\cslang\\python-lib\\dateutil\\parser.py", line 22, in <module> from io import StringIO ImportError: cannot import name StringIO ``` If we first import in our script StringIO from io nmaually, it works: ``` python from io import StringIO import svn.local ```

031bd28395ebde1bb8817f82daea8a0fe3e51585

564f2613037e39cb8dbcbdfc43abec2adb4817db

https://github.com/cloudslang/cloud-slang/compare/031bd28395ebde1bb8817f82daea8a0fe3e51585...564f2613037e39cb8dbcbdfc43abec2adb4817db

diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/configuration/SlangRuntimeSpringConfig.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/configuration/SlangRuntimeSpringConfig.java index e624944e9..511ddabab 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/configuration/SlangRuntimeSpringConfig.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/configuration/SlangRuntimeSpringConfig.java @@ -30,7 +30,10 @@ public class SlangRuntimeSpringConfig { @Bean public PythonInterpreter interpreter(){ - return new PythonInterpreter(); + PythonInterpreter interpreter = new PythonInterpreter(); +// here to avoid jython preferring io.cloudslang package over python io package + interpreter.exec("import io"); + return interpreter; } @Bean diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java index e18581a81..4a5d81735 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java @@ -489,6 +489,23 @@ public class ActionStepsTest { actionSteps.doAction(runEnv, nonSerializableExecutionData, PYTHON, "", "", executionRuntimeServicesMock, userPythonScript, 2L); } + + @Test + public void doActionPythonImportRightIOPackage() { + //prepare doAction arguments + RunEnvironment runEnv = new RunEnvironment(); + + String userPythonScript = + "import io\\n" + + "if 'StringIO' not in dir(io):\\n" + + " raise Exception('cant find StringIO')"; + + //invoke doAction + actionSteps.doAction( + runEnv, new HashMap<String, Object>(), PYTHON, "", "", + executionRuntimeServicesMock, userPythonScript, 2L); + } + @Test (expected = RuntimeException.class, timeout = DEFAULT_TIMEOUT) public void doActionPythonInputTypeMismatchTest() { //prepare doAction arguments

['cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/configuration/SlangRuntimeSpringConfig.java']

{'.java': 2}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/500/499

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/499

https://github.com/CloudSlang/cloud-slang/pull/500

https://github.com/CloudSlang/cloud-slang/pull/500

fixes

Double title 'Flow outputs'

The behavior of the "Flow outputs" messages are changed in CLI. The flow outputs were grouped as a single block. Now we have 'Flow outputs' title for each output: E.g.: Flow outputs: - return_result = Reservation{region=us-east-1, reservationId=r-4cfb859b, instances=[RunningInstance{region=us-east... Flow outputs: - return_code = 0

956e27184a41ab38ac1d9ddb3c8d2fd1c5705900

fcff612803b0c6d77d499f3a7eb19be3044ae30e

https://github.com/cloudslang/cloud-slang/compare/956e27184a41ab38ac1d9ddb3c8d2fd1c5705900...fcff612803b0c6d77d499f3a7eb19be3044ae30e

diff --git a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/SyncTriggerEventListener.java b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/SyncTriggerEventListener.java index 9d2e636e9..160497ad7 100644 --- a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/SyncTriggerEventListener.java +++ b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/SyncTriggerEventListener.java @@ -107,8 +107,8 @@ public class SyncTriggerEventListener implements ScoreEventListener{ && data.containsKey(LanguageEventData.PATH) && data.get(LanguageEventData.PATH).equals(EXEC_START_PATH)) { Map<String, Serializable> outputs = extractNotEmptyOutputs(data); + printWithColor(Ansi.Color.WHITE, "\\nFlow outputs:"); for (String key : outputs.keySet()) { - printWithColor(Ansi.Color.WHITE, "\\nFlow outputs:"); printWithColor(Ansi.Color.WHITE, "- " + key + " = " + outputs.get(key)); } }

['cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/SyncTriggerEventListener.java']

{'.java': 1}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/521/510

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/510

https://github.com/CloudSlang/cloud-slang/pull/521

https://github.com/CloudSlang/cloud-slang/pull/521

fixes

Entity references in logs

some entities still appear as obj refs (e.g. `io.cloudslang.lang.entities.ResultNavigation@5b7d`) instead of toString representation

4586755a44ef9dde8952ad3bf42c2866a024d651

503644bc56bceca49977883ace69d95586c1c673

https://github.com/cloudslang/cloud-slang/compare/4586755a44ef9dde8952ad3bf42c2866a024d651...503644bc56bceca49977883ace69d95586c1c673

diff --git a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/AsyncLoopStatement.java b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/AsyncLoopStatement.java index 97972aa9f..2cebc6016 100644 --- a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/AsyncLoopStatement.java +++ b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/AsyncLoopStatement.java @@ -12,6 +12,7 @@ package io.cloudslang.lang.entities; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.io.Serializable; @@ -43,26 +44,33 @@ public class AsyncLoopStatement extends LoopStatement implements Serializable { return varName; } + @Override + public String toString() { + return new ToStringBuilder(this) + .appendSuper(super.toString()) + .append("varName", varName) + .toString(); + } + @Override public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; + if (this == o) return true; + + if (o == null || getClass() != o.getClass()) return false; AsyncLoopStatement that = (AsyncLoopStatement) o; return new EqualsBuilder() + .appendSuper(super.equals(o)) .append(varName, that.varName) - .append(getExpression(), that.getExpression()) .isEquals(); } @Override public int hashCode() { - return new HashCodeBuilder() + return new HashCodeBuilder(17, 37) + .appendSuper(super.hashCode()) .append(varName) - .append(getExpression()) .toHashCode(); } diff --git a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/CompilationArtifact.java b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/CompilationArtifact.java index fb1b9791e..aaf92430a 100644 --- a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/CompilationArtifact.java +++ b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/CompilationArtifact.java @@ -8,10 +8,11 @@ */ package io.cloudslang.lang.entities; -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; import io.cloudslang.lang.entities.bindings.Input; import io.cloudslang.score.api.ExecutionPlan; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Collection; import java.util.List; @@ -50,14 +51,39 @@ public class CompilationArtifact { return systemProperties; } + @Override + public String toString() { + return new ToStringBuilder(this) + .append("executionPlan", executionPlan) + .append("dependencies", dependencies) + .append("inputs", inputs) + .append("systemProperties", systemProperties) + .toString(); + } + @Override public boolean equals(Object o) { - return EqualsBuilder.reflectionEquals(this, o); + if (this == o) return true; + + if (o == null || getClass() != o.getClass()) return false; + + CompilationArtifact that = (CompilationArtifact) o; + + return new EqualsBuilder() + .append(executionPlan, that.executionPlan) + .append(dependencies, that.dependencies) + .append(inputs, that.inputs) + .append(systemProperties, that.systemProperties) + .isEquals(); } @Override public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); + return new HashCodeBuilder(17, 37) + .append(executionPlan) + .append(dependencies) + .append(inputs) + .append(systemProperties) + .toHashCode(); } - } diff --git a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/ListForLoopStatement.java b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/ListForLoopStatement.java index 49c723b56..57229ff07 100644 --- a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/ListForLoopStatement.java +++ b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/ListForLoopStatement.java @@ -12,6 +12,7 @@ package io.cloudslang.lang.entities; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.io.Serializable; @@ -45,26 +46,33 @@ public class ListForLoopStatement extends LoopStatement implements Serializable return varName; } + @Override + public String toString() { + return new ToStringBuilder(this) + .appendSuper(super.toString()) + .append("varName", varName) + .toString(); + } + @Override public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; + if (this == o) return true; + + if (o == null || getClass() != o.getClass()) return false; ListForLoopStatement that = (ListForLoopStatement) o; return new EqualsBuilder() + .appendSuper(super.equals(o)) .append(varName, that.varName) - .append(getExpression(), that.getExpression()) .isEquals(); } @Override public int hashCode() { - return new HashCodeBuilder() + return new HashCodeBuilder(17, 37) + .appendSuper(super.hashCode()) .append(varName) - .append(getExpression()) .toHashCode(); } diff --git a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/LoopStatement.java b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/LoopStatement.java index b9995cf80..7c7c8af21 100644 --- a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/LoopStatement.java +++ b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/LoopStatement.java @@ -10,6 +10,9 @@ package io.cloudslang.lang.entities; import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.io.Serializable; @@ -37,4 +40,32 @@ public abstract class LoopStatement implements Serializable { public String getExpression() { return expression; } + + @Override + public String toString() { + return new ToStringBuilder(this) + .append("expression", expression) + .toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + + if (o == null || getClass() != o.getClass()) return false; + + LoopStatement that = (LoopStatement) o; + + return new EqualsBuilder() + .append(expression, that.expression) + .isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder(17, 37) + .append(expression) + .toHashCode(); + } + } diff --git a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/MapForLoopStatement.java b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/MapForLoopStatement.java index a452422fe..72f61fae9 100644 --- a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/MapForLoopStatement.java +++ b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/MapForLoopStatement.java @@ -12,6 +12,7 @@ package io.cloudslang.lang.entities; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.io.Serializable; @@ -53,28 +54,36 @@ public class MapForLoopStatement extends LoopStatement implements Serializable{ return valueName; } + @Override + public String toString() { + return new ToStringBuilder(this) + .appendSuper(super.toString()) + .append("keyName", keyName) + .append("valueName", valueName) + .toString(); + } + @Override public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; + if (this == o) return true; + + if (o == null || getClass() != o.getClass()) return false; MapForLoopStatement that = (MapForLoopStatement) o; return new EqualsBuilder() + .appendSuper(super.equals(o)) .append(keyName, that.keyName) .append(valueName, that.valueName) - .append(getExpression(), that.getExpression()) .isEquals(); } @Override public int hashCode() { - return new HashCodeBuilder() + return new HashCodeBuilder(17, 37) + .appendSuper(super.hashCode()) .append(keyName) .append(valueName) - .append(getExpression()) .toHashCode(); } diff --git a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/ResultNavigation.java b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/ResultNavigation.java index 301163100..a9776ffe3 100644 --- a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/ResultNavigation.java +++ b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/ResultNavigation.java @@ -11,6 +11,7 @@ package io.cloudslang.lang.entities; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.io.Serializable; @@ -42,26 +43,34 @@ public class ResultNavigation implements Serializable { return this.presetResult; } + @Override + public String toString() { + return new ToStringBuilder(this) + .append("nextStepId", nextStepId) + .append("presetResult", presetResult) + .toString(); + } + @Override public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; + if (this == o) return true; + + if (o == null || getClass() != o.getClass()) return false; ResultNavigation that = (ResultNavigation) o; return new EqualsBuilder() - .append(this.nextStepId, that.nextStepId) - .append(this.presetResult, that.presetResult) + .append(nextStepId, that.nextStepId) + .append(presetResult, that.presetResult) .isEquals(); } @Override public int hashCode() { - return new HashCodeBuilder() + return new HashCodeBuilder(17, 37) .append(nextStepId) .append(presetResult) .toHashCode(); } + } diff --git a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/bindings/InOutParam.java b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/bindings/InOutParam.java index c4e355dc9..e9a4eefb0 100644 --- a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/bindings/InOutParam.java +++ b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/bindings/InOutParam.java @@ -46,17 +46,32 @@ public abstract class InOutParam implements Serializable { @Override public String toString() { - return ToStringBuilder.reflectionToString(this); + return new ToStringBuilder(this) + .append("name", name) + .append("value", value) + .toString(); } @Override public boolean equals(Object o) { - return EqualsBuilder.reflectionEquals(this, o); + if (this == o) return true; + + if (o == null || getClass() != o.getClass()) return false; + + InOutParam that = (InOutParam) o; + + return new EqualsBuilder() + .append(name, that.name) + .append(value, that.value) + .isEquals(); } @Override public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); + return new HashCodeBuilder(17, 37) + .append(name) + .append(value) + .toHashCode(); } } diff --git a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/bindings/Input.java b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/bindings/Input.java index 3ab30e1b5..c2fceb80a 100644 --- a/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/bindings/Input.java +++ b/cloudslang-entities/src/main/java/io/cloudslang/lang/entities/bindings/Input.java @@ -8,6 +8,10 @@ */ package io.cloudslang.lang.entities.bindings; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; + import java.io.Serializable; /** @@ -58,4 +62,43 @@ public class Input extends InOutParam { return this.systemPropertyName; } + @Override + public String toString() { + return new ToStringBuilder(this) + .appendSuper(super.toString()) + .append("encrypted", encrypted) + .append("required", required) + .append("overridable", overridable) + .append("systemPropertyName", systemPropertyName) + .toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + + if (o == null || getClass() != o.getClass()) return false; + + Input input = (Input) o; + + return new EqualsBuilder() + .appendSuper(super.equals(o)) + .append(encrypted, input.encrypted) + .append(required, input.required) + .append(overridable, input.overridable) + .append(systemPropertyName, input.systemPropertyName) + .isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder(17, 37) + .appendSuper(super.hashCode()) + .append(encrypted) + .append(required) + .append(overridable) + .append(systemPropertyName) + .toHashCode(); + } + }

['cloudslang-entities/src/main/java/io/cloudslang/lang/entities/bindings/InOutParam.java', 'cloudslang-entities/src/main/java/io/cloudslang/lang/entities/AsyncLoopStatement.java', 'cloudslang-entities/src/main/java/io/cloudslang/lang/entities/MapForLoopStatement.java', 'cloudslang-entities/src/main/java/io/cloudslang/lang/entities/ListForLoopStatement.java', 'cloudslang-entities/src/main/java/io/cloudslang/lang/entities/CompilationArtifact.java', 'cloudslang-entities/src/main/java/io/cloudslang/lang/entities/bindings/Input.java', 'cloudslang-entities/src/main/java/io/cloudslang/lang/entities/LoopStatement.java', 'cloudslang-entities/src/main/java/io/cloudslang/lang/entities/ResultNavigation.java']

{'.java': 8}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/428/365

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/365

https://github.com/CloudSlang/cloud-slang/pull/428

https://github.com/CloudSlang/cloud-slang/pull/428

fixes

Sporadic test failures - Travis

SimpleFlowTest.testFlowWithGlobalSession DataFlowTest.testBindingsFlow detailed log here: https://gist.github.com/Bonczidai/864f936c36238b5c903b

23a53202bd7189b83e508e62679620faf20d22d7

3ad2878242beab856579363dddf16d45fc8db2db

https://github.com/cloudslang/cloud-slang/compare/23a53202bd7189b83e508e62679620faf20d22d7...3ad2878242beab856579363dddf16d45fc8db2db

diff --git a/cloudslang-all/src/test/java/io/cloudslang/lang/api/SlangImplTest.java b/cloudslang-all/src/test/java/io/cloudslang/lang/api/SlangImplTest.java index 4c3951725..81ae20b96 100644 --- a/cloudslang-all/src/test/java/io/cloudslang/lang/api/SlangImplTest.java +++ b/cloudslang-all/src/test/java/io/cloudslang/lang/api/SlangImplTest.java @@ -214,7 +214,7 @@ public class SlangImplTest { private class EventListener implements ScoreEventListener{ @Override - public void onEvent(ScoreEvent event) throws InterruptedException { + public synchronized void onEvent(ScoreEvent event) throws InterruptedException { } } diff --git a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCLI.java b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCLI.java index 872301ac6..a7ae45c3f 100644 --- a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCLI.java +++ b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCLI.java @@ -156,7 +156,7 @@ public class SlangCLI implements CommandMarker { handlerTypes.add(ScoreLangConstants.EVENT_EXECUTION_FINISHED); scoreServices.subscribe(new ScoreEventListener() { @Override - public void onEvent(ScoreEvent event) { + public synchronized void onEvent(ScoreEvent event) { logEvent(event); } }, handlerTypes); diff --git a/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/SlangBuildMain.java b/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/SlangBuildMain.java index 8efd31825..033a35a48 100644 --- a/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/SlangBuildMain.java +++ b/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/SlangBuildMain.java @@ -233,7 +233,7 @@ public class SlangBuildMain { private static void registerEventHandlers(Slang slang) { slang.subscribeOnAllEvents(new ScoreEventListener() { @Override - public void onEvent(ScoreEvent event) { + public synchronized void onEvent(ScoreEvent event) { logEvent(event); } }); diff --git a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/TriggerFlows.java b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/TriggerFlows.java index bad0014bd..fd2aeb7ad 100644 --- a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/TriggerFlows.java +++ b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/TriggerFlows.java @@ -47,7 +47,7 @@ public class TriggerFlows { final BlockingQueue<ScoreEvent> finishEvent = new LinkedBlockingQueue<>(); ScoreEventListener finishListener = new ScoreEventListener() { @Override - public void onEvent(ScoreEvent event) throws InterruptedException { + public synchronized void onEvent(ScoreEvent event) throws InterruptedException { finishEvent.add(event); } };

['cloudslang-all/src/test/java/io/cloudslang/lang/api/SlangImplTest.java', 'cloudslang-cli/src/main/java/io/cloudslang/lang/cli/SlangCLI.java', 'cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/TriggerFlows.java', 'cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/SlangBuildMain.java']

{'.java': 4}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/337/336

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/336

https://github.com/CloudSlang/cloud-slang/pull/337

https://github.com/CloudSlang/cloud-slang/pull/337

fixes

preCompile API returns input object which contains input name as default value

When the input has required / overridable / encrypted field (the value doesn’t matter), and has no default value, the expression field of Input object contains the input name during the precompile API.

cfd53e0e24ffc4eb54abe9d98ef4ce7bde9b10a8

5e0481fa9206304d125683d486986fcccca879fd

https://github.com/cloudslang/cloud-slang/compare/cfd53e0e24ffc4eb54abe9d98ef4ce7bde9b10a8...5e0481fa9206304d125683d486986fcccca879fd

diff --git a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/modeller/transformers/AbstractInputsTransformer.java b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/modeller/transformers/AbstractInputsTransformer.java index 6c1274a1c..142c0ea26 100644 --- a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/modeller/transformers/AbstractInputsTransformer.java +++ b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/modeller/transformers/AbstractInputsTransformer.java @@ -68,8 +68,7 @@ public abstract class AbstractInputsTransformer { (boolean) props.get(OVERRIDABLE_KEY); boolean defaultSpecified = props.containsKey(DEFAULT_KEY); String inputName = entry.getKey(); - String expression = defaultSpecified ? props.get(DEFAULT_KEY) - .toString() : inputName; + String expression = defaultSpecified ? props.get(DEFAULT_KEY).toString() : null; String systemPropertyName = (String) props.get(SYSTEM_PROPERTY_KEY); if (!overridable && !defaultSpecified && StringUtils.isEmpty(systemPropertyName)) { diff --git a/cloudslang-compiler/src/test/java/io/cloudslang/lang/compiler/modeller/transformers/InputsTransformerTest.java b/cloudslang-compiler/src/test/java/io/cloudslang/lang/compiler/modeller/transformers/InputsTransformerTest.java index 3e410d053..7ef3af27f 100644 --- a/cloudslang-compiler/src/test/java/io/cloudslang/lang/compiler/modeller/transformers/InputsTransformerTest.java +++ b/cloudslang-compiler/src/test/java/io/cloudslang/lang/compiler/modeller/transformers/InputsTransformerTest.java @@ -105,7 +105,7 @@ public class InputsTransformerTest { @SuppressWarnings("unchecked") List<Input> inputs = inputTransformer.transform(inputsMap); Input input = inputs.get(4); Assert.assertEquals("input5", input.getName()); - Assert.assertEquals("input5", input.getExpression()); + Assert.assertEquals(null, input.getExpression()); Assert.assertEquals(true, input.isEncrypted()); Assert.assertEquals(true, input.isRequired()); }

['cloudslang-compiler/src/test/java/io/cloudslang/lang/compiler/modeller/transformers/InputsTransformerTest.java', 'cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/modeller/transformers/AbstractInputsTransformer.java']

{'.java': 2}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/164/160

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/160

https://github.com/CloudSlang/cloud-slang/pull/164

https://github.com/CloudSlang/cloud-slang/pull/164

fixes

schedule slang flow fails on inputs passed as unmodifiable collection

- also the run time exception is fired from Slang language and not from score as ScoreEvent.Error

2fe8321efdb3adab28f08afa65e2dd4dc98c2600

773cd3dee66c7e1ae82ad35e969feea7c03f734f

https://github.com/cloudslang/cloud-slang/compare/2fe8321efdb3adab28f08afa65e2dd4dc98c2600...773cd3dee66c7e1ae82ad35e969feea7c03f734f

diff --git a/score-lang-api/src/main/java/org/openscore/lang/api/SlangImpl.java b/score-lang-api/src/main/java/org/openscore/lang/api/SlangImpl.java index e1757282e..f81201970 100644 --- a/score-lang-api/src/main/java/org/openscore/lang/api/SlangImpl.java +++ b/score-lang-api/src/main/java/org/openscore/lang/api/SlangImpl.java @@ -80,7 +80,8 @@ public class SlangImpl implements Slang { Map<String, Serializable> executionContext = new HashMap<>(); RunEnvironment runEnv = new RunEnvironment(systemProperties); executionContext.put(ScoreLangConstants.RUN_ENV, runEnv); - executionContext.put(ScoreLangConstants.USER_INPUTS_KEY, (Serializable)runInputs); + Map<String, ? extends Serializable> clonedRunInputs = new HashMap<>(runInputs); + executionContext.put(ScoreLangConstants.USER_INPUTS_KEY, (Serializable) clonedRunInputs); TriggeringProperties triggeringProperties = TriggeringProperties.create(compilationArtifact.getExecutionPlan()).setDependencies(compilationArtifact.getDependencies()) .setContext(executionContext); return score.trigger(triggeringProperties);

['score-lang-api/src/main/java/org/openscore/lang/api/SlangImpl.java']

{'.java': 1}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/361/339

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/339

https://github.com/CloudSlang/cloud-slang/pull/361

https://github.com/CloudSlang/cloud-slang/pull/361

fixes

Failed to compile flow which uses subflow located in file in the same folder

Let's say we have flow flow_system_properties_subflow.sl in flow_system_properties_subflow.sl which uses simplecp.flows.flow_system_properties_subflow_level1 which located in file simplecp.flows.flow_system_properties_subflow_level1.sl located in the same folder When executing cli with command run --f c:/Temp/slang/tests/SimpleCp/flow_system_properties_subflow.sl --cp c:/Temp/slang/tests We get error Command failed java.lang.RuntimeException: java.lang.RuntimeException: Reference: 'simplecp.flows.flow_system_properties_subflow_level1' in executable: 'flow_system_properties_subflow', wasn't found in path When executing command with specifying --cp with flow path run --f c:/Temp/slang/tests/SimpleCp/flow_system_properties_subflow.sl --cp c:/Temp/slang/tests/SimpleCp We get error Command failed java.lang.RuntimeException: java.lang.IllegalArgumentException: Source flow_system_properties_subflow has dependencies but no path was given to the compiler

db86e60a360e5f69afa22395c5012c31c1ad5a01

bc8c8dccb791f43b88f55efad59373447c42bf04

https://github.com/cloudslang/cloud-slang/compare/db86e60a360e5f69afa22395c5012c31c1ad5a01...bc8c8dccb791f43b88f55efad59373447c42bf04

diff --git a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/utils/CompilerHelperImpl.java b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/utils/CompilerHelperImpl.java index 9cd5a57f7..b3db9c95a 100644 --- a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/utils/CompilerHelperImpl.java +++ b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/utils/CompilerHelperImpl.java @@ -86,8 +86,6 @@ public class CompilerHelperImpl implements CompilerHelper{ } for (String dependency:dependencies) { Collection<File> dependenciesFiles = FileUtils.listFiles(new File(dependency), SLANG_FILE_EXTENSIONS, true); - dependenciesFiles = select(dependenciesFiles, having(on(File.class).getPath(), not(containsString(SP_DIR)))); - dependenciesFiles = select(dependenciesFiles, having(on(File.class).getPath(), not(containsString(INPUT_DIR)))); depsSources.addAll(convert(dependenciesFiles, new Converter<File, SlangSource>() { @Override public SlangSource convert(File from) {

['cloudslang-cli/src/main/java/io/cloudslang/lang/cli/utils/CompilerHelperImpl.java']

{'.java': 1}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/346/318

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/318

https://github.com/CloudSlang/cloud-slang/pull/346

https://github.com/CloudSlang/cloud-slang/pull/346

fixes

LanguageEventData.getException throw ClassCastException

2015-06-11 11:24:57,465 [1_WorkerExecutionThread-13_124100530](ExecutionServiceImpl.java:100) ERROR - Error during execution: java.lang.ClassCastException: java.lang.String cannot be cast to java.lang.Exception at io.cloudslang.lang.runtime.events.LanguageEventData.getException(LanguageEventData.java:106)

c08df7c691bbe1aa9b93d818a9cf7fb535f4f90d

7d3c502b657251f576f8d73b08b555b1db6d82d8

https://github.com/cloudslang/cloud-slang/compare/c08df7c691bbe1aa9b93d818a9cf7fb535f4f90d...7d3c502b657251f576f8d73b08b555b1db6d82d8

diff --git a/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/tester/TriggerTestCaseEventListener.java b/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/tester/TriggerTestCaseEventListener.java index 88a2f0573..3a3cf1ab2 100644 --- a/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/tester/TriggerTestCaseEventListener.java +++ b/cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/tester/TriggerTestCaseEventListener.java @@ -21,8 +21,6 @@ package io.cloudslang.lang.tools.build.tester; import io.cloudslang.lang.entities.ScoreLangConstants; import io.cloudslang.lang.runtime.events.LanguageEventData; import org.apache.commons.collections4.MapUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import io.cloudslang.score.events.EventConstants; import io.cloudslang.score.events.ScoreEvent; import io.cloudslang.score.events.ScoreEventListener; @@ -60,7 +58,8 @@ public class TriggerTestCaseEventListener implements ScoreEventListener { @Override public synchronized void onEvent(ScoreEvent scoreEvent) throws InterruptedException { - @SuppressWarnings("unchecked") Map<String,Serializable> data = (Map<String,Serializable>)scoreEvent.getData(); + @SuppressWarnings("unchecked") Map<String,Serializable> data = (Map<String,Serializable>) scoreEvent.getData(); + LanguageEventData eventData; switch (scoreEvent.getEventType()){ case EventConstants.SCORE_FINISHED_EVENT : break; @@ -70,15 +69,18 @@ public class TriggerTestCaseEventListener implements ScoreEventListener { flowFinished.set(true); break; case ScoreLangConstants.SLANG_EXECUTION_EXCEPTION: - errorMessage.set((String)data.get(LanguageEventData.EXCEPTION)); + eventData = (LanguageEventData) data; + errorMessage.set(eventData.getException()); flowFinished.set(true); break; case ScoreLangConstants.EVENT_EXECUTION_FINISHED : - result = (String)data.get(LanguageEventData.RESULT); + eventData = (LanguageEventData) data; + result = eventData.getResult(); flowFinished.set(true); break; case ScoreLangConstants.EVENT_OUTPUT_END: - Map<String, Serializable> extractOutputs = extractOutputs(data); + eventData = (LanguageEventData) data; + Map<String, Serializable> extractOutputs = extractOutputs(eventData); if(MapUtils.isNotEmpty(extractOutputs)) { outputs = extractOutputs; } @@ -90,18 +92,17 @@ public class TriggerTestCaseEventListener implements ScoreEventListener { return new ReturnValues(outputs, result); } - private static Map<String, Serializable> extractOutputs(Map<String, Serializable> data) { + private static Map<String, Serializable> extractOutputs(LanguageEventData data) { Map<String, Serializable> outputsMap = new HashMap<>(); boolean thereAreOutputsForRootPath = data.containsKey(LanguageEventData.OUTPUTS) && data.containsKey(LanguageEventData.PATH) - && data.get(LanguageEventData.PATH).equals(EXEC_START_PATH); + && data.getPath().equals(EXEC_START_PATH); if (thereAreOutputsForRootPath) { - @SuppressWarnings("unchecked") Map<String, Serializable> outputs = - (Map<String, Serializable>) data.get(LanguageEventData.OUTPUTS); + Map<String, Serializable> outputs = data.getOutputs(); if (MapUtils.isNotEmpty(outputs)) outputsMap.putAll(outputs); } diff --git a/cloudslang-content-verifier/src/test/java/io/cloudslang/lang/tools/build/tester/SlangTestRunnerTest.java b/cloudslang-content-verifier/src/test/java/io/cloudslang/lang/tools/build/tester/SlangTestRunnerTest.java index 89e2bef34..1a70d3a2a 100644 --- a/cloudslang-content-verifier/src/test/java/io/cloudslang/lang/tools/build/tester/SlangTestRunnerTest.java +++ b/cloudslang-content-verifier/src/test/java/io/cloudslang/lang/tools/build/tester/SlangTestRunnerTest.java @@ -1,7 +1,5 @@ package io.cloudslang.lang.tools.build.tester; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; import io.cloudslang.lang.api.Slang; import io.cloudslang.lang.compiler.SlangSource; import io.cloudslang.lang.entities.CompilationArtifact; @@ -449,7 +447,9 @@ public class SlangTestRunnerTest { @Override public Object answer(InvocationOnMock invocationOnMock) throws Throwable { ScoreEventListener listener = (ScoreEventListener) invocationOnMock.getArguments()[0]; - listener.onEvent(new ScoreEvent(ScoreLangConstants.EVENT_EXECUTION_FINISHED, ImmutableMap.of(LanguageEventData.RESULT, "SUCCESS"))); + LanguageEventData data = new LanguageEventData(); + data.setResult("SUCCESS"); + listener.onEvent(new ScoreEvent(ScoreLangConstants.EVENT_EXECUTION_FINISHED, data)); return listener; } }).when(slang).subscribeOnEvents(any(ScoreEventListener.class), anySetOf(String.class)); @@ -460,9 +460,13 @@ public class SlangTestRunnerTest { @Override public Object answer(InvocationOnMock invocationOnMock) throws Throwable { ScoreEventListener listener = (ScoreEventListener) invocationOnMock.getArguments()[0]; - ImmutableMap data = ImmutableMap.of(LanguageEventData.OUTPUTS, outputs, LanguageEventData.PATH, "0"); + LanguageEventData data = new LanguageEventData(); + data.setOutputs(outputs); + data.setPath("0"); listener.onEvent(new ScoreEvent(ScoreLangConstants.EVENT_OUTPUT_END, data)); - listener.onEvent(new ScoreEvent(ScoreLangConstants.EVENT_EXECUTION_FINISHED, ImmutableMap.of(LanguageEventData.RESULT, "SUCCESS"))); + data = new LanguageEventData(); + data.setResult("SUCCESS"); + listener.onEvent(new ScoreEvent(ScoreLangConstants.EVENT_EXECUTION_FINISHED, data)); return listener; } }).when(slang).subscribeOnEvents(any(ScoreEventListener.class), anySetOf(String.class)); @@ -473,7 +477,9 @@ public class SlangTestRunnerTest { @Override public Object answer(InvocationOnMock invocationOnMock) throws Throwable { ScoreEventListener listener = (ScoreEventListener) invocationOnMock.getArguments()[0]; - listener.onEvent(new ScoreEvent(ScoreLangConstants.SLANG_EXECUTION_EXCEPTION, ImmutableMap.of(LanguageEventData.EXCEPTION, "Error"))); + LanguageEventData data = new LanguageEventData(); + data.setException("Error"); + listener.onEvent(new ScoreEvent(ScoreLangConstants.SLANG_EXECUTION_EXCEPTION, data)); return listener; } }).when(slang).subscribeOnEvents(any(ScoreEventListener.class), anySetOf(String.class)); diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java index 2e3259526..ab1a63258 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java @@ -102,12 +102,20 @@ public class LanguageEventData extends HashMap<String, Serializable> { put(PATH, path); } - public Exception getException() { - return (Exception) get(EXCEPTION); + public String getResult() { + return (String) get(RESULT); } - public void setException(Exception ex) { - put(EXCEPTION, ex); + public void setResult(String result) { + put(RESULT, result); + } + + public String getException() { + return (String) get(EXCEPTION); + } + + public void setException(String exceptionMessage) { + put(EXCEPTION, exceptionMessage); } public Map<String, Serializable> getInputs() { diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/events/LanguageEventDataTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/events/LanguageEventDataTest.java index 864b3451a..5815b50f3 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/events/LanguageEventDataTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/events/LanguageEventDataTest.java @@ -101,15 +101,27 @@ public class LanguageEventDataTest { assertEquals(exePath, eventData.get(LanguageEventData.PATH)); } + /** + * Test method for {@link LanguageEventData#getResult()}. + */ + @Test + public void testResult() { + String message = "Good"; + eventData.setResult(message); + assertEquals(message, eventData.getResult()); + assertEquals(message, eventData.get(LanguageEventData.RESULT)); + } + /** * Test method for {@link LanguageEventData#getException()}. */ @Test public void testException() { - Exception ex = new Exception("My exception"); - eventData.setException(ex); - assertEquals(ex, eventData.getException()); - assertEquals(ex, eventData.get(LanguageEventData.EXCEPTION)); + String message = "My exception"; + Exception ex = new Exception(message); + eventData.setException(ex.getMessage()); + assertEquals(message, eventData.getException()); + assertEquals(message, eventData.get(LanguageEventData.EXCEPTION)); } /** diff --git a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/TriggerFlows.java b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/TriggerFlows.java index bc4ca6d7d..2d8e67cf6 100644 --- a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/TriggerFlows.java +++ b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/TriggerFlows.java @@ -59,7 +59,7 @@ public class TriggerFlows { ScoreEvent event = finishEvent.take(); if (event.getEventType().equals(ScoreLangConstants.SLANG_EXECUTION_EXCEPTION)){ LanguageEventData languageEvent = (LanguageEventData) event.getData(); - throw new RuntimeException((String) languageEvent.get(LanguageEventData.EXCEPTION)); + throw new RuntimeException(languageEvent.getException()); } slang.unSubscribeOnEvents(finishListener); return event;

['cloudslang-content-verifier/src/main/java/io/cloudslang/lang/tools/build/tester/TriggerTestCaseEventListener.java', 'cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/TriggerFlows.java', 'cloudslang-content-verifier/src/test/java/io/cloudslang/lang/tools/build/tester/SlangTestRunnerTest.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java', 'cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/events/LanguageEventDataTest.java']

{'.java': 5}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/281/259

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/259

https://github.com/CloudSlang/cloud-slang/pull/281

https://github.com/CloudSlang/cloud-slang/pull/281

fixes

iterating over empty arrays problem

I ran over this usecase where a loop is supposed to iterate over an empty array and I get an unclear message Command failed java.lang.RuntimeException: Slang Error : Error running: 'get_parent_image' ``` null ``` As @orius123 we should either show a warning about not being allowed to iterate over empty arrays or just skip the loop

b1109134b20c17a780a4905ca7d2b9e1555da9ed

3aa6eed8e31ac101b25d5cc89594c04cb65990d5

https://github.com/cloudslang/cloud-slang/compare/b1109134b20c17a780a4905ca7d2b9e1555da9ed...3aa6eed8e31ac101b25d5cc89594c04cb65990d5

diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/AsyncLoopBinding.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/AsyncLoopBinding.java index 504ffaa27..6e8134ef7 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/AsyncLoopBinding.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/AsyncLoopBinding.java @@ -27,24 +27,31 @@ import java.util.List; @Component public class AsyncLoopBinding { + public static final String ASYNC_LOOP_EXPRESSION_ERROR_MESSAGE = "Error evaluating async loop expression in task"; + @Autowired private ScriptEvaluator scriptEvaluator; + public static String generateAsyncLoopExpressionMessage(String nodeName, String message) { + return ASYNC_LOOP_EXPRESSION_ERROR_MESSAGE + " '" + nodeName + "', error is: \\n" + message; + } + public List<Serializable> bindAsyncLoopList(AsyncLoopStatement asyncLoopStatement, Context flowContext, String nodeName) { - Validate.notNull(asyncLoopStatement, "async task statement cannot be null"); + Validate.notNull(asyncLoopStatement, "async loop statement cannot be null"); Validate.notNull(flowContext, "flow context cannot be null"); Validate.notNull(nodeName, "node name cannot be null"); + List<Serializable> evalResult; try { - @SuppressWarnings("unchecked") List<Serializable> evalResult = (List<Serializable>) scriptEvaluator.evalExpr( + evalResult = (List<Serializable>) scriptEvaluator.evalExpr( asyncLoopStatement.getExpression(), flowContext.getImmutableViewOfVariables()); - if (CollectionUtils.isEmpty(evalResult)) { - throw new RuntimeException("Expression cannot be empty"); - } - return evalResult; } catch (Throwable t) { - throw new RuntimeException("Error evaluating async loop expression in task '" + nodeName + "', error is: \\n" + t.getMessage(), t); + throw new RuntimeException(generateAsyncLoopExpressionMessage(nodeName, t.getMessage()), t); + } + if (CollectionUtils.isEmpty(evalResult)) { + throw new RuntimeException(generateAsyncLoopExpressionMessage(nodeName, "expression is empty")); } + return evalResult; } } diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/LoopsBinding.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/LoopsBinding.java index 2914640ae..d1c047018 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/LoopsBinding.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/LoopsBinding.java @@ -34,6 +34,9 @@ import static io.cloudslang.lang.runtime.env.LoopCondition.LOOP_CONDITION_KEY; @Component public class LoopsBinding { + public static final String FOR_LOOP_EXPRESSION_ERROR_MESSAGE = "Error evaluating for loop expression in task"; + public static final String INVALID_MAP_EXPRESSION_MESSAGE = "Invalid expression for iterating maps"; + private final Logger logger = Logger.getLogger(getClass()); @Autowired @@ -85,7 +88,7 @@ public class LoopsBinding { try { evalResult = scriptEvaluator.evalExpr(collectionExpression, variables); } catch (Throwable t) { - throw new RuntimeException("Error evaluating for loop expression in task '" + nodeName + "',\\n\\tError is: " + t.getMessage(), t); + throw new RuntimeException(FOR_LOOP_EXPRESSION_ERROR_MESSAGE + " '" + nodeName + "',\\n\\tError is: " + t.getMessage(), t); } if (forLoopStatement instanceof MapForLoopStatement) { @@ -97,7 +100,7 @@ public class LoopsBinding { } evalResult = (Serializable) entriesAsSerializable; } else { - throw new RuntimeException("Invalid expression for iterating maps: " + collectionExpression); + throw new RuntimeException(INVALID_MAP_EXPRESSION_MESSAGE + ": " + collectionExpression); } } @@ -107,6 +110,9 @@ public class LoopsBinding { "in task: '" + nodeName + "' " + "doesn't return an iterable, other types are not supported"); } + if (!forLoopCondition.hasMore()) { + throw new RuntimeException(FOR_LOOP_EXPRESSION_ERROR_MESSAGE + " '" + nodeName + "',\\n\\tError is: expression is empty"); + } return forLoopCondition; } diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/AsyncLoopBindingTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/AsyncLoopBindingTest.java index a3a416d75..023f816c3 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/AsyncLoopBindingTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/AsyncLoopBindingTest.java @@ -67,6 +67,21 @@ public class AsyncLoopBindingTest { assertEquals("returned async loop list not as expected", expectedList, actualList); } + @Test + public void testEmptyExpressionThrowsException() throws Exception { + Map<String, Serializable> variables = new HashMap<>(); + variables.put("key1", "value1"); + variables.put("key2", "value2"); + Context context = new Context(variables); + + when(scriptEvaluator.evalExpr(eq("expression"), eq(variables))).thenReturn(Lists.newArrayList()); + + exception.expectMessage("expression is empty"); + exception.expect(RuntimeException.class); + + asyncLoopBinding.bindAsyncLoopList(createBasicSyncLoopStatement(), context, "nodeName"); + } + @Test public void testExceptionIsPropagated() throws Exception { Map<String, Serializable> variables = new HashMap<>(); diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/LoopsBindingTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/LoopsBindingTest.java index f1fdf3558..854a6aa1f 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/LoopsBindingTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/LoopsBindingTest.java @@ -14,6 +14,7 @@ import org.mockito.runners.MockitoJUnitRunner; import io.cloudslang.lang.entities.LoopStatement; import io.cloudslang.lang.runtime.env.Context; import io.cloudslang.lang.runtime.env.ForLoopCondition; +import org.python.google.common.collect.Lists; import javax.script.ScriptEngine; import java.io.Serializable; @@ -49,13 +50,27 @@ public class LoopsBindingTest { public void whenValueIsNotThereItWillBeCreated() throws Exception { Context context = mock(Context.class); when(scriptEvaluator.evalExpr(anyString(), anyMapOf(String.class, Serializable.class))) - .thenReturn(new ArrayList<>()); + .thenReturn(Lists.newArrayList(1)); HashMap<String, Serializable> langVars = new HashMap<>(); when(context.getLangVariables()).thenReturn(langVars); loopsBinding.getOrCreateLoopCondition(createBasicForStatement(), context, "node"); Assert.assertEquals(true, context.getLangVariables().containsKey(LoopCondition.LOOP_CONDITION_KEY)); } + @Test + public void whenExpressionIsEmptyThrowsException() throws Exception { + Context context = mock(Context.class); + when(scriptEvaluator.evalExpr(anyString(), anyMapOf(String.class, Serializable.class))) + .thenReturn(Lists.newArrayList()); + HashMap<String, Serializable> langVars = new HashMap<>(); + when(context.getLangVariables()).thenReturn(langVars); + + exception.expectMessage("expression is empty"); + exception.expect(RuntimeException.class); + + loopsBinding.getOrCreateLoopCondition(createBasicForStatement(), context, "node"); + } + @Test(expected = RuntimeException.class) public void passingNullLoopStatementThrowsException() throws Exception { loopsBinding.getOrCreateLoopCondition(null, mock(Context.class), "aa"); @@ -109,4 +124,5 @@ public class LoopsBindingTest { verify(context).putVariable("k", "john"); verify(context).putVariable("v", 1); } + } \\ No newline at end of file

['cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/AsyncLoopBindingTest.java', 'cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/LoopsBindingTest.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/AsyncLoopBinding.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/bindings/LoopsBinding.java']

{'.java': 4}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/310/300

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/300

https://github.com/CloudSlang/cloud-slang/pull/310

https://github.com/CloudSlang/cloud-slang/pull/310

fixes

wrong path created by slang actions

the path created by slang action is not correct and also doe not represent the language syntax and how does the user expect to. comment: i already have the fix

8ba75c87d81306fd768aa0ed52a922c0acfd1567

d1000b475377c637b55c88594c452ac15a791c47

https://github.com/cloudslang/cloud-slang/compare/8ba75c87d81306fd768aa0ed52a922c0acfd1567...d1000b475377c637b55c88594c452ac15a791c47

diff --git a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/SyncTriggerEventListener.java b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/SyncTriggerEventListener.java index 53e65db71..2658e94d7 100644 --- a/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/SyncTriggerEventListener.java +++ b/cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/SyncTriggerEventListener.java @@ -73,9 +73,10 @@ public class SyncTriggerEventListener implements ScoreEventListener{ errorMessage.set(SLANG_STEP_ERROR_MSG + data.get(LanguageEventData.EXCEPTION)); break; case ScoreLangConstants.EVENT_INPUT_END: - String taskName = (String)data.get(LanguageEventData.levelName.TASK_NAME.name()); - if(StringUtils.isNotEmpty(taskName)){ - String path = (String) data.get(LanguageEventData.PATH); + LanguageEventData eventData = (LanguageEventData) data; + if(eventData.getStepType() == LanguageEventData.StepType.TASK){ + String taskName = eventData.getStepName(); + String path = eventData.getPath(); int matches = StringUtils.countMatches(path, ExecutionPath.PATH_SEPARATOR); String prefix = StringUtils.repeat(TASK_PATH_PREFIX, matches); printWithColor(Ansi.Color.YELLOW, prefix + taskName); @@ -121,7 +122,7 @@ public class SyncTriggerEventListener implements ScoreEventListener{ private void printFinishEvent(Map<String, Serializable> data) { String flowResult = (String)data.get(LanguageEventData.RESULT); - String flowName = (String)data.get(LanguageEventData.levelName.EXECUTABLE_NAME.toString()); + String flowName = (String)data.get(LanguageEventData.STEP_NAME); printWithColor(Ansi.Color.CYAN,"Flow : " + flowName + " finished with result : " + flowResult); } diff --git a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilder.java b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilder.java index d2ddd2c28..aa5859033 100644 --- a/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilder.java +++ b/cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilder.java @@ -1,28 +1,32 @@ /******************************************************************************* -* (c) Copyright 2014 Hewlett-Packard Development Company, L.P. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Apache License v2.0 which accompany this distribution. -* -* The Apache License is available at -* http://www.apache.org/licenses/LICENSE-2.0 -* -*******************************************************************************/ + * (c) Copyright 2014 Hewlett-Packard Development Company, L.P. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Apache License v2.0 which accompany this distribution. + * + * The Apache License is available at + * http://www.apache.org/licenses/LICENSE-2.0 + * + *******************************************************************************/ package io.cloudslang.lang.compiler.scorecompiler; import ch.lambdaj.Lambda; +import io.cloudslang.lang.compiler.modeller.model.Flow; +import io.cloudslang.lang.compiler.modeller.model.Operation; import io.cloudslang.lang.compiler.modeller.model.Task; import io.cloudslang.lang.entities.ResultNavigation; import io.cloudslang.lang.entities.bindings.Result; -import io.cloudslang.lang.compiler.modeller.model.Flow; -import io.cloudslang.lang.compiler.modeller.model.Operation; -import org.apache.commons.collections4.CollectionUtils; import io.cloudslang.score.api.ExecutionPlan; import io.cloudslang.score.api.ExecutionStep; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.ArrayList; +import java.util.Deque; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static ch.lambdaj.Lambda.having; import static ch.lambdaj.Lambda.on; @@ -106,23 +110,14 @@ public class ExecutionPlanBuilder { if (isAsync) { Long joinStepID = currentId + NUMBER_OF_ASYNC_LOOP_EXECUTION_STEPS + 1; taskExecutionSteps.add( - stepFactory.createAddBranchesStep( - currentId++, - joinStepID, - currentId, - task.getPreTaskActionData(), - compiledFlow.getId(), - taskName + stepFactory.createAddBranchesStep(currentId++, joinStepID, currentId, + task.getPreTaskActionData(), compiledFlow.getId(), taskName ) ); } taskExecutionSteps.add( - stepFactory.createBeginTaskStep( - currentId++, - task.getInputs(), - task.getPreTaskActionData(), - task.getRefId(), - taskName) + stepFactory.createBeginTaskStep(currentId++, task.getInputs(), + task.getPreTaskActionData(), task.getRefId(), taskName) ); //End Task @@ -131,39 +126,28 @@ public class ExecutionPlanBuilder { String nextStepName = entry.getValue(); if (taskReferences.get(nextStepName) == null) { Task nextTaskToCompile = Lambda.selectFirst(tasks, having(on(Task.class).getName(), equalTo(nextStepName))); - if(nextTaskToCompile == null){ + if (nextTaskToCompile == null) { throw new RuntimeException("Failed to compile task: " + taskName + ". The task/result name: " + entry.getValue() + " of navigation: " + entry.getKey() + " -> " + entry.getValue() + " is missing"); } taskExecutionSteps.addAll(buildTaskExecutionSteps(nextTaskToCompile, taskReferences, tasks, compiledFlow)); } - long nextStepId = taskReferences.get(nextStepName); - String presetResult = (FLOW_END_STEP_ID == nextStepId) ? nextStepName : null; - navigationValues.put(entry.getKey(), new ResultNavigation(nextStepId, presetResult)); + long nextStepId = taskReferences.get(nextStepName); + String presetResult = (FLOW_END_STEP_ID == nextStepId) ? nextStepName : null; + navigationValues.put(entry.getKey(), new ResultNavigation(nextStepId, presetResult)); } if (isAsync) { taskExecutionSteps.add( - stepFactory.createFinishTaskStep( - currentId++, - task.getPostTaskActionData(), - new HashMap<String, ResultNavigation>(), - taskName, - true) + stepFactory.createFinishTaskStep(currentId++, task.getPostTaskActionData(), + new HashMap<String, ResultNavigation>(), taskName, true) ); taskExecutionSteps.add( - stepFactory.createJoinBranchesStep( - currentId, - task.getPostTaskActionData(), - navigationValues, - taskName) + stepFactory.createJoinBranchesStep(currentId, task.getPostTaskActionData(), + navigationValues, taskName) ); } else { taskExecutionSteps.add( - stepFactory.createFinishTaskStep( - currentId, - task.getPostTaskActionData(), - navigationValues, - taskName, - false) + stepFactory.createFinishTaskStep(currentId, task.getPostTaskActionData(), + navigationValues, taskName, false) ); } return taskExecutionSteps; diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/env/ExecutionPath.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/env/ExecutionPath.java index f2be9b704..787d59069 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/env/ExecutionPath.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/env/ExecutionPath.java @@ -1,70 +1,61 @@ /******************************************************************************* -* (c) Copyright 2014 Hewlett-Packard Development Company, L.P. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Apache License v2.0 which accompany this distribution. -* -* The Apache License is available at -* http://www.apache.org/licenses/LICENSE-2.0 -* -*******************************************************************************/ + * (c) Copyright 2014 Hewlett-Packard Development Company, L.P. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Apache License v2.0 which accompany this distribution. + * + * The Apache License is available at + * http://www.apache.org/licenses/LICENSE-2.0 + * + *******************************************************************************/ package io.cloudslang.lang.runtime.env; +import org.apache.commons.lang3.StringUtils; + import java.io.Serializable; import java.util.ArrayDeque; import java.util.Deque; -import java.util.Iterator; + +import static org.apache.commons.lang3.StringUtils.join; /** * @author moradi * @since 06/11/2014 - * @version $Id$ */ public class ExecutionPath implements Serializable { - public static final String PATH_SEPARATOR = "/"; - private static final long serialVersionUID = 5536588094244112461L; + public static final String PATH_SEPARATOR = "."; - private Deque<Integer> parentPositions; - private int position; + private Deque<Integer> parentPositions; + private int position; - public ExecutionPath() { - parentPositions = new ArrayDeque<>(); - } - - public int forward() { - return position++; - } + public ExecutionPath() { + parentPositions = new ArrayDeque<>(); + } - public int down() { - parentPositions.push(position); - position = 0; - return position; - } + public void forward() { + position++; + } - public int up() { - position = parentPositions.pop(); - return position; - } + public void down() { + parentPositions.push(position); + position = 0; + } - public int getDepth() { - return parentPositions.size(); - } + public void up() { + position = parentPositions.pop(); + } - public String getCurrentPath() { + public String getCurrentPath() { return getCurrentPath(position); - } + } - public String getCurrentPathPeekForward() { - return getCurrentPath(position + 1); + public String getParentPath() { + return join(parentPositions.descendingIterator(), PATH_SEPARATOR); } private String getCurrentPath(int position) { - StringBuilder result = new StringBuilder(); - for(Iterator<Integer> iterator = parentPositions.descendingIterator(); iterator.hasNext();) { - result.append(iterator.next()).append(PATH_SEPARATOR); - } - result.append(position); - return result.toString(); + String parents = getParentPath(); + return StringUtils.isEmpty(parents) ? position + "" : parents + PATH_SEPARATOR + position; } } diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java index 0a2ede4a0..2e3259526 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java @@ -1,12 +1,12 @@ /******************************************************************************* -* (c) Copyright 2014 Hewlett-Packard Development Company, L.P. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Apache License v2.0 which accompany this distribution. -* -* The Apache License is available at -* http://www.apache.org/licenses/LICENSE-2.0 -* -*******************************************************************************/ + * (c) Copyright 2014 Hewlett-Packard Development Company, L.P. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Apache License v2.0 which accompany this distribution. + * + * The Apache License is available at + * http://www.apache.org/licenses/LICENSE-2.0 + * + *******************************************************************************/ package io.cloudslang.lang.runtime.events; import java.io.Serializable; @@ -17,95 +17,114 @@ import java.util.Map; /** * @author moradi - * @since 03/11/2014 * @version $Id$ + * @since 03/11/2014 */ public class LanguageEventData extends HashMap<String, Serializable> { - public static final String TYPE = "TYPE"; - public static final String DESCRIPTION = "DESCRIPTION"; - public static final String TIMESTAMP = "TIMESTAMP"; - public static final String EXECUTIONID = "EXECUTIONID"; - public static final String PATH = "PATH"; - public static final String EXCEPTION = "EXCEPTION"; - public static final String OUTPUTS = "OUTPUTS"; + public static final String TYPE = "TYPE"; + public static final String DESCRIPTION = "DESCRIPTION"; + public static final String TIMESTAMP = "TIMESTAMP"; + public static final String EXECUTION_ID = "EXECUTION_ID"; + public static final String PATH = "PATH"; + public static final String EXCEPTION = "EXCEPTION"; + public static final String OUTPUTS = "OUTPUTS"; public static final String RESULT = "RESULT"; - public static final String CALL_ARGUMENTS = "CALL_ARGUMENTS"; - public static final String BOUND_INPUTS = "BOUND_INPUTS"; + public static final String CALL_ARGUMENTS = "CALL_ARGUMENTS"; + public static final String BOUND_INPUTS = "BOUND_INPUTS"; public static final String BOUND_ASYNC_LOOP_EXPRESSION = "BOUND_ASYNC_LOOP_EXPRESSION"; - public static final String RETURN_VALUES = "RETURN_VALUES"; + public static final String RETURN_VALUES = "RETURN_VALUES"; public static final String NEXT_STEP_POSITION = "nextPosition"; - public static final String ENCRYPTED_VALUE = "*****"; - private static final long serialVersionUID = 2885051907156304718L; + public static final String ENCRYPTED_VALUE = "*****"; + public static final String STEP_TYPE = "STEP_TYPE"; + public static final String STEP_NAME = "STEP_NAME"; + + public enum StepType { + TASK, + EXECUTABLE, + ACTION, + NAVIGATION + } - public enum levelName { - TASK_NAME, - EXECUTABLE_NAME - } + public String getStepName() { + return (String) get(STEP_NAME); + } - public String getEventType() { - return (String)get(TYPE); - } + public void setStepName(String stepName){ + put(STEP_NAME, stepName); + } - public void setEventType(String eventType) { - put(TYPE, eventType); - } + public StepType getStepType() { + return (StepType) get(STEP_TYPE); + } - public String getDescription() { - return (String)get(DESCRIPTION); - } + public void setStepType(StepType stepType){ + put(STEP_TYPE, stepType); + } - public void setDescription(String description) { - put(DESCRIPTION, description); - } + public String getEventType() { + return (String) get(TYPE); + } - public Date getTimeStamp() { - return (Date)get(TIMESTAMP); - } + public void setEventType(String eventType) { + put(TYPE, eventType); + } - public void setTimeStamp(Date timeStamp) { - put(TIMESTAMP, timeStamp); - } + public String getDescription() { + return (String) get(DESCRIPTION); + } - public Long getExecutionId() { - return (Long)get(EXECUTIONID); - } + public void setDescription(String description) { + put(DESCRIPTION, description); + } - public void setExecutionId(Long executionId) { - put(EXECUTIONID, executionId); - } + public Date getTimeStamp() { + return (Date) get(TIMESTAMP); + } - public String getPath() { - return (String)get(PATH); - } + public void setTimeStamp(Date timeStamp) { + put(TIMESTAMP, timeStamp); + } - public void setPath(String path) { - put(PATH, path); - } + public Long getExecutionId() { + return (Long) get(EXECUTION_ID); + } - public Exception getException() { - return (Exception)get(EXCEPTION); - } + public void setExecutionId(Long executionId) { + put(EXECUTION_ID, executionId); + } - public void setException(Exception ex) { - put(EXCEPTION, ex); - } + public String getPath() { + return (String) get(PATH); + } - public Map<String, Serializable> getInputs() { - return (Map<String, Serializable>)get(BOUND_INPUTS); - } + public void setPath(String path) { + put(PATH, path); + } - public void setInputs(Map<String, Serializable> inputs) { - put(BOUND_INPUTS, (Serializable)inputs); - } + public Exception getException() { + return (Exception) get(EXCEPTION); + } - public Map<String, Serializable> getOutputs() { - return (Map<String, Serializable>)get(OUTPUTS); - } + public void setException(Exception ex) { + put(EXCEPTION, ex); + } - public void setOutputs(Map<String, Serializable> outputs) { - put(OUTPUTS, (Serializable)outputs); - } + public Map<String, Serializable> getInputs() { + return (Map<String, Serializable>) get(BOUND_INPUTS); + } + + public void setInputs(Map<String, Serializable> inputs) { + put(BOUND_INPUTS, (Serializable) inputs); + } + + public Map<String, Serializable> getOutputs() { + return (Map<String, Serializable>) get(OUTPUTS); + } + + public void setOutputs(Map<String, Serializable> outputs) { + put(OUTPUTS, (Serializable) outputs); + } public List<Serializable> getAsyncLoopBoundExpression() { return (List<Serializable>) get(BOUND_ASYNC_LOOP_EXPRESSION); @@ -114,5 +133,4 @@ public class LanguageEventData extends HashMap<String, Serializable> { public void setAsyncLoopBoundExpression(List<Serializable> asyncLoopBoundExpression) { put(BOUND_ASYNC_LOOP_EXPRESSION, (Serializable) asyncLoopBoundExpression); } - } diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/navigations/Navigations.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/navigations/Navigations.java index 3c06e98c1..d69cc3945 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/navigations/Navigations.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/navigations/Navigations.java @@ -39,7 +39,8 @@ public class Navigations { // If we have an error key stored, we fire an error event and return null as the next position if(executionRuntimeServices.hasStepErrorKey()) { - AbstractSteps.fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.SLANG_EXECUTION_EXCEPTION, "Error detected during step", + AbstractSteps.fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.SLANG_EXECUTION_EXCEPTION, + "Error detected during step", LanguageEventData.StepType.NAVIGATION, null, Pair.of(LanguageEventData.EXCEPTION, executionRuntimeServices.getStepErrorKey())); throw new RuntimeException(executionRuntimeServices.getStepErrorKey()); } diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AbstractSteps.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AbstractSteps.java index 78190b1c5..84fdb1238 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AbstractSteps.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AbstractSteps.java @@ -25,9 +25,13 @@ import java.util.Map.Entry; public abstract class AbstractSteps { - public void sendBindingInputsEvent(List<Input> inputs, final Map<String, Serializable> context, RunEnvironment runEnv, - ExecutionRuntimeServices executionRuntimeServices, String desc, String nodeName, - LanguageEventData.levelName levelName) { + public void sendBindingInputsEvent(List<Input> inputs, + final Map<String, Serializable> context, + RunEnvironment runEnv, + ExecutionRuntimeServices executionRuntimeServices, + String desc, + LanguageEventData.StepType stepType, + String stepName) { Map<String, Serializable> inputsForEvent = new HashMap<>(); for (Input input : inputs) { String inputName = input.getName(); @@ -38,8 +42,8 @@ public abstract class AbstractSteps { inputsForEvent.put(inputName, inputValue); } } - fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_INPUT_END, desc, Pair.of(LanguageEventData.BOUND_INPUTS, - (Serializable) inputsForEvent), Pair.of(levelName.name(), nodeName)); + fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_INPUT_END, desc, stepType, stepName, + Pair.of(LanguageEventData.BOUND_INPUTS, (Serializable) inputsForEvent)); } @SafeVarargs @@ -47,14 +51,11 @@ public abstract class AbstractSteps { RunEnvironment runEnvironment, String type, String description, + LanguageEventData.StepType stepType, + String stepName, Map.Entry<String, ? extends Serializable>... fields) { - fireEvent( - runtimeServices, - type, - description, - runEnvironment.getExecutionPath().getCurrentPath(), - fields - ); + fireEvent(runtimeServices, type, description, + runEnvironment.getExecutionPath().getCurrentPath(), stepType, stepName, fields); } @SafeVarargs @@ -62,8 +63,12 @@ public abstract class AbstractSteps { String type, String description, String path, + LanguageEventData.StepType stepType, + String stepName, Map.Entry<String, ? extends Serializable>... fields) { LanguageEventData eventData = new LanguageEventData(); + eventData.setStepType(stepType); + eventData.setStepName(stepName); eventData.setEventType(type); eventData.setDescription(description); eventData.setTimeStamp(new Date()); diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java index 0bf4df3d2..cdad7ad78 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java @@ -68,7 +68,9 @@ public class ActionSteps extends AbstractSteps { Map<String, Serializable> returnValue = new HashMap<>(); Map<String, Serializable> callArguments = runEnv.removeCallArguments(); Map<String, SerializableSessionObject> serializableSessionData = runEnv.getSerializableDataMap(); - fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_ACTION_START, "Preparing to run action " + actionType, Pair.of(LanguageEventData.CALL_ARGUMENTS, (Serializable) callArguments)); + fireEvent(executionRuntimeServices, ScoreLangConstants.EVENT_ACTION_START, "Preparing to run action " + actionType, + runEnv.getExecutionPath().getParentPath(), LanguageEventData.StepType.ACTION, null, + Pair.of(LanguageEventData.CALL_ARGUMENTS, (Serializable) callArguments)); try { switch (actionType) { case JAVA: @@ -81,7 +83,9 @@ public class ActionSteps extends AbstractSteps { break; } } catch (RuntimeException ex) { - fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_ACTION_ERROR, ex.getMessage(), Pair.of(LanguageEventData.EXCEPTION, ex.getMessage())); + fireEvent(executionRuntimeServices, ScoreLangConstants.EVENT_ACTION_ERROR, ex.getMessage(), + runEnv.getExecutionPath().getParentPath(), LanguageEventData.StepType.ACTION, null, + Pair.of(LanguageEventData.EXCEPTION, ex.getMessage())); logger.error(ex); throw(ex); } @@ -90,7 +94,9 @@ public class ActionSteps extends AbstractSteps { ReturnValues returnValues = new ReturnValues(returnValue, null); runEnv.putReturnValues(returnValues); - fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_ACTION_END, "Action performed", Pair.of(LanguageEventData.RETURN_VALUES, (Serializable)returnValue)); + fireEvent(executionRuntimeServices, ScoreLangConstants.EVENT_ACTION_END, "Action performed", + runEnv.getExecutionPath().getParentPath(), LanguageEventData.StepType.ACTION, null, + Pair.of(LanguageEventData.RETURN_VALUES, (Serializable)returnValue)); runEnv.putNextStepPosition(nextStepId); } diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AsyncLoopSteps.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AsyncLoopSteps.java index de9499b79..c93a8782c 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AsyncLoopSteps.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AsyncLoopSteps.java @@ -16,7 +16,6 @@ import io.cloudslang.lang.entities.ScoreLangConstants; import io.cloudslang.lang.entities.bindings.Output; import io.cloudslang.lang.runtime.RuntimeConstants; import io.cloudslang.lang.runtime.bindings.AsyncLoopBinding; -import io.cloudslang.lang.runtime.bindings.LoopsBinding; import io.cloudslang.lang.runtime.bindings.OutputsBinding; import io.cloudslang.lang.runtime.env.*; import io.cloudslang.lang.runtime.events.LanguageEventData; @@ -48,9 +47,6 @@ public class AsyncLoopSteps extends AbstractSteps { @Autowired private AsyncLoopBinding asyncLoopBinding; - @Autowired - private LoopsBinding loopsBinding; - @Autowired private OutputsBinding outputsBinding; @@ -70,22 +66,21 @@ public class AsyncLoopSteps extends AbstractSteps { List<Serializable> splitData = asyncLoopBinding.bindAsyncLoopList(asyncLoopStatement, flowContext, nodeName); - fireEvent( - executionRuntimeServices, - ScoreLangConstants.EVENT_ASYNC_LOOP_EXPRESSION_END, - "async loop expression bound", - runEnv.getExecutionPath().getCurrentPathPeekForward(), - Pair.of(LanguageEventData.BOUND_ASYNC_LOOP_EXPRESSION, (Serializable) splitData), - Pair.of(LanguageEventData.levelName.TASK_NAME.name(), nodeName)); + fireEvent(executionRuntimeServices, ScoreLangConstants.EVENT_ASYNC_LOOP_EXPRESSION_END, + "async loop expression bound", runEnv.getExecutionPath().getCurrentPath(), + LanguageEventData.StepType.TASK, nodeName, + Pair.of(LanguageEventData.BOUND_ASYNC_LOOP_EXPRESSION, (Serializable) splitData)); runEnv.putNextStepPosition(nextStepId); + runEnv.getExecutionPath().down(); for (Serializable splitItem : splitData) { RunEnvironment branchRuntimeEnvironment = (RunEnvironment) SerializationUtils.clone(runEnv); Context branchContext = (Context) SerializationUtils.clone(flowContext); branchContext.putVariable(asyncLoopStatement.getVarName(), splitItem); - updateCallArgumentsAndPushContextToStack(branchRuntimeEnvironment, branchContext, new HashMap<String, Serializable>()); + updateCallArgumentsAndPushContextToStack(branchRuntimeEnvironment, + branchContext, new HashMap<String, Serializable>()); createBranch( branchRuntimeEnvironment, @@ -95,20 +90,15 @@ public class AsyncLoopSteps extends AbstractSteps { nextStepId, branchBeginStep); - fireEvent( - executionRuntimeServices, - ScoreLangConstants.EVENT_BRANCH_START, - "async loop branch created", - runEnv.getExecutionPath().getCurrentPathPeekForward(), - Pair.of(ScoreLangConstants.REF_ID, refId), - Pair.of(RuntimeConstants.SPLIT_ITEM_KEY, splitItem), - Pair.of(LanguageEventData.levelName.TASK_NAME.name(), nodeName)); + fireEvent(executionRuntimeServices, ScoreLangConstants.EVENT_BRANCH_START, + "async loop branch created", runEnv.getExecutionPath().getCurrentPath(), + LanguageEventData.StepType.TASK, nodeName, Pair.of(ScoreLangConstants.REF_ID, refId), + Pair.of(RuntimeConstants.SPLIT_ITEM_KEY, splitItem)); + + runEnv.getExecutionPath().forward(); } updateCallArgumentsAndPushContextToStack(runEnv, flowContext, new HashMap<String, Serializable>()); - - // forward after the branches are created because begin task method also calls forward - runEnv.getExecutionPath().forward(); } catch (RuntimeException e) { logger.error("There was an error running the add branches execution step of: \\'" + nodeName + "\\'. Error is: " + e.getMessage()); throw new RuntimeException("Error running: " + nodeName + ": " + e.getMessage(), e); @@ -122,6 +112,7 @@ public class AsyncLoopSteps extends AbstractSteps { @Param(ScoreLangConstants.TASK_NAVIGATION_KEY) Map<String, ResultNavigation> taskNavigationValues, @Param(ScoreLangConstants.NODE_NAME_KEY) String nodeName) { try { + runEnv.getExecutionPath().up(); List<Map<String, Serializable>> branchesContext = Lists.newArrayList(); Context flowContext = runEnv.getStack().popContext(); Map<String, Serializable> contextBeforeSplit = flowContext.getImmutableViewOfVariables(); @@ -146,6 +137,7 @@ public class AsyncLoopSteps extends AbstractSteps { handleNavigationAndReturnValues(runEnv, executionRuntimeServices, taskNavigationValues, nodeName, publishValues, asyncLoopResult); runEnv.getStack().pushContext(flowContext); + runEnv.getExecutionPath().forward(); } catch (RuntimeException e) { logger.error("There was an error running the end task execution step of: \\'" + nodeName + "\\'. Error is: " + e.getMessage()); throw new RuntimeException("Error running: \\'" + nodeName + "\\': " + e.getMessage(), e); @@ -172,15 +164,11 @@ public class AsyncLoopSteps extends AbstractSteps { HashMap<String, Serializable> outputs = new HashMap<>(publishValues); ReturnValues returnValues = new ReturnValues(outputs, presetResult != null ? presetResult : asyncLoopResult); - fireEvent( - executionRuntimeServices, - runEnv, - ScoreLangConstants.EVENT_ASYNC_LOOP_OUTPUT_END, - "Async loop output binding finished", + fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_ASYNC_LOOP_OUTPUT_END, + "Async loop output binding finished", LanguageEventData.StepType.TASK, nodeName, Pair.of(LanguageEventData.OUTPUTS, (Serializable) publishValues), Pair.of(LanguageEventData.RESULT, returnValues.getResult()), - Pair.of(LanguageEventData.NEXT_STEP_POSITION, nextStepPosition), - Pair.of(LanguageEventData.levelName.TASK_NAME.name(), nodeName)); + Pair.of(LanguageEventData.NEXT_STEP_POSITION, nextStepPosition)); runEnv.putReturnValues(returnValues); runEnv.putNextStepPosition(nextStepPosition); @@ -213,10 +201,9 @@ public class AsyncLoopSteps extends AbstractSteps { executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_ASYNC_LOOP_OUTPUT_START, - "Async loop output binding started", + "Async loop output binding started", LanguageEventData.StepType.TASK, nodeName, Pair.of(ScoreLangConstants.TASK_AGGREGATE_KEY, (Serializable) taskAggregateValues), - Pair.of(ScoreLangConstants.TASK_NAVIGATION_KEY, taskNavigationValues), - Pair.of(LanguageEventData.levelName.TASK_NAME.name(), nodeName)); + Pair.of(ScoreLangConstants.TASK_NAVIGATION_KEY, taskNavigationValues)); return outputsBinding.bindOutputs(contextBeforeSplit, aggregateContext, taskAggregateValues); } @@ -239,13 +226,9 @@ public class AsyncLoopSteps extends AbstractSteps { ReturnValues executableReturnValues = branchRuntimeEnvironment.removeReturnValues(); branchesResult.add(executableReturnValues.getResult()); - fireEvent( - executionRuntimeServices, - runEnv, - ScoreLangConstants.EVENT_BRANCH_END, - "async loop branch ended", - Pair.of(RuntimeConstants.BRANCH_RETURN_VALUES_KEY, executableReturnValues), - Pair.of(LanguageEventData.levelName.TASK_NAME.name(), nodeName) + fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_BRANCH_END, + "async loop branch ended", LanguageEventData.StepType.TASK, nodeName, + Pair.of(RuntimeConstants.BRANCH_RETURN_VALUES_KEY, executableReturnValues) ); } } diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ExecutableSteps.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ExecutableSteps.java index de570b2c6..721f8f87e 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ExecutableSteps.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ExecutableSteps.java @@ -43,6 +43,8 @@ import static io.cloudslang.score.api.execution.ExecutionParametersConsts.EXECUT @Component public class ExecutableSteps extends AbstractSteps { + public static final String ACTION_RETURN_VALUES_KEY = "actionReturnValues"; + @Autowired private ResultsBinding resultsBinding; @@ -61,7 +63,6 @@ public class ExecutableSteps extends AbstractSteps { @Param(ScoreLangConstants.NODE_NAME_KEY) String nodeName, @Param(ScoreLangConstants.NEXT_STEP_ID_KEY) Long nextStepId) { try { -// runEnv.getExecutionPath().forward(); // Start with 1 for consistency Map<String, Serializable> callArguments = runEnv.removeCallArguments(); if (userInputs != null) { @@ -84,11 +85,11 @@ public class ExecutableSteps extends AbstractSteps { updateCallArgumentsAndPushContextToStack(runEnv, new Context(executableContext), actionArguments); sendBindingInputsEvent(executableInputs, executableContext, runEnv, executionRuntimeServices, - "Post Input binding for operation/flow", nodeName, LanguageEventData.levelName.EXECUTABLE_NAME); + "Post Input binding for operation/flow", LanguageEventData.StepType.EXECUTABLE, nodeName); // put the next step position for the navigation runEnv.putNextStepPosition(nextStepId); - runEnv.getExecutionPath().down(); + runEnv.getExecutionPath().down(); } catch (RuntimeException e){ logger.error("There was an error running the start executable execution step of: \\'" + nodeName + "\\'.\\n\\tError is: " + e.getMessage()); throw new RuntimeException("Error running: \\'" + nodeName + "\\'.\\n\\t " + e.getMessage(), e); @@ -109,14 +110,15 @@ public class ExecutableSteps extends AbstractSteps { @Param(EXECUTION_RUNTIME_SERVICES) ExecutionRuntimeServices executionRuntimeServices, @Param(ScoreLangConstants.NODE_NAME_KEY) String nodeName) { try { - runEnv.getExecutionPath().up(); + runEnv.getExecutionPath().up(); Context operationContext = runEnv.getStack().popContext(); Map<String, Serializable> operationVariables = operationContext == null ? null : operationContext.getImmutableViewOfVariables(); ReturnValues actionReturnValues = runEnv.removeReturnValues(); fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_OUTPUT_START, "Output binding started", + LanguageEventData.StepType.EXECUTABLE, nodeName, Pair.of(ScoreLangConstants.EXECUTABLE_OUTPUTS_KEY, (Serializable) executableOutputs), Pair.of(ScoreLangConstants.EXECUTABLE_RESULTS_KEY, (Serializable) executableResults), - Pair.of("actionReturnValues", actionReturnValues), Pair.of(LanguageEventData.levelName.EXECUTABLE_NAME.toString(), nodeName)); + Pair.of(ACTION_RETURN_VALUES_KEY, actionReturnValues)); // Resolving the result of the operation/flow String result = resultsBinding.resolveResult(operationVariables, actionReturnValues.getOutputs(), executableResults, actionReturnValues.getResult()); @@ -128,19 +130,19 @@ public class ExecutableSteps extends AbstractSteps { ReturnValues returnValues = new ReturnValues(operationReturnOutputs, result); runEnv.putReturnValues(returnValues); fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_OUTPUT_END, "Output binding finished", + LanguageEventData.StepType.EXECUTABLE, nodeName, Pair.of(LanguageEventData.OUTPUTS, (Serializable) operationReturnOutputs), - Pair.of(LanguageEventData.RESULT, returnValues.getResult()), - Pair.of(LanguageEventData.levelName.EXECUTABLE_NAME.toString(), nodeName)); + Pair.of(LanguageEventData.RESULT, returnValues.getResult())); // If we have parent flow data on the stack, we pop it and request the score engine to switch to the parent // execution plan id once it can, and we set the next position that was stored there for the use of the navigation if (!runEnv.getParentFlowStack().isEmpty()) { handleNavigationToParent(runEnv, executionRuntimeServices); } else { - fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_EXECUTION_FINISHED, "Execution finished running", + fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_EXECUTION_FINISHED, + "Execution finished running", LanguageEventData.StepType.EXECUTABLE, nodeName, Pair.of(LanguageEventData.RESULT, returnValues.getResult()), - Pair.of(LanguageEventData.OUTPUTS, (Serializable) operationReturnOutputs), - Pair.of(LanguageEventData.levelName.EXECUTABLE_NAME.toString(), nodeName)); + Pair.of(LanguageEventData.OUTPUTS, (Serializable) operationReturnOutputs)); } } catch (RuntimeException e){ logger.error("There was an error running the finish executable execution step of: \\'" + nodeName + "\\'.\\n\\tError is: " + e.getMessage()); diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/TaskSteps.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/TaskSteps.java index a67888d04..9d6ab16c3 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/TaskSteps.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/TaskSteps.java @@ -65,7 +65,6 @@ public class TaskSteps extends AbstractSteps { @Param(ScoreLangConstants.NEXT_STEP_ID_KEY) Long nextStepId, @Param(ScoreLangConstants.REF_ID) String refId) { try { - runEnv.getExecutionPath().forward(); runEnv.removeCallArguments(); runEnv.removeReturnValues(); @@ -103,7 +102,7 @@ public class TaskSteps extends AbstractSteps { //todo: hook sendBindingInputsEvent(taskInputs, operationArguments, runEnv, executionRuntimeServices, "Task inputs resolved", - nodeName, LanguageEventData.levelName.TASK_NAME); + LanguageEventData.StepType.TASK, nodeName); updateCallArgumentsAndPushContextToStack(runEnv, flowContext, operationArguments); @@ -112,7 +111,6 @@ public class TaskSteps extends AbstractSteps { // set the start step of the given ref as the next step to execute (in the new running execution plan that will be set) runEnv.putNextStepPosition(executionRuntimeServices.getSubFlowBeginStep(refId)); - runEnv.getExecutionPath().down(); } catch (RuntimeException e) { logger.error("There was an error running the begin task execution step of: \\'" + nodeName + "\\'. Error is: " + e.getMessage()); throw new RuntimeException("Error running: " + nodeName + ": " + e.getMessage(), e); @@ -133,15 +131,15 @@ public class TaskSteps extends AbstractSteps { @Param(ScoreLangConstants.ASYNC_LOOP_KEY) boolean async_loop) { try { - if (runEnv.getExecutionPath().getDepth() > 0) runEnv.getExecutionPath().up(); Context flowContext = runEnv.getStack().popContext(); Map<String, Serializable> flowVariables = flowContext.getImmutableViewOfVariables(); ReturnValues executableReturnValues = runEnv.removeReturnValues(); fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_OUTPUT_START, "Output binding started", + LanguageEventData.StepType.TASK, nodeName, Pair.of(ScoreLangConstants.TASK_PUBLISH_KEY, (Serializable) taskPublishValues), Pair.of(ScoreLangConstants.TASK_NAVIGATION_KEY, (Serializable) taskNavigationValues), - Pair.of("operationReturnValues", executableReturnValues), Pair.of(LanguageEventData.levelName.TASK_NAME.name(), nodeName)); + Pair.of("operationReturnValues", executableReturnValues)); Map<String, Serializable> publishValues = outputsBinding.bindOutputs(flowVariables, executableReturnValues.getOutputs(), taskPublishValues); @@ -154,6 +152,7 @@ public class TaskSteps extends AbstractSteps { if (!shouldBreakLoop(breakOn, executableReturnValues) && loopCondition.hasMore()) { runEnv.putNextStepPosition(previousStepId); runEnv.getStack().pushContext(flowContext); + runEnv.getExecutionPath().forward(); return; } else { flowContext.getLangVariables().remove(LoopCondition.LOOP_CONDITION_KEY); @@ -188,12 +187,13 @@ public class TaskSteps extends AbstractSteps { ReturnValues returnValues = new ReturnValues(outputs, presetResult != null ? presetResult : executableResult); runEnv.putReturnValues(returnValues); fireEvent(executionRuntimeServices, runEnv, ScoreLangConstants.EVENT_OUTPUT_END, "Output binding finished", + LanguageEventData.StepType.TASK, nodeName, Pair.of(LanguageEventData.OUTPUTS, (Serializable) publishValues), Pair.of(LanguageEventData.RESULT, returnValues.getResult()), - Pair.of(LanguageEventData.NEXT_STEP_POSITION, nextPosition), - Pair.of(LanguageEventData.levelName.TASK_NAME.name(), nodeName)); + Pair.of(LanguageEventData.NEXT_STEP_POSITION, nextPosition)); runEnv.getStack().pushContext(flowContext); + runEnv.getExecutionPath().forward(); } catch (RuntimeException e) { logger.error("There was an error running the end task execution step of: \\'" + nodeName + "\\'. Error is: " + e.getMessage()); throw new RuntimeException("Error running: \\'" + nodeName + "\\': " + e.getMessage(), e); diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/events/LanguageEventDataTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/events/LanguageEventDataTest.java index d99eeba82..864b3451a 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/events/LanguageEventDataTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/events/LanguageEventDataTest.java @@ -15,9 +15,10 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.python.google.common.collect.Lists; import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -86,7 +87,7 @@ public class LanguageEventDataTest { Long exeId = 123L; eventData.setExecutionId(exeId); assertEquals(exeId, eventData.getExecutionId()); - assertEquals(exeId, eventData.get(LanguageEventData.EXECUTIONID)); + assertEquals(exeId, eventData.get(LanguageEventData.EXECUTION_ID)); } /** @@ -149,15 +150,17 @@ public class LanguageEventDataTest { assertEquals(outputs, eventData.get(LanguageEventData.OUTPUTS)); } + /** * Test method for {@link LanguageEventData#getAsyncLoopBoundExpression()}. */ @Test public void testAsyncLoopBoundExpression() { - List<Serializable> asyncLoopBoundExpression = Lists.newArrayList((Serializable) "a", "b", "c"); + List<Serializable> asyncLoopBoundExpression = new ArrayList<Serializable>(Arrays.asList("a", "b", "c")); eventData.setAsyncLoopBoundExpression(asyncLoopBoundExpression); assertEquals(asyncLoopBoundExpression, eventData.getAsyncLoopBoundExpression()); assertEquals(asyncLoopBoundExpression, eventData.get(LanguageEventData.BOUND_ASYNC_LOOP_EXPRESSION)); } + } diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/AsyncLoopStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/AsyncLoopStepsTest.java index 672348c5b..0bd744ecc 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/AsyncLoopStepsTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/AsyncLoopStepsTest.java @@ -174,6 +174,7 @@ public class AsyncLoopStepsTest { public void testJoinBranchesAggregateContexts() throws Exception { // prepare arguments RunEnvironment runEnvironment = new RunEnvironment(); + runEnvironment.getExecutionPath().down(); Map<String, Serializable> variables = new HashMap<>(); Context context = new Context(variables); runEnvironment.getStack().pushContext(context); @@ -230,6 +231,7 @@ public class AsyncLoopStepsTest { public void testJoinBranchesNavigationAllBranchesSucced() throws Exception { // prepare arguments RunEnvironment runEnvironment = new RunEnvironment(); + runEnvironment.getExecutionPath().down(); Map<String, Serializable> variables = new HashMap<>(); Context context = new Context(variables); runEnvironment.getStack().pushContext(context); @@ -279,6 +281,7 @@ public class AsyncLoopStepsTest { public void testJoinBranchesNavigationOneBranchFails() throws Exception { // prepare arguments RunEnvironment runEnvironment = new RunEnvironment(); + runEnvironment.getExecutionPath().down(); Map<String, Serializable> variables = new HashMap<>(); Context context = new Context(variables); runEnvironment.getStack().pushContext(context); @@ -334,6 +337,7 @@ public class AsyncLoopStepsTest { public void testJoinBranchesEventsAreFired() throws Exception { // prepare arguments RunEnvironment runEnvironment = new RunEnvironment(); + runEnvironment.getExecutionPath().down(); Map<String, Serializable> variables = new HashMap<>(); Context context = new Context(variables); runEnvironment.getStack().pushContext(context); diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ExecutableStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ExecutableStepsTest.java index da0228abd..365124ad8 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ExecutableStepsTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ExecutableStepsTest.java @@ -112,14 +112,15 @@ public class ExecutableStepsTest { } } Assert.assertNotNull(boundInputEvent); - Map<String,Serializable> eventData = (Map<String,Serializable>)boundInputEvent.getData(); + LanguageEventData eventData = (LanguageEventData)boundInputEvent.getData(); Assert.assertTrue(eventData.containsKey(LanguageEventData.BOUND_INPUTS)); Map<String,Serializable> inputsBounded = (Map<String,Serializable>)eventData.get(LanguageEventData.BOUND_INPUTS); Assert.assertEquals(5, inputsBounded.get("input1")); Assert.assertEquals(LanguageEventData.ENCRYPTED_VALUE,inputsBounded.get("input2")); - Assert.assertTrue(eventData.containsKey(LanguageEventData.levelName.EXECUTABLE_NAME.name())); - Assert.assertEquals("dockerizeStep",eventData.get(LanguageEventData.levelName.EXECUTABLE_NAME.name())); + Assert.assertNotNull(eventData.getStepName()); + Assert.assertEquals(LanguageEventData.StepType.EXECUTABLE, eventData.getStepType()); + Assert.assertEquals("dockerizeStep", eventData.getStepName()); } @Test @@ -225,7 +226,7 @@ public class ExecutableStepsTest { } } Assert.assertNotNull(startOutputEvent); - Map<String,Serializable> eventData = (Map<String,Serializable>)startOutputEvent.getData(); + LanguageEventData eventData = (LanguageEventData)startOutputEvent.getData(); Assert.assertTrue(eventData.containsKey(ScoreLangConstants.EXECUTABLE_OUTPUTS_KEY)); Assert.assertTrue(eventData.containsKey(ScoreLangConstants.EXECUTABLE_RESULTS_KEY)); List<Output> outputs= (List<Output>)eventData.get(ScoreLangConstants.EXECUTABLE_OUTPUTS_KEY); @@ -234,17 +235,18 @@ public class ExecutableStepsTest { Assert.assertEquals(possibleResults, results); Assert.assertNotNull(boundOutputEvent); - eventData = (Map<String,Serializable>)boundOutputEvent.getData(); + eventData = (LanguageEventData)boundOutputEvent.getData(); Assert.assertTrue(eventData.containsKey(LanguageEventData.OUTPUTS)); - Map<String, String> returnOutputs= (Map<String, String>)eventData.get(LanguageEventData.OUTPUTS); + Map<String, Serializable> returnOutputs= eventData.getOutputs(); String returnResult= (String)eventData.get(LanguageEventData.RESULT); - Assert.assertEquals("task1",eventData.get(LanguageEventData.levelName.EXECUTABLE_NAME.name())); + Assert.assertEquals("task1",eventData.getStepName()); + Assert.assertEquals(LanguageEventData.StepType.EXECUTABLE, eventData.getStepType()); Assert.assertEquals(1, returnOutputs.size()); Assert.assertEquals("John", returnOutputs.get("name")); Assert.assertTrue(returnResult.equals(ScoreLangConstants.SUCCESS_RESULT)); Assert.assertNotNull(executableFinishedEvent); - eventData = (Map<String,Serializable>)executableFinishedEvent.getData(); + eventData = (LanguageEventData)executableFinishedEvent.getData(); String result = (String)eventData.get(LanguageEventData.RESULT); Map<String, String> eventOutputs = (Map<String, String>)eventData.get(LanguageEventData.OUTPUTS); Assert.assertEquals(ScoreLangConstants.SUCCESS_RESULT, result); diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/TaskStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/TaskStepsTest.java index 7c56aa9db..d4b7822ba 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/TaskStepsTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/TaskStepsTest.java @@ -143,8 +143,9 @@ public class TaskStepsTest { ScoreEvent inputEvent = events.iterator().next(); Assert.assertEquals(ScoreLangConstants.EVENT_INPUT_END,inputEvent.getEventType()); - Map<String,Serializable> eventData = (Map<String,Serializable>)inputEvent.getData(); - Assert.assertEquals("task1",eventData.get(LanguageEventData.levelName.TASK_NAME.name())); + LanguageEventData eventData = (LanguageEventData)inputEvent.getData(); + Assert.assertEquals("task1",eventData.getStepName()); + Assert.assertEquals(LanguageEventData.StepType.TASK,eventData.getStepType()); Map<String,Serializable> boundInputs = (Map<String,Serializable>)eventData.get(LanguageEventData.BOUND_INPUTS); Assert.assertEquals(5,boundInputs.get("input1")); @@ -172,14 +173,16 @@ public class TaskStepsTest { ScoreEvent outputStart = eventsIter.next(); Assert.assertEquals(ScoreLangConstants.EVENT_OUTPUT_START,outputStart.getEventType()); - Map<String,Serializable> eventData = (Map<String,Serializable>)outputStart.getData(); - Assert.assertEquals("task1",eventData.get(LanguageEventData.levelName.TASK_NAME.name())); + LanguageEventData eventData = (LanguageEventData)outputStart.getData(); + Assert.assertEquals("task1",eventData.getStepName()); + Assert.assertEquals(LanguageEventData.StepType.TASK,eventData.getStepType()); ScoreEvent outputEnd = eventsIter.next(); Assert.assertEquals(ScoreLangConstants.EVENT_OUTPUT_END,outputEnd.getEventType()); - eventData = (Map<String,Serializable>)outputEnd.getData(); - Assert.assertEquals("task1",eventData.get(LanguageEventData.levelName.TASK_NAME.name())); + eventData = (LanguageEventData)outputEnd.getData(); + Assert.assertEquals("task1",eventData.getStepName()); + Assert.assertEquals(LanguageEventData.StepType.TASK,eventData.getStepType()); } diff --git a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/AbstractAggregatorListener.java b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/AbstractAggregatorListener.java index 6c738ff7f..05f1be1e4 100644 --- a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/AbstractAggregatorListener.java +++ b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/AbstractAggregatorListener.java @@ -23,9 +23,6 @@ import java.util.List; */ public abstract class AbstractAggregatorListener implements ScoreEventListener { - public static final String TASK_NAME = LanguageEventData.levelName.TASK_NAME.name(); - public static final String EXECUTABLE_NAME = LanguageEventData.levelName.EXECUTABLE_NAME.name(); - private final List<LanguageEventData> events = new ArrayList<>(); public List<LanguageEventData> getEvents() { diff --git a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/BranchAggregatorListener.java b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/BranchAggregatorListener.java index 69dc61ca9..884f81c51 100644 --- a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/BranchAggregatorListener.java +++ b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/BranchAggregatorListener.java @@ -11,7 +11,6 @@ package io.cloudslang.lang.systemtests; import ch.lambdaj.group.Group; import com.google.common.collect.Lists; -import io.cloudslang.lang.entities.ScoreLangConstants; import io.cloudslang.lang.runtime.RuntimeConstants; import io.cloudslang.lang.runtime.env.ReturnValues; import io.cloudslang.lang.runtime.events.LanguageEventData; @@ -49,8 +48,7 @@ public class BranchAggregatorListener extends AbstractAggregatorListener { for (LanguageEventData branchData : data) { String path = branchData.getPath(); - String stepName = branchData.get(TASK_NAME) != null ? (String) branchData.get(TASK_NAME) - : (String) branchData.get(EXECUTABLE_NAME); + String stepName = branchData.getStepName(); ReturnValues returnValues = (ReturnValues) branchData.get(RuntimeConstants.BRANCH_RETURN_VALUES_KEY); branches.add( new StepData( @@ -58,7 +56,7 @@ public class BranchAggregatorListener extends AbstractAggregatorListener { stepName, new HashMap<String, Serializable>(), returnValues.getOutputs(), - returnValues.getResult() + null, returnValues.getResult() ) ); } diff --git a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/JoinAggregatorListener.java b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/JoinAggregatorListener.java index 2c883b0f4..9e7dc5695 100644 --- a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/JoinAggregatorListener.java +++ b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/JoinAggregatorListener.java @@ -41,8 +41,7 @@ public class JoinAggregatorListener extends AbstractAggregatorListener { private StepData buildPublishAggregateData(LanguageEventData data) { String path = data.getPath(); - String stepName = data.get(TASK_NAME) != null ? (String) data.get(TASK_NAME) - : (String) data.get(EXECUTABLE_NAME); + String stepName = data.getStepName(); Map<String, Serializable> outputs = data.getOutputs(); String result = (String) data.get(LanguageEventData.RESULT); return new StepData( @@ -50,7 +49,7 @@ public class JoinAggregatorListener extends AbstractAggregatorListener { stepName, new HashMap<String, Serializable>(), outputs, - result + null, result ); } diff --git a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/RunDataAggregatorListener.java b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/RunDataAggregatorListener.java index 4c02de5cc..b79972861 100644 --- a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/RunDataAggregatorListener.java +++ b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/RunDataAggregatorListener.java @@ -10,10 +10,13 @@ package io.cloudslang.lang.systemtests; +import ch.lambdaj.Lambda; import ch.lambdaj.function.convert.Converter; import ch.lambdaj.group.Group; import io.cloudslang.lang.entities.ScoreLangConstants; import io.cloudslang.lang.runtime.events.LanguageEventData; +import org.apache.commons.collections4.CollectionUtils; +import org.hamcrest.Matchers; import java.io.Serializable; import java.util.HashMap; @@ -21,6 +24,7 @@ import java.util.List; import java.util.Map; import static ch.lambdaj.Lambda.*; +import static org.hamcrest.Matchers.equalTo; /* * Created by orius123 on 24/12/14. @@ -42,25 +46,37 @@ public class RunDataAggregatorListener extends AbstractAggregatorListener { } private StepData buildStepData(List<LanguageEventData> data) { - Map<String, LanguageEventData> stepEvents = map(data, new Converter<LanguageEventData, String>() { - @Override - public String convert(LanguageEventData from) { - return from.getEventType(); - } - }); + List<LanguageEventData> taskEvents = selectByStepType(data, LanguageEventData.StepType.TASK); + List<LanguageEventData> executableEvents = selectByStepType(data, LanguageEventData.StepType.EXECUTABLE); + + LanguageEventData inputsEvent; + LanguageEventData outputsEvent; + + if (CollectionUtils.isNotEmpty(taskEvents)) { + inputsEvent = selectByEventType(taskEvents, ScoreLangConstants.EVENT_INPUT_END); + outputsEvent = selectByEventType(taskEvents, ScoreLangConstants.EVENT_OUTPUT_END); + } else { + inputsEvent = selectByEventType(executableEvents, ScoreLangConstants.EVENT_INPUT_END); + outputsEvent = selectByEventType(executableEvents, ScoreLangConstants.EVENT_OUTPUT_END); + } + String path = inputsEvent.getPath(); + String stepName = inputsEvent.getStepName(); + Map<String, Serializable> inputs = inputsEvent.getInputs(); + + Map<String, Serializable> outputs = outputsEvent == null ? null : outputsEvent.getOutputs(); + String result = outputsEvent == null ? null : (String) outputsEvent.get(LanguageEventData.RESULT); - LanguageEventData inputsEvent = stepEvents.get(ScoreLangConstants.EVENT_INPUT_END); - LanguageEventData outputsEvent = stepEvents.get(ScoreLangConstants.EVENT_OUTPUT_END); + String executableName = executableEvents.get(0).getStepName(); - String path = inputsEvent.getPath(); - String stepName = inputsEvent.get(TASK_NAME) != null ? (String) inputsEvent.get(TASK_NAME) - : (String) inputsEvent.get(EXECUTABLE_NAME); - Map<String, Serializable> inputs = inputsEvent.getInputs(); + return new StepData(path, stepName, inputs, outputs, executableName, result); + } - Map<String, Serializable> outputs = outputsEvent == null ? null : outputsEvent.getOutputs(); - String result = outputsEvent == null ? null : (String) outputsEvent.get(LanguageEventData.RESULT); + private List<LanguageEventData> selectByStepType(List<LanguageEventData> data, LanguageEventData.StepType stepType) { + return select(data, having(on(LanguageEventData.class).getStepType(), equalTo(stepType))); + } - return new StepData(path, stepName, inputs, outputs, result); + private LanguageEventData selectByEventType(List<LanguageEventData> data, String eventType) { + return selectFirst(data, having(on(LanguageEventData.class).getEventType(), equalTo(eventType))); } } diff --git a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/StepData.java b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/StepData.java index 8036e3979..f168a5d7b 100644 --- a/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/StepData.java +++ b/cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/StepData.java @@ -19,13 +19,16 @@ public class StepData { private final String name; private final Map<String, Serializable> inputs; private final Map<String, Serializable> outputs; + private final String executableName; private final String result; - public StepData(String path, String name, Map<String, Serializable> inputs, Map<String, Serializable> outputs, String result) { + public StepData(String path, String name, Map<String, Serializable> inputs, + Map<String, Serializable> outputs, String executableName, String result) { this.path = path; this.name = name; this.inputs = inputs; this.outputs = outputs; + this.executableName = executableName; this.result = result; } @@ -45,6 +48,10 @@ public class StepData { return outputs; } + public String getExecutableName() { + return executableName; + } + public String getResult() { return result; } diff --git a/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/LoopFlowsTest.java b/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/LoopFlowsTest.java index e6e762d7d..9b1cde463 100644 --- a/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/LoopFlowsTest.java +++ b/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/LoopFlowsTest.java @@ -23,8 +23,10 @@ import java.util.Map; import java.util.Set; import static ch.lambdaj.Lambda.filter; +import static ch.lambdaj.Lambda.select; import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.startsWith; public class LoopFlowsTest extends SystemsTestsParent{ @@ -196,7 +198,7 @@ public class LoopFlowsTest extends SystemsTestsParent{ } private List<String> getTasksOnly(Map<String, StepData> stepsData) { - return filter(not(endsWith("0")), stepsData.keySet()); + return select(stepsData.keySet(), startsWith("0.")); } private void verifyPersonMap(Map<String, StepData> stepsData) { diff --git a/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/SystemsTestsParent.java b/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/SystemsTestsParent.java index 2f8edcbaf..f632b7583 100644 --- a/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/SystemsTestsParent.java +++ b/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/SystemsTestsParent.java @@ -29,10 +29,10 @@ import java.util.Map; public abstract class SystemsTestsParent { protected static final String EXEC_START_PATH = "0"; - protected static final String FIRST_STEP_PATH = "0/1"; - protected static final String SECOND_STEP_KEY = "0/2"; - protected static final String THIRD_STEP_KEY = "0/3"; - protected static final String FOURTH_STEP_KEY = "0/4"; + protected static final String FIRST_STEP_PATH = "0.0"; + protected static final String SECOND_STEP_KEY = "0.1"; + protected static final String THIRD_STEP_KEY = "0.2"; + protected static final String FOURTH_STEP_KEY = "0.3"; @Autowired protected Slang slang; diff --git a/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/flows/NavigationTest.java b/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/flows/NavigationTest.java index 2f757650a..c7013689c 100644 --- a/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/flows/NavigationTest.java +++ b/cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/flows/NavigationTest.java @@ -53,7 +53,6 @@ public class NavigationTest extends SystemsTestsParent { Map<String, StepData> tasks = triggerWithData(compilationArtifact, userInputs, null).getTasks(); - Assert.assertEquals(5, tasks.size()); Assert.assertEquals("check_number", tasks.get(FIRST_STEP_PATH).getName()); Assert.assertEquals("process_even_number", tasks.get(SECOND_STEP_KEY).getName()); }

['cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/SystemsTestsParent.java', 'cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/StepData.java', 'cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/JoinAggregatorListener.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ActionSteps.java', 'cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/events/LanguageEventDataTest.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AbstractSteps.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/ExecutableSteps.java', 'cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/BranchAggregatorListener.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/navigations/Navigations.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/env/ExecutionPath.java', 'cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/AbstractAggregatorListener.java', 'cloudslang-compiler/src/main/java/io/cloudslang/lang/compiler/scorecompiler/ExecutionPlanBuilder.java', 'cloudslang-cli/src/main/java/io/cloudslang/lang/cli/services/SyncTriggerEventListener.java', 'cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/LoopFlowsTest.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/events/LanguageEventData.java', 'cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/TaskStepsTest.java', 'cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ExecutableStepsTest.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/TaskSteps.java', 'cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/AsyncLoopStepsTest.java', 'cloudslang-tests/src/main/java/io/cloudslang/lang/systemtests/RunDataAggregatorListener.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AsyncLoopSteps.java', 'cloudslang-tests/src/test/java/io/cloudslang/lang/systemtests/flows/NavigationTest.java']

{'.java': 22}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

cloudslang/cloud-slang/347/330

cloudslang

cloud-slang

https://github.com/CloudSlang/cloud-slang/issues/330

https://github.com/CloudSlang/cloud-slang/pull/347

https://github.com/CloudSlang/cloud-slang/pull/347

fix

Join branches throws NPE when aggregating wrong output

when running flow: https://gist.github.com/orius123/a5c2e9facf20e6d0de00 NPE is thrown from AsyncLoopSteps my best guess is that something in this chain in null [Relevant line](https://github.com/CloudSlang/cloud-slang/blob/7c2ff9c81ad706e065bf394f890b31c55ad6c038/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AsyncLoopSteps.java#L224) 10x @genadi-hp for catching this issue

99c4ffa938433aadd8411a5f2c0b8d43141f3108

1c5448fc3155f51c61ebe7fe788e4de6ec2b9251

https://github.com/cloudslang/cloud-slang/compare/99c4ffa938433aadd8411a5f2c0b8d43141f3108...1c5448fc3155f51c61ebe7fe788e4de6ec2b9251

diff --git a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AsyncLoopSteps.java b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AsyncLoopSteps.java index 46d486239..f7180b930 100644 --- a/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AsyncLoopSteps.java +++ b/cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AsyncLoopSteps.java @@ -24,7 +24,10 @@ import io.cloudslang.lang.runtime.events.LanguageEventData; import io.cloudslang.score.api.EndBranchDataContainer; import io.cloudslang.score.api.execution.ExecutionParametersConsts; import io.cloudslang.score.lang.ExecutionRuntimeServices; +import io.cloudslang.score.lang.SystemContext; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.log4j.Logger; import org.python.google.common.collect.Lists; @@ -46,6 +49,8 @@ import static io.cloudslang.score.api.execution.ExecutionParametersConsts.EXECUT @Component public class AsyncLoopSteps extends AbstractSteps { + public static final String BRANCH_EXCEPTION_PREFIX = "Error running branch"; + @Autowired private AsyncLoopBinding asyncLoopBinding; @@ -128,7 +133,7 @@ public class AsyncLoopSteps extends AbstractSteps { Map<String, Serializable> contextBeforeSplit = flowContext.getImmutableViewOfVariables(); List<String> branchesResult = Lists.newArrayList(); - collectBranchesData(runEnv, executionRuntimeServices, nodeName, branchesContext, branchesResult); + collectBranchesData(executionRuntimeServices, nodeName, branchesContext, branchesResult); Map<String, Serializable> publishValues = bindAggregateOutputs( @@ -150,7 +155,7 @@ public class AsyncLoopSteps extends AbstractSteps { runEnv.getExecutionPath().forward(); } catch (RuntimeException e) { logger.error("There was an error running the end task execution step of: \\'" + nodeName + "\\'. Error is: " + e.getMessage()); - throw new RuntimeException("Error running: \\'" + nodeName + "\\': " + e.getMessage(), e); + throw new RuntimeException("Error running: \\'" + nodeName + "\\': \\n" + e.getMessage(), e); } } @@ -219,7 +224,6 @@ public class AsyncLoopSteps extends AbstractSteps { } private void collectBranchesData( - RunEnvironment runEnv, ExecutionRuntimeServices executionRuntimeServices, String nodeName, List<Map<String, Serializable>> branchesContext, @@ -227,6 +231,20 @@ public class AsyncLoopSteps extends AbstractSteps { List<EndBranchDataContainer> branches = executionRuntimeServices.getFinishedChildBranchesData(); for (EndBranchDataContainer branch : branches) { + + //first we check that no exception was thrown during the execution of the branch + String branchException = branch.getException(); + if (StringUtils.isNotEmpty(branchException)) { + Map<String, Serializable> systemContextMap = branch.getSystemContext(); + String branchID = null; + if (MapUtils.isNotEmpty(systemContextMap)) { + ExecutionRuntimeServices branchExecutionRuntimeServices = new SystemContext(systemContextMap); + branchID = branchExecutionRuntimeServices.getBranchId(); + } + logger.error("There was an error running branch: " + branchID + " Error is: " + branchException); + throw new RuntimeException(BRANCH_EXCEPTION_PREFIX + ": \\n" + branchException); + } + Map<String, Serializable> branchContext = branch.getContexts(); RunEnvironment branchRuntimeEnvironment = (RunEnvironment) branchContext.get(ScoreLangConstants.RUN_ENV); diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/AsyncLoopStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/AsyncLoopStepsTest.java index 1048b164c..38aba6912 100644 --- a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/AsyncLoopStepsTest.java +++ b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/AsyncLoopStepsTest.java @@ -37,6 +37,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import javax.script.ScriptEngine; import java.io.Serializable; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -53,6 +54,8 @@ import static org.mockito.Mockito.*; @ContextConfiguration(classes = AsyncLoopStepsTest.Config.class) public class AsyncLoopStepsTest { + public static final String BRANCH_EXCEPTION_MESSAGE = "Exception details placeholder"; + @Autowired private AsyncLoopSteps asyncLoopSteps; @@ -390,6 +393,29 @@ public class AsyncLoopStepsTest { Assert.assertEquals(expectedEventTypesInOrder, actualEventTypesInOrder); } + @Test + public void testExceptionIsCapturedFromBranches() throws Exception { + // prepare arguments + RunEnvironment runEnvironment = new RunEnvironment(); + runEnvironment.getExecutionPath().down(); + Map<String, Serializable> variables = new HashMap<>(); + Context context = new Context(variables); + runEnvironment.getStack().pushContext(context); + + ExecutionRuntimeServices executionRuntimeServices = createExecutionRuntimeServicesMockWithBranchException(); + + exception.expectMessage(BRANCH_EXCEPTION_MESSAGE); + exception.expect(RuntimeException.class); + + asyncLoopSteps.joinBranches( + runEnvironment, + executionRuntimeServices, + new ArrayList<Output>(0), + new HashMap<String, ResultNavigation>(), + "nodeName" + ); + } + private ExecutionRuntimeServices createAndConfigureExecutionRuntimeServicesMock( Map<String, Serializable> runtimeContext1, Map<String, Serializable> runtimeContext2, @@ -445,6 +471,18 @@ public class AsyncLoopStepsTest { return executionRuntimeServices; } + private ExecutionRuntimeServices createExecutionRuntimeServicesMockWithBranchException() { + ExecutionRuntimeServices executionRuntimeServices = mock(ExecutionRuntimeServices.class); + List<EndBranchDataContainer> branchesContainers = Lists.newArrayList( + new EndBranchDataContainer( + new HashMap<String, Serializable>(), + new HashMap<String, Serializable>(), + BRANCH_EXCEPTION_MESSAGE) + ); + when(executionRuntimeServices.getFinishedChildBranchesData()).thenReturn(branchesContainers); + return executionRuntimeServices; + } + @Configuration static class Config {

['cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/AsyncLoopStepsTest.java', 'cloudslang-runtime/src/main/java/io/cloudslang/lang/runtime/steps/AsyncLoopSteps.java']

{'.java': 2}

Java

{'Java': 2503341, 'Slash': 727911, 'Python': 9681, 'Shell': 1856, 'CSS': 1039, 'JavaScript': 795}

Apache License 2.0

hashgraph/hedera-services/796/793

hashgraph

hedera-services

https://github.com/hashgraph/hedera-services/issues/793

https://github.com/hashgraph/hedera-services/pull/796

https://github.com/hashgraph/hedera-services/pull/796

closes

Fix UpdateNode test failure

**Summary of the defect** The Update Node test that has passed in the branch previously failed with this error on master. ``` Node 0 has exception:- Only default usage prices available for function Freeze @ 2020-11-20T04:40:50.999999425Z! (java.lang.NullPointerException) Node 0 has exception:- Only default usage prices available for function Freeze @ 2020-11-20T04:47:25.999999193Z! (java.lang.NullPointerException) Node 1 has exception:- Only default usage prices available for function Freeze @ 2020-11-20T04:40:50.999999425Z! (java.lang.NullPointerException) Node 1 has exception:- Only default usage prices available for function Freeze @ 2020-11-20T04:47:25.999999193Z! (java.lang.NullPointerException) Node 2 has exception:- Only default usage prices available for function Freeze @ 2020-11-20T04:40:50.999999425Z! (java.lang.NullPointerException) Node 2 has exception:- Only default usage prices available for function Freeze @ 2020-11-20T04:47:25.999999193Z! (java.lang.NullPointerException) Node 3 has exception:- Only default usage prices available for function Freeze @ 2020-11-20T04:40:50.999999425Z! (java.lang.NullPointerException) Node 3 has exception:- Only default usage prices available for function Freeze @ 2020-11-20T04:47:25.999999193Z! (java.lang.NullPointerException) Node 4 has exception:- Only default usage prices available for function Freeze @ 2020-11-20T04:47:25.999999193Z! (java.lang.NullPointerException) ``` **How to reproduce (if possible)** **Service logs (if applicable)** https://hedera-hashgraph.slack.com/archives/CKWHL8R9A/p1605848071329100 **Additional Context** Add any other context about the problem here. Attach any logs here, if applicable.

6622d3154982475ce83e1a82adc4bd1c1e8db1af

3661caee928fa2c58855a3f07ce34d3ced107e2e

https://github.com/hashgraph/hedera-services/compare/6622d3154982475ce83e1a82adc4bd1c1e8db1af...3661caee928fa2c58855a3f07ce34d3ced107e2e

diff --git a/hedera-node/src/main/java/com/hedera/services/fees/calculation/AwareFcfsUsagePrices.java b/hedera-node/src/main/java/com/hedera/services/fees/calculation/AwareFcfsUsagePrices.java index 315c15bd5c..a70b378c4a 100644 --- a/hedera-node/src/main/java/com/hedera/services/fees/calculation/AwareFcfsUsagePrices.java +++ b/hedera-node/src/main/java/com/hedera/services/fees/calculation/AwareFcfsUsagePrices.java @@ -9,9 +9,9 @@ package com.hedera.services.fees.calculation; * 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. @@ -118,10 +118,10 @@ public class AwareFcfsUsagePrices implements UsagePricesProvider { return usagePrices; } catch (Exception e) { log.warn( - "Only default usage prices available for function {} @ {}! ({})", + "Default usage price will be used, no specific usage prices available for function {} @ {}!", function, - Instant.ofEpochSecond(at.getSeconds(), at.getNanos()), - e); + Instant.ofEpochSecond(at.getSeconds(), at.getNanos()) + ); } return DEFAULT_USAGE_PRICES; } diff --git a/hedera-node/src/test/java/com/hedera/services/fees/calculation/AwareFcfsUsagePricesTest.java b/hedera-node/src/test/java/com/hedera/services/fees/calculation/AwareFcfsUsagePricesTest.java index 7f3054d461..e3b06f824a 100644 --- a/hedera-node/src/test/java/com/hedera/services/fees/calculation/AwareFcfsUsagePricesTest.java +++ b/hedera-node/src/test/java/com/hedera/services/fees/calculation/AwareFcfsUsagePricesTest.java @@ -9,9 +9,9 @@ package com.hedera.services.fees.calculation; * 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. @@ -206,7 +206,7 @@ class AwareFcfsUsagePricesTest { // then: assertEquals(DEFAULT_USAGE_PRICES, actual); assertEquals(1, mockAppender.size()); - assertEquals("WARN - Only default usage prices available for function UNRECOGNIZED @ 1970-01-15T06:56:06Z! (java.lang.NullPointerException)", + assertEquals("WARN - Default usage price will be used, no specific usage prices available for function UNRECOGNIZED @ 1970-01-15T06:56:06Z!", mockAppender.get(0)); // tearDown:

['hedera-node/src/main/java/com/hedera/services/fees/calculation/AwareFcfsUsagePrices.java', 'hedera-node/src/test/java/com/hedera/services/fees/calculation/AwareFcfsUsagePricesTest.java']

{'.java': 2}

Java

{'Java': 47108298, 'PureBasic': 6600158, 'HTML': 648631, 'Solidity': 616825, 'Kotlin': 207028, 'Shell': 76275, 'Python': 34764, 'Go': 24380, 'Dockerfile': 21409, 'Batchfile': 7426, 'Perl': 7364}

Apache License 2.0

hashgraph/hedera-services/799/687

hashgraph

hedera-services

https://github.com/hashgraph/hedera-services/issues/687

https://github.com/hashgraph/hedera-services/pull/799

https://github.com/hashgraph/hedera-services/pull/799

closes

SuiteRunner's PayerID creation when failed should fall back to Default ID

<!-- Thanks for submitting a bug report! Before submitting: 1. Try searching the existing issues to see if your issue has already been reported 2. If you're reporting a security vulnerability, please email [email protected] instead of opening an issue --> **Summary of the defect** When the process of creating a unique payer ID for a SuiteRunner fails, the payer ID is set to an empty string which is invalid and thus creating invalid transactions in the following steps. **How to reproduce (if possible)** Run any suiteRunner Spec which can break initial account creation, like sending a **cryptocreate** txn to a **publictestnet** state with wrong keys.

e48ff72385325f9ebf2d208dbee2236ba4059d9f

a0a1818d3f57247f21f743e95b4fd8b3810afb42

https://github.com/hashgraph/hedera-services/compare/e48ff72385325f9ebf2d208dbee2236ba4059d9f...a0a1818d3f57247f21f743e95b4fd8b3810afb42

diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/SuiteRunner.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/SuiteRunner.java index b896ebf365..29c8e0ac9c 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/SuiteRunner.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/SuiteRunner.java @@ -129,6 +129,7 @@ import java.util.stream.Stream; import static com.hedera.services.bdd.spec.HapiSpecSetup.NodeSelection.FIXED; import static com.hedera.services.bdd.spec.HapiSpecSetup.TlsConfig.OFF; +import static com.hedera.services.bdd.spec.transactions.TxnUtils.isIdLiteral; import static com.hedera.services.bdd.suites.HapiApiSuite.FinalOutcome; import static java.util.concurrent.CompletableFuture.runAsync; import static java.util.stream.Collectors.groupingBy; @@ -146,7 +147,7 @@ public class SuiteRunner { private static final int EXPECTED_DEV_NETWORK_SIZE = 3; private static final int EXPECTED_CI_NETWORK_SIZE = 4; - private static final String DEFAULT_PAYER_ID = "2"; + private static final String DEFAULT_PAYER_ID = "0.0.2"; public static int expectedNetworkSize = EXPECTED_DEV_NETWORK_SIZE; @@ -374,6 +375,9 @@ public class SuiteRunner { Thread.sleep(r.nextInt(5000)); new CryptoCreateForSuiteRunner(nodes, defaultNode).runSuiteAsync(); Thread.sleep(2000); + if(!isIdLiteral(payerId)){ + payerId = DEFAULT_PAYER_ID; + } } catch (InterruptedException e) { e.printStackTrace(); }

['test-clients/src/main/java/com/hedera/services/bdd/suites/SuiteRunner.java']

{'.java': 1}

Java

{'Java': 47108298, 'PureBasic': 6600158, 'HTML': 648631, 'Solidity': 616825, 'Kotlin': 207028, 'Shell': 76275, 'Python': 34764, 'Go': 24380, 'Dockerfile': 21409, 'Batchfile': 7426, 'Perl': 7364}

Apache License 2.0

hashgraph/hedera-services/807/806

hashgraph

hedera-services

https://github.com/hashgraph/hedera-services/issues/806

https://github.com/hashgraph/hedera-services/pull/807

https://github.com/hashgraph/hedera-services/pull/807

closes

Ensure SystemFileManager.loadAllSystemFiles is called in ServicesMain.init before any properties are accessed

**Summary of the defect** Currently `ServicesMain.init` starts the record stream thread _before_ calling `SystemFilesManager.loadAllSystemFiles` if necessary (as on a restart). Hence when this call _is_ necessary, the record stream directory will always be the default.

e48ff72385325f9ebf2d208dbee2236ba4059d9f

14cf74b707dc128bad5fd9e700feb23b0c75fdb9

https://github.com/hashgraph/hedera-services/compare/e48ff72385325f9ebf2d208dbee2236ba4059d9f...14cf74b707dc128bad5fd9e700feb23b0c75fdb9

diff --git a/hedera-node/src/main/java/com/hedera/services/ServicesMain.java b/hedera-node/src/main/java/com/hedera/services/ServicesMain.java index 61a767710f..8264b007bd 100644 --- a/hedera-node/src/main/java/com/hedera/services/ServicesMain.java +++ b/hedera-node/src/main/java/com/hedera/services/ServicesMain.java @@ -142,28 +142,28 @@ public class ServicesMain implements SwirldMain { } private void contextDrivenInit() { - registerIssListener(); - log.info("Platform callbacks registered."); checkPropertySources(); log.info("Property sources are available."); - configurePlatform(); - log.info("Platform is configured."); + initSystemFiles(); + log.info("System files rationalized."); + createSystemAccountsIfNeeded(); + log.info("System accounts initialized."); migrateStateIfNeeded(); log.info("Migrations complete."); - startRecordStreamThread(); - log.info("Record stream started."); - startNettyIfAppropriate(); - log.info("Netty started."); - createSystemAccountsIfNeeded(); - log.info("System accounts rationalized."); validateLedgerState(); log.info("Ledger state ok."); - createSystemFilesIfNeeded(); - log.info("System files rationalized."); + configurePlatform(); + log.info("Platform is configured."); + registerIssListener(); + log.info("Platform callbacks registered."); exportAccountsIfDesired(); log.info("Accounts exported."); initializeStats(); log.info("Stats initialized."); + startRecordStreamThread(); + log.info("Record stream started in directory {}.", ctx.recordStream().getRecordStreamsDirectory()); + startNettyIfAppropriate(); + log.info("Netty started."); log.info("Completed initialization of {} #{}", ctx.nodeType(), ctx.id()); } @@ -181,7 +181,7 @@ public class ServicesMain implements SwirldMain { } } - private void createSystemFilesIfNeeded() { + private void initSystemFiles() { try { ctx.systemFilesManager().createAddressBookIfMissing(); ctx.systemFilesManager().createNodeDetailsIfMissing(); @@ -238,10 +238,6 @@ public class ServicesMain implements SwirldMain { return myNodeAccount.equals(blessedNodeAccount); } - private void loadFeeSchedule() { - ctx.fees().init(); - } - private void initializeStats() { ctx.statsManager().initializeFor(ctx.platform()); } diff --git a/hedera-node/src/main/java/com/hedera/services/legacy/stream/RecordStream.java b/hedera-node/src/main/java/com/hedera/services/legacy/stream/RecordStream.java index 507d04bea9..b578231b0f 100644 --- a/hedera-node/src/main/java/com/hedera/services/legacy/stream/RecordStream.java +++ b/hedera-node/src/main/java/com/hedera/services/legacy/stream/RecordStream.java @@ -85,7 +85,7 @@ public class RecordStream implements Runnable { Platform platform; MiscRunningAvgs runningAvgs; boolean inFreeze; - String recordStreamsDirectory; + final String recordStreamsDirectory; private final PropertySource properties; @@ -395,6 +395,10 @@ public class RecordStream implements Runnable { return recordBuffer.size(); } + public String getRecordStreamsDirectory() { + return recordStreamsDirectory; + } + /** * Read the FileHash from the record stream signature file * diff --git a/hedera-node/src/test/java/com/hedera/services/ServicesMainTest.java b/hedera-node/src/test/java/com/hedera/services/ServicesMainTest.java index f4d7638cec..1467f14fae 100644 --- a/hedera-node/src/test/java/com/hedera/services/ServicesMainTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ServicesMainTest.java @@ -243,6 +243,7 @@ public class ServicesMainTest { public void initializesSanelyGivenPreconditions() { // given: InOrder inOrder = inOrder( + systemFilesManager, propertySources, platform, stateMigrations, @@ -257,14 +258,15 @@ public class ServicesMainTest { subject.init(null, new NodeId(false, NODE_ID)); // then: - inOrder.verify(platform).addSignedStateListener(any(IssListener.class)); inOrder.verify(propertySources).assertSourcesArePresent(); - inOrder.verify(platform).setSleepAfterSync(0L); + inOrder.verify(systemFilesManager).loadAllSystemFiles(); inOrder.verify(stateMigrations).runAllFor(ctx); - inOrder.verify(recordStreamThread).start(); inOrder.verify(ledgerValidator).assertIdsAreValid(accounts); inOrder.verify(ledgerValidator).hasExpectedTotalBalance(accounts); + inOrder.verify(platform).setSleepAfterSync(0L); + inOrder.verify(platform).addSignedStateListener(any(IssListener.class)); inOrder.verify(statsManager).initializeFor(platform); + inOrder.verify(recordStreamThread).start(); } @Test

['hedera-node/src/main/java/com/hedera/services/ServicesMain.java', 'hedera-node/src/test/java/com/hedera/services/ServicesMainTest.java', 'hedera-node/src/main/java/com/hedera/services/legacy/stream/RecordStream.java']

{'.java': 3}

Java

{'Java': 47108298, 'PureBasic': 6600158, 'HTML': 648631, 'Solidity': 616825, 'Kotlin': 207028, 'Shell': 76275, 'Python': 34764, 'Go': 24380, 'Dockerfile': 21409, 'Batchfile': 7426, 'Perl': 7364}

Apache License 2.0

hashgraph/hedera-services/1019/1008

hashgraph

hedera-services

https://github.com/hashgraph/hedera-services/issues/1008

https://github.com/hashgraph/hedera-services/pull/1019

https://github.com/hashgraph/hedera-services/pull/1019

closes

HCS-Restart-Performance-Testnet-10k-46m fails on master

**Summary of the defect** HCS-Restart-Performance-Testnet-10k-46m fails on master with 0 TPS . Investigate the reason for it and fix the issue. **How to reproduce (if possible)** https://hedera-hashgraph.slack.com/archives/C018Y4E6ADT/p1611476677006700 https://hedera-hashgraph.slack.com/archives/C018Y4E6ADT/p1611562896008600 **Service logs (if applicable)** ``` ... ``` **Environment:** - OS: [e.g. Ubuntu 18.04] - Java: [e.g. OpenJDK 11.0.4] - Hedera Services Version: [e.g. 0.0.5] - HAPI Version: [e.g. 0.0.5] **Additional Context** Add any other context about the problem here. Attach any logs here, if applicable.

d3ad20925b92b2fc9bc1bbafbe9fe99cac523ee3

02fd7183f517d2df68e9ae1d8fada50b8375de3c

https://github.com/hashgraph/hedera-services/compare/d3ad20925b92b2fc9bc1bbafbe9fe99cac523ee3...02fd7183f517d2df68e9ae1d8fada50b8375de3c

diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/perf/SubmitMessageLoadTest.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/perf/SubmitMessageLoadTest.java index 5eb275029c..186524480c 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/perf/SubmitMessageLoadTest.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/perf/SubmitMessageLoadTest.java @@ -119,7 +119,6 @@ public class SubmitMessageLoadTest extends LoadTest { private static HapiApiSpec runSubmitMessages() { PerfTestLoadSettings settings = new PerfTestLoadSettings(); final AtomicInteger submittedSoFar = new AtomicInteger(0); - Supplier<HapiSpecOperation[]> submitBurst = () -> new HapiSpecOperation[] { opSupplier(settings).get() }; @@ -163,10 +162,23 @@ public class SubmitMessageLoadTest extends LoadTest { : settings.getIntProperty("messageSize", messageSize) - r.nextInt(settings.getHcsSubmitMessageSizeVar()); - // maybe use some more realistic distributions to simulate real world scenarios - String senderId = String.format("0.0.%d", TEST_ACCOUNT_STARTS_FROM + r.nextInt(settings.getTotalAccounts())); - String topicId = String.format("0.0.%d", TEST_ACCOUNT_STARTS_FROM + settings.getTotalAccounts() - + r.nextInt(settings.getTotalTopics() )); + String senderId = "sender"; + String topicId = "topic"; + String senderKey= "sender"; + String submitKey = "submitKey"; + if(settings.getTotalAccounts() > 1) { + int s = r.nextInt(settings.getTotalAccounts()); + int re = 0; + do { + re = r.nextInt(settings.getTotalAccounts()); + } while (re == s); + // maybe use some more realistic distributions to simulate real world scenarios + senderId = String.format("0.0.%d", TEST_ACCOUNT_STARTS_FROM + r.nextInt(settings.getTotalAccounts())); + topicId = String.format("0.0.%d", TEST_ACCOUNT_STARTS_FROM + settings.getTotalAccounts() + + r.nextInt(settings.getTotalTopics() )); + senderKey = GENESIS; + submitKey = GENESIS; + } if(log.isDebugEnabled()) { log.debug("{} will submit a message of size {} to topic {}", senderId, msgSize, topicId); @@ -176,7 +188,7 @@ public class SubmitMessageLoadTest extends LoadTest { randomUtf8Bytes( msgSize - 8))) .noLogging() .payingWith(senderId) - .signedBy(GENESIS, GENESIS) + .signedBy(senderKey, submitKey) .fee(100_000_000) .suppressStats(true) .hasRetryPrecheckFrom(BUSY, DUPLICATE_TRANSACTION, PLATFORM_TRANSACTION_NOT_CREATED,

['test-clients/src/main/java/com/hedera/services/bdd/suites/perf/SubmitMessageLoadTest.java']

{'.java': 1}

Java

{'Java': 47108298, 'PureBasic': 6600158, 'HTML': 648631, 'Solidity': 616825, 'Kotlin': 207028, 'Shell': 76275, 'Python': 34764, 'Go': 24380, 'Dockerfile': 21409, 'Batchfile': 7426, 'Perl': 7364}

Apache License 2.0

hashgraph/hedera-services/829/814

hashgraph

hedera-services

https://github.com/hashgraph/hedera-services/issues/814

https://github.com/hashgraph/hedera-services/pull/829

https://github.com/hashgraph/hedera-services/pull/829

closes

AWS daily APIPermissionUpdate reconnect fails

**Summary of the defect** The test failed due to PLATFORM_TRANSACTION_NOT_CREATED. **How to reproduce (if possible)** Please refer to the slack URL: https://hedera-hashgraph.slack.com/archives/CKWHL8R9A/p1606723088018100 and the detailed log file: https://s3.console.aws.amazon.com/s3/object/hedera-service-regression-jrs?region=us-east-2&prefix=4N_1C/Reconnect/20201130-0717-AWS-Daily-Services-Comp-Reconnect-4N-1C/APIPermissionUpdate-Reconnect-1-12m.json/node0000-TestClient/hapi-client-combined.log **Service logs (if applicable)** ``` ... 2020-11-30 07:46:20.267 INFO 128 HapiQueryOp - 'updateApiPermissionsDuringReconnect' - Paying for HapiGetFileContents{sigs=1, payer=strong-control, node=0.0.6, file=API_PERMISSIONS, fileId=fileNum: 122 } with body=transactionID { transactionValidStart { seconds: 1606722320 nanos: 380 } accountID { accountNum: 50 } } nodeAccountID { accountNum: 6 } transactionFee: 84163 transactionValidDuration { seconds: 120 } memo: "\\303\\203\\302\\256\\303\\202\\302\\267\\303\\203\\302\\271tF8\\303\\202\\302\\256J\\303\\203\\302\\213\\303\\203\\302\\220\\303\\203\\302\\216" cryptoTransfer { transfers { accountAmounts { accountID { accountNum: 50 } amount: -8 } accountAmounts { accountID { accountNum: 6 } amount: 8 } } }; sigs=sigPair { pubKeyPrefix: "\\n" ed25519: "\\372l]\\231|*\\257\\035e\\212\\241?\\200\\265Q~u\\000I\\005J\\244\\202cf\\244\\242_\\024-\\344\\367\\351\\365xs9\\273OB=\\226?#\\220\\371\\326\\214\\243\\tdW\\274\\273^\\272\\036\\225\\312\\221C\\302\\t\\b" } 2020-11-30 07:46:20.383 INFO 155 HapiGetFileContents - API_PERMISSIONS contained 0 bytes 2020-11-30 07:46:20.383 INFO 164 HapiGetFileContents - As a config list, contents are: 2020-11-30 07:46:20.385 WARN 199 HapiSpecOperation - 'updateApiPermissionsDuringReconnect' - HapiGetFileContents{sigs=1, payer=strong-control, node=0.0.6, file=API_PERMISSIONS, fileId=fileNum: 122 } failed! java.lang.AssertionError: Bad answerOnlyPrecheck! expected:<OK> but was:<PLATFORM_TRANSACTION_NOT_CREATED> at org.junit.Assert.fail(Assert.java:88) ~[SuiteRunner.jar:?] at org.junit.Assert.failNotEquals(Assert.java:834) ~[SuiteRunner.jar:?] at org.junit.Assert.assertEquals(Assert.java:118) ~[SuiteRunner.jar:?] at com.hedera.services.bdd.spec.queries.HapiQueryOp.submitOp(HapiQueryOp.java:144) ~[SuiteRunner.jar:?] at com.hedera.services.bdd.spec.HapiSpecOperation.execFor(HapiSpecOperation.java:179) ~[SuiteRunner.jar:?] at com.hedera.services.bdd.spec.HapiApiSpec.exec(HapiApiSpec.java:222) ~[SuiteRunner.jar:?] at com.hedera.services.bdd.spec.HapiApiSpec.run(HapiApiSpec.java:176) ~[SuiteRunner.jar:?] at java.util.AbstractList$RandomAccessSpliterator.forEachRemaining(AbstractList.java:720) ~[?:?] at java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:658) ~[?:?] at com.hedera.services.bdd.suites.HapiApiSuite.runSync(HapiApiSuite.java:249) ~[SuiteRunner.jar:?] at com.hedera.services.bdd.suites.HapiApiSuite.runSuite(HapiApiSuite.java:140) ~[SuiteRunner.jar:?] at com.hedera.services.bdd.suites.HapiApiSuite.runSuiteSync(HapiApiSuite.java:133) ~[SuiteRunner.jar:?] at com.hedera.services.bdd.suites.SuiteRunner.lambda$runSuitesSync$15(SuiteRunner.java:490) ~[SuiteRunner.jar:?] at java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:176) ~[?:?] at java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:948) ~[?:?] at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484) ~[?:?] at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474) ~[?:?] at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:913) ~[?:?] at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) ~[?:?] at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:578) ~[?:?] at com.hedera.services.bdd.suites.SuiteRunner.runSuitesSync(SuiteRunner.java:491) ~[SuiteRunner.jar:?] at com.hedera.services.bdd.suites.SuiteRunner.lambda$runTargetCategories$10(SuiteRunner.java:465) ~[SuiteRunner.jar:?] at java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195) [?:?] at java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1654) [?:?] at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484) [?:?] at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474) [?:?] at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:913) [?:?] at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) [?:?] at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:578) [?:?] at com.hedera.services.bdd.suites.SuiteRunner.runTargetCategories(SuiteRunner.java:465) [SuiteRunner.jar:?] at com.hedera.services.bdd.suites.SuiteRunner.runCategories(SuiteRunner.java:434) [SuiteRunner.jar:?] at com.hedera.services.bdd.suites.SuiteRunner.main(SuiteRunner.java:358) [SuiteRunner.jar:?] 2020-11-30 07:46:20.390 INFO 244 HapiApiSpec - 'updateApiPermissionsDuringReconnect' - final status: FAILED! 2020-11-30 07:46:20.391 INFO 168 UpdateApiPermissionsDuringReconnect - -------------- RESULTS OF UpdateApiPermissionsDuringReconnect SUITE -------------- 2020-11-30 07:46:20.391 INFO 170 UpdateApiPermissionsDuringReconnect - Spec{name=updateApiPermissionsDuringReconnect, status=FAILED} 2020-11-30 07:46:20.395 INFO 439 SuiteRunner - ============== sync run results ============== 2020-11-30 07:46:20.395 INFO 442 SuiteRunner - UpdateApiPermi...uringReconnect :: 0/1 suites ran OK 2020-11-30 07:46:20.395 INFO 448 SuiteRunner - --> Problems in suite 'UpdateApiPermissionsDuringReconnect' :: Spec{name=updateApiPermissionsDuringReconnect, status=FAILED} ``` **Environment:** - OS: [e.g. Ubuntu 18.04] - Java: [e.g. OpenJDK 11.0.4] - Hedera Services Version: [e.g. 0.0.5] - HAPI Version: [e.g. 0.0.5] **Additional Context** Add any other context about the problem here. Attach any logs here, if applicable.

a1becc9109e1724e5b02961e6e0821a9a51fd56e

f4b1559a3118e08e6c4918324571a47417639c64

https://github.com/hashgraph/hedera-services/compare/a1becc9109e1724e5b02961e6e0821a9a51fd56e...f4b1559a3118e08e6c4918324571a47417639c64

diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/reconnect/UpdateApiPermissionsDuringReconnect.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/reconnect/UpdateApiPermissionsDuringReconnect.java index a251efa59b..e6679dfc5f 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/reconnect/UpdateApiPermissionsDuringReconnect.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/reconnect/UpdateApiPermissionsDuringReconnect.java @@ -29,7 +29,9 @@ import org.apache.logging.log4j.Logger; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import java.time.Duration; +import static com.hedera.services.bdd.spec.utilops.UtilVerbs.sleepFor; import static com.hedera.services.bdd.spec.HapiApiSpec.defaultHapiSpec; import static com.hedera.services.bdd.spec.queries.QueryVerbs.getAccountBalance; import static com.hedera.services.bdd.spec.queries.QueryVerbs.getFileContents; @@ -54,6 +56,7 @@ public class UpdateApiPermissionsDuringReconnect extends HapiApiSuite { final String fileInfoRegistry = "apiPermissionsReconnect"; return defaultHapiSpec("updateApiPermissionsDuringReconnect") .given( + sleepFor(Duration.ofSeconds(25).toMillis()), getAccountBalance(GENESIS).setNode("0.0.6").unavailableNode() ) .when(

['test-clients/src/main/java/com/hedera/services/bdd/suites/reconnect/UpdateApiPermissionsDuringReconnect.java']

{'.java': 1}

Java

{'Java': 47108298, 'PureBasic': 6600158, 'HTML': 648631, 'Solidity': 616825, 'Kotlin': 207028, 'Shell': 76275, 'Python': 34764, 'Go': 24380, 'Dockerfile': 21409, 'Batchfile': 7426, 'Perl': 7364}

Apache License 2.0

hashgraph/hedera-services/1020/859

hashgraph

hedera-services

https://github.com/hashgraph/hedera-services/issues/859

https://github.com/hashgraph/hedera-services/pull/1020

https://github.com/hashgraph/hedera-services/pull/1020

closes

Account with positive balance must be created via a cryptoCreate

**Summary of the defect** https://github.com/hashgraph/hedera-services/blob/1308f994ba95d4d76c004b319aafa33fa2fcac67/hedera-node/src/main/java/com/hedera/services/state/initialization/BackedSystemAccountsCreator.java#L81-L104 Only `GENESIS` account (also called `treasury` account) is created with `totalTinyBarFloat` during genesis.

58049acd49d8ed56230b448455c2f71f1b5d345c

401581d84a9213f3d0f8da9b520d6259b63cdfb7

https://github.com/hashgraph/hedera-services/compare/58049acd49d8ed56230b448455c2f71f1b5d345c...401581d84a9213f3d0f8da9b520d6259b63cdfb7

diff --git a/hedera-node/src/main/java/com/hedera/services/state/initialization/BackedSystemAccountsCreator.java b/hedera-node/src/main/java/com/hedera/services/state/initialization/BackedSystemAccountsCreator.java index 6b8966e04d..3b3b1e59bf 100644 --- a/hedera-node/src/main/java/com/hedera/services/state/initialization/BackedSystemAccountsCreator.java +++ b/hedera-node/src/main/java/com/hedera/services/state/initialization/BackedSystemAccountsCreator.java @@ -31,7 +31,6 @@ import com.hedera.services.legacy.core.jproto.JKey; import com.hedera.services.exceptions.NegativeAccountBalanceException; import com.hedera.services.state.merkle.MerkleAccount; import com.hedera.services.state.merkle.MerkleEntityId; -import com.hedera.services.utils.MiscUtils; import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.Key; import com.hederahashgraph.api.proto.java.KeyList; @@ -78,16 +77,9 @@ public class BackedSystemAccountsCreator implements SystemAccountsCreator { BackingStore<AccountID, MerkleAccount> accounts, AddressBook addressBook ) { - var nodeAccountNums = MiscUtils.getNodeAccountNums(addressBook); - long N = properties.getIntProperty("ledger.numSystemAccounts"); long expiry = properties.getLongProperty("bootstrap.system.entityExpiry"); long tinyBarFloat = properties.getLongProperty("ledger.totalTinyBarFloat"); - long nodeBalance = properties.getLongProperty("bootstrap.ledger.nodeAccounts.initialBalance"); - long defaultBalance = properties.getLongProperty("bootstrap.ledger.systemAccounts.initialBalance"); - long treasuryBalance = tinyBarFloat - - (nodeBalance * nodeAccountNums.size()) - - (defaultBalance * (N - nodeAccountNums.size() - 1)); for (long num = 1; num <= N; num++) { var id = idWith(num); @@ -95,11 +87,9 @@ public class BackedSystemAccountsCreator implements SystemAccountsCreator { continue; } if (num == accountNums.treasury()) { - accounts.put(id, accountWith(treasuryBalance, expiry)); - } else if (nodeAccountNums.contains(num)) { - accounts.put(id, accountWith(nodeBalance, expiry)); + accounts.put(id, accountWith(tinyBarFloat, expiry)); } else { - accounts.put(id, accountWith(defaultBalance, expiry)); + accounts.put(id, accountWith(0, expiry)); } } diff --git a/hedera-node/src/test/java/com/hedera/services/state/initialization/BackedSystemAccountsCreatorTest.java b/hedera-node/src/test/java/com/hedera/services/state/initialization/BackedSystemAccountsCreatorTest.java index 3e25e5ba55..3fc2e0d1fa 100644 --- a/hedera-node/src/test/java/com/hedera/services/state/initialization/BackedSystemAccountsCreatorTest.java +++ b/hedera-node/src/test/java/com/hedera/services/state/initialization/BackedSystemAccountsCreatorTest.java @@ -58,10 +58,7 @@ import static org.mockito.Mockito.verify; class BackedSystemAccountsCreatorTest { private long shard = 1; private long realm = 2; - private long nodeBalance = 10l; - private long stdBalance = 5l; - private long treasuryBalance = 80l; - private long recordThresholds = 100l; + private long totalBalance = 100l; private long expiry = Instant.now().getEpochSecond() + 1_234_567L; private int numAccounts = 4; private String b64Loc = "somewhere"; @@ -98,11 +95,7 @@ class BackedSystemAccountsCreatorTest { given(properties.getIntProperty("ledger.numSystemAccounts")) .willReturn(numAccounts); given(properties.getLongProperty("ledger.totalTinyBarFloat")) - .willReturn(100L); - given(properties.getLongProperty("bootstrap.ledger.nodeAccounts.initialBalance")) - .willReturn(10L); - given(properties.getLongProperty("bootstrap.ledger.systemAccounts.initialBalance")) - .willReturn(5L); + .willReturn(totalBalance); given(properties.getStringProperty("bootstrap.genesisB64Keystore.keyName")) .willReturn(legacyId); given(properties.getStringProperty("bootstrap.genesisB64Keystore.path")) @@ -122,10 +115,10 @@ class BackedSystemAccountsCreatorTest { accountWith(2), accountWith(3), accountWith(4))); - given(backingAccounts.getUnsafeRef(accountWith(1))).willReturn(withExpectedBalance(stdBalance)); - given(backingAccounts.getUnsafeRef(accountWith(2))).willReturn(withExpectedBalance(treasuryBalance)); - given(backingAccounts.getUnsafeRef(accountWith(3))).willReturn(withExpectedBalance(nodeBalance)); - given(backingAccounts.getUnsafeRef(accountWith(4))).willReturn(withExpectedBalance(stdBalance)); + given(backingAccounts.getUnsafeRef(accountWith(1))).willReturn(withExpectedBalance(0)); + given(backingAccounts.getUnsafeRef(accountWith(2))).willReturn(withExpectedBalance(totalBalance)); + given(backingAccounts.getUnsafeRef(accountWith(3))).willReturn(withExpectedBalance(0)); + given(backingAccounts.getUnsafeRef(accountWith(4))).willReturn(withExpectedBalance(0)); subject = new BackedSystemAccountsCreator( hederaNums, @@ -136,11 +129,11 @@ class BackedSystemAccountsCreatorTest { @Test public void throwsOnNegativeBalance() { - givenMissingNode(); + givenMissingTreasury(); // and: given(legacyReader.hexedABytesFrom(b64Loc, legacyId)).willReturn(hexedABytes); // and: - given(properties.getLongProperty("bootstrap.ledger.nodeAccounts.initialBalance")) + given(properties.getLongProperty("ledger.totalTinyBarFloat")) .willReturn(-100L); // expect: @@ -177,7 +170,7 @@ class BackedSystemAccountsCreatorTest { subject.ensureSystemAccounts(backingAccounts, book); // then: - verify(backingAccounts).put(accountWith(3), withExpectedBalance(nodeBalance)); + verify(backingAccounts).put(accountWith(3), withExpectedBalance(0)); } @Test @@ -190,7 +183,7 @@ class BackedSystemAccountsCreatorTest { subject.ensureSystemAccounts(backingAccounts, book); // then: - verify(backingAccounts).put(accountWith(4), withExpectedBalance(stdBalance)); + verify(backingAccounts).put(accountWith(4), withExpectedBalance(0)); } @Test @@ -203,7 +196,7 @@ class BackedSystemAccountsCreatorTest { subject.ensureSystemAccounts(backingAccounts, book); // then: - verify(backingAccounts).put(accountWith(2), withExpectedBalance(treasuryBalance)); + verify(backingAccounts).put(accountWith(2), withExpectedBalance(totalBalance)); } @Test @@ -231,7 +224,7 @@ class BackedSystemAccountsCreatorTest { verify(backingAccounts, never()).put(any(), any()); // and: verify(BackedSystemAccountsCreator.log).info(String.format( - "Ledger float is %d tinyBars in %d accounts.", 100, 4)); + "Ledger float is %d tinyBars in %d accounts.", totalBalance, 4)); // cleanup: BackedSystemAccountsCreator.log = LogManager.getLogger(BackedSystemAccountsCreator.class);

['hedera-node/src/main/java/com/hedera/services/state/initialization/BackedSystemAccountsCreator.java', 'hedera-node/src/test/java/com/hedera/services/state/initialization/BackedSystemAccountsCreatorTest.java']

{'.java': 2}

Java

{'Java': 47108298, 'PureBasic': 6600158, 'HTML': 648631, 'Solidity': 616825, 'Kotlin': 207028, 'Shell': 76275, 'Python': 34764, 'Go': 24380, 'Dockerfile': 21409, 'Batchfile': 7426, 'Perl': 7364}

Apache License 2.0

hashgraph/hedera-services/1093/1092

hashgraph

hedera-services

https://github.com/hashgraph/hedera-services/issues/1092

https://github.com/hashgraph/hedera-services/pull/1093

https://github.com/hashgraph/hedera-services/pull/1093

closes

Exported balances CSV using SingleAccountBalances type in 0.12.0-rc.1 tag

**Summary of the defect** In `v0.11.0` token balances in the account balances CSV are Base64-encoded serializations of [the `TokenBalances` type](https://github.com/hashgraph/hedera-services/blob/06381945ab3960f7efcc9228a12bc71dad153e02/hedera-node/src/main/java/com/hedera/services/state/exports/SignedStateBalancesExporter.java#L239): ``` static String b64Encode(TokenBalances tokenBalances) { return encoder.encodeToString(tokenBalances.toByteArray()); } ``` In `master` the Base64-encoding is of the `SingleAccountBalances` [type](https://github.com/hashgraph/hedera-services/blob/master/hedera-node/src/main/java/com/hedera/services/state/exports/SignedStateBalancesExporter.java#L364): ``` static String b64Encode(SingleAccountBalances accountBalances) { return encoder.encodeToString(accountBalances.toByteArray()); } ```

2ceb58f0d8a3687749b5366d38197a6d1340e788

0394e874f0882c060013ac0e25c595e87b740b4a

https://github.com/hashgraph/hedera-services/compare/2ceb58f0d8a3687749b5366d38197a6d1340e788...0394e874f0882c060013ac0e25c595e87b740b4a

diff --git a/hedera-node/src/main/java/com/hedera/services/ServicesMain.java b/hedera-node/src/main/java/com/hedera/services/ServicesMain.java index 4f00558ef4..12acda2796 100644 --- a/hedera-node/src/main/java/com/hedera/services/ServicesMain.java +++ b/hedera-node/src/main/java/com/hedera/services/ServicesMain.java @@ -126,8 +126,7 @@ public class ServicesMain implements SwirldMain { } if (ctx.globalDynamicProperties().shouldExportBalances() && ctx.balancesExporter().isTimeToExport(when)) { try { - ctx.balancesExporter().toCsvFile((ServicesState) signedState, when); - ctx.balancesExporter().toProtoFile((ServicesState) signedState, when); + ctx.balancesExporter().exportBalancesFrom((ServicesState) signedState, when); } catch (IllegalStateException ise) { log.error("HederaNode#{} has invalid total balance in signed state, exiting!", ctx.id(), ise); systemExits.fail(1); diff --git a/hedera-node/src/main/java/com/hedera/services/state/exports/BalancesExporter.java b/hedera-node/src/main/java/com/hedera/services/state/exports/BalancesExporter.java index e80d73aba9..cbcde98fa9 100644 --- a/hedera-node/src/main/java/com/hedera/services/state/exports/BalancesExporter.java +++ b/hedera-node/src/main/java/com/hedera/services/state/exports/BalancesExporter.java @@ -26,6 +26,5 @@ import java.time.Instant; public interface BalancesExporter { boolean isTimeToExport(Instant now); - void toCsvFile(ServicesState signedState, Instant when); - void toProtoFile(ServicesState signedState, Instant when); + void exportBalancesFrom(ServicesState signedState, Instant when); } diff --git a/hedera-node/src/main/java/com/hedera/services/state/exports/SignedStateBalancesExporter.java b/hedera-node/src/main/java/com/hedera/services/state/exports/SignedStateBalancesExporter.java index f162b370df..e50a3e7329 100644 --- a/hedera-node/src/main/java/com/hedera/services/state/exports/SignedStateBalancesExporter.java +++ b/hedera-node/src/main/java/com/hedera/services/state/exports/SignedStateBalancesExporter.java @@ -9,9 +9,9 @@ package com.hedera.services.state.exports; * 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. @@ -34,15 +34,16 @@ import com.hederahashgraph.api.proto.java.AccountID; import com.hedera.services.stream.proto.AllAccountBalances; import com.hedera.services.stream.proto.SingleAccountBalances; import com.hedera.services.stream.proto.TokenUnitBalance; +import com.hederahashgraph.api.proto.java.TokenBalance; +import com.hederahashgraph.api.proto.java.TokenBalances; import com.hederahashgraph.api.proto.java.TokenID; -import com.swirlds.common.Units; import com.swirlds.fcmap.FCMap; +import org.apache.commons.lang3.time.StopWatch; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.BufferedWriter; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.Writer; @@ -54,8 +55,8 @@ import java.util.ArrayList; import java.util.Base64; import java.util.Comparator; import java.util.List; +import java.util.concurrent.TimeUnit; import java.util.function.UnaryOperator; -import java.util.Optional; import static com.hedera.services.state.merkle.MerkleEntityAssociation.fromAccountTokenRel; import static com.hedera.services.state.merkle.MerkleEntityId.fromTokenId; @@ -65,34 +66,37 @@ import static com.hedera.services.ledger.HederaLedger.ACCOUNT_ID_COMPARATOR; public class SignedStateBalancesExporter implements BalancesExporter { static Logger log = LogManager.getLogger(SignedStateBalancesExporter.class); - static final String LINE_SEPARATOR = System.getProperty("line.separator"); - static final String UNKNOWN_EXPORT_DIR = ""; + private static final String LINE_SEPARATOR = System.getProperty("line.separator"); + private static final String UNKNOWN_EXPORT_DIR = ""; + private static final String BAD_EXPORT_ATTEMPT_ERROR_MSG_TPL = "Could not export to '%s'!"; + private static final String BAD_SIGNING_ATTEMPT_ERROR_MSG_TPL = "Could not sign balance file '%s'!"; static final String BAD_EXPORT_DIR_ERROR_MSG_TPL = "Cannot ensure existence of export dir '%s'!"; static final String LOW_NODE_BALANCE_WARN_MSG_TPL = "Node '%s' has unacceptably low balance %d!"; - static final String BAD_EXPORT_ATTEMPT_ERROR_MSG_TPL = "Could not export to '%s'!"; - static final String BAD_SIGNING_ATTEMPT_ERROR_MSG_TPL = "Could not sign balance file '%s'!"; static final String GOOD_SIGNING_ATTEMPT_DEBUG_MSG_TPL = "Created balance signature file '%s'."; static final String CURRENT_VERSION = "version:2"; - static final String PROTOBUF_FILE_EXTENSION = ".pb"; - static final String CSV_FILE_EXTENSION = ".csv"; + private static final String PROTO_FILE_EXTENSION = ".pb"; + private static final String CSV_FILE_EXTENSION = ".csv"; static final Instant NEVER = null; - static final Base64.Encoder encoder = Base64.getEncoder(); + private static final Base64.Encoder encoder = Base64.getEncoder(); final long expectedFloat; - final UnaryOperator<byte[]> signer; - final GlobalDynamicProperties dynamicProperties; + private final UnaryOperator<byte[]> signer; + private final GlobalDynamicProperties dynamicProperties; + /* Used to toggle output for testing. */ + boolean exportCsv = true, exportProto = true; SigFileWriter sigFileWriter = new StandardSigFileWriter(); FileHashReader hashReader = new Sha384HashReader(); DirectoryAssurance directories = loc -> Files.createDirectories(Paths.get(loc)); - String lastUsedExportDir = UNKNOWN_EXPORT_DIR; - Instant periodEnd = NEVER; + private String lastUsedExportDir = UNKNOWN_EXPORT_DIR; + private BalancesSummary summary; + Instant periodEnd = NEVER; - public static final Comparator<SingleAccountBalances> SINGLE_ACCOUNT_BALANCES_COMPARATOR = + static final Comparator<SingleAccountBalances> SINGLE_ACCOUNT_BALANCES_COMPARATOR = Comparator.comparing(SingleAccountBalances::getAccountID, ACCOUNT_ID_COMPARATOR); public SignedStateBalancesExporter( @@ -119,57 +123,53 @@ public class SignedStateBalancesExporter implements BalancesExporter { } @Override - public void toCsvFile(ServicesState signedState, Instant exportTimeStamp) { + public void exportBalancesFrom(ServicesState signedState, Instant when) { if (!ensureExportDir(signedState.getNodeAccountId())) { return; } - long startTime = System.nanoTime(); - var summary = summarized(signedState); + var watch = StopWatch.createStarted(); + summary = summarized(signedState); var expected = BigInteger.valueOf(expectedFloat); if (!expected.equals(summary.getTotalFloat())) { throw new IllegalStateException(String.format( "Signed state @ %s had total balance %d not %d!", - exportTimeStamp, - summary.getTotalFloat(), - expectedFloat)); + when, summary.getTotalFloat(), expectedFloat)); } + log.info("Took {}ms to summarize signed state balances", watch.getTime(TimeUnit.MILLISECONDS)); + + if (exportCsv) { + toCsvFile(when); + } + if (exportProto) { + toProtoFile(when); } + } + + private void toCsvFile(Instant exportTimeStamp) { + var watch = StopWatch.createStarted(); + var csvLoc = lastUsedExportDir + exportTimeStamp.toString().replace(":", "_") + "_Balances" + CSV_FILE_EXTENSION; boolean exportSucceeded = exportBalancesFile(summary, csvLoc, exportTimeStamp); if (exportSucceeded) { tryToSign(csvLoc); } - log.info("It took total {} Millisecond to export and sign the csv account files", - (System.nanoTime() - startTime) * Units.NANOSECONDS_TO_MILLISECONDS); - } - - @Override - public void toProtoFile(ServicesState signedState, Instant exportTimeStamp) { - if (!ensureExportDir(signedState.getNodeAccountId())) { - return; - } - long startTime = System.nanoTime(); - AllAccountBalances.Builder allAccountBalancesBuilder = AllAccountBalances.newBuilder(); + log.info(" -> Took {}ms to export and sign CSV balances file", watch.getTime(TimeUnit.MILLISECONDS)); + } - var expected = BigInteger.valueOf(expectedFloat); - var total = calcTotalAndBuildProtoMessage(signedState, exportTimeStamp, allAccountBalancesBuilder); - - if (!expected.equals(total)) { - throw new IllegalStateException(String.format( - "Signed state @ %s had total balance %d not %d!", - exportTimeStamp,total, expectedFloat)); - } + private void toProtoFile(Instant exportTimeStamp) { + var watch = StopWatch.createStarted(); + var builder = AllAccountBalances.newBuilder(); + summarizeAsProto(exportTimeStamp, builder); var protoLoc = lastUsedExportDir - + exportTimeStamp.toString().replace(":", "_") + "_Balances" + PROTOBUF_FILE_EXTENSION; - boolean exportSucceeded = exportBalancesProtoFile(allAccountBalancesBuilder, protoLoc); - + + exportTimeStamp.toString().replace(":", "_") + "_Balances" + PROTO_FILE_EXTENSION; + boolean exportSucceeded = exportBalancesProtoFile(builder, protoLoc); if (exportSucceeded) { tryToSign(protoLoc); } - log.info("It took total {} Millisecond to export and sign the proto account files", - (System.nanoTime() - startTime) * Units.NANOSECONDS_TO_MILLISECONDS); + + log.info(" -> Took {}ms to export and sign proto balances file", watch.getTime(TimeUnit.MILLISECONDS)); } private void tryToSign(String csvLoc) { @@ -192,7 +192,7 @@ public class SignedStateBalancesExporter implements BalancesExporter { } else { addLegacyHeader(fout, when); } - for (SingleAccountBalances singleAccountBalances : summary.getOrderedBalances()) { + for (SingleAccountBalances singleAccountBalances : summary.getOrderedBalances()) { fout.write(String.format( "%d,%d,%d,%d", singleAccountBalances.getAccountID().getShardNum(), @@ -200,10 +200,9 @@ public class SignedStateBalancesExporter implements BalancesExporter { singleAccountBalances.getAccountID().getAccountNum(), singleAccountBalances.getHbarBalance())); if (dynamicProperties.shouldExportTokenBalances()) { - if(singleAccountBalances.getTokenUnitBalancesList().size() > 0) { + if (singleAccountBalances.getTokenUnitBalancesList().size() > 0) { fout.write("," + b64Encode(singleAccountBalances)); - } - else { + } else { fout.write(","); } } @@ -216,62 +215,14 @@ public class SignedStateBalancesExporter implements BalancesExporter { return true; } - private BigInteger calcTotalAndBuildProtoMessage(ServicesState signedState, Instant exportTimeStamp, - AllAccountBalances.Builder allAccountBalancesBuilder) { - - long nodeBalanceWarnThreshold = dynamicProperties.nodeBalanceWarningThreshold(); - BigInteger totalFloat = BigInteger.valueOf(0L); - - var nodeIds = MiscUtils.getNodeAccounts(signedState.addressBook()); - var tokens = signedState.tokens(); - var accounts = signedState.accounts(); - var tokenAssociations = signedState.tokenAssociations(); - - for (MerkleEntityId id : accounts.keySet()) { - var account = accounts.get(id); - if (!account.isDeleted()) { - var accountId = id.toAccountId(); - var balance = account.getBalance(); - if (nodeIds.contains(accountId) && balance < nodeBalanceWarnThreshold) { - log.warn(String.format( - LOW_NODE_BALANCE_WARN_MSG_TPL, - readableId(accountId), - balance)); - } - totalFloat = totalFloat.add(BigInteger.valueOf(account.getBalance())); - - SingleAccountBalances.Builder singleAccountBuilder =SingleAccountBalances.newBuilder(); - singleAccountBuilder.setAccountID(accountId) - .setHbarBalance(balance); - - if (dynamicProperties.shouldExportTokenBalances()) { - var accountTokens = account.tokens(); - if (accountTokens.numAssociations() > 0) { - for (TokenID tokenId : accountTokens.asIds()) { - var token = tokens.get(fromTokenId(tokenId)); - if (token != null && !token.isDeleted()) { - var relationship = tokenAssociations - .get(fromAccountTokenRel(accountId, tokenId)); - singleAccountBuilder.addTokenUnitBalances(tb(tokenId, relationship.getBalance())); - } - } - } - } - Timestamp.Builder consensusTimeStamp = Timestamp.newBuilder(); - consensusTimeStamp.setSeconds(exportTimeStamp.getEpochSecond()) - .setNanos(exportTimeStamp.getNano()); - allAccountBalancesBuilder.setConsensusTimestamp(consensusTimeStamp.build()); - allAccountBalancesBuilder.addAllAccounts(singleAccountBuilder.build()); - } - } - return totalFloat; + private void summarizeAsProto(Instant exportTimeStamp, AllAccountBalances.Builder builder) { + builder.setConsensusTimestamp(Timestamp.newBuilder() + .setSeconds(exportTimeStamp.getEpochSecond()) + .setNanos(exportTimeStamp.getNano())); + builder.addAllAllAccounts(summary.getOrderedBalances()); } private boolean exportBalancesProtoFile(AllAccountBalances.Builder allAccountsBuilder, String protoLoc) { - if(log.isDebugEnabled()) { - log.debug("Export all accounts to protobuf file {} ", protoLoc); - } - try (FileOutputStream fout = new FileOutputStream(protoLoc)) { allAccountsBuilder.build().writeTo(fout); } catch (IOException e) { @@ -281,17 +232,6 @@ public class SignedStateBalancesExporter implements BalancesExporter { return true; } - public Optional<AllAccountBalances> importBalanceProtoFile(String protoLoc) { - try { - FileInputStream fin = new FileInputStream(protoLoc); - AllAccountBalances allAccountBalances = AllAccountBalances.parseFrom(fin); - return Optional.ofNullable(allAccountBalances); - } catch (IOException e) { - log.error("Can't read protobuf message file {}", protoLoc); - } - return Optional.empty(); - } - private void addLegacyHeader(Writer writer, Instant at) throws IOException { writer.write(String.format("TimeStamp:%s%s", at, LINE_SEPARATOR)); writer.write("shardNum,realmNum,accountNum,balance" + LINE_SEPARATOR); @@ -312,7 +252,7 @@ public class SignedStateBalancesExporter implements BalancesExporter { var tokens = signedState.tokens(); var accounts = signedState.accounts(); var tokenAssociations = signedState.tokenAssociations(); - for (MerkleEntityId id : accounts.keySet()) { + for (MerkleEntityId id : accounts.keySet()) { var account = accounts.get(id); if (!account.isDeleted()) { var accountId = id.toAccountId(); @@ -328,7 +268,7 @@ public class SignedStateBalancesExporter implements BalancesExporter { sabBuilder.setHbarBalance(balance) .setAccountID(accountId); if (dynamicProperties.shouldExportTokenBalances()) { - addTokenBalances(accountId, account, sabBuilder, tokens, tokenAssociations); + addTokenBalances(accountId, account, sabBuilder, tokens, tokenAssociations); } accountBalances.add(sabBuilder.build()); } @@ -345,14 +285,11 @@ public class SignedStateBalancesExporter implements BalancesExporter { FCMap<MerkleEntityAssociation, MerkleTokenRelStatus> tokenAssociations ) { var accountTokens = account.tokens(); - if (accountTokens.numAssociations() > 0) { - - for (TokenID tokenId : accountTokens.asIds()) { - var token = tokens.get(fromTokenId(tokenId)); - if (token != null && !token.isDeleted()) { - var relationship = tokenAssociations.get(fromAccountTokenRel(id, tokenId)); - sabBuilder.addTokenUnitBalances(tb(tokenId, relationship.getBalance())); - } + for (TokenID tokenId : accountTokens.asIds()) { + var token = tokens.get(fromTokenId(tokenId)); + if (token != null && !token.isDeleted()) { + var relationship = tokenAssociations.get(fromAccountTokenRel(id, tokenId)); + sabBuilder.addTokenUnitBalances(tb(tokenId, relationship.getBalance())); } } } @@ -362,7 +299,13 @@ public class SignedStateBalancesExporter implements BalancesExporter { } static String b64Encode(SingleAccountBalances accountBalances) { - return encoder.encodeToString(accountBalances.toByteArray()); + var wrapper = TokenBalances.newBuilder(); + for (TokenUnitBalance tokenUnitBalance : accountBalances.getTokenUnitBalancesList()) { + wrapper.addTokenBalances(TokenBalance.newBuilder() + .setTokenId(tokenUnitBalance.getTokenId()) + .setBalance(tokenUnitBalance.getBalance())); + } + return encoder.encodeToString(wrapper.build().toByteArray()); } private boolean ensureExportDir(AccountID node) { diff --git a/hedera-node/src/test/java/com/hedera/services/ServicesMainTest.java b/hedera-node/src/test/java/com/hedera/services/ServicesMainTest.java index f9a97391b4..0d38db1e42 100644 --- a/hedera-node/src/test/java/com/hedera/services/ServicesMainTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ServicesMainTest.java @@ -522,8 +522,7 @@ public class ServicesMainTest { subject.newSignedState(signedState, when, 1L); // then: - verify(balancesExporter, never()).toCsvFile(any(), any()); - verify(balancesExporter, never()).toProtoFile(any(), any()); + verify(balancesExporter, never()).exportBalancesFrom(any(), any()); } @Test @@ -540,8 +539,7 @@ public class ServicesMainTest { subject.newSignedState(signedState, when, 1L); // then: - verify(balancesExporter).toCsvFile(signedState, when); - verify(balancesExporter).toProtoFile(signedState, when); + verify(balancesExporter).exportBalancesFrom(signedState, when); } @Test @@ -569,7 +567,9 @@ public class ServicesMainTest { given(globalDynamicProperties.shouldExportBalances()).willReturn(true); given(balancesExporter.isTimeToExport(when)).willReturn(true); - willThrow(IllegalStateException.class).given(balancesExporter).toCsvFile(signedState, when); + willThrow(IllegalStateException.class) + .given(balancesExporter) + .exportBalancesFrom(signedState, when); // when: subject.newSignedState(signedState, when, 1L); diff --git a/hedera-node/src/test/java/com/hedera/services/sigs/factories/SigFactoryCreatorTest.java b/hedera-node/src/test/java/com/hedera/services/sigs/factories/SigFactoryCreatorTest.java index e364453f86..64df69775e 100644 --- a/hedera-node/src/test/java/com/hedera/services/sigs/factories/SigFactoryCreatorTest.java +++ b/hedera-node/src/test/java/com/hedera/services/sigs/factories/SigFactoryCreatorTest.java @@ -21,6 +21,7 @@ package com.hedera.services.sigs.factories; */ import com.google.protobuf.ByteString; +import com.google.protobuf.InvalidProtocolBufferException; import com.hedera.services.state.merkle.MerkleEntityId; import com.hedera.services.state.merkle.MerkleSchedule; import com.hedera.services.utils.SignedTxnAccessor; @@ -32,6 +33,7 @@ import com.hederahashgraph.api.proto.java.ScheduleCreateTransactionBody; import com.hederahashgraph.api.proto.java.ScheduleID; import com.hederahashgraph.api.proto.java.ScheduleSignTransactionBody; import com.hederahashgraph.api.proto.java.SignedTransaction; +import com.hederahashgraph.api.proto.java.TokenBalances; import com.hederahashgraph.api.proto.java.Transaction; import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.api.proto.java.TransferList; @@ -41,6 +43,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.Base64; + import static com.hedera.services.sigs.factories.PlatformSigFactoryTest.pk; import static com.hedera.services.sigs.factories.PlatformSigFactoryTest.sig; import static com.hedera.services.state.merkle.MerkleEntityId.fromScheduleId; diff --git a/hedera-node/src/test/java/com/hedera/services/state/exports/SignedStateBalancesExporterTest.java b/hedera-node/src/test/java/com/hedera/services/state/exports/SignedStateBalancesExporterTest.java index ea44c84f15..5f9aecfe6f 100644 --- a/hedera-node/src/test/java/com/hedera/services/state/exports/SignedStateBalancesExporterTest.java +++ b/hedera-node/src/test/java/com/hedera/services/state/exports/SignedStateBalancesExporterTest.java @@ -20,6 +20,7 @@ package com.hedera.services.state.exports; * ‍ */ +import com.google.protobuf.InvalidProtocolBufferException; import com.hedera.services.ServicesState; import com.hedera.services.config.MockGlobalDynamicProps; import com.hedera.services.context.properties.GlobalDynamicProperties; @@ -35,6 +36,7 @@ import com.hederahashgraph.api.proto.java.AccountID; import com.hedera.services.stream.proto.AllAccountBalances; import com.hedera.services.stream.proto.SingleAccountBalances; import com.hedera.services.stream.proto.TokenUnitBalance; +import com.hederahashgraph.api.proto.java.TokenBalances; import com.hederahashgraph.api.proto.java.TokenID; import com.swirlds.common.Address; @@ -47,17 +49,18 @@ import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.time.Instant; import java.util.ArrayList; -import java.util.Collections; +import java.util.Base64; +import java.util.Base64.Decoder; import java.util.Comparator; import java.util.List; import java.util.function.UnaryOperator; -import java.util.regex.Pattern; import java.util.Optional; import static com.hedera.services.state.exports.SignedStateBalancesExporter.GOOD_SIGNING_ATTEMPT_DEBUG_MSG_TPL; @@ -93,16 +96,12 @@ class SignedStateBalancesExporterTest { long thisNodeBalance = 400; AccountID thisNode = asAccount("0.0.3"); - long anotherNodeBalance = 100; AccountID anotherNode = asAccount("0.0.4"); - long firstNonNodeAccountBalance = 250; AccountID firstNonNode = asAccount("0.0.1001"); - long secondNonNodeAccountBalance = 250; AccountID secondNonNode = asAccount("0.0.1002"); - AccountID deleted = asAccount("0.0.1003"); TokenID theToken = asToken("0.0.1004"); @@ -212,7 +211,8 @@ class SignedStateBalancesExporterTest { subject.directories = assurance; // when: - subject.toCsvFile(state, now); + subject.exportProto = false; + subject.exportBalancesFrom(state, now); // then: verify(mockLog).error(any(String.class), any(Throwable.class)); @@ -226,7 +226,8 @@ class SignedStateBalancesExporterTest { given(hashReader.readHash(loc)).willThrow(IllegalStateException.class); // when: - subject.toCsvFile(state, now); + subject.exportProto = false; + subject.exportBalancesFrom(state, now); // then: verify(mockLog).error(any(String.class), any(Throwable.class)); @@ -235,12 +236,81 @@ class SignedStateBalancesExporterTest { new File(loc).delete(); } + @Test + public void matchesV2OutputForCsv() throws IOException { + // setup: + ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); + // and: + var loc = expectedExportLoc(); + // and: + accounts.clear(); + accounts.put( + new MerkleEntityId(0, 0, 1), + MerkleAccountFactory.newAccount().get()); + accounts.put( + new MerkleEntityId(0, 0, 2), + MerkleAccountFactory.newAccount() + .balance(4999999999999999920L) + .tokens(asToken("0.0.1001"), asToken("0.0.1002")) + .get()); + accounts.put( + new MerkleEntityId(0, 0, 3), + MerkleAccountFactory.newAccount() + .balance(80L) + .tokens(asToken("0.0.1002")) + .get()); + // and: + tokenRels.clear(); + tokenRels.put( + new MerkleEntityAssociation(0, 0, 2, 0, 0, 1001), + new MerkleTokenRelStatus(666L, false, false)); + tokenRels.put( + new MerkleEntityAssociation(0, 0, 2, 0, 0, 1002), + new MerkleTokenRelStatus(444L, false, false)); + tokenRels.put( + new MerkleEntityAssociation(0, 0, 3, 0, 0, 1002), + new MerkleTokenRelStatus(333L, false, false)); + // and: + tokens.clear(); + tokens.put(new MerkleEntityId(0, 0, 1001), token); + tokens.put(new MerkleEntityId(0, 0, 1002), token); + + given(hashReader.readHash(loc)).willReturn(fileHash); + given(sigFileWriter.writeSigFile(captor.capture(), any(), any())).willReturn(loc + "_sig"); + given(properties.getLongProperty("ledger.totalTinyBarFloat")) + .willReturn(5000000000000000000L); + given(signer.apply(fileHash)).willReturn(sig); + // and: + subject = new SignedStateBalancesExporter(properties, signer, dynamicProperties); + subject.sigFileWriter = sigFileWriter; + subject.hashReader = hashReader; + + // when: + subject.exportProto = false; + subject.exportBalancesFrom(state, now); + + // then: + var lines = Files.readAllLines(Paths.get(loc)); + assertEquals(6, lines.size()); + assertEquals(String.format("# " + SignedStateBalancesExporter.CURRENT_VERSION, now), lines.get(0)); + assertEquals(String.format("# TimeStamp:%s", now), lines.get(1)); + assertEquals("shardNum,realmNum,accountNum,balance,tokenBalances", lines.get(2)); + assertEquals("0,0,1,0,", lines.get(3)); + assertEquals("0,0,2,4999999999999999920,CggKAxjpBxCaBQoICgMY6gcQvAM=", lines.get(4)); + assertEquals("0,0,3,80,CggKAxjqBxDNAg==", lines.get(5)); + // and: + verify(sigFileWriter).writeSigFile(loc, sig, fileHash); + // and: + verify(mockLog).debug(String.format(GOOD_SIGNING_ATTEMPT_DEBUG_MSG_TPL, loc + "_sig")); + + // cleanup: + new File(loc).delete(); + } + @Test public void usesNewFormatWhenExportingTokenBalances() throws IOException { // setup: ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - Pattern CSV_NAME_PATTERN = Pattern.compile( - ".*\\\\d{4}-\\\\d{2}-\\\\d{2}T\\\\d{2}_\\\\d{2}_\\\\d{2}[.]\\\\d{9}Z_Balances.csv"); // and: var loc = expectedExportLoc(); @@ -248,7 +318,8 @@ class SignedStateBalancesExporterTest { given(sigFileWriter.writeSigFile(captor.capture(), any(), any())).willReturn(loc + "_sig"); // when: - subject.toCsvFile(state, now); + subject.exportProto = false; + subject.exportBalancesFrom(state, now); // then: var lines = Files.readAllLines(Paths.get(loc)); @@ -271,8 +342,6 @@ class SignedStateBalancesExporterTest { verify(sigFileWriter).writeSigFile(loc, sig, fileHash); // and: verify(mockLog).debug(String.format(GOOD_SIGNING_ATTEMPT_DEBUG_MSG_TPL, loc + "_sig")); - // and: -// assertTrue(CSV_NAME_PATTERN.matcher(captor.getValue()).matches()); // cleanup: new File(loc).delete(); @@ -292,7 +361,8 @@ class SignedStateBalancesExporterTest { subject.hashReader = hashReader; // when: - subject.toCsvFile(state, now); + subject.exportProto = false; + subject.exportBalancesFrom(state, now); // then: var lines = Files.readAllLines(Paths.get(expectedExportLoc())); @@ -318,8 +388,6 @@ class SignedStateBalancesExporterTest { public void testExportingTokenBalancesProto() throws IOException { // setup: ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - Pattern PB_NAME_PATTERN = Pattern.compile( - ".*\\\\d{4}-\\\\d{2}-\\\\d{2}T\\\\d{2}_\\\\d{2}_\\\\d{2}[.]\\\\d{9}Z_Balances.pb"); // and: var loc = expectedExportLoc(true); @@ -327,23 +395,23 @@ class SignedStateBalancesExporterTest { given(sigFileWriter.writeSigFile(captor.capture(), any(), any())).willReturn(loc + "_sig"); // when: - subject.toProtoFile(state, now); + subject.exportCsv = false; + subject.exportBalancesFrom(state, now); // and: - java.util.Optional<AllAccountBalances> fileContent = subject.importBalanceProtoFile(loc); + java.util.Optional<AllAccountBalances> fileContent = importBalanceProtoFile(loc); - AllAccountBalances allAccountBalances = fileContent.get() ; + AllAccountBalances allAccountBalances = fileContent.get(); // then: List<SingleAccountBalances> accounts = allAccountBalances.getAllAccountsList(); assertEquals(accounts.size(), 4); - for(SingleAccountBalances account : accounts) { - if(account.getAccountID().getAccountNum() == 1001) { + for (SingleAccountBalances account : accounts) { + if (account.getAccountID().getAccountNum() == 1001) { assertEquals(account.getHbarBalance(), 250); - } - else if(account.getAccountID().getAccountNum() == 1002) { + } else if (account.getAccountID().getAccountNum() == 1002) { assertEquals(account.getHbarBalance(), 250); assertEquals(account.getTokenUnitBalances(0).getTokenId().getTokenNum(), 1004); assertEquals(account.getTokenUnitBalances(0).getBalance(), 100); @@ -354,8 +422,6 @@ class SignedStateBalancesExporterTest { verify(sigFileWriter).writeSigFile(loc, sig, fileHash); // and: verify(mockLog).debug(String.format(GOOD_SIGNING_ATTEMPT_DEBUG_MSG_TPL, loc + "_sig")); - // and: -// assertTrue(CSV_NAME_PATTERN.matcher(captor.getValue()).matches()); // cleanup: new File(loc).delete(); @@ -376,7 +442,8 @@ class SignedStateBalancesExporterTest { subject.directories = assurance; // when: - subject.toProtoFile(state, now); + subject.exportCsv = false; + subject.exportBalancesFrom(state, now); // then: verify(mockLog).error(any(String.class), any(Throwable.class)); @@ -386,42 +453,29 @@ class SignedStateBalancesExporterTest { @Test public void getEmptyAllAccountBalancesFromCorruptedProtoFileImport() throws Exception { // setup: - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - Pattern BAD_PB_NAME_PATTERN = Pattern.compile( - ".*\\\\d{4}-\\\\d{2}-\\\\d{2}T\\\\d{2}_\\\\d{2}_\\\\d{2}[.]\\\\d{9}Z_Balances.pb"); - // and: var loc = expectedExportLoc(true); given(hashReader.readHash(loc)).willReturn(fileHash); // when: Pretend the .csv file is a corrupted .pb file - subject.toCsvFile(state, now); + subject.exportProto = false; + subject.exportBalancesFrom(state, now); // and: - java.util.Optional<AllAccountBalances> accounts = subject.importBalanceProtoFile(loc); + java.util.Optional<AllAccountBalances> accounts = importBalanceProtoFile(loc); // then: assertEquals(Optional.empty(), accounts); } - @Test - public void throwsOnUnexpectedTotalFloatForProtoFile() throws NegativeAccountBalanceException { - // given: - anotherNodeAccount.setBalance(anotherNodeBalance + 1); - - // then: - assertThrows(IllegalStateException.class, () -> subject.toProtoFile(state, now)); - } - - - @Test public void assuresExpectedProtoFileDir() throws IOException { // given: subject.directories = assurance; // when: - subject.toProtoFile(state, now); + subject.exportCsv = false; + subject.exportBalancesFrom(state, now); // then: verify(assurance).ensureExistenceOf(expectedExportDir()); @@ -449,22 +503,19 @@ class SignedStateBalancesExporterTest { willThrow(IOException.class).given(assurance).ensureExistenceOf(any()); // when: - subject.toProtoFile(state, now); + subject.exportCsv = false; + subject.exportBalancesFrom(state, now); // then: verify(mockLog).error(String.format( SignedStateBalancesExporter.BAD_EXPORT_DIR_ERROR_MSG_TPL, expectedExportDir())); } - private String expectedBalancesName(Boolean isProto ) { + private String expectedBalancesName(Boolean isProto) { return isProto ? now.toString().replace(":", "_") + "_Balances.pb" : now.toString().replace(":", "_") + "_Balances.csv"; } - private String expectedBalancesName() { - return expectedBalancesName(false) ; - } - @Test public void testSingleAccountBalancingSort() { // given: @@ -534,7 +585,8 @@ class SignedStateBalancesExporterTest { subject.directories = assurance; // when: - subject.toCsvFile(state, now); + subject.exportProto = false; + subject.exportBalancesFrom(state, now); // then: verify(assurance).ensureExistenceOf(expectedExportDir()); @@ -546,7 +598,8 @@ class SignedStateBalancesExporterTest { anotherNodeAccount.setBalance(anotherNodeBalance + 1); // then: - assertThrows(IllegalStateException.class, () -> subject.toCsvFile(state, now)); + assertThrows(IllegalStateException.class, + () -> subject.exportBalancesFrom(state, now)); } @Test @@ -557,7 +610,8 @@ class SignedStateBalancesExporterTest { willThrow(IOException.class).given(assurance).ensureExistenceOf(any()); // when: - subject.toCsvFile(state, now); + subject.exportProto = false; + subject.exportBalancesFrom(state, now); // then: verify(mockLog).error(String.format( @@ -592,4 +646,15 @@ class SignedStateBalancesExporterTest { .map(Path::toFile) .forEach(File::delete); } + + static Optional<AllAccountBalances> importBalanceProtoFile(String protoLoc) { + try { + FileInputStream fin = new FileInputStream(protoLoc); + AllAccountBalances allAccountBalances = AllAccountBalances.parseFrom(fin); + return Optional.ofNullable(allAccountBalances); + } catch (IOException e) { + SignedStateBalancesExporter.log.error("Can't read protobuf message file {}", protoLoc); + } + return Optional.empty(); + } } diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenMiscOps.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenMiscOps.java index 4e7f49c7bf..e71b01cc1a 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenMiscOps.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenMiscOps.java @@ -21,6 +21,7 @@ package com.hedera.services.bdd.suites.token; */ import com.hedera.services.bdd.spec.HapiApiSpec; +import com.hedera.services.bdd.spec.transactions.token.TokenMovement; import com.hedera.services.bdd.suites.HapiApiSuite; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -38,6 +39,7 @@ import static com.hedera.services.bdd.spec.transactions.TxnVerbs.cryptoTransfer; import static com.hedera.services.bdd.spec.transactions.TxnVerbs.mintToken; import static com.hedera.services.bdd.spec.transactions.TxnVerbs.tokenAssociate; import static com.hedera.services.bdd.spec.transactions.TxnVerbs.tokenCreate; +import static com.hedera.services.bdd.spec.transactions.token.TokenMovement.moving; import static com.hedera.services.bdd.spec.utilops.UtilVerbs.newKeyNamed; public class TokenMiscOps extends HapiApiSuite { @@ -52,12 +54,38 @@ public class TokenMiscOps extends HapiApiSuite { return allOf( List.of(new HapiApiSpec[] { // wellKnownAccountsHaveTokens(), - someInfoQueries(), +// someLowNumAccountsHaveTokens(), +// someInfoQueries(), + theCreation(), } ) ); } + public HapiApiSpec someLowNumAccountsHaveTokens() { + long aSupply = 666L, bSupply = 777L; + + return defaultHapiSpec("SomeLowNumAccountsHaveTokens") + .given( + tokenCreate("first").treasury(GENESIS).initialSupply(aSupply), + tokenCreate("second").treasury(GENESIS).initialSupply(bSupply) + ).when( + tokenAssociate("0.0.3", "second").signedBy(GENESIS), + cryptoTransfer(moving(aSupply / 2, "second") + .between(GENESIS, "0.0.3")).signedBy(GENESIS) + ).then( + getAccountInfo(GENESIS).logged(), + getAccountInfo("0.0.3").logged() + ); + } + + public HapiApiSpec theCreation() { + return defaultHapiSpec("TheCreation") + .given().when().then( + cryptoCreate("adam") + ); + } + public HapiApiSpec someInfoQueries() { return defaultHapiSpec("SomeInfoQueries") .given().when().then(

['hedera-node/src/test/java/com/hedera/services/state/exports/SignedStateBalancesExporterTest.java', 'hedera-node/src/main/java/com/hedera/services/ServicesMain.java', 'test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenMiscOps.java', 'hedera-node/src/main/java/com/hedera/services/state/exports/BalancesExporter.java', 'hedera-node/src/main/java/com/hedera/services/state/exports/SignedStateBalancesExporter.java', 'hedera-node/src/test/java/com/hedera/services/sigs/factories/SigFactoryCreatorTest.java', 'hedera-node/src/test/java/com/hedera/services/ServicesMainTest.java']

{'.java': 7}

Java

{'Java': 47108298, 'PureBasic': 6600158, 'HTML': 648631, 'Solidity': 616825, 'Kotlin': 207028, 'Shell': 76275, 'Python': 34764, 'Go': 24380, 'Dockerfile': 21409, 'Batchfile': 7426, 'Perl': 7364}

Apache License 2.0

hashgraph/hedera-services/1098/1096

hashgraph

hedera-services

https://github.com/hashgraph/hedera-services/issues/1096

https://github.com/hashgraph/hedera-services/pull/1098

https://github.com/hashgraph/hedera-services/pull/1098

closes

HTS-Restart-Performance-Random-10k-61m failed with Unhandled error while processing :: signedTransactionBytes

<!-- Thanks for submitting a bug report! Before submitting: 1. Try searching the existing issues to see if your issue has already been reported 2. If you're reporting a security vulnerability, please email [email protected] instead of opening an issue --> **Summary of the defect** HTS-Restart-Performance-Random-10k-61m failed during TokenAssociateTransitionLogic. **How to reproduce (if possible)** Run test `HTS-Restart-Performance-Random-10k-61m`. **Service logs (if applicable)** ``` 2021-02-08 05:58:07.178 WARN 70 TokenAssociateTransitionLogic - Unhandled error while processing :: signedTransactionBytes: "\\nS\\n\\027\\n\\021\\b\\262\\245\\203\\201\\006\\020\\244\\373\\377\\377\\377\\377\\377\\377\\377\\001\\022\\002\\030\\002\\022\\002\\030\\003\\030\\200\\310\\257\\240%\\"\\002\\bx2 \\303\\203\\302\\256\\303\\202\\302\\267\\303\\203\\302\\271tF8\\303\\202\\302\\256J\\303\\203\\302\\213\\303\\203\\302\\220\\303\\203\\302\\216\\302\\002\\a\\n\\003\\030\\350U\\022\\000\\022G\\nE\\n\\001\\n\\032@\\331\\332\\353\\315T\\3452\\235\\0300\\202\\331Hn\\200w>\\317%\\211\\017S\\270\\374\\312\\322\\3464:\\226r\\371\\\\\\264\\246\\363\\351\\341\\375\\020@\\027\\372\\332.:\\226\\317\\260\\324\\317\\022K\\v\\a\\377n\\177X\\252\\323\\317\\337\\v" ! java.lang.NullPointerException: null at com.hedera.services.store.tokens.HederaTokenStore.fullySanityChecked(HederaTokenStore.java:616) ~[?:?] at com.hedera.services.store.tokens.HederaTokenStore.associate(HederaTokenStore.java:150) ~[?:?] at com.hedera.services.txns.token.TokenAssociateTransitionLogic.doStateTransition(TokenAssociateTransitionLogic.java:67) ~[?:?] at com.hedera.services.legacy.services.state.AwareProcessLogic.doProcess(AwareProcessLogic.java:231) ~[?:?] at com.hedera.services.legacy.services.state.AwareProcessLogic.processTxnInCtx(AwareProcessLogic.java:137) ~[?:?] at com.hedera.services.state.logic.ServicesTxnManager.process(ServicesTxnManager.java:59) ~[?:?] at com.hedera.services.legacy.services.state.AwareProcessLogic.incorporateConsensusTxn(AwareProcessLogic.java:107) ~[?:?] at com.hedera.services.ServicesState.handleTransaction(ServicesState.java:307) ~[?:?] at com.swirlds.platform.EventFlow.handleTransaction(EventFlow.java:731) ~[swirlds-platform-core-0.9.0-alpha.1.jar:?] at com.swirlds.platform.EventFlow.takeHandlePut(EventFlow.java:1259) ~[swirlds-platform-core-0.9.0-alpha.1.jar:?] at com.swirlds.platform.EventFlow.doCons(EventFlow.java:800) ~[swirlds-platform-core-0.9.0-alpha.1.jar:?] at com.swirlds.common.threading.StoppableThread.run(StoppableThread.java:248) ~[swirlds-common-0.9.0-alpha.1.jar:?] at java.lang.Thread.run(Thread.java:835) [?:?] ``` These are Warning Logs and should be ignored in `HederaNodeValidator` Also Error logs `ERROR 158 HapiTxnOp - signedTransactionBytes:` mentioned in `HAPIClientValidator` are from `regression.log` and all tests client logs passed successfully. Slack link : https://hedera-hashgraph.slack.com/archives/CKWHL8R9A/p1612767653364100

0b92ce1301536e9f84f0222e7c94985a8ef9027f

781a28f3bc334e4407ed7414f4a56180e4daf897

https://github.com/hashgraph/hedera-services/compare/0b92ce1301536e9f84f0222e7c94985a8ef9027f...781a28f3bc334e4407ed7414f4a56180e4daf897

diff --git a/hedera-node/src/main/java/com/hedera/services/store/schedule/HederaScheduleStore.java b/hedera-node/src/main/java/com/hedera/services/store/schedule/HederaScheduleStore.java index 5e6806ed5c..adeebe7a25 100644 --- a/hedera-node/src/main/java/com/hedera/services/store/schedule/HederaScheduleStore.java +++ b/hedera-node/src/main/java/com/hedera/services/store/schedule/HederaScheduleStore.java @@ -96,7 +96,7 @@ public class HederaScheduleStore extends HederaStore implements ScheduleStore { @Override public boolean exists(ScheduleID id) { - return pendingId.equals(id) || schedules.get().containsKey(fromScheduleId(id)); + return (isCreationPending() && pendingId.equals(id)) || schedules.get().containsKey(fromScheduleId(id)); } @Override diff --git a/hedera-node/src/main/java/com/hedera/services/store/tokens/HederaTokenStore.java b/hedera-node/src/main/java/com/hedera/services/store/tokens/HederaTokenStore.java index 467eee55fc..ef7cb80ce7 100644 --- a/hedera-node/src/main/java/com/hedera/services/store/tokens/HederaTokenStore.java +++ b/hedera-node/src/main/java/com/hedera/services/store/tokens/HederaTokenStore.java @@ -234,7 +234,7 @@ public class HederaTokenStore extends HederaStore implements TokenStore { @Override public boolean exists(TokenID id) { - return pendingId.equals(id) || tokens.get().containsKey(fromTokenId(id)); + return (isCreationPending() && pendingId.equals(id)) || tokens.get().containsKey(fromTokenId(id)); } @Override diff --git a/hedera-node/src/test/java/com/hedera/services/store/schedule/HederaScheduleStoreTest.java b/hedera-node/src/test/java/com/hedera/services/store/schedule/HederaScheduleStoreTest.java index 2a77c9fd99..9dd6367c37 100644 --- a/hedera-node/src/test/java/com/hedera/services/store/schedule/HederaScheduleStoreTest.java +++ b/hedera-node/src/test/java/com/hedera/services/store/schedule/HederaScheduleStoreTest.java @@ -31,6 +31,7 @@ import com.hedera.services.state.merkle.MerkleEntityId; import com.hedera.services.state.merkle.MerkleSchedule; import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.state.submerkle.RichInstant; +import com.hedera.services.store.tokens.HederaTokenStore; import com.hedera.test.utils.IdUtils; import com.hedera.test.utils.TxnUtils; import com.hederahashgraph.api.proto.java.AccountID; @@ -325,6 +326,12 @@ public class HederaScheduleStoreTest { assertSame(schedule, subject.get(created)); } + @Test + public void existenceCheckUnderstandsPendingIdOnlyAppliesIfCreationPending() { + // expect: + assertFalse(subject.exists(HederaScheduleStore.NO_PENDING_ID)); + } + @Test public void rejectsCreateProvisionallyMissingPayer() { // given: diff --git a/hedera-node/src/test/java/com/hedera/services/store/tokens/HederaTokenStoreTest.java b/hedera-node/src/test/java/com/hedera/services/store/tokens/HederaTokenStoreTest.java index 6445ee25be..8e19755618 100644 --- a/hedera-node/src/test/java/com/hedera/services/store/tokens/HederaTokenStoreTest.java +++ b/hedera-node/src/test/java/com/hedera/services/store/tokens/HederaTokenStoreTest.java @@ -361,6 +361,12 @@ class HederaTokenStoreTest { assertSame(token, subject.get(pending)); } + @Test + public void existenceCheckUnderstandsPendingIdOnlyAppliesIfCreationPending() { + // expect: + assertFalse(subject.exists(HederaTokenStore.NO_PENDING_ID)); + } + @Test public void existenceCheckIncludesPending() { // setup: diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/schedule/HapiGetScheduleInfo.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/schedule/HapiGetScheduleInfo.java index f33ddf2c49..f62e96cab8 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/schedule/HapiGetScheduleInfo.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/schedule/HapiGetScheduleInfo.java @@ -127,7 +127,6 @@ public class HapiGetScheduleInfo extends HapiQueryOp<HapiGetScheduleInfo> { "Wrong schedule expiry!", spec.registry()); - var registry = spec.registry(); expectedSignatories.ifPresent(s -> { diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/HapiTxnOp.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/HapiTxnOp.java index d137acf786..612e7761d9 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/HapiTxnOp.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/HapiTxnOp.java @@ -202,17 +202,18 @@ public abstract class HapiTxnOp<T extends HapiTxnOp<T>> extends HapiSpecOperatio // "{} {} Wrong actual precheck status {}, not one of {}!",spec.logPrefix(), this, // actualPrecheck, // permissiblePrechecks.get()); - throw new HapiTxnPrecheckStateException( - String.format("Wrong actual precheck status %s, expected %s", actualStatus, - permissibleStatuses.get())); + throw new HapiTxnPrecheckStateException(String.format( + "Wrong precheck status! Expected one of %s, actual %s", + permissibleStatuses.get(), actualStatus)); } } else { if (getExpectedPrecheck() != actualPrecheck) { // Change to an info until HapiClientValidator can be modified and can understand new errors log.info("{} {} Wrong actual precheck status {}, expecting {}", spec.logPrefix(), this, actualPrecheck, getExpectedPrecheck()); -// throw new HapiTxnPrecheckStateException(String.format("Wrong precheck status! expected %s, actual -// %s", getExpectedPrecheck(), actualPrecheck)); + throw new HapiTxnPrecheckStateException(String.format( + "Wrong precheck status! Expected %s, actual %s", + getExpectedPrecheck(), actualPrecheck)); } } } @@ -262,16 +263,18 @@ public abstract class HapiTxnOp<T extends HapiTxnOp<T>> extends HapiSpecOperatio "{} {} Wrong actual status {}, not one of {}!", spec.logPrefix(), this, actualStatus, permissibleStatuses.get()); - throw new HapiTxnCheckStateException( - String.format("Wrong actual status %s, expected %s", actualStatus, permissibleStatuses.get())); + throw new HapiTxnCheckStateException(String.format( + "Wrong status! Expected one of %s, was %s", + permissibleStatuses.get(), actualStatus)); } } else { if (getExpectedStatus() != actualStatus) { // Change to an info until HapiClientValidator can be modified and can understand new errors log.info("{} {} Wrong actual status {}, expected {}", spec.logPrefix(), this, actualStatus, getExpectedStatus()); -// throw new HapiTxnCheckStateException(String.format("Wrong actual status %s, expected %s", actualStatus, -// getExpectedStatus())); + throw new HapiTxnCheckStateException(String.format( + "Wrong status! Expected %s, was %s", + getExpectedStatus(), actualStatus)); } } if (!deferStatusResolution) { diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleCreateSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleCreateSpecs.java index ff5b52cdaf..abdd2612be 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleCreateSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleCreateSpecs.java @@ -62,6 +62,7 @@ import static com.hedera.services.bdd.spec.utilops.UtilVerbs.overriding; import static com.hedera.services.bdd.spec.utilops.UtilVerbs.saveExpirations; import static com.hedera.services.bdd.spec.utilops.UtilVerbs.sleepFor; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_SCHEDULE_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.MEMO_TOO_LONG; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.SOME_SIGNATURES_WERE_INVALID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.UNPARSEABLE_SCHEDULED_TRANSACTION; @@ -116,6 +117,7 @@ public class ScheduleCreateSpecs extends HapiApiSuite { allowsDoublingScheduledCreates(), scheduledTXCreatedAfterPreviousIdenticalIsExecuted(), preservesRevocationServiceSemanticsForFileDelete(), + worksAsExpectedWithDefaultScheduleId(), suiteCleanup(), }); } @@ -134,6 +136,13 @@ public class ScheduleCreateSpecs extends HapiApiSuite { ); } + private HapiApiSpec worksAsExpectedWithDefaultScheduleId() { + return defaultHapiSpec("WorksAsExpectedWithDefaultScheduleId") + .given( ).when( ).then( + getScheduleInfo("0.0.0").hasCostAnswerPrecheck(INVALID_SCHEDULE_ID) + ); + } + private HapiApiSpec bodyOnlyCreation() { return defaultHapiSpec("BodyOnlyCreation") .given( ).when( diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleDeleteSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleDeleteSpecs.java index ae689bded0..ccd0df1425 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleDeleteSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleDeleteSpecs.java @@ -167,6 +167,8 @@ public class ScheduleDeleteSpecs extends HapiApiSuite { return defaultHapiSpec("DeletingNonExistingFails") .given().when().then( scheduleDelete("0.0.534") + .hasKnownStatus(INVALID_SCHEDULE_ID), + scheduleDelete("0.0.0") .hasKnownStatus(INVALID_SCHEDULE_ID) ); } diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenAssociationSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenAssociationSpecs.java index 1b65e79978..fc15d788cc 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenAssociationSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenAssociationSpecs.java @@ -101,10 +101,19 @@ public class TokenAssociationSpecs extends HapiApiSuite { expiredAndDeletedTokensStillAppearInContractInfo(), dissociationFromExpiredTokensAsExpected(), accountInfoQueriesAsExpected(), + handlesUseOfDefaultTokenId(), } ); } + public HapiApiSpec handlesUseOfDefaultTokenId() { + return defaultHapiSpec("HandlesUseOfDefaultTokenId") + .given( ).when( ).then( + tokenAssociate(DEFAULT_PAYER, "0.0.0") + .hasKnownStatus(INVALID_TOKEN_ID) + ); + } + public HapiApiSpec associatedContractsMustHaveAdminKeys() { String misc = "someToken"; String contract = "defaultContract"; diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenCreateSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenCreateSpecs.java index e70dc04bbb..78a30ffc7a 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenCreateSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenCreateSpecs.java @@ -38,6 +38,7 @@ import java.util.stream.IntStream; import static com.hedera.services.bdd.spec.HapiApiSpec.defaultHapiSpec; import static com.hedera.services.bdd.spec.queries.QueryVerbs.getAccountBalance; import static com.hedera.services.bdd.spec.queries.QueryVerbs.getAccountInfo; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getScheduleInfo; import static com.hedera.services.bdd.spec.queries.QueryVerbs.getTokenInfo; import static com.hedera.services.bdd.spec.queries.QueryVerbs.getTxnRecord; import static com.hedera.services.bdd.spec.transactions.TxnVerbs.cryptoCreate; @@ -80,10 +81,19 @@ public class TokenCreateSpecs extends HapiApiSuite { creationSetsCorrectExpiry(), creationHappyPath(), numAccountsAllowedIsDynamic(), + worksAsExpectedWithDefaultTokenId(), } ); } + + private HapiApiSpec worksAsExpectedWithDefaultTokenId() { + return defaultHapiSpec("WorksAsExpectedWithDefaultTokenId") + .given().when().then( + getTokenInfo("0.0.0").hasCostAnswerPrecheck(INVALID_TOKEN_ID) + ); + } + public HapiApiSpec autoRenewValidationWorks() { return defaultHapiSpec("AutoRenewValidationWorks") .given( @@ -334,7 +344,7 @@ public class TokenCreateSpecs extends HapiApiSuite { .given( cryptoCreate(TOKEN_TREASURY).balance(0L), recordSystemProperty("tokens.maxSymbolUtf8Bytes", Integer::parseInt, maxUtf8Bytes::set) - ).when( ).then( + ).when().then( tokenCreate("missingSymbol") .symbol("") .hasPrecheck(MISSING_TOKEN_SYMBOL), diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenDeleteSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenDeleteSpecs.java index 94615abfe0..dda82f2953 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenDeleteSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenDeleteSpecs.java @@ -60,8 +60,8 @@ public class TokenDeleteSpecs extends HapiApiSuite { deletionValidatesMissingAdminKey(), deletionWorksAsExpected(), deletionValidatesAlreadyDeletedToken(), - deletionValidatesRef(), treasuryBecomesDeletableAfterTokenDelete(), + deletionValidatesRef(), } ); } @@ -178,11 +178,11 @@ public class TokenDeleteSpecs extends HapiApiSuite { .given( cryptoCreate("payer") ).when().then( - tokenDelete("1.2.3") + tokenDelete("0.0.0") .payingWith("payer") .signedBy("payer") .hasKnownStatus(INVALID_TOKEN_ID), - tokenDelete("0.0.0") + tokenDelete("1.2.3") .payingWith("payer") .signedBy("payer") .hasKnownStatus(INVALID_TOKEN_ID) diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTransactSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTransactSpecs.java index 297326f91a..0be2b76530 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTransactSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTransactSpecs.java @@ -49,7 +49,9 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.EMPTY_TOKEN_TR import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INSUFFICIENT_ACCOUNT_BALANCE; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INSUFFICIENT_TOKEN_BALANCE; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_AMOUNTS; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_SIGNATURE; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_TRANSFER_LIST_SIZE_LIMIT_EXCEEDED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TRANSFERS_NOT_ZERO_SUM_FOR_TOKEN; @@ -80,6 +82,7 @@ public class TokenTransactSpecs extends HapiApiSuite { nonZeroTransfersRejected(), prechecksWork(), allRequiredSigsAreChecked(), + missingEntitiesRejected(), } ); } @@ -142,6 +145,22 @@ public class TokenTransactSpecs extends HapiApiSuite { ); } + public HapiApiSpec missingEntitiesRejected() { + return defaultHapiSpec("MissingTokensRejected") + .given( + tokenCreate("some").treasury(DEFAULT_PAYER) + ).when().then( + cryptoTransfer( + moving(1L, "some") + .between(DEFAULT_PAYER, "0.0.0") + ).signedBy(DEFAULT_PAYER).hasKnownStatus(INVALID_ACCOUNT_ID), + cryptoTransfer( + moving(100_000_000_000_000L, "0.0.0") + .between(DEFAULT_PAYER, FUNDING) + ).signedBy(DEFAULT_PAYER).hasKnownStatus(INVALID_TOKEN_ID) + ); + } + public HapiApiSpec balancesAreChecked() { return defaultHapiSpec("BalancesAreChecked") .given( diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenUpdateSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenUpdateSpecs.java index 7502512189..cff1675a9d 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenUpdateSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenUpdateSpecs.java @@ -75,7 +75,6 @@ public class TokenUpdateSpecs extends HapiApiSuite { nameChanges(), keysChange(), validatesAlreadyDeletedToken(), - validatesMissingRef(), treasuryEvolves(), deletedAutoRenewAccountCheckHolds(), renewalPeriodCheckHolds(), @@ -85,6 +84,7 @@ public class TokenUpdateSpecs extends HapiApiSuite { tokensCanBeMadeImmutableWithEmptyKeyList(), updateHappyPath(), validatesMissingAdminKey(), + validatesMissingRef(), } ); } @@ -148,6 +148,10 @@ public class TokenUpdateSpecs extends HapiApiSuite { .given( cryptoCreate("payer") ).when().then( + tokenUpdate("0.0.0") + .payingWith("payer") + .signedBy("payer") + .hasKnownStatus(INVALID_TOKEN_ID), tokenUpdate("1.2.3") .payingWith("payer") .signedBy("payer")

['test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleCreateSpecs.java', 'test-clients/src/main/java/com/hedera/services/bdd/spec/queries/schedule/HapiGetScheduleInfo.java', 'hedera-node/src/test/java/com/hedera/services/store/schedule/HederaScheduleStoreTest.java', 'test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenCreateSpecs.java', 'test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleDeleteSpecs.java', 'test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTransactSpecs.java', 'test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenAssociationSpecs.java', 'test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenUpdateSpecs.java', 'hedera-node/src/main/java/com/hedera/services/store/schedule/HederaScheduleStore.java', 'hedera-node/src/main/java/com/hedera/services/store/tokens/HederaTokenStore.java', 'test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenDeleteSpecs.java', 'test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/HapiTxnOp.java', 'hedera-node/src/test/java/com/hedera/services/store/tokens/HederaTokenStoreTest.java']

{'.java': 13}