Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerina"
name = "websocket"
version = "2.15.0"
version = "2.15.1"
authors = ["Ballerina"]
keywords = ["ws", "network", "bi-directional", "streaming", "service", "client"]
repository = "https://github.com/ballerina-platform/module-ballerina-websocket"
Expand All @@ -15,20 +15,20 @@ graalvmCompatible = true
[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "websocket-native"
version = "2.15.0"
path = "../native/build/libs/websocket-native-2.15.0.jar"
version = "2.15.1"
path = "../native/build/libs/websocket-native-2.15.1-SNAPSHOT.jar"

[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "http-native"
version = "2.15.0"
path = "./lib/http-native-2.15.0.jar"
version = "2.15.4"
path = "./lib/http-native-2.15.4-20260105-153100-46b50ac.jar"

[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "mime-native"
version = "2.12.0"
path = "./lib/mime-native-2.12.0.jar"
version = "2.12.1"
path = "./lib/mime-native-2.12.1.jar"

[[platform.java21.dependency]]
groupId = "io.ballerina.stdlib"
Expand All @@ -39,51 +39,51 @@ path = "./lib/constraint-native-1.7.0.jar"
[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-common"
version = "4.1.126.Final"
path = "./lib/netty-common-4.1.126.Final.jar"
version = "4.1.130.Final"
path = "./lib/netty-common-4.1.130.Final.jar"

[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-buffer"
version = "4.1.126.Final"
path = "./lib/netty-buffer-4.1.126.Final.jar"
version = "4.1.130.Final"
path = "./lib/netty-buffer-4.1.130.Final.jar"

[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-transport"
version = "4.1.126.Final"
path = "./lib/netty-transport-4.1.126.Final.jar"
version = "4.1.130.Final"
path = "./lib/netty-transport-4.1.130.Final.jar"

[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-resolver"
version = "4.1.126.Final"
path = "./lib/netty-resolver-4.1.126.Final.jar"
version = "4.1.130.Final"
path = "./lib/netty-resolver-4.1.130.Final.jar"

[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-handler"
version = "4.1.126.Final"
path = "./lib/netty-handler-4.1.126.Final.jar"
version = "4.1.130.Final"
path = "./lib/netty-handler-4.1.130.Final.jar"

[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-codec-http"
version = "4.1.126.Final"
path = "./lib/netty-codec-http-4.1.126.Final.jar"
version = "4.1.130.Final"
path = "./lib/netty-codec-http-4.1.130.Final.jar"

[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-codec"
version = "4.1.126.Final"
path = "./lib/netty-codec-4.1.126.Final.jar"
version = "4.1.130.Final"
path = "./lib/netty-codec-4.1.130.Final.jar"

[[platform.java21.dependency]]
groupId = "io.netty"
artifactId = "netty-handler-proxy"
version = "4.1.126.Final"
path = "./lib/netty-handler-proxy-4.1.126.Final.jar"
version = "4.1.130.Final"
path = "./lib/netty-handler-proxy-4.1.130.Final.jar"

[[platform.java21.dependency]]
path = "../test-utils/build/libs/websocket-test-utils-2.15.0.jar"
path = "../test-utils/build/libs/websocket-test-utils-2.15.1-SNAPSHOT.jar"
scope = "testOnly"
6 changes: 3 additions & 3 deletions ballerina/CompilerPlugin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ id = "websocket-compiler-plugin"
class = "io.ballerina.stdlib.websocket.plugin.WebSocketCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/websocket-compiler-plugin-2.15.0.jar"
path = "../compiler-plugin/build/libs/websocket-compiler-plugin-2.15.1-SNAPSHOT.jar"

[[dependency]]
path = "../native/build/libs/websocket-native-2.15.0.jar"
path = "../native/build/libs/websocket-native-2.15.1-SNAPSHOT.jar"

[[dependency]]
path = "./lib/http-native-2.15.0.jar"
path = "./lib/http-native-2.15.4-20260105-153100-46b50ac.jar"
2 changes: 1 addition & 1 deletion ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "websocket"
version = "2.15.0"
version = "2.15.1"
dependencies = [
{org = "ballerina", name = "auth"},
{org = "ballerina", name = "constraint"},
Expand Down
1 change: 1 addition & 0 deletions ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ build.dependsOn ":${packageName}-native:build"
build.dependsOn ":${packageName}-test-utils:build"
build.dependsOn ":${packageName}-compiler-plugin:build"
test.dependsOn ":${packageName}-native:build"
test.dependsOn ":${packageName}-test-utils:build"
test.dependsOn ":${packageName}-compiler-plugin:build"

publishToMavenLocal.dependsOn build
Expand Down
6 changes: 6 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

### Fixed

- [Address `CVE-2025-67735` security vulnerability in Netty](https://github.com/ballerina-platform/ballerina-library/issues/8538)

## [2.15.0] - 2025-11-06

### Added

- [Support Custom Remote Function Mapping via Annotation](https://github.com/ballerina-platform/ballerina-library/issues/7733)
Expand Down
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ group=io.ballerina.stdlib
version=2.15.1-SNAPSHOT
ballerinaLangVersion=2201.13.0
ballerinaTomlParserVersion=1.2.2
nettyVersion=4.1.126.Final
nettyVersion=4.1.130.Final
slf4jVersion=1.7.30
puppycrawlCheckstyleVersion=10.12.0
unirestVersion=1.4.9
Expand All @@ -26,23 +26,23 @@ stdlibUrlVersion=2.6.0
stdlibConstraintVersion=1.7.0
stdlibCryptoVersion=2.9.2
stdlibLogVersion=2.13.0
stdlibOsVersion=1.10.0
stdlibOsVersion=1.10.1
stdlibTaskVersion=2.11.0

# Level 03
stdlibCacheVersion=3.10.0
stdlibFileVersion=1.12.0
stdlibMimeVersion=2.12.0
stdlibMimeVersion=2.12.1
stdlibUuidVersion=1.10.0

# Level 04
stdlibAuthVersion=2.14.0
stdlibDataJsonDataVersion=1.1.2
stdlibJwtVersion=2.15.0
stdlibDataJsonDataVersion=1.1.3
stdlibJwtVersion=2.15.1
stdlibOAuth2Version=2.15.0

# Level 05
stdlibHttpVersion=2.15.0
stdlibHttpVersion=2.15.4-20260105-153100-46b50ac

# Ballerinax Observer
observeVersion=1.5.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
*
*/
public class InitEndpoint extends AbstractWebsocketNativeFunction {

private static final int BUFFER_SIZE = 1048576;
private static final int BACK_LOG = 100;

public static Object initEndpoint(BObject serviceEndpoint) {
ServerConnector httpServerConnector;
try {
Expand Down Expand Up @@ -134,13 +138,21 @@ private static ListenerConfiguration getListenerConfig(long port, BMap endpointC
listenerConfiguration.setWebSocketCompressionEnabled((Boolean) webSocketCompressionEnabled);
}

setSocketConfig(endpointConfig, listenerConfiguration);

if (sslConfig != null) {
return setSslConfig(sslConfig, listenerConfiguration);
}

return listenerConfiguration;
}

private static void setSocketConfig(BMap endpointConfig, ListenerConfiguration listenerConfiguration) {
listenerConfiguration.setReceiveBufferSize(BUFFER_SIZE);
listenerConfiguration.setSendBufferSize(BUFFER_SIZE);
listenerConfiguration.setSoBackLog(BACK_LOG);
}

private static ListenerConfiguration setSslConfig(BMap<BString, Object> secureSocket,
ListenerConfiguration listenerConfiguration) {
List<Parameter> serverParamList = new ArrayList<>();
Expand Down