@@ -274,49 +274,6 @@ type awsRequest struct {
274
274
Headers []awsRequestHeader `json:"headers"`
275
275
}
276
276
277
- func (cs awsCredentialSource ) validateMetadataServers () error {
278
- if err := cs .validateMetadataServer (cs .RegionURL , "region_url" ); err != nil {
279
- return err
280
- }
281
- if err := cs .validateMetadataServer (cs .CredVerificationURL , "url" ); err != nil {
282
- return err
283
- }
284
- return cs .validateMetadataServer (cs .IMDSv2SessionTokenURL , "imdsv2_session_token_url" )
285
- }
286
-
287
- var validHostnames []string = []string {"169.254.169.254" , "fd00:ec2::254" }
288
-
289
- func (cs awsCredentialSource ) isValidMetadataServer (metadataUrl string ) bool {
290
- if metadataUrl == "" {
291
- // Zero value means use default, which is valid.
292
- return true
293
- }
294
-
295
- u , err := url .Parse (metadataUrl )
296
- if err != nil {
297
- // Unparseable URL means invalid
298
- return false
299
- }
300
-
301
- for _ , validHostname := range validHostnames {
302
- if u .Hostname () == validHostname {
303
- // If it's one of the valid hostnames, everything is good
304
- return true
305
- }
306
- }
307
-
308
- // hostname not found in our allowlist, so not valid
309
- return false
310
- }
311
-
312
- func (cs awsCredentialSource ) validateMetadataServer (metadataUrl , urlName string ) error {
313
- if ! cs .isValidMetadataServer (metadataUrl ) {
314
- return fmt .Errorf ("oauth2/google: invalid hostname %s for %s" , metadataUrl , urlName )
315
- }
316
-
317
- return nil
318
- }
319
-
320
277
func (cs awsCredentialSource ) doRequest (req * http.Request ) (* http.Response , error ) {
321
278
if cs .client == nil {
322
279
cs .client = oauth2 .NewClient (cs .ctx , nil )
0 commit comments