Skip to content

Commit e696956

Browse files
mergify[bot]ShourieGbelimawr
authored
[9.1](backport #47611) [azureblobstorage] - Make OAuth2 tests compatible with latest version of AzIdentity and AzureAD libraries (#47736)
Microsoft in their latest SDK updates to AzureAD and And AzIdentity, have made changes to how their OIDC endpoints are validated. With these changes, when using a custom source for the OIDC endpoints, the "issuer" must be validated against the "authority" (base url). With these changes when we try to inject a custom authority in the http transport, completely separate clients seem to be created internally by the SDK which bypass our custom transport and we are unable to mock the authentication process. Because of this, we are changing the mock authentication to occur on standard Microsoft endpoints which bypass the authority validation as a whole. (cherry picked from commit d333f3c) # Conflicts: # NOTICE.txt # go.mod # go.sum --------- Co-authored-by: Shourie Ganguly <shourie.ganguly@elastic.co> Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co>
1 parent a0a1a43 commit e696956

File tree

5 files changed

+158
-176
lines changed

5 files changed

+158
-176
lines changed

CHANGELOG-developer.next.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
118118
- Fixed Fileebat GCP Pub/Sub input integration tests. {pull}45150[45150]
119119
- `mage BuildSystemTestBinary` now build Otel enabled binaries for Filebeat and Metricbeat {pull}45824[45824]
120120
- testing/environments/docker/cometd: update base img version {pull}45889[45889]
121+
- Made Filebeat azureblobstorage input OAuth2 tests compatible with latest version of Azidentity and AzureAD libraries. {pull}47611[47611]
121122

122123
==== Added
123124

NOTICE.txt

Lines changed: 71 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,11 +1742,11 @@ SOFTWARE.
17421742

17431743
--------------------------------------------------------------------------------
17441744
Dependency : github.com/Azure/azure-sdk-for-go/sdk/azcore
1745-
Version: v1.18.0
1745+
Version: v1.20.0
17461746
Licence type (autodetected): MIT
17471747
--------------------------------------------------------------------------------
17481748

1749-
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/azcore@v1.18.0/LICENSE.txt:
1749+
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/azcore@v1.20.0/LICENSE.txt:
17501750

17511751
MIT License
17521752

@@ -1773,11 +1773,11 @@ SOFTWARE
17731773

17741774
--------------------------------------------------------------------------------
17751775
Dependency : github.com/Azure/azure-sdk-for-go/sdk/azidentity
1776-
Version: v1.10.1
1776+
Version: v1.13.1
17771777
Licence type (autodetected): MIT
17781778
--------------------------------------------------------------------------------
17791779

1780-
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/azidentity@v1.10.1/LICENSE.txt:
1780+
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/azidentity@v1.13.1/LICENSE.txt:
17811781

17821782
MIT License
17831783

@@ -16064,11 +16064,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1606416064

1606516065
--------------------------------------------------------------------------------
1606616066
Dependency : github.com/gofrs/uuid/v5
16067-
Version: v5.2.0
16067+
Version: v5.3.2
1606816068
Licence type (autodetected): MIT
1606916069
--------------------------------------------------------------------------------
1607016070

16071-
Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid/v5@v5.2.0/LICENSE:
16071+
Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid/v5@v5.3.2/LICENSE:
1607216072

1607316073
Copyright (C) 2013-2018 by Maxim Bublis <b@codemonkey.ru>
1607416074

@@ -16170,11 +16170,11 @@ THE SOFTWARE.
1617016170

1617116171
--------------------------------------------------------------------------------
1617216172
Dependency : github.com/golang-jwt/jwt/v5
16173-
Version: v5.2.2
16173+
Version: v5.3.0
1617416174
Licence type (autodetected): MIT
1617516175
--------------------------------------------------------------------------------
1617616176

16177-
Contents of probable licence file $GOMODCACHE/github.com/golang-jwt/jwt/v5@v5.2.2/LICENSE:
16177+
Contents of probable licence file $GOMODCACHE/github.com/golang-jwt/jwt/v5@v5.3.0/LICENSE:
1617816178

1617916179
Copyright (c) 2012 Dave Grijalva
1618016180
Copyright (c) 2021 golang-jwt maintainers
@@ -28770,11 +28770,11 @@ THE SOFTWARE.
2877028770

2877128771
--------------------------------------------------------------------------------
2877228772
Dependency : golang.org/x/crypto
28773-
Version: v0.41.0
28773+
Version: v0.44.0
2877428774
Licence type (autodetected): BSD-3-Clause
2877528775
--------------------------------------------------------------------------------
2877628776

28777-
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.41.0/LICENSE:
28777+
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.44.0/LICENSE:
2877828778

2877928779
Copyright 2009 The Go Authors.
2878028780

@@ -28807,11 +28807,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2880728807

2880828808
--------------------------------------------------------------------------------
2880928809
Dependency : golang.org/x/exp
28810-
Version: v0.0.0-20250718183923-645b1fa84792
28810+
Version: v0.0.0-20250811191247-51f88131bc50
2881128811
Licence type (autodetected): BSD-3-Clause
2881228812
--------------------------------------------------------------------------------
2881328813

28814-
Contents of probable licence file $GOMODCACHE/golang.org/x/exp@v0.0.0-20250718183923-645b1fa84792/LICENSE:
28814+
Contents of probable licence file $GOMODCACHE/golang.org/x/exp@v0.0.0-20250811191247-51f88131bc50/LICENSE:
2881528815

2881628816
Copyright 2009 The Go Authors.
2881728817

@@ -28844,11 +28844,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2884428844

2884528845
--------------------------------------------------------------------------------
2884628846
Dependency : golang.org/x/mod
28847-
Version: v0.27.0
28847+
Version: v0.29.0
2884828848
Licence type (autodetected): BSD-3-Clause
2884928849
--------------------------------------------------------------------------------
2885028850

28851-
Contents of probable licence file $GOMODCACHE/golang.org/x/mod@v0.27.0/LICENSE:
28851+
Contents of probable licence file $GOMODCACHE/golang.org/x/mod@v0.29.0/LICENSE:
2885228852

2885328853
Copyright 2009 The Go Authors.
2885428854

@@ -28881,11 +28881,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2888128881

2888228882
--------------------------------------------------------------------------------
2888328883
Dependency : golang.org/x/net
28884-
Version: v0.43.0
28884+
Version: v0.47.0
2888528885
Licence type (autodetected): BSD-3-Clause
2888628886
--------------------------------------------------------------------------------
2888728887

28888-
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.43.0/LICENSE:
28888+
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.47.0/LICENSE:
2888928889

2889028890
Copyright 2009 The Go Authors.
2889128891

@@ -28955,11 +28955,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2895528955

2895628956
--------------------------------------------------------------------------------
2895728957
Dependency : golang.org/x/sync
28958-
Version: v0.16.0
28958+
Version: v0.18.0
2895928959
Licence type (autodetected): BSD-3-Clause
2896028960
--------------------------------------------------------------------------------
2896128961

28962-
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.16.0/LICENSE:
28962+
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.18.0/LICENSE:
2896328963

2896428964
Copyright 2009 The Go Authors.
2896528965

@@ -28992,11 +28992,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2899228992

2899328993
--------------------------------------------------------------------------------
2899428994
Dependency : golang.org/x/sys
28995-
Version: v0.35.0
28995+
Version: v0.38.0
2899628996
Licence type (autodetected): BSD-3-Clause
2899728997
--------------------------------------------------------------------------------
2899828998

28999-
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.35.0/LICENSE:
28999+
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.38.0/LICENSE:
2900029000

2900129001
Copyright 2009 The Go Authors.
2900229002

@@ -29029,11 +29029,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2902929029

2903029030
--------------------------------------------------------------------------------
2903129031
Dependency : golang.org/x/term
29032-
Version: v0.34.0
29032+
Version: v0.37.0
2903329033
Licence type (autodetected): BSD-3-Clause
2903429034
--------------------------------------------------------------------------------
2903529035

29036-
Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.34.0/LICENSE:
29036+
Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.37.0/LICENSE:
2903729037

2903829038
Copyright 2009 The Go Authors.
2903929039

@@ -29066,11 +29066,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2906629066

2906729067
--------------------------------------------------------------------------------
2906829068
Dependency : golang.org/x/text
29069-
Version: v0.28.0
29069+
Version: v0.31.0
2907029070
Licence type (autodetected): BSD-3-Clause
2907129071
--------------------------------------------------------------------------------
2907229072

29073-
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.28.0/LICENSE:
29073+
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.31.0/LICENSE:
2907429074

2907529075
Copyright 2009 The Go Authors.
2907629076

@@ -29140,11 +29140,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2914029140

2914129141
--------------------------------------------------------------------------------
2914229142
Dependency : golang.org/x/tools
29143-
Version: v0.36.0
29143+
Version: v0.38.0
2914429144
Licence type (autodetected): BSD-3-Clause
2914529145
--------------------------------------------------------------------------------
2914629146

29147-
Contents of probable licence file $GOMODCACHE/golang.org/x/tools@v0.36.0/LICENSE:
29147+
Contents of probable licence file $GOMODCACHE/golang.org/x/tools@v0.38.0/LICENSE:
2914829148

2914929149
Copyright 2009 The Go Authors.
2915029150

@@ -29214,11 +29214,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2921429214

2921529215
--------------------------------------------------------------------------------
2921629216
Dependency : google.golang.org/genproto/googleapis/api
29217-
Version: v0.0.0-20250804133106-a7a43d27e69b
29217+
Version: v0.0.0-20250825161204-c5933d9347a5
2921829218
Licence type (autodetected): Apache-2.0
2921929219
--------------------------------------------------------------------------------
2922029220

29221-
Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/api@v0.0.0-20250804133106-a7a43d27e69b/LICENSE:
29221+
Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/api@v0.0.0-20250825161204-c5933d9347a5/LICENSE:
2922229222

2922329223

2922429224
Apache License
@@ -34495,11 +34495,11 @@ SOFTWARE
3449534495

3449634496
--------------------------------------------------------------------------------
3449734497
Dependency : github.com/Azure/azure-sdk-for-go/sdk/internal
34498-
Version: v1.11.1
34498+
Version: v1.11.2
3449934499
Licence type (autodetected): MIT
3450034500
--------------------------------------------------------------------------------
3450134501

34502-
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/internal@v1.11.1/LICENSE.txt:
34502+
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go/sdk/internal@v1.11.2/LICENSE.txt:
3450334503

3450434504
MIT License
3450534505

@@ -36641,11 +36641,11 @@ Contents of probable licence file $GOMODCACHE/github.com/!azure!a!d/microsoft-au
3664136641

3664236642
--------------------------------------------------------------------------------
3664336643
Dependency : github.com/AzureAD/microsoft-authentication-library-for-go
36644-
Version: v1.4.2
36644+
Version: v1.6.0
3664536645
Licence type (autodetected): MIT
3664636646
--------------------------------------------------------------------------------
3664736647

36648-
Contents of probable licence file $GOMODCACHE/github.com/!azure!a!d/microsoft-authentication-library-for-go@v1.4.2/LICENSE:
36648+
Contents of probable licence file $GOMODCACHE/github.com/!azure!a!d/microsoft-authentication-library-for-go@v1.6.0/LICENSE:
3664936649

3665036650
MIT License
3665136651

@@ -44368,37 +44368,6 @@ THE SOFTWARE.
4436844368

4436944369

4437044370

44371-
--------------------------------------------------------------------------------
44372-
Dependency : github.com/dgryski/go-rendezvous
44373-
Version: v0.0.0-20200823014737-9f7001d12a5f
44374-
Licence type (autodetected): MIT
44375-
--------------------------------------------------------------------------------
44376-
44377-
Contents of probable licence file $GOMODCACHE/github.com/dgryski/go-rendezvous@v0.0.0-20200823014737-9f7001d12a5f/LICENSE:
44378-
44379-
The MIT License (MIT)
44380-
44381-
Copyright (c) 2017-2020 Damian Gryski <damian@gryski.com>
44382-
44383-
Permission is hereby granted, free of charge, to any person obtaining a copy
44384-
of this software and associated documentation files (the "Software"), to deal
44385-
in the Software without restriction, including without limitation the rights
44386-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
44387-
copies of the Software, and to permit persons to whom the Software is
44388-
furnished to do so, subject to the following conditions:
44389-
44390-
The above copyright notice and this permission notice shall be included in
44391-
all copies or substantial portions of the Software.
44392-
44393-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
44394-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
44395-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
44396-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
44397-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
44398-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
44399-
THE SOFTWARE.
44400-
44401-
4440244371
--------------------------------------------------------------------------------
4440344372
Dependency : github.com/dimchansky/utfbom
4440444373
Version: v1.1.0
@@ -62882,41 +62851,6 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/sigv4@v0.2.0
6288262851
limitations under the License.
6288362852

6288462853

62885-
--------------------------------------------------------------------------------
62886-
Dependency : github.com/redis/go-redis/v9
62887-
Version: v9.8.0
62888-
Licence type (autodetected): BSD-2-Clause
62889-
--------------------------------------------------------------------------------
62890-
62891-
Contents of probable licence file $GOMODCACHE/github.com/redis/go-redis/v9@v9.8.0/LICENSE:
62892-
62893-
Copyright (c) 2013 The github.com/redis/go-redis Authors.
62894-
All rights reserved.
62895-
62896-
Redistribution and use in source and binary forms, with or without
62897-
modification, are permitted provided that the following conditions are
62898-
met:
62899-
62900-
* Redistributions of source code must retain the above copyright
62901-
notice, this list of conditions and the following disclaimer.
62902-
* Redistributions in binary form must reproduce the above
62903-
copyright notice, this list of conditions and the following disclaimer
62904-
in the documentation and/or other materials provided with the
62905-
distribution.
62906-
62907-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
62908-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
62909-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
62910-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
62911-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
62912-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
62913-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
62914-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
62915-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
62916-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
62917-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
62918-
62919-
6292062854
--------------------------------------------------------------------------------
6292162855
Dependency : github.com/rivo/uniseg
6292262856
Version: v0.4.7
@@ -80730,6 +80664,43 @@ See the License for the specific language governing permissions and
8073080664
limitations under the License.
8073180665

8073280666

80667+
--------------------------------------------------------------------------------
80668+
Dependency : golang.org/x/telemetry
80669+
Version: v0.0.0-20251008203120-078029d740a8
80670+
Licence type (autodetected): BSD-3-Clause
80671+
--------------------------------------------------------------------------------
80672+
80673+
Contents of probable licence file $GOMODCACHE/golang.org/x/telemetry@v0.0.0-20251008203120-078029d740a8/LICENSE:
80674+
80675+
Copyright 2009 The Go Authors.
80676+
80677+
Redistribution and use in source and binary forms, with or without
80678+
modification, are permitted provided that the following conditions are
80679+
met:
80680+
80681+
* Redistributions of source code must retain the above copyright
80682+
notice, this list of conditions and the following disclaimer.
80683+
* Redistributions in binary form must reproduce the above
80684+
copyright notice, this list of conditions and the following disclaimer
80685+
in the documentation and/or other materials provided with the
80686+
distribution.
80687+
* Neither the name of Google LLC nor the names of its
80688+
contributors may be used to endorse or promote products derived from
80689+
this software without specific prior written permission.
80690+
80691+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
80692+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
80693+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
80694+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
80695+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
80696+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
80697+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
80698+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
80699+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
80700+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
80701+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
80702+
80703+
8073380704
--------------------------------------------------------------------------------
8073480705
Dependency : golang.org/x/xerrors
8073580706
Version: v0.0.0-20240903120638-7835f813f4da
@@ -81013,11 +80984,11 @@ Contents of probable licence file $GOMODCACHE/google.golang.org/genproto@v0.0.0-
8101380984

8101480985
--------------------------------------------------------------------------------
8101580986
Dependency : google.golang.org/genproto/googleapis/rpc
81016-
Version: v0.0.0-20250811230008-5f3141c8851a
80987+
Version: v0.0.0-20250818200422-3122310a409c
8101780988
Licence type (autodetected): Apache-2.0
8101880989
--------------------------------------------------------------------------------
8101980990

81020-
Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20250811230008-5f3141c8851a/LICENSE:
80991+
Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20250818200422-3122310a409c/LICENSE:
8102180992

8102280993

8102380994
Apache License

0 commit comments

Comments
 (0)