Datasets:

JetBrains-Research

/

lca-bug-localization

like 1

Follow

JetBrains Research 47

wso2/product-is/4636/3914

wso2

product-is

https://github.com/wso2/product-is/issues/3914

https://github.com/wso2/product-is/pull/4636

https://github.com/wso2/product-is/pull/4636

fix

OIdC Session Management RP-initiated logout : Backchannel logout tokens form param should change to "logout_token"

backchannel logout tokens have a form param "logoutToken", which, according to the spec, should be "logout_token". Ref: http://openid.net/specs/openid-connect-backchannel-1_0.html#BCRequest.

b97dce268a5c3d198a24dbcce29a553fae6db0d5

3c3dba0dea7cf1f015e02613bd9aac6532794aaa

https://github.com/wso2/product-is/compare/b97dce268a5c3d198a24dbcce29a553fae6db0d5...3c3dba0dea7cf1f015e02613bd9aac6532794aaa

diff --git a/modules/samples/oauth2/playground2/src/main/org/wso2/sample/identity/oauth2/OIDCBackchannelLogoutServlet.java b/modules/samples/oauth2/playground2/src/main/org/wso2/sample/identity/oauth2/OIDCBackchannelLogoutServlet.java index 9def5b6fa..902953f65 100644 --- a/modules/samples/oauth2/playground2/src/main/org/wso2/sample/identity/oauth2/OIDCBackchannelLogoutServlet.java +++ b/modules/samples/oauth2/playground2/src/main/org/wso2/sample/identity/oauth2/OIDCBackchannelLogoutServlet.java @@ -56,8 +56,8 @@ public class OIDCBackchannelLogoutServlet extends HttpServlet { String sid = null; try { - sid = (String) SignedJWT.parse(req.getParameter("logoutToken")).getJWTClaimsSet().getClaim("sid"); - log.info("Logout token: " + req.getParameter("logoutToken")); + sid = (String) SignedJWT.parse(req.getParameter("logout_token")).getJWTClaimsSet().getClaim("sid"); + log.info("Logout token: " + req.getParameter("logout_token")); } catch (ParseException e) { log.error("Error in generating Logout Token.", e); }

['modules/samples/oauth2/playground2/src/main/org/wso2/sample/identity/oauth2/OIDCBackchannelLogoutServlet.java']

{'.java': 1}

Java

{'Java': 5237276, 'JavaScript': 1286957, 'CSS': 701967, 'HTML': 68342, 'Python': 56729, 'Handlebars': 56641, 'Shell': 51738, 'Batchfile': 33345, 'Jinja': 12917}

Apache License 2.0

huaweicloud/sermant/970/969

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/969

https://github.com/huaweicloud/Sermant/pull/970

https://github.com/huaweicloud/Sermant/pull/970

fixes

【fix】fix bug springboot registry plugin

### What happened? if url contains space , request will fail; We need use the encoded url replcae decoded url ### How can we reproduce it (as minimally and precisely as possible)? Use url which has space(%20) request ### Anything else we need to know? _No response_ ### Sermant version <details> 0.7.0 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

e079acbd008d426caabb0ef8eed4b46b4a8255de

0568661b7abc9911afd6aec3e4a95e80a8a0c7cb

https://github.com/huaweicloud/sermant/compare/e079acbd008d426caabb0ef8eed4b46b4a8255de...0568661b7abc9911afd6aec3e4a95e80a8a0c7cb

diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java index 4b05f568..7dd73d7e 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java @@ -308,9 +308,9 @@ public class RequestInterceptorUtils { .append(HttpConstants.HTTP_URL_COLON) .append(serviceInstance.getPort()) .append(path); - if (uri.getQuery() != null && method.equals(HttpConstants.HTTP_GET)) { + if (uri.getRawQuery() != null && method.equals(HttpConstants.HTTP_GET)) { urlBuild.append(HttpConstants.HTTP_URL_UNKNOWN) - .append(uri.getQuery()); + .append(uri.getRawQuery()); } return urlBuild.toString(); }

['sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java']

{'.java': 1}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/964/963

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/963

https://github.com/huaweicloud/Sermant/pull/964

https://github.com/huaweicloud/Sermant/pull/964

fixes

【fix】fix protocol of feign for spring-boot-registry

### What happened? feign maybe not effect ### How can we reproduce it (as minimally and precisely as possible)? N/A ### Anything else we need to know? _No response_ ### Sermant version <details> 0.7.0 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

fa2a96fe391294765180eae060a694bc71e5ae9f

86ddedacf126a020396c1195d8f591499ceb78a0

https://github.com/huaweicloud/sermant/compare/fa2a96fe391294765180eae060a694bc71e5ae9f...86ddedacf126a020396c1195d8f591499ceb78a0

diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java index e86e3bc3..66d23623 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java @@ -48,14 +48,15 @@ public class FeignInvokeInterceptor extends MarkInterceptor { final InvokerService invokerService = PluginServiceManager.getPluginService(InvokerService.class); Request request = (Request) context.getArguments()[0]; Map<String, String> urlInfo = RequestInterceptorUtils.recoverUrl(request.url()); - if (!PlugEffectWhiteBlackUtils.isAllowRun(request.url(), urlInfo.get(HttpConstants.HTTP_URI_HOST))) { + if (!PlugEffectWhiteBlackUtils.isAllowRun(urlInfo.get(HttpConstants.HTTP_URI_HOST), + urlInfo.get(HttpConstants.HTTP_URI_SERVICE))) { return context; } RequestInterceptorUtils.printRequestLog("feign", urlInfo); Optional<Object> result = invokerService.invoke( buildInvokerFunc(context, request, urlInfo), ex -> ex, - urlInfo.get(HttpConstants.HTTP_URI_HOST)); + urlInfo.get(HttpConstants.HTTP_URI_SERVICE)); if (result.isPresent()) { Object obj = result.get(); if (obj instanceof Exception) { diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java index daca8098..dc1ae2da 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java @@ -68,7 +68,7 @@ public class OkHttp3ClientInterceptor extends MarkInterceptor { return context; } Map<String, String> hostAndPath = RequestInterceptorUtils.recoverHostAndPath(uri.getPath()); - if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_HOST))) { + if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_SERVICE))) { return context; } RequestInterceptorUtils.printRequestLog("OkHttp3", hostAndPath); @@ -77,7 +77,7 @@ public class OkHttp3ClientInterceptor extends MarkInterceptor { invokerService.invoke( buildInvokerFunc(uri, hostAndPath, request, rebuildRequest, context), buildExFunc(rebuildRequest), - hostAndPath.get(HttpConstants.HTTP_URI_HOST)) + hostAndPath.get(HttpConstants.HTTP_URI_SERVICE)) .ifPresent(o -> setResultOrThrow(context, o, uri.getPath())); return context; } diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java index 6070583c..ebcee18e 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java @@ -70,7 +70,7 @@ public class OkHttpClientInterceptor extends MarkInterceptor { return context; } Map<String, String> hostAndPath = RequestInterceptorUtils.recoverHostAndPath(uri.getPath()); - if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_HOST))) { + if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_SERVICE))) { return context; } RequestInterceptorUtils.printRequestLog("OkHttp", hostAndPath); @@ -79,7 +79,7 @@ public class OkHttpClientInterceptor extends MarkInterceptor { invokerService.invoke( buildInvokerFunc(uri, hostAndPath, request, rebuildRequest, context), buildExFunc(rebuildRequest), - hostAndPath.get(HttpConstants.HTTP_URI_HOST)) + hostAndPath.get(HttpConstants.HTTP_URI_SERVICE)) .ifPresent(o -> setResultOrThrow(context, o, uri.getPath())); return context; } diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java index 73dcf258..c64b0f6b 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java @@ -54,14 +54,14 @@ public class RestTemplateInterceptor extends MarkInterceptor { return context; } Map<String, String> hostAndPath = RequestInterceptorUtils.recoverHostAndPath(uri.getPath()); - if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_HOST))) { + if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_SERVICE))) { return context; } RequestInterceptorUtils.printRequestLog("restTemplate", hostAndPath); Optional<Object> result = invokerService.invoke( buildInvokerFunc(uri, hostAndPath, context, httpMethod), ex -> ex, - hostAndPath.get(HttpConstants.HTTP_URI_HOST)); + hostAndPath.get(HttpConstants.HTTP_URI_SERVICE)); if (result.isPresent()) { Object obj = result.get(); if (obj instanceof Exception) { diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java index d8d525dd..0a1752f1 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java @@ -117,7 +117,7 @@ public class HttpAsyncClient4xInterceptor implements Interceptor { if (hostAndPath == null) { return context; } - final String serviceName = hostAndPath.get(HttpConstants.HTTP_URI_HOST); + final String serviceName = hostAndPath.get(HttpConstants.HTTP_URI_SERVICE); cleanCallback(); final InvokerService invokerService = PluginServiceManager.getPluginService(InvokerService.class); final HttpAsyncContext asyncContext = HttpAsyncUtils.getOrCreateContext(); @@ -139,7 +139,7 @@ public class HttpAsyncClient4xInterceptor implements Interceptor { if (originHostName == null || hostAndPath == null) { return false; } - return PlugEffectWhiteBlackUtils.isAllowRun(originHostName, hostAndPath.get(HttpConstants.HTTP_URI_HOST)); + return PlugEffectWhiteBlackUtils.isAllowRun(originHostName, hostAndPath.get(HttpConstants.HTTP_URI_SERVICE)); } private void acquireHostPath(HttpAsyncRequestProducer httpAsyncRequestProducer) throws Exception { diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java index ac970729..ce365260 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java @@ -75,14 +75,14 @@ public class HttpClient4xInterceptor extends MarkInterceptor { if (hostAndPath.isEmpty()) { return context; } - if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_HOST))) { + if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_SERVICE))) { return context; } RequestInterceptorUtils.printRequestLog("HttpClient", hostAndPath); invokerService.invoke( buildInvokerFunc(hostAndPath, httpRequest, context), buildExFunc(httpRequest, Thread.currentThread().getContextClassLoader()), - hostAndPath.get(HttpConstants.HTTP_URI_HOST)) + hostAndPath.get(HttpConstants.HTTP_URI_SERVICE)) .ifPresent(result -> this.setResultOrThrow(context, result, hostAndPath.get(HttpConstants.HTTP_URI_PATH))); return context; diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionConnectInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionConnectInterceptor.java index a4faf8ec..a19f0834 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionConnectInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionConnectInterceptor.java @@ -86,7 +86,7 @@ public class HttpUrlConnectionConnectInterceptor extends MarkInterceptor { } final String fullUrl = url.toString(); Map<String, String> urlInfo = RequestInterceptorUtils.recoverUrl(url); - if (!PlugEffectWhiteBlackUtils.isPlugEffect(urlInfo.get(HttpConstants.HTTP_URI_HOST))) { + if (!PlugEffectWhiteBlackUtils.isPlugEffect(urlInfo.get(HttpConstants.HTTP_URI_SERVICE))) { return context; } HttpConnectionUtils.save(new HttpConnectionContext(urlInfo, url)); @@ -94,7 +94,7 @@ public class HttpUrlConnectionConnectInterceptor extends MarkInterceptor { invokerService.invoke( buildInvokerFunc(context, url, urlInfo), ex -> ex, - urlInfo.get(HttpConstants.HTTP_URI_HOST)) + urlInfo.get(HttpConstants.HTTP_URI_SERVICE)) .ifPresent(obj -> { if (obj instanceof Exception) { LOGGER.log(Level.SEVERE, "request is error, uri is " + fullUrl, (Exception) obj); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionResponseStreamInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionResponseStreamInterceptor.java index 85e78dc7..2a629e81 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionResponseStreamInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionResponseStreamInterceptor.java @@ -90,7 +90,7 @@ public class HttpUrlConnectionResponseStreamInterceptor implements Interceptor { Optional<Object> result = invokerService.invoke( invokerContextObjectFunction, ex -> ex, - urlInfo.get(HttpConstants.HTTP_URI_HOST)); + urlInfo.get(HttpConstants.HTTP_URI_SERVICE)); if (result.isPresent()) { Object obj = result.get(); if (obj instanceof Exception) { @@ -117,11 +117,15 @@ public class HttpUrlConnectionResponseStreamInterceptor implements Interceptor { if (ex instanceof SocketTimeoutException) { // 此处仅SocketTimeoutException: Read timed out进行重试 final String message = ex.getMessage(); - return "Read timed out".equalsIgnoreCase(message) && this.lbConfig.isEnableSocketReadTimeoutRetry(); + return "Read timed out".equalsIgnoreCase(message) && isEnableRetry(); } return false; } + private boolean isEnableRetry() { + return this.lbConfig.isEnableSocketReadTimeoutRetry() && this.lbConfig.getMaxRetry() > 0; + } + private void resetStats(ExecuteContext context) { ReflectUtils.setFieldValue(context.getObject(), "rememberedException", null); ReflectUtils.setFieldValue(context.getObject(), "failedOnce", false); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/HttpConstants.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/HttpConstants.java index 25ddef6c..261d8a22 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/HttpConstants.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/HttpConstants.java @@ -33,7 +33,12 @@ public class HttpConstants { public static final String HTTP_GET = "GET"; /** - * 主机名 + * 从url解析的服务名 + */ + public static final String HTTP_URI_SERVICE = "serviceName"; + + /** + * 域名 */ public static final String HTTP_URI_HOST = "host"; diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java index 885d17c5..4b05f568 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java @@ -96,7 +96,7 @@ public class RequestInterceptorUtils { } final Map<String, String> result = new HashMap<>(URL_INFO_INIT_SIZE); result.put(HttpConstants.HTTP_URL_SCHEME, protocol); - result.put(HttpConstants.HTTP_URI_HOST, tokenizer.nextToken(delim)); + result.put(HttpConstants.HTTP_URI_SERVICE, tokenizer.nextToken(delim)); result.put(HttpConstants.HTTP_URI_PATH, formatPath(tokenizer.nextToken(HttpConstants.EMPTY_STR), url.getQuery())); return result; @@ -123,11 +123,11 @@ public class RequestInterceptorUtils { String scheme = rawScheme.substring(0, rawScheme.length() - 1); // domain 域名 - urlTokens.nextToken(baseSlash); + Map<String, String> result = new HashMap<>(URL_INFO_INIT_SIZE); + result.put(HttpConstants.HTTP_URI_HOST, urlTokens.nextToken(baseSlash)); final String serviceName = urlTokens.nextToken(baseSlash); final String path = urlTokens.nextToken(HttpConstants.EMPTY_STR); - Map<String, String> result = new HashMap<>(URL_INFO_INIT_SIZE); - result.put(HttpConstants.HTTP_URI_HOST, serviceName); + result.put(HttpConstants.HTTP_URI_SERVICE, serviceName); result.put(HttpConstants.HTTP_URL_SCHEME, scheme); result.put(HttpConstants.HTTP_URI_PATH, path); return result; @@ -175,7 +175,7 @@ public class RequestInterceptorUtils { if (!RECORDER.isEnable()) { return; } - String path = String.format(Locale.ENGLISH, "/%s%s", hostAndPath.get(HttpConstants.HTTP_URI_HOST), + String path = String.format(Locale.ENGLISH, "/%s%s", hostAndPath.get(HttpConstants.HTTP_URI_SERVICE), hostAndPath.get(HttpConstants.HTTP_URI_PATH)); LOGGER.log(Level.FINE, String.format(Locale.ENGLISH, "[%s] request [%s] has been intercepted!", source, path)); RECORDER.beforeRequest(); @@ -284,7 +284,7 @@ public class RequestInterceptorUtils { if (tempPath.indexOf(HttpConstants.HTTP_URL_SINGLE_SLASH) <= 0) { return result; } - result.put(HttpConstants.HTTP_URI_HOST, + result.put(HttpConstants.HTTP_URI_SERVICE, tempPath.substring(0, tempPath.indexOf(HttpConstants.HTTP_URL_SINGLE_SLASH))); result.put(HttpConstants.HTTP_URI_PATH, tempPath.substring(tempPath.indexOf(HttpConstants.HTTP_URL_SINGLE_SLASH)));

['sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionResponseStreamInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionConnectInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/HttpConstants.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java']

{'.java': 10}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/838/837

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/837

https://github.com/huaweicloud/Sermant/pull/838

https://github.com/huaweicloud/Sermant/pull/838

fixes

【bug】fix the registry plugin bugs

### What happened? feign core 10.12无法正常工作，resttemplate 5.3.13/5.1.2.RELEASE无法正确处理异常 ### How can we reproduce it (as minimally and precisely as possible)? no ### Anything else we need to know? _No response_ ### Sermant version 0.6.1 ### OS version n/a

2cf78adfe99402a2de2d5ca361bc9091f957d10b

c465388a830cbd0d44ce56a31b0c50a891be2b51

https://github.com/huaweicloud/sermant/compare/2cf78adfe99402a2de2d5ca361bc9091f957d10b...c465388a830cbd0d44ce56a31b0c50a891be2b51

diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/PluginManager.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/PluginManager.java index 423a720a..d9c5d91a 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/PluginManager.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/PluginManager.java @@ -113,7 +113,7 @@ public class PluginManager { private static void initPlugin(String pluginName, String pluginPackage, Instrumentation instrumentation) { final String pluginPath = pluginPackage + File.separatorChar + pluginName; if (!new File(pluginPath).exists()) { - LOGGER.warning(String.format(Locale.ROOT, + LOGGER.severe(String.format(Locale.ROOT, "Plugin directory %s does not exist, so skip initializing %s. ", pluginPath, pluginName)); return; } diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java index 8a481081..498ff966 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java @@ -64,7 +64,7 @@ public class FeignInvokeInterceptor extends MarkInterceptor { return invokerContext -> { context.getArguments()[0] = Request.create(request.httpMethod(), RequestInterceptorUtils.buildUrl(urlInfo, invokerContext.getServiceInstance()), - request.headers(), request.requestBody()); + request.headers(), request.body(), request.charset()); return RequestInterceptorUtils.buildFunc(context, invokerContext).get(); }; } diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java index 9497ad8a..080eeaca 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java @@ -22,21 +22,19 @@ import com.huawei.discovery.utils.HttpConstants; import com.huawei.discovery.utils.PlugEffectWhiteBlackUtils; import com.huawei.discovery.utils.RequestInterceptorUtils; +import com.huaweicloud.sermant.core.common.LoggerFactory; import com.huaweicloud.sermant.core.plugin.agent.entity.ExecuteContext; import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager; -import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.http.client.ClientHttpResponse; -import java.io.IOException; -import java.io.InputStream; import java.net.URI; import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.function.Function; +import java.util.logging.Level; +import java.util.logging.Logger; /** * 拦截获取服务列表 @@ -45,23 +43,31 @@ import java.util.function.Function; * @since 2022-09-27 */ public class RestTemplateInterceptor extends MarkInterceptor { + private static final Logger LOGGER = LoggerFactory.getLogger(); @Override protected ExecuteContext doBefore(ExecuteContext context) throws Exception { final InvokerService invokerService = PluginServiceManager.getPluginService(InvokerService.class); - URI uri = (URI)context.getArguments()[0]; - HttpMethod httpMethod = (HttpMethod)context.getArguments()[1]; + URI uri = (URI) context.getArguments()[0]; + HttpMethod httpMethod = (HttpMethod) context.getArguments()[1]; Map<String, String> hostAndPath = RequestInterceptorUtils.recoverHostAndPath(uri.getPath()); if (!PlugEffectWhiteBlackUtils.isAllowRun(uri.getHost(), hostAndPath.get(HttpConstants.HTTP_URI_HOST), true)) { return context; } RequestInterceptorUtils.printRequestLog("restTemplate", hostAndPath); - invokerService.invoke( - buildInvokerFunc(uri, hostAndPath, context, httpMethod), - this::buildErrorResponse, - hostAndPath.get(HttpConstants.HTTP_URI_HOST)) - .ifPresent(context::skip); + Optional<Object> result = invokerService.invoke( + buildInvokerFunc(uri, hostAndPath, context, httpMethod), + this::buildErrorResponse, + hostAndPath.get(HttpConstants.HTTP_URI_HOST)); + if (result.isPresent()) { + Object obj = result.get(); + if (obj instanceof Exception) { + LOGGER.log(Level.SEVERE, "request is error, uri is " + uri, (Exception) obj); + return context; + } + context.skip(obj); + } return context; } @@ -89,7 +95,7 @@ public class RestTemplateInterceptor extends MarkInterceptor { ExecuteContext context, HttpMethod httpMethod) { return invokerContext -> { String url = RequestInterceptorUtils.buildUrlWithIp(uri, invokerContext.getServiceInstance(), - hostAndPath.get(HttpConstants.HTTP_URI_PATH), httpMethod.name()); + hostAndPath.get(HttpConstants.HTTP_URI_PATH), httpMethod.name()); context.getArguments()[0] = rebuildUri(url, uri); return RequestInterceptorUtils.buildFunc(context, invokerContext).get(); }; @@ -101,44 +107,8 @@ public class RestTemplateInterceptor extends MarkInterceptor { * @param ex * @return 响应 */ - private ClientHttpResponse buildErrorResponse(Exception ex) { - return new ClientHttpResponse() { - - @Override - public HttpHeaders getHeaders() { - return new HttpHeaders(); - } - - @Override - public InputStream getBody() throws IOException { - return new InputStream() { - @Override - public int read() throws IOException { - return 0; - } - }; - } - - @Override - public HttpStatus getStatusCode() throws IOException { - return HttpStatus.INTERNAL_SERVER_ERROR; - } - - @Override - public int getRawStatusCode() throws IOException { - return HttpStatus.INTERNAL_SERVER_ERROR.value(); - } - - @Override - public String getStatusText() throws IOException { - return ""; - } - - @Override - public void close() { - - } - }; + private Exception buildErrorResponse(Exception ex) { + return ex; } @Override diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/RestTemplateInterceptorTest.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/RestTemplateInterceptorTest.java index cd390e92..c6024f6b 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/RestTemplateInterceptorTest.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/RestTemplateInterceptorTest.java @@ -16,11 +16,13 @@ package com.huawei.discovery.interceptors; -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.URI; -import java.util.Map; -import java.util.Optional; +import com.huawei.discovery.config.PlugEffectWhiteBlackConstants; +import com.huawei.discovery.entity.PlugEffectStategyCache; +import com.huawei.discovery.service.InvokerService; + +import com.huaweicloud.sermant.core.plugin.agent.entity.ExecuteContext; +import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager; +import com.huaweicloud.sermant.core.utils.ReflectUtils; import org.junit.Assert; import org.junit.Test; @@ -28,15 +30,12 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.http.client.ClientHttpResponse; -import com.huawei.discovery.config.PlugEffectWhiteBlackConstants; -import com.huawei.discovery.entity.PlugEffectStategyCache; -import com.huawei.discovery.service.InvokerService; -import com.huaweicloud.sermant.core.plugin.agent.entity.ExecuteContext; -import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager; -import com.huaweicloud.sermant.core.utils.ReflectUtils; +import java.io.IOException; +import java.lang.reflect.Method; +import java.net.URI; +import java.util.Map; +import java.util.Optional; /** * RestTemplate调用测试 @@ -74,10 +73,10 @@ public class RestTemplateInterceptorTest extends BaseTest { interceptor = new RestTemplateInterceptor(); MockitoAnnotations.openMocks(this); pluginServiceManagerMockedStatic.when(() -> PluginServiceManager.getPluginService(InvokerService.class)) - .thenReturn(invokerService); + .thenReturn(invokerService); } - private URI createURI(String url){ + private URI createURI(String url) { return URI.create(url); } @@ -99,27 +98,27 @@ public class RestTemplateInterceptorTest extends BaseTest { //含域名，设置多个域名，未设置黑白名单 discoveryPluginConfig.setRealmName(realmNames); interceptor.doBefore(context); - URI uriNew = (URI)context.getArguments()[0]; + URI uriNew = (URI) context.getArguments()[0]; Assert.assertEquals(url, uriNew.toString()); discoveryPluginConfig.setRealmName(realmName); //含域名，设置全部通过策略 initStrategy(PlugEffectWhiteBlackConstants.STRATEGY_ALL, "zookeeper-provider-demo"); Mockito.when(invokerService.invoke(null, null, "zookeeper-provider-demo")) - .thenReturn(Optional.ofNullable(new Object())); + .thenReturn(Optional.ofNullable(new Object())); interceptor.doBefore(context); - uriNew = (URI)context.getArguments()[0]; + uriNew = (URI) context.getArguments()[0]; Assert.assertEquals(url, uriNew.toString()); } @Test public void rebuildUriTest() { Optional<Method> method = ReflectUtils.findMethod(RestTemplateInterceptor.class, "rebuildUri", - new Class[] {String.class, URI.class}); + new Class[]{String.class, URI.class}); URI uri = createURI(url); if (method.isPresent()) { Optional<Object> uriNew = ReflectUtils - .invokeMethod(interceptor, method.get(), new Object[] {convertUrl, uri}); + .invokeMethod(interceptor, method.get(), new Object[]{convertUrl, uri}); Assert.assertEquals(convertUrl, uriNew.get().toString()); } } @@ -127,12 +126,12 @@ public class RestTemplateInterceptorTest extends BaseTest { @Test public void buildErrorResponseTest() throws IOException { Optional<Method> method = ReflectUtils.findMethod(RestTemplateInterceptor.class, "buildErrorResponse", - new Class[] {Exception.class}); + new Class[]{Exception.class}); Exception ex = new Exception(); if (method.isPresent()) { Optional<Object> exception = ReflectUtils - .invokeMethod(interceptor, method.get(), new Object[] {ex}); - Assert.assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, ((ClientHttpResponse)exception.get()).getStatusCode()); + .invokeMethod(interceptor, method.get(), new Object[]{ex}); + Assert.assertEquals(ex, exception.get()); } } }

['sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/PluginManager.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/RestTemplateInterceptorTest.java']

{'.java': 4}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/839/835

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/835

https://github.com/huaweicloud/Sermant/pull/839

https://github.com/huaweicloud/Sermant/pull/839

fixes

【bug】fix the registry plugin bugs

### What happened? can not work ### How can we reproduce it (as minimally and precisely as possible)? no ### Anything else we need to know? _No response_ ### Sermant version <details> 0.6.0 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

5b4a28a42a6380a36dea764fc07bfffe45dc67da

4c76c97cfad4011049c478f85438d437b21353af

https://github.com/huaweicloud/sermant/compare/5b4a28a42a6380a36dea764fc07bfffe45dc67da...4c76c97cfad4011049c478f85438d437b21353af

diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java index ce5ee597..454ca55e 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java @@ -40,6 +40,7 @@ import java.net.ConnectException; import java.net.NoRouteToHostException; import java.time.LocalDateTime; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Map; @@ -66,9 +67,8 @@ public class RetryServiceImpl implements InvokerService { ConnectException.class, NoRouteToHostException.class); - private final List<String> rawRetryEx = Arrays.asList( - "org.apache.http.conn.ConnectTimeoutException", - "org.apache.http.NoHttpResponseException"); + private final List<String> rawRetryEx = Collections.singletonList( + "org.apache.http.conn.ConnectTimeoutException"); private final Map<String, Retry> retryCache = new ConcurrentHashMap<>();

['sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java']

{'.java': 1}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/840/835

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/835

https://github.com/huaweicloud/Sermant/pull/840

https://github.com/huaweicloud/Sermant/pull/840

fixes

【bug】fix the registry plugin bugs

### What happened? can not work ### How can we reproduce it (as minimally and precisely as possible)? no ### Anything else we need to know? _No response_ ### Sermant version <details> 0.6.0 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

9c4a080942067f774c7d02a2dc5c6e64717565f2

31e113661c432a76cbbe2dece28674bcf5df202c

https://github.com/huaweicloud/sermant/compare/9c4a080942067f774c7d02a2dc5c6e64717565f2...31e113661c432a76cbbe2dece28674bcf5df202c

diff --git a/sermant-agentcore/sermant-agentcore-premain/src/main/java/com/huawei/sermant/premain/AgentPremain.java b/sermant-agentcore/sermant-agentcore-premain/src/main/java/com/huawei/sermant/premain/AgentPremain.java index 1844d8f1..f29440dd 100644 --- a/sermant-agentcore/sermant-agentcore-premain/src/main/java/com/huawei/sermant/premain/AgentPremain.java +++ b/sermant-agentcore/sermant-agentcore-premain/src/main/java/com/huawei/sermant/premain/AgentPremain.java @@ -74,6 +74,8 @@ public class AgentPremain { // agent core入口 LOGGER.info("Loading sermant agent... "); AgentCoreEntrance.run(argsMap, instrumentation); + + LOGGER.info("Load sermant done. "); } catch (Exception e) { LOGGER.severe( String.format(Locale.ROOT, "Loading sermant agent failed, %s. ", e)); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java index 464d7b58..ed6ef173 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java @@ -16,7 +16,6 @@ package com.huawei.discovery.interceptors.httpclient; -import com.huawei.discovery.entity.SimpleRequestRecorder; import com.huawei.discovery.interceptors.MarkInterceptor; import com.huawei.discovery.retry.InvokerContext; import com.huawei.discovery.service.InvokerService; @@ -60,8 +59,6 @@ public class HttpClient4xInterceptor extends MarkInterceptor { private final AtomicBoolean isLoaded = new AtomicBoolean(); - private final SimpleRequestRecorder requestRecorder = new SimpleRequestRecorder(); - @Override public ExecuteContext doBefore(ExecuteContext context) { final InvokerService invokerService = PluginServiceManager.getPluginService(InvokerService.class); @@ -77,7 +74,6 @@ public class HttpClient4xInterceptor extends MarkInterceptor { return context; } RequestInterceptorUtils.printRequestLog("HttpClient", hostAndPath); - requestRecorder.beforeRequest(); invokerService.invoke( buildInvokerFunc(hostAndPath, uri, httpRequest, context), buildExFunc(httpRequest), diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/retry/RetryConfig.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/retry/RetryConfig.java index 40771082..335aa246 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/retry/RetryConfig.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/retry/RetryConfig.java @@ -127,10 +127,17 @@ public class RetryConfig { this.name = name; } - private Predicate<Throwable> buildThrowPredicate(List<Class<? extends Throwable>> retryEx, + /** + * 构建异常判断器 + * + * @param retryEx 类型判断 + * @param rawRetryEx 类全限定名判断 + * @return Predicate + */ + public static Predicate<Throwable> buildThrowPredicate(List<Class<? extends Throwable>> retryEx, List<String> rawRetryEx) { final Predicate<Throwable> assignableEx = ex -> { - if (ex == null) { + if (ex == null || retryEx == null) { return false; } for (Class<? extends Throwable> cur : retryEx) { @@ -144,10 +151,7 @@ public class RetryConfig { return false; }; final Predicate<Throwable> rawEx = ex -> { - if (ex == null) { - return false; - } - if (rawRetryEx == null) { + if (ex == null || rawRetryEx == null) { return false; } return rawRetryEx.stream().anyMatch(clazz -> isAssignableFrom(clazz, ex.getClass())); @@ -155,7 +159,7 @@ public class RetryConfig { return assignableEx.or(rawEx); } - private boolean isAssignableFrom(String clazz, Class<?> ex) { + private static boolean isAssignableFrom(String clazz, Class<?> ex) { if (clazz.equals(ex.getName())) { return true; } diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java index f26d6bb5..0ed24ac4 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java @@ -142,7 +142,7 @@ public class RequestInterceptorUtils { } catch (InvocationTargetException e) { invokerContext.setEx(e.getTargetException()); LOGGER.log(Level.FINE, String.format(Locale.ENGLISH, "invoke method [%s] failed", - context.getMethod().getName()), e); + context.getMethod().getName()), e.getTargetException()); } return Optional.empty(); }; diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/lb/DiscoveryManager.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/lb/DiscoveryManager.java index 92fe7357..985a0ed7 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/lb/DiscoveryManager.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/lb/DiscoveryManager.java @@ -219,6 +219,9 @@ public enum DiscoveryManager { private Loadbalancer getLoadbalancer(String serviceName) { checkStats(); return serviceLbCache.computeIfAbsent(serviceName, curService -> { + LOGGER.info(String.format(Locale.ENGLISH, + "Use the loadbalancer [%s], if the lb does not support, it will replace by RoundRobin", + lbConfig.getLbType())); final Class<? extends AbstractLoadbalancer> lbClazz = lbCache .getOrDefault(lbConfig.getLbType(), RoundRobinLoadbalancer.class); return createLb(lbClazz).orElse(null); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java index 454ca55e..5e868aa5 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java @@ -135,10 +135,10 @@ public class RetryServiceImpl implements InvokerService { throws Exception { final RetryContext<Recorder> context = retry.context(); final InvokerContext invokerContext = new InvokerContext(); - boolean isRetry = false; + boolean isInRetry = false; do { final long start = System.currentTimeMillis(); - final Optional<ServiceInstance> instance = choose(serviceName, isRetry, + final Optional<ServiceInstance> instance = choose(serviceName, isInRetry, invokerContext.getServiceInstance()); if (!instance.isPresent()) { throw new ProviderException("Can not found provider service named: " + serviceName); @@ -149,7 +149,7 @@ public class RetryServiceImpl implements InvokerService { long consumeTimeMs; try { final Object result = invokeFunc.apply(invokerContext); - isRetry = true; + isInRetry = true; consumeTimeMs = System.currentTimeMillis() - start; if (invokerContext.getEx() != null) { // 此处调用器, 若调用出现异常, 则以异常结果返回 @@ -163,7 +163,7 @@ public class RetryServiceImpl implements InvokerService { return Optional.ofNullable(result); } } catch (Exception ex) { - isRetry = true; + isInRetry = true; handleEx(ex, context, stats, System.currentTimeMillis() - start); } } while (true);

['sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/lb/DiscoveryManager.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java', 'sermant-agentcore/sermant-agentcore-premain/src/main/java/com/huawei/sermant/premain/AgentPremain.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/retry/RetryConfig.java']

{'.java': 6}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/841/835

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/835

https://github.com/huaweicloud/Sermant/pull/841

https://github.com/huaweicloud/Sermant/pull/841

fixes

【bug】fix the registry plugin bugs

### What happened? can not work ### How can we reproduce it (as minimally and precisely as possible)? no ### Anything else we need to know? _No response_ ### Sermant version <details> 0.6.0 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

7192b632d955dab24f9b5603fb571adf18a0f589

9813581cc4f726895c46736a4794d62c7ed6e97f

https://github.com/huaweicloud/sermant/compare/7192b632d955dab24f9b5603fb571adf18a0f589...9813581cc4f726895c46736a4794d62c7ed6e97f

diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/entity/ExecuteContext.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/entity/ExecuteContext.java index 983044d0..900dae41 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/entity/ExecuteContext.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/entity/ExecuteContext.java @@ -72,6 +72,11 @@ public class ExecuteContext { */ private Throwable throwable; + /** + * 抛出给宿主的异常 + */ + private Throwable throwableOut; + /** * 额外的静态属性 */ @@ -208,6 +213,10 @@ public class ExecuteContext { return throwable; } + public Throwable getThrowableOut() { + return throwableOut; + } + public Map<String, Object> getExtStaticFields() { return extStaticFields; } @@ -528,6 +537,17 @@ public class ExecuteContext { return this; } + /** + * 给宿主抛出异常 + * + * @param throwableOut 抛出给宿主的异常 + * @return 执行上下文 + */ + public ExecuteContext setThrowableOut(Throwable throwableOut) { + this.throwableOut = throwableOut; + return this; + } + @Override public String toString() { return "ExecuteContext{" diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceConstTemplate.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceConstTemplate.java index 1e797cb2..f5e8453c 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceConstTemplate.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceConstTemplate.java @@ -49,6 +49,7 @@ public class AdviceConstTemplate { * @param extStaticFields 额外静态属性集 * @param interceptorItr 拦截器迭代器 * @param context 执行上下文 + * @throws Throwable 抛给宿主的异常 */ @Advice.OnMethodEnter(suppress = Throwable.class) public static void onMethodEnter( @@ -60,7 +61,7 @@ public class AdviceConstTemplate { @Advice.FieldValue(value = "_EXT_STATIC_FIELDS_$SERMANT", readOnly = false, typing = Assigner.Typing.DYNAMIC) Map<String, Object> extStaticFields, @Advice.Local(value = "_INTERCEPTOR_ITR_$SERMANT_LOCAL") ListIterator<Interceptor> interceptorItr, - @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) { + @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) throws Throwable { interceptorItr = interceptorMap.get(methodKey).listIterator(); context = ExecuteContext.forConstructor(cls, constructor, arguments, extStaticFields); context = CommonConstAdviser.onMethodEnter(context, interceptorItr); @@ -76,6 +77,7 @@ public class AdviceConstTemplate { * @param extMemberFields 额外成员属性集 * @param interceptorItr 拦截器迭代器 * @param context 执行上下文 + * @throws Throwable 抛给宿主的异常 */ @Advice.OnMethodExit(suppress = Throwable.class) public static void onMethodExit( @@ -85,7 +87,7 @@ public class AdviceConstTemplate { @Advice.FieldValue(value = "_EXT_MEMBER_FIELDS_$SERMANT", readOnly = false, typing = Assigner.Typing.DYNAMIC) Map<String, Object> extMemberFields, @Advice.Local(value = "_INTERCEPTOR_ITR_$SERMANT_LOCAL") ListIterator<Interceptor> interceptorItr, - @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) { + @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) throws Throwable { context = CommonConstAdviser.onMethodExit(context.afterConstructor(obj, extMemberFields), interceptorItr); extStaticFields = context.getExtStaticFields(); extMemberFields = context.getExtMemberFields(); diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceMemberTemplate.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceMemberTemplate.java index c113def5..47c41d8b 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceMemberTemplate.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceMemberTemplate.java @@ -51,6 +51,7 @@ public class AdviceMemberTemplate { * @param interceptorItr 拦截器迭代器 * @param context 执行上下文 * @return 是否跳过主要方法 + * @throws Throwable 抛给宿主的异常 */ @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class) public static boolean onMethodEnter( @@ -64,7 +65,7 @@ public class AdviceMemberTemplate { @Advice.FieldValue(value = "_EXT_MEMBER_FIELDS_$SERMANT", readOnly = false, typing = Assigner.Typing.DYNAMIC) Map<String, Object> extMemberFields, @Advice.Local(value = "_INTERCEPTOR_ITR_$SERMANT_LOCAL") ListIterator<Interceptor> interceptorItr, - @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) { + @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) throws Throwable { interceptorItr = interceptorMap.get(methodKey).listIterator(); context = ExecuteContext.forMemberMethod(obj, method, arguments, extStaticFields, extMemberFields); context = CommonMethodAdviser.onMethodEnter(context, interceptorItr); @@ -83,6 +84,7 @@ public class AdviceMemberTemplate { * @param extMemberFields 额外成员属性集 * @param interceptorItr 拦截器迭代器 * @param context 执行上下文 + * @throws Throwable 抛给宿主的异常 */ @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) public static void onMethodExit( @@ -93,7 +95,7 @@ public class AdviceMemberTemplate { @Advice.FieldValue(value = "_EXT_MEMBER_FIELDS_$SERMANT", readOnly = false, typing = Assigner.Typing.DYNAMIC) Map<String, Object> extMemberFields, @Advice.Local(value = "_INTERCEPTOR_ITR_$SERMANT_LOCAL") ListIterator<Interceptor> interceptorItr, - @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) { + @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) throws Throwable { context = context.isSkip() ? context : context.afterMethod(result, throwable); context = CommonMethodAdviser.onMethodExit(context, interceptorItr); result = context.getResult(); diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceStaticTemplate.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceStaticTemplate.java index 840462fb..a9b630c6 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceStaticTemplate.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceStaticTemplate.java @@ -50,6 +50,7 @@ public class AdviceStaticTemplate { * @param interceptorItr 拦截器迭代器 * @param context 执行上下文 * @return 是否跳过主要方法 + * @throws Throwable 抛给宿主的异常 */ @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class) public static boolean onMethodEnter( @@ -61,7 +62,7 @@ public class AdviceStaticTemplate { @Advice.FieldValue(value = "_EXT_STATIC_FIELDS_$SERMANT", readOnly = false, typing = Assigner.Typing.DYNAMIC) Map<String, Object> extStaticFields, @Advice.Local(value = "_INTERCEPTOR_ITR_$SERMANT_LOCAL") ListIterator<Interceptor> interceptorItr, - @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) { + @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) throws Throwable { interceptorItr = interceptorMap.get(methodKey).listIterator(); context = ExecuteContext.forStaticMethod(cls, method, arguments, extStaticFields); context = CommonMethodAdviser.onMethodEnter(context, interceptorItr); @@ -78,6 +79,7 @@ public class AdviceStaticTemplate { * @param extStaticFields 额外静态属性集 * @param interceptorItr 拦截器迭代器 * @param context 执行上下文 + * @throws Throwable 抛给宿主的异常 */ @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) public static void onMethodExit( @@ -86,7 +88,7 @@ public class AdviceStaticTemplate { @Advice.FieldValue(value = "_EXT_STATIC_FIELDS_$SERMANT", readOnly = false, typing = Assigner.Typing.DYNAMIC) Map<String, Object> extStaticFields, @Advice.Local(value = "_INTERCEPTOR_ITR_$SERMANT_LOCAL") ListIterator<Interceptor> interceptorItr, - @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) { + @Advice.Local(value = "_EXECUTE_CONTEXT_$SERMANT_LOCAL") ExecuteContext context) throws Throwable { context = context.isSkip() ? context : context.afterMethod(result, throwable); context = CommonMethodAdviser.onMethodExit(context, interceptorItr); result = context.getResult(); diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonBaseAdviser.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonBaseAdviser.java index a2ca77db..06efe3ea 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonBaseAdviser.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonBaseAdviser.java @@ -39,9 +39,10 @@ public class CommonBaseAdviser { * @param interceptorItr 拦截器双向迭代器 * @param beforeHandler before的异常处理器 * @return 执行上下文 + * @throws Throwable 抛给宿主的异常 */ public static ExecuteContext onMethodEnter(ExecuteContext context, ListIterator<Interceptor> interceptorItr, - ExceptionHandler beforeHandler) { + ExceptionHandler beforeHandler) throws Throwable { ExecuteContext newContext = context; while (interceptorItr.hasNext()) { final Interceptor interceptor = interceptorItr.next(); @@ -56,6 +57,9 @@ public class CommonBaseAdviser { } catch (Throwable t) { beforeHandler.handle(context, interceptor, t); } + if (newContext.getThrowableOut() != null) { + throw newContext.getThrowableOut(); + } } return newContext; } @@ -68,9 +72,10 @@ public class CommonBaseAdviser { * @param onThrowHandler onThrow的异常处理器 * @param afterHandler after的的异常处理器 * @return 执行上下文 + * @throws Throwable 抛给宿主的异常 */ public static ExecuteContext onMethodExit(ExecuteContext context, ListIterator<Interceptor> interceptorItr, - ExceptionHandler onThrowHandler, ExceptionHandler afterHandler) { + ExceptionHandler onThrowHandler, ExceptionHandler afterHandler) throws Throwable { ExecuteContext newContext = context; while (interceptorItr.hasPrevious()) { final Interceptor interceptor = interceptorItr.previous(); @@ -83,6 +88,9 @@ public class CommonBaseAdviser { } catch (Throwable t) { onThrowHandler.handle(newContext, interceptor, t); } + if (newContext.getThrowableOut() != null) { + throw newContext.getThrowableOut(); + } } try { final ExecuteContext tempContext = interceptor.after(newContext); @@ -92,6 +100,9 @@ public class CommonBaseAdviser { } catch (Throwable t) { afterHandler.handle(newContext, interceptor, t); } + if (newContext.getThrowableOut() != null) { + throw newContext.getThrowableOut(); + } } return newContext; } diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonConstAdviser.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonConstAdviser.java index fe80c975..2a8b7161 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonConstAdviser.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonConstAdviser.java @@ -61,8 +61,10 @@ public class CommonConstAdviser { * @param context 执行上下文 * @param interceptorItr 拦截器双向迭代器 * @return 执行上下文 + * @throws Throwable 抛给宿主的异常 */ - public static ExecuteContext onMethodEnter(ExecuteContext context, ListIterator<Interceptor> interceptorItr) { + public static ExecuteContext onMethodEnter(ExecuteContext context, ListIterator<Interceptor> interceptorItr) + throws Throwable { return CommonBaseAdviser.onMethodEnter(context, interceptorItr, new CommonBaseAdviser.ExceptionHandler() { @Override @@ -78,8 +80,10 @@ public class CommonConstAdviser { * @param context 执行上下文 * @param interceptorItr 拦截器双向迭代器 * @return 执行上下文 + * @throws Throwable 抛给宿主的异常 */ - public static ExecuteContext onMethodExit(ExecuteContext context, ListIterator<Interceptor> interceptorItr) { + public static ExecuteContext onMethodExit(ExecuteContext context, ListIterator<Interceptor> interceptorItr) + throws Throwable { return CommonBaseAdviser.onMethodExit(context, interceptorItr, null, new CommonBaseAdviser.ExceptionHandler() { @Override diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonMethodAdviser.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonMethodAdviser.java index d7909964..3724811d 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonMethodAdviser.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonMethodAdviser.java @@ -61,8 +61,10 @@ public class CommonMethodAdviser { * @param context 执行上下文 * @param interceptorItr 拦截器双向迭代器 * @return 执行上下文 + * @throws Throwable 抛给宿主的异常 */ - public static ExecuteContext onMethodEnter(ExecuteContext context, ListIterator<Interceptor> interceptorItr) { + public static ExecuteContext onMethodEnter(ExecuteContext context, ListIterator<Interceptor> interceptorItr) + throws Throwable { return CommonBaseAdviser.onMethodEnter(context, interceptorItr, new CommonBaseAdviser.ExceptionHandler() { @Override @@ -78,8 +80,10 @@ public class CommonMethodAdviser { * @param context 执行上下文 * @param interceptorItr 拦截器双向迭代器 * @return 执行上下文 + * @throws Throwable 抛给宿主的异常 */ - public static ExecuteContext onMethodExit(ExecuteContext context, ListIterator<Interceptor> interceptorItr) { + public static ExecuteContext onMethodExit(ExecuteContext context, ListIterator<Interceptor> interceptorItr) + throws Throwable { return CommonBaseAdviser.onMethodExit(context, interceptorItr, new CommonBaseAdviser.ExceptionHandler() { @Override diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java index 498ff966..e905e354 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java @@ -22,16 +22,17 @@ import com.huawei.discovery.utils.HttpConstants; import com.huawei.discovery.utils.PlugEffectWhiteBlackUtils; import com.huawei.discovery.utils.RequestInterceptorUtils; +import com.huaweicloud.sermant.core.common.LoggerFactory; import com.huaweicloud.sermant.core.plugin.agent.entity.ExecuteContext; import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager; import feign.Request; -import feign.Response; - -import org.apache.http.HttpStatus; import java.util.Map; +import java.util.Optional; import java.util.function.Function; +import java.util.logging.Level; +import java.util.logging.Logger; /** * 拦截获取服务列表 @@ -40,22 +41,31 @@ import java.util.function.Function; * @since 2022-09-27 */ public class FeignInvokeInterceptor extends MarkInterceptor { + private static final Logger LOGGER = LoggerFactory.getLogger(); @Override protected ExecuteContext doBefore(ExecuteContext context) throws Exception { final InvokerService invokerService = PluginServiceManager.getPluginService(InvokerService.class); - Request request = (Request)context.getArguments()[0]; + Request request = (Request) context.getArguments()[0]; Map<String, String> urlInfo = RequestInterceptorUtils.recovertUrl(request.url()); if (!PlugEffectWhiteBlackUtils.isAllowRun(request.url(), urlInfo.get(HttpConstants.HTTP_URI_HOST), false)) { return context; } RequestInterceptorUtils.printRequestLog("feign", urlInfo); - invokerService.invoke( - buildInvokerFunc(context, request, urlInfo), - buildExFunc(request), - urlInfo.get(HttpConstants.HTTP_URI_HOST)) - .ifPresent(context::skip); + Optional<Object> result = invokerService.invoke( + buildInvokerFunc(context, request, urlInfo), + ex -> ex, + urlInfo.get(HttpConstants.HTTP_URI_HOST)); + if (result.isPresent()) { + Object obj = result.get(); + if (obj instanceof Exception) { + LOGGER.log(Level.SEVERE, "request is error, uri is " + request.url(), (Exception) obj); + context.setThrowableOut((Exception) obj); + return context; + } + context.skip(obj); + } return context; } @@ -69,24 +79,6 @@ public class FeignInvokeInterceptor extends MarkInterceptor { }; } - private Function<Exception, Object> buildExFunc(Request request) { - return ex -> buildErrorResponse(ex, request); - } - - /** - * 构建feign响应 - * - * @param ex - * @return 响应 - */ - private Response buildErrorResponse(Exception ex, Request request) { - Response.Builder builder = Response.builder(); - builder.status(HttpStatus.SC_INTERNAL_SERVER_ERROR); - builder.reason(ex.getMessage()); - builder.request(request); - return builder.build(); - } - @Override public ExecuteContext after(ExecuteContext context) throws Exception { return context; diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java index 080eeaca..62181676 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java @@ -58,12 +58,13 @@ public class RestTemplateInterceptor extends MarkInterceptor { RequestInterceptorUtils.printRequestLog("restTemplate", hostAndPath); Optional<Object> result = invokerService.invoke( buildInvokerFunc(uri, hostAndPath, context, httpMethod), - this::buildErrorResponse, + ex -> ex, hostAndPath.get(HttpConstants.HTTP_URI_HOST)); if (result.isPresent()) { Object obj = result.get(); if (obj instanceof Exception) { LOGGER.log(Level.SEVERE, "request is error, uri is " + uri, (Exception) obj); + context.setThrowableOut((Exception) obj); return context; } context.skip(obj); @@ -101,16 +102,6 @@ public class RestTemplateInterceptor extends MarkInterceptor { }; } - /** - * 构建restTemplete响应 - * - * @param ex - * @return 响应 - */ - private Exception buildErrorResponse(Exception ex) { - return ex; - } - @Override public ExecuteContext after(ExecuteContext context) throws Exception { return context;

['sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/entity/ExecuteContext.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceConstTemplate.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceMemberTemplate.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonMethodAdviser.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonBaseAdviser.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/CommonConstAdviser.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceStaticTemplate.java']

{'.java': 9}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/843/835

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/835

https://github.com/huaweicloud/Sermant/pull/843

https://github.com/huaweicloud/Sermant/pull/843

fixes

【bug】fix the registry plugin bugs

### What happened? can not work ### How can we reproduce it (as minimally and precisely as possible)? no ### Anything else we need to know? _No response_ ### Sermant version <details> 0.6.0 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

d746892d4bbe9990d765b98a101029b1ac4789ed

38432cfdc370f2ca5c78a07a02b0229ef0e20d9e

https://github.com/huaweicloud/sermant/compare/d746892d4bbe9990d765b98a101029b1ac4789ed...38432cfdc370f2ca5c78a07a02b0229ef0e20d9e

diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/declarers/OkHttp3ClientDeclarer.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/declarers/OkHttp3ClientDeclarer.java index 2c06e3a6..d4444be9 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/declarers/OkHttp3ClientDeclarer.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/declarers/OkHttp3ClientDeclarer.java @@ -50,7 +50,8 @@ public class OkHttp3ClientDeclarer extends AbstractPluginDeclarer { @Override public InterceptDeclarer[] getInterceptDeclarers(ClassLoader classLoader) { return new InterceptDeclarer[] { - InterceptDeclarer.build(MethodMatcher.nameEquals("getResponseWithInterceptorChain"), INTERCEPT_CLASS) + InterceptDeclarer.build(MethodMatcher.nameContains("execute", "getResponseWithInterceptorChain"), + INTERCEPT_CLASS) }; } } diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/declarers/OkHttpClientDeclarer.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/declarers/OkHttpClientDeclarer.java index c3d96662..f80a04e4 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/declarers/OkHttpClientDeclarer.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/declarers/OkHttpClientDeclarer.java @@ -50,7 +50,8 @@ public class OkHttpClientDeclarer extends AbstractPluginDeclarer { @Override public InterceptDeclarer[] getInterceptDeclarers(ClassLoader classLoader) { return new InterceptDeclarer[] { - InterceptDeclarer.build(MethodMatcher.nameEquals("getResponseWithInterceptorChain"), INTERCEPT_CLASS) + InterceptDeclarer.build(MethodMatcher.nameContains("execute", "getResponseWithInterceptorChain"), + INTERCEPT_CLASS) }; } } diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java index 8fb1c39c..ffc674be 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java @@ -28,7 +28,7 @@ import com.huaweicloud.sermant.core.plugin.agent.entity.ExecuteContext; import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager; import com.huaweicloud.sermant.core.utils.ReflectUtils; -import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import okhttp3.Protocol; import okhttp3.Request; import okhttp3.Response; @@ -36,11 +36,14 @@ import okhttp3.Response.Builder; import org.apache.http.HttpStatus; +import java.io.IOException; +import java.lang.reflect.Method; import java.net.URI; import java.util.Map; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; +import java.util.logging.Level; import java.util.logging.Logger; /** @@ -71,14 +74,30 @@ public class OkHttp3ClientInterceptor extends MarkInterceptor { RequestInterceptorUtils.printRequestLog("OkHttp3", hostAndPath); AtomicReference<Request> rebuildRequest = new AtomicReference<>(); rebuildRequest.set(request); - invokerService.invoke( + final Optional<Object> invoke = invokerService.invoke( buildInvokerFunc(uri, hostAndPath, request, rebuildRequest, context), buildExFunc(rebuildRequest), - hostAndPath.get(HttpConstants.HTTP_URI_HOST)) - .ifPresent(context::skip); + hostAndPath.get(HttpConstants.HTTP_URI_HOST)); + if (!invoke.isPresent() && isNoneReturnMethod(context.getMethod())) { + context.skip(null); + } + invoke.ifPresent(o -> setResultOrThrow(context, o, uri.getPath())); return context; } + private void setResultOrThrow(ExecuteContext context, Object result, String url) { + if (result instanceof IOException) { + LOGGER.log(Level.SEVERE, "Ok http client request error, uri is " + url, (Exception) result); + context.setThrowableOut((Exception) result); + return; + } + context.skip(result); + } + + private boolean isNoneReturnMethod(Method method) { + return method.getReturnType() == void.class || method.getReturnType() == Void.class; + } + private Optional<Request> getRequest(ExecuteContext context) { final Optional<Object> originalRequest = ReflectUtils.getFieldValue(context.getObject(), FIELD_NAME); if (originalRequest.isPresent() && originalRequest.get() instanceof Request) { @@ -97,37 +116,43 @@ public class OkHttp3ClientInterceptor extends MarkInterceptor { final String method = request.method(); Request newRequest = covertRequest(uri, hostAndPath, request, method, invokerContext.getServiceInstance()); rebuildRequest.set(newRequest); - try { - context.setRawMemberFieldValue(FIELD_NAME, newRequest); - } catch (NoSuchFieldException e) { - LOGGER.warning("setRawMemberFieldValue originalRequest failed"); - return context; - } catch (IllegalAccessException e) { - LOGGER.warning("setRawMemberFieldValue originalRequest failed"); - return context; - } - return RequestInterceptorUtils.buildFunc(context, invokerContext).get(); + final Object target = copyNewCall(context, newRequest); + return RequestInterceptorUtils.buildFunc(target, context.getMethod(), context.getArguments(), + invokerContext).get(); }; } + private Object copyNewCall(ExecuteContext executeContext, Request newRequest) { + final Optional<Object> client = ReflectUtils.getFieldValue(executeContext.getObject(), "client"); + if (!client.isPresent()) { + return executeContext.getObject(); + } + final OkHttpClient okHttpClient = (OkHttpClient) client.get(); + return okHttpClient.newCall(newRequest); + } + private Request covertRequest(URI uri, Map<String, String> hostAndPath, Request request, String method, ServiceInstance serviceInstance) { String url = RequestInterceptorUtils.buildUrlWithIp(uri, serviceInstance, hostAndPath.get(HttpConstants.HTTP_URI_PATH), method); - HttpUrl newUrl = HttpUrl.parse(url); - return request - .newBuilder() - .url(newUrl) + return new Request.Builder() + .headers(request.headers()) + .method(request.method(), request.body()) + .url(url) + .tag(request.tag()) .build(); } /** * 构建okHttp3响应 * - * @param ex + * @param ex 指定异常 * @return 响应 */ - private Response buildErrorResponse(Exception ex, Request request) { + private Object buildErrorResponse(Exception ex, Request request) { + if (ex instanceof IOException) { + return ex; + } Builder builder = new Builder(); builder.code(HttpStatus.SC_INTERNAL_SERVER_ERROR); builder.message(ex.getMessage()); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java index 8266bcf5..1485a5fd 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java @@ -29,6 +29,7 @@ import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager; import com.huaweicloud.sermant.core.utils.ReflectUtils; import com.squareup.okhttp.HttpUrl; +import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.Protocol; import com.squareup.okhttp.Request; import com.squareup.okhttp.Response; @@ -36,11 +37,14 @@ import com.squareup.okhttp.Response.Builder; import org.apache.http.HttpStatus; +import java.io.IOException; +import java.lang.reflect.Method; import java.net.URI; import java.util.Map; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; +import java.util.logging.Level; import java.util.logging.Logger; /** @@ -50,7 +54,6 @@ import java.util.logging.Logger; * @since 2022-09-14 */ public class OkHttpClientInterceptor extends MarkInterceptor { - private static final Logger LOGGER = LoggerFactory.getLogger(); private static final String FIELD_NAME = "originalRequest"; @@ -72,14 +75,30 @@ public class OkHttpClientInterceptor extends MarkInterceptor { RequestInterceptorUtils.printRequestLog("OkHttp", hostAndPath); AtomicReference<Request> rebuildRequest = new AtomicReference<>(); rebuildRequest.set(request); - invokerService.invoke( + final Optional<Object> invoke = invokerService.invoke( buildInvokerFunc(uri, hostAndPath, request, rebuildRequest, context), buildExFunc(rebuildRequest), - hostAndPath.get(HttpConstants.HTTP_URI_HOST)) - .ifPresent(context::skip); + hostAndPath.get(HttpConstants.HTTP_URI_HOST)); + if (!invoke.isPresent() && isNoneReturnMethod(context.getMethod())) { + context.skip(null); + } + invoke.ifPresent(o -> setResultOrThrow(context, o, uri.getPath())); return context; } + private void setResultOrThrow(ExecuteContext context, Object result, String url) { + if (result instanceof IOException) { + LOGGER.log(Level.SEVERE, "Ok http client request error, uri is " + url, (Exception) result); + context.setThrowableOut((Exception) result); + return; + } + context.skip(result); + } + + private boolean isNoneReturnMethod(Method method) { + return method.getReturnType() == void.class || method.getReturnType() == Void.class; + } + private Optional<Request> getRequest(ExecuteContext context) { final Optional<Object> originalRequest = ReflectUtils.getFieldValue(context.getObject(), FIELD_NAME); if (originalRequest.isPresent() && originalRequest.get() instanceof Request) { @@ -98,19 +117,21 @@ public class OkHttpClientInterceptor extends MarkInterceptor { final String method = request.method(); Request newRequest = covertRequest(uri, hostAndPath, request, method, invokerContext.getServiceInstance()); rebuildRequest.set(newRequest); - try { - context.setRawMemberFieldValue(FIELD_NAME, newRequest); - } catch (NoSuchFieldException e) { - LOGGER.warning("setRawMemberFieldValue originalRequest failed"); - return context; - } catch (IllegalAccessException e) { - LOGGER.warning("setRawMemberFieldValue originalRequest failed"); - return context; - } - return RequestInterceptorUtils.buildFunc(context, invokerContext).get(); + final Object newCall = copyNewCall(context, newRequest); + return RequestInterceptorUtils.buildFunc(newCall, context.getMethod(), context.getArguments(), + invokerContext).get(); }; } + private Object copyNewCall(ExecuteContext executeContext, Request newRequest) { + final Optional<Object> client = ReflectUtils.getFieldValue(executeContext.getObject(), "client"); + if (!client.isPresent()) { + return executeContext.getObject(); + } + final OkHttpClient okHttpClient = (OkHttpClient) client.get(); + return okHttpClient.newCall(newRequest); + } + private Request covertRequest(URI uri, Map<String, String> hostAndPath, Request request, String method, ServiceInstance serviceInstance) { String url = RequestInterceptorUtils.buildUrlWithIp(uri, serviceInstance, @@ -125,10 +146,13 @@ public class OkHttpClientInterceptor extends MarkInterceptor { /** * 构建okHttp响应 * - * @param ex + * @param ex 指定异常 * @return 响应 */ - private Response buildErrorResponse(Exception ex, Request request) { + private Object buildErrorResponse(Exception ex, Request request) { + if (ex instanceof IOException) { + return ex; + } Builder builder = new Builder(); builder.code(HttpStatus.SC_INTERNAL_SERVER_ERROR); builder.message(ex.getMessage()); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java index ed6ef173..b9fe9751 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java @@ -36,12 +36,14 @@ import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.utils.URIUtils; +import java.io.IOException; import java.net.URI; import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; +import java.util.logging.Level; import java.util.logging.Logger; /** @@ -78,10 +80,19 @@ public class HttpClient4xInterceptor extends MarkInterceptor { buildInvokerFunc(hostAndPath, uri, httpRequest, context), buildExFunc(httpRequest), hostAndPath.get(HttpConstants.HTTP_URI_HOST)) - .ifPresent(context::skip); + .ifPresent(result -> this.setResultOrThrow(context, result, uri.getPath())); return context; } + private void setResultOrThrow(ExecuteContext context, Object result, String url) { + if (result instanceof IOException) { + LOGGER.log(Level.SEVERE, "Http client request failed, uri is " + url, (Exception) result); + context.setThrowableOut((Exception) result); + return; + } + context.skip(result); + } + private Function<InvokerContext, Object> buildInvokerFunc(Map<String, String> hostAndPath, URI uri, HttpRequest httpRequest, ExecuteContext context) { final String method = httpRequest.getRequestLine().getMethod(); @@ -110,6 +121,9 @@ public class HttpClient4xInterceptor extends MarkInterceptor { private Function<Exception, Object> buildExFunc(HttpRequest httpRequest) { final ClassLoader appClassloader = Thread.currentThread().getContextClassLoader(); return ex -> { + if (ex instanceof IOException) { + return ex; + } final ClassLoader pluginClassloader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(appClassloader); try { diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java index 63471709..36e11129 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java @@ -133,21 +133,34 @@ public class RequestInterceptorUtils { * @return 调用器 */ public static Supplier<Object> buildFunc(ExecuteContext context, InvokerContext invokerContext) { + return buildFunc(context.getObject(), context.getMethod(), context.getArguments(), invokerContext); + } + + /** + * 构建invoke回调方法函数 + * + * @param target 目标 + * @param arguments 参数 + * @param method 方法 + * @param invokerContext 调用上下文 + * @return 调用器 + */ + public static Supplier<Object> buildFunc(Object target, Method method, Object[] arguments, + InvokerContext invokerContext) { return () -> { try { - final Method method = context.getMethod(); AccessController.doPrivileged((PrivilegedAction<Object>) () -> { method.setAccessible(true); return method; }); - return method.invoke(context.getObject(), context.getArguments()); + return method.invoke(target, arguments); } catch (IllegalAccessException e) { LOGGER.log(Level.SEVERE, String.format(Locale.ENGLISH, "Can not invoke method [%s]", - context.getMethod().getName()), e); + method.getName()), e); } catch (InvocationTargetException e) { invokerContext.setEx(e.getTargetException()); LOGGER.log(Level.FINE, String.format(Locale.ENGLISH, "invoke method [%s] failed", - context.getMethod().getName()), e); + method.getName()), e.getTargetException()); } return Optional.empty(); }; diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptorTest.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptorTest.java index d436dde0..2e4edea0 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptorTest.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptorTest.java @@ -104,7 +104,9 @@ public class OkHttp3ClientInterceptorTest extends BaseTest { public void testRestTemplateInterceptor() throws Exception { OkHttpClient client = new OkHttpClient(); Request request = createRequest(url); - ExecuteContext context = ExecuteContext.forMemberMethod(client.newCall(request), null, arguments, null, null); + ExecuteContext context = ExecuteContext.forMemberMethod(client.newCall(request), + String.class.getDeclaredMethod("trim"), arguments, null, + null); discoveryPluginConfig.setRealmName(realmName); initStrategy(PlugEffectWhiteBlackConstants.STRATEGY_ALL, "zookeeper-provider-demo"); interceptor.doBefore(context); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/OkHttpClientInterceptorTest.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/OkHttpClientInterceptorTest.java index a14b928b..6c1bf20c 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/OkHttpClientInterceptorTest.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/OkHttpClientInterceptorTest.java @@ -99,7 +99,9 @@ public class OkHttpClientInterceptorTest extends BaseTest { public void testRestTemplateInterceptor() throws Exception { OkHttpClient client = new OkHttpClient(); Request request = createRequest(url); - ExecuteContext context = ExecuteContext.forMemberMethod(client.newCall(request), null, arguments, null, null); + ExecuteContext context = ExecuteContext.forMemberMethod(client.newCall(request), + String.class.getDeclaredMethod("trim"), arguments, null, + null); discoveryPluginConfig.setRealmName(realmName); initStrategy(PlugEffectWhiteBlackConstants.STRATEGY_ALL, "zookeeper-provider-demo"); interceptor.doBefore(context);

['sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptorTest.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/declarers/OkHttp3ClientDeclarer.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/interceptors/OkHttpClientInterceptorTest.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/declarers/OkHttpClientDeclarer.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java']

{'.java': 8}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/844/835

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/835

https://github.com/huaweicloud/Sermant/pull/844

https://github.com/huaweicloud/Sermant/pull/844

fixes

【bug】fix the registry plugin bugs

### What happened? can not work ### How can we reproduce it (as minimally and precisely as possible)? no ### Anything else we need to know? _No response_ ### Sermant version <details> 0.6.0 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

8987157956e7a1afa021d92e83502f342d262b44

41ce77de4e084593196d307cf594143bfb687ef5

https://github.com/huaweicloud/sermant/compare/8987157956e7a1afa021d92e83502f342d262b44...41ce77de4e084593196d307cf594143bfb687ef5

diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java index 0ed24ac4..63471709 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java @@ -31,6 +31,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.security.AccessController; import java.security.PrivilegedAction; +import java.util.Collections; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -62,23 +63,27 @@ public class RequestInterceptorUtils { */ public static Map<String, String> recovertUrl(String url) { if (StringUtils.isEmpty(url)) { - return new HashMap<>(); + return Collections.emptyMap(); } - Map<String, String> result = new HashMap<>(); - String scheme = url.substring(0, url.indexOf(HttpConstants.HTTP_URL_DOUBLIE_SLASH)); String temp = url.substring(url.indexOf(HttpConstants.HTTP_URL_DOUBLIE_SLASH) - + HttpConstants.HTTP_URL_DOUBLIE_SLASH.length()); + + HttpConstants.HTTP_URL_DOUBLIE_SLASH.length()); int slashLen = 1; // 剔除域名之后的path temp = temp.substring(temp.indexOf(HttpConstants.HTTP_URL_SINGLE_SLASH) + slashLen); // 服务名 - String host = temp.substring(0, temp.indexOf(HttpConstants.HTTP_URL_SINGLE_SLASH)); + int index = temp.indexOf(HttpConstants.HTTP_URL_SINGLE_SLASH); + if (index == -1) { + return Collections.emptyMap(); + } + String host = temp.substring(0, index); // 请求路径 String path = temp.substring(temp.indexOf(HttpConstants.HTTP_URL_SINGLE_SLASH)); + Map<String, String> result = new HashMap<>(); result.put(HttpConstants.HTTP_URI_HOST, host); + String scheme = url.substring(0, url.indexOf(HttpConstants.HTTP_URL_DOUBLIE_SLASH)); result.put(HttpConstants.HTTP_URL_SCHEME, scheme); result.put(HttpConstants.HTTP_URI_PATH, path); return result; @@ -92,7 +97,7 @@ public class RequestInterceptorUtils { */ public static void printRequestLog(String source, Map<String, String> hostAndPath) { String path = String.format(Locale.ENGLISH, "/%s%s", hostAndPath.get(HttpConstants.HTTP_URI_HOST), - hostAndPath.get(HttpConstants.HTTP_URI_PATH)); + hostAndPath.get(HttpConstants.HTTP_URI_PATH)); LOGGER.log(Level.FINE, String.format(Locale.ENGLISH, "[%s] request [%s] has been intercepted!", source, path)); RECORDER.beforeRequest(); } @@ -138,11 +143,11 @@ public class RequestInterceptorUtils { return method.invoke(context.getObject(), context.getArguments()); } catch (IllegalAccessException e) { LOGGER.log(Level.SEVERE, String.format(Locale.ENGLISH, "Can not invoke method [%s]", - context.getMethod().getName()), e); + context.getMethod().getName()), e); } catch (InvocationTargetException e) { invokerContext.setEx(e.getTargetException()); LOGGER.log(Level.FINE, String.format(Locale.ENGLISH, "invoke method [%s] failed", - context.getMethod().getName()), e.getTargetException()); + context.getMethod().getName()), e); } return Optional.empty(); }; @@ -158,11 +163,11 @@ public class RequestInterceptorUtils { public static String buildUrl(Map<String, String> urlIfo, ServiceInstance serviceInstance) { StringBuilder urlBuild = new StringBuilder(); urlBuild.append(urlIfo.get(HttpConstants.HTTP_URL_SCHEME)) - .append(HttpConstants.HTTP_URL_DOUBLIE_SLASH) - .append(serviceInstance.getIp()) - .append(HttpConstants.HTTP_URL_COLON) - .append(serviceInstance.getPort()) - .append(urlIfo.get(HttpConstants.HTTP_URI_PATH)); + .append(HttpConstants.HTTP_URL_DOUBLIE_SLASH) + .append(serviceInstance.getIp()) + .append(HttpConstants.HTTP_URL_COLON) + .append(serviceInstance.getPort()) + .append(urlIfo.get(HttpConstants.HTTP_URI_PATH)); return urlBuild.toString(); } @@ -186,9 +191,9 @@ public class RequestInterceptorUtils { return result; } result.put(HttpConstants.HTTP_URI_HOST, - tempPath.substring(0, tempPath.indexOf(HttpConstants.HTTP_URL_SINGLE_SLASH))); + tempPath.substring(0, tempPath.indexOf(HttpConstants.HTTP_URL_SINGLE_SLASH))); result.put(HttpConstants.HTTP_URI_PATH, - tempPath.substring(tempPath.indexOf(HttpConstants.HTTP_URL_SINGLE_SLASH))); + tempPath.substring(tempPath.indexOf(HttpConstants.HTTP_URL_SINGLE_SLASH))); return result; } @@ -204,14 +209,14 @@ public class RequestInterceptorUtils { public static String buildUrlWithIp(URI uri, ServiceInstance serviceInstance, String path, String method) { StringBuilder urlBuild = new StringBuilder(); urlBuild.append(uri.getScheme()) - .append(HttpConstants.HTTP_URL_DOUBLIE_SLASH) - .append(serviceInstance.getIp()) - .append(HttpConstants.HTTP_URL_COLON) - .append(serviceInstance.getPort()) - .append(path); + .append(HttpConstants.HTTP_URL_DOUBLIE_SLASH) + .append(serviceInstance.getIp()) + .append(HttpConstants.HTTP_URL_COLON) + .append(serviceInstance.getPort()) + .append(path); if (method.equals(HttpConstants.HTTP_GET)) { urlBuild.append(HttpConstants.HTTP_URL_UNKNOWN) - .append(uri.getQuery()); + .append(uri.getQuery()); } return urlBuild.toString(); }

['sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java']

{'.java': 1}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/848/847

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/847

https://github.com/huaweicloud/Sermant/pull/848

https://github.com/huaweicloud/Sermant/pull/848

fixes

【fix】remove the logic for catch throwabel of bytebudy

### What happened? remove the logic for catch throwabel of bytebudy ### How can we reproduce it (as minimally and precisely as possible)? 100% ### Anything else we need to know? _No response_ ### Sermant version <details> 0.7 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

086b4bed4a685bb807ffae45fadf37fd040fb78a

e55faf698126cc6717a87b46b41cfed35c7f86b0

https://github.com/huaweicloud/sermant/compare/086b4bed4a685bb807ffae45fadf37fd040fb78a...e55faf698126cc6717a87b46b41cfed35c7f86b0

diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceConstTemplate.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceConstTemplate.java index f5e8453c..51bda3a9 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceConstTemplate.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceConstTemplate.java @@ -51,7 +51,7 @@ public class AdviceConstTemplate { * @param context 执行上下文 * @throws Throwable 抛给宿主的异常 */ - @Advice.OnMethodEnter(suppress = Throwable.class) + @Advice.OnMethodEnter public static void onMethodEnter( @Advice.Origin Class<?> cls, @Advice.Origin Constructor<?> constructor, @@ -79,7 +79,7 @@ public class AdviceConstTemplate { * @param context 执行上下文 * @throws Throwable 抛给宿主的异常 */ - @Advice.OnMethodExit(suppress = Throwable.class) + @Advice.OnMethodExit public static void onMethodExit( @Advice.This(typing = Assigner.Typing.DYNAMIC) Object obj, @Advice.FieldValue(value = "_EXT_STATIC_FIELDS_$SERMANT", diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceMemberTemplate.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceMemberTemplate.java index 47c41d8b..21ee1a26 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceMemberTemplate.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceMemberTemplate.java @@ -53,7 +53,7 @@ public class AdviceMemberTemplate { * @return 是否跳过主要方法 * @throws Throwable 抛给宿主的异常 */ - @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class) + @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class) public static boolean onMethodEnter( @Advice.This(typing = Assigner.Typing.DYNAMIC) Object obj, @Advice.Origin Method method, @@ -86,7 +86,7 @@ public class AdviceMemberTemplate { * @param context 执行上下文 * @throws Throwable 抛给宿主的异常 */ - @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + @Advice.OnMethodExit(onThrowable = Throwable.class) public static void onMethodExit( @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Object result, @Advice.Thrown Throwable throwable, diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceStaticTemplate.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceStaticTemplate.java index a9b630c6..7484e419 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceStaticTemplate.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceStaticTemplate.java @@ -52,7 +52,7 @@ public class AdviceStaticTemplate { * @return 是否跳过主要方法 * @throws Throwable 抛给宿主的异常 */ - @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class) + @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class) public static boolean onMethodEnter( @Advice.Origin Class<?> cls, @Advice.Origin Method method, @@ -81,7 +81,7 @@ public class AdviceStaticTemplate { * @param context 执行上下文 * @throws Throwable 抛给宿主的异常 */ - @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + @Advice.OnMethodExit(onThrowable = Throwable.class) public static void onMethodExit( @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Object result, @Advice.Thrown Throwable throwable, diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapConstTemplate.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapConstTemplate.java index 53374ae1..fa8096d7 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapConstTemplate.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapConstTemplate.java @@ -51,7 +51,7 @@ public class BootstrapConstTemplate { * @param context 执行上下文 * @throws Exception 执行异常 */ - @Advice.OnMethodEnter(suppress = Throwable.class) + @Advice.OnMethodEnter public static void onMethodEnter( @Advice.Origin Class<?> cls, @Advice.Origin Constructor<?> constructor, @@ -87,7 +87,7 @@ public class BootstrapConstTemplate { * @param context 执行上下文 * @throws Exception 执行异常 */ - @Advice.OnMethodExit(suppress = Throwable.class) + @Advice.OnMethodExit public static void onMethodExit( @Advice.This(typing = Assigner.Typing.DYNAMIC) Object obj, @Advice.Local(value = "_CONTEXT_CLS_$SERMANT_LOCAL") Class<?> contextCls, diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapMemberTemplate.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapMemberTemplate.java index d690d948..3bdd6496 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapMemberTemplate.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapMemberTemplate.java @@ -52,7 +52,7 @@ public class BootstrapMemberTemplate { * @return 是否跳过主要方法 * @throws Exception 执行异常 */ - @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class) + @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class) public static boolean onMethodEnter( @Advice.This(typing = Assigner.Typing.DYNAMIC) Object obj, @Advice.Origin Method method, @@ -90,7 +90,7 @@ public class BootstrapMemberTemplate { * @param context 执行上下文 * @throws Exception 执行异常 */ - @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + @Advice.OnMethodExit(onThrowable = Throwable.class) public static void onMethodExit( @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Object result, @Advice.Thrown Throwable throwable, diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapStaticTemplate.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapStaticTemplate.java index 1feb99a2..91f697a5 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapStaticTemplate.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapStaticTemplate.java @@ -52,7 +52,7 @@ public class BootstrapStaticTemplate { * @return 是否跳过主要方法 * @throws Exception 执行异常 */ - @Advice.OnMethodEnter(suppress = Throwable.class, skipOn = Advice.OnNonDefaultValue.class) + @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class) public static boolean onMethodEnter( @Advice.Origin Class<?> cls, @Advice.Origin Method method, @@ -90,7 +90,7 @@ public class BootstrapStaticTemplate { * @param context 执行上下文 * @throws Exception 执行异常 */ - @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class) + @Advice.OnMethodExit(onThrowable = Throwable.class) public static void onMethodExit( @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Object result, @Advice.Thrown Throwable throwable,

['sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapConstTemplate.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceConstTemplate.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceMemberTemplate.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapStaticTemplate.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/BootstrapMemberTemplate.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/agent/template/AdviceStaticTemplate.java']

{'.java': 6}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/853/852

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/852

https://github.com/huaweicloud/Sermant/pull/853

https://github.com/huaweicloud/Sermant/pull/853

fixes

【bug】配置项为list时，yaml会抛出解析错误的bug

### What happened? 配置项为list时，yaml会抛出解析错误的bug ### How can we reproduce it (as minimally and precisely as possible)? 配置项为list时，yaml会抛出解析错误的bug ### Anything else we need to know? _No response_ ### Sermant version <details> 0.6.1 </details> ### OS version n/a

8f306861e38ada86c329e017f232adcf82d205d8

0ca5a54a4ff30a72a434b20c993f256f75946154

https://github.com/huaweicloud/sermant/compare/8f306861e38ada86c329e017f232adcf82d205d8...0ca5a54a4ff30a72a434b20c993f256f75946154

diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/subscribe/processor/ConfigOrderIntegratedProcessor.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/subscribe/processor/ConfigOrderIntegratedProcessor.java index ab536eeb..f8aebe96 100644 --- a/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/subscribe/processor/ConfigOrderIntegratedProcessor.java +++ b/sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/subscribe/processor/ConfigOrderIntegratedProcessor.java @@ -138,11 +138,16 @@ public class ConfigOrderIntegratedProcessor implements ConfigProcessor { targetHolder.getHolder().getOrDefault(originEvent.getKey(), new HashMap<>(CAP_SIZE)); olderDataMap.clear(); if (originEvent.getEventType() != DynamicConfigEventType.DELETE) { - Optional<Map<String, Object>> dataMap = yamlConverter.convert(originEvent.getContent(), Map.class); - if (!dataMap.isPresent()) { + Optional<Object> convert = yamlConverter.convert(originEvent.getContent(), Object.class); + if (!convert.isPresent()) { return false; } - olderDataMap.putAll(dataMap.get()); + Object obj = convert.get(); + if (obj instanceof Map) { + olderDataMap.putAll((Map<String, Object>) obj); + } else { + olderDataMap.put(originEvent.getKey(), obj); + } } targetHolder.getHolder().put(originEvent.getKey(), olderDataMap); return true; diff --git a/sermant-plugins/sermant-router/router-config-service/src/main/java/com/huaweicloud/sermant/router/config/handler/RouterConfigHandler.java b/sermant-plugins/sermant-router/router-config-service/src/main/java/com/huaweicloud/sermant/router/config/handler/RouterConfigHandler.java index a87025ad..66ecd6cb 100644 --- a/sermant-plugins/sermant-router/router-config-service/src/main/java/com/huaweicloud/sermant/router/config/handler/RouterConfigHandler.java +++ b/sermant-plugins/sermant-router/router-config-service/src/main/java/com/huaweicloud/sermant/router/config/handler/RouterConfigHandler.java @@ -16,7 +16,6 @@ package com.huaweicloud.sermant.router.config.handler; -import com.huaweicloud.sermant.core.plugin.subscribe.processor.OrderConfigEvent; import com.huaweicloud.sermant.core.service.dynamicconfig.common.DynamicConfigEvent; import com.huaweicloud.sermant.core.service.dynamicconfig.common.DynamicConfigEventType; import com.huaweicloud.sermant.router.common.constants.RouterConstant; @@ -81,24 +80,6 @@ public class RouterConfigHandler extends AbstractConfigHandler { } private Map<String, String> getRouteRuleMap(DynamicConfigEvent event) { - if (event instanceof OrderConfigEvent) { - Map<String, Object> allData = ((OrderConfigEvent) event).getAllData(); - String prefix = - RouterConstant.ROUTER_CONFIG_SERVICECOMB_KEY + "." + RouterConstant.ROUTER_CONFIG_ROUTE_RULE_KEY + "."; - Map<String, String> routeRuleMap = new HashMap<>(); - for (Entry<String, Object> entry : allData.entrySet()) { - if (!entry.getKey().startsWith(prefix)) { - continue; - } - Object value = entry.getValue(); - if (value instanceof String) { - routeRuleMap.put(entry.getKey().substring(prefix.length()), (String) value); - } else { - routeRuleMap.put(entry.getKey().substring(prefix.length()), yaml.dump(value)); - } - } - return routeRuleMap; - } String content = event.getContent(); Map<String, Map<String, Map<String, String>>> load = yaml.load(content); if (CollectionUtils.isEmpty(load)) { diff --git a/sermant-plugins/sermant-router/router-config-service/src/main/java/com/huaweicloud/sermant/router/config/handler/ServiceConfigHandler.java b/sermant-plugins/sermant-router/router-config-service/src/main/java/com/huaweicloud/sermant/router/config/handler/ServiceConfigHandler.java index 2171b11d..6520ce2c 100644 --- a/sermant-plugins/sermant-router/router-config-service/src/main/java/com/huaweicloud/sermant/router/config/handler/ServiceConfigHandler.java +++ b/sermant-plugins/sermant-router/router-config-service/src/main/java/com/huaweicloud/sermant/router/config/handler/ServiceConfigHandler.java @@ -16,9 +16,9 @@ package com.huaweicloud.sermant.router.config.handler; -import com.huaweicloud.sermant.core.plugin.subscribe.processor.OrderConfigEvent; import com.huaweicloud.sermant.core.service.dynamicconfig.common.DynamicConfigEvent; import com.huaweicloud.sermant.core.service.dynamicconfig.common.DynamicConfigEventType; +import com.huaweicloud.sermant.core.utils.StringUtils; import com.huaweicloud.sermant.router.common.constants.RouterConstant; import com.huaweicloud.sermant.router.common.utils.CollectionUtils; import com.huaweicloud.sermant.router.config.cache.ConfigCache; @@ -30,10 +30,8 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; /** * 路由配置处理器（服务维度） @@ -79,23 +77,11 @@ public class ServiceConfigHandler extends AbstractConfigHandler { } private List<Map<String, Object>> getRule(DynamicConfigEvent event, String serviceName) { - if (event instanceof OrderConfigEvent) { - Map<String, Object> allData = ((OrderConfigEvent) event).getAllData(); - Map<String, List<Map<String, Object>>> routeRuleMap = new HashMap<>(); - for (Entry<String, Object> entry : allData.entrySet()) { - String key = entry.getKey(); - if (!key.startsWith(RouterConstant.ROUTER_KEY_PREFIX + POINT)) { - continue; - } - Object value = entry.getValue(); - if (value instanceof String) { - routeRuleMap.put(entry.getKey(), yaml.loadAs((String) value, List.class)); - } else { - routeRuleMap.put(entry.getKey(), (List<Map<String, Object>>) value); - } - } - return routeRuleMap.get(RouterConstant.ROUTER_KEY_PREFIX + POINT + serviceName); + String content = event.getContent(); + if (StringUtils.isBlank(content)) { + return Collections.emptyList(); } - return yaml.loadAs(event.getContent(), List.class); + Map<String, List<Map<String, Object>>> map = yaml.load(content); + return map.get(RouterConstant.ROUTER_KEY_PREFIX + POINT + serviceName); } } \\ No newline at end of file diff --git a/sermant-plugins/sermant-service-registry/dubbo-registry-service/src/main/java/com/huawei/dubbo/registry/listener/GovernanceConfigListener.java b/sermant-plugins/sermant-service-registry/dubbo-registry-service/src/main/java/com/huawei/dubbo/registry/listener/GovernanceConfigListener.java index 0816b965..3d07b3af 100644 --- a/sermant-plugins/sermant-service-registry/dubbo-registry-service/src/main/java/com/huawei/dubbo/registry/listener/GovernanceConfigListener.java +++ b/sermant-plugins/sermant-service-registry/dubbo-registry-service/src/main/java/com/huawei/dubbo/registry/listener/GovernanceConfigListener.java @@ -20,11 +20,11 @@ import com.huawei.dubbo.registry.entity.GovernanceCache; import com.huawei.dubbo.registry.entity.GovernanceData; import com.huawei.dubbo.registry.service.RegistryService; -import com.huaweicloud.sermant.core.plugin.subscribe.processor.OrderConfigEvent; import com.huaweicloud.sermant.core.service.ServiceManager; import com.huaweicloud.sermant.core.service.dynamicconfig.common.DynamicConfigEvent; import com.huaweicloud.sermant.core.service.dynamicconfig.common.DynamicConfigEventType; import com.huaweicloud.sermant.core.service.dynamicconfig.common.DynamicConfigListener; +import com.huaweicloud.sermant.core.utils.StringUtils; import com.alibaba.fastjson.JSONObject; @@ -54,8 +54,8 @@ public class GovernanceConfigListener implements DynamicConfigListener { GovernanceData governanceData = null; if (event.getEventType() != DynamicConfigEventType.DELETE) { String content = event.getContent(); - if (event instanceof OrderConfigEvent) { - content = JSONObject.toJSONString(((OrderConfigEvent) event).getAllData()); + if (StringUtils.isBlank(content)) { + return; } governanceData = JSONObject.parseObject(content, GovernanceData.class); } diff --git a/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/src/main/java/com/huawei/registry/config/RegistryConfigResolver.java b/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/src/main/java/com/huawei/registry/config/RegistryConfigResolver.java index 01a2dc01..59d00710 100644 --- a/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/src/main/java/com/huawei/registry/config/RegistryConfigResolver.java +++ b/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/src/main/java/com/huawei/registry/config/RegistryConfigResolver.java @@ -19,7 +19,6 @@ package com.huawei.registry.config; import com.huaweicloud.sermant.core.operation.OperationManager; import com.huaweicloud.sermant.core.operation.converter.api.YamlConverter; -import com.huaweicloud.sermant.core.plugin.subscribe.processor.OrderConfigEvent; import com.huaweicloud.sermant.core.service.dynamicconfig.common.DynamicConfigEvent; import com.huaweicloud.sermant.core.service.dynamicconfig.common.DynamicConfigEventType; import com.huaweicloud.sermant.core.utils.MapUtils; @@ -50,14 +49,7 @@ public abstract class RegistryConfigResolver { if (!isTargetConfig(event)) { return; } - boolean isUpdated; - if (event instanceof OrderConfigEvent) { - final Map<String, Object> allData = ((OrderConfigEvent) event).getAllData(); - isUpdated = updateConfig(allData, event.getEventType()); - } else { - isUpdated = this.updateWithDefaultMode(event); - } - if (isUpdated) { + if (updateWithDefaultMode(event)) { afterUpdateConfig(); } }

['sermant-plugins/sermant-router/router-config-service/src/main/java/com/huaweicloud/sermant/router/config/handler/ServiceConfigHandler.java', 'sermant-plugins/sermant-service-registry/dubbo-registry-service/src/main/java/com/huawei/dubbo/registry/listener/GovernanceConfigListener.java', 'sermant-plugins/sermant-router/router-config-service/src/main/java/com/huaweicloud/sermant/router/config/handler/RouterConfigHandler.java', 'sermant-agentcore/sermant-agentcore-core/src/main/java/com/huaweicloud/sermant/core/plugin/subscribe/processor/ConfigOrderIntegratedProcessor.java', 'sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/src/main/java/com/huawei/registry/config/RegistryConfigResolver.java']

{'.java': 5}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/901/900

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/900

https://github.com/huaweicloud/Sermant/pull/901

https://github.com/huaweicloud/Sermant/pull/901

fixes

【fix】fix the statics logic for request count

### What happened? Redundant statistics for request count ### How can we reproduce it (as minimally and precisely as possible)? always ### Anything else we need to know? _No response_ ### Sermant version <details> 0.6.1 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

fe56e06cff5c62a5c70afbef622507df34d16914

7dddcbf6071b1d4b0270b9062ee42b6d52cd94b0

https://github.com/huaweicloud/sermant/compare/fe56e06cff5c62a5c70afbef622507df34d16914...7dddcbf6071b1d4b0270b9062ee42b6d52cd94b0

diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/entity/SimpleRequestRecorder.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/entity/SimpleRequestRecorder.java index 13274605..65c66a95 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/entity/SimpleRequestRecorder.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/entity/SimpleRequestRecorder.java @@ -48,16 +48,17 @@ public class SimpleRequestRecorder implements Recorder { @Override public void beforeRequest() { + if (!discoveryPluginConfig.isEnableRequestCount()) { + return; + } final long allRequest = allRequestCount.incrementAndGet(); if (allRequest <= 0) { allRequestCount.set(0); LOGGER.info("SimpleRequestRecorder has over the max num of long, it has been reset to 0!"); } - if (discoveryPluginConfig.isEnableRequestCount()) { - LOGGER.info(String.format(Locale.ENGLISH, - "currentTime: %s request count handle by plugin is: %s", - HttpConstants.currentTime(), allRequest)); - } + LOGGER.info(String.format(Locale.ENGLISH, + "currentTime: %s request count handle by plugin is: %s", + HttpConstants.currentTime(), allRequest)); } @Override diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/entity/SimpleRequestRecorderTest.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/entity/SimpleRequestRecorderTest.java index b95e77ed..16431e19 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/entity/SimpleRequestRecorderTest.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/entity/SimpleRequestRecorderTest.java @@ -46,6 +46,7 @@ public class SimpleRequestRecorderTest { public void setUp() throws Exception { pluginConfigManagerMockedStatic = Mockito .mockStatic(PluginConfigManager.class); + discoveryPluginConfig.setEnableRequestCount(true); pluginConfigManagerMockedStatic.when(() -> PluginConfigManager.getPluginConfig(DiscoveryPluginConfig.class)) .thenReturn(discoveryPluginConfig); }

['sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/test/java/com/huawei/discovery/entity/SimpleRequestRecorderTest.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/entity/SimpleRequestRecorder.java']

{'.java': 2}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/960/959

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/959

https://github.com/huaweicloud/Sermant/pull/960

https://github.com/huaweicloud/Sermant/pull/960

fixes

【fix】fix bug for springboot registry plugin

### What happened? if the url which for springboot registry plugin is invalid, it will throw ex ### How can we reproduce it (as minimally and precisely as possible)? use url request whose url is invalid, such as http://www.domain.com/test ### Anything else we need to know? _No response_ ### Sermant version <details> 0.7.0 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

32db176cc5b92438fc0a260209bf552b8c02c945

d3dad05e34a6b709ac30dba5b9e27eac87842268

https://github.com/huaweicloud/sermant/compare/32db176cc5b92438fc0a260209bf552b8c02c945...d3dad05e34a6b709ac30dba5b9e27eac87842268

diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java index c48a5913..e86e3bc3 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java @@ -48,8 +48,7 @@ public class FeignInvokeInterceptor extends MarkInterceptor { final InvokerService invokerService = PluginServiceManager.getPluginService(InvokerService.class); Request request = (Request) context.getArguments()[0]; Map<String, String> urlInfo = RequestInterceptorUtils.recoverUrl(request.url()); - if (!PlugEffectWhiteBlackUtils.isAllowRun(request.url(), urlInfo.get(HttpConstants.HTTP_URI_HOST), - false)) { + if (!PlugEffectWhiteBlackUtils.isAllowRun(request.url(), urlInfo.get(HttpConstants.HTTP_URI_HOST))) { return context; } RequestInterceptorUtils.printRequestLog("feign", urlInfo); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java index 062f1f4a..daca8098 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java @@ -64,9 +64,11 @@ public class OkHttp3ClientInterceptor extends MarkInterceptor { } Request request = rawRequest.get(); URI uri = request.url().uri(); + if (!PlugEffectWhiteBlackUtils.isHostEqualRealmName(uri.getHost())) { + return context; + } Map<String, String> hostAndPath = RequestInterceptorUtils.recoverHostAndPath(uri.getPath()); - if (!PlugEffectWhiteBlackUtils.isAllowRun(uri.getHost(), hostAndPath.get(HttpConstants.HTTP_URI_HOST), - true)) { + if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_HOST))) { return context; } RequestInterceptorUtils.printRequestLog("OkHttp3", hostAndPath); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java index 8e72882f..6070583c 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java @@ -66,9 +66,11 @@ public class OkHttpClientInterceptor extends MarkInterceptor { } Request request = rawRequest.get(); URI uri = request.uri(); + if (!PlugEffectWhiteBlackUtils.isHostEqualRealmName(uri.getHost())) { + return context; + } Map<String, String> hostAndPath = RequestInterceptorUtils.recoverHostAndPath(uri.getPath()); - if (!PlugEffectWhiteBlackUtils.isAllowRun(uri.getHost(), hostAndPath.get(HttpConstants.HTTP_URI_HOST), - true)) { + if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_HOST))) { return context; } RequestInterceptorUtils.printRequestLog("OkHttp", hostAndPath); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java index 62181676..73dcf258 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java @@ -50,9 +50,11 @@ public class RestTemplateInterceptor extends MarkInterceptor { final InvokerService invokerService = PluginServiceManager.getPluginService(InvokerService.class); URI uri = (URI) context.getArguments()[0]; HttpMethod httpMethod = (HttpMethod) context.getArguments()[1]; + if (!PlugEffectWhiteBlackUtils.isHostEqualRealmName(uri.getHost())) { + return context; + } Map<String, String> hostAndPath = RequestInterceptorUtils.recoverHostAndPath(uri.getPath()); - if (!PlugEffectWhiteBlackUtils.isAllowRun(uri.getHost(), hostAndPath.get(HttpConstants.HTTP_URI_HOST), - true)) { + if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_HOST))) { return context; } RequestInterceptorUtils.printRequestLog("restTemplate", hostAndPath); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java index c569196f..d8d525dd 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java @@ -80,7 +80,11 @@ public class HttpAsyncClient4xInterceptor implements Interceptor { @Override public ExecuteContext before(ExecuteContext context) throws Exception { ready(); - acquireHostPath(context); + HttpAsyncRequestProducer httpAsyncRequestProducer = (HttpAsyncRequestProducer) context.getArguments()[0]; + if (!PlugEffectWhiteBlackUtils.isHostEqualRealmName(httpAsyncRequestProducer.getTarget().getHostName())) { + return context; + } + acquireHostPath(httpAsyncRequestProducer); if (!isConfigEnable()) { // 配置不允许则直接返回 return context; @@ -99,6 +103,7 @@ public class HttpAsyncClient4xInterceptor implements Interceptor { @Override public ExecuteContext after(ExecuteContext context) throws Exception { if (!isConfigEnable()) { + HttpAsyncUtils.remove(); return context; } final ClassLoader appClassloader = Thread.currentThread().getContextClassLoader(); @@ -134,12 +139,10 @@ public class HttpAsyncClient4xInterceptor implements Interceptor { if (originHostName == null || hostAndPath == null) { return false; } - return PlugEffectWhiteBlackUtils - .isAllowRun(originHostName, hostAndPath.get(HttpConstants.HTTP_URI_HOST), true); + return PlugEffectWhiteBlackUtils.isAllowRun(originHostName, hostAndPath.get(HttpConstants.HTTP_URI_HOST)); } - private void acquireHostPath(ExecuteContext context) throws Exception { - HttpAsyncRequestProducer httpAsyncRequestProducer = (HttpAsyncRequestProducer) context.getArguments()[0]; + private void acquireHostPath(HttpAsyncRequestProducer httpAsyncRequestProducer) throws Exception { final HttpHost httpHost = httpAsyncRequestProducer.getTarget(); final HttpRequest httpRequest = httpAsyncRequestProducer.generateRequest(); final Optional<URI> optionalUri = RequestInterceptorUtils.formatUri(httpRequest.getRequestLine().getUri()); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java index f6b2c886..ac970729 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java @@ -67,12 +67,15 @@ public class HttpClient4xInterceptor extends MarkInterceptor { final InvokerService invokerService = PluginServiceManager.getPluginService(InvokerService.class); HttpHost httpHost = (HttpHost) context.getArguments()[0]; final HttpRequest httpRequest = (HttpRequest) context.getArguments()[1]; + if (!PlugEffectWhiteBlackUtils.isHostEqualRealmName(httpHost.getHostName())) { + return context; + } final Map<String, String> hostAndPath = RequestInterceptorUtils.recoverUrl(httpRequest.getRequestLine() .getUri()); if (hostAndPath.isEmpty()) { return context; } - if (!isConfigEnable(hostAndPath, httpHost.getHostName())) { + if (!PlugEffectWhiteBlackUtils.isPlugEffect(hostAndPath.get(HttpConstants.HTTP_URI_HOST))) { return context; } RequestInterceptorUtils.printRequestLog("HttpClient", hostAndPath); @@ -154,10 +157,6 @@ public class HttpClient4xInterceptor extends MarkInterceptor { }; } - private boolean isConfigEnable(Map<String, String> hostAndPath, String hostName) { - return PlugEffectWhiteBlackUtils.isAllowRun(hostName, hostAndPath.get(HttpConstants.HTTP_URI_HOST), true); - } - @Override protected void ready() { if (isLoaded.compareAndSet(false, true)) { diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionConnectInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionConnectInterceptor.java index 7ef28948..a4faf8ec 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionConnectInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionConnectInterceptor.java @@ -81,10 +81,12 @@ public class HttpUrlConnectionConnectInterceptor extends MarkInterceptor { return context; } final URL url = rawUrl.get(); + if (!PlugEffectWhiteBlackUtils.isHostEqualRealmName(url.getHost())) { + return context; + } final String fullUrl = url.toString(); Map<String, String> urlInfo = RequestInterceptorUtils.recoverUrl(url); - if (!PlugEffectWhiteBlackUtils.isAllowRun(url.getHost(), urlInfo.get(HttpConstants.HTTP_URI_HOST), - false)) { + if (!PlugEffectWhiteBlackUtils.isPlugEffect(urlInfo.get(HttpConstants.HTTP_URI_HOST))) { return context; } HttpConnectionUtils.save(new HttpConnectionContext(urlInfo, url)); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/PlugEffectWhiteBlackUtils.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/PlugEffectWhiteBlackUtils.java index b6396969..21630568 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/PlugEffectWhiteBlackUtils.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/PlugEffectWhiteBlackUtils.java @@ -135,14 +135,10 @@ public class PlugEffectWhiteBlackUtils { * * @param realmStr 拦截获取的域名 * @param serviceName 下游服务名 - * @param isByEqual 是否基于等于比较 * @return 是否允许执行 */ - public static boolean isAllowRun(String realmStr, String serviceName, boolean isByEqual) { - if (isByEqual && !PlugEffectWhiteBlackUtils.isHostEqualRealmName(realmStr)) { - return false; - } - if (!isByEqual && !PlugEffectWhiteBlackUtils.isUrlContainsRealmName(realmStr)) { + public static boolean isAllowRun(String realmStr, String serviceName) { + if (!PlugEffectWhiteBlackUtils.isHostEqualRealmName(realmStr)) { return false; } return PlugEffectWhiteBlackUtils.isPlugEffect(serviceName); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java index acfa9abe..885d17c5 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java @@ -55,6 +55,17 @@ public class RequestInterceptorUtils { private static final int URL_INFO_INIT_SIZE = 8; + /** + * 解析url时，分隔的最小长度, 其path必须为/serviceName/api/xxx, 否则将不是目标请求 {@link RequestInterceptorUtils#recoverUrl(URL)} + */ + private static final int MIN_LEN_FOR_VALID_PATH = 2; + + /** + * 解析url时，分隔的最小长度, 其url必须为http:/www.domain.com/serviceName/api/xxx, 否则将不是目标请求 + * {@link RequestInterceptorUtils#recoverUrl(String)} + */ + private static final int MIN_LEN_FOR_VALID_URL = 4; + private RequestInterceptorUtils() { } @@ -75,14 +86,17 @@ public class RequestInterceptorUtils { if (url == null) { return Collections.emptyMap(); } - final Map<String, String> result = new HashMap<>(URL_INFO_INIT_SIZE); final String protocol = url.getProtocol(); // /serviceName/sayHello?name=1, 已切分为serviceName, sayHello?name=1 - final StringTokenizer tokenizer = new StringTokenizer(url.getPath()); + String delim = String.valueOf(HttpConstants.HTTP_URL_SINGLE_SLASH); + final StringTokenizer tokenizer = new StringTokenizer(url.getPath(), delim); + if (tokenizer.countTokens() < MIN_LEN_FOR_VALID_PATH) { + return Collections.emptyMap(); + } + final Map<String, String> result = new HashMap<>(URL_INFO_INIT_SIZE); result.put(HttpConstants.HTTP_URL_SCHEME, protocol); - result.put(HttpConstants.HTTP_URI_HOST, - tokenizer.nextToken(String.valueOf(HttpConstants.HTTP_URL_SINGLE_SLASH))); + result.put(HttpConstants.HTTP_URI_HOST, tokenizer.nextToken(delim)); result.put(HttpConstants.HTTP_URI_PATH, formatPath(tokenizer.nextToken(HttpConstants.EMPTY_STR), url.getQuery())); return result; @@ -98,8 +112,11 @@ public class RequestInterceptorUtils { if (StringUtils.isEmpty(url) || !isValidUrl(url)) { return Collections.emptyMap(); } - final StringTokenizer urlTokens = new StringTokenizer(url); String baseSlash = String.valueOf(HttpConstants.HTTP_URL_SINGLE_SLASH); + final StringTokenizer urlTokens = new StringTokenizer(url, baseSlash); + if (urlTokens.countTokens() < MIN_LEN_FOR_VALID_URL) { + return Collections.emptyMap(); + } // http(s):.subString(0, len - 1) final String rawScheme = urlTokens.nextToken(baseSlash);

['sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpClient4xInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpconnection/HttpUrlConnectionConnectInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/RestTemplateInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/FeignInvokeInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/PlugEffectWhiteBlackUtils.java']

{'.java': 9}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/836/835

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/835

https://github.com/huaweicloud/Sermant/pull/836

https://github.com/huaweicloud/Sermant/pull/836

fixes

【bug】fix the registry plugin bugs

### What happened? can not work ### How can we reproduce it (as minimally and precisely as possible)? no ### Anything else we need to know? _No response_ ### Sermant version <details> 0.6.0 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

960821e519fb82f73c6484d18713c7d0bdcaec4e

e92160564783ad57a6192fe62b005cb4a847ca3c

https://github.com/huaweicloud/sermant/compare/960821e519fb82f73c6484d18713c7d0bdcaec4e...e92160564783ad57a6192fe62b005cb4a847ca3c

diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/config/LbConfig.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/config/LbConfig.java index 72f1627e..de1eb957 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/config/LbConfig.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/config/LbConfig.java @@ -135,9 +135,9 @@ public class LbConfig implements PluginConfig { private boolean preferIpAddress = false; /** - * 统计并发数的时间窗口, 默认10分钟, 并发数仅在时间窗口内统计生效, 超出则清0 + * 实例状态统计时间窗口, 默认10分钟, 每一个时间窗口的开始, 统计都会清0 */ - private long activeRequestTimeoutWindowMs = LbConstants.DEFAULT_ACTIVE_REQUEST_COUNT_WINDOW_MS; + private long instanceStatTimeWindowMs = LbConstants.DEFAULT_INSTANCE_STATE_TIME_WINDOW_MS; public long getRefreshTimerInterval() { return refreshTimerInterval; @@ -187,8 +187,8 @@ public class LbConfig implements PluginConfig { this.zkServerVersion = version; } - public long getActiveRequestTimeoutWindowMs() { - return activeRequestTimeoutWindowMs; + public long getInstanceStatTimeWindowMs() { + return instanceStatTimeWindowMs; } public int getMaxRetryConfigCache() { @@ -199,8 +199,8 @@ public class LbConfig implements PluginConfig { this.maxRetryConfigCache = maxRetryConfigCache; } - public void setActiveRequestTimeoutWindowMs(long activeRequestTimeoutWindowMs) { - this.activeRequestTimeoutWindowMs = activeRequestTimeoutWindowMs; + public void setInstanceStatTimeWindowMs(long instanceStatTimeWindowMs) { + this.instanceStatTimeWindowMs = instanceStatTimeWindowMs; } public String getZkUriSpec() { diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/config/LbConstants.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/config/LbConstants.java index 64beed89..c7e8fa86 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/config/LbConstants.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/config/LbConstants.java @@ -64,9 +64,9 @@ public class LbConstants { public static final long DEFAULT_LB_STATS_REFRESH_INTERVAL_MS = 30000L; /** - * 统计并发数的时间窗口, 默认10分钟 + * 实例状态统计时间窗口, 默认10分钟, 每一个时间窗口的开始, 统计都会清0 */ - public static final long DEFAULT_ACTIVE_REQUEST_COUNT_WINDOW_MS = 600000L; + public static final long DEFAULT_INSTANCE_STATE_TIME_WINDOW_MS = 600000L; /** * 服务超时后最大重试次数 diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/entity/SimpleRequestRecorder.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/entity/SimpleRequestRecorder.java index 2ff7d40f..13274605 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/entity/SimpleRequestRecorder.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/entity/SimpleRequestRecorder.java @@ -55,7 +55,7 @@ public class SimpleRequestRecorder implements Recorder { } if (discoveryPluginConfig.isEnableRequestCount()) { LOGGER.info(String.format(Locale.ENGLISH, - "currentTime: %s httpClientInterceptor effect count: %s", + "currentTime: %s request count handle by plugin is: %s", HttpConstants.currentTime(), allRequest)); } } diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java index 43759e24..8fb1c39c 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java @@ -26,6 +26,7 @@ import com.huawei.discovery.utils.RequestInterceptorUtils; import com.huaweicloud.sermant.core.common.LoggerFactory; import com.huaweicloud.sermant.core.plugin.agent.entity.ExecuteContext; import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager; +import com.huaweicloud.sermant.core.utils.ReflectUtils; import okhttp3.HttpUrl; import okhttp3.Protocol; @@ -37,6 +38,7 @@ import org.apache.http.HttpStatus; import java.net.URI; import java.util.Map; +import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import java.util.logging.Logger; @@ -48,7 +50,6 @@ import java.util.logging.Logger; * @since 2022-09-14 */ public class OkHttp3ClientInterceptor extends MarkInterceptor { - private static final Logger LOGGER = LoggerFactory.getLogger(); private static final String FIELD_NAME = "originalRequest"; @@ -56,10 +57,11 @@ public class OkHttp3ClientInterceptor extends MarkInterceptor { @Override protected ExecuteContext doBefore(ExecuteContext context) throws Exception { final InvokerService invokerService = PluginServiceManager.getPluginService(InvokerService.class); - if (context.getRawMemberFieldValue(FIELD_NAME) == null) { + final Optional<Request> rawRequest = getRequest(context); + if (!rawRequest.isPresent()) { return context; } - Request request = (Request)context.getRawMemberFieldValue(FIELD_NAME); + Request request = rawRequest.get(); URI uri = request.url().uri(); Map<String, String> hostAndPath = RequestInterceptorUtils.recoverHostAndPath(uri.getPath()); if (!PlugEffectWhiteBlackUtils.isAllowRun(uri.getHost(), hostAndPath.get(HttpConstants.HTTP_URI_HOST), @@ -68,6 +70,7 @@ public class OkHttp3ClientInterceptor extends MarkInterceptor { } RequestInterceptorUtils.printRequestLog("OkHttp3", hostAndPath); AtomicReference<Request> rebuildRequest = new AtomicReference<>(); + rebuildRequest.set(request); invokerService.invoke( buildInvokerFunc(uri, hostAndPath, request, rebuildRequest, context), buildExFunc(rebuildRequest), @@ -76,6 +79,14 @@ public class OkHttp3ClientInterceptor extends MarkInterceptor { return context; } + private Optional<Request> getRequest(ExecuteContext context) { + final Optional<Object> originalRequest = ReflectUtils.getFieldValue(context.getObject(), FIELD_NAME); + if (originalRequest.isPresent() && originalRequest.get() instanceof Request) { + return Optional.of((Request) originalRequest.get()); + } + return Optional.empty(); + } + private Function<Exception, Object> buildExFunc(AtomicReference<Request> rebuildRequest) { return ex -> buildErrorResponse(ex, rebuildRequest.get()); } diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java index 49e3e077..8266bcf5 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java @@ -26,6 +26,7 @@ import com.huawei.discovery.utils.RequestInterceptorUtils; import com.huaweicloud.sermant.core.common.LoggerFactory; import com.huaweicloud.sermant.core.plugin.agent.entity.ExecuteContext; import com.huaweicloud.sermant.core.plugin.service.PluginServiceManager; +import com.huaweicloud.sermant.core.utils.ReflectUtils; import com.squareup.okhttp.HttpUrl; import com.squareup.okhttp.Protocol; @@ -37,6 +38,7 @@ import org.apache.http.HttpStatus; import java.net.URI; import java.util.Map; +import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import java.util.logging.Logger; @@ -56,10 +58,11 @@ public class OkHttpClientInterceptor extends MarkInterceptor { @Override protected ExecuteContext doBefore(ExecuteContext context) throws Exception { final InvokerService invokerService = PluginServiceManager.getPluginService(InvokerService.class); - if (context.getRawMemberFieldValue(FIELD_NAME) == null) { + final Optional<Request> rawRequest = getRequest(context); + if (!rawRequest.isPresent()) { return context; } - Request request = (Request)context.getRawMemberFieldValue(FIELD_NAME); + Request request = rawRequest.get(); URI uri = request.uri(); Map<String, String> hostAndPath = RequestInterceptorUtils.recoverHostAndPath(uri.getPath()); if (!PlugEffectWhiteBlackUtils.isAllowRun(uri.getHost(), hostAndPath.get(HttpConstants.HTTP_URI_HOST), @@ -68,6 +71,7 @@ public class OkHttpClientInterceptor extends MarkInterceptor { } RequestInterceptorUtils.printRequestLog("OkHttp", hostAndPath); AtomicReference<Request> rebuildRequest = new AtomicReference<>(); + rebuildRequest.set(request); invokerService.invoke( buildInvokerFunc(uri, hostAndPath, request, rebuildRequest, context), buildExFunc(rebuildRequest), @@ -76,6 +80,14 @@ public class OkHttpClientInterceptor extends MarkInterceptor { return context; } + private Optional<Request> getRequest(ExecuteContext context) { + final Optional<Object> originalRequest = ReflectUtils.getFieldValue(context.getObject(), FIELD_NAME); + if (originalRequest.isPresent() && originalRequest.get() instanceof Request) { + return Optional.of((Request) originalRequest.get()); + } + return Optional.empty(); + } + private Function<Exception, Object> buildExFunc(AtomicReference<Request> rebuildRequest) { return ex -> buildErrorResponse(ex, rebuildRequest.get()); } diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java index e2cb4c8a..9b88cc21 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java @@ -18,9 +18,7 @@ package com.huawei.discovery.interceptors.httpclient; import com.huawei.discovery.entity.FutureDecorator; import com.huawei.discovery.entity.HttpAsyncContext; -import com.huawei.discovery.entity.Recorder; import com.huawei.discovery.entity.ServiceInstance; -import com.huawei.discovery.entity.SimpleRequestRecorder; import com.huawei.discovery.retry.InvokerContext; import com.huawei.discovery.service.InvokerService; import com.huawei.discovery.utils.HttpAsyncUtils; @@ -69,8 +67,6 @@ public class HttpAsyncClient4xInterceptor implements Interceptor { private final AtomicBoolean isLoaded = new AtomicBoolean(); - private final Recorder recorder = new SimpleRequestRecorder(); - @Override public ExecuteContext before(ExecuteContext context) throws Exception { ready(); @@ -108,7 +104,6 @@ public class HttpAsyncClient4xInterceptor implements Interceptor { } RequestInterceptorUtils.printRequestLog("HttpAsyncClient", HttpAsyncUtils.getOrCreateContext() .getHostAndPath()); - recorder.beforeRequest(); final Object result = context.getResult(); if (!(result instanceof Future)) { return context; diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/retry/DefaultRetryImpl.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/retry/DefaultRetryImpl.java index 43d58198..f16c0b73 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/retry/DefaultRetryImpl.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/retry/DefaultRetryImpl.java @@ -18,8 +18,13 @@ package com.huawei.discovery.retry; import com.huawei.discovery.entity.Recorder; +import com.huaweicloud.sermant.core.common.LoggerFactory; + +import java.util.Locale; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Predicate; +import java.util.logging.Level; +import java.util.logging.Logger; /** * 默认重试器 @@ -28,6 +33,8 @@ import java.util.function.Predicate; * @since 2022-09-28 */ public class DefaultRetryImpl implements Retry { + private static final Logger LOGGER = LoggerFactory.getLogger(); + private final RetryConfig retryConfig; private final String name; @@ -106,7 +113,13 @@ public class DefaultRetryImpl implements Retry { } // 抛出异常 - throw new RetryException(ex); + if (invokeCount.get() > 0) { + LOGGER.log(Level.WARNING, String.format(Locale.ENGLISH, "Retry failed with %s times", + invokeCount.get()), ex); + } + final RetryException retryException = new RetryException(ex); + retryException.setStackTrace(ex.getStackTrace()); + throw retryException; } @Override diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java index 08c8be3c..f26d6bb5 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java @@ -16,7 +16,9 @@ package com.huawei.discovery.utils; +import com.huawei.discovery.entity.Recorder; import com.huawei.discovery.entity.ServiceInstance; +import com.huawei.discovery.entity.SimpleRequestRecorder; import com.huawei.discovery.retry.InvokerContext; import com.huaweicloud.sermant.core.common.LoggerFactory; @@ -44,9 +46,10 @@ import java.util.logging.Logger; * @since 2022-10-09 */ public class RequestInterceptorUtils { - private static final Logger LOGGER = LoggerFactory.getLogger(); + private static final Recorder RECORDER = new SimpleRequestRecorder(); + private RequestInterceptorUtils() { } @@ -91,6 +94,7 @@ public class RequestInterceptorUtils { String path = String.format(Locale.ENGLISH, "/%s%s", hostAndPath.get(HttpConstants.HTTP_URI_HOST), hostAndPath.get(HttpConstants.HTTP_URI_PATH)); LOGGER.log(Level.FINE, String.format(Locale.ENGLISH, "[%s] request [%s] has been intercepted!", source, path)); + RECORDER.beforeRequest(); } /** diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/lb/stats/InstanceStats.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/lb/stats/InstanceStats.java index fe04669a..78528cb2 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/lb/stats/InstanceStats.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/lb/stats/InstanceStats.java @@ -53,24 +53,25 @@ public class InstanceStats implements Recorder { /** * 时间窗口 */ - private final long activeRequestTimeoutWindowMs; + private final long instanceStateTimeWindowMs; /** - * 上一次记录并发数的时间戳 + * 上一次时间窗口更新时间, 作为时间窗口的左边界 */ - private volatile long lastActiveRequestTimestamp; + private volatile long lastLeftWindowTime; /** - * 平均响应时间 + * 时间窗口内的平均响应时间 */ - private double responseAvgTime = 0d; + private volatile double responseAvgTime; /** * 构造器 */ public InstanceStats() { - this.activeRequestTimeoutWindowMs = - PluginConfigManager.getPluginConfig(LbConfig.class).getActiveRequestTimeoutWindowMs(); + this.instanceStateTimeWindowMs = + PluginConfigManager.getPluginConfig(LbConfig.class).getInstanceStatTimeWindowMs(); + lastLeftWindowTime = System.currentTimeMillis(); } /** @@ -80,7 +81,6 @@ public class InstanceStats implements Recorder { public void beforeRequest() { activeRequests.incrementAndGet(); allRequestCount.incrementAndGet(); - lastActiveRequestTimestamp = System.currentTimeMillis(); } /** @@ -102,13 +102,24 @@ public class InstanceStats implements Recorder { baseStats(consumeTimeMs); } + private void calculateResponseAvgTime() { + final long allConsumeTime = allRequestConsumeTime.get(); + final long currentTimeMillis = System.currentTimeMillis(); + if (currentTimeMillis - lastLeftWindowTime >= this.instanceStateTimeWindowMs) { + lastLeftWindowTime = currentTimeMillis; + allRequestCount.set(0); + allRequestConsumeTime.set(0); + } + this.responseAvgTime = allRequestCount.get() == 0 ? 0 : (allConsumeTime * 1d / allRequestCount.get()); + } + private void baseStats(long consumeTimeMs) { final long request = activeRequests.decrementAndGet(); if (request < 0) { activeRequests.set(0); } - final long responseTime = allRequestConsumeTime.addAndGet(consumeTimeMs); - responseAvgTime = allRequestCount.get() == 0 ? 0 : (responseTime * 1d / allRequestCount.get()); + allRequestConsumeTime.addAndGet(consumeTimeMs); + this.calculateResponseAvgTime(); } /** @@ -134,7 +145,8 @@ public class InstanceStats implements Recorder { public long getActiveRequests() { final long activeCount = activeRequests.get(); final long currentTimeMillis = System.currentTimeMillis(); - if (currentTimeMillis - lastActiveRequestTimestamp >= this.activeRequestTimeoutWindowMs) { + if (currentTimeMillis - lastLeftWindowTime >= this.instanceStateTimeWindowMs) { + lastLeftWindowTime = currentTimeMillis; this.activeRequests.set(0); return 0; } @@ -145,6 +157,11 @@ public class InstanceStats implements Recorder { return failRequestCount; } + /** + * 获取平均响应时间 + * + * @return responseAvgTime + */ public double getResponseAvgTime() { return responseAvgTime; } diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java index d2304a44..ce5ee597 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java @@ -40,7 +40,6 @@ import java.net.ConnectException; import java.net.NoRouteToHostException; import java.time.LocalDateTime; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Map; @@ -67,7 +66,9 @@ public class RetryServiceImpl implements InvokerService { ConnectException.class, NoRouteToHostException.class); - private final List<String> rawRetryEx = Collections.singletonList("org.apache.http.conn.ConnectTimeoutException"); + private final List<String> rawRetryEx = Arrays.asList( + "org.apache.http.conn.ConnectTimeoutException", + "org.apache.http.NoHttpResponseException"); private final Map<String, Retry> retryCache = new ConcurrentHashMap<>(); @@ -108,9 +109,6 @@ public class RetryServiceImpl implements InvokerService { try { return invokeWithEx(invokeFunc, serviceName, retry); } catch (RetryException ex) { - // 走异常处理流程 - LOGGER.log(Level.WARNING, String.format(Locale.ENGLISH, "Retry failed with %s times", - retry.config().getMaxRetry()), ex); return Optional.ofNullable(exFunc.apply(ex.getRealEx())); } catch (Exception ex) { // 重试最终失败抛出异常, 需对异常进行封装, 返回给上游, 或者作为当前调用返回调用方 diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/test/java/com/huawei/discovery/service/lb/stats/InstanceStatsTest.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/test/java/com/huawei/discovery/service/lb/stats/InstanceStatsTest.java index 5b8bb279..3fc46985 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/test/java/com/huawei/discovery/service/lb/stats/InstanceStatsTest.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/test/java/com/huawei/discovery/service/lb/stats/InstanceStatsTest.java @@ -68,7 +68,7 @@ public class InstanceStatsTest extends BaseTest { @Test public void testActiveRequest() throws InterruptedException { - lbConfig.setActiveRequestTimeoutWindowMs(1L); + lbConfig.setInstanceStatTimeWindowMs(1L); final InstanceStats stats = new InstanceStats(); stats.beforeRequest(); Thread.sleep(10);

['sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/httpclient/HttpAsyncClient4xInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/test/java/com/huawei/discovery/service/lb/stats/InstanceStatsTest.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/lb/stats/InstanceStats.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/entity/SimpleRequestRecorder.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttpClientInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/retry/DefaultRetryImpl.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/interceptors/OkHttp3ClientInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-service/src/main/java/com/huawei/discovery/service/retry/RetryServiceImpl.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/config/LbConfig.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/config/LbConstants.java']

{'.java': 11}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/1012/1010

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/1010

https://github.com/huaweicloud/Sermant/pull/1012

https://github.com/huaweicloud/Sermant/pull/1012

fixes

【fix】fix the bug that springboot registry plugin can not process the url query params when method is post

### What happened? when the method is post, and it's url has the url query params, plugin will not handler it. The result for it will lose the query params ### How can we reproduce it (as minimally and precisely as possible)? N/A ### Anything else we need to know? _No response_ ### Sermant version <details> 0.8.0 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

0bdf7d91bd519f175d413d40c986677096b9b6ae

1cf2ef962ea9ac5fb937b4487d603b761860e1ac

https://github.com/huaweicloud/sermant/compare/0bdf7d91bd519f175d413d40c986677096b9b6ae...1cf2ef962ea9ac5fb937b4487d603b761860e1ac

diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java index 7dd73d7e..3efa99ef 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java @@ -308,9 +308,8 @@ public class RequestInterceptorUtils { .append(HttpConstants.HTTP_URL_COLON) .append(serviceInstance.getPort()) .append(path); - if (uri.getRawQuery() != null && method.equals(HttpConstants.HTTP_GET)) { - urlBuild.append(HttpConstants.HTTP_URL_UNKNOWN) - .append(uri.getRawQuery()); + if (uri.getRawQuery() != null) { + urlBuild.append(HttpConstants.HTTP_URL_UNKNOWN).append(uri.getRawQuery()); } return urlBuild.toString(); }

['sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java']

{'.java': 1}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

huaweicloud/sermant/1013/1010

huaweicloud

sermant

https://github.com/huaweicloud/Sermant/issues/1010

https://github.com/huaweicloud/Sermant/pull/1013

https://github.com/huaweicloud/Sermant/pull/1013

fixes

【fix】fix the bug that springboot registry plugin can not process the url query params when method is post

### What happened? when the method is post, and it's url has the url query params, plugin will not handler it. The result for it will lose the query params ### How can we reproduce it (as minimally and precisely as possible)? N/A ### Anything else we need to know? _No response_ ### Sermant version <details> 0.8.0 </details> ### OS version <details> ```console # On Linux: $ cat /etc/os-release # paste output here $ uname -a # paste output here # On Windows: C:\\> wmic os get Caption, Version, BuildNumber, OSArchitecture # paste output here ``` </details>

b1dd072144a8bda8fd8a139041d9c0273b9d0656

6919115739eefd10ccae0252fbba47e040f7a05d

https://github.com/huaweicloud/sermant/compare/b1dd072144a8bda8fd8a139041d9c0273b9d0656...6919115739eefd10ccae0252fbba47e040f7a05d

diff --git a/sermant-plugins/sermant-loadbalancer/dubbo-loadbalancer-plugin/src/main/java/com/huaweicloud/loadbalancer/declarer/UrlDeclarer.java b/sermant-plugins/sermant-loadbalancer/dubbo-loadbalancer-plugin/src/main/java/com/huaweicloud/loadbalancer/declarer/UrlDeclarer.java index 20cb863a..6821721a 100644 --- a/sermant-plugins/sermant-loadbalancer/dubbo-loadbalancer-plugin/src/main/java/com/huaweicloud/loadbalancer/declarer/UrlDeclarer.java +++ b/sermant-plugins/sermant-loadbalancer/dubbo-loadbalancer-plugin/src/main/java/com/huaweicloud/loadbalancer/declarer/UrlDeclarer.java @@ -43,7 +43,8 @@ public class UrlDeclarer extends AbstractPluginDeclarer { @Override public InterceptDeclarer[] getInterceptDeclarers(ClassLoader classLoader) { return new InterceptDeclarer[]{ - InterceptDeclarer.build(MethodMatcher.nameEquals(METHOD_NAME), INTERCEPT_CLASS) + InterceptDeclarer.build(MethodMatcher.nameEquals(METHOD_NAME) + .and(MethodMatcher.paramTypesEqual("java.lang.String", "java.lang.String")), INTERCEPT_CLASS) }; } } diff --git a/sermant-plugins/sermant-loadbalancer/dubbo-loadbalancer-plugin/src/main/java/com/huaweicloud/loadbalancer/interceptor/UrlInterceptor.java b/sermant-plugins/sermant-loadbalancer/dubbo-loadbalancer-plugin/src/main/java/com/huaweicloud/loadbalancer/interceptor/UrlInterceptor.java index 327662ab..7b059949 100644 --- a/sermant-plugins/sermant-loadbalancer/dubbo-loadbalancer-plugin/src/main/java/com/huaweicloud/loadbalancer/interceptor/UrlInterceptor.java +++ b/sermant-plugins/sermant-loadbalancer/dubbo-loadbalancer-plugin/src/main/java/com/huaweicloud/loadbalancer/interceptor/UrlInterceptor.java @@ -67,10 +67,11 @@ public class UrlInterceptor extends AbstractInterceptor { @Override public ExecuteContext before(ExecuteContext context) { - LbContext.INSTANCE.setCurLoadbalancerType(LbContext.LOADBALANCER_DUBBO); Object[] arguments = context.getArguments(); if (arguments != null && arguments.length > 1 && DubboUrlParamsConstants.DUBBO_LOAD_BALANCER_KEY.equals(arguments[1])) { + LbContext.INSTANCE.setCurLoadbalancerType(LbContext.LOADBALANCER_DUBBO); + // 如果为empty，继续执行原方法，即使用宿主的负载均衡策略 // 如果不为empty，则使用返回的type并跳过原方法 checkRules(); diff --git a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java index 7dd73d7e..3efa99ef 100644 --- a/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java +++ b/sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java @@ -308,9 +308,8 @@ public class RequestInterceptorUtils { .append(HttpConstants.HTTP_URL_COLON) .append(serviceInstance.getPort()) .append(path); - if (uri.getRawQuery() != null && method.equals(HttpConstants.HTTP_GET)) { - urlBuild.append(HttpConstants.HTTP_URL_UNKNOWN) - .append(uri.getRawQuery()); + if (uri.getRawQuery() != null) { + urlBuild.append(HttpConstants.HTTP_URL_UNKNOWN).append(uri.getRawQuery()); } return urlBuild.toString(); }

['sermant-plugins/sermant-loadbalancer/dubbo-loadbalancer-plugin/src/main/java/com/huaweicloud/loadbalancer/interceptor/UrlInterceptor.java', 'sermant-plugins/sermant-springboot-registry/springboot-registry-plugin/src/main/java/com/huawei/discovery/utils/RequestInterceptorUtils.java', 'sermant-plugins/sermant-loadbalancer/dubbo-loadbalancer-plugin/src/main/java/com/huaweicloud/loadbalancer/declarer/UrlDeclarer.java']

{'.java': 3}

Java

{'Java': 5367471, 'Roff': 51750, 'Vue': 35403, 'Groovy': 9659, 'Shell': 6979, 'Python': 6856, 'TypeScript': 3199, 'FreeMarker': 3170, 'CSS': 2150, 'SCSS': 1577, 'Batchfile': 873, 'HTML': 344, 'JavaScript': 317, 'Dockerfile': 217}

Apache License 2.0

hxsecurity/dongtai-agent-java/158/153

hxsecurity

dongtai-agent-java

https://github.com/HXSecurity/DongTai-agent-java/issues/153

https://github.com/HXSecurity/DongTai-agent-java/pull/158

https://github.com/HXSecurity/DongTai-agent-java/pull/158#issuecomment-983420821

closes

When using resttemplate to customize the header, some fields will not be loaded, such as the host header.

### Preflight Checklist - [X] I agree to follow the [Code of Conduct](https://github.com/HXSecurity/DongTai/blob/main/.github/CODE_OF_CONDUCT.md) that this project adheres to. - [X] I have searched the [issue tracker](https://www.github.com/HXSecurity/DongTai/issues) for an issue that matches the one I want to file, without success. - [X] I am not looking for support or already pursued the available [support channels](https://github.com/HXSecurity/DongTai/issues/new/choose) without success. ### Version 1.1.2 ### Installation Type Official Docker Compose ### Service Name DongTai-agent-java ### Describe the details of the bug and the steps to reproduce it When using resttemplate to customize the header, some fields will not be loaded, such as the host header.In sun.net.www.protocol.http.httpurlconnection, allowrestrictedheaders is assigned in the static block and will be initialized only once. In the agent, httpurlconnection is loaded before the program, which leads to this problem. 使用RestTemplate自定义头的时候有些字段会加载不进来，比如说host头。因为在sun.net.www.protocol.http.HttpURLConnection中allowRestrictedHeaders是放在static块中赋值，只会初始化一次。而在agent中先于程序加载了HttpURLConnection，所以导致这个问题。 ### Additional Information _No response_ ### Logs _No response_

c11628f9d235e6e972d24f2657fab5ba3305e85f

4e143208c5377fc88d31e40892ded345be30d0c7

https://github.com/hxsecurity/dongtai-agent-java/compare/c11628f9d235e6e972d24f2657fab5ba3305e85f...4e143208c5377fc88d31e40892ded345be30d0c7

diff --git a/iast-agent/src/main/java/com/secnium/iast/agent/AgentLauncher.java b/iast-agent/src/main/java/com/secnium/iast/agent/AgentLauncher.java index 26ef6647..6f380206 100755 --- a/iast-agent/src/main/java/com/secnium/iast/agent/AgentLauncher.java +++ b/iast-agent/src/main/java/com/secnium/iast/agent/AgentLauncher.java @@ -24,6 +24,7 @@ public class AgentLauncher { * @param inst inst */ public static void premain(String args, Instrumentation inst) { + System.setProperty("sun.net.http.allowRestrictedHeaders","true"); LAUNCH_MODE = LAUNCH_MODE_AGENT; try { Agent.appendToolsPath();

['iast-agent/src/main/java/com/secnium/iast/agent/AgentLauncher.java']

{'.java': 1}

Java

{'Java': 1172876, 'Shell': 3769}

Apache License 2.0

hxsecurity/dongtai-agent-java/447/374

hxsecurity

dongtai-agent-java

https://github.com/HXSecurity/DongTai-agent-java/issues/374

https://github.com/HXSecurity/DongTai-agent-java/pull/447

https://github.com/HXSecurity/DongTai-agent-java/pull/447#issuecomment-1457515691

fixed

[Bug]: install成功后，原服务无法正常工作

### Preflight Checklist - [X] I agree to follow the [Code of Conduct](https://github.com/HXSecurity/DongTai/blob/main/.github/CODE_OF_CONDUCT.md) that this project adheres to. - [X] I have searched the [issue tracker](https://www.github.com/HXSecurity/DongTai/issues) for an issue that matches the one I want to file, without success. - [X] I am not looking for support or already pursued the available [support channels](https://github.com/HXSecurity/DongTai/issues/new/choose) without success. ### Version 1.4.0 ### Installation Type Official Docker Compose ### Service Name DongTai-agent-java ### Describe the details of the bug and the steps to reproduce it - docker run -d -p 8082:8080 --name springrce -it vulfocus/spring-core-rce-2022-03-29 这个镜像 - 用热部署的方法插入之后，服务器显示 500错误 `Request processing failed; nested exception is java.lang.NoClassDefFoundError: org/springframework/beans/factory/ListableBeanFactory` **（正常情况页面显示是OK）** ### Additional Information _No response_ ### Logs ```shell 02-Apr-2022 02:26:49.126 INFO [localhost-startStop-1] org.apache.catalina.core.ApplicationContext.log 2 Spring WebApplicationInitializers detected on classpath 02-Apr-2022 02:26:50.801 INFO [localhost-startStop-1] org.apache.catalina.core.ApplicationContext.log Initializing Spring embedded WebApplicationContext 02-Apr-2022 02:40:41.273 INFO [http-nio-8080-exec-1] org.apache.catalina.core.ApplicationContext.log Initializing Spring DispatcherServlet 'dispatcherServlet' 02-Apr-2022 02:40:41.444 SEVERE [http-nio-8080-exec-1] org.apache.catalina.core.ApplicationDispatcher.invoke Servlet.service() for servlet [dispatcherServlet] threw exception java.lang.NoClassDefFoundError: org/springframework/beans/factory/ListableBeanFactory at java.base/java.lang.Class.getDeclaredMethods0(Native Method) at java.base/java.lang.Class.privateGetDeclaredMethods(Class.java:3139) at java.base/java.lang.Class.getDeclaredMethod(Class.java:2430) at io.dongtai.iast.core.bytecode.enhance.plugin.spring.SpringApplicationImpl.loadApplicationContext(SpringApplicationImpl.java:41) at io.dongtai.iast.core.bytecode.enhance.plugin.spring.SpringApplicationImpl.getWebApplicationContext(SpringApplicationImpl.java:26) at io.dongtai.iast.core.handler.hookpoint.SpyDispatcherImpl.collectMethodPool(SpyDispatcherImpl.java:344) at org.springframework.web.servlet.FrameworkServlet.getWebApplicationContext(FrameworkServlet.java:806) at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942) at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:898) at javax.servlet.http.HttpServlet.service(HttpServlet.java:655) at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883) at javax.servlet.http.HttpServlet.service(HttpServlet.java:764) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:102) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:102) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:712) at org.apache.catalina.core.ApplicationDispatcher.processRequest(ApplicationDispatcher.java:462) at org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDispatcher.java:388) at org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispatcher.java:316) at org.springframework.boot.web.servlet.support.ErrorPageFilter.forwardToErrorPage(ErrorPageFilter.java:191) at org.springframework.boot.web.servlet.support.ErrorPageFilter.handleException(ErrorPageFilter.java:176) at org.springframework.boot.web.servlet.support.ErrorPageFilter.doFilter(ErrorPageFilter.java:143) at org.springframework.boot.web.servlet.support.ErrorPageFilter.access$000(ErrorPageFilter.java:64) at org.springframework.boot.web.servlet.support.ErrorPageFilter$1.doFilterInternal(ErrorPageFilter.java:101) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) at org.springframework.boot.web.servlet.support.ErrorPageFilter.doFilter(ErrorPageFilter.java:119) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:197) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:97) at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:543) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:135) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:81) at org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:698) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:367) at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:639) at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65) at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:881) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1647) at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191) at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.base/java.lang.Thread.run(Thread.java:844) 02-Apr-2022 02:40:41.452 SEVERE [http-nio-8080-exec-1] org.apache.catalina.core.StandardWrapperValve.invoke Servlet.service() for servlet [dispatcherServlet] in context with path [] threw exception [Request processing failed; nested exception is java.lang.NoClassDefFoundError: org/springframework/beans/factory/ListableBeanFactory] with root cause java.lang.NoClassDefFoundError: org/springframework/beans/factory/ListableBeanFactory at java.base/java.lang.Class.getDeclaredMethods0(Native Method) at java.base/java.lang.Class.privateGetDeclaredMethods(Class.java:3139) at java.base/java.lang.Class.getDeclaredMethod(Class.java:2430) at io.dongtai.iast.core.bytecode.enhance.plugin.spring.SpringApplicationImpl.loadApplicationContext(SpringApplicationImpl.java:41) at io.dongtai.iast.core.bytecode.enhance.plugin.spring.SpringApplicationImpl.getWebApplicationContext(SpringApplicationImpl.java:26) at io.dongtai.iast.core.handler.hookpoint.SpyDispatcherImpl.collectMethodPool(SpyDispatcherImpl.java:344) at org.springframework.web.servlet.FrameworkServlet.getWebApplicationContext(FrameworkServlet.java:806) at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942) at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:898) at javax.servlet.http.HttpServlet.service(HttpServlet.java:655) at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883) at javax.servlet.http.HttpServlet.service(HttpServlet.java:764) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:102) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:102) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:712) at org.apache.catalina.core.ApplicationDispatcher.processRequest(ApplicationDispatcher.java:462) at org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDispatcher.java:388) at org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispatcher.java:316) at org.springframework.boot.web.servlet.support.ErrorPageFilter.forwardToErrorPage(ErrorPageFilter.java:191) at org.springframework.boot.web.servlet.support.ErrorPageFilter.handleException(ErrorPageFilter.java:176) at org.springframework.boot.web.servlet.support.ErrorPageFilter.doFilter(ErrorPageFilter.java:143) at org.springframework.boot.web.servlet.support.ErrorPageFilter.access$000(ErrorPageFilter.java:64) at org.springframework.boot.web.servlet.support.ErrorPageFilter$1.doFilterInternal(ErrorPageFilter.java:101) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) at org.springframework.boot.web.servlet.support.ErrorPageFilter.doFilter(ErrorPageFilter.java:119) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:197) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:97) at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:543) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:135) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:81) at org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:698) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:367) at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:639) at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65) at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:881) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1647) at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191) at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.base/java.lang.Thread.run(Thread.java:844) ```

9b326f53b76bd46229045cf5a4e5adca658ed38b

af37a3604be994928dcfdd98ec687bcc86bf89a8

https://github.com/hxsecurity/dongtai-agent-java/compare/9b326f53b76bd46229045cf5a4e5adca658ed38b...af37a3604be994928dcfdd98ec687bcc86bf89a8

diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/spring/SpringApplicationImpl.java b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/spring/SpringApplicationImpl.java index 682d9329..d1a91db6 100644 --- a/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/spring/SpringApplicationImpl.java +++ b/dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/spring/SpringApplicationImpl.java @@ -37,6 +37,12 @@ public class SpringApplicationImpl { getAPI = proxyClass.getDeclaredMethod("getAPI", Object.class); } catch (NoSuchMethodException e) { DongTaiLog.error("SpringApplicationImpl.loadApplicationContext failed", e); + } catch (NoClassDefFoundError e) { + // spring mvc has no class org/springframework/beans/factory/ListableBeanFactory + if (!e.getMessage().equals(" org/springframework/beans/factory/ListableBeanFactory".substring(1))) { + DongTaiLog.warn("SpringApplicationImpl.loadApplicationContext failed", e); + } + isSend = true; } finally { iastClassLoader = null; }

['dongtai-core/src/main/java/io/dongtai/iast/core/bytecode/enhance/plugin/spring/SpringApplicationImpl.java']

{'.java': 1}

Java

{'Java': 1172876, 'Shell': 3769}

Apache License 2.0

hxsecurity/dongtai-agent-java/534/533

hxsecurity

dongtai-agent-java

https://github.com/HXSecurity/DongTai-agent-java/issues/533

https://github.com/HXSecurity/DongTai-agent-java/pull/534

https://github.com/HXSecurity/DongTai-agent-java/pull/534#issuecomment-1586758946

fix

[Bug]: fastjson已经是1.2.83版本了，洞态显示请求头有反序列化漏洞

### Preflight Checklist - [X] I agree to follow the [Code of Conduct](https://github.com/HXSecurity/DongTai/blob/main/.github/CODE_OF_CONDUCT.md) that this project adheres to. - [X] I have searched the [issue tracker](https://www.github.com/HXSecurity/DongTai/issues) for an issue that matches the one I want to file, without success. - [X] I am not looking for support or already pursued the available [support channels](https://github.com/HXSecurity/DongTai/issues/new/choose) without success. ### Version 1.11.0 ### Installation Type Official SaaS Service ### Service Name DongTai-agent-java ### Describe the details of the bug and the steps to reproduce it  污点流程图  危险方法显示是fastjson  但是fastjson目前已经是最新版本 1.2.83 ,这是否是误报？不是误报的话又该怎么验证 ### Additional Information _No response_ ### Logs _No response_

1142b3229194466dd0a69d2144e5d539ecb48b12

d327a1db4478cd5643a18a5c11d6f49267d3e80d

https://github.com/hxsecurity/dongtai-agent-java/compare/1142b3229194466dd0a69d2144e5d539ecb48b12...d327a1db4478cd5643a18a5c11d6f49267d3e80d

diff --git a/dongtai-agent/src/main/java/io/dongtai/iast/agent/middlewarerecognition/dubbo/DubboService.java b/dongtai-agent/src/main/java/io/dongtai/iast/agent/middlewarerecognition/dubbo/DubboService.java index 0007b4e1..c46f4ee3 100644 --- a/dongtai-agent/src/main/java/io/dongtai/iast/agent/middlewarerecognition/dubbo/DubboService.java +++ b/dongtai-agent/src/main/java/io/dongtai/iast/agent/middlewarerecognition/dubbo/DubboService.java @@ -13,7 +13,7 @@ public class DubboService implements IServer { } catch (Throwable ignored) { } try { - loader.loadClass("com.alibaba.dubbo.monitor.support.MonitorFilter"); + loader.loadClass(" com.alibaba.dubbo.monitor.support.MonitorFilter".substring(1)); return true; } catch (Throwable ignored) { } diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/vulscan/dynamic/FastjsonCheck.java b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/vulscan/dynamic/FastjsonCheck.java index 73da47fe..31229db6 100644 --- a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/vulscan/dynamic/FastjsonCheck.java +++ b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/vulscan/dynamic/FastjsonCheck.java @@ -12,9 +12,9 @@ import java.util.List; public class FastjsonCheck implements SinkSafeChecker { public static List<String> FASTJSON_SINK_METHODS = Arrays.asList( - "com.alibaba.fastjson.JSON.parseObject(java.lang.String)", - "com.alibaba.fastjson.JSON.parse(java.lang.String,int)", - "com.alibaba.fastjson.JSON.parse(java.lang.String)" + " com.alibaba.fastjson.JSON.parseObject(java.lang.String)".substring(1), + " com.alibaba.fastjson.JSON.parse(java.lang.String,int)".substring(1), + " com.alibaba.fastjson.JSON.parse(java.lang.String)".substring(1) ); private String policySignature; @@ -36,9 +36,9 @@ public class FastjsonCheck implements SinkSafeChecker { try { Class<?> cls; if (JSON_CLASS_LOADER == null) { - cls = Class.forName("com.alibaba.fastjson.JSON"); + cls = Class.forName(" com.alibaba.fastjson.JSON".substring(1)); } else { - cls = Class.forName("com.alibaba.fastjson.JSON", false, JSON_CLASS_LOADER); + cls = Class.forName(" com.alibaba.fastjson.JSON".substring(1), false, JSON_CLASS_LOADER); } Field f = cls.getDeclaredField("VERSION"); Class<?> t = f.getType(); @@ -61,9 +61,9 @@ public class FastjsonCheck implements SinkSafeChecker { // https://github.com/alibaba/fastjson/wiki/fastjson_safemode Class<?> cfgClass; if (PARSE_CONFIG_CLASS_LOADER == null) { - cfgClass = Class.forName("com.alibaba.fastjson.parser.ParserConfig"); + cfgClass = Class.forName(" com.alibaba.fastjson.parser.ParserConfig".substring(1)); } else { - cfgClass = Class.forName("com.alibaba.fastjson.parser.ParserConfig", false, PARSE_CONFIG_CLASS_LOADER); + cfgClass = Class.forName(" com.alibaba.fastjson.parser.ParserConfig".substring(1), false, PARSE_CONFIG_CLASS_LOADER); } Object cfg = cfgClass.getMethod("getGlobalInstance").invoke(null); Object isSafeMode = cfg.getClass().getMethod("isSafeMode").invoke(cfg);

['dongtai-agent/src/main/java/io/dongtai/iast/agent/middlewarerecognition/dubbo/DubboService.java', 'dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/vulscan/dynamic/FastjsonCheck.java']

{'.java': 2}

Java

{'Java': 1172876, 'Shell': 3769}

Apache License 2.0

hxsecurity/dongtai-agent-java/542/538

hxsecurity

dongtai-agent-java

https://github.com/HXSecurity/DongTai-agent-java/issues/538

https://github.com/HXSecurity/DongTai-agent-java/pull/542

https://github.com/HXSecurity/DongTai-agent-java/pull/542

fix

[Bug]: POST出现服务器端请求伪造漏洞,位置:HEADER

### Preflight Checklist - [X] I agree to follow the [Code of Conduct](https://github.com/HXSecurity/DongTai/blob/main/.github/CODE_OF_CONDUCT.md) that this project adheres to. - [X] I have searched the [issue tracker](https://www.github.com/HXSecurity/DongTai/issues) for an issue that matches the one I want to file, without success. - [X] I am not looking for support or already pursued the available [support channels](https://github.com/HXSecurity/DongTai/issues/new/choose) without success. ### Version 1.12.0 ### Installation Type Official Kubernetes ### Service Name DongTai-Web ### Describe the details of the bug and the steps to reproduce it  根据调用链显示x-forwarded-for参数存在ssrf的注入点，我将洞态上的请求复制到burp上重新发从，发现将x-forwarded-for这个参数删除之后仍然可以得到响应结果，这个是不是误报？   ### Additional Information _No response_ ### Logs _No response_

87dd311b4a33c283b66ff9345dbd1152146578ed

e987bfee2fd367ab6c246acbb81050a4dc08203d

https://github.com/hxsecurity/dongtai-agent-java/compare/87dd311b4a33c283b66ff9345dbd1152146578ed...e987bfee2fd367ab6c246acbb81050a4dc08203d

diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintCommand.java b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintCommand.java index a269fb53..f131b262 100644 --- a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintCommand.java +++ b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintCommand.java @@ -13,6 +13,7 @@ public enum TaintCommand { REMOVE, REPLACE, CONCAT, + OVERWRITE, TRIM, TRIM_RIGHT, TRIM_LEFT, diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintCommandRunner.java b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintCommandRunner.java index 97b5dd20..ae5c85e5 100644 --- a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintCommandRunner.java +++ b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintCommandRunner.java @@ -133,6 +133,8 @@ public class TaintCommandRunner { case CONCAT: this.builder.concat(tr, target, oldTaintRanges, source, srcTaintRanges, params); break; + case OVERWRITE: + this.builder.overwrite(tr, oldTaintRanges, source, srcTaintRanges, p1, this.paramsCount); case TRIM: case TRIM_LEFT: case TRIM_RIGHT: diff --git a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintRangesBuilder.java b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintRangesBuilder.java index 6a6be60e..f78d114f 100644 --- a/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintRangesBuilder.java +++ b/dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintRangesBuilder.java @@ -144,6 +144,16 @@ public class TaintRangesBuilder { taintRanges.merge(); } + public void overwrite(TaintRanges taintRanges, TaintRanges oldTagRanges, Object source, TaintRanges srcTagRanges, int p1, int argC) { + if (argC == 1) { + int length = getLength(source); + srcTagRanges.shift(p1); + oldTagRanges.clear(p1, length + p1); + taintRanges.addAll(oldTagRanges); + taintRanges.addAll(srcTagRanges); + } + } + public void trim(TaintCommand command, TaintRanges taintRanges, Object source, TaintRanges srcTaintRanges, int argC) { if (argC > 0) { return;

['dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintCommandRunner.java', 'dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintCommand.java', 'dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/models/taint/range/TaintRangesBuilder.java']

{'.java': 3}

Java

{'Java': 1172876, 'Shell': 3769}

Apache License 2.0

hxsecurity/dongtai-agent-java/201/202

hxsecurity

dongtai-agent-java

https://github.com/HXSecurity/DongTai-agent-java/issues/202

https://github.com/HXSecurity/DongTai-agent-java/pull/201

https://github.com/HXSecurity/DongTai-agent-java/pull/201

closes

Agent动态attach后卸载存在bug

### Preflight Checklist - [X] I agree to follow the [Code of Conduct](https://github.com/HXSecurity/DongTai/blob/main/.github/CODE_OF_CONDUCT.md) that this project adheres to. - [X] I have searched the [issue tracker](https://www.github.com/HXSecurity/DongTai/issues) for an issue that matches the one I want to file, without success. - [X] I am not looking for support or already pursued the available [support channels](https://github.com/HXSecurity/DongTai/issues/new/choose) without success. ### Version 1.1.4 ### Installation Type Other (specify below) ### Service Name DongTai-agent-java ### Describe the details of the bug and the steps to reproduce it 1.不涉及 2.不涉及 3.执行卸载时AttachLauncher 传入的是“token=uninstall” ，而agentmain中判断传入字符是否等于“uninstall”。前后不一致导致发起热卸载操作失败 ### Additional Information _No response_ ### Logs _No response_

72d05912ae91060b2a50489abd32120f53f8d045

c13466d162ffb4430a4319c8822f7ed1d45bfbf5

https://github.com/hxsecurity/dongtai-agent-java/compare/72d05912ae91060b2a50489abd32120f53f8d045...c13466d162ffb4430a4319c8822f7ed1d45bfbf5

diff --git a/iast-agent/src/main/java/com/secnium/iast/agent/AttachLauncher.java b/iast-agent/src/main/java/com/secnium/iast/agent/AttachLauncher.java index ab373c86..fe861bc1 100644 --- a/iast-agent/src/main/java/com/secnium/iast/agent/AttachLauncher.java +++ b/iast-agent/src/main/java/com/secnium/iast/agent/AttachLauncher.java @@ -34,7 +34,7 @@ public class AttachLauncher { } } - vmObj.loadAgent(AGENT_PATH, "token=" + args); + vmObj.loadAgent(AGENT_PATH, args); LogUtils.info("attach to process " + pid + " success."); } finally { if (null != vmObj) {

['iast-agent/src/main/java/com/secnium/iast/agent/AttachLauncher.java']

{'.java': 1}

Java

{'Java': 1172876, 'Shell': 3769}

Apache License 2.0

hxsecurity/dongtai-agent-java/406/403

hxsecurity

dongtai-agent-java

https://github.com/HXSecurity/DongTai-agent-java/issues/403

https://github.com/HXSecurity/DongTai-agent-java/pull/406

https://github.com/HXSecurity/DongTai-agent-java/pull/406

close

[Bug]: agent在wndows下运行时，无法注册，报错

### Preflight Checklist - [X] I agree to follow the [Code of Conduct](https://github.com/HXSecurity/DongTai/blob/main/.github/CODE_OF_CONDUCT.md) that this project adheres to. - [X] I have searched the [issue tracker](https://www.github.com/HXSecurity/DongTai/issues) for an issue that matches the one I want to file, without success. - [X] I am not looking for support or already pursued the available [support channels](https://github.com/HXSecurity/DongTai/issues/new/choose) without success. ### Version latest ### Installation Type Official Kubernetes ### Service Name DongTai-Web ### Describe the details of the bug and the steps to reproduce it 下载agent后在windows下运行（运行命令` java -javaagent:dongtai-agent.jar -jar xxx.jar`），报错注册失败： 2022-11-03 09:00:11 [io.dongtai.iast.agent] [ERROR] Register msg: {"status": 202, "msg": "\\u63a2\\u9488\\u6ce8\\u518c\\u5931\\u8d25"} ### Additional Information 查看服务端日志，疑似编码问题。 相关日志： ERROR 2022-11-03 10:28:09,614 [agent_register.post:298] 探针注册失败，原因：'utf-8' codec can't decode byte 0xbb in position 480: invalid start byte Traceback (most recent call last): File "/opt/dongtai/./dongtai_protocol/views/agent_register.py", line 272, in post self.register_server( File "/opt/dongtai/./dongtai_protocol/views/agent_register.py", line 122, in register_server env = base64.b64decode(server_env).decode('utf-8') UnicodeDecodeError: 'utf-8' codec can't decode byte 0xbb in position 480: invalid start byte [pid: 25|app: 0|req: 1/5] 10.42.178.223 () {42 vars in 643 bytes} [Thu Nov 3 10:28:08 2022] POST /api/v1/agent/register => generated 62 ### Logs ```shell ERROR 2022-11-03 10:28:09,614 [agent_register.post:298] 探针注册失败，原因：'utf-8' codec can't decode byte 0xbb in position 480: invalid start byte Traceback (most recent call last): File "/opt/dongtai/./dongtai_protocol/views/agent_register.py", line 272, in post self.register_server( File "/opt/dongtai/./dongtai_protocol/views/agent_register.py", line 122, in register_server env = base64.b64decode(server_env).decode('utf-8') UnicodeDecodeError: 'utf-8' codec can't decode byte 0xbb in position 480: invalid start byte [pid: 25|app: 0|req: 1/5] 10.42.178.223 () {42 vars in 643 bytes} [Thu Nov 3 10:28:08 2022] POST /api/v1/agent/register => generated 62 ```

fb3940975dd33fa7b84645fe37f02d9dad352d61

60941c8700ab5e729826553b5c2d7b940eb88736

https://github.com/hxsecurity/dongtai-agent-java/compare/fb3940975dd33fa7b84645fe37f02d9dad352d61...60941c8700ab5e729826553b5c2d7b940eb88736

diff --git a/dongtai-agent/src/main/java/io/dongtai/iast/agent/report/AgentRegisterReport.java b/dongtai-agent/src/main/java/io/dongtai/iast/agent/report/AgentRegisterReport.java index ce285d2b..6b887954 100644 --- a/dongtai-agent/src/main/java/io/dongtai/iast/agent/report/AgentRegisterReport.java +++ b/dongtai-agent/src/main/java/io/dongtai/iast/agent/report/AgentRegisterReport.java @@ -13,6 +13,7 @@ import org.json.JSONArray; import org.json.JSONObject; import java.net.*; +import java.nio.charset.Charset; import java.util.Enumeration; /** @@ -48,8 +49,9 @@ public class AgentRegisterReport { object.put("hostname", AgentRegisterReport.getInternalHostName()); object.put("language", AgentConstant.LANGUAGE); object.put("network", readIpInfo()); - object.put("serverEnv", - Base64Encoder.encodeBase64String(System.getProperties().toString().getBytes()).replaceAll("\\n", "")); + object.put("serverEnv", Base64Encoder + .encodeBase64String(System.getProperties().toString().getBytes(Charset.forName("UTF-8"))) + .replaceAll("\\n", "")); object.put("containerName", null == server ? "" : server.getName()); object.put("containerVersion", null == server ? "" : server.getVersion()); object.put("serverPath", ServerDetect.getWebServerPath()); @@ -195,12 +197,12 @@ public class AgentRegisterReport { JSONObject jsonObject = new JSONObject(); String displayName = networkInterface.getDisplayName(); String hostAddress = inetAddress.getHostAddress(); - jsonObject.put("name",displayName); - jsonObject.put("ip",hostAddress); - if (displayName.startsWith("en")){ - jsonObject.put("isAddress","1"); - }else { - jsonObject.put("isAddress","0"); + jsonObject.put("name", displayName); + jsonObject.put("ip", hostAddress); + if (displayName.startsWith("en")) { + jsonObject.put("isAddress", "1"); + } else { + jsonObject.put("isAddress", "0"); } network.put(jsonObject); } @@ -211,7 +213,7 @@ public class AgentRegisterReport { } } - public void register(){ + public void register() { try { if (server == null) { System.out.println("[io.dongtai.iast.agent] Can't Recognize Web Service");

['dongtai-agent/src/main/java/io/dongtai/iast/agent/report/AgentRegisterReport.java']

{'.java': 1}

Java

{'Java': 1172876, 'Shell': 3769}

Apache License 2.0

androidx/media/141/131

androidx

media

https://github.com/androidx/media/issues/131

https://github.com/androidx/media/pull/141

https://github.com/androidx/media/pull/141

fixes

API <=26: MediaNotification will add a Badge to the App Icon

New APIs will never show a badge for a MediaStyle notification. It seems that for older API versions it needs to be deactivated manually. ### Media3 Version 1.0.0-beta02

26c8478de667180cb8137a20ae88df285c0bb046

22efef2dea3789c19a5660c57a0b5e31b96dace2

https://github.com/androidx/media/compare/26c8478de667180cb8137a20ae88df285c0bb046...22efef2dea3789c19a5660c57a0b5e31b96dace2

diff --git a/libraries/session/src/main/java/androidx/media3/session/DefaultMediaNotificationProvider.java b/libraries/session/src/main/java/androidx/media3/session/DefaultMediaNotificationProvider.java index 4b588cfda7..23bbb9f85d 100644 --- a/libraries/session/src/main/java/androidx/media3/session/DefaultMediaNotificationProvider.java +++ b/libraries/session/src/main/java/androidx/media3/session/DefaultMediaNotificationProvider.java @@ -508,6 +508,9 @@ public class DefaultMediaNotificationProvider implements MediaNotification.Provi channelId, context.getString(channelNameResourceId), NotificationManager.IMPORTANCE_LOW); + if (Util.SDK_INT == 26 || Util.SDK_INT == 27) { + channel.setShowBadge(false); + } notificationManager.createNotificationChannel(channel); }

['libraries/session/src/main/java/androidx/media3/session/DefaultMediaNotificationProvider.java']

{'.java': 1}

Java

{'Java': 20334016, 'C++': 112467, 'GLSL': 48492, 'AIDL': 28951, 'Makefile': 11496, 'Shell': 8440, 'CMake': 3728}

Apache License 2.0

exercism/java/1646/1645

exercism

java

https://github.com/exercism/java/issues/1645

https://github.com/exercism/java/pull/1646

https://github.com/exercism/java/pull/1646

fixes

DnD Character Track build issues

Hey everyone, I am currently going through the Java track and I just downloaded the exercise. This exercise gives me a lot of errors but that is without me implementing anything. It looks like the solution .java file has a lot of **missing methods** and that is uncommon for the track. Here is the error log. ``` > Executing task: gradle test < > Task :compileTestJava FAILED C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:118: error: cannot find symbol assertTrue(character.getDexterity() > 2 && character.getDexterity() < 19); ^ symbol: method getDexterity() location: variable character of type DnDCharacter C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:118: error: cannot find symbol assertTrue(character.getDexterity() > 2 && character.getDexterity() < 19); ^ symbol: method getDexterity() location: variable character of type DnDCharacter C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:119: error: cannot find symbol assertTrue(character.getConstitution() > 2 && character.getConstitution() < 19); ^ symbol: method getConstitution() location: variable character of type DnDCharacter C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:119: error: cannot find symbol assertTrue(character.getConstitution() > 2 && character.getConstitution() < 19); ^ symbol: method getConstitution() location: variable character of type DnDCharacter C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:120: error: cannot find symbol assertTrue(character.getIntelligence() > 2 && character.getIntelligence() < 19); ^ symbol: method getIntelligence() location: variable character of type DnDCharacter C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:120: error: cannot find symbol assertTrue(character.getIntelligence() > 2 && character.getIntelligence() < 19); ^ symbol: method getIntelligence() location: variable character of type DnDCharacter C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:121: error: cannot find symbol assertTrue(character.getWisdom() > 2 && character.getWisdom() < 19); ^ symbol: method getWisdom() location: variable character of type DnDCharacter C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:121: error: cannot find symbol assertTrue(character.getWisdom() > 2 && character.getWisdom() < 19); ^ symbol: method getWisdom() location: variable character of type DnDCharacter C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:122: error: cannot find symbol assertTrue(character.getCharisma() > 2 && character.getCharisma() < 19); ^ symbol: method getCharisma() location: variable character of type DnDCharacter C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:122: error: cannot find symbol assertTrue(character.getCharisma() > 2 && character.getCharisma() < 19); ^ symbol: method getCharisma() location: variable character of type DnDCharacter C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:123: error: cannot find symbol assertEquals(character.getHitpoints(), ^ symbol: method getHitpoints() location: variable character of type DnDCharacter C:\\Users\\Mayur\\Exercism\\java\\dnd-character\\src\\test\\java\\DnDCharacterTest.java:124: error: cannot find symbol 10 + character.modifier(character.getConstitution())); ^ symbol: method getConstitution() location: variable character of type DnDCharacter 12 errors FAILURE: Build failed with an exception. * What went wrong: Execution failed for task ':compileTestJava'. > Compilation failed; see the compiler error output for details. * Try: Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights. * Get more help at https://help.gradle.org BUILD FAILED in 1s 2 actionable tasks: 1 executed, 1 up-to-date The terminal process terminated with exit code: 1 ```

83e8cb9a5c4d10e9df7642a615a55e3ecd8bdaea

8e7e277fb9560be7604e69058831a96ffeb3dbc4

https://github.com/exercism/java/compare/83e8cb9a5c4d10e9df7642a615a55e3ecd8bdaea...8e7e277fb9560be7604e69058831a96ffeb3dbc4

diff --git a/exercises/dnd-character/src/main/java/DnDCharacter.java b/exercises/dnd-character/src/main/java/DnDCharacter.java index 1bc48c69..470d3327 100644 --- a/exercises/dnd-character/src/main/java/DnDCharacter.java +++ b/exercises/dnd-character/src/main/java/DnDCharacter.java @@ -8,4 +8,32 @@ class DnDCharacter { throw new UnsupportedOperationException("Delete this statement and write your own implementation."); } + int getStrength() { + throw new UnsupportedOperationException("Delete this statement and write your own implementation."); + } + + int getDexterity() { + throw new UnsupportedOperationException("Delete this statement and write your own implementation."); + } + + int getConstitution() { + throw new UnsupportedOperationException("Delete this statement and write your own implementation."); + } + + int getIntelligence() { + throw new UnsupportedOperationException("Delete this statement and write your own implementation."); + } + + int getWisdom() { + throw new UnsupportedOperationException("Delete this statement and write your own implementation."); + } + + int getCharisma() { + throw new UnsupportedOperationException("Delete this statement and write your own implementation."); + } + + int getHitpoints() { + throw new UnsupportedOperationException("Delete this statement and write your own implementation."); + } + }

['exercises/dnd-character/src/main/java/DnDCharacter.java']

{'.java': 1}

Java

{'Java': 1063911, 'Shell': 29846}

MIT License

exercism/java/422/416

exercism

java

https://github.com/exercism/java/issues/416

https://github.com/exercism/java/pull/422

https://github.com/exercism/java/pull/422

closes

book-store: Example implementation is incorrect

The description of the exercise describes a a scenario that is also a [test case](https://github.com/exercism/xjava/blob/master/exercises/book-store/src/test/java/BookstoreTest.java#L70-L74) where two groups of 4 are cheaper than two groups of 5 and 3. The example implementation always starts with the biggest possible group and does not try all other combinations to really find the cheapest price. The problem why the tests don't find this is the incorrect use of the delta parameter in the assert method. ```java List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,3,4,5)); Bookstore bookstore = new Bookstore(books); assertEquals(51.20,bookstore.calculateTotalCost(),2); ``` While `calculateTotalCost()` actually returns the wrong price of `51.6` because of the `delta=2` even `53.2` or `49.2` would be considered equal. > delta - the maximum delta between expected and actual for which both numbers are still considered equal. Maybe `delta` should better be something like `0.001` so people really implement the correct algorithm.

165511f4d6d8bceb1e7ac9c16f0e2a9b10d2758b

0e0d28882bd889642f99b68550d93ad684e6bed5

https://github.com/exercism/java/compare/165511f4d6d8bceb1e7ac9c16f0e2a9b10d2758b...0e0d28882bd889642f99b68550d93ad684e6bed5

diff --git a/exercises/book-store/src/example/java/Bookstore.java b/exercises/book-store/src/example/java/Bookstore.java index 54908ed6..48b27e7f 100644 --- a/exercises/book-store/src/example/java/Bookstore.java +++ b/exercises/book-store/src/example/java/Bookstore.java @@ -1,61 +1,57 @@ -import java.awt.print.Printable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -public class Bookstore{ +class Bookstore { - private static int BOOK_PRICE = 8, MAX_GROUP_SIZE = 5; - private List<Integer> books; - private static double[] DISCOUNT_TIERS = {0,5,10,20,25}; + private static final int BOOK_PRICE = 8, MAX_GROUP_SIZE = 5; - public Bookstore (List<Integer> books){ - this.books = books; - } - + private static double[] DISCOUNT_TIERS = {0, 5, 10, 20, 25}; + private List<Integer> books; + Bookstore(List<Integer> books) { + this.books = books; + } - public double calculateTotalCost(){ - return calculateTotalCost(this.books,0); - } + double calculateTotalCost() { + return calculateTotalCost(this.books, 0); + } - private double calculateTotalCost (List<Integer> books,double priceSoFar ){ - double minPrice = Double.MAX_VALUE; + private double calculateTotalCost(List<Integer> books, double priceSoFar) { + if (books.size() == 0) { + return priceSoFar; + } + List<Integer> availableBookNumbers = books.stream() + .distinct() + .collect(Collectors.toList()); - if(books.size() == 0){ - return priceSoFar; - } + double minPrice = Double.MAX_VALUE; - List<Integer> groups = (ArrayList<Integer>) books.stream().distinct().collect(Collectors.toList()); + for (int i = 0; i < availableBookNumbers.size(); i++) { + List<Integer> newGroupBooks = new ArrayList<>(availableBookNumbers.subList(0, i + 1)); + List<Integer> remainingBooks = new ArrayList<>(books); - - double price = 0; + for (final Integer newGroupBook : newGroupBooks) { + //noinspection UseBulkOperation - we want to remove _one_ of each book number, not _all_ of each book number. + remainingBooks.remove(newGroupBook); + } - for(int i = 0;i<groups.size();i++){ - books.remove(groups.get(i)); - } - - try { - price = calculateTotalCost(books,priceSoFar + costPerGroup(groups.size())); - } catch (Exception e) { - e.printStackTrace(); - } - - minPrice = Math.min(minPrice, price); - return minPrice; + double price = calculateTotalCost(remainingBooks, priceSoFar + costOfGroupSize(newGroupBooks.size())); + minPrice = Math.min(minPrice, price); + } - } + return minPrice; + } - private double costPerGroup(int groupSize) throws Exception{ - if (groupSize < 1 || groupSize > MAX_GROUP_SIZE){ - throw new Exception("Invalid group size : " + groupSize ); - } - return BOOK_PRICE * groupSize * (100 - DISCOUNT_TIERS[groupSize-1])/100; - } + private double costOfGroupSize(int groupSize) { + if (groupSize < 1 || groupSize > MAX_GROUP_SIZE) { + throw new IllegalStateException("Invalid group size : " + groupSize); + } + return BOOK_PRICE * groupSize * (100 - DISCOUNT_TIERS[groupSize - 1]) / 100; + } } diff --git a/exercises/book-store/src/test/java/BookstoreTest.java b/exercises/book-store/src/test/java/BookstoreTest.java index 8552d393..89389648 100644 --- a/exercises/book-store/src/test/java/BookstoreTest.java +++ b/exercises/book-store/src/test/java/BookstoreTest.java @@ -1,5 +1,6 @@ import static org.junit.Assert.assertEquals; +import java.util.Collections; import java.util.List; import java.util.ArrayList; import java.util.Arrays; @@ -7,112 +8,112 @@ import java.util.Arrays; import org.junit.Ignore; import org.junit.Test; -public class BookstoreTest{ - - @Test - public void onlyASingleBook(){ - List<Integer> books = new ArrayList<>(Arrays.asList(1)); - Bookstore bookstore = new Bookstore(books); - assertEquals(8,bookstore.calculateTotalCost(),2); - } - - @Ignore - @Test - public void twoOfSameBook(){ - List<Integer> books = new ArrayList<>(Arrays.asList(1,1)); - Bookstore bookstore = new Bookstore(books); - assertEquals(16,bookstore.calculateTotalCost(),2); - } - - @Ignore - @Test - public void emptyBasket(){ - List<Integer> books = new ArrayList<>(); - Bookstore bookstore = new Bookstore(books); - assertEquals(0,bookstore.calculateTotalCost(),2); - } - - @Ignore - @Test - public void twoDifferentBooks(){ - List<Integer> books = new ArrayList<>(Arrays.asList(1,2)); - Bookstore bookstore = new Bookstore(books); - assertEquals(15.20,bookstore.calculateTotalCost(),2); - } - - @Ignore - @Test - public void threeDifferentBooks(){ - List<Integer> books = new ArrayList<>(Arrays.asList(1,2,3)); - Bookstore bookstore = new Bookstore(books); - assertEquals(21.6,bookstore.calculateTotalCost(),2); - } - - @Ignore - @Test - public void fourDifferentBooks(){ - ArrayList<Integer> books = new ArrayList<>(Arrays.asList(1,2,3,4)); - Bookstore bookstore = new Bookstore(books); - assertEquals(25.6,bookstore.calculateTotalCost(),2); - - } - - @Ignore - @Test - public void fiveDifferentBooks(){ - ArrayList<Integer> books = new ArrayList<>(Arrays.asList(1,2,3,4,5)); - Bookstore bookstore = new Bookstore(books); - assertEquals(30,bookstore.calculateTotalCost(),2); - } - - @Ignore - @Test - public void twoGroupsOfFourIsCheaperThanGroupOfFivePlusGroupOfThree(){ - List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,3,4,5)); - Bookstore bookstore = new Bookstore(books); - assertEquals(51.20,bookstore.calculateTotalCost(),2); - } - - @Ignore - @Test - public void groupOfFourPlusGroupOfTwoIsCheaperThanTwoGroupsOfThree(){ - List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,4)); - Bookstore bookstore = new Bookstore(books); - assertEquals(40.8,bookstore.calculateTotalCost(),2); - } - - @Ignore - @Test - public void twoEachOfFirst4BooksAnd1CopyEachOfRest(){ - Integer[] p = {1,1,2,2,3,3,4,4,5}; - List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,3,4,4,5)); - Bookstore bookstore = new Bookstore(books); - assertEquals(55.60,bookstore.calculateTotalCost(),2); - } - - @Ignore - @Test - public void twoCopiesOfEachBook(){ - List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,3,4,4,5,5)); - Bookstore bookstore = new Bookstore(books); - assertEquals(60.00,bookstore.calculateTotalCost(),2); - } - - @Ignore - @Test - public void threeCopiesOfFirstBookAnd2EachOfRemaining(){ - List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,3,4,4,5,5,1)); - Bookstore bookstore = new Bookstore(books); - assertEquals(68.00,bookstore.calculateTotalCost(),2); - } - - @Ignore - @Test - public void threeEachOFirst2BooksAnd2EachOfRemainingBooks(){ - List<Integer> books = new ArrayList<>(Arrays.asList(1,1,2,2,3,3,4,4,5,5,1,2)); - Bookstore bookstore = new Bookstore(books); - assertEquals(75.20,bookstore.calculateTotalCost(),2); - } +public class BookstoreTest { + + // This is sufficient accuracy since we're handling currency values, which should be equal to within 2 decimal places. + private static final double EQUALITY_TOLERANCE = 0.001; + + @Test + public void onlyASingleBook() { + List<Integer> books = new ArrayList<>(Collections.singletonList(1)); + Bookstore bookstore = new Bookstore(books); + assertEquals(8, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void twoOfSameBook() { + List<Integer> books = new ArrayList<>(Arrays.asList(1, 1)); + Bookstore bookstore = new Bookstore(books); + assertEquals(16, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void emptyBasket() { + List<Integer> books = new ArrayList<>(); + Bookstore bookstore = new Bookstore(books); + assertEquals(0, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void twoDifferentBooks() { + List<Integer> books = new ArrayList<>(Arrays.asList(1, 2)); + Bookstore bookstore = new Bookstore(books); + assertEquals(15.20, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void threeDifferentBooks() { + List<Integer> books = new ArrayList<>(Arrays.asList(1, 2, 3)); + Bookstore bookstore = new Bookstore(books); + assertEquals(21.6, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void fourDifferentBooks() { + List<Integer> books = new ArrayList<>(Arrays.asList(1, 2, 3, 4)); + Bookstore bookstore = new Bookstore(books); + assertEquals(25.6, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void fiveDifferentBooks() { + List<Integer> books = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5)); + Bookstore bookstore = new Bookstore(books); + assertEquals(30, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void twoGroupsOfFourIsCheaperThanGroupOfFivePlusGroupOfThree() { + List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 3, 4, 5)); + Bookstore bookstore = new Bookstore(books); + assertEquals(51.20, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void groupOfFourPlusGroupOfTwoIsCheaperThanTwoGroupsOfThree() { + List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 4)); + Bookstore bookstore = new Bookstore(books); + assertEquals(40.8, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void twoEachOfFirst4BooksAnd1CopyEachOfRest() { + List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5)); + Bookstore bookstore = new Bookstore(books); + assertEquals(55.60, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void twoCopiesOfEachBook() { + List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5, 5)); + Bookstore bookstore = new Bookstore(books); + assertEquals(60.00, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void threeCopiesOfFirstBookAnd2EachOfRemaining() { + List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1)); + Bookstore bookstore = new Bookstore(books); + assertEquals(68.00, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } + + @Ignore + @Test + public void threeEachOFirst2BooksAnd2EachOfRemainingBooks() { + List<Integer> books = new ArrayList<>(Arrays.asList(1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1, 2)); + Bookstore bookstore = new Bookstore(books); + assertEquals(75.20, bookstore.calculateTotalCost(), EQUALITY_TOLERANCE); + } } -

['exercises/book-store/src/example/java/Bookstore.java', 'exercises/book-store/src/test/java/BookstoreTest.java']

{'.java': 2}

Java

{'Java': 1063911, 'Shell': 29846}

MIT License

exercism/java/780/778

exercism

java

https://github.com/exercism/java/issues/778

https://github.com/exercism/java/pull/780

https://github.com/exercism/java/pull/780

fixes

saddle-points: unhelpful error message

When running the saddle-points tests you don't get a very descriptive error message (unless I'm doing something wrong). The error message I get is something along the lines of: `expected:<MatrixCoordinate@1f> but was:<MatrixCoordinate@0` Which isn't much help in finding out what you've done wrong. To improve this we could iterate over the sets and compare each point with a more detailed error message e.g. `"Expected row to be " + expected.getRow() + " and it was " + actual.getRow() + ". Expected column to be " + expected.getCol() + " and it was " + actual.getCol() + ".";` What do you think @exercism/java?

37e3c794bd78a0a707c84e07b2901193066fdd35

49db0afcf0a0e63626c9fcaf39a3ff1fcbce5534

https://github.com/exercism/java/compare/37e3c794bd78a0a707c84e07b2901193066fdd35...49db0afcf0a0e63626c9fcaf39a3ff1fcbce5534

diff --git a/exercises/saddle-points/.meta/src/reference/java/MatrixCoordinate.java b/exercises/saddle-points/.meta/src/reference/java/MatrixCoordinate.java index 140bf2ce..1180e2ca 100644 --- a/exercises/saddle-points/.meta/src/reference/java/MatrixCoordinate.java +++ b/exercises/saddle-points/.meta/src/reference/java/MatrixCoordinate.java @@ -1,31 +1,33 @@ -final class MatrixCoordinate { - - private final int row; - - private final int col; - - MatrixCoordinate(final int row, final int col) { - this.row = row; - this.col = col; - } - - // Generated equals and hashcode. - - @Override - public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - final MatrixCoordinate that = (MatrixCoordinate) o; - - return row == that.row && col == that.col; - } - - @Override - public int hashCode() { - int result = row; - result = 31 * result + col; - return result; - } - +class MatrixCoordinate { + private final int row; + private final int col; + + MatrixCoordinate(final int row, final int col) { + this.row = row; + this.col = col; + } + + @Override + public String toString() { + return "Row: " + row + ", Column: " + col; + } + + // Generated equals and hashcode. + + @Override + public boolean equals(final Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + final MatrixCoordinate that = (MatrixCoordinate) o; + + return row == that.row && col == that.col; + } + + @Override + public int hashCode() { + int result = row; + result = 31 * result + col; + return result; + } } diff --git a/exercises/saddle-points/src/main/java/MatrixCoordinate.java b/exercises/saddle-points/src/main/java/MatrixCoordinate.java index 6c35e9ab..1180e2ca 100644 --- a/exercises/saddle-points/src/main/java/MatrixCoordinate.java +++ b/exercises/saddle-points/src/main/java/MatrixCoordinate.java @@ -1,31 +1,33 @@ class MatrixCoordinate { + private final int row; + private final int col; - private final int row; + MatrixCoordinate(final int row, final int col) { + this.row = row; + this.col = col; + } - private final int col; + @Override + public String toString() { + return "Row: " + row + ", Column: " + col; + } - MatrixCoordinate(final int row, final int col) { - this.row = row; - this.col = col; - } + // Generated equals and hashcode. - // Generated equals and hashcode. + @Override + public boolean equals(final Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; - @Override - public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + final MatrixCoordinate that = (MatrixCoordinate) o; - final MatrixCoordinate that = (MatrixCoordinate) o; - - return row == that.row && col == that.col; - } - - @Override - public int hashCode() { - int result = row; - result = 31 * result + col; - return result; - } + return row == that.row && col == that.col; + } + @Override + public int hashCode() { + int result = row; + result = 31 * result + col; + return result; + } }

['exercises/saddle-points/.meta/src/reference/java/MatrixCoordinate.java', 'exercises/saddle-points/src/main/java/MatrixCoordinate.java']

{'.java': 2}

Java

{'Java': 1063911, 'Shell': 29846}

MIT License

asciidoctor/asciidoctorj/283/275

asciidoctor

asciidoctorj

https://github.com/asciidoctor/asciidoctorj/issues/275

https://github.com/asciidoctor/asciidoctorj/pull/283

https://github.com/asciidoctor/asciidoctorj/pull/283

fixes

Asciidoctorj gives error if input file is an absolute path

Hi, I have error if I pass the input file as an absolute path, but using relative path everything is ok. Asciidoctorj version (installed via GVM): ``` enrico@lap:~/union/feasibility-docs/developers-manual$ asciidoctorj --version Asciidoctor 1.5.2 [http://asciidoctor.org] ``` The failing command: ``` enrico@lap:~/union/feasibility-docs/developers-manual$ asciidoctorj --backend html5 \\ --destination-dir /home/enrico/union/feasibility-docs/developers-manual/build \\ --out-file index.html --doctype book --attribute project-version=0.1 \\ /home/enrico/union/feasibility-docs/developers-manual/src/asciidoc/index.adoc asciidoctor: FAILED: input file(s) '[/home/enrico/union/feasibility-docs/developers-manual/src/asciidoc/index.adoc]' missing or cannot be read Exception in thread "main" java.lang.IllegalArgumentException: asciidoctor: FAILED: input file(s) '[/home/enrico/union/feasibility-docs/developers-manual/src/asciidoc/index.adoc]' missing or cannot be read at org.asciidoctor.cli.AsciidoctorInvoker.invoke(AsciidoctorInvoker.java:51) at org.asciidoctor.cli.AsciidoctorInvoker.main(AsciidoctorInvoker.java:184) ``` The input file exists: ``` enrico@lap:~/union/feasibility-docs/developers-manual$ ll /home/enrico/union/feasibility-docs/developers-manual/src/asciidoc/index.adoc -rw-rw-r-- 1 enrico enrico 288 gen 27 16:39 /home/enrico/union/feasibility-docs/developers-manual/src/asciidoc/index.adoc ``` The successful command (change only the input file path, from absolute to relative): ``` enrico@lap:~/union/feasibility-docs/developers-manual$ asciidoctorj --backend html5 \\ --destination-dir /home/enrico/union/feasibility-docs/developers-manual/build \\ --out-file index.html --doctype book --attribute project-version=0.1 \\ src/asciidoc/index.adoc ``` Is this expected? Anyway, thanks a lot for this awesome tool! Enrico

47f568070d1dcac5a4da0733ea1c8b2fd6823fa7

b25541fcc7ff1ac3a385664f112374d1aa1f70e2

https://github.com/asciidoctor/asciidoctorj/compare/47f568070d1dcac5a4da0733ea1c8b2fd6823fa7...b25541fcc7ff1ac3a385664f112374d1aa1f70e2

diff --git a/asciidoctorj-core/src/main/java/org/asciidoctor/GlobDirectoryWalker.java b/asciidoctorj-core/src/main/java/org/asciidoctor/GlobDirectoryWalker.java index 907b3ff7..a87fd80a 100644 --- a/asciidoctorj-core/src/main/java/org/asciidoctor/GlobDirectoryWalker.java +++ b/asciidoctorj-core/src/main/java/org/asciidoctor/GlobDirectoryWalker.java @@ -24,11 +24,63 @@ public class GlobDirectoryWalker implements DirectoryWalker { private final List<File> matches = new ArrayList<File>(); private final String globExpression; - public GlobDirectoryWalker(String rootDir, String globExpression) { - rootDirectory = new File(rootDir); - checkInput(rootDirectory); - this.canonicalRootDir = getCanonicalPath(rootDirectory); - this.globExpression = globExpression; + public GlobDirectoryWalker(String globExpression) { + + if (isAbsoluteGlobExpression(globExpression)) { + + // If the given path is an absolute path we want to split it into an absolute part containing + // directories without wildcards and a glob part with wildcards and file names + int indexOfUnglobbedPart = findIndexOfUnglobbedPart(globExpression); + this.rootDirectory = new File(globExpression.substring(0, indexOfUnglobbedPart)); + this.globExpression = globExpression.substring(indexOfUnglobbedPart + 1); + checkInput(rootDirectory); + this.canonicalRootDir = getCanonicalPath(rootDirectory); + + } else { + // It's a relative expression, current working dir is sufficient as root directory + rootDirectory = new File("."); + checkInput(rootDirectory); + this.canonicalRootDir = getCanonicalPath(rootDirectory); + this.globExpression = globExpression; + + } + } + + // An absolute path will consist of an absolute, unglobbed part and a globbed part. + // The globbed part starts at the first path element that contains a '*' or it is + // the part following the last separator + private int findIndexOfUnglobbedPart(String globExpression) { + int result = 0; + for (int i = 0; i < globExpression.length(); i++) { + switch (globExpression.charAt(i)) { + case '/': + case '\\\\': + result = i; + break; + case '*': + return result; + default: + } + } + // There is apparently no wildcard in the path, let the directory part be the path + // and the glob part only the filename + return result; + } + + // Determines if the given glob expression is an absolute path + // That is the expression starts with a separator or with [A-Za-z]:[/\\] on Windows + private boolean isAbsoluteGlobExpression(String globExpression) { + if (globExpression.startsWith(File.separator)) { + return true; + } + if (isWindows()) { + return globExpression.matches("^[A-Za-z]:[\\\\\\\\/].*$"); + } + return false; + } + + private boolean isWindows() { + return System.getProperty("os.name").toLowerCase().contains("win"); } @Override diff --git a/asciidoctorj-core/src/main/java/org/asciidoctor/cli/AsciidoctorInvoker.java b/asciidoctorj-core/src/main/java/org/asciidoctor/cli/AsciidoctorInvoker.java index 0da5fd57..c068a3cd 100644 --- a/asciidoctorj-core/src/main/java/org/asciidoctor/cli/AsciidoctorInvoker.java +++ b/asciidoctorj-core/src/main/java/org/asciidoctor/cli/AsciidoctorInvoker.java @@ -171,8 +171,7 @@ public class AsciidoctorInvoker { List<File> filesToBeRendered = new ArrayList<File>(); for (String globExpression : parameters) { - DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(".", - globExpression); + DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(globExpression); filesToBeRendered.addAll(globDirectoryWalker.scan()); } diff --git a/asciidoctorj-core/src/test/java/org/asciidoctor/WhenGlobExpressionIsUsedForScanning.java b/asciidoctorj-core/src/test/java/org/asciidoctor/WhenGlobExpressionIsUsedForScanning.java index 01aeba5d..140b5563 100644 --- a/asciidoctorj-core/src/test/java/org/asciidoctor/WhenGlobExpressionIsUsedForScanning.java +++ b/asciidoctorj-core/src/test/java/org/asciidoctor/WhenGlobExpressionIsUsedForScanning.java @@ -21,7 +21,7 @@ public class WhenGlobExpressionIsUsedForScanning { public void all_files_with_given_extension_of_current_directory_should_be_returned() { File pathToWalk = classpath.getResource("src"); - DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath(), "documents/*.adoc"); + DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath() + File.separator + "documents/*.adoc"); List<File> asciidocFiles = globDirectoryWalker.scan(); assertThat( @@ -35,7 +35,7 @@ public class WhenGlobExpressionIsUsedForScanning { public void all_files_with_given_extension_should_be_returned_recursively() { File pathToWalk = classpath.getResource("src"); - DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath(), "**/*.adoc"); + DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath() + File.separator + "**/*.adoc"); List<File> asciidocFiles = globDirectoryWalker.scan(); assertThat( @@ -49,7 +49,7 @@ public class WhenGlobExpressionIsUsedForScanning { public void no_should_be_returned_if_glob_expression_does_not_match() { File pathToWalk = classpath.getResource("src"); - DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath(), "**/*.a"); + DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath() + File.separator + "**/*.a"); List<File> asciidocFiles = globDirectoryWalker.scan(); assertThat(asciidocFiles, is(empty())); diff --git a/asciidoctorj-core/src/test/java/org/asciidoctor/cli/WhenAsciidoctorIsCalledUsingCli.java b/asciidoctorj-core/src/test/java/org/asciidoctor/cli/WhenAsciidoctorIsCalledUsingCli.java index 97578201..d1c13c80 100644 --- a/asciidoctorj-core/src/test/java/org/asciidoctor/cli/WhenAsciidoctorIsCalledUsingCli.java +++ b/asciidoctorj-core/src/test/java/org/asciidoctor/cli/WhenAsciidoctorIsCalledUsingCli.java @@ -231,7 +231,19 @@ public class WhenAsciidoctorIsCalledUsingCli { } - private ByteArrayOutputStream redirectStdout() { + @Test + public void with_absolute_path_file_should_be_rendered() { + + File inputFile = classpath.getResource("rendersample.asciidoc"); + String inputPath = inputFile.getAbsolutePath(); + new AsciidoctorInvoker().invoke(inputPath); + File expectedFile = new File(inputPath.replaceFirst("\\\\.asciidoc$", ".html")); + + assertThat(expectedFile.exists(), is(true)); + expectedFile.delete(); + } + + private ByteArrayOutputStream redirectStdout() { ByteArrayOutputStream output = new ByteArrayOutputStream(); System.setOut(new PrintStream(output)); return output;

['asciidoctorj-core/src/test/java/org/asciidoctor/WhenGlobExpressionIsUsedForScanning.java', 'asciidoctorj-core/src/main/java/org/asciidoctor/GlobDirectoryWalker.java', 'asciidoctorj-core/src/test/java/org/asciidoctor/cli/WhenAsciidoctorIsCalledUsingCli.java', 'asciidoctorj-core/src/main/java/org/asciidoctor/cli/AsciidoctorInvoker.java']

{'.java': 4}

Java

{'Java': 973088, 'Groovy': 143210, 'Ruby': 78105, 'Shell': 6743, 'CSS': 3759, 'PowerShell': 1831, 'CoffeeScript': 414, 'Makefile': 321, 'Slim': 25, 'Haml': 16}

Apache License 2.0

asciidoctor/asciidoctorj/435/434

asciidoctor

asciidoctorj

https://github.com/asciidoctor/asciidoctorj/issues/434

https://github.com/asciidoctor/asciidoctorj/pull/435

https://github.com/asciidoctor/asciidoctorj/pull/435

fixes

asciidoctor.loadFile(file, options) doesn't generate complete document.

loadFile doesn't generate complete document, only first paragraph will be processed. Reading from string (line based reading of a file done before) does work. The project is maven based and is using version 1.5.4 of asciidoctorj. // Example of reading via loadFile Map<String,Object> attributes = new HashMap<String, Object>(); attributes.put("stylesdir", "adocs/css"); attributes.put("stylesheet", "asciidoctor.css"); Map<String, Object> options = new HashMap<String, Object>(); options.put("attributes", attributes); options.put("in_place", true); options.put("header", true); options.put("footer", true); options.put("safe", 0); Document document = asciidoctor.loadFile(file, options); // Example for asciidoctor.load: Map<String,Object> attributes = new HashMap<String, Object>(); attributes.put("stylesdir", "adocs/css"); attributes.put("stylesheet", "asciidoctor.css"); Map<String, Object> options = new HashMap<String, Object>(); options.put("attributes", attributes); options.put("in_place", true); options.put("header", true); options.put("footer", true); options.put("safe", 0); String lines = ""; String tmpString = ""; if (file.canRead()) { System.out.println("File: " + file + " is readable"); try { FileReader fileReader = new FileReader(file); BufferedReader bufferedReader = new BufferedReader(fileReader); while( (tmpString = bufferedReader.readLine()) != null ) { lines = lines + "\\n" + tmpString; } bufferedReader.close(); } catch (FileNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); } } Document document = asciidoctor.load(lines, options); System.out.println("content: " + document.convert());

7a8fe72a4bc58ac066be2295bb0d20d4dbd2d050

594bc08ae4ba503e95243e39fde8e224a13552b8

https://github.com/asciidoctor/asciidoctorj/compare/7a8fe72a4bc58ac066be2295bb0d20d4dbd2d050...594bc08ae4ba503e95243e39fde8e224a13552b8

diff --git a/asciidoctorj-core/src/main/java/org/asciidoctor/internal/JRubyAsciidoctor.java b/asciidoctorj-core/src/main/java/org/asciidoctor/internal/JRubyAsciidoctor.java index 722041e0..64d8c0fd 100644 --- a/asciidoctorj-core/src/main/java/org/asciidoctor/internal/JRubyAsciidoctor.java +++ b/asciidoctorj-core/src/main/java/org/asciidoctor/internal/JRubyAsciidoctor.java @@ -598,7 +598,7 @@ public class JRubyAsciidoctor implements Asciidoctor { @Override public Document loadFile(File file, Map<String, Object> options) { RubyHash rubyHash = RubyHashUtil.convertMapToRubyHashWithSymbols(rubyRuntime, options); - return new Document(this.asciidoctorModule.load(file.getAbsolutePath(), rubyHash), this.rubyRuntime); + return new Document(this.asciidoctorModule.load_file(file.getAbsolutePath(), rubyHash), this.rubyRuntime); } } diff --git a/asciidoctorj-core/src/test/java/org/asciidoctor/WhenAsciiDocIsRenderedToDocument.java b/asciidoctorj-core/src/test/java/org/asciidoctor/WhenAsciiDocIsRenderedToDocument.java index f8d61791..c9fe3609 100644 --- a/asciidoctorj-core/src/test/java/org/asciidoctor/WhenAsciiDocIsRenderedToDocument.java +++ b/asciidoctorj-core/src/test/java/org/asciidoctor/WhenAsciiDocIsRenderedToDocument.java @@ -1,9 +1,11 @@ package org.asciidoctor; +import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.collection.IsMapContaining.hasKey; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import java.io.File; @@ -205,4 +207,18 @@ public class WhenAsciiDocIsRenderedToDocument { assertThat(content, is(IOUtils.readFull(new FileReader(inputFile)))); } + @Test + public void should_load_a_document_from_File() throws FileNotFoundException { + Map<String, Object> options = OptionsBuilder.options().safe(SafeMode.SAFE) + .attributes(AttributesBuilder.attributes().dataUri(false)) + .compact(true).asMap(); + File inputFile = classpath.getResource("rendersample.asciidoc"); + Document document = asciidoctor.loadFile(inputFile, options); + assertEquals(1, document.blocks().size()); + assertThat(document.blocks().get(0), instanceOf(Section.class)); + Section section = (Section) document.blocks().get(0); + assertEquals(1, section.getBlocks().size()); + assertEquals("<strong>Section A</strong> paragraph.", section.getBlocks().get(0).getContent()); + } + }

['asciidoctorj-core/src/main/java/org/asciidoctor/internal/JRubyAsciidoctor.java', 'asciidoctorj-core/src/test/java/org/asciidoctor/WhenAsciiDocIsRenderedToDocument.java']

{'.java': 2}

Java

{'Java': 973088, 'Groovy': 143210, 'Ruby': 78105, 'Shell': 6743, 'CSS': 3759, 'PowerShell': 1831, 'CoffeeScript': 414, 'Makefile': 321, 'Slim': 25, 'Haml': 16}

Apache License 2.0

asciidoctor/asciidoctorj/594/593

asciidoctor

asciidoctorj

https://github.com/asciidoctor/asciidoctorj/issues/593

https://github.com/asciidoctor/asciidoctorj/pull/594

https://github.com/asciidoctor/asciidoctorj/pull/594

fixes

(RuntimeError) can't modify frozen NilClass on getParent()

When `getParent()` is called on the root `ContentNode` (where `null` is expected), a ruby `RuntimeError` is thrown. Code to reproduce it: public static void main(String[] args) { String s = "== A small Example\\n" + "\\n" + "Lorem ipsum dolor sit amet:\\n"; org.asciidoctor.Asciidoctor asciidoctor = org.asciidoctor.Asciidoctor.Factory.create(); org.asciidoctor.ast.Document document = asciidoctor.load(s, new java.util.HashMap<String, Object>()); org.asciidoctor.ast.ContentNode parent = document.getParent(); // Runtime error here! System.out.println(parent); } Using `org.asciidoctor: asciidoctorj:1.6.0-alpha.6` as dependency. Error is: > Exception in thread "main" org.jruby.exceptions.RaiseException: (RuntimeError) can't modify frozen NilClass --- The code works with `org.asciidoctor:asciidoctorj:1.5.6` (the code needs to be modified, because the API changed): public static void main(String[] args) { String s = "== A small Example\\n" + "\\n" + "Lorem ipsum dolor sit amet:\\n"; org.asciidoctor.Asciidoctor asciidoctor = org.asciidoctor.Asciidoctor.Factory.create(); org.asciidoctor.ast.Document document = asciidoctor.load(s, new java.util.HashMap<String, Object>()); org.asciidoctor.ast.AbstractNode parent = document.getParent(); System.out.println(parent); } This works: `parent` is `null` as expected.

5b8018792c787f59df8ee099d5f8393f68e7591b

a4a41460ada7e095980ecc767de68b21a89672b8

https://github.com/asciidoctor/asciidoctorj/compare/5b8018792c787f59df8ee099d5f8393f68e7591b...a4a41460ada7e095980ecc767de68b21a89672b8

diff --git a/asciidoctorj-core/src/main/java/org/asciidoctor/ast/NodeConverter.java b/asciidoctorj-core/src/main/java/org/asciidoctor/ast/NodeConverter.java index 9dbb8ed0..bdd04a6a 100644 --- a/asciidoctorj-core/src/main/java/org/asciidoctor/ast/NodeConverter.java +++ b/asciidoctorj-core/src/main/java/org/asciidoctor/ast/NodeConverter.java @@ -126,15 +126,16 @@ public final class NodeConverter { if (object instanceof IRubyObject || object instanceof RubyObjectHolderProxy) { IRubyObject rubyObject = asRubyObject(object); + if (rubyObject.isNil()) { + return null; + } NodeCache nodeCache = NodeCache.get(rubyObject); ContentNode cachedNode = nodeCache.getASTNode(); if (cachedNode != null) { return cachedNode; } - Ruby runtime = rubyObject.getRuntime(); - - ContentNode ret = null; + ContentNode ret; switch (NodeType.getNodeType(rubyObject)) { case BLOCK_CLASS: diff --git a/asciidoctorj-core/src/test/java/org/asciidoctor/WhenAsciiDocIsRenderedToDocument.java b/asciidoctorj-core/src/test/java/org/asciidoctor/WhenAsciiDocIsRenderedToDocument.java index 1ac0b756..4f848e38 100644 --- a/asciidoctorj-core/src/test/java/org/asciidoctor/WhenAsciiDocIsRenderedToDocument.java +++ b/asciidoctorj-core/src/test/java/org/asciidoctor/WhenAsciiDocIsRenderedToDocument.java @@ -1,25 +1,9 @@ package org.asciidoctor; -import static org.hamcrest.Matchers.either; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.collection.IsMapContaining.hasKey; -import static org.hamcrest.collection.IsIterableContainingInOrder.contains; -import static org.junit.Assert.assertThat; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.asciidoctor.arquillian.api.Unshared; -import org.asciidoctor.ast.StructuralNode; import org.asciidoctor.ast.Document; import org.asciidoctor.ast.Section; +import org.asciidoctor.ast.StructuralNode; import org.asciidoctor.internal.IOUtils; import org.asciidoctor.util.ClasspathResources; import org.jboss.arquillian.junit.Arquillian; @@ -27,6 +11,22 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.junit.Test; import org.junit.runner.RunWith; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.hamcrest.Matchers.either; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.hamcrest.collection.IsIterableContainingInOrder.contains; +import static org.hamcrest.collection.IsMapContaining.hasKey; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; + @RunWith(Arquillian.class) public class WhenAsciiDocIsRenderedToDocument { @@ -341,4 +341,15 @@ public class WhenAsciiDocIsRenderedToDocument { assertThat(section.getContentModel(), is("compound")); assertThat(section.getBlocks().get(0).getContentModel(), is("simple")); } + + @Test + public void should_be_able_to_get_parent_from_document() { + String s = "== A small Example\\n" + + "\\n" + + "Lorem ipsum dolor sit amet:\\n"; + + Document document = asciidoctor.load(s, new HashMap<String, Object>()); + assertNull(document.getParent()); + } + }

['asciidoctorj-core/src/main/java/org/asciidoctor/ast/NodeConverter.java', 'asciidoctorj-core/src/test/java/org/asciidoctor/WhenAsciiDocIsRenderedToDocument.java']

{'.java': 2}

Java

{'Java': 973088, 'Groovy': 143210, 'Ruby': 78105, 'Shell': 6743, 'CSS': 3759, 'PowerShell': 1831, 'CoffeeScript': 414, 'Makefile': 321, 'Slim': 25, 'Haml': 16}

Apache License 2.0

asciidoctor/asciidoctorj/759/749

asciidoctor

asciidoctorj

https://github.com/asciidoctor/asciidoctorj/issues/749

https://github.com/asciidoctor/asciidoctorj/pull/759

https://github.com/asciidoctor/asciidoctorj/pull/759

fixes

RubyExtensionRegistry references Impl

While refactoring the RubyExtensionRegistry to interfaces the implementation of this interface slipped through and appears as the return type: https://github.com/asciidoctor/asciidoctorj/blob/15fd95849ad7f236a34a3e7a38321093ea741283/asciidoctorj-core/src/main/java/org/asciidoctor/extension/RubyExtensionRegistry.java#L8 Instead all methods should return just RubyExtensionRegistry. This cannot be fixed on 1.6.0 as this would result in a binary incompatibility.

fa6a40feffca444fa321b53a8ca125de93ffb83d

2d32f1ddc76f4555416fc5578063797d66c8424d

https://github.com/asciidoctor/asciidoctorj/compare/fa6a40feffca444fa321b53a8ca125de93ffb83d...2d32f1ddc76f4555416fc5578063797d66c8424d

diff --git a/asciidoctorj-core/src/main/java/org/asciidoctor/extension/RubyExtensionRegistry.java b/asciidoctorj-core/src/main/java/org/asciidoctor/extension/RubyExtensionRegistry.java index d575a139..b6ada669 100644 --- a/asciidoctorj-core/src/main/java/org/asciidoctor/extension/RubyExtensionRegistry.java +++ b/asciidoctorj-core/src/main/java/org/asciidoctor/extension/RubyExtensionRegistry.java @@ -1,33 +1,32 @@ package org.asciidoctor.extension; -import org.asciidoctor.internal.RubyExtensionRegistryImpl; - import java.io.InputStream; public interface RubyExtensionRegistry { - RubyExtensionRegistryImpl requireLibrary(String requiredLibrary); - RubyExtensionRegistryImpl loadClass(InputStream rubyClassStream); + RubyExtensionRegistry requireLibrary(String requiredLibrary); + + RubyExtensionRegistry loadClass(InputStream rubyClassStream); - RubyExtensionRegistryImpl preprocessor(String preprocessor); + RubyExtensionRegistry preprocessor(String preprocessor); - RubyExtensionRegistryImpl postprocessor(String postprocessor); + RubyExtensionRegistry postprocessor(String postprocessor); - RubyExtensionRegistryImpl docinfoProcessor(String docinfoProcessor); + RubyExtensionRegistry docinfoProcessor(String docinfoProcessor); - RubyExtensionRegistryImpl includeProcessor(String includeProcessor); + RubyExtensionRegistry includeProcessor(String includeProcessor); - RubyExtensionRegistryImpl treeprocessor(String treeProcessor); + RubyExtensionRegistry treeprocessor(String treeProcessor); - RubyExtensionRegistryImpl block(String blockName, String blockProcessor); + RubyExtensionRegistry block(String blockName, String blockProcessor); - RubyExtensionRegistryImpl block(String blockProcessor); + RubyExtensionRegistry block(String blockProcessor); - RubyExtensionRegistryImpl blockMacro(String blockName, String blockMacroProcessor); + RubyExtensionRegistry blockMacro(String blockName, String blockMacroProcessor); - RubyExtensionRegistryImpl blockMacro(String blockMacroProcessor); + RubyExtensionRegistry blockMacro(String blockMacroProcessor); - RubyExtensionRegistryImpl inlineMacro(String blockName, String inlineMacroProcessor); + RubyExtensionRegistry inlineMacro(String blockName, String inlineMacroProcessor); - RubyExtensionRegistryImpl inlineMacro(String inlineMacroProcessor); + RubyExtensionRegistry inlineMacro(String inlineMacroProcessor); }

['asciidoctorj-core/src/main/java/org/asciidoctor/extension/RubyExtensionRegistry.java']

{'.java': 1}

Java

{'Java': 973088, 'Groovy': 143210, 'Ruby': 78105, 'Shell': 6743, 'CSS': 3759, 'PowerShell': 1831, 'CoffeeScript': 414, 'Makefile': 321, 'Slim': 25, 'Haml': 16}

Apache License 2.0

asciidoctor/asciidoctorj/282/275

asciidoctor

asciidoctorj

https://github.com/asciidoctor/asciidoctorj/issues/275

https://github.com/asciidoctor/asciidoctorj/pull/282

https://github.com/asciidoctor/asciidoctorj/pull/282

fixes

Asciidoctorj gives error if input file is an absolute path

Hi, I have error if I pass the input file as an absolute path, but using relative path everything is ok. Asciidoctorj version (installed via GVM): ``` enrico@lap:~/union/feasibility-docs/developers-manual$ asciidoctorj --version Asciidoctor 1.5.2 [http://asciidoctor.org] ``` The failing command: ``` enrico@lap:~/union/feasibility-docs/developers-manual$ asciidoctorj --backend html5 \\ --destination-dir /home/enrico/union/feasibility-docs/developers-manual/build \\ --out-file index.html --doctype book --attribute project-version=0.1 \\ /home/enrico/union/feasibility-docs/developers-manual/src/asciidoc/index.adoc asciidoctor: FAILED: input file(s) '[/home/enrico/union/feasibility-docs/developers-manual/src/asciidoc/index.adoc]' missing or cannot be read Exception in thread "main" java.lang.IllegalArgumentException: asciidoctor: FAILED: input file(s) '[/home/enrico/union/feasibility-docs/developers-manual/src/asciidoc/index.adoc]' missing or cannot be read at org.asciidoctor.cli.AsciidoctorInvoker.invoke(AsciidoctorInvoker.java:51) at org.asciidoctor.cli.AsciidoctorInvoker.main(AsciidoctorInvoker.java:184) ``` The input file exists: ``` enrico@lap:~/union/feasibility-docs/developers-manual$ ll /home/enrico/union/feasibility-docs/developers-manual/src/asciidoc/index.adoc -rw-rw-r-- 1 enrico enrico 288 gen 27 16:39 /home/enrico/union/feasibility-docs/developers-manual/src/asciidoc/index.adoc ``` The successful command (change only the input file path, from absolute to relative): ``` enrico@lap:~/union/feasibility-docs/developers-manual$ asciidoctorj --backend html5 \\ --destination-dir /home/enrico/union/feasibility-docs/developers-manual/build \\ --out-file index.html --doctype book --attribute project-version=0.1 \\ src/asciidoc/index.adoc ``` Is this expected? Anyway, thanks a lot for this awesome tool! Enrico

2bdd6ea28ad1ae12c634192ff8875b69db9bdacb

c775e46d3a9b786a993eb4e0954f5e20704ad0c5

https://github.com/asciidoctor/asciidoctorj/compare/2bdd6ea28ad1ae12c634192ff8875b69db9bdacb...c775e46d3a9b786a993eb4e0954f5e20704ad0c5

diff --git a/asciidoctorj-core/src/main/java/org/asciidoctor/GlobDirectoryWalker.java b/asciidoctorj-core/src/main/java/org/asciidoctor/GlobDirectoryWalker.java index 907b3ff7..a87fd80a 100644 --- a/asciidoctorj-core/src/main/java/org/asciidoctor/GlobDirectoryWalker.java +++ b/asciidoctorj-core/src/main/java/org/asciidoctor/GlobDirectoryWalker.java @@ -24,11 +24,63 @@ public class GlobDirectoryWalker implements DirectoryWalker { private final List<File> matches = new ArrayList<File>(); private final String globExpression; - public GlobDirectoryWalker(String rootDir, String globExpression) { - rootDirectory = new File(rootDir); - checkInput(rootDirectory); - this.canonicalRootDir = getCanonicalPath(rootDirectory); - this.globExpression = globExpression; + public GlobDirectoryWalker(String globExpression) { + + if (isAbsoluteGlobExpression(globExpression)) { + + // If the given path is an absolute path we want to split it into an absolute part containing + // directories without wildcards and a glob part with wildcards and file names + int indexOfUnglobbedPart = findIndexOfUnglobbedPart(globExpression); + this.rootDirectory = new File(globExpression.substring(0, indexOfUnglobbedPart)); + this.globExpression = globExpression.substring(indexOfUnglobbedPart + 1); + checkInput(rootDirectory); + this.canonicalRootDir = getCanonicalPath(rootDirectory); + + } else { + // It's a relative expression, current working dir is sufficient as root directory + rootDirectory = new File("."); + checkInput(rootDirectory); + this.canonicalRootDir = getCanonicalPath(rootDirectory); + this.globExpression = globExpression; + + } + } + + // An absolute path will consist of an absolute, unglobbed part and a globbed part. + // The globbed part starts at the first path element that contains a '*' or it is + // the part following the last separator + private int findIndexOfUnglobbedPart(String globExpression) { + int result = 0; + for (int i = 0; i < globExpression.length(); i++) { + switch (globExpression.charAt(i)) { + case '/': + case '\\\\': + result = i; + break; + case '*': + return result; + default: + } + } + // There is apparently no wildcard in the path, let the directory part be the path + // and the glob part only the filename + return result; + } + + // Determines if the given glob expression is an absolute path + // That is the expression starts with a separator or with [A-Za-z]:[/\\] on Windows + private boolean isAbsoluteGlobExpression(String globExpression) { + if (globExpression.startsWith(File.separator)) { + return true; + } + if (isWindows()) { + return globExpression.matches("^[A-Za-z]:[\\\\\\\\/].*$"); + } + return false; + } + + private boolean isWindows() { + return System.getProperty("os.name").toLowerCase().contains("win"); } @Override diff --git a/asciidoctorj-core/src/main/java/org/asciidoctor/cli/AsciidoctorInvoker.java b/asciidoctorj-core/src/main/java/org/asciidoctor/cli/AsciidoctorInvoker.java index 0da5fd57..c068a3cd 100644 --- a/asciidoctorj-core/src/main/java/org/asciidoctor/cli/AsciidoctorInvoker.java +++ b/asciidoctorj-core/src/main/java/org/asciidoctor/cli/AsciidoctorInvoker.java @@ -171,8 +171,7 @@ public class AsciidoctorInvoker { List<File> filesToBeRendered = new ArrayList<File>(); for (String globExpression : parameters) { - DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(".", - globExpression); + DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(globExpression); filesToBeRendered.addAll(globDirectoryWalker.scan()); } diff --git a/asciidoctorj-core/src/test/java/org/asciidoctor/WhenGlobExpressionIsUsedForScanning.java b/asciidoctorj-core/src/test/java/org/asciidoctor/WhenGlobExpressionIsUsedForScanning.java index 01aeba5d..140b5563 100644 --- a/asciidoctorj-core/src/test/java/org/asciidoctor/WhenGlobExpressionIsUsedForScanning.java +++ b/asciidoctorj-core/src/test/java/org/asciidoctor/WhenGlobExpressionIsUsedForScanning.java @@ -21,7 +21,7 @@ public class WhenGlobExpressionIsUsedForScanning { public void all_files_with_given_extension_of_current_directory_should_be_returned() { File pathToWalk = classpath.getResource("src"); - DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath(), "documents/*.adoc"); + DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath() + File.separator + "documents/*.adoc"); List<File> asciidocFiles = globDirectoryWalker.scan(); assertThat( @@ -35,7 +35,7 @@ public class WhenGlobExpressionIsUsedForScanning { public void all_files_with_given_extension_should_be_returned_recursively() { File pathToWalk = classpath.getResource("src"); - DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath(), "**/*.adoc"); + DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath() + File.separator + "**/*.adoc"); List<File> asciidocFiles = globDirectoryWalker.scan(); assertThat( @@ -49,7 +49,7 @@ public class WhenGlobExpressionIsUsedForScanning { public void no_should_be_returned_if_glob_expression_does_not_match() { File pathToWalk = classpath.getResource("src"); - DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath(), "**/*.a"); + DirectoryWalker globDirectoryWalker = new GlobDirectoryWalker(pathToWalk.getPath() + File.separator + "**/*.a"); List<File> asciidocFiles = globDirectoryWalker.scan(); assertThat(asciidocFiles, is(empty())); diff --git a/asciidoctorj-core/src/test/java/org/asciidoctor/cli/WhenAsciidoctorIsCalledUsingCli.java b/asciidoctorj-core/src/test/java/org/asciidoctor/cli/WhenAsciidoctorIsCalledUsingCli.java index 97578201..d1c13c80 100644 --- a/asciidoctorj-core/src/test/java/org/asciidoctor/cli/WhenAsciidoctorIsCalledUsingCli.java +++ b/asciidoctorj-core/src/test/java/org/asciidoctor/cli/WhenAsciidoctorIsCalledUsingCli.java @@ -231,7 +231,19 @@ public class WhenAsciidoctorIsCalledUsingCli { } - private ByteArrayOutputStream redirectStdout() { + @Test + public void with_absolute_path_file_should_be_rendered() { + + File inputFile = classpath.getResource("rendersample.asciidoc"); + String inputPath = inputFile.getAbsolutePath(); + new AsciidoctorInvoker().invoke(inputPath); + File expectedFile = new File(inputPath.replaceFirst("\\\\.asciidoc$", ".html")); + + assertThat(expectedFile.exists(), is(true)); + expectedFile.delete(); + } + + private ByteArrayOutputStream redirectStdout() { ByteArrayOutputStream output = new ByteArrayOutputStream(); System.setOut(new PrintStream(output)); return output;

['asciidoctorj-core/src/test/java/org/asciidoctor/WhenGlobExpressionIsUsedForScanning.java', 'asciidoctorj-core/src/main/java/org/asciidoctor/GlobDirectoryWalker.java', 'asciidoctorj-core/src/test/java/org/asciidoctor/cli/WhenAsciidoctorIsCalledUsingCli.java', 'asciidoctorj-core/src/main/java/org/asciidoctor/cli/AsciidoctorInvoker.java']

{'.java': 4}

Java

{'Java': 973088, 'Groovy': 143210, 'Ruby': 78105, 'Shell': 6743, 'CSS': 3759, 'PowerShell': 1831, 'CoffeeScript': 414, 'Makefile': 321, 'Slim': 25, 'Haml': 16}

Apache License 2.0

kyoripowered/adventure/859/414

kyoripowered

adventure

https://github.com/KyoriPowered/adventure/issues/414

https://github.com/KyoriPowered/adventure/pull/859

https://github.com/KyoriPowered/adventure/pull/859

fixes

Unable to handle Empty Hover Event Value/Contents Array

Weirdly enough, vanilla Minecraft actually accepts a json string like this as a valid chat component. ```json {"text": "hello", "hoverEvent":{"action":"show_text","value":[]}} ``` AND ```json {"text": "hello", "hoverEvent":{"action":"show_text","contents":[]}} ``` Which in game, the whole hoverEvent would just be ignored. But with Adventure, it'll not know what to do/throw an error. ``` [02:25:32 INFO]: com.google.gson.JsonParseException: Don't know how to turn [] into a Component [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.ComponentSerializerImpl.notSureHowToDeserialize(ComponentSerializerImpl.java:262) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.ComponentSerializerImpl.deserialize0(ComponentSerializerImpl.java:92) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.ComponentSerializerImpl.deserialize(ComponentSerializerImpl.java:75) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.ComponentSerializerImpl.deserialize(ComponentSerializerImpl.java:55) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.internal.bind.TreeTypeAdapter.read(TreeTypeAdapter.java:69) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.Gson.fromJson(Gson.java:887) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.Gson.fromJson(Gson.java:952) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.internal.bind.TreeTypeAdapter$GsonContextImpl.deserialize(TreeTypeAdapter.java:162) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.StyleSerializer.deserialize(StyleSerializer.java:155) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.StyleSerializer.deserialize(StyleSerializer.java:98) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.StyleSerializer.deserialize(StyleSerializer.java:53) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.internal.bind.TreeTypeAdapter.read(TreeTypeAdapter.java:69) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.Gson.fromJson(Gson.java:887) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.Gson.fromJson(Gson.java:952) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.internal.bind.TreeTypeAdapter$GsonContextImpl.deserialize(TreeTypeAdapter.java:162) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.ComponentSerializerImpl.deserialize0(ComponentSerializerImpl.java:161) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.ComponentSerializerImpl.deserialize(ComponentSerializerImpl.java:75) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.ComponentSerializerImpl.deserialize(ComponentSerializerImpl.java:55) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.internal.bind.TreeTypeAdapter.read(TreeTypeAdapter.java:69) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.Gson.fromJson(Gson.java:887) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.Gson.fromJson(Gson.java:852) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.Gson.fromJson(Gson.java:801) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at com.google.gson.Gson.fromJson(Gson.java:773) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.GsonComponentSerializerImpl.deserialize(GsonComponentSerializerImpl.java:101) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] [02:25:32 INFO]: at net.kyori.adventure.text.serializer.gson.GsonComponentSerializerImpl.deserialize(GsonComponentSerializerImpl.java:44) ~[Paper-Server-reobf.jar:git-Paper-"416ec98"] ``` An extra piece of information, ```json [] ``` is not a valid component as expected, so accepting (and then ignoring) empty arrays is just a special case for Components in hoverEvents, not everywhere.

42ea3df1942644a3a3b70c467c0035de63eb511c

1438b88eec775bd981702cead14df1dee0ae0644

https://github.com/kyoripowered/adventure/compare/42ea3df1942644a3a3b70c467c0035de63eb511c...1438b88eec775bd981702cead14df1dee0ae0644

diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java index 4f74b016..5f692cb6 100644 --- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java +++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java @@ -147,7 +147,9 @@ final class StyleSerializer extends TypeAdapter<Style> { if (hoverEventObject.has(HOVER_EVENT_CONTENTS)) { final @Nullable JsonElement rawValue = hoverEventObject.get(HOVER_EVENT_CONTENTS); final Class<?> actionType = action.type(); - if (SerializerFactory.COMPONENT_TYPE.isAssignableFrom(actionType)) { + if (isNullOrEmpty(rawValue)) { + value = null; + } else if (SerializerFactory.COMPONENT_TYPE.isAssignableFrom(actionType)) { value = this.gson.fromJson(rawValue, SerializerFactory.COMPONENT_TYPE); } else if (SerializerFactory.SHOW_ITEM_TYPE.isAssignableFrom(actionType)) { value = this.gson.fromJson(rawValue, SerializerFactory.SHOW_ITEM_TYPE); @@ -157,8 +159,13 @@ final class StyleSerializer extends TypeAdapter<Style> { value = null; } } else if (hoverEventObject.has(HOVER_EVENT_VALUE)) { - final Component rawValue = this.gson.fromJson(hoverEventObject.get(HOVER_EVENT_VALUE), SerializerFactory.COMPONENT_TYPE); - value = this.legacyHoverEventContents(action, rawValue); + final JsonElement element = hoverEventObject.get(HOVER_EVENT_VALUE); + if (isNullOrEmpty(element)) { + value = null; + } else { + final Component rawValue = this.gson.fromJson(element, SerializerFactory.COMPONENT_TYPE); + value = this.legacyHoverEventContents(action, rawValue); + } } else { value = null; } @@ -177,6 +184,10 @@ final class StyleSerializer extends TypeAdapter<Style> { return style.build(); } + private static boolean isNullOrEmpty(final @Nullable JsonElement element) { + return element == null || element.isJsonNull() || (element.isJsonArray() && element.getAsJsonArray().size() == 0) || (element.isJsonObject() && element.getAsJsonObject().size() == 0); + } + private boolean readBoolean(final JsonReader in) throws IOException { final JsonToken peek = in.peek(); if (peek == JsonToken.BOOLEAN) { diff --git a/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerTest.java b/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerTest.java index 7cad7c7c..db6f1416 100644 --- a/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerTest.java +++ b/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerTest.java @@ -90,6 +90,14 @@ class GsonComponentSerializerTest { assertEquals("Don't know how to turn null into a Component", ex.getMessage()); } + // https://github.com/KyoriPowered/adventure/issues/414 + @Test + void testSkipInvalidHoverEvent() { + final String input = "{\\"text\\": \\"hello\\", \\"hoverEvent\\":{\\"action\\":\\"show_text\\",\\"value\\":[]}}"; + final Component expected = Component.text("hello"); + assertEquals(expected, GsonComponentSerializer.gson().deserialize(input)); + } + private static String name(final NamedTextColor color) { return NamedTextColor.NAMES.key(color); }

['text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java', 'text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerTest.java']

{'.java': 2}

Java

{'Java': 2437627, 'Kotlin': 34310}

MIT License

kyoripowered/adventure/475/473

kyoripowered

adventure

https://github.com/KyoriPowered/adventure/issues/473

https://github.com/KyoriPowered/adventure/pull/475

https://github.com/KyoriPowered/adventure/pull/475

fix

Expected BOOLEAN but was STRING at path $.underlined

Copied from Discord, but of course if you need more information I'm happy to provide. Hello! Geyser just updated from 4.8.0 to 4.9.2 and we've got what appears to be a brand new error! yey ``` [09:47:22] [defaultEventLoopGroup-3-10/WARN] [Geyser-BungeeCord]: Downstream packet error! java.lang.IllegalStateException: Expected BOOLEAN but was STRING at path $.bold [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: com.google.gson.JsonSyntaxException: java.lang.IllegalStateException: Expected BOOLEAN but was STRING at path $.bold [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.Gson.fromJson(Gson.java:944) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.Gson.fromJson(Gson.java:1003) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.Gson.fromJson(Gson.java:975) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at org.geysermc.platform.bungeecord.shaded.kyori.adventure.text.serializer.gson.ComponentSerializerImpl.read(ComponentSerializerImpl.java:214) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at org.geysermc.platform.bungeecord.shaded.kyori.adventure.text.serializer.gson.ComponentSerializerImpl.read(ComponentSerializerImpl.java:56) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.TypeAdapter$1.read(TypeAdapter.java:199) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper.read(TypeAdapterRuntimeTypeWrapper.java:41) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter.read(CollectionTypeAdapterFactory.java:82) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter.read(CollectionTypeAdapterFactory.java:61) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.Gson.fromJson(Gson.java:932) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at org.geysermc.platform.bungeecord.shaded.kyori.adventure.text.serializer.gson.ComponentSerializerImpl.read(ComponentSerializerImpl.java:173) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at org.geysermc.platform.bungeecord.shaded.kyori.adventure.text.serializer.gson.ComponentSerializerImpl.read(ComponentSerializerImpl.java:56) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.TypeAdapter$1.read(TypeAdapter.java:199) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.Gson.fromJson(Gson.java:932) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.Gson.fromJson(Gson.java:897) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.Gson.fromJson(Gson.java:846) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.google.gson.Gson.fromJson(Gson.java:817) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at org.geysermc.platform.bungeecord.shaded.kyori.adventure.text.serializer.gson.GsonComponentSerializerImpl.deserialize(GsonComponentSerializerImpl.java:84) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at org.geysermc.platform.bungeecord.shaded.kyori.adventure.text.serializer.gson.GsonComponentSerializerImpl.deserialize(GsonComponentSerializerImpl.java:37) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.github.steveice10.mc.protocol.packet.ingame.server.ServerPlayerListEntryPacket.read(ServerPlayerListEntryPacket.java:93) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at com.github.steveice10.packetlib.tcp.TcpPacketCodec.decode(TcpPacketCodec.java:59) [09:47:22] [defaultEventLoopGroup-3-10/ERROR]: at io.netty.handler.codec.ByteToMessageCodec$1.decode(ByteToMessageCodec.java:42) ``` I *believe* this is an example suspect string: `{"text":"","extra":[{"text":"lobby","color":"yellow","underlined":"true"},{"text":" (1):","color":"white","italic":"true"}]}` though I get `Expected BOOLEAN but was STRING at path $.underlined` with that.

f5253d09c699e65418f4722ef8a9f46c1c9cf36b

034768aca57e9f8b271f5c55532183b3219e43a7

https://github.com/kyoripowered/adventure/compare/f5253d09c699e65418f4722ef8a9f46c1c9cf36b...034768aca57e9f8b271f5c55532183b3219e43a7

diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java index 7293b0f4..cf0d317f 100644 --- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java +++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java @@ -111,7 +111,7 @@ final class StyleSerializer extends TypeAdapter<Style> { style.decoration(color.decoration, TextDecoration.State.TRUE); } } else if (TextDecoration.NAMES.keys().contains(fieldName)) { - style.decoration(TextDecoration.NAMES.value(fieldName), in.nextBoolean()); + style.decoration(TextDecoration.NAMES.value(fieldName), this.readBoolean(in)); } else if (fieldName.equals(INSERTION)) { style.insertion(in.nextString()); } else if (fieldName.equals(CLICK_EVENT)) { @@ -177,6 +177,17 @@ final class StyleSerializer extends TypeAdapter<Style> { return style.build(); } + private boolean readBoolean(final JsonReader in) throws IOException { + final JsonToken peek = in.peek(); + if (peek == JsonToken.BOOLEAN) { + return in.nextBoolean(); + } else if (peek == JsonToken.STRING || peek == JsonToken.NUMBER) { + return Boolean.parseBoolean(in.nextString()); + } else { + throw new JsonParseException("Token of type " + peek + " cannot be interpreted as a boolean"); + } + } + private Object legacyHoverEventContents(final HoverEvent.Action<?> action, final Component rawValue) { if (action == HoverEvent.Action.SHOW_TEXT) { return rawValue; // Passthrough -- no serialization needed diff --git a/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/StyleTest.java b/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/StyleTest.java index 9d8147ce..ac9db8fd 100644 --- a/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/StyleTest.java +++ b/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/StyleTest.java @@ -24,6 +24,8 @@ package net.kyori.adventure.text.serializer.gson; import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonParseException; import java.util.UUID; import java.util.function.Function; import java.util.stream.Collectors; @@ -39,7 +41,9 @@ import net.kyori.adventure.text.format.TextDecoration; import org.junit.jupiter.api.Test; import static com.google.common.truth.Truth.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @SuppressWarnings("CodeBlock2Expr") @@ -87,6 +91,27 @@ class StyleTest extends GsonTest<Style> { @Test void testDecoration() { this.test(Style.style(TextDecoration.BOLD), object(json -> json.addProperty(name(TextDecoration.BOLD), true))); + + Style s0 = GsonComponentSerializer.gson().serializer().fromJson(object(object -> { + object.addProperty(name(TextDecoration.BOLD), "true"); + }), Style.class); + assertTrue(s0.hasDecoration(TextDecoration.BOLD)); + + s0 = GsonComponentSerializer.gson().serializer().fromJson(object(object -> { + object.addProperty(name(TextDecoration.BOLD), "false"); + }), Style.class); + assertFalse(s0.hasDecoration(TextDecoration.BOLD)); + + s0 = GsonComponentSerializer.gson().serializer().fromJson(object(object -> { + object.addProperty(name(TextDecoration.BOLD), 1); + }), Style.class); + assertFalse(s0.hasDecoration(TextDecoration.BOLD)); + + assertThrows(JsonParseException.class, () -> { + GsonComponentSerializer.gson().serializer().fromJson(object(object -> { + object.add(name(TextDecoration.BOLD), JsonNull.INSTANCE); + }), Style.class); + }); } @Test

['text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java', 'text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/StyleTest.java']

{'.java': 2}

Java

{'Java': 2437627, 'Kotlin': 34310}

MIT License

kyoripowered/adventure/439/427

kyoripowered

adventure

https://github.com/KyoriPowered/adventure/issues/427

https://github.com/KyoriPowered/adventure/pull/439

https://github.com/KyoriPowered/adventure/pull/439

fixes

Enforce nullability checks on component appending

At the moment, the nullability of components is not enforced when appending components, meaning that the children of a component may contain null elements.

eb867ffbbd1e751ced298235abe51ff52d1dcdfe

02449c28502bfcdec20db17481836612fc6477b5

https://github.com/kyoripowered/adventure/compare/eb867ffbbd1e751ced298235abe51ff52d1dcdfe...02449c28502bfcdec20db17481836612fc6477b5

diff --git a/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java b/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java index a58d0840..4fecb02e 100644 --- a/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java +++ b/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java @@ -39,6 +39,8 @@ import net.kyori.adventure.text.format.TextDecoration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import static java.util.Objects.requireNonNull; + /** * An abstract implementation of a component builder. * @@ -74,13 +76,14 @@ abstract class AbstractComponentBuilder<C extends BuildableComponent<C, B>, B ex public @NotNull B append(final @NotNull Component component) { if (component == Component.empty()) return (B) this; this.prepareChildren(); - this.children.add(component); + this.children.add(requireNonNull(component, "component")); return (B) this; } @Override @SuppressWarnings("unchecked") public @NotNull B append(final @NotNull Component@NotNull... components) { + requireNonNull(components, "components"); boolean prepared = false; for (int i = 0, length = components.length; i < length; i++) { final Component component = components[i]; @@ -89,7 +92,7 @@ abstract class AbstractComponentBuilder<C extends BuildableComponent<C, B>, B ex this.prepareChildren(); prepared = true; } - this.children.add(component); + this.children.add(requireNonNull(component, "components[?]")); } } return (B) this; @@ -98,6 +101,7 @@ abstract class AbstractComponentBuilder<C extends BuildableComponent<C, B>, B ex @Override @SuppressWarnings("unchecked") public @NotNull B append(final @NotNull ComponentLike@NotNull... components) { + requireNonNull(components, "components"); boolean prepared = false; for (int i = 0, length = components.length; i < length; i++) { final Component component = components[i].asComponent(); @@ -106,7 +110,7 @@ abstract class AbstractComponentBuilder<C extends BuildableComponent<C, B>, B ex this.prepareChildren(); prepared = true; } - this.children.add(component); + this.children.add(requireNonNull(component, "components[?]")); } } return (B) this; @@ -115,6 +119,7 @@ abstract class AbstractComponentBuilder<C extends BuildableComponent<C, B>, B ex @Override @SuppressWarnings("unchecked") public @NotNull B append(final @NotNull Iterable<? extends ComponentLike> components) { + requireNonNull(components, "components"); boolean prepared = false; for (final ComponentLike like : components) { final Component component = like.asComponent(); @@ -123,7 +128,7 @@ abstract class AbstractComponentBuilder<C extends BuildableComponent<C, B>, B ex this.prepareChildren(); prepared = true; } - this.children.add(component); + this.children.add(requireNonNull(component, "components[?]")); } } return (B) this; @@ -167,7 +172,7 @@ abstract class AbstractComponentBuilder<C extends BuildableComponent<C, B>, B ex if (!(child instanceof BuildableComponent<?, ?>)) { continue; } - final BuildableComponent<?, ?> mappedChild = function.apply((BuildableComponent<?, ?>) child); + final BuildableComponent<?, ?> mappedChild = requireNonNull(function.apply((BuildableComponent<?, ?>) child), "mappedChild"); if (child == mappedChild) { continue; } @@ -188,7 +193,7 @@ abstract class AbstractComponentBuilder<C extends BuildableComponent<C, B>, B ex if (!(child instanceof BuildableComponent<?, ?>)) { continue; } - final BuildableComponent<?, ?> mappedChild = function.apply((BuildableComponent<?, ?>) child); + final BuildableComponent<?, ?> mappedChild = requireNonNull(function.apply((BuildableComponent<?, ?>) child), "mappedChild"); if (mappedChild.children().isEmpty()) { if (child == mappedChild) { continue; diff --git a/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java b/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java index fabb7940..8356c35e 100644 --- a/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java +++ b/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java @@ -35,6 +35,8 @@ import net.kyori.adventure.util.MonkeyBars; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import static java.util.Objects.requireNonNull; + /** * Some magic to change return types. * @@ -77,7 +79,7 @@ public interface ScopedComponent<C extends Component> extends Component { default @NotNull C append(final @NotNull Component component) { if (component == Component.empty()) return (C) this; final List<Component> oldChildren = this.children(); - return this.children(MonkeyBars.addOne(oldChildren, component)); + return this.children(MonkeyBars.addOne(oldChildren, requireNonNull(component, "component"))); } @Override

['api/src/main/java/net/kyori/adventure/text/ScopedComponent.java', 'api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java']

{'.java': 2}

Java

{'Java': 2437627, 'Kotlin': 34310}

MIT License

kyoripowered/adventure/364/363

kyoripowered

adventure

https://github.com/KyoriPowered/adventure/issues/363

https://github.com/KyoriPowered/adventure/pull/364

https://github.com/KyoriPowered/adventure/pull/364

fixes

Component contains check doesn't check identical but separately created components

The following test will fail despite seeming like it should work. ```java final Component c0 = Component.text("best!"); final Component c1 = Component.text() .append(Component.text("Nero ")) .append(Component.text(" are the ").append(c0)) .build(); assertTrue(c1.contains(Component.text("best!"))); ``` As far as I'm concerned there are a few possible solutions to this: 1. Modify the Javadoc to note that this is how the check works. 2. Swap the identity check for a true equality check. 3. Create a new method, `Component#contains(Component, boolean)` which can be used to define the type of check that is made and make the old method overload this one. I kinda prefer options 1 or 3 because doing a true equality check every time here is going to be an awful lot of recursion which would suck.

9596f1ea0085cf0e987423637138d2358c683d8f

6e269d83f8daab0e0cc2b2cca2a0acc5d15204c8

https://github.com/kyoripowered/adventure/compare/9596f1ea0085cf0e987423637138d2358c683d8f...6e269d83f8daab0e0cc2b2cca2a0acc5d15204c8

diff --git a/api/src/main/java/net/kyori/adventure/text/Component.java b/api/src/main/java/net/kyori/adventure/text/Component.java index 8c85c3c8..b7ae6efa 100644 --- a/api/src/main/java/net/kyori/adventure/text/Component.java +++ b/api/src/main/java/net/kyori/adventure/text/Component.java @@ -28,7 +28,9 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; +import java.util.function.BiPredicate; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.UnaryOperator; @@ -93,6 +95,19 @@ import org.jetbrains.annotations.Unmodifiable; */ @ApiStatus.NonExtendable public interface Component extends ComponentBuilderApplicable, ComponentLike, Examinable, HoverEventSource<Component> { + /** + * A predicate that checks equality of two {@code Component}s using {@link Objects#equals(Object, Object)}. + * + * @since 4.8.0 + */ + BiPredicate<? super Component, ? super Component> EQUALS = Objects::equals; + /** + * A predicate that checks equality of two {@code Component}s using identity equality. + * + * @since 4.8.0 + */ + BiPredicate<? super Component, ? super Component> EQUALS_IDENTITY = (a, b) -> a == b; + /** * Gets an empty component. * @@ -1270,15 +1285,31 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex /** * Checks if this component contains a component. * + * <p>This method uses <b>identity</b> comparison when checking for contains. Use {@link #contains(Component, BiPredicate)} with {@link #EQUALS} if you + * wish to use full equality comparison.</p> + * * @param that the other component * @return {@code true} if this component contains the provided * component, {@code false} otherwise * @since 4.0.0 */ default boolean contains(final @NonNull Component that) { - if(this == that) return true; + return this.contains(that, EQUALS_IDENTITY); + } + + /** + * Checks if this component contains a component. + * + * @param that the other component + * @param equals the equality tester + * @return {@code true} if this component contains the provided + * component, {@code false} otherwise + * @since 4.8.0 + */ + default boolean contains(final @NonNull Component that, final @NonNull BiPredicate<? super Component, ? super Component> equals) { + if(equals.test(this, that)) return true; for(final Component child : this.children()) { - if(child.contains(that)) return true; + if(child.contains(that, equals)) return true; } final @Nullable HoverEvent<?> hoverEvent = this.hoverEvent(); if(hoverEvent != null) { @@ -1286,7 +1317,7 @@ public interface Component extends ComponentBuilderApplicable, ComponentLike, Ex final Component hover = (Component) hoverEvent.value(); if(that == hover) return true; for(final Component child : hover.children()) { - if(child.contains(that)) return true; + if(child.contains(that, equals)) return true; } } } diff --git a/api/src/test/java/net/kyori/adventure/text/TextComponentTest.java b/api/src/test/java/net/kyori/adventure/text/TextComponentTest.java index 5abe6724..1421731c 100644 --- a/api/src/test/java/net/kyori/adventure/text/TextComponentTest.java +++ b/api/src/test/java/net/kyori/adventure/text/TextComponentTest.java @@ -142,6 +142,18 @@ class TextComponentTest extends AbstractComponentTest<TextComponent, TextCompone assertTrue(component.contains(child)); } + // https://github.com/KyoriPowered/adventure/issues/363 + @Test + void testContainsEquality() { + final Component c0 = Component.text("best!"); + final Component c1 = Component.text() + .append(Component.text("Nero ")) + .append(Component.text(" are the ").append(c0)) + .build(); + + assertTrue(c1.contains(Component.text("best!"), Component.EQUALS)); + } + @Test void testContent() { final TextComponent c0 = Component.text("foo");

['api/src/main/java/net/kyori/adventure/text/Component.java', 'api/src/test/java/net/kyori/adventure/text/TextComponentTest.java']

{'.java': 2}

Java

{'Java': 2437627, 'Kotlin': 34310}

MIT License

kyoripowered/adventure/421/387

kyoripowered

adventure

https://github.com/KyoriPowered/adventure/issues/387

https://github.com/KyoriPowered/adventure/pull/421

https://github.com/KyoriPowered/adventure/pull/421

fixes

Loss of style when replacing full match text

When replacing text with a complete match of the text of a component with another component (`ComponentLike`) without a style (primitive text without any style), the outer style is lost, although it should be inherited. If you do a partial match, such as adding spaces at the end or beginning of the original component, the style is inherited correctly. I found the code that is responsible for this. However, I don’t know how to fix it correctly. https://github.com/KyoriPowered/adventure/blob/e23407ac6c0d4122cc4646d2f9e9fa1328a0423a/api/src/main/java/net/kyori/adventure/text/TextReplacementConfig.java#L193-L197 https://github.com/KyoriPowered/adventure/blob/e23407ac6c0d4122cc4646d2f9e9fa1328a0423a/api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java#L75-L76

201a0ba7bfbc9bd409a39c63524ee6a0e202238a

b2dfd4ec1d56a8fdf3bfd1fc00cdd94c96035b9c

https://github.com/kyoripowered/adventure/compare/201a0ba7bfbc9bd409a39c63524ee6a0e202238a...b2dfd4ec1d56a8fdf3bfd1fc00cdd94c96035b9c

diff --git a/api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java b/api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java index 4b2f28b9..483330ce 100644 --- a/api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java +++ b/api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java @@ -30,6 +30,7 @@ import java.util.regex.MatchResult; import java.util.regex.Matcher; import java.util.regex.Pattern; import net.kyori.adventure.text.event.HoverEvent; +import net.kyori.adventure.text.format.Style; import net.kyori.adventure.text.renderer.ComponentRenderer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -76,6 +77,10 @@ final class TextReplacementRenderer implements ComponentRenderer<TextReplacement .style(component.style())); modified = replacement == null ? Component.empty() : replacement.asComponent(); + + // merge style of the match into this component to prevent unexpected loss of style + modified = modified.style(modified.style().merge(component.style(), Style.Merge.Strategy.IF_ABSENT_ON_TARGET)); + if (children == null) { // Prepare children children = new ArrayList<>(oldChildrenSize + modified.children().size()); children.addAll(modified.children()); diff --git a/api/src/test/java/net/kyori/adventure/text/TextReplacementRendererTest.java b/api/src/test/java/net/kyori/adventure/text/TextReplacementRendererTest.java index c2c546e7..f39cc94e 100644 --- a/api/src/test/java/net/kyori/adventure/text/TextReplacementRendererTest.java +++ b/api/src/test/java/net/kyori/adventure/text/TextReplacementRendererTest.java @@ -246,4 +246,16 @@ class TextReplacementRendererTest { .build(); assertEquals(expected, replaced); } + + // https://github.com/KyoriPowered/adventure/issues/387 + @Test + void testFullMatchReplaceWithStyle() { + final Component base = Component.text("hello", NamedTextColor.RED); + + final Component replaced = base.replaceText(c -> c.matchLiteral("hello") + .replacement(Component.text("world").decorate(TextDecoration.BOLD))); + + final Component expected = Component.text("world", NamedTextColor.RED, TextDecoration.BOLD); + assertEquals(expected, replaced); + } }

['api/src/main/java/net/kyori/adventure/text/TextReplacementRenderer.java', 'api/src/test/java/net/kyori/adventure/text/TextReplacementRendererTest.java']

{'.java': 2}

Java

{'Java': 2437627, 'Kotlin': 34310}

MIT License

kyoripowered/adventure/954/953

kyoripowered

adventure

https://github.com/KyoriPowered/adventure/issues/953

https://github.com/KyoriPowered/adventure/pull/954

https://github.com/KyoriPowered/adventure/pull/954

closes

`ComponentFlattener.basic()` converts `ScoreComponent` with null `value` to null

A specific action bar received by Geyser cannot be serialized using the legacy serializer. The offending component was logged to console by the reporting user: ``` {"extra":[{"extra":[{"font":"nameplates:default","text":"끎끓끒끑끗"},{"color":"red","extra":[{"font":"nameplates:default","text":"끎끓끒끑끐끏끗"},{"color":"#00A5FF","extra":[{"font":"nameplates:default","text":"끎끔끑끏끗"},{"color":"#D31FEB","extra":[{"font":"nameplates:default","text":"끎끓끒끐끗"},{"color":"green","extra":[{"font":"nameplates:default","text":""},{"color":"#FFFEFD","extra":[{"font":"nameplates:ascent_-5","text":"100"},{"text":" "},{"font":"nameplates:default","text":"뀅"}],"text":""}],"text":"44°C "}],"text":"20.0 ✦ "}],"text":"1.0 ❈ "}],"text":"20 ❤ "}],"text":""}],"score":{"name":"nameplates","objective":"actionbar"}} ``` --- I was able to reproduce the issue and have posted it a test project [here](https://github.com/Konicai/actionbar-test/blob/main/src/test/java/me/konicai/test/ActionBarTest.java): ```java @Test public void testThing() { String input = "{\\"extra\\":[{\\"extra\\":[{\\"font\\":\\"nameplates:default\\",\\"text\\":\\"끎\\uF801끓\\uF801끒\\uF801끑\\uF801끗\\uF809\\uF808\\uF803\\"},{\\"color\\":\\"red\\",\\"extra\\":[{\\"font\\":\\"nameplates:default\\",\\"text\\":\\"끎\\uF801끓\\uF801끒\\uF801끑\\uF801끐\\uF801끏\\uF801끗\\uF809\\uF808\\uF806\\"},{\\"color\\":\\"#00A5FF\\",\\"extra\\":[{\\"font\\":\\"nameplates:default\\",\\"text\\":\\"끎\\uF801끔\\uF801끑\\uF801끏\\uF801끗\\uF80A\\uF804\\"},{\\"color\\":\\"#D31FEB\\",\\"extra\\":[{\\"font\\":\\"nameplates:default\\",\\"text\\":\\"끎\\uF801끓\\uF801끒\\uF801끐\\uF801끗\\uF809\\uF808\\uF801\\"},{\\"color\\":\\"green\\",\\"extra\\":[{\\"font\\":\\"nameplates:default\\",\\"text\\":\\"\\uF819\\uF818\\uF813\\"},{\\"color\\":\\"#FFFEFD\\",\\"extra\\":[{\\"font\\":\\"nameplates:ascent_-5\\",\\"text\\":\\"100\\"},{\\"text\\":\\" \\"},{\\"font\\":\\"nameplates:default\\",\\"text\\":\\"뀅\\"}],\\"text\\":\\"\\"}],\\"text\\":\\"44°C \\uF80A\\uF809\\uF804\\"}],\\"text\\":\\"20.0 ✦ \\"}],\\"text\\":\\"1.0 ❈ \\"}],\\"text\\":\\"20 ❤ \\"}],\\"text\\":\\"\\uF828\\uF824\\"}],\\"score\\":{\\"name\\":\\"nameplates\\",\\"objective\\":\\"actionbar\\"}}"; Component message = GsonComponentSerializer.gson().deserialize(input); System.out.println(PlainTextComponentSerializer.plainText().serialize(message)); LegacyComponentSerializer.legacySection().serialize(message); } ``` The following error occurs while trying to serialize the component to legacy text: ``` Cannot invoke "String.isEmpty()" because "text" is null java.lang.NullPointerException: Cannot invoke "String.isEmpty()" because "text" is null at net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializerImpl$Cereal.component(LegacyComponentSerializerImpl.java:326) at net.kyori.adventure.text.flattener.ComponentFlattenerImpl.lambda$flattener$3(ComponentFlattenerImpl.java:117) at net.kyori.adventure.text.flattener.ComponentFlattenerImpl.flatten0(ComponentFlattenerImpl.java:95) at net.kyori.adventure.text.flattener.ComponentFlattenerImpl.flatten(ComponentFlattenerImpl.java:78) at net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializerImpl.serialize(LegacyComponentSerializerImpl.java:271) at me.konicai.test.ActionBarTest.testThing(ActionBarTest.java:18) ``` The plain text serializer works fine and creates the following output (null at the front seems smelly): ``` null끎끓끒끑끗20 ❤ 끎끓끒끑끐끏끗1.0 ❈ 끎끔끑끏끗20.0 ✦ 끎끓끒끐끗44°C 100 뀅 ``` --- This occurs with `4.14.0`, which the test project is running (unlike Geyser). The affected code in Geyser begins [here](https://github.com/GeyserMC/Geyser/blob/18e7db8c30821edf38410d91e13d1a3690eff066/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetActionBarTextTranslator.java#L44).

f8fa6ffec951743d90994855509bdf852e994c36

999ae5611e2e49cccf46ed68806ac56a600a7c19

https://github.com/kyoripowered/adventure/compare/f8fa6ffec951743d90994855509bdf852e994c36...999ae5611e2e49cccf46ed68806ac56a600a7c19

diff --git a/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattenerImpl.java b/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattenerImpl.java index 78dce1c1..51c1987b 100644 --- a/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattenerImpl.java +++ b/api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattenerImpl.java @@ -47,7 +47,11 @@ final class ComponentFlattenerImpl implements ComponentFlattener { @SuppressWarnings("deprecation") static final ComponentFlattener BASIC = new BuilderImpl() .mapper(KeybindComponent.class, component -> component.keybind()) // IntelliJ is wrong here, this is fine - .mapper(ScoreComponent.class, ScoreComponent::value) // Removed in Vanilla 1.16, but we keep it for backwards compat + .mapper(ScoreComponent.class, component -> { + // Removed in Vanilla 1.16, but we keep it for backwards compat + final @Nullable String value = component.value(); + return value != null ? value : ""; + }) .mapper(SelectorComponent.class, SelectorComponent::pattern) .mapper(TextComponent.class, TextComponent::content) .mapper(TranslatableComponent.class, component -> {

['api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattenerImpl.java']

{'.java': 1}

Java

{'Java': 2437627, 'Kotlin': 34310}

MIT License

kyoripowered/adventure/213/212

kyoripowered

adventure

https://github.com/KyoriPowered/adventure/issues/212

https://github.com/KyoriPowered/adventure/pull/213

https://github.com/KyoriPowered/adventure/pull/213

fixes

@NonNull not being followed when using GsonComponentSerializer

When converting `"null"` using the GsonComponentSerializer the `deserialize` method returns null even though the method is marked `@NonNull`. I think it would be best to throw a JsonSyntaxException or something similar in this case. Version: 7acd956 Code: ```java System.out.println(GsonComponentSerializer.gson().deserialize("null")) System.out.println(GsonComponentSerializer.gson().deserialize("null") == null) ``` Output: ``` null true ```

f627af74783aa7b0372c9a090d68f0d4b00ce274

9fc26d18a88eb43a04c5a240e7aa99ff6cbfdf2e

https://github.com/kyoripowered/adventure/compare/f627af74783aa7b0372c9a090d68f0d4b00ce274...9fc26d18a88eb43a04c5a240e7aa99ff6cbfdf2e

diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java index 2fa1686c..56f905bf 100644 --- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java +++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java @@ -235,7 +235,7 @@ final class ComponentSerializerImpl implements JsonDeserializer<Component>, Json return object; } - private static JsonParseException notSureHowToDeserialize(final JsonElement element) { + static JsonParseException notSureHowToDeserialize(final Object element) { return new JsonParseException("Don't know how to turn " + element + " into a Component"); } diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java index 0b214e22..89197320 100644 --- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java +++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java @@ -80,7 +80,9 @@ final class GsonComponentSerializerImpl implements GsonComponentSerializer { @Override public @NonNull Component deserialize(final @NonNull String string) { - return this.serializer().fromJson(string, Component.class); + final Component component = this.serializer().fromJson(string, Component.class); + if(component == null) throw ComponentSerializerImpl.notSureHowToDeserialize(string); + return component; } @Override diff --git a/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerTest.java b/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerTest.java index 6671aa4e..5db99099 100644 --- a/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerTest.java +++ b/text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerTest.java @@ -35,8 +35,15 @@ import static net.kyori.adventure.text.serializer.gson.GsonTest.array; import static net.kyori.adventure.text.serializer.gson.GsonTest.object; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; class GsonComponentSerializerTest { + @Test + void testDeserializeNull() { + final JsonParseException jpe = assertThrows(JsonParseException.class, () -> GsonComponentSerializer.gson().deserialize("null")); + assertTrue(jpe.getMessage().contains("turn null into a Component")); + } + @Test void testDeserializePrimitive() { assertEquals(Component.text("potato"), GsonComponentSerializer.gson().serializer().fromJson(new JsonPrimitive("potato"), Component.class));

['text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java', 'text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java', 'text-serializer-gson/src/test/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerTest.java']

{'.java': 3}

Java

{'Java': 2437627, 'Kotlin': 34310}

MIT License

kyoripowered/adventure/12/11

kyoripowered

adventure

https://github.com/KyoriPowered/adventure/issues/11

https://github.com/KyoriPowered/adventure/pull/12

https://github.com/KyoriPowered/adventure/pull/12

fixes

Legacy color code parsing

When more than one color code is specified consecutively, the one which appears first is used, rather than the last. For example, `&a&9foo` is parsed to `foo` with color `green` as opposed to `foo` with color `blue`. Test case: ```java @Test public void testFromColor() { final TextComponent component = TextComponent.builder("") .append(TextComponent.of("foo").color(TextColor.BLUE)) .build(); assertEquals(component, ComponentSerializers.LEGACY.deserialize("&a&9foo", '&')); } ``` ``` java.lang.AssertionError: Expected :TextComponent{content=, children=[TextComponent{content=foo, children=[], color=blue, obfuscated=null, bold=null, strikethrough=null, underlined=null, italic=null, clickEvent=null, hoverEvent=null, insertion=null}], color=null, obfuscated=null, bold=null, strikethrough=null, underlined=null, italic=null, clickEvent=null, hoverEvent=null, insertion=null} Actual :TextComponent{content=, children=[TextComponent{content=foo, children=[], color=green, obfuscated=null, bold=null, strikethrough=null, underlined=null, italic=null, clickEvent=null, hoverEvent=null, insertion=null}], color=null, obfuscated=null, bold=null, strikethrough=null, underlined=null, italic=null, clickEvent=null, hoverEvent=null, insertion=null} ``` I've tried playing around with `LegacyComponentSerializer` to work out a fix. I assume this is happening because the string is being parsed in reverse, meaning the first color code in the string is being read after the color code later in the string - hence overriding the last.

24e44d683f825f9cc6fecbe2c8f5b684e5494b34

0ef8fcc8a7d1ee78aefd6aec2f3b479b3721c3b7

https://github.com/kyoripowered/adventure/compare/24e44d683f825f9cc6fecbe2c8f5b684e5494b34...0ef8fcc8a7d1ee78aefd6aec2f3b479b3721c3b7

diff --git a/src/main/java/net/kyori/text/AbstractBuildableComponent.java b/src/main/java/net/kyori/text/AbstractBuildableComponent.java index 949ebfe1..904274a7 100644 --- a/src/main/java/net/kyori/text/AbstractBuildableComponent.java +++ b/src/main/java/net/kyori/text/AbstractBuildableComponent.java @@ -215,6 +215,15 @@ public abstract class AbstractBuildableComponent<C extends BuildableComponent<C, return (B) this; } + @NonNull + @Override + public B colorIfAbsent(@Nullable final TextColor color) { + if(this.color == null) { + this.color = color; + } + return (B) this; + } + @NonNull @Override public B decoration(@NonNull final TextDecoration decoration, @NonNull final TextDecoration.State state) { diff --git a/src/main/java/net/kyori/text/BuildableComponent.java b/src/main/java/net/kyori/text/BuildableComponent.java index 4cb74fec..168fcabb 100644 --- a/src/main/java/net/kyori/text/BuildableComponent.java +++ b/src/main/java/net/kyori/text/BuildableComponent.java @@ -125,6 +125,15 @@ public interface BuildableComponent<C extends BuildableComponent<C, B>, B extend @NonNull B color(@Nullable final TextColor color); + /** + * Sets the color of this component if there isn't one set already. + * + * @param color the color + * @return this builder + */ + @NonNull + B colorIfAbsent(@Nullable final TextColor color); + /** * Sets the state of a decoration on this component. * diff --git a/src/main/java/net/kyori/text/serializer/LegacyComponentSerializerImpl.java b/src/main/java/net/kyori/text/serializer/LegacyComponentSerializerImpl.java index cf776c30..85df3668 100644 --- a/src/main/java/net/kyori/text/serializer/LegacyComponentSerializerImpl.java +++ b/src/main/java/net/kyori/text/serializer/LegacyComponentSerializerImpl.java @@ -109,7 +109,7 @@ class LegacyComponentSerializerImpl implements LegacyComponentSerializer { private static boolean applyFormat(@NonNull final TextComponent.Builder builder, @NonNull final TextFormat format) { if(format instanceof TextColor) { - builder.color((TextColor) format); + builder.colorIfAbsent((TextColor) format); return true; } else if(format instanceof TextDecoration) { builder.decoration((TextDecoration) format, TextDecoration.State.TRUE); diff --git a/src/test/java/net/kyori/text/serializer/ComponentSerializerTest.java b/src/test/java/net/kyori/text/serializer/ComponentSerializerTest.java index d46696ef..5a80917c 100644 --- a/src/test/java/net/kyori/text/serializer/ComponentSerializerTest.java +++ b/src/test/java/net/kyori/text/serializer/ComponentSerializerTest.java @@ -47,6 +47,15 @@ public class ComponentSerializerTest { assertEquals(component, ComponentSerializers.LEGACY.deserialize("&a&lfoo&9bar", '&')); } + @Test + public void testFromColorOverride() { + final TextComponent component = TextComponent.builder("") + .append(TextComponent.of("foo").color(TextColor.BLUE)) + .build(); + + assertEquals(component, ComponentSerializers.LEGACY.deserialize("&a&9foo", '&')); + } + @Test public void testToLegacy() { final TextComponent c1 = TextComponent.builder("hi")

['src/test/java/net/kyori/text/serializer/ComponentSerializerTest.java', 'src/main/java/net/kyori/text/BuildableComponent.java', 'src/main/java/net/kyori/text/serializer/LegacyComponentSerializerImpl.java', 'src/main/java/net/kyori/text/AbstractBuildableComponent.java']

{'.java': 4}

Java

{'Java': 2437627, 'Kotlin': 34310}

MIT License

scalecube/scalecube-services/550/549

scalecube

scalecube-services

https://github.com/scalecube/scalecube-services/issues/549

https://github.com/scalecube/scalecube-services/pull/550

https://github.com/scalecube/scalecube-services/pull/550

fix

Client-sdk doesn't parse type with nested generics

For example `java.util.List<io.scalecube.FetchResponse>>` throws exception

76c8de6019e5480a1436d12b37acf163f70eea47

7c443017c41e6746ced8381747b5386db0ce0e38

https://github.com/scalecube/scalecube-services/compare/76c8de6019e5480a1436d12b37acf163f70eea47...7c443017c41e6746ced8381747b5386db0ce0e38

diff --git a/services-api/src/main/java/io/scalecube/services/methods/MethodInfo.java b/services-api/src/main/java/io/scalecube/services/methods/MethodInfo.java index 0fcdb9fb..2d6c4463 100644 --- a/services-api/src/main/java/io/scalecube/services/methods/MethodInfo.java +++ b/services-api/src/main/java/io/scalecube/services/methods/MethodInfo.java @@ -3,13 +3,14 @@ package io.scalecube.services.methods; import io.scalecube.services.CommunicationMode; import io.scalecube.services.api.Qualifier; import io.scalecube.services.api.ServiceMessage; +import java.lang.reflect.Type; public final class MethodInfo { private final String serviceName; private final String methodName; private final String qualifier; - private final Class<?> parameterizedReturnType; + private final Type parameterizedReturnType; private final CommunicationMode communicationMode; private final int parameterCount; private final Class<?> requestType; @@ -27,7 +28,7 @@ public final class MethodInfo { public MethodInfo( String serviceName, String methodName, - Class<?> parameterizedReturnType, + Type parameterizedReturnType, CommunicationMode communicationMode, int parameterCount, Class<?> requestType) { @@ -53,7 +54,7 @@ public final class MethodInfo { return qualifier; } - public Class<?> parameterizedReturnType() { + public Type parameterizedReturnType() { return parameterizedReturnType; } diff --git a/services-api/src/main/java/io/scalecube/services/transport/api/DataCodec.java b/services-api/src/main/java/io/scalecube/services/transport/api/DataCodec.java index 1d62b68c..7b9bd9ab 100644 --- a/services-api/src/main/java/io/scalecube/services/transport/api/DataCodec.java +++ b/services-api/src/main/java/io/scalecube/services/transport/api/DataCodec.java @@ -4,6 +4,7 @@ import io.scalecube.services.ServiceLoaderUtil; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.lang.reflect.Type; import java.util.Collection; import java.util.Map; import java.util.function.Function; @@ -41,5 +42,5 @@ public interface DataCodec { void encode(OutputStream stream, Object value) throws IOException; - Object decode(InputStream stream, Class<?> type) throws IOException; + Object decode(InputStream stream, Type type) throws IOException; } diff --git a/services-api/src/main/java/io/scalecube/services/transport/api/ServiceMessageCodec.java b/services-api/src/main/java/io/scalecube/services/transport/api/ServiceMessageCodec.java index 9c261a50..9bb54845 100644 --- a/services-api/src/main/java/io/scalecube/services/transport/api/ServiceMessageCodec.java +++ b/services-api/src/main/java/io/scalecube/services/transport/api/ServiceMessageCodec.java @@ -8,6 +8,7 @@ import io.netty.buffer.Unpooled; import io.scalecube.services.api.ErrorData; import io.scalecube.services.api.ServiceMessage; import io.scalecube.services.exceptions.MessageCodecException; +import java.lang.reflect.Type; import java.util.function.BiFunction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -104,7 +105,7 @@ public final class ServiceMessageCodec { * (of type data type) * @throws MessageCodecException when decode fails */ - public static ServiceMessage decodeData(ServiceMessage message, Class<?> dataType) + public static ServiceMessage decodeData(ServiceMessage message, Type dataType) throws MessageCodecException { if (dataType == null || !message.hasData(ByteBuf.class) @@ -113,7 +114,7 @@ public final class ServiceMessageCodec { } Object data; - Class<?> targetType = message.isError() ? ErrorData.class : dataType; + Type targetType = message.isError() ? ErrorData.class : dataType; ByteBuf dataBuffer = message.data(); try (ByteBufInputStream inputStream = new ByteBufInputStream(dataBuffer, true)) { diff --git a/services-examples/src/main/java/io/scalecube/services/examples/GreetingService.java b/services-examples/src/main/java/io/scalecube/services/examples/GreetingService.java index de8856ba..93895fd1 100644 --- a/services-examples/src/main/java/io/scalecube/services/examples/GreetingService.java +++ b/services-examples/src/main/java/io/scalecube/services/examples/GreetingService.java @@ -2,6 +2,7 @@ package io.scalecube.services.examples; import io.scalecube.services.annotations.Service; import io.scalecube.services.annotations.ServiceMethod; +import java.util.List; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -28,6 +29,9 @@ public interface GreetingService { @ServiceMethod("pojo/one") Mono<GreetingResponse> pojoOne(GreetingRequest request); + @ServiceMethod("pojo/list") + Mono<List<GreetingResponse>> pojoList(GreetingRequest request); + @ServiceMethod("pojo/many") Flux<GreetingResponse> pojoMany(GreetingRequest request); diff --git a/services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceCancelCallback.java b/services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceCancelCallback.java index df94b777..50779793 100644 --- a/services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceCancelCallback.java +++ b/services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceCancelCallback.java @@ -1,5 +1,6 @@ package io.scalecube.services.examples; +import java.util.List; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -42,6 +43,11 @@ public class GreetingServiceCancelCallback implements GreetingService { return greetingService.pojoOne(request).doOnCancel(onCancel); } + @Override + public Mono<List<GreetingResponse>> pojoList(GreetingRequest request) { + return greetingService.pojoList(request).doOnCancel(onCancel); + } + @Override public Flux<GreetingResponse> pojoMany(GreetingRequest request) { return greetingService.pojoMany(request).doOnCancel(onCancel); diff --git a/services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceImpl.java b/services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceImpl.java index fefe0773..ab0a3f48 100644 --- a/services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceImpl.java +++ b/services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceImpl.java @@ -1,6 +1,8 @@ package io.scalecube.services.examples; import java.time.Duration; +import java.util.Collections; +import java.util.List; import java.util.stream.LongStream; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -47,6 +49,12 @@ public class GreetingServiceImpl implements GreetingService { return Mono.defer(() -> one(request.getText()).map(GreetingResponse::new)); } + @Override + public Mono<List<GreetingResponse>> pojoList(GreetingRequest request) { + return Mono.defer( + () -> one(request.getText()).map(GreetingResponse::new).map(Collections::singletonList)); + } + @Override public Flux<GreetingResponse> pojoMany(GreetingRequest request) { return Flux.defer(() -> many(request.getText()).map(GreetingResponse::new)); diff --git a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/ClientCodec.java b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/ClientCodec.java index 6394a7fc..2849dc2d 100644 --- a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/ClientCodec.java +++ b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/ClientCodec.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; import io.scalecube.services.gateway.clientsdk.exceptions.MessageCodecException; import io.scalecube.services.transport.api.DataCodec; +import java.lang.reflect.Type; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,14 +26,14 @@ public interface ClientCodec<T> { * @return client message object. * @throws MessageCodecException in case if data decoding fails. */ - default ClientMessage decodeData(ClientMessage message, Class<?> dataType) + default ClientMessage decodeData(ClientMessage message, Type dataType) throws MessageCodecException { if (!message.hasData(ByteBuf.class) || dataType == null) { return message; } Object data; - Class<?> targetType = message.isError() ? ErrorData.class : dataType; + Type targetType = message.isError() ? ErrorData.class : dataType; ByteBuf dataBuffer = message.data(); try (ByteBufInputStream inputStream = new ByteBufInputStream(dataBuffer, true)) { @@ -48,7 +49,7 @@ public interface ClientCodec<T> { /** * Returns codec which is used to decode data object of {@link ClientMessage}. * - * @see ClientCodec#decodeData(ClientMessage, Class) + * @see ClientCodec#decodeData(ClientMessage, Type) * @return data codec */ DataCodec getDataCodec(); diff --git a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/Reflect.java b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/Reflect.java index af30d76a..ddf06b4f 100644 --- a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/Reflect.java +++ b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/Reflect.java @@ -70,15 +70,10 @@ class Reflect { * @param method to extract type from. * @return the generic type of the return value or object. */ - private static Class<?> parameterizedReturnType(Method method) { + private static Type parameterizedReturnType(Method method) { Type type = method.getGenericReturnType(); if (type instanceof ParameterizedType) { - try { - return Class.forName( - (((ParameterizedType) type).getActualTypeArguments()[0]).getTypeName()); - } catch (ClassNotFoundException e) { - return Object.class; - } + return ((ParameterizedType) type).getActualTypeArguments()[0]; } else { return Object.class; } diff --git a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/RemoteInvocationHandler.java b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/RemoteInvocationHandler.java index ff69d869..0a78f730 100644 --- a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/RemoteInvocationHandler.java +++ b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/RemoteInvocationHandler.java @@ -4,6 +4,7 @@ import io.scalecube.services.gateway.clientsdk.exceptions.ClientErrorMapper; import io.scalecube.services.methods.MethodInfo; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; +import java.lang.reflect.Type; import java.util.Map; import reactor.core.Exceptions; @@ -42,7 +43,7 @@ public class RemoteInvocationHandler implements InvocationHandler { .data(methodInfo.parameterCount() != 0 ? args[0] : null) .build(); - Class<?> responseType = methodInfo.parameterizedReturnType(); + Type responseType = methodInfo.parameterizedReturnType(); switch (methodInfo.communicationMode()) { case REQUEST_RESPONSE: diff --git a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/http/HttpGatewayTest.java b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/http/HttpGatewayTest.java index 9e46c1fe..e8cdd0fa 100644 --- a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/http/HttpGatewayTest.java +++ b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/http/HttpGatewayTest.java @@ -54,6 +54,14 @@ class HttpGatewayTest { .verify(TIMEOUT); } + @Test + void shouldReturnListResponseWithPojoRequest() { + StepVerifier.create(service.pojoList(new GreetingRequest("hello"))) + .expectNextMatches(response -> "Echo:hello".equals(response.get(0).getText())) + .expectComplete() + .verify(TIMEOUT); + } + @Test void shouldReturnNoContentWhenResponseIsEmpty() { StepVerifier.create(service.emptyOne("hello")).expectComplete().verify(TIMEOUT); diff --git a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayTest.java b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayTest.java index caa83e17..c20fb32f 100644 --- a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayTest.java +++ b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayTest.java @@ -52,6 +52,14 @@ class HttpLocalGatewayTest { .verify(TIMEOUT); } + @Test + void shouldReturnListResponseWithPojoRequest() { + StepVerifier.create(service.pojoList(new GreetingRequest("hello"))) + .expectNextMatches(response -> "Echo:hello".equals(response.get(0).getText())) + .expectComplete() + .verify(TIMEOUT); + } + @Test void shouldReturnNoContentWhenResponseIsEmpty() { StepVerifier.create(service.emptyOne("hello")).expectComplete().verify(TIMEOUT); diff --git a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/rsocket/RSocketGatewayTest.java b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/rsocket/RSocketGatewayTest.java index 7ed709f2..d09da7e7 100644 --- a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/rsocket/RSocketGatewayTest.java +++ b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/rsocket/RSocketGatewayTest.java @@ -55,6 +55,14 @@ class RSocketGatewayTest { .verify(TIMEOUT); } + @Test + void shouldReturnListResponseWithPojoRequest() { + StepVerifier.create(service.pojoList(new GreetingRequest("hello"))) + .expectNextMatches(response -> "Echo:hello".equals(response.get(0).getText())) + .expectComplete() + .verify(TIMEOUT); + } + @Test void shouldReturnManyResponses() { int expectedResponseNum = 3; diff --git a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/rsocket/RSocketLocalGatewayTest.java b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/rsocket/RSocketLocalGatewayTest.java index e1205fe4..5cb09604 100644 --- a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/rsocket/RSocketLocalGatewayTest.java +++ b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/rsocket/RSocketLocalGatewayTest.java @@ -55,6 +55,14 @@ class RSocketLocalGatewayTest { .verify(TIMEOUT); } + @Test + void shouldReturnListResponseWithPojoRequest() { + StepVerifier.create(service.pojoList(new GreetingRequest("hello"))) + .expectNextMatches(response -> "Echo:hello".equals(response.get(0).getText())) + .expectComplete() + .verify(TIMEOUT); + } + @Test void shouldReturnManyResponses() { int expectedResponseNum = 3; diff --git a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java index 2989056c..0b32d249 100644 --- a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java +++ b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java @@ -55,6 +55,14 @@ class WebsocketGatewayTest { .verify(TIMEOUT); } + @Test + void shouldReturnListResponseWithPojoRequest() { + StepVerifier.create(service.pojoList(new GreetingRequest("hello"))) + .expectNextMatches(response -> "Echo:hello".equals(response.get(0).getText())) + .expectComplete() + .verify(TIMEOUT); + } + @Test void shouldReturnManyResponsesWithSimpleRequest() { int expectedResponseNum = 3; diff --git a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java index 39adede8..6004ecfb 100644 --- a/services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java +++ b/services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java @@ -54,6 +54,14 @@ class WebsocketLocalGatewayTest { .verify(TIMEOUT); } + @Test + void shouldReturnListResponseWithPojoRequest() { + StepVerifier.create(service.pojoList(new GreetingRequest("hello"))) + .expectNextMatches(response -> "Echo:hello".equals(response.get(0).getText())) + .expectComplete() + .verify(TIMEOUT); + } + @Test void shouldReturnManyResponsesWithSimpleRequest() { int expectedResponseNum = 3; diff --git a/services-transport-jackson/src/main/java/io/scalecube/services/transport/jackson/JacksonCodec.java b/services-transport-jackson/src/main/java/io/scalecube/services/transport/jackson/JacksonCodec.java index ee8a3430..8c565e70 100644 --- a/services-transport-jackson/src/main/java/io/scalecube/services/transport/jackson/JacksonCodec.java +++ b/services-transport-jackson/src/main/java/io/scalecube/services/transport/jackson/JacksonCodec.java @@ -12,6 +12,7 @@ import io.scalecube.services.transport.api.HeadersCodec; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.lang.reflect.Type; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -53,8 +54,8 @@ public final class JacksonCodec implements DataCodec, HeadersCodec { } @Override - public Object decode(InputStream stream, Class<?> type) throws IOException { - return mapper.readValue(stream, type); + public Object decode(InputStream stream, Type type) throws IOException { + return mapper.readValue(stream, mapper.getTypeFactory().constructType(type)); } private static ObjectMapper initMapper() { diff --git a/services-transport-protostuff/src/main/java/io/scalecube/services/transport/protostuff/ProtostuffCodec.java b/services-transport-protostuff/src/main/java/io/scalecube/services/transport/protostuff/ProtostuffCodec.java index ca8d26a7..c09d821e 100644 --- a/services-transport-protostuff/src/main/java/io/scalecube/services/transport/protostuff/ProtostuffCodec.java +++ b/services-transport-protostuff/src/main/java/io/scalecube/services/transport/protostuff/ProtostuffCodec.java @@ -5,11 +5,14 @@ import io.protostuff.ProtostuffIOUtil; import io.protostuff.Schema; import io.protostuff.StringMapSchema; import io.protostuff.runtime.RuntimeSchema; +import io.scalecube.services.exceptions.MessageCodecException; import io.scalecube.services.transport.api.DataCodec; import io.scalecube.services.transport.api.HeadersCodec; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; import java.util.HashMap; import java.util.Map; @@ -40,14 +43,24 @@ public final class ProtostuffCodec implements HeadersCodec, DataCodec { } @Override - public Object decode(InputStream stream, Class<?> type) throws IOException { - Schema schema = RuntimeSchema.getSchema(type); - Object result = schema.newMessage(); + public Object decode(InputStream stream, Type type) throws IOException { + try { + Class<?> clazz = null; + if (type instanceof Class<?>) { + clazz = (Class<?>) type; + } else if (type instanceof ParameterizedType) { + clazz = Class.forName(((ParameterizedType) type).getRawType().getTypeName()); + } + Schema schema = RuntimeSchema.getSchema(clazz); + Object result = schema.newMessage(); - try (RecyclableLinkedBuffer rlb = recyclableLinkedBuffer.get()) { - ProtobufIOUtil.mergeFrom(stream, result, schema, rlb.buffer()); + try (RecyclableLinkedBuffer rlb = recyclableLinkedBuffer.get()) { + ProtobufIOUtil.mergeFrom(stream, result, schema, rlb.buffer()); + } + return result; + } catch (ClassNotFoundException e) { + throw new MessageCodecException("Couldn't decode message", e); } - return result; } @Override diff --git a/services/src/main/java/io/scalecube/services/Reflect.java b/services/src/main/java/io/scalecube/services/Reflect.java index 4b53f2ab..358e772f 100644 --- a/services/src/main/java/io/scalecube/services/Reflect.java +++ b/services/src/main/java/io/scalecube/services/Reflect.java @@ -62,15 +62,10 @@ public final class Reflect { * @param method to extract type from. * @return the generic type of the return value or object. */ - public static Class<?> parameterizedReturnType(Method method) { + public static Type parameterizedReturnType(Method method) { Type type = method.getGenericReturnType(); if (type instanceof ParameterizedType) { - try { - return Class.forName( - (((ParameterizedType) type).getActualTypeArguments()[0]).getTypeName()); - } catch (ClassNotFoundException e) { - return Object.class; - } + return ((ParameterizedType) type).getActualTypeArguments()[0]; } else { return Object.class; } diff --git a/services/src/main/java/io/scalecube/services/ServiceCall.java b/services/src/main/java/io/scalecube/services/ServiceCall.java index fe1212cd..9ef8986e 100644 --- a/services/src/main/java/io/scalecube/services/ServiceCall.java +++ b/services/src/main/java/io/scalecube/services/ServiceCall.java @@ -19,6 +19,7 @@ import io.scalecube.services.transport.api.ReferenceCountUtil; import io.scalecube.services.transport.api.ServiceMessageCodec; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.lang.reflect.Type; import java.util.Map; import java.util.Optional; import java.util.concurrent.Callable; @@ -150,7 +151,7 @@ public class ServiceCall { * @param responseType type of response. * @return mono publisher completing with single response message or with error. */ - public Mono<ServiceMessage> requestOne(ServiceMessage request, Class<?> responseType) { + public Mono<ServiceMessage> requestOne(ServiceMessage request, Type responseType) { return Mono.defer( () -> { String qualifier = request.qualifier(); @@ -175,7 +176,7 @@ public class ServiceCall { * @return mono publisher completing with single response message or with error. */ public Mono<ServiceMessage> requestOne( - ServiceMessage request, Class<?> responseType, Address address) { + ServiceMessage request, Type responseType, Address address) { return Mono.defer( () -> { requireNonNull(address, "requestOne address parameter is required and must not be null"); @@ -205,7 +206,7 @@ public class ServiceCall { * @param responseType type of responses. * @return flux publisher of service responses. */ - public Flux<ServiceMessage> requestMany(ServiceMessage request, Class<?> responseType) { + public Flux<ServiceMessage> requestMany(ServiceMessage request, Type responseType) { return Flux.defer( () -> { String qualifier = request.qualifier(); @@ -232,7 +233,7 @@ public class ServiceCall { * @return flux publisher of service responses. */ public Flux<ServiceMessage> requestMany( - ServiceMessage request, Class<?> responseType, Address address) { + ServiceMessage request, Type responseType, Address address) { return Flux.defer( () -> { requireNonNull(address, "requestMany address parameter is required and must not be null"); @@ -263,7 +264,7 @@ public class ServiceCall { * @return flux publisher of service responses. */ public Flux<ServiceMessage> requestBidirectional( - Publisher<ServiceMessage> publisher, Class<?> responseType) { + Publisher<ServiceMessage> publisher, Type responseType) { return Flux.from(publisher) .switchOnFirst( (first, messages) -> { @@ -298,7 +299,7 @@ public class ServiceCall { * @return flux publisher of service responses. */ public Flux<ServiceMessage> requestBidirectional( - Publisher<ServiceMessage> publisher, Class<?> responseType, Address address) { + Publisher<ServiceMessage> publisher, Type responseType, Address address) { return Flux.defer( () -> { requireNonNull( @@ -331,7 +332,7 @@ public class ServiceCall { new Class[] {serviceInterface}, (proxy, method, params) -> { final MethodInfo methodInfo = genericReturnTypes.get(method); - final Class<?> returnType = methodInfo.parameterizedReturnType(); + final Type returnType = methodInfo.parameterizedReturnType(); final boolean isServiceMessage = methodInfo.isRequestTypeServiceMessage(); Optional<Object> check =

['services-gateway-tests/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayTest.java', 'services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/ClientCodec.java', 'services-api/src/main/java/io/scalecube/services/transport/api/DataCodec.java', 'services-gateway-tests/src/test/java/io/scalecube/services/gateway/rsocket/RSocketGatewayTest.java', 'services/src/main/java/io/scalecube/services/ServiceCall.java', 'services-api/src/main/java/io/scalecube/services/transport/api/ServiceMessageCodec.java', 'services/src/main/java/io/scalecube/services/Reflect.java', 'services-examples/src/main/java/io/scalecube/services/examples/GreetingService.java', 'services-transport-protostuff/src/main/java/io/scalecube/services/transport/protostuff/ProtostuffCodec.java', 'services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceImpl.java', 'services-gateway-tests/src/test/java/io/scalecube/services/gateway/http/HttpGatewayTest.java', 'services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/Reflect.java', 'services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/RemoteInvocationHandler.java', 'services-transport-jackson/src/main/java/io/scalecube/services/transport/jackson/JacksonCodec.java', 'services-api/src/main/java/io/scalecube/services/methods/MethodInfo.java', 'services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java', 'services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java', 'services-gateway-tests/src/test/java/io/scalecube/services/gateway/rsocket/RSocketLocalGatewayTest.java', 'services-examples/src/main/java/io/scalecube/services/examples/GreetingServiceCancelCallback.java']

{'.java': 19}

Java

{'Java': 668288}

Apache License 2.0

scalecube/scalecube-services/515/513

scalecube

scalecube-services

https://github.com/scalecube/scalecube-services/issues/513

https://github.com/scalecube/scalecube-services/pull/515

https://github.com/scalecube/scalecube-services/pull/515

fix

Method not being called when making HTTP request to @ServiceMethod that have no input params

Method not being called when making HTTP request to @ServiceMethod that have no input params, response is empty and no error in log. Example: **Definition** `@ServiceMethod("getVersion") Mono<String> getVersion();` **Implementation** `@Override public Mono<String> getVersion() { return Mono.just("version 1"); }` **Request:** - POST - URL: localhost:8080/adminservice/getVersion - Headers: Content-Type:application/json - Body: <empty>

a9761776973df8d990658eeffca7d5025f58b209

fd7c32ebd462a793821c2c6b39551a17ecb8969d

https://github.com/scalecube/scalecube-services/compare/a9761776973df8d990658eeffca7d5025f58b209...fd7c32ebd462a793821c2c6b39551a17ecb8969d

diff --git a/services-api/src/main/java/io/scalecube/services/api/ServiceMessage.java b/services-api/src/main/java/io/scalecube/services/api/ServiceMessage.java index 57612923..498cc025 100644 --- a/services-api/src/main/java/io/scalecube/services/api/ServiceMessage.java +++ b/services-api/src/main/java/io/scalecube/services/api/ServiceMessage.java @@ -154,7 +154,7 @@ public final class ServiceMessage { /** * Verify that this message contains data. * - * @param dataClass the expected class of the dara + * @param dataClass the expected class of the data * @return true if the data is instance of the dataClass */ public boolean hasData(Class<?> dataClass) { diff --git a/services-api/src/main/java/io/scalecube/services/transport/api/ServiceMessageCodec.java b/services-api/src/main/java/io/scalecube/services/transport/api/ServiceMessageCodec.java index 0f51bfda..9c261a50 100644 --- a/services-api/src/main/java/io/scalecube/services/transport/api/ServiceMessageCodec.java +++ b/services-api/src/main/java/io/scalecube/services/transport/api/ServiceMessageCodec.java @@ -106,7 +106,9 @@ public final class ServiceMessageCodec { */ public static ServiceMessage decodeData(ServiceMessage message, Class<?> dataType) throws MessageCodecException { - if (!message.hasData(ByteBuf.class) || dataType == null) { + if (dataType == null + || !message.hasData(ByteBuf.class) + || ((ByteBuf) message.data()).readableBytes() == 0) { return message; } diff --git a/services-gateway-http/src/main/java/io/scalecube/services/gateway/http/HttpGatewayAcceptor.java b/services-gateway-http/src/main/java/io/scalecube/services/gateway/http/HttpGatewayAcceptor.java index 7c1504c6..d1127030 100644 --- a/services-gateway-http/src/main/java/io/scalecube/services/gateway/http/HttpGatewayAcceptor.java +++ b/services-gateway-http/src/main/java/io/scalecube/services/gateway/http/HttpGatewayAcceptor.java @@ -14,7 +14,6 @@ import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpResponseStatus; import io.scalecube.services.ServiceCall; import io.scalecube.services.api.ErrorData; -import io.scalecube.services.api.Qualifier; import io.scalecube.services.api.ServiceMessage; import io.scalecube.services.api.ServiceMessage.Builder; import io.scalecube.services.exceptions.DefaultErrorMapper; @@ -27,6 +26,7 @@ import org.reactivestreams.Publisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; +import reactor.netty.ByteBufMono; import reactor.netty.http.server.HttpServerRequest; import reactor.netty.http.server.HttpServerResponse; @@ -64,6 +64,7 @@ public class HttpGatewayAcceptor return httpRequest .receive() .aggregate() + .switchIfEmpty(Mono.defer(() -> ByteBufMono.just(Unpooled.EMPTY_BUFFER))) .map(ByteBuf::retain) .doOnNext(content -> metrics.markRequest()) .flatMap(content -> handleRequest(content, httpRequest, httpResponse))

['services-api/src/main/java/io/scalecube/services/transport/api/ServiceMessageCodec.java', 'services-api/src/main/java/io/scalecube/services/api/ServiceMessage.java', 'services-gateway-http/src/main/java/io/scalecube/services/gateway/http/HttpGatewayAcceptor.java']

{'.java': 3}

Java

{'Java': 668288}

Apache License 2.0

scalecube/scalecube-services/36/34

scalecube

scalecube-services

https://github.com/scalecube/scalecube-services/issues/34

https://github.com/scalecube/scalecube-services/pull/36

https://github.com/scalecube/scalecube-services/pull/36

fix

Data type can be lost if message is passed via proxy node (e.g. gossip)

Since message doesn't contain field dataType, but only in deserialized form at MessageSchema when message pass via some proxy which can't resolve dataType via class by name (e.g. gossip which pass to some node which doesn't have required data model) then data type will be lost on this node and won't be transferred on next hop.

fb9cebc26a35184b357f6cd5d3135edbb8e51821

19bd2da6d286ce8594f776f11ec9cfd2d1ec20d2

https://github.com/scalecube/scalecube-services/compare/fb9cebc26a35184b357f6cd5d3135edbb8e51821...19bd2da6d286ce8594f776f11ec9cfd2d1ec20d2

diff --git a/transport/src/main/java/io/servicefabric/transport/TransportHeaders.java b/transport/src/main/java/io/servicefabric/transport/TransportHeaders.java index 5bc3ef79..ef85fa9d 100644 --- a/transport/src/main/java/io/servicefabric/transport/TransportHeaders.java +++ b/transport/src/main/java/io/servicefabric/transport/TransportHeaders.java @@ -7,10 +7,23 @@ import rx.functions.Func1; */ public final class TransportHeaders { + /** + * This header is supposed to be used by application in case if same data type can be reused for different message + * meanings so it will allow to qualify the specific meaning of data. + */ public static final String QUALIFIER = "q"; + /** + * This header is supposed to be used by application in order to correlate request and response messages. + */ public static final String CORRELATION_ID = "cid"; + /** + * This is a system header which used by transport for serialization and deserialization purpose. It is not supposed + * to be used by application directly and it is subject to changes in future releases. + */ + public static final String DATA_TYPE = "_type"; + private TransportHeaders() { // Do not instantiate } diff --git a/transport/src/main/java/io/servicefabric/transport/protocol/MessageSchema.java b/transport/src/main/java/io/servicefabric/transport/protocol/MessageSchema.java index 249b16b9..299d3888 100644 --- a/transport/src/main/java/io/servicefabric/transport/protocol/MessageSchema.java +++ b/transport/src/main/java/io/servicefabric/transport/protocol/MessageSchema.java @@ -3,6 +3,7 @@ package io.servicefabric.transport.protocol; import static io.protostuff.LinkedBuffer.MIN_BUFFER_SIZE; import static io.servicefabric.transport.utils.RecyclableLinkedBuffer.DEFAULT_MAX_CAPACITY; +import io.servicefabric.transport.TransportHeaders; import io.servicefabric.transport.utils.RecyclableLinkedBuffer; import io.servicefabric.transport.utils.memoization.Computable; import io.servicefabric.transport.utils.memoization.ConcurrentMapMemoizer; @@ -34,15 +35,13 @@ final class MessageSchema implements Schema<Message> { private static final int HEADER_KEYS_FIELD_NUMBER = 1; private static final int HEADER_VALUES_FIELD_NUMBER = 2; - private static final int DATA_PAYLOAD_FIELD_NUMBER = 3; - private static final int DATA_TYPE_FIELD_NUMBER = 4; + private static final int DATA_FIELD_NUMBER = 3; private static final RecyclableLinkedBuffer recyclableLinkedBuffer = new RecyclableLinkedBuffer(MIN_BUFFER_SIZE, DEFAULT_MAX_CAPACITY); private static final Map<String, Integer> fieldMap = ImmutableMap.of("headerKeys", HEADER_KEYS_FIELD_NUMBER, - "headerValues", HEADER_VALUES_FIELD_NUMBER, "dataPayload", DATA_PAYLOAD_FIELD_NUMBER, "dataType", - DATA_TYPE_FIELD_NUMBER); + "headerValues", HEADER_VALUES_FIELD_NUMBER, "data", DATA_FIELD_NUMBER); private final ConcurrentMapMemoizer<String, Optional<Class>> classCache = new ConcurrentMapMemoizer<>( new Computable<String, Optional<Class>>() { @@ -64,10 +63,8 @@ final class MessageSchema implements Schema<Message> { return "headerKeys"; case HEADER_VALUES_FIELD_NUMBER: return "headerValues"; - case DATA_PAYLOAD_FIELD_NUMBER: - return "dataPayload"; - case DATA_TYPE_FIELD_NUMBER: - return "dataType"; + case DATA_FIELD_NUMBER: + return "data"; default: return null; } @@ -109,8 +106,7 @@ final class MessageSchema implements Schema<Message> { boolean iterate = true; List<String> headerKeys = new ArrayList<>(); List<String> headerValues = new ArrayList<>(); - byte[] dataPayload = null; - String dataType = null; + byte[] dataBytes = null; while (iterate) { int number = input.readFieldNumber(this); switch (number) { @@ -123,11 +119,8 @@ final class MessageSchema implements Schema<Message> { case HEADER_VALUES_FIELD_NUMBER: headerValues.add(input.readString()); break; - case DATA_PAYLOAD_FIELD_NUMBER: - dataPayload = input.readByteArray(); - break; - case DATA_TYPE_FIELD_NUMBER: - dataType = input.readString(); + case DATA_FIELD_NUMBER: + dataBytes = input.readByteArray(); break; default: input.handleUnknownField(number, this); @@ -135,38 +128,43 @@ final class MessageSchema implements Schema<Message> { } // Deserialize headers + Map<String, String> headers = new HashMap<>(headerKeys.size()); if (!headerKeys.isEmpty()) { - Map<String, String> headers = new HashMap<>(headerKeys.size()); ListIterator<String> headerValuesIterator = headerValues.listIterator(); for (String key : headerKeys) { String value = headerValuesIterator.next(); headers.put(key, value); } - message.setHeaders(headers); } // Deserialize data - if (dataPayload != null) { + Object data = null; + if (dataBytes != null) { + String dataType = headers.get(TransportHeaders.DATA_TYPE); if (dataType == null) { - message.setData(dataPayload); + data = dataBytes; } else { Optional<Class> optionalDataClass = classCache.get(dataType); if (optionalDataClass.isPresent()) { + headers.remove(TransportHeaders.DATA_TYPE); Class<?> dataClass = optionalDataClass.get(); Schema dataSchema = RuntimeSchema.getSchema(dataClass); - Object data = dataSchema.newMessage(); + data = dataSchema.newMessage(); try { - ProtostuffIOUtil.mergeFrom(dataPayload, data, dataSchema); + ProtostuffIOUtil.mergeFrom(dataBytes, data, dataSchema); } catch (Throwable e) { LOGGER.error("Failed to deserialize : {}", message); throw e; } - message.setData(data); } else { - message.setData(dataPayload); + data = dataBytes; } } } + + // Set message + message.setHeaders(headers); + message.setData(data); } @Override @@ -183,15 +181,20 @@ final class MessageSchema implements Schema<Message> { Object originalData = message.data(); if (originalData != null) { if (originalData instanceof byte[]) { - output.writeByteArray(DATA_PAYLOAD_FIELD_NUMBER, (byte[]) originalData, false); + // Write data byte array as is + output.writeByteArray(DATA_FIELD_NUMBER, (byte[]) originalData, false); } else { + // Write data class as an additional header Class<?> dataClass = originalData.getClass(); + output.writeString(HEADER_KEYS_FIELD_NUMBER, TransportHeaders.DATA_TYPE, true); + output.writeString(HEADER_VALUES_FIELD_NUMBER, dataClass.getName(), true); + + // Write data as serialized byte array Schema dataSchema = RuntimeSchema.getSchema(dataClass); try (RecyclableLinkedBuffer rlb = recyclableLinkedBuffer.get()) { byte[] array = ProtostuffIOUtil.toByteArray(originalData, dataSchema, rlb.buffer()); - output.writeByteArray(DATA_PAYLOAD_FIELD_NUMBER, array, false); + output.writeByteArray(DATA_FIELD_NUMBER, array, false); } - output.writeString(DATA_TYPE_FIELD_NUMBER, dataClass.getName(), false); } } }

['transport/src/main/java/io/servicefabric/transport/TransportHeaders.java', 'transport/src/main/java/io/servicefabric/transport/protocol/MessageSchema.java']

{'.java': 2}

Java

{'Java': 668288}

Apache License 2.0

scalecube/scalecube-services/470/469

scalecube

scalecube-services

https://github.com/scalecube/scalecube-services/issues/469

https://github.com/scalecube/scalecube-services/pull/470

https://github.com/scalecube/scalecube-services/pull/470

fix

Client-sdk doesn't support redirecting

When we launch the following example: ```java class Scratch { public static void main(String[] args) throws Exception { Client client = onWebsocket( ClientSettings.builder() .host("develop-ws.aws.com") .port(80) /// 443 .loopResources(LoopResources.create("test")) .build()); client .forService(UserService.class) .find(new FindUserRequest("123")) .subscribe( System.out::println, Throwable::printStackTrace, () -> System.out.println("Complete")); Thread.currentThread().join(); } } ``` it throws: ```c io.netty.handler.codec.http.websocketx.WebSocketHandshakeException: Invalid handshake response getStatus: 301 Moved Permanently at io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker13.verify(WebSocketClientHandshaker13.java:191) at io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker.finishHandshake(WebSocketClientHandshaker.java:216) at reactor.netty.http.client.WebsocketClientOperations.onInboundNext(WebsocketClientOperations.java:109) at reactor.netty.channel.ChannelOperationsHandler.channelRead(ChannelOperationsHandler.java:141) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:362) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:348) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:340) at io.netty.handler.codec.MessageToMessageDecoder.channelRead(MessageToMessageDecoder.java:102) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:362) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:348) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:340) at io.netty.channel.CombinedChannelDuplexHandler$DelegatingChannelHandlerContext.fireChannelRead(CombinedChannelDuplexHandler.java:438) at io.netty.handler.codec.ByteToMessageDecoder.fireChannelRead(ByteToMessageDecoder.java:310) at io.netty.handler.codec.ByteToMessageDecoder.channelRead(ByteToMessageDecoder.java:284) at io.netty.channel.CombinedChannelDuplexHandler.channelRead(CombinedChannelDuplexHandler.java:253) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:362) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:348) at io.netty.channel.AbstractChannelHandlerContext.fireChannelRead(AbstractChannelHandlerContext.java:340) at io.netty.channel.DefaultChannelPipeline$HeadContext.channelRead(DefaultChannelPipeline.java:1434) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:362) at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:348) at io.netty.channel.DefaultChannelPipeline.fireChannelRead(DefaultChannelPipeline.java:965) at io.netty.channel.epoll.AbstractEpollStreamChannel$EpollStreamUnsafe.epollInReady(AbstractEpollStreamChannel.java:808) at io.netty.channel.epoll.EpollEventLoop.processReady(EpollEventLoop.java:410) at io.netty.channel.epoll.EpollEventLoop.run(EpollEventLoop.java:310) at io.netty.util.concurrent.SingleThreadEventExecutor$5.run(SingleThreadEventExecutor.java:884) at java.lang.Thread.run(Thread.java:748) ``` So can we use the client-sdk with redirecting?

d6a5d03afb226d8d132c7fbd77953ba81aec0dd2

8ceb77d7aa7410e8ba55632eacde67bdac29fe54

https://github.com/scalecube/scalecube-services/compare/d6a5d03afb226d8d132c7fbd77953ba81aec0dd2...8ceb77d7aa7410e8ba55632eacde67bdac29fe54

diff --git a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/ClientSettings.java b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/ClientSettings.java index a51df11c..e418c881 100644 --- a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/ClientSettings.java +++ b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/ClientSettings.java @@ -2,6 +2,7 @@ package io.scalecube.services.gateway.clientsdk; import java.net.InetSocketAddress; import reactor.netty.resources.LoopResources; +import reactor.netty.tcp.SslProvider; public class ClientSettings { @@ -12,12 +13,16 @@ public class ClientSettings { private final int port; private final String contentType; private final LoopResources loopResources; + private final boolean followRedirect; + private final SslProvider sslProvider; private ClientSettings(Builder builder) { this.host = builder.host; this.port = builder.port; this.contentType = builder.contentType; this.loopResources = builder.loopResources; + this.followRedirect = builder.followRedirect; + this.sslProvider = builder.sslProvider; } public String host() { @@ -36,22 +41,29 @@ public class ClientSettings { return loopResources; } + public boolean followRedirect() { + return followRedirect; + } + + public SslProvider sslProvider() { + return sslProvider; + } + public static Builder builder() { return new Builder(); } @Override public String toString() { - return "ClientSettings{" - + "host='" - + host - + '\\'' - + ", port=" - + port - + ", contentType='" - + contentType - + '\\'' - + '}'; + final StringBuilder sb = new StringBuilder("ClientSettings{"); + sb.append("host='").append(host).append('\\''); + sb.append(", port=").append(port); + sb.append(", contentType='").append(contentType).append('\\''); + sb.append(", loopResources=").append(loopResources); + sb.append(", followRedirect=").append(followRedirect); + sb.append(", sslProvider=").append(sslProvider); + sb.append('}'); + return sb.toString(); } public static class Builder { @@ -59,6 +71,8 @@ public class ClientSettings { private int port; private String contentType = DEFAULT_CONTENT_TYPE; private LoopResources loopResources; + private boolean followRedirect = true; + private SslProvider sslProvider; private Builder() {} @@ -86,6 +100,38 @@ public class ClientSettings { return this; } + /** + * Specifies is auto-redirect enabled for HTTP 301/302 status codes. Enabled by default. + * + * @param followRedirect if <code>true</code> auto-redirect is enabled, otherwise disabled + * @return builder + */ + public Builder followRedirect(boolean followRedirect) { + this.followRedirect = followRedirect; + return this; + } + + /** + * Use default SSL client provider. + * + * @return builder + */ + public Builder secure() { + this.sslProvider = SslProvider.defaultClientProvider(); + return this; + } + + /** + * Use specified SSL provider. + * + * @param sslProvider SSL provider + * @return builder + */ + public Builder secure(SslProvider sslProvider) { + this.sslProvider = sslProvider; + return this; + } + public ClientSettings build() { return new ClientSettings(this); } diff --git a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/http/HttpClientTransport.java b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/http/HttpClientTransport.java index f0c2b489..3edaf942 100644 --- a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/http/HttpClientTransport.java +++ b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/http/HttpClientTransport.java @@ -40,9 +40,14 @@ public final class HttpClientTransport implements ClientTransport { httpClient = HttpClient.create(connectionProvider) + .followRedirect(settings.followRedirect()) .tcpConfiguration( - tcpClient -> - tcpClient.runOn(loopResources).host(settings.host()).port(settings.port())); + tcpClient -> { + if (settings.sslProvider() != null) { + tcpClient = tcpClient.secure(settings.sslProvider()); + } + return tcpClient.runOn(loopResources).host(settings.host()).port(settings.port()); + }); } @Override diff --git a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/rsocket/RSocketClientTransport.java b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/rsocket/RSocketClientTransport.java index bcdd5245..7b5e5f41 100644 --- a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/rsocket/RSocketClientTransport.java +++ b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/rsocket/RSocketClientTransport.java @@ -139,9 +139,14 @@ public final class RSocketClientTransport implements ClientTransport { HttpClient httpClient = HttpClient.newConnection() + .followRedirect(settings.followRedirect()) .tcpConfiguration( - tcpClient -> - tcpClient.runOn(loopResources).host(settings.host()).port(settings.port())); + tcpClient -> { + if (settings.sslProvider() != null) { + tcpClient = tcpClient.secure(settings.sslProvider()); + } + return tcpClient.runOn(loopResources).host(settings.host()).port(settings.port()); + }); return WebsocketClientTransport.create(httpClient, path); } diff --git a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/websocket/WebsocketClientTransport.java b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/websocket/WebsocketClientTransport.java index 5f5af7fa..471d8e21 100644 --- a/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/websocket/WebsocketClientTransport.java +++ b/services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/websocket/WebsocketClientTransport.java @@ -49,9 +49,14 @@ public final class WebsocketClientTransport implements ClientTransport { httpClient = HttpClient.newConnection() + .followRedirect(settings.followRedirect()) .tcpConfiguration( - tcpClient -> - tcpClient.runOn(loopResources).host(settings.host()).port(settings.port())); + tcpClient -> { + if (settings.sslProvider() != null) { + tcpClient = tcpClient.secure(settings.sslProvider()); + } + return tcpClient.runOn(loopResources).host(settings.host()).port(settings.port()); + }); } @Override

['services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/websocket/WebsocketClientTransport.java', 'services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/rsocket/RSocketClientTransport.java', 'services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/ClientSettings.java', 'services-gateway-clientsdk/src/main/java/io/scalecube/services/gateway/clientsdk/http/HttpClientTransport.java']

{'.java': 4}

Java

{'Java': 668288}

Apache License 2.0

polyhedraldev/terra/158/140

polyhedraldev

terra

https://github.com/PolyhedralDev/Terra/issues/140

https://github.com/PolyhedralDev/Terra/pull/158

https://github.com/PolyhedralDev/Terra/pull/158

closes

Eyes of ender do not work

When generating a terra world (fabric), if you use eyes of ender to try to find a stronghold, they cannot find one. This is with a vanilla world on the terra default config and the only 3 mods installed are terra, terra fabric server, and fabric api.

dbc60b1d8254eefedf626c4e6fc229ffe3fd0bb6

77a4c95c4a4f1f2f13bcfab75bee6d50403222dd

https://github.com/polyhedraldev/terra/compare/dbc60b1d8254eefedf626c4e6fc229ffe3fd0bb6...77a4c95c4a4f1f2f13bcfab75bee6d50403222dd

diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java index 2a78c36f8..efac7ee53 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java @@ -5,19 +5,25 @@ import com.dfsek.terra.api.platform.world.generator.ChunkData; import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper; import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.world.generation.TerraChunkGenerator; +import com.dfsek.terra.api.world.locate.AsyncStructureFinder; import com.dfsek.terra.config.pack.ConfigPack; +import com.dfsek.terra.fabric.FabricAdapter; import com.dfsek.terra.fabric.TerraFabricPlugin; import com.dfsek.terra.world.TerraWorld; import com.dfsek.terra.world.generation.generators.DefaultChunkGenerator3D; import com.dfsek.terra.world.generation.math.samplers.Sampler; +import com.dfsek.terra.world.population.items.TerraStructure; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.jafama.FastMath; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.server.world.ServerWorld; import net.minecraft.structure.StructureManager; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.registry.DynamicRegistryManager; +import net.minecraft.util.registry.Registry; import net.minecraft.world.BlockView; import net.minecraft.world.ChunkRegion; import net.minecraft.world.Heightmap; @@ -29,6 +35,12 @@ import net.minecraft.world.gen.StructureAccessor; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.chunk.StructuresConfig; import net.minecraft.world.gen.chunk.VerticalBlockSample; +import net.minecraft.world.gen.feature.StructureFeature; +import org.jetbrains.annotations.Nullable; + +import java.util.Objects; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; public class FabricChunkGeneratorWrapper extends ChunkGenerator implements GeneratorWrapper { private final long seed; @@ -75,6 +87,28 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener } + @Nullable + @Override + public BlockPos locateStructure(ServerWorld world, StructureFeature<?> feature, BlockPos center, int radius, boolean skipExistingChunks) { + String name = Objects.requireNonNull(Registry.STRUCTURE_FEATURE.getId(feature)).toString(); + TerraWorld terraWorld = TerraFabricPlugin.getInstance().getWorld((World) world); + TerraStructure located = pack.getStructure(pack.getTemplate().getLocatable().get(name)); + if(located != null) { + CompletableFuture<BlockPos> result = new CompletableFuture<>(); + AsyncStructureFinder finder = new AsyncStructureFinder(terraWorld.getBiomeProvider(), located, FabricAdapter.adapt(center).toLocation((World) world), 0, 500, location -> { + result.complete(FabricAdapter.adapt(location)); + }, TerraFabricPlugin.getInstance()); + finder.run(); // Do this synchronously. + try { + return result.get(); + } catch(InterruptedException | ExecutionException e) { + throw new RuntimeException(e); + } + } + TerraFabricPlugin.getInstance().logger().warning("No overrides are defined for \\"" + name + "\\""); + return null; + } + @Override public void generateFeatures(ChunkRegion region, StructureAccessor accessor) { super.generateFeatures(region, accessor);

['platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java']

{'.java': 1}