mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 14:12:26 -05:00 
			
		
		
		
	[chore]: Bump golang.org/x/net from 0.17.0 to 0.18.0 (#2390)
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.17.0 to 0.18.0. - [Commits](https://github.com/golang/net/compare/v0.17.0...v0.18.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								c334df8f43
							
						
					
				
			
			
				commit
				
					
						5c17ecd93a
					
				
			
		
					 168 changed files with 119 additions and 372 deletions
				
			
		
							
								
								
									
										20
									
								
								vendor/golang.org/x/crypto/ssh/server.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								vendor/golang.org/x/crypto/ssh/server.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -64,6 +64,13 @@ type ServerConfig struct { | |||
| 	// Config contains configuration shared between client and server. | ||||
| 	Config | ||||
| 
 | ||||
| 	// PublicKeyAuthAlgorithms specifies the supported client public key | ||||
| 	// authentication algorithms. Note that this should not include certificate | ||||
| 	// types since those use the underlying algorithm. This list is sent to the | ||||
| 	// client if it supports the server-sig-algs extension. Order is irrelevant. | ||||
| 	// If unspecified then a default set of algorithms is used. | ||||
| 	PublicKeyAuthAlgorithms []string | ||||
| 
 | ||||
| 	hostKeys []Signer | ||||
| 
 | ||||
| 	// NoClientAuth is true if clients are allowed to connect without | ||||
|  | @ -201,6 +208,15 @@ func NewServerConn(c net.Conn, config *ServerConfig) (*ServerConn, <-chan NewCha | |||
| 	if fullConf.MaxAuthTries == 0 { | ||||
| 		fullConf.MaxAuthTries = 6 | ||||
| 	} | ||||
| 	if len(fullConf.PublicKeyAuthAlgorithms) == 0 { | ||||
| 		fullConf.PublicKeyAuthAlgorithms = supportedPubKeyAuthAlgos | ||||
| 	} else { | ||||
| 		for _, algo := range fullConf.PublicKeyAuthAlgorithms { | ||||
| 			if !contains(supportedPubKeyAuthAlgos, algo) { | ||||
| 				return nil, nil, nil, fmt.Errorf("ssh: unsupported public key authentication algorithm %s", algo) | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 	// Check if the config contains any unsupported key exchanges | ||||
| 	for _, kex := range fullConf.KeyExchanges { | ||||
| 		if _, ok := serverForbiddenKexAlgos[kex]; ok { | ||||
|  | @ -524,7 +540,7 @@ userAuthLoop: | |||
| 				return nil, parseError(msgUserAuthRequest) | ||||
| 			} | ||||
| 			algo := string(algoBytes) | ||||
| 			if !contains(supportedPubKeyAuthAlgos, underlyingAlgo(algo)) { | ||||
| 			if !contains(config.PublicKeyAuthAlgorithms, underlyingAlgo(algo)) { | ||||
| 				authErr = fmt.Errorf("ssh: algorithm %q not accepted", algo) | ||||
| 				break | ||||
| 			} | ||||
|  | @ -591,7 +607,7 @@ userAuthLoop: | |||
| 				// algorithm name that corresponds to algo with | ||||
| 				// sig.Format.  This is usually the same, but | ||||
| 				// for certs, the names differ. | ||||
| 				if !contains(supportedPubKeyAuthAlgos, sig.Format) { | ||||
| 				if !contains(config.PublicKeyAuthAlgorithms, sig.Format) { | ||||
| 					authErr = fmt.Errorf("ssh: algorithm %q not accepted", sig.Format) | ||||
| 					break | ||||
| 				} | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue