Skip to content

Commit 4b88fd7

Browse files
Merge branch 'master' into GODRIVER-3419
2 parents 8d6fc8e + 6c97757 commit 4b88fd7

File tree

30 files changed

+316
-429
lines changed

30 files changed

+316
-429
lines changed

.github/workflows/scorecard.yml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# This workflow uses actions that are not certified by GitHub. They are provided
2+
# by a third-party and are governed by separate terms of service, privacy
3+
# policy, and support documentation.
4+
5+
name: Scorecard supply-chain security
6+
on:
7+
# For Branch-Protection check. Only the default branch is supported. See
8+
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
9+
branch_protection_rule:
10+
# To guarantee Maintained check is occasionally updated. See
11+
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
12+
schedule:
13+
- cron: '24 21 * * 1'
14+
push:
15+
branches: [ "master" ]
16+
17+
# Declare default permissions as read only.
18+
permissions: read-all
19+
20+
jobs:
21+
analysis:
22+
name: Scorecard analysis
23+
runs-on: ubuntu-latest
24+
# `publish_results: true` only works when run from the default branch. conditional can be removed if disabled.
25+
if: github.event.repository.default_branch == github.ref_name || github.event_name == 'pull_request'
26+
permissions:
27+
# Needed to upload the results to code-scanning dashboard.
28+
security-events: write
29+
# Needed to publish results and get a badge (see publish_results below).
30+
id-token: write
31+
# Uncomment the permissions below if installing in a private repository.
32+
# contents: read
33+
# actions: read
34+
35+
steps:
36+
- name: "Checkout code"
37+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
38+
with:
39+
persist-credentials: false
40+
41+
- name: "Run analysis"
42+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
43+
with:
44+
results_file: results.sarif
45+
results_format: sarif
46+
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
47+
# - you want to enable the Branch-Protection check on a *public* repository, or
48+
# - you are installing Scorecard on a *private* repository
49+
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
50+
# repo_token: ${{ secrets.SCORECARD_TOKEN }}
51+
52+
# Public repositories:
53+
# - Publish results to OpenSSF REST API for easy access by consumers
54+
# - Allows the repository to include the Scorecard badge.
55+
# - See https://github.com/ossf/scorecard-action#publishing-results.
56+
# For private repositories:
57+
# - `publish_results` will always be set to `false`, regardless
58+
# of the value entered here.
59+
publish_results: true
60+
61+
# (Optional) Uncomment file_mode if you have a .gitattributes with files marked export-ignore
62+
# file_mode: git
63+
64+
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
65+
# format to the repository Actions tab.
66+
- name: "Upload artifact"
67+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
68+
with:
69+
name: SARIF file
70+
path: results.sarif
71+
retention-days: 5
72+
73+
# Upload the results to GitHub's code scanning dashboard (optional).
74+
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
75+
- name: "Upload to code-scanning"
76+
uses: github/codeql-action/upload-sarif@v3
77+
with:
78+
sarif_file: results.sarif

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<a href="https://pkg.go.dev/go.mongodb.org/mongo-driver/v2/mongo"><img src="etc/assets/godev-mongo-blue.svg" alt="docs"></a>
55
<a href="https://pkg.go.dev/go.mongodb.org/mongo-driver/v2/bson"><img src="etc/assets/godev-bson-blue.svg" alt="docs"></a>
66
<a href="https://www.mongodb.com/docs/drivers/go/current/"><img src="etc/assets/docs-mongodb-green.svg"></a>
7+
<a href="https://securityscorecards.dev/viewer/?uri=github.com/mongodb/mongo-go-driver">
8+
<img src="https://api.securityscorecards.dev/projects/github.com/mongodb/mongo-go-driver/badge" alt="OpenSSF Scorecard" />
9+
</a>
710
</p>
811

912
# MongoDB Go Driver

bson/doc.go

Lines changed: 29 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,14 @@
44
// not use this file except in compliance with the License. You may obtain
55
// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
66

7-
// Package bson is a library for reading, writing, and manipulating BSON. BSON is a binary serialization format used to
8-
// store documents and make remote procedure calls in MongoDB. The BSON specification is located at https://bsonspec.org.
9-
// The BSON library handles marshaling and unmarshaling of values through a configurable codec system. For a description
10-
// of the codec system and examples of registering custom codecs, see the bsoncodec package. For additional information
11-
// and usage examples, check out the [Work with BSON] page in the Go Driver docs site.
12-
//
13-
// # Raw BSON
14-
//
15-
// The Raw family of types is used to validate and retrieve elements from a slice of bytes. This
16-
// type is most useful when you want do lookups on BSON bytes without unmarshaling it into another
17-
// type.
18-
//
19-
// Example:
20-
//
21-
// var raw bson.Raw = ... // bytes from somewhere
22-
// err := raw.Validate()
23-
// if err != nil { return err }
24-
// val := raw.Lookup("foo")
25-
// i32, ok := val.Int32OK()
26-
// // do something with i32...
7+
// Package bson is a library for reading, writing, and manipulating BSON. BSON is a binary serialization
8+
// format used to store documents and make remote procedure calls in MongoDB. For more information about
9+
// the Go BSON library, including usage examples, check out the [Work with BSON] page in the Go Driver
10+
// docs site. For more information about BSON, see https://bsonspec.org.
2711
//
2812
// # Native Go Types
2913
//
30-
// The D and M types defined in this package can be used to build representations of BSON using native Go types. D is a
14+
// The [D] and [M] types defined in this package can be used to build representations of BSON using native Go types. D is a
3115
// slice and M is a map. For more information about the use cases for these types, see the documentation on the type
3216
// definitions.
3317
//
@@ -93,26 +77,16 @@
9377
// 5. When unmarshaling, a field of type interface{} will follow the D/M type mappings listed above. BSON documents
9478
// unmarshaled into an interface{} field will be unmarshaled as a D.
9579
//
96-
// The encoding of each struct field can be customized by the "bson" struct tag.
97-
//
98-
// This tag behavior is configurable, and different struct tag behavior can be configured by initializing a new
99-
// bsoncodec.StructCodec with the desired tag parser and registering that StructCodec onto the Registry. By default, JSON
100-
// tags are not honored, but that can be enabled by creating a StructCodec with JSONFallbackStructTagParser, like below:
101-
//
102-
// Example:
103-
//
104-
// structcodec, _ := bsoncodec.NewStructCodec(bsoncodec.JSONFallbackStructTagParser)
105-
//
106-
// The bson tag gives the name of the field, possibly followed by a comma-separated list of options.
107-
// The name may be empty in order to specify options without overriding the default field name. The following options can
108-
// be used to configure behavior:
80+
// The encoding of each struct field can be customized by the "bson" struct tag. The "bson" tag gives the name of the
81+
// field, followed by a comma-separated list of options. The name may be omitted in order to specify options without
82+
// overriding the default field name. The following options can be used to configure behavior:
10983
//
11084
// 1. omitempty: If the "omitempty" struct tag is specified on a field, the field will not be marshaled if it is set to
11185
// an "empty" value. Numbers, booleans, and strings are considered empty if their value is equal to the zero value for
11286
// the type (i.e. 0 for numbers, false for booleans, and "" for strings). Slices, maps, and arrays are considered
11387
// empty if they are of length zero. Interfaces and pointers are considered empty if their value is nil. By default,
114-
// structs are only considered empty if the struct type implements [bsoncodec.Zeroer] and the IsZero
115-
// method returns true. Struct types that do not implement [bsoncodec.Zeroer] are never considered empty and will be
88+
// structs are only considered empty if the struct type implements [Zeroer] and the "IsZero"
89+
// method returns true. Struct types that do not implement [Zeroer] are never considered empty and will be
11690
// marshaled as embedded documents. NOTE: It is recommended that this tag be used for all slice and map fields.
11791
//
11892
// 2. minsize: If the minsize struct tag is specified on a field of type int64, uint, uint32, or uint64 and the value of
@@ -134,22 +108,34 @@
134108
// error will be returned. This tag can be used with fields that are pointers to structs. If an inlined pointer field
135109
// is nil, it will not be marshaled. For fields that are not maps or structs, this tag is ignored.
136110
//
137-
// # Marshaling and Unmarshaling
111+
// # Raw BSON
138112
//
139-
// Manually marshaling and unmarshaling can be done with the Marshal and Unmarshal family of functions.
113+
// The Raw family of types is used to validate and retrieve elements from a slice of bytes. This
114+
// type is most useful when you want do lookups on BSON bytes without unmarshaling it into another
115+
// type.
140116
//
141-
// bsoncodec code provides a system for encoding values to BSON representations and decoding
142-
// values from BSON representations. This package considers both binary BSON and ExtendedJSON as
143-
// BSON representations. The types in this package enable a flexible system for handling this
144-
// encoding and decoding.
117+
// Example:
145118
//
146-
// The codec system is composed of two parts:
119+
// var raw bson.Raw = ... // bytes from somewhere
120+
// err := raw.Validate()
121+
// if err != nil { return err }
122+
// val := raw.Lookup("foo")
123+
// i32, ok := val.Int32OK()
124+
// // do something with i32...
125+
//
126+
// # Custom Registry
127+
//
128+
// The Go BSON library uses a [Registry] to define encoding and decoding behavior for different data types.
129+
// The default encoding and decoding behavior can be customized or extended by using a modified Registry.
130+
// The custom registry system is composed of two parts:
147131
//
148132
// 1) [ValueEncoder] and [ValueDecoder] that handle encoding and decoding Go values to and from BSON
149133
// representations.
150134
//
151135
// 2) A [Registry] that holds these ValueEncoders and ValueDecoders and provides methods for
152136
// retrieving them.
153137
//
138+
// To use a custom Registry, use [Encoder.SetRegistry] or [Decoder.SetRegistry].
139+
//
154140
// [Work with BSON]: https://www.mongodb.com/docs/drivers/go/current/fundamentals/bson/
155141
package bson

