Showing with 77 additions and 37 deletions.
  1. +4 −0 .final_builds/jobs/uaa/index.yml
  2. +4 −0 .final_builds/packages/uaa/index.yml
  3. +6 −0 .github/dependabot.yml
  4. +3 −5 Gemfile.lock
  5. +1 −1 jobs/uaa/spec
  6. +2 −0 releases/uaa/index.yml
  7. +26 −0 releases/uaa/uaa-77.2.0.yml
  8. +6 −6 src/acceptance_tests/go.mod
  9. +24 −24 src/acceptance_tests/go.sum
  10. +1 −1 src/uaa
4 changes: 4 additions & 0 deletions .final_builds/jobs/uaa/index.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ builds:
version: 733395e5e40c0d5e761643186b584940ba2efb54
blobstore_id: 68473184-4ffc-4b95-7e61-4ba846e21e19
sha1: 02e8b4079a136f46489f7fed9dda8b1275888654
83b46301f2168e0bee50fb0eb1c7428f7948f4321f1344a82024c26730a73fbc:
version: 83b46301f2168e0bee50fb0eb1c7428f7948f4321f1344a82024c26730a73fbc
blobstore_id: fe6bbe76-82ae-4c19-535a-24e11e262a0a
sha1: sha256:7c9fcf61931e69621640a5ed84712dd3c56588e757f186781fad90861bee6cf6
8422ad0f5110275ede3b8e1ef7fd83f7690f17aa:
version: 8422ad0f5110275ede3b8e1ef7fd83f7690f17aa
blobstore_id: d5b7e270-5bea-485f-b4db-e8d72777af15
Expand Down
4 changes: 4 additions & 0 deletions .final_builds/packages/uaa/index.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ builds:
version: 334c8a12a8d4acd9334a4fc83c063bdad706de42
blobstore_id: 9c2b7aef-2dbf-433c-8347-b65b269f0e47
sha1: 73e0ef462dc71b740dcf5a61a1a734bcd00bd36b
33cf665bc7e1510a7031a7f87f8177813b7b75c4be892988bb2327bd1277aeb6:
version: 33cf665bc7e1510a7031a7f87f8177813b7b75c4be892988bb2327bd1277aeb6
blobstore_id: e27118bd-c1c9-4744-6d5f-19735cdca9aa
sha1: sha256:5dbb2c8670471cd102e71bce30412d276c1442beb390f815756da25a4ca7dfa4
33da697bb3343793c762f06970868565a71d053a:
version: 33da697bb3343793c762f06970868565a71d053a
blobstore_id: f0888d28-fe34-4381-93a4-a578ca4188c3
Expand Down
6 changes: 6 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,9 @@ updates:
time: "11:00"
target-branch: "74.5.x"
open-pull-requests-limit: 10
ignore:
- dependency-name: "github.com/onsi/gomega"
# gomega 1.31 requires go 1.20. However, legacy-bosh-docker-image
# we use for in uaa-ci/concourse/v74-5-x-lts/pipeline.yml has go 1.19.
# Can be bumped only after we change the legacy-bosh-docker-image
# there.
8 changes: 3 additions & 5 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ GEM
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
diff-lcs (1.5.1)
drb (2.2.0)
ruby2_keywords
i18n (1.14.1)
drb (2.2.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
method_source (1.0.0)
mini_portile2 (2.8.5)
Expand Down Expand Up @@ -51,8 +50,7 @@ GEM
rspec-mocks (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.0)
ruby2_keywords (0.0.5)
rspec-support (3.13.1)
semi_semantic (1.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand Down
2 changes: 1 addition & 1 deletion jobs/uaa/spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ properties:
description: "The file to be used for configuring the LDAP authentication. Options are: 'simple-bind', 'search-and-bind', 'search-and-compare'"
default: search-and-bind
uaa.ldap.url:
description: "The URL to the ldap server, must start with ldap:// or ldaps://. Allows multiple servers to be specified, space separated"
description: "The URL to the ldap server, must start with ldap:// or ldaps://. Allows multiple server URLs to be specified for failover purpose, space separated."
example: ldap://localhost:389 ldaps://secure.host:636
uaa.ldap.userDNPattern:
description: "Used with simple-bind only. A semi-colon separated lists of DN patterns to construct a DN direct from the user ID without performing a search."
Expand Down
2 changes: 2 additions & 0 deletions releases/uaa/index.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ builds:
version: 75.1.0
24dca834-abce-4612-b708-499ff3d05023:
version: "44"
2558372d-29a6-4eed-5313-072f1c91e25e:
version: 77.2.0
259ac2dd-987c-41d2-6226-6a0e000f018a:
version: "64.0"
272a6cea-3bdd-498c-8a34-ac932149d11b:
Expand Down
26 changes: 26 additions & 0 deletions releases/uaa/uaa-77.2.0.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: uaa
version: 77.2.0
commit_hash: 6883c464
uncommitted_changes: false
jobs:
- name: bbr-uaadb
version: b10586c070c07129cd8f62188cd4754c403fb163812607dce31985e8e61781f0
fingerprint: b10586c070c07129cd8f62188cd4754c403fb163812607dce31985e8e61781f0
sha1: sha256:d1ed1f3056979fdac54590424d9be63ba9e9b03eaf6292984d1028de7dae96a9
packages: []
- name: uaa
version: 83b46301f2168e0bee50fb0eb1c7428f7948f4321f1344a82024c26730a73fbc
fingerprint: 83b46301f2168e0bee50fb0eb1c7428f7948f4321f1344a82024c26730a73fbc
sha1: sha256:7c9fcf61931e69621640a5ed84712dd3c56588e757f186781fad90861bee6cf6
packages:
- uaa
packages:
- name: uaa
version: 33cf665bc7e1510a7031a7f87f8177813b7b75c4be892988bb2327bd1277aeb6
fingerprint: 33cf665bc7e1510a7031a7f87f8177813b7b75c4be892988bb2327bd1277aeb6
sha1: sha256:5dbb2c8670471cd102e71bce30412d276c1442beb390f815756da25a4ca7dfa4
dependencies: []
license:
version: cc48a230dddf0499912777ce8ccf63b8ed7c22a4106f30b6934679272826f430
fingerprint: cc48a230dddf0499912777ce8ccf63b8ed7c22a4106f30b6934679272826f430
sha1: sha256:f98289619ac04578182dd62ac10ea1e940d05c35a045d87287ea8183af4e0315
12 changes: 6 additions & 6 deletions src/acceptance_tests/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ go 1.21.5

require (
github.com/cloudfoundry/bosh-cli v6.4.1+incompatible
github.com/cloudfoundry/bosh-utils v0.0.446
github.com/cloudfoundry/bosh-utils v0.0.449
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.31.1
)

require (
code.cloudfoundry.org/tlsconfig v0.0.0-20240216143505-4f8d9b753d56 // indirect
code.cloudfoundry.org/tlsconfig v0.0.0-20240301143844-95036809ae27 // indirect
github.com/bmatcuk/doublestar v1.3.4 // indirect
github.com/charlievieth/fs v0.0.3 // indirect
github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect
github.com/cloudfoundry/socks5-proxy v0.2.113 // indirect
github.com/cloudfoundry/socks5-proxy v0.2.114 // indirect
github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
Expand All @@ -24,9 +24,9 @@ require (
github.com/nxadm/tail v1.4.11 // indirect
github.com/pivotal-cf/paraphernalia v0.0.0-20180203224945-a64ae2051c20 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
48 changes: 24 additions & 24 deletions src/acceptance_tests/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
code.cloudfoundry.org/clock v1.0.0 h1:kFXWQM4bxYvdBw2X8BbBeXwQNgfoWv1vqAk2ZZyBN2o=
code.cloudfoundry.org/clock v1.0.0/go.mod h1:QD9Lzhd/ux6eNQVUDVRJX/RKTigpewimNYBi7ivZKY8=
code.cloudfoundry.org/tlsconfig v0.0.0-20240216143505-4f8d9b753d56 h1:OQ0z8N/DFAebg+mixpjICcj1ptH+rnMrA/bM6uSpFYA=
code.cloudfoundry.org/tlsconfig v0.0.0-20240216143505-4f8d9b753d56/go.mod h1:mCPOg9cNXnnC9RHxr1tCmosrhqPXmtpIptXaxZDNf4g=
code.cloudfoundry.org/tlsconfig v0.0.0-20240301143844-95036809ae27 h1:JBXvmlM2LxD7JliSaJJKauJyRH4Rqqkf0gm9cUr01jg=
code.cloudfoundry.org/tlsconfig v0.0.0-20240301143844-95036809ae27/go.mod h1:H6duQRLhZB0UEBVa1a9UJayTAYj0fF5K6pyjZu1pCTw=
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
Expand All @@ -10,12 +10,12 @@ github.com/charlievieth/fs v0.0.3 h1:3lZQXTj4PbE81CVPwALSn+JoyCNXkZgORHN6h2XHGlg
github.com/charlievieth/fs v0.0.3/go.mod h1:hD4sRzto1Hw8zCua76tNVKZxaeZZr1RiKftjAJQRLLo=
github.com/cloudfoundry/bosh-cli v6.4.1+incompatible h1:n5/+NIF9QxvGINOrjh6DmO+GTen78MoCj5+LU9L8bR4=
github.com/cloudfoundry/bosh-cli v6.4.1+incompatible/go.mod h1:rzIB+e1sn7wQL/TJ54bl/FemPKRhXby5BIMS3tLuWFM=
github.com/cloudfoundry/bosh-utils v0.0.446 h1:/FzseLBGn79a3NNwfaQwB9Cv+GRv/44pQZQXxTJuLvA=
github.com/cloudfoundry/bosh-utils v0.0.446/go.mod h1:l6ehmy90nDzz3jOR/phOFmPz/Rpto75izLL0zlFZWIs=
github.com/cloudfoundry/bosh-utils v0.0.449 h1:BmhONZcCx7msj65KYrLlQMLTwwWRfjnoKK33SfXYuuc=
github.com/cloudfoundry/bosh-utils v0.0.449/go.mod h1:CIZwHmw/xLup8jCgbS1c/a7iN4uz1bP0Iy5wLYgqB8o=
github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e h1:FQdRViaoDphGRfgrotl2QGsX1gbloe57dbGBS5CG6KY=
github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e/go.mod h1:PXmcacyJB/pJjSxEl15IU6rEIKXrhZQRzsr0UTkgNNs=
github.com/cloudfoundry/socks5-proxy v0.2.113 h1:z1DL2e8wucFaGb/z1njaHtGYSiDFaG6ZLAviHkGuU2I=
github.com/cloudfoundry/socks5-proxy v0.2.113/go.mod h1:+YV5oYxSeQM/wJ+OngpW38usEp75H8ekNgIXOD0rKQ0=
github.com/cloudfoundry/socks5-proxy v0.2.114 h1:ewCoN/Syuzm7EI/iDbbumoWABmdCt0Plrb44OpbEfZk=
github.com/cloudfoundry/socks5-proxy v0.2.114/go.mod h1:uEx+FTU9Uu00A0r2iqQ1a+Skh6sam1O1ClAEWxxPVc8=
github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4 h1:J+ghqo7ZubTzelkjo9hntpTtP/9lUCWH9icEmAW+B+Q=
github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4/go.mod h1:socxpf5+mELPbosI149vWpNlHK6mbfWFxSWOoSndXR8=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
Expand All @@ -27,8 +27,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
Expand All @@ -46,8 +46,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 h1:E/LAvt58di64hlYjx7AsNS6C/ysHWYo+2qPCZKTQhRo=
github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 h1:y3N7Bm7Y9/CtpiVkw/ZWj6lSlDF3F74SfKwfTCer72Q=
github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
Expand All @@ -65,8 +65,8 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
Expand All @@ -83,24 +83,24 @@ github.com/square/certstrap v1.3.0 h1:N9P0ZRA+DjT8pq5fGDj0z3FjafRKnBDypP0QHpMlaA
github.com/square/certstrap v1.3.0/go.mod h1:wGZo9eE1B7WX2GKBn0htJ+B3OuRl2UsdCFySNooy9hU=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.step.sm/crypto v0.43.1 h1:18Z/M49SnFDPXvFbfoN/ugE1i0J7phLWARhSQs/XSDI=
go.step.sm/crypto v0.43.1/go.mod h1:9n90D/SWjH1hTyQn1hgviUGyK8YRv743S8UZHYbt4BU=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -114,19 +114,19 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
2 changes: 1 addition & 1 deletion src/uaa
Submodule uaa updated 27 files
+5 −5 dependencies.gradle
+57 −0 model/src/main/java/org/cloudfoundry/identity/uaa/EntityWithAlias.java
+15 −5 model/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProvider.java
+18 −0 model/src/test/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderTest.java
+15 −0 server/src/main/java/org/cloudfoundry/identity/uaa/alias/EntityAliasFailedException.java
+236 −0 server/src/main/java/org/cloudfoundry/identity/uaa/alias/EntityAliasHandler.java
+1 −1 server/src/main/java/org/cloudfoundry/identity/uaa/home/BuildInfo.java
+8 −1 server/src/main/java/org/cloudfoundry/identity/uaa/logging/LogSanitizerUtil.java
+54 −8 server/src/main/java/org/cloudfoundry/identity/uaa/logging/SanitizedLogFactory.java
+18 −21 server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/JwtHelper.java
+99 −0 server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandler.java
+19 −250 server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java
+0 −91 server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdpAliasFailedException.java
+281 −0 server/src/test/java/org/cloudfoundry/identity/uaa/alias/EntityAliasHandlerValidationTest.java
+11 −5 server/src/test/java/org/cloudfoundry/identity/uaa/logging/LogSanitizerUtilTest.java
+118 −24 server/src/test/java/org/cloudfoundry/identity/uaa/logging/SanitizedLogFactoryTest.java
+7 −7 server/src/test/java/org/cloudfoundry/identity/uaa/oauth/jwt/ChainedSignatureVerifierTests.java
+35 −1 server/src/test/java/org/cloudfoundry/identity/uaa/oauth/jwt/CommonSignerTest.java
+394 −0 ...src/test/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandlerEnsureConsistencyTest.java
+149 −0 server/src/test/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderAliasHandlerValidationTest.java
+390 −558 server/src/test/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpointsTest.java
+0 −67 server/src/test/java/org/cloudfoundry/identity/uaa/provider/IdpAliasFailedExceptionTest.java
+33 −0 uaa/slateCustomizations/source/index.html.md.erb
+3 −2 uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/OIDCLoginIT.java
+1 −1 uaa/src/test/java/org/cloudfoundry/identity/uaa/login/TokenEndpointDocs.java
+6 −3 uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/providers/IdentityProviderEndpointsAliasMockMvcTests.java
+0 −129 uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/saml/SamlAuthenticationMockMvcTests.java