ViacheslavKlimov
1 year ago
170 changed files with 4071 additions and 1772 deletions
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 8.9 KiB |
@ -0,0 +1,46 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.service.security.auth; |
||||
|
|
||||
|
import jakarta.servlet.FilterChain; |
||||
|
import jakarta.servlet.http.HttpServletRequest; |
||||
|
import jakarta.servlet.http.HttpServletResponse; |
||||
|
import lombok.RequiredArgsConstructor; |
||||
|
import lombok.extern.slf4j.Slf4j; |
||||
|
import org.springframework.security.core.AuthenticationException; |
||||
|
import org.springframework.stereotype.Component; |
||||
|
import org.springframework.web.filter.OncePerRequestFilter; |
||||
|
import org.thingsboard.server.exception.ThingsboardErrorResponseHandler; |
||||
|
|
||||
|
@Component |
||||
|
@RequiredArgsConstructor |
||||
|
@Slf4j |
||||
|
public class AuthExceptionHandler extends OncePerRequestFilter { |
||||
|
|
||||
|
private final ThingsboardErrorResponseHandler errorResponseHandler; |
||||
|
|
||||
|
@Override |
||||
|
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) { |
||||
|
try { |
||||
|
filterChain.doFilter(request, response); |
||||
|
} catch (AuthenticationException e) { |
||||
|
throw e; |
||||
|
} catch (Exception e) { |
||||
|
errorResponseHandler.handle(e, response); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
} |
||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,42 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.transport.lwm2m.transportConfiguration; |
||||
|
|
||||
|
import org.junit.Assert; |
||||
|
import org.junit.Test; |
||||
|
import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration; |
||||
|
import org.thingsboard.server.transport.lwm2m.security.AbstractSecurityLwM2MIntegrationTest; |
||||
|
|
||||
|
import static org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryObserveStrategy.COMPOSITE_ALL; |
||||
|
import static org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryObserveStrategy.SINGLE; |
||||
|
import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE; |
||||
|
|
||||
|
public class ObserveStrategyTransportConfigurationTest extends AbstractSecurityLwM2MIntegrationTest { |
||||
|
|
||||
|
@Test |
||||
|
public void testTransportConfigurationObserveStrategyBeforeParseNullAfterParseNotNull_STRATEGY_SINGLE() throws Exception { |
||||
|
Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(TELEMETRY_WITHOUT_OBSERVE, getBootstrapServerCredentialsNoSec(NONE)); |
||||
|
Assert.assertNotNull(transportConfiguration.getObserveAttr().getObserveStrategy()); |
||||
|
Assert.assertEquals(SINGLE, transportConfiguration.getObserveAttr().getObserveStrategy()); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
public void testTransportConfigurationObserveStrategyBeforeParseNotNullAfterParseNotNull_STRATEGY_COMPOSITE_ALL() throws Exception { |
||||
|
Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(TELEMETRY_WITH_COMPOSITE_ALL_OBSERVE_ID_3_ID_19, getBootstrapServerCredentialsNoSec(NONE)); |
||||
|
Assert.assertNotNull(transportConfiguration.getObserveAttr().getObserveStrategy()); |
||||
|
Assert.assertEquals(COMPOSITE_ALL, transportConfiguration.getObserveAttr().getObserveStrategy()); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,63 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.transport.lwm2m.transportConfiguration; |
||||
|
|
||||
|
import org.junit.Test; |
||||
|
import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials; |
||||
|
import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration; |
||||
|
import org.thingsboard.server.transport.lwm2m.security.AbstractSecurityLwM2MIntegrationTest; |
||||
|
|
||||
|
import static org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryObserveStrategy.COMPOSITE_ALL; |
||||
|
import static org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryObserveStrategy.COMPOSITE_BY_OBJECT; |
||||
|
import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE; |
||||
|
|
||||
|
public class ObserveStrategyWithNoSecQueueModeConnectTest extends AbstractSecurityLwM2MIntegrationTest { |
||||
|
|
||||
|
@Test |
||||
|
public void testWithNoSecQueueModeConnectLwm2mSuccessAndObserveSingleTelemetryUpdateProfileAfterConnected() throws Exception { |
||||
|
String clientEndpoint = CLIENT_ENDPOINT_NO_SEC + "_ObserveSingle"; |
||||
|
LwM2MDeviceCredentials clientCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint)); |
||||
|
super.basicTestConnectionObserveSingleTelemetry(SECURITY_NO_SEC, clientCredentials, clientEndpoint, true, true); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
public void testWithNoSecQueueModeConnectLwm2mSuccessAndObserveCompositeAllTelemetry_Both_UpdateProfileAfterConnected() throws Exception { |
||||
|
String clientEndpoint = CLIENT_ENDPOINT_NO_SEC + "_ObserveCompositeAll"; |
||||
|
LwM2MDeviceCredentials clientCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint)); |
||||
|
Lwm2mDeviceProfileTransportConfiguration transportConfiguration = super.getTransportConfiguration(TELEMETRY_WITH_SINGLE_PARAMS_OBJECT_ID_5_ID_3, getBootstrapServerCredentialsNoSec(NONE)); |
||||
|
transportConfiguration.getObserveAttr().setObserveStrategy(COMPOSITE_ALL); |
||||
|
super.basicTestConnectionObserveCompositeTelemetry(SECURITY_NO_SEC, clientCredentials, clientEndpoint, transportConfiguration, 1, 0); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
public void testWithNoSecQueueModeConnectLwm2mSuccessAndObserveCompositeByObjectTelemetry_Both_UpdateProfileAfterConnected() throws Exception { |
||||
|
String clientEndpoint = CLIENT_ENDPOINT_NO_SEC + "_ObserveCompositeByObject"; |
||||
|
LwM2MDeviceCredentials clientCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint)); |
||||
|
Lwm2mDeviceProfileTransportConfiguration transportConfiguration = super.getTransportConfiguration(TELEMETRY_WITH_SINGLE_PARAMS_OBJECT_ID_5_ID_3, getBootstrapServerCredentialsNoSec(NONE)); |
||||
|
transportConfiguration.getObserveAttr().setObserveStrategy(COMPOSITE_BY_OBJECT); |
||||
|
super.basicTestConnectionObserveCompositeTelemetry(SECURITY_NO_SEC, clientCredentials, clientEndpoint, transportConfiguration, 2, 1); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
public void testWithNoSecQueueModeConnectLwm2mSuccessAndObserveCompositeByObjectTelemetry_Single_UpdateProfileAfterConnected() throws Exception { |
||||
|
String clientEndpoint = CLIENT_ENDPOINT_NO_SEC + "_ObserveCompositeByObject_Single"; |
||||
|
LwM2MDeviceCredentials clientCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint)); |
||||
|
Lwm2mDeviceProfileTransportConfiguration transportConfiguration = super.getTransportConfiguration(TELEMETRY_WITH_SINGLE_PARAMS_OBJECT_ID_5_ID_3, getBootstrapServerCredentialsNoSec(NONE)); |
||||
|
transportConfiguration.getObserveAttr().setObserveStrategy(COMPOSITE_BY_OBJECT); |
||||
|
super.basicTestConnectionObserveCompositeTelemetry(SECURITY_NO_SEC, clientCredentials, clientEndpoint, transportConfiguration, 2, 2); |
||||
|
} |
||||
|
} |
||||
|
|
||||
@ -0,0 +1,59 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.common.data.device.profile.lwm2m; |
||||
|
|
||||
|
import lombok.Getter; |
||||
|
|
||||
|
public enum TelemetryObserveStrategy { |
||||
|
|
||||
|
SINGLE("One resource equals one single observe request", 0), |
||||
|
COMPOSITE_ALL("All resources in one composite observe request", 1), |
||||
|
COMPOSITE_BY_OBJECT("Grouped composite observe requests by object", 2); |
||||
|
|
||||
|
@Getter |
||||
|
private final String description; |
||||
|
|
||||
|
@Getter |
||||
|
private final int id; |
||||
|
|
||||
|
TelemetryObserveStrategy(String description, int id) { |
||||
|
this.description = description; |
||||
|
this.id = id; |
||||
|
} |
||||
|
|
||||
|
public static TelemetryObserveStrategy fromDescription(String description) { |
||||
|
for (TelemetryObserveStrategy strategy : values()) { |
||||
|
if (strategy.description.equalsIgnoreCase(description)) { |
||||
|
return strategy; |
||||
|
} |
||||
|
} |
||||
|
throw new IllegalArgumentException("Unknown TelemetryObserveStrategy id: " + description); |
||||
|
} |
||||
|
|
||||
|
public static TelemetryObserveStrategy fromId(int id) { |
||||
|
for (TelemetryObserveStrategy strategy : values()) { |
||||
|
if (strategy.id == id) { |
||||
|
return strategy; |
||||
|
} |
||||
|
} |
||||
|
throw new IllegalArgumentException("Unknown TelemetryObserveStrategy id: " + id); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public String toString() { |
||||
|
return name() + " (" + id + "): " + description; |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,120 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.script.api.js; |
||||
|
|
||||
|
import java.util.regex.Pattern; |
||||
|
|
||||
|
public class JsValidator { |
||||
|
|
||||
|
static final Pattern ASYNC_PATTERN = Pattern.compile("\\basync\\b"); |
||||
|
static final Pattern AWAIT_PATTERN = Pattern.compile("\\bawait\\b"); |
||||
|
static final Pattern PROMISE_PATTERN = Pattern.compile("\\bPromise\\b"); |
||||
|
static final Pattern SET_TIMEOUT_PATTERN = Pattern.compile("\\bsetTimeout\\b"); |
||||
|
|
||||
|
public static String validate(String scriptBody) { |
||||
|
if (scriptBody == null || scriptBody.trim().isEmpty()) { |
||||
|
return "Script body is empty"; |
||||
|
} |
||||
|
|
||||
|
//Quick check
|
||||
|
if (!ASYNC_PATTERN.matcher(scriptBody).find() |
||||
|
&& !AWAIT_PATTERN.matcher(scriptBody).find() |
||||
|
&& !PROMISE_PATTERN.matcher(scriptBody).find() |
||||
|
&& !SET_TIMEOUT_PATTERN.matcher(scriptBody).find()) { |
||||
|
return null; |
||||
|
} |
||||
|
|
||||
|
//Recheck if quick check failed. Ignoring comments and strings
|
||||
|
String[] lines = scriptBody.split("\\r?\\n"); |
||||
|
boolean insideMultilineComment = false; |
||||
|
|
||||
|
for (String line : lines) { |
||||
|
String stripped = line; |
||||
|
|
||||
|
// Handle multiline comments
|
||||
|
if (insideMultilineComment) { |
||||
|
if (line.contains("*/")) { |
||||
|
insideMultilineComment = false; |
||||
|
stripped = line.substring(line.indexOf("*/") + 2); // continue after comment
|
||||
|
} else { |
||||
|
continue; // skip line inside multiline comment
|
||||
|
} |
||||
|
} |
||||
|
|
||||
|
// Check for start of multiline comment
|
||||
|
if (stripped.contains("/*")) { |
||||
|
int start = stripped.indexOf("/*"); |
||||
|
int end = stripped.indexOf("*/", start + 2); |
||||
|
|
||||
|
if (end != -1) { |
||||
|
// Inline multiline comment
|
||||
|
stripped = stripped.substring(0, start) + stripped.substring(end + 2); |
||||
|
} else { |
||||
|
// Starts a block comment, continues on next lines
|
||||
|
insideMultilineComment = true; |
||||
|
stripped = stripped.substring(0, start); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
stripped = stripInlineComment(stripped); |
||||
|
stripped = stripStringLiterals(stripped); |
||||
|
|
||||
|
if (ASYNC_PATTERN.matcher(stripped).find()) { |
||||
|
return "Script must not contain 'async' keyword."; |
||||
|
} |
||||
|
if (AWAIT_PATTERN.matcher(stripped).find()) { |
||||
|
return "Script must not contain 'await' keyword."; |
||||
|
} |
||||
|
if (PROMISE_PATTERN.matcher(stripped).find()) { |
||||
|
return "Script must not use 'Promise'."; |
||||
|
} |
||||
|
if (SET_TIMEOUT_PATTERN.matcher(stripped).find()) { |
||||
|
return "Script must not use 'setTimeout' method."; |
||||
|
} |
||||
|
} |
||||
|
return null; |
||||
|
} |
||||
|
|
||||
|
private static String stripInlineComment(String line) { |
||||
|
int index = line.indexOf("//"); |
||||
|
return index >= 0 ? line.substring(0, index) : line; |
||||
|
} |
||||
|
|
||||
|
private static String stripStringLiterals(String line) { |
||||
|
StringBuilder sb = new StringBuilder(); |
||||
|
boolean inSingleQuote = false; |
||||
|
boolean inDoubleQuote = false; |
||||
|
|
||||
|
for (int i = 0; i < line.length(); i++) { |
||||
|
char c = line.charAt(i); |
||||
|
|
||||
|
if (c == '"' && !inSingleQuote) { |
||||
|
inDoubleQuote = !inDoubleQuote; |
||||
|
continue; |
||||
|
} else if (c == '\'' && !inDoubleQuote) { |
||||
|
inSingleQuote = !inSingleQuote; |
||||
|
continue; |
||||
|
} |
||||
|
|
||||
|
if (!inSingleQuote && !inDoubleQuote) { |
||||
|
sb.append(c); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
return sb.toString(); |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,122 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.script.api; |
||||
|
|
||||
|
import com.google.common.util.concurrent.FutureCallback; |
||||
|
import com.google.common.util.concurrent.Futures; |
||||
|
import org.junit.jupiter.api.BeforeEach; |
||||
|
import org.junit.jupiter.api.Test; |
||||
|
import org.mockito.Mockito; |
||||
|
import org.springframework.test.util.ReflectionTestUtils; |
||||
|
import org.thingsboard.server.common.data.id.TenantId; |
||||
|
import org.thingsboard.server.common.stats.StatsCounter; |
||||
|
|
||||
|
import java.util.UUID; |
||||
|
import java.util.concurrent.ExecutionException; |
||||
|
import java.util.concurrent.TimeUnit; |
||||
|
import java.util.concurrent.TimeoutException; |
||||
|
|
||||
|
import static org.assertj.core.api.Assertions.assertThat; |
||||
|
import static org.junit.jupiter.api.Assertions.assertNull; |
||||
|
import static org.junit.jupiter.api.Assertions.assertThrows; |
||||
|
import static org.mockito.ArgumentMatchers.any; |
||||
|
import static org.mockito.ArgumentMatchers.anyString; |
||||
|
import static org.mockito.Mockito.doCallRealMethod; |
||||
|
import static org.mockito.Mockito.doReturn; |
||||
|
import static org.mockito.Mockito.mock; |
||||
|
import static org.mockito.Mockito.never; |
||||
|
import static org.mockito.Mockito.verify; |
||||
|
|
||||
|
class AbstractScriptInvokeServiceTest { |
||||
|
|
||||
|
AbstractScriptInvokeService service; |
||||
|
final UUID id = UUID.randomUUID(); |
||||
|
final String scriptBody = "return true;"; |
||||
|
final TenantId tenantId = TenantId.fromUUID(UUID.fromString("2ed9a658-45a5-4812-b212-9931f5749f30")); |
||||
|
|
||||
|
@BeforeEach |
||||
|
void setUp() { |
||||
|
service = mock(AbstractScriptInvokeService.class, Mockito.RETURNS_DEEP_STUBS); |
||||
|
|
||||
|
// Make sure core checks always pass
|
||||
|
doReturn(true).when(service).isExecEnabled(any()); |
||||
|
doReturn(50000L).when(service).getMaxScriptBodySize(); |
||||
|
|
||||
|
// Use real implementations
|
||||
|
doCallRealMethod().when(service).scriptBodySizeExceeded(anyString()); |
||||
|
doCallRealMethod().when(service).eval(any(), any(), any(), any(String[].class)); |
||||
|
doCallRealMethod().when(service).error(anyString()); |
||||
|
doCallRealMethod().when(service).validate(any(), anyString()); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
void evalWithValidationCallTest() throws ExecutionException, InterruptedException, TimeoutException { |
||||
|
ReflectionTestUtils.setField(service, "requestsCounter", mock(StatsCounter.class)); |
||||
|
ReflectionTestUtils.setField(service, "evalCallback", mock(FutureCallback.class)); |
||||
|
|
||||
|
doReturn(Futures.immediateFuture(id)).when(service).doEvalScript(any(), any(), anyString(), any(), any(String[].class)); |
||||
|
|
||||
|
var future = service.eval(tenantId, ScriptType.RULE_NODE_SCRIPT, scriptBody, "x", "y"); |
||||
|
|
||||
|
assertThat(future.get(30, TimeUnit.SECONDS)).isEqualTo(id); |
||||
|
verify(service).validate(any(), anyString()); |
||||
|
verify(service).validate(tenantId, scriptBody); |
||||
|
verify(service, never()).error(anyString()); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
void evalWithValidationCallErrorTest() throws ExecutionException, InterruptedException, TimeoutException { |
||||
|
doReturn(false).when(service).isExecEnabled(any()); |
||||
|
var future = service.eval(tenantId, ScriptType.RULE_NODE_SCRIPT, scriptBody, "x", "y"); |
||||
|
|
||||
|
ExecutionException ex = assertThrows(ExecutionException.class, future::get); |
||||
|
assertThat(ex.getCause().getMessage()).isEqualTo("Script Execution is disabled due to API limits!"); |
||||
|
assertThat(ex.getCause()).isInstanceOf(RuntimeException.class); |
||||
|
|
||||
|
verify(service).validate(any(), anyString()); |
||||
|
verify(service).validate(tenantId, scriptBody); |
||||
|
verify(service).error(anyString()); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
void validateScriptBodyTestExecEnabledTest() { |
||||
|
assertNull(service.validate(tenantId, scriptBody)); |
||||
|
verify(service).isExecEnabled(tenantId); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
void validateScriptBodyTestExecDisabledTest() { |
||||
|
doReturn(false).when(service).isExecEnabled(tenantId); |
||||
|
assertThat(service.validate(tenantId, scriptBody)).isEqualTo("Script Execution is disabled due to API limits!"); |
||||
|
verify(service).isExecEnabled(tenantId); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
void validateScriptBodySizeOKTest() { |
||||
|
assertNull(service.validate(tenantId, scriptBody)); |
||||
|
verify(service).isExecEnabled(tenantId); |
||||
|
verify(service).scriptBodySizeExceeded(scriptBody); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
void validateScriptBodySizeExceededTest() { |
||||
|
doReturn(10L).when(service).getMaxScriptBodySize(); |
||||
|
assertThat(service.validate(tenantId, scriptBody)).isEqualTo("Script body exceeds maximum allowed size of 10 symbols"); |
||||
|
verify(service).isExecEnabled(tenantId); |
||||
|
verify(service).scriptBodySizeExceeded(scriptBody); |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,91 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.script.api.js; |
||||
|
|
||||
|
import com.google.common.util.concurrent.FutureCallback; |
||||
|
import com.google.common.util.concurrent.Futures; |
||||
|
import org.thingsboard.server.common.stats.StatsCounter; |
||||
|
import lombok.extern.slf4j.Slf4j; |
||||
|
import org.junit.jupiter.api.BeforeEach; |
||||
|
import org.junit.jupiter.api.Test; |
||||
|
import org.mockito.Mockito; |
||||
|
import org.springframework.test.util.ReflectionTestUtils; |
||||
|
import org.thingsboard.script.api.ScriptType; |
||||
|
import org.thingsboard.server.common.data.id.TenantId; |
||||
|
|
||||
|
import java.util.UUID; |
||||
|
import java.util.concurrent.ExecutionException; |
||||
|
import java.util.concurrent.TimeUnit; |
||||
|
import java.util.concurrent.TimeoutException; |
||||
|
|
||||
|
import static org.assertj.core.api.Assertions.assertThat; |
||||
|
import static org.junit.jupiter.api.Assertions.assertThrows; |
||||
|
import static org.junit.jupiter.api.Assertions.assertTrue; |
||||
|
import static org.mockito.ArgumentMatchers.any; |
||||
|
import static org.mockito.ArgumentMatchers.anyString; |
||||
|
import static org.mockito.Mockito.doCallRealMethod; |
||||
|
import static org.mockito.Mockito.doReturn; |
||||
|
import static org.mockito.Mockito.mock; |
||||
|
import static org.mockito.Mockito.times; |
||||
|
import static org.mockito.Mockito.verify; |
||||
|
|
||||
|
@Slf4j |
||||
|
class AbstractJsInvokeServiceTest { |
||||
|
|
||||
|
AbstractJsInvokeService service; |
||||
|
final UUID id = UUID.randomUUID(); |
||||
|
|
||||
|
@BeforeEach |
||||
|
void setUp() { |
||||
|
service = mock(AbstractJsInvokeService.class, Mockito.RETURNS_DEEP_STUBS); |
||||
|
|
||||
|
ReflectionTestUtils.setField(service, "requestsCounter", mock(StatsCounter.class)); |
||||
|
ReflectionTestUtils.setField(service, "evalCallback", mock(FutureCallback.class)); |
||||
|
|
||||
|
// Make sure core checks always pass
|
||||
|
doReturn(true).when(service).isExecEnabled(any()); |
||||
|
doReturn(false).when(service).scriptBodySizeExceeded(anyString()); |
||||
|
doReturn(Futures.immediateFuture(id)).when(service).doEvalScript(any(), any(), anyString(), any(), any(String[].class)); |
||||
|
|
||||
|
// Use real implementations
|
||||
|
doCallRealMethod().when(service).eval(any(), any(), any(), any(String[].class)); |
||||
|
doCallRealMethod().when(service).error(anyString()); |
||||
|
doCallRealMethod().when(service).validate(any(), anyString()); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
void shouldReturnValidationErrorFromJsValidator() throws ExecutionException, InterruptedException { |
||||
|
String scriptWithAsync = "async function test() {}"; |
||||
|
|
||||
|
var future = service.eval(TenantId.SYS_TENANT_ID, ScriptType.RULE_NODE_SCRIPT, scriptWithAsync, "a", "b"); |
||||
|
ExecutionException ex = assertThrows(ExecutionException.class, future::get); |
||||
|
assertTrue(ex.getCause().getMessage().contains("Script must not contain 'async' keyword.")); |
||||
|
assertThat(ex.getCause()).isInstanceOf(RuntimeException.class); |
||||
|
verify(service).isExecEnabled(any()); |
||||
|
verify(service).scriptBodySizeExceeded(any()); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
void shouldPassValidationAndCallSuperEval() throws ExecutionException, InterruptedException, TimeoutException { |
||||
|
String validScript = "function test() { return 42; }"; |
||||
|
var result = service.eval(TenantId.SYS_TENANT_ID, ScriptType.RULE_NODE_SCRIPT, validScript, "x", "y"); |
||||
|
|
||||
|
assertThat(result.get(30, TimeUnit.SECONDS)).isEqualTo(id); |
||||
|
verify(service, times(1)).isExecEnabled(any()); |
||||
|
verify(service, times(1)).scriptBodySizeExceeded(any()); |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,88 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.script.api.js; |
||||
|
|
||||
|
import org.junit.jupiter.params.ParameterizedTest; |
||||
|
import org.junit.jupiter.params.provider.NullAndEmptySource; |
||||
|
import org.junit.jupiter.params.provider.ValueSource; |
||||
|
|
||||
|
import static org.junit.jupiter.api.Assertions.assertEquals; |
||||
|
import static org.junit.jupiter.api.Assertions.assertNotNull; |
||||
|
import static org.junit.jupiter.api.Assertions.assertNull; |
||||
|
|
||||
|
class JsValidatorTest { |
||||
|
|
||||
|
@ParameterizedTest(name = "should return error for script \"{0}\"") |
||||
|
@ValueSource(strings = { |
||||
|
"async function test() {}", |
||||
|
"const result = await someFunc();", |
||||
|
"const result =\nawait\tsomeFunc();", |
||||
|
"setTimeout(1000);", |
||||
|
"new Promise((resolve) => {});", |
||||
|
"function test() { return 42; } \n\t await test()", |
||||
|
""" |
||||
|
function init() { |
||||
|
await doSomething(); |
||||
|
} |
||||
|
""", |
||||
|
}) |
||||
|
void shouldReturnErrorForInvalidScripts(String script) { |
||||
|
assertNotNull(JsValidator.validate(script)); |
||||
|
} |
||||
|
|
||||
|
@ParameterizedTest(name = "should pass validation for script: \"{0}\"") |
||||
|
@ValueSource(strings = { |
||||
|
"function test() { return 42; }", |
||||
|
"const result = 10 * 2;", |
||||
|
"// async is a keyword but not used: 'const word = \"async\";'", |
||||
|
"let note = 'setTimeout tight';", |
||||
|
|
||||
|
"const word = \"async\";", |
||||
|
"const word = \"setTimeout\";", |
||||
|
"const word = \"Promise\";", |
||||
|
"const word = \"await\";", |
||||
|
|
||||
|
"const word = 'async';", |
||||
|
"const word = 'setTimeout';", |
||||
|
"const word = 'Promise';", |
||||
|
"const word = 'await';", |
||||
|
|
||||
|
"//function test() { return 42; }", |
||||
|
"// const result = 10 * 2;", |
||||
|
"// async is a keyword but not used: 'const word = \"async\";'", |
||||
|
"//setTimeout(1);", |
||||
|
|
||||
|
"a=b+c; // await for a day", |
||||
|
"return new // Promise((resolve) => {", |
||||
|
"hello(); // async is a keyword but not used: 'const word = \"async\";'", |
||||
|
"setGoal(a); //setTimeout(1);", |
||||
|
|
||||
|
" /* new Promise((resolve) => {}); // */ return 'await';", |
||||
|
" /* async */ function calc() {", |
||||
|
"/* async function abc() { \n await new Promise ( \t setTimeout () ) \n } \n*/", |
||||
|
}) |
||||
|
void shouldReturnNullForValidScripts(String script) { |
||||
|
assertNull(JsValidator.validate(script)); |
||||
|
} |
||||
|
|
||||
|
@ParameterizedTest(name = "should return 'Script body is empty' for input: \"{0}\"") |
||||
|
@NullAndEmptySource |
||||
|
@ValueSource(strings = {" ", "\t", "\n"}) |
||||
|
void shouldReturnErrorForEmptyOrNullScripts(String script) { |
||||
|
assertEquals("Script body is empty", JsValidator.validate(script)); |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,34 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.transport.lwm2m.server.client; |
||||
|
|
||||
|
import lombok.AllArgsConstructor; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.HashSet; |
||||
|
import java.util.Set; |
||||
|
|
||||
|
@Data |
||||
|
@AllArgsConstructor |
||||
|
public class ResourceUpdateResult { |
||||
|
private LwM2mClient lwM2MClient; |
||||
|
private Set<String> paths; |
||||
|
|
||||
|
public ResourceUpdateResult(LwM2mClient lwM2MClient) { |
||||
|
this.lwM2MClient = lwM2MClient; |
||||
|
this.paths = new HashSet<>(); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,44 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.transport.lwm2m.server.model; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
import org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryObserveStrategy; |
||||
|
|
||||
|
import java.util.Map; |
||||
|
import java.util.Set; |
||||
|
import java.util.concurrent.ConcurrentHashMap; |
||||
|
|
||||
|
import static org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryObserveStrategy.SINGLE; |
||||
|
|
||||
|
@Data |
||||
|
public class ParametersObserveAnalyzeResult { |
||||
|
Set<String> observeSingleToCancel = ConcurrentHashMap.newKeySet(); |
||||
|
Set<String> observeSingleToNew = ConcurrentHashMap.newKeySet(); |
||||
|
Map<Integer, String[]> observeByObjectToNew = new ConcurrentHashMap<>();; |
||||
|
Map<Integer, String[]> observeByObjectToCancel = new ConcurrentHashMap<>();; |
||||
|
TelemetryObserveStrategy observeStrategyOld = SINGLE; |
||||
|
TelemetryObserveStrategy observeStrategyNew = SINGLE; |
||||
|
|
||||
|
public ParametersObserveAnalyzeResult(Set<String> observeSingleToCancel, Set<String> observeSingleToNew, TelemetryObserveStrategy observeStrategyOld, TelemetryObserveStrategy observeStrategyNew){ |
||||
|
this.observeSingleToCancel = observeSingleToCancel; |
||||
|
this.observeSingleToNew = observeSingleToNew; |
||||
|
this.observeStrategyOld = observeStrategyOld; |
||||
|
this.observeStrategyNew = observeStrategyNew; |
||||
|
} |
||||
|
|
||||
|
public ParametersObserveAnalyzeResult(){} |
||||
|
} |
||||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue