Skip to content

Cherry picks from main #1846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rozza merged 2 commits into from
Dec 3, 2025
Merged

Cherry picks from main #1846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d83341e
Updated DEFAULT_ALLOWED_HOSTS (#1843)
rozza Nov 27, 2025
69f42ba
Implement NettyByteBuf.asReadOnly (#1841)
rozza Dec 2, 2025
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
4 changes: 2 additions & 2 deletions driver-core/src/main/com/mongodb/MongoCredential.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,13 @@ public final class MongoCredential {
* The list of allowed hosts that will be used if no
* {@link MongoCredential#ALLOWED_HOSTS_KEY} value is supplied.
* The default allowed hosts are:
* {@code "*.mongodb.net", "*.mongodb-qa.net", "*.mongodb-dev.net", "*.mongodbgov.net", "localhost", "127.0.0.1", "::1"}
* {@code "*.mongo.com", "*.mongodb.net", "*.mongodb-qa.net", "*.mongodb-dev.net", "*.mongodbgov.net", "localhost", "127.0.0.1", "::1"}
Copy link
Contributor

@nhachicha nhachicha Dec 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wasn't part of https://github.com/mongodb/mongo-java-driver/pull/1841/files

*
* @see #createOidcCredential(String)
* @since 5.1
*/
public static final List<String> DEFAULT_ALLOWED_HOSTS = Collections.unmodifiableList(Arrays.asList(
"*.mongodb.net", "*.mongodb-qa.net", "*.mongodb-dev.net", "*.mongodbgov.net", "localhost", "127.0.0.1", "::1"));
"*.mongo.com", "*.mongodb.net", "*.mongodb-qa.net", "*.mongodb-dev.net", "*.mongodbgov.net", "localhost", "127.0.0.1", "::1"));

/**
* Mechanism property key for specifying the URI of the target resource (sometimes called the audience),
Expand Down
4 changes: 2 additions & 2 deletions driver-core/src/main/com/mongodb/internal/connection/CompositeByteBuf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class CompositeByteBuf implements ByteBuf {
limit = components.get(components.size() - 1).endOffset;
}

CompositeByteBuf(final CompositeByteBuf from) {
private CompositeByteBuf(final CompositeByteBuf from) {
components = from.components;
position = from.position();
limit = from.limit();
Expand All @@ -58,7 +58,7 @@ class CompositeByteBuf implements ByteBuf {
@Override
public ByteBuf order(final ByteOrder byteOrder) {
if (byteOrder == ByteOrder.BIG_ENDIAN) {
throw new UnsupportedOperationException(format("Only %s is supported", ByteOrder.BIG_ENDIAN));
throw new UnsupportedOperationException(format("Only %s is supported", ByteOrder.LITTLE_ENDIAN));
}
return this;
}
Expand Down
2 changes: 1 addition & 1 deletion driver-core/src/main/com/mongodb/internal/connection/netty/NettyByteBuf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public ByteBuf limit(final int newLimit) {

@Override
public ByteBuf asReadOnly() {
return this; // TODO: do we need this method really? Netty ByteBuf does not have this concept
return new NettyByteBuf(proxied.asReadOnly().retain(), false);
}

@Override
Expand Down
1 change: 1 addition & 0 deletions ...ore/src/test/functional/com/mongodb/internal/connection/CommandHelperSpecification.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class CommandHelperSpecification extends Specification {
InternalConnection connection

def setup() {
InternalStreamConnection.setRecordEverything(true)
connection = new InternalStreamConnectionFactory(ClusterConnectionMode.SINGLE,
new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
getCredentialWithCache(), CLIENT_METADATA, [], LoggerSettings.builder().build(), null, getServerApi())
Expand Down
Loading