internal/httputil/httputil.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,17 @@ import (
1010
"net/http"
1111
)
1212

13-
// DefaultHTTPClient is the default HTTP client used across the driver.
14-
var DefaultHTTPClient = &http.Client{
15-
Transport: http.DefaultTransport.(*http.Transport).Clone(),
13+
var DefaultHTTPClient = &http.Client{}
14+
15+
// NewHTTPClient will return the globally-defined DefaultHTTPClient, updating
16+
// the transport if it differs from the http package DefaultTransport.
17+
func NewHTTPClient() *http.Client {
18+
client := DefaultHTTPClient
19+
if _, ok := http.DefaultTransport.(*http.Transport); !ok {
20+
client.Transport = http.DefaultTransport
21+
}
22+
23+
return client
1624
}
1725

1826
// CloseIdleHTTPConnections closes any connections which were previously

internal/httputil/httputil_test.go

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Copyright (C) MongoDB, Inc. 2022-present.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License"); you may
4+
// not use this file except in compliance with the License. You may obtain
5+
// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6+
7+
package httputil
8+
9+
import (
10+
"net/http"
11+
"testing"
12+
13+
"go.mongodb.org/mongo-driver/v2/internal/assert"
14+
)
15+
16+
type nonDefaultTransport struct{}
17+
18+
func (*nonDefaultTransport) RoundTrip(*http.Request) (*http.Response, error) { return nil, nil }
19+
20+
func TestDefaultHTTPClientTransport(t *testing.T) {
21+
t.Run("default", func(t *testing.T) {
22+
client := NewHTTPClient()
23+
24+
val := assert.ObjectsAreEqual(http.DefaultClient, client)
25+
26+
assert.True(t, val)
27+
assert.Equal(t, DefaultHTTPClient, client)
28+
})
29+
30+
t.Run("non-default global transport", func(t *testing.T) {
31+
http.DefaultTransport = &nonDefaultTransport{}
32+
33+
client := NewHTTPClient()
34+
35+
val := assert.ObjectsAreEqual(&nonDefaultTransport{}, client.Transport)
36+
37+
assert.True(t, val)
38+
assert.Equal(t, DefaultHTTPClient, client)
39+
assert.NotEqual(t, http.DefaultClient, client) // Sanity Check
40+
})
41+
}

internal/integration/unified/matches.go

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,19 +242,32 @@ func evaluateSpecialComparison(ctx context.Context, assertionDoc bson.Raw, actua
242242
return fmt.Errorf("expected lsid %v, got %v", expectedID, actualID)
243243
}
244244
case "$$lte":
245-
if assertionVal.Type != bson.TypeInt32 && assertionVal.Type != bson.TypeInt64 {
246-
return fmt.Errorf("expected assertionVal to be an Int32 or Int64 but got a %s", assertionVal.Type)
245+
if assertionVal.Type != bson.TypeInt32 && assertionVal.Type != bson.TypeInt64 && assertionVal.Type != bson.TypeDouble {
246+
return fmt.Errorf("expected assertionVal to be an Int32, Int64, or Double but got a %s", assertionVal.Type)
247247
}
248-
if actual.Type != bson.TypeInt32 && actual.Type != bson.TypeInt64 {
249-
return fmt.Errorf("expected value to be an Int32 or Int64 but got a %s", actual.Type)
248+
if actual.Type != bson.TypeInt32 && actual.Type != bson.TypeInt64 && assertionVal.Type != bson.TypeDouble {
249+
return fmt.Errorf("expected value to be an Int32, Int64, or Double but got a %s", actual.Type)
250250
}
251251

252252
// Numeric values can be compared even if their types are different (e.g. if expected is an int32 and actual
253253
// is an int64).
254-
expectedInt64 := assertionVal.AsInt64()
255-
actualInt64 := actual.AsInt64()
256-
if actualInt64 > expectedInt64 {
257-
return fmt.Errorf("expected numeric value %d to be less than or equal %d", actualInt64, expectedInt64)
254+
255+
// TODO(GODRIVER-3594): If we decide to add AsDoubleOK() as a method to RawValue, this following conversion should be updated.
256+
var expectedF64 float64
257+
if assertionVal.Type == bson.TypeDouble {
258+
expectedF64 = assertionVal.Double()
259+
} else {
260+
expectedF64 = float64(assertionVal.AsInt64())
261+
}
262+
var actualF64 float64
263+
if actual.Type == bson.TypeDouble {
264+
actualF64 = actual.Double()
265+
} else {
266+
actualF64 = float64(actual.AsInt64())
267+
}
268+
269+
if actualF64 > expectedF64 {
270+
return fmt.Errorf("expected numeric value %f to be less than or equal %f", actualF64, expectedF64)
258271
}
259272
return nil
260273
case "$$matchAsDocument":

internal/integtest/integtest.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@ func AddServerlessAuthCredentials(uri string) (string, error) {
223223

224224
// ConnString gets the globally configured connection string.
225225
func ConnString(t *testing.T) *connstring.ConnString {
226+
if testing.Short() {
227+
t.Skip("skipping integration test in short mode")
228+
}
229+
226230
connectionStringOnce.Do(func() {
227231
uri, err := MongoDBURI()
228232
require.NoError(t, err, "error constructing mongodb URI: %v", err)

internal/spectest/skip.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ import "testing"
1111
// skipTests is a map of "fully-qualified test name" to "the reason for skipping
1212
// the test".
1313
var skipTests = map[string][]string{
14-
// TODO(GODRIVER-3518): Test flexible numeric comparisons with $$lte
15-
"Modifies $$lte operator test to also use floating point and Int64 types (GODRIVER-3518)": {
16-
"TestUnifiedSpec/unified-test-format/tests/valid-pass/operator-lte.json/special_lte_matching_operator",
17-
},
1814

1915
// SPEC-1403: This test checks to see if the correct error is thrown when auto
2016
// encrypting with a server < 4.2. Currently, the test will fail because a

internal/test/aws/aws_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ import (
2020

2121
func TestAWS(t *testing.T) {
2222
uri := os.Getenv("MONGODB_URI")
23+
if uri == "" {
24+
t.Skip("Skipping test: MONGODB_URI environment variable is not set")
25+
}
2326

2427
client, err := mongo.Connect(options.Client().ApplyURI(uri))
25-
require.NoError(t, err, "Connect error")
2628

2729
defer func() {
2830
err = client.Disconnect(context.Background())

0 commit comments

Comments
 (0)